diff --git a/packages/core/src/decorators/__tests__/memoized.test.ts b/packages/@n8n/decorators/src/__tests__/memoized.test.ts similarity index 100% rename from packages/core/src/decorators/__tests__/memoized.test.ts rename to packages/@n8n/decorators/src/__tests__/memoized.test.ts diff --git a/packages/@n8n/decorators/src/index.ts b/packages/@n8n/decorators/src/index.ts index 76008b795f..e1e2f7eea7 100644 --- a/packages/@n8n/decorators/src/index.ts +++ b/packages/@n8n/decorators/src/index.ts @@ -20,3 +20,4 @@ export type { AccessScope, Controller, RateLimit } from './types'; export type { ShutdownHandler } from './types'; export { MultiMainMetadata } from './multi-main-metadata'; export { OnLeaderTakeover, OnLeaderStepdown } from './on-multi-main-event'; +export { Memoized } from './memoized'; diff --git a/packages/core/src/decorators/memoized.ts b/packages/@n8n/decorators/src/memoized.ts similarity index 100% rename from packages/core/src/decorators/memoized.ts rename to packages/@n8n/decorators/src/memoized.ts diff --git a/packages/core/package.json b/packages/core/package.json index 4f956f250f..9b2e14447b 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -40,6 +40,7 @@ "@langchain/core": "catalog:", "@n8n/client-oauth2": "workspace:*", "@n8n/config": "workspace:*", + "@n8n/decorators": "workspace:*", "@n8n/di": "workspace:*", "@sentry/node": "catalog:", "axios": "catalog:", diff --git a/packages/core/src/decorators/index.ts b/packages/core/src/decorators/index.ts deleted file mode 100644 index 2bf9174d7a..0000000000 --- a/packages/core/src/decorators/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { Memoized } from './memoized'; diff --git a/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts b/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts index 1899b3a443..75b05fb790 100644 --- a/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts +++ b/packages/core/src/execution-engine/node-execution-context/credentials-test-context.ts @@ -1,7 +1,7 @@ +import { Memoized } from '@n8n/decorators'; import { Container } from '@n8n/di'; import type { ICredentialTestFunctions } from 'n8n-workflow'; -import { Memoized } from '@/decorators'; import { Logger } from '@/logging'; import { proxyRequestToAxios } from './utils/request-helper-functions'; diff --git a/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts index 7b5e94d8a6..17047b30b2 100644 --- a/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts +++ b/packages/core/src/execution-engine/node-execution-context/node-execution-context.ts @@ -1,3 +1,4 @@ +import { Memoized } from '@n8n/decorators'; import { Container } from '@n8n/di'; import { get } from 'lodash'; import type { @@ -33,7 +34,6 @@ import { HTTP_REQUEST_NODE_TYPE, HTTP_REQUEST_TOOL_NODE_TYPE, } from '@/constants'; -import { Memoized } from '@/decorators'; import { InstanceSettings } from '@/instance-settings'; import { Logger } from '@/logging/logger'; diff --git a/packages/core/src/instance-settings/instance-settings.ts b/packages/core/src/instance-settings/instance-settings.ts index 4d4e505c12..5a06fb10e3 100644 --- a/packages/core/src/instance-settings/instance-settings.ts +++ b/packages/core/src/instance-settings/instance-settings.ts @@ -1,3 +1,4 @@ +import { Memoized } from '@n8n/decorators'; import { Service } from '@n8n/di'; import { createHash, randomBytes } from 'crypto'; import { ApplicationError, jsonParse, ALPHABET, toResult } from 'n8n-workflow'; @@ -5,7 +6,6 @@ import { customAlphabet } from 'nanoid'; import { chmodSync, existsSync, mkdirSync, readFileSync, statSync, writeFileSync } from 'node:fs'; import path from 'path'; -import { Memoized } from '@/decorators'; import { Logger } from '@/logging/logger'; import { InstanceSettingsConfig } from './instance-settings-config'; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c0300f48f7..30a93bc475 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -648,7 +648,7 @@ importers: version: 3.666.0(@aws-sdk/client-sts@3.666.0) '@getzep/zep-cloud': specifier: 1.0.12 - version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(561f86043553ea1cdca62460394870a4)) + version: 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(6006e4ec6d742ca755e4775e38dc0b4c)) '@getzep/zep-js': specifier: 0.9.0 version: 0.9.0 @@ -675,7 +675,7 @@ importers: version: 0.3.2(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13) '@langchain/community': specifier: 'catalog:' - version: 0.3.24(baacc6cfd87ca40452e0e4a1284c9bc7) + version: 0.3.24(c9c4611e1b6dc12df1941bdd7ead1452) '@langchain/core': specifier: 'catalog:' version: 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) @@ -774,7 +774,7 @@ importers: version: 23.0.1 langchain: specifier: 0.3.11 - version: 0.3.11(561f86043553ea1cdca62460394870a4) + version: 0.3.11(6006e4ec6d742ca755e4775e38dc0b4c) lodash: specifier: 'catalog:' version: 4.17.21 @@ -1380,6 +1380,9 @@ importers: '@n8n/config': specifier: workspace:* version: link:../@n8n/config + '@n8n/decorators': + specifier: workspace:* + version: link:../@n8n/decorators '@n8n/di': specifier: workspace:* version: link:../@n8n/di @@ -16319,7 +16322,7 @@ snapshots: '@gar/promisify@1.1.3': optional: true - '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(561f86043553ea1cdca62460394870a4))': + '@getzep/zep-cloud@1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(6006e4ec6d742ca755e4775e38dc0b4c))': dependencies: form-data: 4.0.0 node-fetch: 2.7.0(encoding@0.1.13) @@ -16328,7 +16331,7 @@ snapshots: zod: 3.24.1 optionalDependencies: '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) - langchain: 0.3.11(561f86043553ea1cdca62460394870a4) + langchain: 0.3.11(6006e4ec6d742ca755e4775e38dc0b4c) transitivePeerDependencies: - encoding @@ -16843,7 +16846,7 @@ snapshots: - aws-crt - encoding - '@langchain/community@0.3.24(baacc6cfd87ca40452e0e4a1284c9bc7)': + '@langchain/community@0.3.24(c9c4611e1b6dc12df1941bdd7ead1452)': dependencies: '@browserbasehq/stagehand': 1.9.0(@playwright/test@1.49.1)(deepmerge@4.3.1)(dotenv@16.4.5)(encoding@0.1.13)(openai@4.78.1(encoding@0.1.13)(zod@3.24.1))(zod@3.24.1) '@ibm-cloud/watsonx-ai': 1.1.2 @@ -16854,7 +16857,7 @@ snapshots: flat: 5.0.2 ibm-cloud-sdk-core: 5.1.0 js-yaml: 4.1.0 - langchain: 0.3.11(561f86043553ea1cdca62460394870a4) + langchain: 0.3.11(6006e4ec6d742ca755e4775e38dc0b4c) langsmith: 0.2.15(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) openai: 4.78.1(encoding@0.1.13)(zod@3.24.1) uuid: 10.0.0 @@ -16869,7 +16872,7 @@ snapshots: '@aws-sdk/credential-provider-node': 3.666.0(@aws-sdk/client-sso-oidc@3.666.0(@aws-sdk/client-sts@3.666.0))(@aws-sdk/client-sts@3.666.0) '@azure/storage-blob': 12.18.0(encoding@0.1.13) '@browserbasehq/sdk': 2.0.0(encoding@0.1.13) - '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(561f86043553ea1cdca62460394870a4)) + '@getzep/zep-cloud': 1.0.12(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13)(langchain@0.3.11(6006e4ec6d742ca755e4775e38dc0b4c)) '@getzep/zep-js': 0.9.0 '@google-ai/generativelanguage': 2.6.0(encoding@0.1.13) '@google-cloud/storage': 7.12.1(encoding@0.1.13) @@ -23080,7 +23083,7 @@ snapshots: '@types/debug': 4.1.12 '@types/node': 18.16.16 '@types/tough-cookie': 4.0.2 - axios: 1.8.2 + axios: 1.8.2(debug@4.4.0) camelcase: 6.3.0 debug: 4.4.0(supports-color@8.1.1) dotenv: 16.4.5 @@ -23090,7 +23093,7 @@ snapshots: isstream: 0.1.2 jsonwebtoken: 9.0.2 mime-types: 2.1.35 - retry-axios: 2.6.0(axios@1.8.2(debug@4.4.0)) + retry-axios: 2.6.0(axios@1.8.2) tough-cookie: 4.1.3 transitivePeerDependencies: - supports-color @@ -24084,7 +24087,7 @@ snapshots: kuler@2.0.0: {} - langchain@0.3.11(561f86043553ea1cdca62460394870a4): + langchain@0.3.11(6006e4ec6d742ca755e4775e38dc0b4c): dependencies: '@langchain/core': 0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)) '@langchain/openai': 0.3.17(@langchain/core@0.3.30(openai@4.78.1(encoding@0.1.13)(zod@3.24.1)))(encoding@0.1.13) @@ -26457,7 +26460,7 @@ snapshots: onetime: 5.1.2 signal-exit: 3.0.7 - retry-axios@2.6.0(axios@1.8.2(debug@4.4.0)): + retry-axios@2.6.0(axios@1.8.2): dependencies: axios: 1.8.2