n8n 2.34.3 → 2.35.0

package/dist/modules/n8n-packages/engine/n8n-package-parser.js

@@ -55,6 +55,7 @@ const manifest_schema_1 = require("../spec/manifest.schema");
 const data_table_schema_1 = require("../spec/serialized/data-table.schema");
 const folder_schema_1 = require("../spec/serialized/folder.schema");
 const project_schema_1 = require("../spec/serialized/project.schema");
+const variable_schema_1 = require("../spec/serialized/variable.schema");
 let N8nPackageParser = class N8nPackageParser {
     constructor(workflowSerializer) {
         this.workflowSerializer = workflowSerializer;
@@ -105,6 +106,14 @@ let N8nPackageParser = class N8nPackageParser {
         }
         return projects;
     }
+    async getVariables(reader) {
+        const manifest = await this.getManifest(reader);
+        const variables = new Map();
+        for (const entry of manifest.variables ?? []) {
+            variables.set(entry.target, await this.readVariable(reader, entry));
+        }
+        return variables;
+    }
     async readWorkflow(reader, entry, parentFolderId) {
         const path = `${entry.target}/workflow.json`;
         const wire = await this.readJson(reader, path, 'workflow');
@@ -198,6 +207,26 @@ let N8nPackageParser = class N8nPackageParser {
                 : {}),
         };
     }
+    async readVariable(reader, entry) {
+        const path = `${entry.target}/variable.json`;
+        const wire = await this.readJson(reader, path, 'variable');
+        let variable;
+        try {
+            variable = variable_schema_1.serializedVariableSchema.parse(wire);
+        }
+        catch (cause) {
+            if (cause instanceof zod_1.ZodError) {
+                throw new n8n_workflow_1.UserError(`Package variable file at ${path} failed schema validation.`, {
+                    cause,
+                });
+            }
+            throw cause;
+        }
+        if (variable.name !== entry.name) {
+            throw new n8n_workflow_1.UserError(`Package variable at ${path} declares name "${variable.name}" but the manifest lists it as "${entry.name}".`);
+        }
+        return variable;
+    }
     async readJson(reader, path, label) {
         let content;
         try {

package/dist/modules/n8n-packages/engine/n8n-package-parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"n8n-package-parser.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/n8n-package-parser.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAyC;AACzC,gCAAkC;AAClC,+CAAoD;AACpD,6BAA+B;AAE/B,kFAA6E;AAC7E,MAAY,eAAe,+CAA2B;AAEtD,qDAA0F;AAI1F,kFAA8E;AAG9E,6DAAgE;AAChE,4EAAiF;AAEjF,oEAAiG;AACjG,sEAAoG;AAU7F,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC5B,YAA6B,kBAAsC;kCAAtC,kBAAkB;IAAuB,CAAC;IAEvE,KAAK,CAAC,WAAW,CAAC,MAAqB;QACtC,IAAI,CAAC;YACJ,OAAO,uCAAqB,CAAC,KAAK,CAAC,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACjE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,mCAAe;gBAAE,MAAM,KAAK,CAAC;YAClD,IAAI,KAAK,YAAY,cAAQ;gBAC5B,MAAM,IAAI,mCAAe,CAAC,oCAAoC,CAAC,CAAC;YACjE,MAAM,IAAI,mCAAe,CAAC,iCAAiC,CAAC,CAAC;QAC9D,CAAC;IACF,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,MAAqB,EAAE,UAAU,GAAG,EAAE;QACxD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAExF,MAAM,SAAS,GAAuB,EAAE,CAAC;QACzC,KAAK,MAAM,KAAK,IAAI,IAAA,iCAAgB,EAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,CAAC,EAAE,CAAC;YACtE,MAAM,cAAc,GAAG,IAAA,qCAAoB,EAAC,KAAK,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;YAC5E,SAAS,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;QACxE,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,MAAqB,EAAE,UAAU,GAAG,EAAE;QACtD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAqB,EAAE,CAAC;QACrC,KAAK,MAAM,KAAK,IAAI,IAAA,+BAAc,EAAC,QAAQ,CAAC,OAAO,EAAE,UAAU,CAAC,EAAE,CAAC;YAClE,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QACpD,CAAC;QACD,OAAO,OAAO,CAAC;IAChB,CAAC;IAGD,KAAK,CAAC,aAAa,CAAC,MAAqB;QACxC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,UAAU,GAA0B,EAAE,CAAC;QAC7C,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;YAC/C,UAAU,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,UAAU,CAAC;IACnB,CAAC;IAGD,KAAK,CAAC,WAAW,CAAC,MAAqB;QACtC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,QAAQ,GAAsB,EAAE,CAAC;QACvC,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;YAC7C,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,QAAQ,CAAC;IACjB,CAAC;IAEO,KAAK,CAAC,YAAY,CACzB,MAAqB,EACrB,KAAoB,EACpB,cAA6B;QAE7B,MAAM,IAAI,GAAG,GAAG,KAAK,CAAC,MAAM,gBAAgB,CAAC;QAC7C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAqB,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QAE/E,IAAI,MAAsB,CAAC;QAC3B,IAAI,CAAC;YACJ,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,mBAAc,EAAE,EAAE,OAAO,CAAC,CAAC;QACvD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,cAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,wBAAS,CAAC,4BAA4B,IAAI,4BAA4B,EAAE;oBACjF,KAAK;iBACL,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;QAED,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC;QAElD,OAAO;YACN,MAAM;YACN,gBAAgB,EAAE,KAAK,CAAC,EAAE;YAC1B,eAAe,EAAE,IAAI,CAAC,WAAW;YACjC,cAAc;YACd,GAAG,CAAC,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC7D,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,MAAqB,EAAE,KAAoB;QACnE,MAAM,IAAI,GAAG,GAAG,KAAK,CAAC,MAAM,cAAc,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEzD,IAAI,MAAwB,CAAC;QAC7B,IAAI,CAAC;YACJ,MAAM,GAAG,sCAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,cAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,wBAAS,CAAC,0BAA0B,IAAI,4BAA4B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5F,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;QAID,IAAI,MAAM,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YAC5B,MAAM,IAAI,wBAAS,CAClB,qBAAqB,IAAI,iBAAiB,MAAM,CAAC,EAAE,mCAAmC,KAAK,CAAC,EAAE,IAAI,CAClG,CAAC;QACH,CAAC;QAED,OAAO;YACN,cAAc,EAAE,MAAM,CAAC,EAAE;YACzB,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,cAAc,EAAE,MAAM,CAAC,cAAc;SACrC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,aAAa,CAC1B,MAAqB,EACrB,KAAoB;QAEpB,MAAM,IAAI,GAAG,GAAG,KAAK,CAAC,MAAM,kBAAkB,CAAC;QAC/C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC;QAE7D,IAAI,SAA8B,CAAC;QACnC,IAAI,CAAC;YACJ,SAAS,GAAG,6CAAyB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,cAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,wBAAS,CAAC,8BAA8B,IAAI,4BAA4B,EAAE;oBACnF,KAAK;iBACL,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;QAKD,IAAI,SAAS,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YAC/B,MAAM,IAAI,wBAAS,CAClB,yBAAyB,IAAI,iBAAiB,SAAS,CAAC,EAAE,mCAAmC,KAAK,CAAC,EAAE,IAAI,CACzG,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAC;IAClB,CAAC;IAEO,KAAK,CAAC,WAAW,CAAC,MAAqB,EAAE,KAAoB;QACpE,MAAM,IAAI,GAAG,GAAG,KAAK,CAAC,MAAM,eAAe,CAAC;QAC5C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAE1D,IAAI,OAA0B,CAAC;QAC/B,IAAI,CAAC;YACJ,OAAO,GAAG,wCAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,IAAI,KAAK,YAAY,cAAQ,EAAE,CAAC;gBAC/B,MAAM,IAAI,wBAAS,CAAC,2BAA2B,IAAI,4BAA4B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC7F,CAAC;YACD,MAAM,KAAK,CAAC;QACb,CAAC;QAID,IAAI,OAAO,CAAC,EAAE,KAAK,KAAK,CAAC,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,wBAAS,CAClB,sBAAsB,IAAI,iBAAiB,OAAO,CAAC,EAAE,mCAAmC,KAAK,CAAC,EAAE,IAAI,CACpG,CAAC;QACH,CAAC;QAED,OAAO;YACN,eAAe,EAAE,OAAO,CAAC,EAAE;YAC3B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,GAAG,CAAC,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAClF,GAAG,CAAC,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7D,GAAG,CAAC,OAAO,CAAC,mBAAmB,KAAK,SAAS;gBAC5C,CAAC,CAAC,EAAE,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,EAAE;gBACtD,CAAC,CAAC,EAAE,CAAC;SACN,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,QAAQ,CACrB,MAAqB,EACrB,IAAY,EACZ,KAAa;QAEb,IAAI,OAAe,CAAC;QACpB,IAAI,CAAC;YACJ,OAAO,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACvC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,MAAM,IAAI,wBAAS,CAAC,yCAAyC,KAAK,YAAY,IAAI,GAAG,EAAE;gBACtF,KAAK;aACL,CAAC,CAAC;QACJ,CAAC;QAED,OAAO,IAAA,wBAAS,EAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC9C,YAAY,EAAE,WAAW,KAAK,YAAY,IAAI,qBAAqB;SACnE,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;2BAzMY,gBAAgB;IAD5B,IAAA,YAAO,GAAE;qCAEwC,wCAAkB;GADvD,gBAAgB,CAyM5B"}
+{"version":3,"file":"n8n-package-parser.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/n8n-package-parser.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/engine/package-layout.d.ts

@@ -1,5 +1,22 @@
+import type { PlacedVariableRequirement } from '../entities/variable/variable.types';
+import { VariableParentPolicy } from '../n8n-packages.types';
+import type { ImportVariableProperties } from '../n8n-packages.types';
 import type { ManifestEntry } from '../spec/manifest.schema';
+import type { PackageVariableRequirement } from '../spec/requirements.schema';
+import type { SerializedVariable } from '../spec/serialized/variable.schema';
 export declare function foldersInScope(entries: ManifestEntry[] | undefined, basePrefix?: string): ManifestEntry[];
 export declare function workflowsInScope(entries: ManifestEntry[] | undefined, basePrefix?: string): ManifestEntry[];
-export declare function deriveVariableScope(entries: ManifestEntry[] | undefined, basePrefix: string, name: string): 'global' | 'project';
+export declare function needsBundledVariableValues(request: ImportVariableProperties, hasRequirements: boolean): boolean;
+interface VariableBundleLookup {
+    requirements: PackageVariableRequirement[] | undefined;
+    manifestVariables: ManifestEntry[] | undefined;
+    bundledVariables?: Map<string, SerializedVariable>;
+}
+export declare function placeByPolicy(params: VariableBundleLookup & {
+    policy: VariableParentPolicy;
+}): PlacedVariableRequirement[] | undefined;
+export declare function placeByLayout(params: VariableBundleLookup & {
+    scopePrefix: string;
+}): PlacedVariableRequirement[] | undefined;
 export declare function deriveParentFolderId(workflowTarget: string, folderTargetToId: Map<string, string>): string | null;
+export {};

package/dist/modules/n8n-packages/engine/package-layout.js

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.foldersInScope = foldersInScope;
 exports.workflowsInScope = workflowsInScope;
-exports.deriveVariableScope = deriveVariableScope;
+exports.needsBundledVariableValues = needsBundledVariableValues;
+exports.placeByPolicy = placeByPolicy;
+exports.placeByLayout = placeByLayout;
 exports.deriveParentFolderId = deriveParentFolderId;
 const n8n_workflow_1 = require("n8n-workflow");
+const variable_missing_mode_1 = require("../entities/variable/variable-missing-mode");
+const n8n_packages_types_1 = require("../n8n-packages.types");
 function foldersInScope(entries, basePrefix = '') {
     return (entries ?? []).filter((entry) => entry.target.startsWith(`${basePrefix}folders/`));
 }
@@ -12,13 +16,38 @@ function workflowsInScope(entries, basePrefix = '') {
     return (entries ?? []).filter((entry) => entry.target.startsWith(`${basePrefix}workflows/`) ||
         entry.target.startsWith(`${basePrefix}folders/`));
 }
-function deriveVariableScope(entries, basePrefix, name) {
+function needsBundledVariableValues(request, hasRequirements) {
+    return (hasRequirements &&
+        ((0, variable_missing_mode_1.variableMissingModeUsesPackageValue)(request.variableMissingMode) ||
+            request.variableConflictPolicy !== n8n_packages_types_1.VariableConflictPolicy.KeepExisting));
+}
+function variableBundleEntry(entries, basePrefix, name) {
     const named = (entries ?? []).filter((entry) => entry.name === name);
-    if (named.some((entry) => entry.target.startsWith(`${basePrefix}variables/`)))
-        return 'project';
-    if (named.some((entry) => entry.target.startsWith('variables/')))
-        return 'global';
-    return 'project';
+    const scoped = named.filter((entry) => entry.target.startsWith(`${basePrefix}variables/`));
+    const topLevel = named.filter((entry) => entry.target.startsWith('variables/'));
+    const winning = scoped.length > 0 ? scoped : topLevel;
+    if (winning.length > 1) {
+        throw new n8n_workflow_1.UserError(`Package contains ambiguous variable entries for "${name}".`);
+    }
+    return winning[0];
+}
+function placeWith({ requirements, manifestVariables, bundledVariables }, basePrefix, isGlobal) {
+    return requirements?.map((requirement) => {
+        const bundle = variableBundleEntry(manifestVariables, basePrefix, requirement.name);
+        const packageValue = bundle ? bundledVariables?.get(bundle.target)?.value : undefined;
+        return {
+            ...requirement,
+            globalPlacement: isGlobal(bundle),
+            ...(packageValue !== undefined ? { packageValue } : {}),
+        };
+    });
+}
+function placeByPolicy(params) {
+    const global = params.policy === n8n_packages_types_1.VariableParentPolicy.Global;
+    return placeWith(params, '', () => global);
+}
+function placeByLayout(params) {
+    return placeWith(params, params.scopePrefix, (bundle) => bundle !== undefined && !bundle.target.startsWith(params.scopePrefix));
 }
 function deriveParentFolderId(workflowTarget, folderTargetToId) {
     const idx = workflowTarget.lastIndexOf('/workflows/');

package/dist/modules/n8n-packages/engine/package-layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/package-layout.ts"],"names":[],"mappings":";;;;;;AAAA,+CAAyC;AAIzC,wBACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,0BACC,OAAoC,EACpC,UAAU,GAAG,EAAE;IAEf,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAC5B,CAAC,KAAK,EAAE,EAAE,CACT,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,YAAY,CAAC;QAClD,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,UAAU,CAAC,CACjD,CAAC;AACH,CAAC;AAGD,6BACC,OAAoC,EACpC,UAAkB,EAClB,IAAY;IAEZ,MAAM,KAAK,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IACrE,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,UAAU,YAAY,CAAC,CAAC;QAAE,OAAO,SAAS,CAAC;IAChG,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAAE,OAAO,QAAQ,CAAC;IAClF,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,8BACC,cAAsB,EACtB,gBAAqC;IAErC,MAAM,GAAG,GAAG,cAAc,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,CAAC,CAAC;QAAE,OAAO,IAAI,CAAC;IAE5B,MAAM,eAAe,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAErD,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IACvD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACvD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC5B,MAAM,IAAI,wBAAS,CAClB,wBAAwB,cAAc,6BAA6B,eAAe,wCAAwC,CAC1H,CAAC;IACH,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC"}
+{"version":3,"file":"package-layout.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/package-layout.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/engine/project-package-importer.js

@@ -19,6 +19,7 @@ const workflow_importer_1 = require("../entities/workflow/workflow-importer");
 const workflow_publisher_1 = require("../entities/workflow/workflow-publisher");
 const n8n_packages_types_1 = require("../n8n-packages.types");
 const import_gates_1 = require("./import-gates");
+const import_blocked_error_1 = require("./import-blocked.error");
 const package_layout_1 = require("./package-layout");
 const import_orchestrator_1 = require("./import-orchestrator");
 const import_result_1 = require("./import-result");
@@ -36,17 +37,25 @@ let ProjectPackageImporter = class ProjectPackageImporter {
     async import(request, reader, manifest) {
         this.assertAdequatePermissions(request, manifest);
         const projects = await this.packageParser.getProjects(reader);
-        const projectPlan = await this.projectImporter.plan(request.user, projects);
-        const pendingCreateIds = new Set(projectPlan.filter((item) => item.action === 'create').map((item) => item.sourceProjectId));
+        const projectPlan = await this.projectImporter.plan(request.user, projects, request.projectConflictPolicy);
+        if (projectPlan.conflicts.length > 0) {
+            throw (0, import_blocked_error_1.toImportBlockedError)(projectPlan.conflicts.map((conflict) => ({ type: 'project-conflict', ...conflict })));
+        }
+        const bundledVariables = (0, package_layout_1.needsBundledVariableValues)(request, (manifest.requirements?.variables?.length ?? 0) > 0)
+            ? await this.packageParser.getVariables(reader)
+            : undefined;
+        const pendingCreateIds = new Set(projectPlan.items
+            .filter((item) => item.action === 'create')
+            .map((item) => item.sourceProjectId));
         const planned = [];
         for (const project of manifest.projects ?? []) {
-            const input = await this.buildImportContextForProject(request, reader, manifest, project, pendingCreateIds.has(project.id));
+            const input = await this.buildImportContextForProject(request, reader, manifest, project, pendingCreateIds.has(project.id), bundledVariables);
             const plan = await this.importOrchestrator.plan(input);
             planned.push({ project, plan });
         }
         (0, import_gates_1.assertTagWritesAllowed)(request.apiKeyScopes, planned.map(({ plan }) => plan.tagPlan));
-        await this.importOrchestrator.assertNotBlocked(planned.map(({ plan }) => plan));
-        const projectSummaries = await this.projectImporter.apply(request.user, projectPlan);
+        await this.importOrchestrator.assertNotBlocked(planned.map(({ plan }) => plan), { apiKeyScopes: request.apiKeyScopes });
+        const projectSummaries = await this.projectImporter.apply(request.user, projectPlan.items);
         const packageWorkflowBindings = new Map(planned.flatMap(({ plan }) => [...(0, workflow_importer_1.collectPlannedWorkflowBindings)(plan.workflowPlan.items)]));
         const applied = [];
         for (const { project, plan } of planned) {
@@ -69,8 +78,10 @@ let ProjectPackageImporter = class ProjectPackageImporter {
         const stubbed = [];
         const variablesMatched = [];
         const variablesMissing = [];
+        const variablesCreated = [];
         const variablesStubbed = [];
         const variablesSkipped = [];
+        const variablesUpdated = [];
         const tagSummaries = [];
         const scopes = [];
         for (const { project, plan, content } of applied) {
@@ -81,8 +92,10 @@ let ProjectPackageImporter = class ProjectPackageImporter {
             stubbed.push(...content.credentialResult.stubbed);
             variablesMatched.push(...content.variablePlan.matched);
             variablesMissing.push(...content.variablePlan.missing.map(({ name }) => name));
+            variablesCreated.push(...content.variableResult.created);
             variablesStubbed.push(...content.variableResult.stubbed);
             variablesSkipped.push(...content.variableResult.skippedExisting);
+            variablesUpdated.push(...content.variableResult.updated);
             tagSummaries.push((0, import_result_1.toTagSummary)(content.tagPlan));
             scopes.push({
                 context: plan.input.context,
@@ -104,13 +117,15 @@ let ProjectPackageImporter = class ProjectPackageImporter {
             variables: (0, import_result_1.reconcileVariableSummary)({
                 matched: variablesMatched,
                 missing: variablesMissing,
+                created: variablesCreated,
                 stubbed: variablesStubbed,
                 skipped: variablesSkipped,
+                updated: variablesUpdated,
             }),
             tags: (0, import_result_1.unionTagSummaries)(tagSummaries),
         });
     }
-    async buildImportContextForProject(request, reader, manifest, project, projectPendingCreation) {
+    async buildImportContextForProject(request, reader, manifest, project, projectPendingCreation, bundledVariables) {
         const basePrefix = `${project.target}/`;
         const folders = await this.packageParser.getFolders(reader, basePrefix);
         const workflows = await this.packageParser.getWorkflows(reader, basePrefix);
@@ -129,11 +144,14 @@ let ProjectPackageImporter = class ProjectPackageImporter {
             schemaConflictPolicy: request.dataTableSchemaConflictPolicy,
         };
         const variableRequest = {
-            requirements: (0, import_result_1.identifyRequirements)(manifest.requirements?.variables, workflows)?.map((requirement) => ({
-                ...requirement,
-                globalPlacement: (0, package_layout_1.deriveVariableScope)(manifest.variables, basePrefix, requirement.name) === 'global',
-            })),
+            requirements: (0, package_layout_1.placeByLayout)({
+                requirements: (0, import_result_1.identifyRequirements)(manifest.requirements?.variables, workflows),
+                manifestVariables: manifest.variables,
+                scopePrefix: basePrefix,
+                bundledVariables,
+            }),
             missingMode: request.variableMissingMode,
+            conflictPolicy: request.variableConflictPolicy,
         };
         const tagRequest = {
             requirements: manifest.requirements?.tags,
@@ -167,12 +185,6 @@ let ProjectPackageImporter = class ProjectPackageImporter {
         if ((manifest.workflows?.length ?? 0) > 0) {
             (0, import_gates_1.assertPackageImportApiKeyScopes)(request.apiKeyScopes, ['workflow:import']);
         }
-        (0, import_gates_1.assertVariableCreationAllowed)({
-            licenseState: this.licenseState,
-            apiKeyScopes: request.apiKeyScopes,
-            missingMode: request.variableMissingMode,
-            hasRequirements: (manifest.requirements?.variables?.length ?? 0) > 0,
-        });
     }
 };
 exports.ProjectPackageImporter = ProjectPackageImporter;

package/dist/modules/n8n-packages/engine/project-package-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-package-importer.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/project-package-importer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAmD;AACnD,gCAAkC;AAElC,8EAA0E;AAC1E,0DAAsD;AAItD,2EAAuE;AAGvE,8EAAwF;AACxF,gFAA4E;AAW5E,8DAAsD;AACtD,iDAIwB;AACxB,qDAAuD;AACvD,+DAK+B;AAC/B,mDASyB;AACzB,yDAAuF;AACvF,6DAAwD;AAIjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,aAA+B,EAC/B,eAAgC,EAChC,kBAAsC,EACtC,iBAAoC,EACpC,YAA0B,EAC1B,YAA0B;6BAL1B,aAAa;+BACb,eAAe;kCACf,kBAAkB;iCAClB,iBAAiB;4BACjB,YAAY;4BACZ,YAAY;IAC3B,CAAC;IAEJ,KAAK,CAAC,MAAM,CACX,OAA6B,EAC7B,MAAqB,EACrB,QAAyB;QAEzB,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAG5E,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC/B,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAC1F,CAAC;QAIF,MAAM,OAAO,GAAwD,EAAE,CAAC;QACxE,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACpD,OAAO,EACP,MAAM,EACN,QAAQ,EACR,OAAO,EACP,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAChC,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,IAAA,qCAAsB,EACrB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CACvC,CAAC;QACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAEhF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;QAIrF,MAAM,uBAAuB,GAAqB,IAAI,GAAG,CACxD,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,IAAA,kDAA8B,EAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3F,CAAC;QAIF,MAAM,OAAO,GAIR,EAAE,CAAC;QACR,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC;gBACZ,OAAO;gBACP,IAAI;gBACJ,OAAO,EAAE,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC;aAC3E,CAAC,CAAC;QACJ,CAAC;QAKD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;YAC7D,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACrE,MAAM,EAAE,OAAO,CAAC,wBAAwB;YACxC,uBAAuB,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS;SACzD,CAAC,CAAC;QAEH,MAAM,SAAS,GAA8B,EAAE,CAAC;QAChD,MAAM,OAAO,GAA4B,EAAE,CAAC;QAC5C,MAAM,cAAc,GAA4B,EAAE,CAAC;QACnD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,YAAY,GAAuB,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAyB,EAAE,CAAC;QAExC,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,CAAC;YAClD,SAAS,CAAC,IAAI,CACb,GAAG,IAAA,2CAA2B,EAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAC/E,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;YACzC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAClD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACvD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/E,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACzD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YACjE,YAAY,CAAC,IAAI,CAAC,IAAA,4BAAY,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC3B,QAAQ,EAAE,OAAO;gBACjB,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB;gBAC/C,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;gBAC7C,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;gBAC3C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;aACjC,CAAC,CAAC;QACJ,CAAC;QAED,IAAA,2CAAwB,EAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3E,OAAO,IAAA,iCAAiB,EAAC;YACxB,OAAO,EAAE,IAAA,gCAAgB,EAAC,QAAQ,CAAC;YACnC,SAAS;YACT,OAAO;YACP,QAAQ,EAAE,gBAAgB;YAC1B,QAAQ,EAAE,IAAA,kCAAa,EAAC,GAAG,cAAc,CAAC;YAC1C,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;YACjC,SAAS,EAAE,IAAA,wCAAwB,EAAC;gBACnC,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;aACzB,CAAC;YACF,IAAI,EAAE,IAAA,iCAAiB,EAAC,YAAY,CAAC;SACrC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACzC,OAA6B,EAC7B,MAAqB,EACrB,QAAyB,EACzB,OAAsB,EACtB,sBAA+B;QAE/B,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAI5E,MAAM,YAAY,GAAG,IAAA,oCAAoB,EAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACzF,MAAM,iBAAiB,GAA6B;YACnD,YAAY;YACZ,YAAY,EAAE,OAAO,CAAC,sBAAsB;YAC5C,WAAW,EAAE,OAAO,CAAC,qBAAqB;YAC1C,kBAAkB,EAAE,IAAA,qDAAqC,EACxD,OAAO,CAAC,QAAQ,EAAE,WAAW,EAC7B,YAAY,CACZ;SACD,CAAC;QAEF,MAAM,gBAAgB,GAA2B;YAChD,YAAY,EAAE,IAAA,oCAAoB,EAAC,QAAQ,CAAC,YAAY,EAAE,UAAU,EAAE,SAAS,CAAC;YAChF,iBAAiB,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC;YACjE,YAAY,EAAE,OAAO,CAAC,qBAAqB;YAC3C,WAAW,EAAE,OAAO,CAAC,oBAAoB;YACzC,oBAAoB,EAAE,OAAO,CAAC,6BAA6B;SAC3D,CAAC;QAEF,MAAM,eAAe,GAA0B;YAC9C,YAAY,EAAE,IAAA,oCAAoB,EAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC,EAAE,GAAG,CACnF,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;gBACjB,GAAG,WAAW;gBACd,eAAe,EACd,IAAA,oCAAmB,EAAC,QAAQ,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,QAAQ;aACnF,CAAC,CACF;YACD,WAAW,EAAE,OAAO,CAAC,mBAAmB;SACxC,CAAC;QAIF,MAAM,UAAU,GAAqB;YACpC,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,IAAI;YACzC,WAAW,EAAE,OAAO,CAAC,cAAc;YACnC,cAAc,EAAE,OAAO,CAAC,iBAAiB;SACzC,CAAC;QAEF,OAAO;YACN,OAAO,EAAE;gBACR,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,QAAQ,EAAE,IAAI;aACd;YACD,OAAO;YACP,SAAS;YACT,iBAAiB;YACjB,gBAAgB;YAChB,eAAe;YACf,UAAU;YACV,OAAO,EAAE,OAAO;YAChB,sBAAsB;SACtB,CAAC;IACH,CAAC;IAEO,yBAAyB,CAChC,OAA6B,EAC7B,QAAyB;QAIzB,IAAA,8CAA+B,EAAC,OAAO,CAAC,YAAY,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAE5F,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnD,MAAM,IAAI,gCAAc,CACvB,iHAAiH,CACjH,CAAC;YACH,CAAC;YACD,IAAA,8CAA+B,EAAC,OAAO,CAAC,YAAY,EAAE,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAA,8CAA+B,EAAC,OAAO,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC5E,CAAC;QAED,IAAA,4CAA6B,EAAC;YAC7B,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,WAAW,EAAE,OAAO,CAAC,mBAAmB;YACxC,eAAe,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC;SACpE,CAAC,CAAC;IACJ,CAAC;CACD,CAAA;;iCArOY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAGwB,qCAAgB,EACd,kCAAe,EACZ,wCAAkB,EACnB,sCAAiB,EACtB,4BAAY,EACZ,6BAAY;GAPhC,sBAAsB,CAqOlC"}
+{"version":3,"file":"project-package-importer.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/project-package-importer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,wDAAmD;AACnD,gCAAkC;AAElC,8EAA0E;AAC1E,0DAAsD;AAItD,2EAAuE;AAGvE,8EAAwF;AACxF,gFAA4E;AAY5E,8DAAsD;AACtD,iDAAyF;AACzF,iEAA8D;AAC9D,qDAA6E;AAC7E,+DAK+B;AAC/B,mDASyB;AACzB,yDAAuF;AACvF,6DAAwD;AAKjD,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAClC,YACkB,aAA+B,EAC/B,eAAgC,EAChC,kBAAsC,EACtC,iBAAoC,EACpC,YAA0B,EAC1B,YAA0B;6BAL1B,aAAa;+BACb,eAAe;kCACf,kBAAkB;iCAClB,iBAAiB;4BACjB,YAAY;4BACZ,YAAY;IAC3B,CAAC;IAEJ,KAAK,CAAC,MAAM,CACX,OAA6B,EAC7B,MAAqB,EACrB,QAAyB;QAEzB,IAAI,CAAC,yBAAyB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAC9D,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,IAAI,CAClD,OAAO,CAAC,IAAI,EACZ,QAAQ,EACR,OAAO,CAAC,qBAAqB,CAC7B,CAAC;QAGF,IAAI,WAAW,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,IAAA,2CAAoB,EACzB,WAAW,CAAC,SAAS,CAAC,GAAG,CACxB,CAAC,QAAQ,EAAiB,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,GAAG,QAAQ,EAAE,CAAC,CACxE,CACD,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAA,2CAA0B,EAClD,OAAO,EACP,CAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CACnD;YACA,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC;YAC/C,CAAC,CAAC,SAAS,CAAC;QAGb,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAC/B,WAAW,CAAC,KAAK;aACf,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC;aAC1C,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CACrC,CAAC;QAIF,MAAM,OAAO,GAAwD,EAAE,CAAC;QACxE,KAAK,MAAM,OAAO,IAAI,QAAQ,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,4BAA4B,CACpD,OAAO,EACP,MAAM,EACN,QAAQ,EACR,OAAO,EACP,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,EAChC,gBAAgB,CAChB,CAAC;YACF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,IAAA,qCAAsB,EACrB,OAAO,CAAC,YAAY,EACpB,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CACvC,CAAC;QACF,MAAM,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAC7C,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAC/B,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CACtC,CAAC;QAEF,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC;QAI3F,MAAM,uBAAuB,GAAqB,IAAI,GAAG,CACxD,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,GAAG,IAAA,kDAA8B,EAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3F,CAAC;QAIF,MAAM,OAAO,GAIR,EAAE,CAAC;QACR,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC;gBACZ,OAAO;gBACP,IAAI;gBACJ,OAAO,EAAE,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,EAAE,uBAAuB,CAAC;aAC3E,CAAC,CAAC;QACJ,CAAC;QAKD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,cAAc,CAAC;YAC7D,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC;YACrE,MAAM,EAAE,OAAO,CAAC,wBAAwB;YACxC,uBAAuB,EAAE,QAAQ,CAAC,YAAY,EAAE,SAAS;SACzD,CAAC,CAAC;QAEH,MAAM,SAAS,GAA8B,EAAE,CAAC;QAChD,MAAM,OAAO,GAA4B,EAAE,CAAC;QAC5C,MAAM,cAAc,GAA4B,EAAE,CAAC;QACnD,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAa,EAAE,CAAC;QAC7B,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,MAAM,YAAY,GAAuB,EAAE,CAAC;QAC5C,MAAM,MAAM,GAAyB,EAAE,CAAC;QAExC,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,OAAO,EAAE,CAAC;YAClD,SAAS,CAAC,IAAI,CACb,GAAG,IAAA,2CAA2B,EAAC,OAAO,CAAC,gBAAgB,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAC/E,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;YACzC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACtC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAClD,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAClD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACvD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;YAC/E,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACzD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACzD,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YACjE,gBAAgB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;YACzD,YAAY,CAAC,IAAI,CAAC,IAAA,4BAAY,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;YACjD,MAAM,CAAC,IAAI,CAAC;gBACX,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;gBAC3B,QAAQ,EAAE,OAAO;gBACjB,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB;gBAC/C,gBAAgB,EAAE,IAAI,CAAC,KAAK,CAAC,gBAAgB;gBAC7C,eAAe,EAAE,IAAI,CAAC,KAAK,CAAC,eAAe;gBAC3C,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;aACjC,CAAC,CAAC;QACJ,CAAC;QAED,IAAA,2CAAwB,EAAC,IAAI,CAAC,YAAY,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;QAE3E,OAAO,IAAA,iCAAiB,EAAC;YACxB,OAAO,EAAE,IAAA,gCAAgB,EAAC,QAAQ,CAAC;YACnC,SAAS;YACT,OAAO;YACP,QAAQ,EAAE,gBAAgB;YAC1B,QAAQ,EAAE,IAAA,kCAAa,EAAC,GAAG,cAAc,CAAC;YAC1C,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;YACjC,SAAS,EAAE,IAAA,wCAAwB,EAAC;gBACnC,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;gBACzB,OAAO,EAAE,gBAAgB;aACzB,CAAC;YACF,IAAI,EAAE,IAAA,iCAAiB,EAAC,YAAY,CAAC;SACrC,CAAC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,4BAA4B,CACzC,OAA6B,EAC7B,MAAqB,EACrB,QAAyB,EACzB,OAAsB,EACtB,sBAA+B,EAC/B,gBAA6D;QAE7D,MAAM,UAAU,GAAG,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC;QACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QACxE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;QAI5E,MAAM,YAAY,GAAG,IAAA,oCAAoB,EAAC,QAAQ,CAAC,YAAY,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;QACzF,MAAM,iBAAiB,GAA6B;YACnD,YAAY;YACZ,YAAY,EAAE,OAAO,CAAC,sBAAsB;YAC5C,WAAW,EAAE,OAAO,CAAC,qBAAqB;YAC1C,kBAAkB,EAAE,IAAA,qDAAqC,EACxD,OAAO,CAAC,QAAQ,EAAE,WAAW,EAC7B,YAAY,CACZ;SACD,CAAC;QAEF,MAAM,gBAAgB,GAA2B;YAChD,YAAY,EAAE,IAAA,oCAAoB,EAAC,QAAQ,CAAC,YAAY,EAAE,UAAU,EAAE,SAAS,CAAC;YAChF,iBAAiB,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC;YACjE,YAAY,EAAE,OAAO,CAAC,qBAAqB;YAC3C,WAAW,EAAE,OAAO,CAAC,oBAAoB;YACzC,oBAAoB,EAAE,OAAO,CAAC,6BAA6B;SAC3D,CAAC;QAEF,MAAM,eAAe,GAA0B;YAC9C,YAAY,EAAE,IAAA,8BAAa,EAAC;gBAC3B,YAAY,EAAE,IAAA,oCAAoB,EAAC,QAAQ,CAAC,YAAY,EAAE,SAAS,EAAE,SAAS,CAAC;gBAC/E,iBAAiB,EAAE,QAAQ,CAAC,SAAS;gBACrC,WAAW,EAAE,UAAU;gBACvB,gBAAgB;aAChB,CAAC;YACF,WAAW,EAAE,OAAO,CAAC,mBAAmB;YACxC,cAAc,EAAE,OAAO,CAAC,sBAAsB;SAC9C,CAAC;QAIF,MAAM,UAAU,GAAqB;YACpC,YAAY,EAAE,QAAQ,CAAC,YAAY,EAAE,IAAI;YACzC,WAAW,EAAE,OAAO,CAAC,cAAc;YACnC,cAAc,EAAE,OAAO,CAAC,iBAAiB;SACzC,CAAC;QAEF,OAAO;YACN,OAAO,EAAE;gBACR,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,QAAQ,EAAE,IAAI;aACd;YACD,OAAO;YACP,SAAS;YACT,iBAAiB;YACjB,gBAAgB;YAChB,eAAe;YACf,UAAU;YACV,OAAO,EAAE,OAAO;YAChB,sBAAsB;SACtB,CAAC;IACH,CAAC;IAEO,yBAAyB,CAChC,OAA6B,EAC7B,QAAyB;QAIzB,IAAA,8CAA+B,EAAC,OAAO,CAAC,YAAY,EAAE,CAAC,gBAAgB,EAAE,gBAAgB,CAAC,CAAC,CAAC;QAE5F,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;gBACnD,MAAM,IAAI,gCAAc,CACvB,iHAAiH,CACjH,CAAC;YACH,CAAC;YACD,IAAA,8CAA+B,EAAC,OAAO,CAAC,YAAY,EAAE,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;QAC3F,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAA,8CAA+B,EAAC,OAAO,CAAC,YAAY,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC5E,CAAC;IACF,CAAC;CACD,CAAA;;iCA/PY,sBAAsB;IADlC,IAAA,YAAO,GAAE;qCAGwB,qCAAgB,EACd,kCAAe,EACZ,wCAAkB,EACnB,sCAAiB,EACtB,4BAAY,EACZ,6BAAY;GAPhC,sBAAsB,CA+PlC"}

package/dist/modules/n8n-packages/engine/workflow-package-importer.js

@@ -25,6 +25,7 @@ const import_orchestrator_1 = require("./import-orchestrator");
 const import_result_1 = require("./import-result");
 const import_telemetry_1 = require("./import-telemetry");
 const n8n_package_parser_1 = require("./n8n-package-parser");
+const package_layout_1 = require("./package-layout");
 let WorkflowPackageImporter = class WorkflowPackageImporter {
     constructor(packageParser, importOrchestrator, workflowPublisher, projectService, folderService, eventService, licenseState) {
         this.packageParser = packageParser;
@@ -61,19 +62,18 @@ let WorkflowPackageImporter = class WorkflowPackageImporter {
             schemaConflictPolicy: request.dataTableSchemaConflictPolicy,
         };
         const variableRequirements = (0, import_result_1.identifyRequirements)(manifest.requirements?.variables, workflows);
-        (0, import_gates_1.assertVariableCreationAllowed)({
-            licenseState: this.licenseState,
-            apiKeyScopes: request.apiKeyScopes,
-            missingMode: request.variableMissingMode,
-            hasRequirements: (variableRequirements?.length ?? 0) > 0,
-        });
-        const globalPlacement = request.variableParentPolicy === n8n_packages_types_1.VariableParentPolicy.Global;
+        const bundledVariables = (0, package_layout_1.needsBundledVariableValues)(request, (variableRequirements?.length ?? 0) > 0)
+            ? await this.packageParser.getVariables(reader)
+            : undefined;
         const variableRequest = {
-            requirements: variableRequirements?.map((requirement) => ({
-                ...requirement,
-                globalPlacement,
-            })),
+            requirements: (0, package_layout_1.placeByPolicy)({
+                requirements: variableRequirements,
+                manifestVariables: manifest.variables,
+                policy: request.variableParentPolicy ?? n8n_packages_types_1.VariableParentPolicy.Project,
+                bundledVariables,
+            }),
             missingMode: request.variableMissingMode,
+            conflictPolicy: request.variableConflictPolicy,
         };
         const tagRequest = {
             requirements: manifest.requirements?.tags,
@@ -92,7 +92,7 @@ let WorkflowPackageImporter = class WorkflowPackageImporter {
             subWorkflowRequirements: (0, import_result_1.identifyRequirements)(manifest.requirements?.workflows, workflows),
         });
         (0, import_gates_1.assertTagWritesAllowed)(request.apiKeyScopes, [plan.tagPlan]);
-        await this.importOrchestrator.assertNotBlocked([plan]);
+        await this.importOrchestrator.assertNotBlocked([plan], { apiKeyScopes: request.apiKeyScopes });
         const content = await this.importOrchestrator.apply(plan);
         const published = await this.workflowPublisher.applyToPackage({
             user: request.user,

package/dist/modules/n8n-packages/engine/workflow-package-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflow-package-importer.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/workflow-package-importer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workflow-package-importer.js","sourceRoot":"","sources":["../../../../src/modules/n8n-packages/engine/workflow-package-importer.ts"],"names":[],"mappings":"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"}

package/dist/modules/n8n-packages/entities/project/project-conflict-policy.d.ts

@@ -0,0 +1,7 @@
+import type { ProjectPlannedAction } from './project-import.types';
+import type { ProjectConflictPolicy } from '../../n8n-packages.types';
+export interface MatchedProjectDecision {
+    action: Extract<ProjectPlannedAction, 'update' | 'skip'>;
+    blocked: boolean;
+}
+export declare function decideMatchedProject(policy: ProjectConflictPolicy): MatchedProjectDecision;

package/dist/modules/n8n-packages/entities/project/project-conflict-policy.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decideMatchedProject = decideMatchedProject;
+const PROJECT_CONFLICT_POLICIES = {
+    merge: { action: 'skip', blocked: false },
+    fail: { action: 'skip', blocked: true },
+    overwrite: { action: 'update', blocked: false },
+};
+function decideMatchedProject(policy) {
+    return PROJECT_CONFLICT_POLICIES[policy];
+}
+//# sourceMappingURL=project-conflict-policy.js.map

package/dist/modules/n8n-packages/entities/project/project-conflict-policy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-conflict-policy.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project-conflict-policy.ts"],"names":[],"mappings":";;;AAaA,MAAM,yBAAyB,GAA0D;IACxF,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE;IACzC,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;IACvC,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;CAC/C,CAAC;AAEF,8BAAqC,MAA6B;IACjE,OAAO,yBAAyB,CAAC,MAAM,CAAC,CAAC;AAC1C,CAAC"}

package/dist/modules/n8n-packages/entities/project/project-import.types.d.ts

@@ -1,3 +1,4 @@
+import type { ProjectConflict } from '../../n8n-packages.types';
 import type { SerializedProject } from '../../spec/serialized/project.schema';
 export interface PreparedProject {
     sourceProjectId: string;
@@ -6,12 +7,21 @@ export interface PreparedProject {
     icon?: SerializedProject['icon'];
     customTelemetryTags?: SerializedProject['customTelemetryTags'];
 }
-export type ProjectPlannedAction = 'create' | 'update';
-export interface ProjectPlanItem {
-    action: ProjectPlannedAction;
+export type ProjectPlannedAction = 'create' | 'update' | 'skip';
+export interface ProjectPlanFields {
     sourceProjectId: string;
     name: string;
     description?: string;
     icon?: SerializedProject['icon'];
     customTelemetryTags?: SerializedProject['customTelemetryTags'];
 }
+export type ProjectPlanItem = ({
+    action: 'create' | 'update';
+} & ProjectPlanFields) | ({
+    action: 'skip';
+    existingName: string;
+} & ProjectPlanFields);
+export interface ProjectImportPlan {
+    items: ProjectPlanItem[];
+    conflicts: ProjectConflict[];
+}

package/dist/modules/n8n-packages/entities/project/project-importer.d.ts

@@ -1,13 +1,13 @@
 import { LicenseState } from '@n8n/backend-common';
 import type { User } from '@n8n/db';
 import { ProjectService } from '../../../../services/project.service.ee';
-import type { PreparedProject, ProjectPlanItem } from './project-import.types';
-import type { ImportedProjectSummary } from '../../n8n-packages.types';
+import type { PreparedProject, ProjectImportPlan, ProjectPlanItem } from './project-import.types';
+import type { ImportedProjectSummary, ProjectConflictPolicy } from '../../n8n-packages.types';
 export declare class ProjectImporter {
     private readonly projectService;
     private readonly licenseState;
     constructor(projectService: ProjectService, licenseState: LicenseState);
-    plan(user: User, projects: PreparedProject[]): Promise<ProjectPlanItem[]>;
+    plan(user: User, projects: PreparedProject[], policy: ProjectConflictPolicy): Promise<ProjectImportPlan>;
     apply(user: User, items: ProjectPlanItem[]): Promise<ImportedProjectSummary[]>;
     private assertCanCreateProjects;
 }

package/dist/modules/n8n-packages/entities/project/project-importer.js

@@ -13,15 +13,19 @@ exports.ProjectImporter = void 0;
 const backend_common_1 = require("@n8n/backend-common");
 const di_1 = require("@n8n/di");
 const permissions_1 = require("@n8n/permissions");
+const n8n_workflow_1 = require("n8n-workflow");
 const forbidden_error_1 = require("../../../../errors/response-errors/forbidden.error");
 const project_service_ee_1 = require("../../../../services/project.service.ee");
+const project_conflict_policy_1 = require("./project-conflict-policy");
 let ProjectImporter = class ProjectImporter {
     constructor(projectService, licenseState) {
         this.projectService = projectService;
         this.licenseState = licenseState;
     }
-    async plan(user, projects) {
+    async plan(user, projects, policy) {
         const items = [];
+        const conflicts = [];
+        const decision = (0, project_conflict_policy_1.decideMatchedProject)(policy);
         for (const project of projects) {
             const existing = await this.projectService.findProject(project.sourceProjectId);
             if (existing) {
@@ -34,44 +38,69 @@ let ProjectImporter = class ProjectImporter {
                 if (!authorized) {
                     throw new forbidden_error_1.ForbiddenError(`You do not have permission to update the existing project "${project.name}".`);
                 }
-                items.push({ action: 'update', ...toFields(project) });
+                if (decision.blocked) {
+                    conflicts.push({
+                        kind: 'fail-policy',
+                        sourceProjectId: project.sourceProjectId,
+                        name: project.name,
+                    });
+                    continue;
+                }
+                items.push(decision.action === 'update'
+                    ? { action: 'update', ...toFields(project) }
+                    : { action: 'skip', existingName: existing.name, ...toFields(project) });
             }
             else {
                 this.assertCanCreateProjects(user);
                 items.push({ action: 'create', ...toFields(project) });
             }
         }
-        return items;
+        return { items, conflicts };
     }
     async apply(user, items) {
         const summaries = [];
         for (const item of items) {
-            if (item.action === 'create') {
-                const project = await this.projectService.createTeamProject(user, { name: item.name, icon: item.icon }, {
-                    id: item.sourceProjectId,
-                    description: item.description ?? null,
-                    customTelemetryTags: item.customTelemetryTags,
-                });
-                summaries.push({
-                    sourceProjectId: item.sourceProjectId,
-                    localId: project.id,
-                    name: project.name,
-                    status: 'created',
-                });
-            }
-            else {
-                await this.projectService.updateProject(item.sourceProjectId, {
-                    name: item.name,
-                    icon: item.icon,
-                    description: item.description,
-                    customTelemetryTags: item.customTelemetryTags,
-                });
-                summaries.push({
-                    sourceProjectId: item.sourceProjectId,
-                    localId: item.sourceProjectId,
-                    name: item.name,
-                    status: 'updated',
-                });
+            switch (item.action) {
+                case 'skip':
+                    summaries.push({
+                        sourceProjectId: item.sourceProjectId,
+                        localId: item.sourceProjectId,
+                        name: item.existingName,
+                        status: 'skipped',
+                    });
+                    break;
+                case 'create': {
+                    const project = await this.projectService.createTeamProject(user, { name: item.name, icon: item.icon }, {
+                        id: item.sourceProjectId,
+                        description: item.description ?? null,
+                        customTelemetryTags: item.customTelemetryTags,
+                    });
+                    summaries.push({
+                        sourceProjectId: item.sourceProjectId,
+                        localId: project.id,
+                        name: project.name,
+                        status: 'created',
+                    });
+                    break;
+                }
+                case 'update':
+                    await this.projectService.updateProject(item.sourceProjectId, {
+                        name: item.name,
+                        icon: item.icon,
+                        description: item.description,
+                        customTelemetryTags: item.customTelemetryTags,
+                    });
+                    summaries.push({
+                        sourceProjectId: item.sourceProjectId,
+                        localId: item.sourceProjectId,
+                        name: item.name,
+                        status: 'updated',
+                    });
+                    break;
+                default: {
+                    const unhandled = item;
+                    throw new n8n_workflow_1.UnexpectedError(`Unhandled project import action: ${JSON.stringify(unhandled)}`);
+                }
             }
         }
         return summaries;

package/dist/modules/n8n-packages/entities/project/project-importer.js.map

@@ -1 +1 @@
-{"version":3,"file":"project-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project-importer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"project-importer.js","sourceRoot":"","sources":["../../../../../src/modules/n8n-packages/entities/project/project-importer.ts"],"names":[],"mappings":"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"}