@n8n/workflow-sdk 0.13.1 → 0.14.1

package/dist/generate-types/generate-zod-schemas.js

@@ -7,11 +7,7 @@ exports.generateSchemaPropertyLine = generateSchemaPropertyLine;
 exports.stripDiscriminatorKeysFromDisplayOptions = stripDiscriminatorKeysFromDisplayOptions;
 exports.mergeDisplayOptions = mergeDisplayOptions;
 exports.mergePropertiesByName = mergePropertiesByName;
-exports.hasMultiVariantEntries = hasMultiVariantEntries;
-exports.needsResolveOneOfSchemas = needsResolveOneOfSchemas;
 exports.generateConditionalSchemaLine = generateConditionalSchemaLine;
-exports.generateOneOfSchemaLine = generateOneOfSchemaLine;
-exports.generateParameterEntryLine = generateParameterEntryLine;
 exports.generateSubnodeConfigSchemaCode = generateSubnodeConfigSchemaCode;
 exports.getSubnodeSchemaImports = getSubnodeSchemaImports;
 exports.generateSingleVersionSchemaFile = generateSingleVersionSchemaFile;
@@ -26,6 +22,9 @@ const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
 function isCustomApiCall(operation) {
     return operation === CUSTOM_API_CALL_KEY;
 }
+const DISPLAY_ONLY_PROPERTY_TYPES = new Set(['notice', 'curlImport', 'credentials', 'callout']);
+const ICON_ZOD_SCHEMA = "z.object({ type: z.union([z.literal('icon'), z.literal('emoji')]), value: z.string() })";
+const WORKFLOW_SELECTOR_ZOD_SCHEMA = "z.union([z.object({ __rl: z.literal(true), mode: z.union([z.literal('list'), z.literal('id')]), value: z.union([z.string(), z.number()]), cachedResultName: z.string().optional(), cachedResultUrl: z.string().optional() }), expressionSchema])";
 const GENERIC_AUTH_TYPE_VALUES = [
     'httpBasicAuth',
     'httpBearerAuth',
@@ -36,9 +35,6 @@ const GENERIC_AUTH_TYPE_VALUES = [
     'oAuth1Api',
     'oAuth2Api',
 ];
-const DISPLAY_ONLY_PROPERTY_TYPES = new Set(['notice', 'curlImport', 'credentials', 'callout']);
-const ICON_ZOD_SCHEMA = "z.object({ type: z.union([z.literal('icon'), z.literal('emoji')]), value: z.string() })";
-const WORKFLOW_SELECTOR_ZOD_SCHEMA = "z.union([z.object({ __rl: z.literal(true), mode: z.union([z.literal('list'), z.literal('id')]), value: z.union([z.string(), z.number()]), cachedResultName: z.string().optional(), cachedResultUrl: z.string().optional() }), expressionSchema])";
 const RESERVED_WORDS = new Set([
     'break',
     'case',
@@ -252,14 +248,26 @@ function generateResourceLocatorZodSchema(prop) {
     }
     return 'resourceLocatorValueSchema';
 }
+function primitiveElement(base, allowExpression) {
+    if (base === 'string')
+        return allowExpression ? 'stringOrExpression' : 'z.string()';
+    if (base === 'number')
+        return allowExpression ? 'numberOrExpression' : 'z.number()';
+    return allowExpression ? 'booleanOrExpression' : 'z.boolean()';
+}
+function wrapMultipleValues(elementSchema, isMultipleValues, _allowExpression) {
+    if (!isMultipleValues)
+        return elementSchema;
+    return `z.array(${elementSchema})`;
+}
+function literalUnion(literals, allowExpression) {
+    const parts = allowExpression ? [...literals, 'expressionSchema'] : literals;
+    return `z.union([${parts.join(', ')}])`;
+}
 function mapNestedPropertyToZodSchema(prop) {
-    const result = mapNestedPropertyToZodSchemaInner(prop);
-    const expressionAwareResult = prop.noDataExpression
-        ? stripExpressionFromZodSchema(result)
-        : result;
-    return wrapMultipleValuesZodSchema(prop, expressionAwareResult);
+    return mapNestedPropertyToZodSchemaInner(prop, !prop.noDataExpression);
 }
-function mapNestedPropertyToZodSchemaInner(prop) {
+function mapNestedPropertyToZodSchemaInner(prop, allowExpression) {
     if (DISPLAY_ONLY_PROPERTY_TYPES.has(prop.type)) {
         return '';
     }
@@ -269,42 +277,41 @@ function mapNestedPropertyToZodSchemaInner(prop) {
     if (prop.type === 'resourceMapper') {
         return 'resourceMapperValueSchema';
     }
+    const isMultipleValues = prop.typeOptions?.multipleValues === true;
     if (prop.typeOptions?.loadOptionsMethod || prop.typeOptions?.loadOptionsDependsOn) {
         if (prop.type === 'multiOptions') {
             return 'z.array(z.string())';
         }
-        return 'stringOrExpression';
+        return wrapMultipleValues(primitiveElement('string', allowExpression), isMultipleValues, allowExpression);
     }
     switch (prop.type) {
         case 'string':
         case 'dateTime':
         case 'color':
         case 'credentialsSelect':
-            return 'stringOrExpression';
+            return wrapMultipleValues(primitiveElement('string', allowExpression), isMultipleValues, allowExpression);
         case 'number':
-            return 'numberOrExpression';
+            return wrapMultipleValues(primitiveElement('number', allowExpression), isMultipleValues, allowExpression);
         case 'boolean':
-            return 'booleanOrExpression';
-        case 'options':
-            if (prop.options && prop.options.length > 0) {
-                const literals = prop.options
-                    .filter((opt) => opt.value !== undefined)
-                    .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
-                if (literals.length > 0) {
-                    return `z.union([${literals.join(', ')}, expressionSchema])`;
-                }
-            }
-            return 'stringOrExpression';
-        case 'multiOptions':
-            if (prop.options && prop.options.length > 0) {
-                const literals = prop.options
-                    .filter((opt) => opt.value !== undefined)
-                    .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
-                if (literals.length > 0) {
-                    return `z.array(z.union([${literals.join(', ')}]))`;
-                }
+            return primitiveElement('boolean', allowExpression);
+        case 'options': {
+            const literals = (prop.options ?? [])
+                .filter((opt) => opt.value !== undefined)
+                .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
+            const elementSchema = literals.length > 0
+                ? literalUnion(literals, allowExpression)
+                : primitiveElement('string', allowExpression);
+            return wrapMultipleValues(elementSchema, isMultipleValues, allowExpression);
+        }
+        case 'multiOptions': {
+            const literals = (prop.options ?? [])
+                .filter((opt) => opt.value !== undefined)
+                .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
+            if (literals.length > 0) {
+                return `z.array(z.union([${literals.join(', ')}]))`;
             }
             return 'z.array(z.string())';
+        }
         case 'json':
             return 'z.union([iDataObjectSchema, z.string()])';
         case 'filter':
@@ -316,7 +323,7 @@ function mapNestedPropertyToZodSchemaInner(prop) {
         case 'collection':
             return generateCollectionZodSchema(prop);
         case 'button':
-            return 'stringOrExpression';
+            return primitiveElement('string', allowExpression);
         case 'icon':
             return ICON_ZOD_SCHEMA;
         case 'workflowSelector':
@@ -402,20 +409,8 @@ function generateCollectionZodSchema(prop) {
     return `z.object({ ${nestedProps.join(', ')} })`;
 }
 function mapPropertyToZodSchema(prop) {
-    const result = mapPropertyToZodSchemaInner(prop);
-    const expressionAwareResult = prop.noDataExpression
-        ? stripExpressionFromZodSchema(result)
-        : result;
-    return wrapMultipleValuesZodSchema(prop, expressionAwareResult);
-}
-function stripExpressionFromZodSchema(schema) {
-    if (schema === 'stringOrExpression')
-        return 'z.string()';
-    if (schema === 'numberOrExpression')
-        return 'z.number()';
-    if (schema === 'booleanOrExpression')
-        return 'z.boolean()';
-    return schema.replace(/,\s*expressionSchema/g, '');
+    const result = mapPropertyToZodSchemaInner(prop, !prop.noDataExpression);
+    return wrapMultipleValuesZodSchema(prop, result);
 }
 function wrapMultipleValuesZodSchema(prop, schema) {
     if (!schema || prop.type === 'fixedCollection' || prop.type === 'multiOptions') {
@@ -423,10 +418,13 @@ function wrapMultipleValuesZodSchema(prop, schema) {
     }
     return prop.typeOptions?.multipleValues === true ? `z.array(${schema})` : schema;
 }
-function mapPropertyToZodSchemaInner(prop) {
+function mapPropertyToZodSchemaInner(prop, allowExpression) {
+    if (DISPLAY_ONLY_PROPERTY_TYPES.has(prop.type)) {
+        return '';
+    }
     if (prop.type === 'credentialsSelect' && prop.name === 'genericAuthType') {
         const literals = GENERIC_AUTH_TYPE_VALUES.map((v) => `z.literal('${v}')`);
-        return `z.union([${literals.join(', ')}, expressionSchema])`;
+        return literalUnion(literals, allowExpression);
     }
     if (prop.type === 'resourceLocator') {
         return generateResourceLocatorZodSchema(prop);
@@ -435,42 +433,37 @@ function mapPropertyToZodSchemaInner(prop) {
         return 'resourceMapperValueSchema';
     }
     if (prop.typeOptions?.loadOptionsMethod || prop.typeOptions?.loadOptionsDependsOn) {
-        switch (prop.type) {
-            case 'options':
-                return 'stringOrExpression';
-            case 'multiOptions':
-                return 'z.array(z.string())';
-            default:
-                return 'stringOrExpression';
-        }
+        if (prop.type === 'multiOptions')
+            return 'z.array(z.string())';
+        return primitiveElement('string', allowExpression);
     }
     switch (prop.type) {
         case 'string':
-            return 'stringOrExpression';
+        case 'dateTime':
+        case 'color':
+        case 'credentialsSelect':
+            return primitiveElement('string', allowExpression);
         case 'number':
-            return 'numberOrExpression';
+            return primitiveElement('number', allowExpression);
         case 'boolean':
-            return 'booleanOrExpression';
-        case 'options':
-            if (prop.options && prop.options.length > 0) {
-                const literals = prop.options
-                    .filter((opt) => opt.value !== undefined)
-                    .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
-                if (literals.length > 0) {
-                    return `z.union([${literals.join(', ')}, expressionSchema])`;
-                }
-            }
-            return 'stringOrExpression';
-        case 'multiOptions':
-            if (prop.options && prop.options.length > 0) {
-                const literals = prop.options
-                    .filter((opt) => opt.value !== undefined)
-                    .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
-                if (literals.length > 0) {
-                    return `z.array(z.union([${literals.join(', ')}]))`;
-                }
+            return primitiveElement('boolean', allowExpression);
+        case 'options': {
+            const literals = (prop.options ?? [])
+                .filter((opt) => opt.value !== undefined)
+                .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
+            return literals.length > 0
+                ? literalUnion(literals, allowExpression)
+                : primitiveElement('string', allowExpression);
+        }
+        case 'multiOptions': {
+            const literals = (prop.options ?? [])
+                .filter((opt) => opt.value !== undefined)
+                .map((opt) => `z.literal(${formatZodLiteral(opt.value)})`);
+            if (literals.length > 0) {
+                return `z.array(z.union([${literals.join(', ')}]))`;
             }
             return 'z.array(z.string())';
+        }
         case 'json':
             return 'z.union([iDataObjectSchema, z.string()])';
         case 'filter':
@@ -481,9 +474,12 @@ function mapPropertyToZodSchemaInner(prop) {
             return generateFixedCollectionZodSchema(prop);
         case 'collection':
             return generateCollectionZodSchema(prop);
-        case 'dateTime':
-        case 'color':
-            return 'stringOrExpression';
+        case 'button':
+            return primitiveElement('string', allowExpression);
+        case 'icon':
+            return ICON_ZOD_SCHEMA;
+        case 'workflowSelector':
+            return WORKFLOW_SELECTOR_ZOD_SCHEMA;
         case 'hidden':
             return 'z.unknown()';
         case 'notice':
@@ -491,14 +487,6 @@ function mapPropertyToZodSchemaInner(prop) {
         case 'credentials':
         case 'callout':
             return '';
-        case 'button':
-            return 'stringOrExpression';
-        case 'icon':
-            return ICON_ZOD_SCHEMA;
-        case 'workflowSelector':
-            return WORKFLOW_SELECTOR_ZOD_SCHEMA;
-        case 'credentialsSelect':
-            return 'stringOrExpression';
         default:
             return 'z.unknown()';
     }
@@ -573,72 +561,38 @@ function mergeDisplayOptions(existing, incoming) {
     }
     return merged;
 }
-function isSameDisplayOptions(a, b) {
-    return JSON.stringify(a ?? null) === JSON.stringify(b ?? null);
-}
 function mergePropertiesByName(properties) {
-    const variantsByName = new Map();
+    const propsByName = new Map();
     for (const prop of properties) {
         if (DISPLAY_ONLY_PROPERTY_TYPES.has(prop.type)) {
             continue;
         }
-        const { displayOptions: narrowedDisplayOptions, fullyDisabled } = (0, generate_types_1.narrowDisplayOptionsByDisabled)(prop);
-        if (fullyDisabled) {
-            continue;
-        }
-        const normalizedProp = { ...prop, displayOptions: narrowedDisplayOptions };
-        const existingVariants = variantsByName.get(normalizedProp.name);
-        if (!existingVariants) {
-            variantsByName.set(normalizedProp.name, [
-                {
-                    ...normalizedProp,
-                    options: normalizedProp.options ? [...normalizedProp.options] : undefined,
-                },
-            ]);
-            continue;
-        }
-        const trueDuplicate = existingVariants.find((v) => isSameDisplayOptions(v.displayOptions, normalizedProp.displayOptions));
-        if (trueDuplicate) {
-            if ((normalizedProp.type === 'collection' || normalizedProp.type === 'fixedCollection') &&
-                normalizedProp.options &&
-                trueDuplicate.options) {
-                const existingOptionNames = new Set(trueDuplicate.options.map((o) => o.name));
-                for (const opt of normalizedProp.options) {
+        const existing = propsByName.get(prop.name);
+        if (existing) {
+            if (prop.displayOptions && existing.displayOptions) {
+                existing.displayOptions = mergeDisplayOptions(existing.displayOptions, prop.displayOptions);
+            }
+            else if (prop.displayOptions && !existing.displayOptions) {
+            }
+            if ((prop.type === 'collection' || prop.type === 'fixedCollection') &&
+                prop.options &&
+                existing.options) {
+                const existingOptionNames = new Set(existing.options.map((o) => o.name));
+                for (const opt of prop.options) {
                     if (!existingOptionNames.has(opt.name)) {
-                        trueDuplicate.options.push(opt);
+                        existing.options.push(opt);
                     }
                 }
             }
         }
         else {
-            existingVariants.push({
-                ...normalizedProp,
-                options: normalizedProp.options ? [...normalizedProp.options] : undefined,
+            propsByName.set(prop.name, {
+                ...prop,
+                options: prop.options ? [...prop.options] : undefined,
             });
         }
     }
-    return variantsByName;
-}
-function hasMultiVariantEntries(variantsByName) {
-    for (const variants of variantsByName.values()) {
-        if (variants.length > 1)
-            return true;
-    }
-    return false;
-}
-function needsResolveOneOfSchemas(variantsByName, discriminatorKeys) {
-    for (const variants of variantsByName.values()) {
-        if (variants.length < 2)
-            continue;
-        const allRemainConditional = variants.every((v) => {
-            if (!v.displayOptions)
-                return false;
-            return (stripDiscriminatorKeysFromDisplayOptions(v.displayOptions, discriminatorKeys) !== undefined);
-        });
-        if (allRemainConditional)
-            return true;
-    }
-    return false;
+    return propsByName;
 }
 function generateConditionalSchemaLine(prop, allProperties = []) {
     const zodSchema = mapPropertyToZodSchema(prop);
@@ -654,49 +608,6 @@ function generateConditionalSchemaLine(prop, allProperties = []) {
     const defaultsStr = Object.keys(defaults).length > 0 ? `, defaults: ${JSON.stringify(defaults)}` : '';
     return `${INDENT}${propName}: resolveSchema({ parameters, schema: ${zodSchema}, required: ${required}, displayOptions: ${displayOptionsStr}${defaultsStr} }),`;
 }
-function generateOneOfSchemaLine(variants, allProperties = []) {
-    if (variants.length === 0)
-        return '';
-    const propName = quotePropertyName(variants[0].name);
-    const variantSpecs = [];
-    for (const variant of variants) {
-        const zodSchema = mapPropertyToZodSchema(variant);
-        if (!zodSchema) {
-            return '';
-        }
-        const required = !isPropertyOptional(variant);
-        const displayOptionsStr = JSON.stringify(variant.displayOptions ?? {});
-        const defaults = variant.displayOptions
-            ? extractDefaultsForDisplayOptions(variant.displayOptions, allProperties)
-            : {};
-        const defaultsStr = Object.keys(defaults).length > 0 ? `, defaults: ${JSON.stringify(defaults)}` : '';
-        variantSpecs.push(`{ schema: ${zodSchema}, required: ${required}, displayOptions: ${displayOptionsStr}${defaultsStr} }`);
-    }
-    return `${INDENT}${propName}: resolveOneOfSchemas({ parameters, variants: [${variantSpecs.join(', ')}] }),`;
-}
-function generateParameterEntryLine(variants, allFlatProperties, discriminatorKeys) {
-    if (variants.length === 0)
-        return '';
-    const processed = variants.map((variant) => {
-        if (!variant.displayOptions) {
-            return { variant, conditional: false };
-        }
-        const stripped = stripDiscriminatorKeysFromDisplayOptions(variant.displayOptions, discriminatorKeys);
-        if (!stripped) {
-            return { variant: { ...variant, displayOptions: undefined }, conditional: false };
-        }
-        return { variant: { ...variant, displayOptions: stripped }, conditional: true };
-    });
-    const unconditional = processed.find((p) => !p.conditional);
-    if (unconditional) {
-        return generateSchemaPropertyLine(unconditional.variant, isPropertyOptional(unconditional.variant));
-    }
-    const conditionalVariants = processed.map((p) => p.variant);
-    if (conditionalVariants.length === 1) {
-        return generateConditionalSchemaLine(conditionalVariants[0], allFlatProperties);
-    }
-    return generateOneOfSchemaLine(conditionalVariants, allFlatProperties);
-}
 function generateSubnodeConfigSchemaCode(aiInputTypes, schemaName, allProperties) {
     if (aiInputTypes.length === 0) {
         return null;
@@ -777,10 +688,8 @@ function generateSingleVersionSchemaFile(node, specificVersion) {
     const aiInputTypes = (0, generate_types_1.extractAIInputTypesFromBuilderHint)(filteredNode);
     const subnodeSchemaImports = getSubnodeSchemaImports(aiInputTypes);
     const hasAiInputs = aiInputTypes.length > 0;
-    const propsByName = mergePropertiesByName(filteredProperties);
     const needsResolveSchema = hasDisplayOptions(filteredProperties) ||
         (hasAiInputs && hasConditionalSubnodeFields(aiInputTypes));
-    const needsResolveOneOf = needsResolveOneOfSchemas(propsByName, ['@version']);
     const lines = [];
     const helpers = [
         'z',
@@ -797,9 +706,6 @@ function generateSingleVersionSchemaFile(node, specificVersion) {
     if (needsResolveSchema) {
         helpers.push('resolveSchema');
     }
-    if (needsResolveOneOf) {
-        helpers.push('resolveOneOfSchemas');
-    }
     for (const schemaImport of subnodeSchemaImports) {
         helpers.push(schemaImport);
     }
@@ -881,11 +787,35 @@ function generateSingleVersionSchemaFile(node, specificVersion) {
     lines.push('');
     lines.push(`${INDENT}// Parameters schema`);
     lines.push(`${INDENT}const parametersSchema = z.object({`);
-    const allFlatProperties = Array.from(propsByName.values()).flat();
-    for (const variants of propsByName.values()) {
-        const propLine = generateParameterEntryLine(variants, allFlatProperties, ['@version']);
-        if (propLine) {
-            lines.push(INDENT + propLine);
+    const propsByName = mergePropertiesByName(filteredProperties);
+    const allPropsArray = Array.from(propsByName.values());
+    for (const prop of allPropsArray) {
+        if (prop.displayOptions) {
+            const strippedDisplayOptions = stripDiscriminatorKeysFromDisplayOptions(prop.displayOptions, [
+                '@version',
+            ]);
+            if (strippedDisplayOptions) {
+                const propWithStripped = {
+                    ...prop,
+                    displayOptions: strippedDisplayOptions,
+                };
+                const propLine = generateConditionalSchemaLine(propWithStripped, allPropsArray);
+                if (propLine) {
+                    lines.push(INDENT + propLine);
+                }
+            }
+            else {
+                const propLine = generateSchemaPropertyLine(prop, isPropertyOptional(prop));
+                if (propLine) {
+                    lines.push(INDENT + propLine);
+                }
+            }
+        }
+        else {
+            const propLine = generateSchemaPropertyLine(prop, isPropertyOptional(prop));
+            if (propLine) {
+                lines.push(INDENT + propLine);
+            }
         }
     }
     lines.push(`${INDENT}});`);
@@ -934,8 +864,6 @@ function generateDiscriminatorSchemaFile(node, version, combo, props, _importDep
         return stripped !== undefined;
     });
     const hasConditionalAiInputs = hasAiInputs && hasConditionalSubnodeFields(aiInputTypes);
-    const propsByName = mergePropertiesByName(props);
-    const needsResolveOneOf = needsResolveOneOfSchemas(propsByName, discriminatorKeys);
     const lines = [];
     const comboDesc = Object.entries(combo)
         .filter(([_, v]) => v !== undefined)
@@ -956,9 +884,6 @@ function generateDiscriminatorSchemaFile(node, version, combo, props, _importDep
     if (hasRemainingDisplayOptions || hasConditionalAiInputs) {
         helpers.push('resolveSchema');
     }
-    if (needsResolveOneOf) {
-        helpers.push('resolveOneOfSchemas');
-    }
     if (hasAiInputs) {
         const subnodeImports = getSubnodeSchemaImports(aiInputTypes);
         for (const schemaImport of subnodeImports) {
@@ -1055,11 +980,33 @@ function generateDiscriminatorSchemaFile(node, version, combo, props, _importDep
             }
         }
     }
-    const allFlatProperties = Array.from(propsByName.values()).flat();
-    for (const variants of propsByName.values()) {
-        const propLine = generateParameterEntryLine(variants, allFlatProperties, discriminatorKeys);
-        if (propLine) {
-            lines.push(INDENT.repeat(2) + propLine);
+    const propsByName = mergePropertiesByName(props);
+    const allPropsArray = Array.from(propsByName.values());
+    for (const prop of allPropsArray) {
+        if (prop.displayOptions) {
+            const strippedDisplayOptions = stripDiscriminatorKeysFromDisplayOptions(prop.displayOptions, discriminatorKeys);
+            if (strippedDisplayOptions) {
+                const propWithStrippedOptions = {
+                    ...prop,
+                    displayOptions: strippedDisplayOptions,
+                };
+                const propLine = generateConditionalSchemaLine(propWithStrippedOptions, allPropsArray);
+                if (propLine) {
+                    lines.push(INDENT.repeat(2) + propLine);
+                }
+            }
+            else {
+                const propLine = generateSchemaPropertyLine(prop, isPropertyOptional(prop));
+                if (propLine) {
+                    lines.push(INDENT.repeat(2) + propLine);
+                }
+            }
+        }
+        else {
+            const propLine = generateSchemaPropertyLine(prop, isPropertyOptional(prop));
+            if (propLine) {
+                lines.push(INDENT.repeat(2) + propLine);
+            }
         }
     }
     lines.push(`${INDENT.repeat(2)}}).optional(),`);