@intrig/plugin-next 0.0.15-29 → 0.0.15-31

package/dist/index.cjs

@@ -3326,38 +3326,10 @@ function serverIndexTemplate(requestProperties, serverExports = [], internalGene
   `;
 }
 
-async function typeTemplate(descriptor) {
-    const { data: { schema, name: typeName }, source } = descriptor;
-    const { imports, zodSchema, tsType } = openApiSchemaToZod(schema);
-    const ts = pluginSdk.typescript(path__namespace.resolve('src', source, 'components', 'schemas', `${typeName}.ts`));
-    const simpleType = (await pluginSdk.jsonLiteral('')`${JSON.stringify(schema)}`).content;
-    const transport = schema.type === 'string' && schema.format === 'binary' ? 'binary' : 'json';
-    var _JSON_stringify;
-    return ts`
-  import { z } from 'zod'
-
-  ${[
-        ...imports
-    ].join('\n')}
-
-  //--- Zod Schemas  ---//
-
-  export const ${typeName}Schema = ${zodSchema}
-
-  //--- Typescript Type  ---//
-
-  export type ${typeName} = ${tsType}
-
-  //--- JSON Schema  ---//
-
-  export const ${typeName}_jsonschema = ${(_JSON_stringify = JSON.stringify(schema)) != null ? _JSON_stringify : "{}"}
-
-  //--- Simple Type  ---//
-  /*[${simpleType}]*/
-  
-  // Transport hint for clients ("binary" => use arraybuffer/blob)
-  export const ${typeName}_transport = '${transport}' as const;
-  `;
+// Helper to escape string values for use in generated code
+function escapeStringValue(value) {
+    return value.replace(/\\/g, '\\\\') // Escape backslashes first
+    .replace(/'/g, "\\'"); // Escape single quotes
 }
 function isRef(schema) {
     return '$ref' in (schema != null ? schema : {});
@@ -3412,8 +3384,8 @@ function handleStringSchema(schema) {
     const imports = new Set();
     let binaryish = false;
     if (schema.enum) {
-        const enumValues = schema.enum.map((value)=>`'${value}'`).join(' | ');
-        const zodEnum = `z.enum([${schema.enum.map((value)=>`'${value}'`).join(', ')}])`;
+        const enumValues = schema.enum.map((value)=>`'${escapeStringValue(String(value))}'`).join(' | ');
+        const zodEnum = `z.enum([${schema.enum.map((value)=>`'${escapeStringValue(String(value))}'`).join(', ')}])`;
         return {
             tsType: enumValues,
             zodSchema: zodEnum,
@@ -3435,7 +3407,7 @@ function handleStringSchema(schema) {
     } else if (schema.format === 'time') {
         zodSchema = 'z.string()';
         if (schema.pattern) {
-            zodSchema += `.regex(new RegExp('${schema.pattern}'))`;
+            zodSchema += `.regex(new RegExp('${escapeStringValue(schema.pattern)}'))`;
         }
     } else if (schema.format === 'date-time' && !schema.pattern) {
         tsType = 'Date';
@@ -3450,12 +3422,30 @@ function handleStringSchema(schema) {
     } else if (schema.format === 'binary') {
         tsType = 'BinaryData';
         zodSchema = 'BinaryDataSchema';
-        imports.add(`import { BinaryData, BinaryDataSchema } from '@intrig/react/type-utils'`);
+        // Apply file size constraints using refinements
+        if (schema.minLength !== undefined) {
+            zodSchema += `.refine((blob) => blob.size >= ${schema.minLength}, { message: 'File size must be at least ${schema.minLength} bytes' })`;
+        }
+        if (schema.maxLength !== undefined) {
+            zodSchema += `.refine((blob) => blob.size <= ${schema.maxLength}, { message: 'File size must not exceed ${schema.maxLength} bytes' })`;
+        }
+        imports.add(`import { BinaryData, BinaryDataSchema } from '@intrig/next/type-utils'`);
         binaryish = true;
     } else if (schema.format === 'byte') {
         tsType = 'Uint8Array';
         zodSchema = 'z.string().transform((val) => base64ToUint8Array(val))';
-        imports.add(`import { base64ToUint8Array } from '@intrig/react/type-utils'`);
+        // Note: For byte (base64), length constraints apply to the decoded data
+        // We can't easily validate before transform, so we validate after
+        if (schema.minLength !== undefined || schema.maxLength !== undefined) {
+            zodSchema = `(${zodSchema})`;
+            if (schema.minLength !== undefined) {
+                zodSchema += `.refine((arr) => arr.length >= ${schema.minLength}, { message: 'Data size must be at least ${schema.minLength} bytes' })`;
+            }
+            if (schema.maxLength !== undefined) {
+                zodSchema += `.refine((arr) => arr.length <= ${schema.maxLength}, { message: 'Data size must not exceed ${schema.maxLength} bytes' })`;
+            }
+        }
+        imports.add(`import { base64ToUint8Array } from '@intrig/next/type-utils'`);
         binaryish = true;
     } else if (schema.format === 'email') {
         zodSchema = 'z.string().email()';
@@ -3472,7 +3462,7 @@ function handleStringSchema(schema) {
     } else {
         if (schema.minLength !== undefined) zodSchema += `.min(${schema.minLength})`;
         if (schema.maxLength !== undefined) zodSchema += `.max(${schema.maxLength})`;
-        if (schema.pattern !== undefined) zodSchema += `.regex(new RegExp('${schema.pattern}'))`;
+        if (schema.pattern !== undefined) zodSchema += `.regex(new RegExp('${escapeStringValue(schema.pattern)}'))`;
     }
     return {
         tsType,
@@ -3483,8 +3473,11 @@ function handleStringSchema(schema) {
 }
 function handleNumberSchema(schema) {
     let zodSchema = 'z.number()';
-    if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
-    if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
+    // Handle exclusive bounds (OpenAPI 3.1 style - exclusiveMinimum/Maximum are numbers)
+    if (schema.exclusiveMinimum !== undefined) zodSchema += `.gt(${schema.exclusiveMinimum})`;
+    else if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
+    if (schema.exclusiveMaximum !== undefined) zodSchema += `.lt(${schema.exclusiveMaximum})`;
+    else if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
     return {
         tsType: 'number',
         zodSchema,
@@ -3493,8 +3486,11 @@ function handleNumberSchema(schema) {
 }
 function handleIntegerSchema(schema) {
     let zodSchema = 'z.number().int()';
-    if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
-    if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
+    // Handle exclusive bounds (OpenAPI 3.1 style - exclusiveMinimum/Maximum are numbers)
+    if (schema.exclusiveMinimum !== undefined) zodSchema += `.gt(${schema.exclusiveMinimum})`;
+    else if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
+    if (schema.exclusiveMaximum !== undefined) zodSchema += `.lt(${schema.exclusiveMaximum})`;
+    else if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
     return {
         tsType: 'number',
         zodSchema,
@@ -3514,9 +3510,11 @@ function handleArraySchema(schema, imports) {
         throw new Error('Array schema must have an items property');
     }
     const { tsType, zodSchema: itemZodSchema, imports: itemImports, binaryish } = openApiSchemaToZod(schema.items, imports);
-    let zodSchema = binaryish ? `z.array(${itemZodSchema})` : `(z.preprocess((raw) => (Array.isArray(raw) ? raw : [raw]), z.array(${itemZodSchema})) as z.ZodType<${tsType}[], z.ZodTypeDef, ${tsType}[]>)`;
-    if (schema.minItems !== undefined) zodSchema += `.min(${schema.minItems})`;
-    if (schema.maxItems !== undefined) zodSchema += `.max(${schema.maxItems})`;
+    // Build the array schema with constraints
+    let arraySchema = `z.array(${itemZodSchema})`;
+    if (schema.minItems !== undefined) arraySchema += `.min(${schema.minItems})`;
+    if (schema.maxItems !== undefined) arraySchema += `.max(${schema.maxItems})`;
+    const zodSchema = binaryish ? arraySchema : `(z.preprocess((raw) => (Array.isArray(raw) ? raw : [raw]), ${arraySchema}) as z.ZodType<(${tsType})[], z.ZodTypeDef, (${tsType})[]>)`;
     return {
         tsType: `(${tsType})[]`,
         zodSchema,
@@ -3587,21 +3585,26 @@ function handleComplexSchema(schema, imports) {
         const options = schema.allOf.map((subSchema)=>openApiSchemaToZod(subSchema));
         const zodSchemas = options.map((option)=>option.zodSchema);
         const tsTypes = options.map((option)=>option.tsType);
-        if (zodSchemas.length === 1) return {
-            tsType: tsTypes.join(' & '),
-            zodSchema: zodSchemas[0],
-            imports: new Set([
-                ...imports,
-                ...options.flatMap((option)=>Array.from(option.imports))
-            ])
-        };
+        const allImports = new Set([
+            ...imports,
+            ...options.flatMap((option)=>Array.from(option.imports))
+        ]);
+        if (zodSchemas.length === 1) {
+            return {
+                tsType: tsTypes[0],
+                zodSchema: zodSchemas[0],
+                imports: allImports
+            };
+        }
+        // Use .and() chaining instead of z.intersection() which only takes 2 arguments
+        const combinedZodSchema = zodSchemas.reduce((acc, schema, index)=>{
+            if (index === 0) return schema;
+            return `${acc}.and(${schema})`;
+        });
         return {
             tsType: tsTypes.join(' & '),
-            zodSchema: `z.intersection(${zodSchemas.join(', ')})`,
-            imports: new Set([
-                ...imports,
-                ...options.flatMap((option)=>Array.from(option.imports))
-            ])
+            zodSchema: combinedZodSchema,
+            imports: allImports
         };
     }
     return {
@@ -3611,6 +3614,40 @@ function handleComplexSchema(schema, imports) {
     };
 }
 
+async function typeTemplate(descriptor) {
+    const { data: { schema, name: typeName }, source } = descriptor;
+    const { imports, zodSchema, tsType } = openApiSchemaToZod(schema);
+    const ts = pluginSdk.typescript(path__namespace.resolve('src', source, 'components', 'schemas', `${typeName}.ts`));
+    const simpleType = (await pluginSdk.jsonLiteral('')`${JSON.stringify(schema)}`).content;
+    const transport = schema.type === 'string' && schema.format === 'binary' ? 'binary' : 'json';
+    var _JSON_stringify;
+    return ts`
+  import { z } from 'zod'
+
+  ${[
+        ...imports
+    ].join('\n')}
+
+  //--- Zod Schemas  ---//
+
+  export const ${typeName}Schema = ${zodSchema}
+
+  //--- Typescript Type  ---//
+
+  export type ${typeName} = ${tsType}
+
+  //--- JSON Schema  ---//
+
+  export const ${typeName}_jsonschema = ${(_JSON_stringify = JSON.stringify(schema)) != null ? _JSON_stringify : "{}"}
+
+  //--- Simple Type  ---//
+  /*[${simpleType}]*/
+
+  // Transport hint for clients ("binary" => use arraybuffer/blob)
+  export const ${typeName}_transport = '${transport}' as const;
+  `;
+}
+
 function serverFunctionDocs(descriptor) {
     const md = pluginSdk.mdLiteral('server-function.md');
     var _descriptor_data_variables;

package/dist/index.js

@@ -3300,38 +3300,10 @@ function serverIndexTemplate(requestProperties, serverExports = [], internalGene
   `;
 }
 
-async function typeTemplate(descriptor) {
-    const { data: { schema, name: typeName }, source } = descriptor;
-    const { imports, zodSchema, tsType } = openApiSchemaToZod(schema);
-    const ts = typescript(path.resolve('src', source, 'components', 'schemas', `${typeName}.ts`));
-    const simpleType = (await jsonLiteral('')`${JSON.stringify(schema)}`).content;
-    const transport = schema.type === 'string' && schema.format === 'binary' ? 'binary' : 'json';
-    var _JSON_stringify;
-    return ts`
-  import { z } from 'zod'
-
-  ${[
-        ...imports
-    ].join('\n')}
-
-  //--- Zod Schemas  ---//
-
-  export const ${typeName}Schema = ${zodSchema}
-
-  //--- Typescript Type  ---//
-
-  export type ${typeName} = ${tsType}
-
-  //--- JSON Schema  ---//
-
-  export const ${typeName}_jsonschema = ${(_JSON_stringify = JSON.stringify(schema)) != null ? _JSON_stringify : "{}"}
-
-  //--- Simple Type  ---//
-  /*[${simpleType}]*/
-  
-  // Transport hint for clients ("binary" => use arraybuffer/blob)
-  export const ${typeName}_transport = '${transport}' as const;
-  `;
+// Helper to escape string values for use in generated code
+function escapeStringValue(value) {
+    return value.replace(/\\/g, '\\\\') // Escape backslashes first
+    .replace(/'/g, "\\'"); // Escape single quotes
 }
 function isRef(schema) {
     return '$ref' in (schema != null ? schema : {});
@@ -3386,8 +3358,8 @@ function handleStringSchema(schema) {
     const imports = new Set();
     let binaryish = false;
     if (schema.enum) {
-        const enumValues = schema.enum.map((value)=>`'${value}'`).join(' | ');
-        const zodEnum = `z.enum([${schema.enum.map((value)=>`'${value}'`).join(', ')}])`;
+        const enumValues = schema.enum.map((value)=>`'${escapeStringValue(String(value))}'`).join(' | ');
+        const zodEnum = `z.enum([${schema.enum.map((value)=>`'${escapeStringValue(String(value))}'`).join(', ')}])`;
         return {
             tsType: enumValues,
             zodSchema: zodEnum,
@@ -3409,7 +3381,7 @@ function handleStringSchema(schema) {
     } else if (schema.format === 'time') {
         zodSchema = 'z.string()';
         if (schema.pattern) {
-            zodSchema += `.regex(new RegExp('${schema.pattern}'))`;
+            zodSchema += `.regex(new RegExp('${escapeStringValue(schema.pattern)}'))`;
         }
     } else if (schema.format === 'date-time' && !schema.pattern) {
         tsType = 'Date';
@@ -3424,12 +3396,30 @@ function handleStringSchema(schema) {
     } else if (schema.format === 'binary') {
         tsType = 'BinaryData';
         zodSchema = 'BinaryDataSchema';
-        imports.add(`import { BinaryData, BinaryDataSchema } from '@intrig/react/type-utils'`);
+        // Apply file size constraints using refinements
+        if (schema.minLength !== undefined) {
+            zodSchema += `.refine((blob) => blob.size >= ${schema.minLength}, { message: 'File size must be at least ${schema.minLength} bytes' })`;
+        }
+        if (schema.maxLength !== undefined) {
+            zodSchema += `.refine((blob) => blob.size <= ${schema.maxLength}, { message: 'File size must not exceed ${schema.maxLength} bytes' })`;
+        }
+        imports.add(`import { BinaryData, BinaryDataSchema } from '@intrig/next/type-utils'`);
         binaryish = true;
     } else if (schema.format === 'byte') {
         tsType = 'Uint8Array';
         zodSchema = 'z.string().transform((val) => base64ToUint8Array(val))';
-        imports.add(`import { base64ToUint8Array } from '@intrig/react/type-utils'`);
+        // Note: For byte (base64), length constraints apply to the decoded data
+        // We can't easily validate before transform, so we validate after
+        if (schema.minLength !== undefined || schema.maxLength !== undefined) {
+            zodSchema = `(${zodSchema})`;
+            if (schema.minLength !== undefined) {
+                zodSchema += `.refine((arr) => arr.length >= ${schema.minLength}, { message: 'Data size must be at least ${schema.minLength} bytes' })`;
+            }
+            if (schema.maxLength !== undefined) {
+                zodSchema += `.refine((arr) => arr.length <= ${schema.maxLength}, { message: 'Data size must not exceed ${schema.maxLength} bytes' })`;
+            }
+        }
+        imports.add(`import { base64ToUint8Array } from '@intrig/next/type-utils'`);
         binaryish = true;
     } else if (schema.format === 'email') {
         zodSchema = 'z.string().email()';
@@ -3446,7 +3436,7 @@ function handleStringSchema(schema) {
     } else {
         if (schema.minLength !== undefined) zodSchema += `.min(${schema.minLength})`;
         if (schema.maxLength !== undefined) zodSchema += `.max(${schema.maxLength})`;
-        if (schema.pattern !== undefined) zodSchema += `.regex(new RegExp('${schema.pattern}'))`;
+        if (schema.pattern !== undefined) zodSchema += `.regex(new RegExp('${escapeStringValue(schema.pattern)}'))`;
     }
     return {
         tsType,
@@ -3457,8 +3447,11 @@ function handleStringSchema(schema) {
 }
 function handleNumberSchema(schema) {
     let zodSchema = 'z.number()';
-    if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
-    if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
+    // Handle exclusive bounds (OpenAPI 3.1 style - exclusiveMinimum/Maximum are numbers)
+    if (schema.exclusiveMinimum !== undefined) zodSchema += `.gt(${schema.exclusiveMinimum})`;
+    else if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
+    if (schema.exclusiveMaximum !== undefined) zodSchema += `.lt(${schema.exclusiveMaximum})`;
+    else if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
     return {
         tsType: 'number',
         zodSchema,
@@ -3467,8 +3460,11 @@ function handleNumberSchema(schema) {
 }
 function handleIntegerSchema(schema) {
     let zodSchema = 'z.number().int()';
-    if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
-    if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
+    // Handle exclusive bounds (OpenAPI 3.1 style - exclusiveMinimum/Maximum are numbers)
+    if (schema.exclusiveMinimum !== undefined) zodSchema += `.gt(${schema.exclusiveMinimum})`;
+    else if (schema.minimum !== undefined) zodSchema += `.min(${schema.minimum})`;
+    if (schema.exclusiveMaximum !== undefined) zodSchema += `.lt(${schema.exclusiveMaximum})`;
+    else if (schema.maximum !== undefined) zodSchema += `.max(${schema.maximum})`;
     return {
         tsType: 'number',
         zodSchema,
@@ -3488,9 +3484,11 @@ function handleArraySchema(schema, imports) {
         throw new Error('Array schema must have an items property');
     }
     const { tsType, zodSchema: itemZodSchema, imports: itemImports, binaryish } = openApiSchemaToZod(schema.items, imports);
-    let zodSchema = binaryish ? `z.array(${itemZodSchema})` : `(z.preprocess((raw) => (Array.isArray(raw) ? raw : [raw]), z.array(${itemZodSchema})) as z.ZodType<${tsType}[], z.ZodTypeDef, ${tsType}[]>)`;
-    if (schema.minItems !== undefined) zodSchema += `.min(${schema.minItems})`;
-    if (schema.maxItems !== undefined) zodSchema += `.max(${schema.maxItems})`;
+    // Build the array schema with constraints
+    let arraySchema = `z.array(${itemZodSchema})`;
+    if (schema.minItems !== undefined) arraySchema += `.min(${schema.minItems})`;
+    if (schema.maxItems !== undefined) arraySchema += `.max(${schema.maxItems})`;
+    const zodSchema = binaryish ? arraySchema : `(z.preprocess((raw) => (Array.isArray(raw) ? raw : [raw]), ${arraySchema}) as z.ZodType<(${tsType})[], z.ZodTypeDef, (${tsType})[]>)`;
     return {
         tsType: `(${tsType})[]`,
         zodSchema,
@@ -3561,21 +3559,26 @@ function handleComplexSchema(schema, imports) {
         const options = schema.allOf.map((subSchema)=>openApiSchemaToZod(subSchema));
         const zodSchemas = options.map((option)=>option.zodSchema);
         const tsTypes = options.map((option)=>option.tsType);
-        if (zodSchemas.length === 1) return {
-            tsType: tsTypes.join(' & '),
-            zodSchema: zodSchemas[0],
-            imports: new Set([
-                ...imports,
-                ...options.flatMap((option)=>Array.from(option.imports))
-            ])
-        };
+        const allImports = new Set([
+            ...imports,
+            ...options.flatMap((option)=>Array.from(option.imports))
+        ]);
+        if (zodSchemas.length === 1) {
+            return {
+                tsType: tsTypes[0],
+                zodSchema: zodSchemas[0],
+                imports: allImports
+            };
+        }
+        // Use .and() chaining instead of z.intersection() which only takes 2 arguments
+        const combinedZodSchema = zodSchemas.reduce((acc, schema, index)=>{
+            if (index === 0) return schema;
+            return `${acc}.and(${schema})`;
+        });
         return {
             tsType: tsTypes.join(' & '),
-            zodSchema: `z.intersection(${zodSchemas.join(', ')})`,
-            imports: new Set([
-                ...imports,
-                ...options.flatMap((option)=>Array.from(option.imports))
-            ])
+            zodSchema: combinedZodSchema,
+            imports: allImports
         };
     }
     return {
@@ -3585,6 +3588,40 @@ function handleComplexSchema(schema, imports) {
     };
 }
 
+async function typeTemplate(descriptor) {
+    const { data: { schema, name: typeName }, source } = descriptor;
+    const { imports, zodSchema, tsType } = openApiSchemaToZod(schema);
+    const ts = typescript(path.resolve('src', source, 'components', 'schemas', `${typeName}.ts`));
+    const simpleType = (await jsonLiteral('')`${JSON.stringify(schema)}`).content;
+    const transport = schema.type === 'string' && schema.format === 'binary' ? 'binary' : 'json';
+    var _JSON_stringify;
+    return ts`
+  import { z } from 'zod'
+
+  ${[
+        ...imports
+    ].join('\n')}
+
+  //--- Zod Schemas  ---//
+
+  export const ${typeName}Schema = ${zodSchema}
+
+  //--- Typescript Type  ---//
+
+  export type ${typeName} = ${tsType}
+
+  //--- JSON Schema  ---//
+
+  export const ${typeName}_jsonschema = ${(_JSON_stringify = JSON.stringify(schema)) != null ? _JSON_stringify : "{}"}
+
+  //--- Simple Type  ---//
+  /*[${simpleType}]*/
+
+  // Transport hint for clients ("binary" => use arraybuffer/blob)
+  export const ${typeName}_transport = '${transport}' as const;
+  `;
+}
+
 function serverFunctionDocs(descriptor) {
     const md = mdLiteral('server-function.md');
     var _descriptor_data_variables;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intrig/plugin-next",
-  "version": "0.0.15-29",
+  "version": "0.0.15-31",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -15,7 +15,7 @@
     }
   },
   "dependencies": {
-    "@intrig/plugin-sdk": "^0.0.15-29",
+    "@intrig/plugin-sdk": "^0.0.15-31",
     "@swc/helpers": "~0.5.11",
     "fs-extra": "^11.2.0"
   },