Merge pull request #2275 from hey-api/fix/valibot-array-min-max-length

mrlubos · web-flow · commit 63645d07acd0 · 2025-07-05T05:43:17.000+08:00
fix(valibot): properly handle array minLength and maxLength
diff --git a/.changeset/bright-readers-thank.md b/.changeset/bright-readers-thank.md
@@ -0,0 +1,5 @@
+---
+'@hey-api/openapi-ts': patch
+---
+
+fix(valibot): properly handle array minLength and maxLength
diff --git a/packages/openapi-ts-tests/test/3.0.x.test.ts b/packages/openapi-ts-tests/test/3.0.x.test.ts
@@ -68,8 +68,9 @@ describe(`OpenAPI ${version}`, () => {
     },
     {
       config: createConfig({
-        input: 'array-items-one-of-length-1.json',
+        input: 'array-items-one-of-length-1.yaml',
         output: 'array-items-one-of-length-1',
+        plugins: ['@hey-api/typescript', 'valibot', 'zod'],
       }),
       description:
         'generates correct array when items are oneOf array with single item',
diff --git a/packages/openapi-ts-tests/test/3.1.x.test.ts b/packages/openapi-ts-tests/test/3.1.x.test.ts
@@ -68,8 +68,9 @@ describe(`OpenAPI ${version}`, () => {
     },
     {
       config: createConfig({
-        input: 'array-items-one-of-length-1.json',
+        input: 'array-items-one-of-length-1.yaml',
         output: 'array-items-one-of-length-1',
+        plugins: ['@hey-api/typescript', 'valibot', 'zod'],
       }),
       description:
         'generates correct array when items are oneOf array with single item',
diff --git a/packages/openapi-ts-tests/test/__snapshots__/3.0.x/array-items-one-of-length-1/valibot.gen.ts b/packages/openapi-ts-tests/test/__snapshots__/3.0.x/array-items-one-of-length-1/valibot.gen.ts
@@ -0,0 +1,9 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as v from 'valibot';
+
+export const vBar = v.string();
+
+export const vFoo = v.object({
+    foo: v.optional(v.pipe(v.array(vBar), v.minLength(1), v.maxLength(2147483647)))
+});
diff --git a/packages/openapi-ts-tests/test/__snapshots__/3.0.x/array-items-one-of-length-1/zod.gen.ts b/packages/openapi-ts-tests/test/__snapshots__/3.0.x/array-items-one-of-length-1/zod.gen.ts
@@ -0,0 +1,9 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+export const zBar = z.string();
+
+export const zFoo = z.object({
+    foo: z.array(zBar).min(1).max(2147483647).optional()
+});
diff --git a/packages/openapi-ts-tests/test/__snapshots__/3.1.x/array-items-one-of-length-1/valibot.gen.ts b/packages/openapi-ts-tests/test/__snapshots__/3.1.x/array-items-one-of-length-1/valibot.gen.ts
@@ -0,0 +1,9 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import * as v from 'valibot';
+
+export const vBar = v.string();
+
+export const vFoo = v.object({
+    foo: v.optional(v.pipe(v.array(vBar), v.minLength(1), v.maxLength(2147483647)))
+});
diff --git a/packages/openapi-ts-tests/test/__snapshots__/3.1.x/array-items-one-of-length-1/zod.gen.ts b/packages/openapi-ts-tests/test/__snapshots__/3.1.x/array-items-one-of-length-1/zod.gen.ts
@@ -0,0 +1,9 @@
+// This file is auto-generated by @hey-api/openapi-ts
+
+import { z } from 'zod';
+
+export const zBar = z.string();
+
+export const zFoo = z.object({
+    foo: z.array(zBar).min(1).max(2147483647).optional()
+});
diff --git a/packages/openapi-ts-tests/test/openapi-ts.config.ts b/packages/openapi-ts-tests/test/openapi-ts.config.ts
@@ -37,7 +37,12 @@ export default defineConfig(() => {
       //   'invalid',
       //   'servers-entry.yaml',
       // ),
-      path: path.resolve(__dirname, 'spec', '2.0.x', 'full.yaml'),
+      path: path.resolve(
+        __dirname,
+        'spec',
+        '3.1.x',
+        'array-items-one-of-length-1.yaml',
+      ),
       // path: path.resolve(__dirname, 'spec', 'v3-transforms.json'),
       // path: path.resolve(__dirname, 'spec', 'v3.json'),
       // path: 'http://localhost:4000/',
@@ -136,7 +141,7 @@ export default defineConfig(() => {
           enabled: false,
           type: 'typescript+namespace',
         },
-        // name: '@hey-api/typescript',
+        name: '@hey-api/typescript',
         // tree: true,
       },
       {
@@ -147,7 +152,7 @@ export default defineConfig(() => {
         // client: false,
         // include...
         // instance: true,
-        // name: '@hey-api/sdk',
+        name: '@hey-api/sdk',
         // operationId: false,
         // responseStyle: 'data',
         // throwOnError: true,
@@ -193,7 +198,7 @@ export default defineConfig(() => {
         definitions: 'z{{name}}Definition',
         // exportFromIndex: true,
         metadata: true,
-        // name: 'valibot',
+        name: 'valibot',
         requests: {
           // case: 'SCREAMING_SNAKE_CASE',
           name: 'z{{name}}TestData',
@@ -209,7 +214,7 @@ export default defineConfig(() => {
         definitions: 'z{{name}}Definition',
         // exportFromIndex: true,
         // metadata: true,
-        // name: 'zod',
+        name: 'zod',
         requests: {
           // case: 'SCREAMING_SNAKE_CASE',
           // name: 'z{{name}}TestData',
diff --git a/packages/openapi-ts-tests/test/spec/3.0.x/array-items-one-of-length-1.json b/packages/openapi-ts-tests/test/spec/3.0.x/array-items-one-of-length-1.json
diff --git a/packages/openapi-ts-tests/test/spec/3.0.x/array-items-one-of-length-1.yaml b/packages/openapi-ts-tests/test/spec/3.0.x/array-items-one-of-length-1.yaml
@@ -0,0 +1,18 @@
+openapi: 3.0.2
+info:
+  title: OpenAPI 3.0.2 array items oneOf length 1 example
+  version: '1'
+components:
+  schemas:
+    Foo:
+      type: object
+      properties:
+        foo:
+          type: array
+          items:
+            oneOf:
+              - $ref: '#/components/schemas/Bar'
+          maxItems: 2147483647
+          minItems: 1
+    Bar:
+      type: string
diff --git a/packages/openapi-ts-tests/test/spec/3.1.x/array-items-one-of-length-1.json b/packages/openapi-ts-tests/test/spec/3.1.x/array-items-one-of-length-1.json
diff --git a/packages/openapi-ts-tests/test/spec/3.1.x/array-items-one-of-length-1.yaml b/packages/openapi-ts-tests/test/spec/3.1.x/array-items-one-of-length-1.yaml
@@ -0,0 +1,18 @@
+openapi: 3.1.0
+info:
+  title: OpenAPI 3.1.0 array items oneOf length 1 example
+  version: '1'
+components:
+  schemas:
+    Foo:
+      type: object
+      properties:
+        foo:
+          type: array
+          items:
+            oneOf:
+              - $ref: '#/components/schemas/Bar'
+          maxItems: 2147483647
+          minItems: 1
+    Bar:
+      type: string
diff --git a/packages/openapi-ts/src/plugins/valibot/plugin.ts b/packages/openapi-ts/src/plugins/valibot/plugin.ts
@@ -46,16 +46,16 @@ const arrayTypeToValibotSchema = ({
   plugin: ValibotPlugin['Instance'];
   schema: SchemaWithType<'array'>;
   state: State;
-}): ts.CallExpression => {
+}): ts.Expression => {
   const functionName = compiler.propertyAccessExpression({
     expression: identifiers.v,
     name: identifiers.schemas.array,
   });
 
-  let arrayExpression: ts.CallExpression | undefined;
+  const pipes: Array<ts.CallExpression> = [];
 
   if (!schema.items) {
-    arrayExpression = compiler.callExpression({
+    const expression = compiler.callExpression({
       functionName,
       parameters: [
         unknownTypeToValibotSchema({
@@ -65,6 +65,7 @@ const arrayTypeToValibotSchema = ({
         }),
       ],
     });
+    pipes.push(expression);
   } else {
     schema = deduplicateSchema({ schema });
 
@@ -79,10 +80,11 @@ const arrayTypeToValibotSchema = ({
     });
 
     if (itemExpressions.length === 1) {
-      arrayExpression = compiler.callExpression({
+      const expression = compiler.callExpression({
         functionName,
         parameters: itemExpressions,
       });
+      pipes.push(expression);
     } else {
       if (schema.logicalOperator === 'and') {
         // TODO: parser - handle intersection
@@ -94,7 +96,7 @@ const arrayTypeToValibotSchema = ({
       // TODO: parser - handle union
       // return compiler.typeArrayNode(compiler.typeUnionNode({ types: itemExpressions }));
 
-      arrayExpression = compiler.callExpression({
+      const expression = compiler.callExpression({
         functionName,
         parameters: [
           unknownTypeToValibotSchema({
@@ -104,40 +106,44 @@ const arrayTypeToValibotSchema = ({
           }),
         ],
       });
+      pipes.push(expression);
     }
   }
 
   if (schema.minItems === schema.maxItems && schema.minItems !== undefined) {
-    arrayExpression = compiler.callExpression({
+    const expression = compiler.callExpression({
       functionName: compiler.propertyAccessExpression({
-        expression: arrayExpression,
+        expression: identifiers.v,
         name: identifiers.actions.length,
       }),
       parameters: [compiler.valueToExpression({ value: schema.minItems })],
     });
+    pipes.push(expression);
   } else {
     if (schema.minItems !== undefined) {
-      arrayExpression = compiler.callExpression({
+      const expression = compiler.callExpression({
         functionName: compiler.propertyAccessExpression({
-          expression: arrayExpression,
-          name: compiler.identifier({ text: 'min' }),
+          expression: identifiers.v,
+          name: identifiers.actions.minLength,
         }),
         parameters: [compiler.valueToExpression({ value: schema.minItems })],
       });
+      pipes.push(expression);
     }
 
     if (schema.maxItems !== undefined) {
-      arrayExpression = compiler.callExpression({
+      const expression = compiler.callExpression({
         functionName: compiler.propertyAccessExpression({
-          expression: arrayExpression,
-          name: compiler.identifier({ text: 'max' }),
+          expression: identifiers.v,
+          name: identifiers.actions.maxLength,
         }),
         parameters: [compiler.valueToExpression({ value: schema.maxItems })],
       });
+      pipes.push(expression);
     }
   }
 
-  return arrayExpression;
+  return pipesToExpression(pipes);
 };
 
 const booleanTypeToValibotSchema = ({

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +'@hey-api/openapi-ts': patch
 +---
++
 +fix(valibot): properly handle array minLength and maxLength