Merge pull request #3509 from hey-api/refactor/valibot-union-intersection

refactor: extract valibot union and intersection handler

Author: mrlubos

packages/openapi-ts/src/plugins/valibot/v1/toAst/intersection.ts

@@ -0,0 +1,38 @@
+import type { IR } from '@hey-api/shared';
+
+import { $ } from '../../../../ts-dsl';
+import type { Pipes } from '../../shared/pipes';
+import { pipesToNode } from '../../shared/pipes';
+import type { CompositeHandlerResult, ValibotFinal, ValibotResult } from '../../shared/types';
+import type { ValibotPlugin } from '../../types';
+import { identifiers } from '../constants';
+
+interface IntersectionToPipesContext {
+  applyModifiers: (result: ValibotResult, options?: { optional?: boolean }) => ValibotFinal;
+  childResults: Array<ValibotResult>;
+  parentSchema: IR.SchemaObject;
+  plugin: ValibotPlugin['Instance'];
+}
+
+export function intersectionToPipes(ctx: IntersectionToPipesContext): CompositeHandlerResult {
+  const { applyModifiers, childResults, plugin } = ctx;
+
+  const v = plugin.external('valibot.v');
+  let pipes: Pipes;
+
+  if (childResults.length === 0) {
+    pipes = [$(v).attr(identifiers.schemas.any).call()];
+  } else if (childResults.length === 1) {
+    const finalResult = applyModifiers(childResults[0]!);
+    pipes = finalResult.pipes;
+  } else {
+    const itemNodes = childResults.map((item) => pipesToNode(item.pipes, plugin));
+    pipes = [
+      $(v)
+        .attr(identifiers.schemas.intersect)
+        .call($.array(...itemNodes)),
+    ];
+  }
+
+  return { childResults, pipes };
+}

packages/openapi-ts/src/plugins/valibot/v1/toAst/union.ts

@@ -0,0 +1,49 @@
+import type { IR } from '@hey-api/shared';
+
+import { $ } from '../../../../ts-dsl';
+import type { Pipes } from '../../shared/pipes';
+import { pipesToNode } from '../../shared/pipes';
+import type { CompositeHandlerResult, ValibotFinal, ValibotResult } from '../../shared/types';
+import type { ValibotPlugin } from '../../types';
+import { identifiers } from '../constants';
+
+interface UnionToPipesContext {
+  applyModifiers: (result: ValibotResult, options?: { optional?: boolean }) => ValibotFinal;
+  childResults: Array<ValibotResult>;
+  parentSchema: IR.SchemaObject;
+  plugin: ValibotPlugin['Instance'];
+  schemas: ReadonlyArray<IR.SchemaObject>;
+}
+
+export function unionToPipes(ctx: UnionToPipesContext): CompositeHandlerResult {
+  const { childResults, plugin, schemas } = ctx;
+
+  const nonNullItems: Array<ValibotResult> = [];
+  childResults.forEach((item, index) => {
+    const schema = schemas[index]!;
+    if (schema.type !== 'null') {
+      nonNullItems.push(item);
+    }
+  });
+
+  const v = plugin.external('valibot.v');
+  let pipes: Pipes;
+
+  if (nonNullItems.length === 0) {
+    pipes = [$(v).attr(identifiers.schemas.null).call()];
+  } else if (nonNullItems.length === 1) {
+    pipes = nonNullItems[0]!.pipes;
+  } else {
+    const itemNodes = nonNullItems.map((i) => pipesToNode(i.pipes, plugin));
+    pipes = [
+      $(v)
+        .attr(identifiers.schemas.union)
+        .call($.array(...itemNodes)),
+    ];
+  }
+
+  return {
+    childResults,
+    pipes,
+  };
+}

packages/openapi-ts/src/plugins/valibot/v1/walker.ts

@@ -15,13 +15,15 @@ import { identifiers } from './constants';
 import { arrayToPipes } from './toAst/array';
 import { booleanToPipes } from './toAst/boolean';
 import { enumToPipes } from './toAst/enum';
+import { intersectionToPipes } from './toAst/intersection';
 import { neverToPipes } from './toAst/never';
 import { nullToPipes } from './toAst/null';
 import { numberToPipes } from './toAst/number';
 import { objectToPipes } from './toAst/object';
 import { stringToPipes } from './toAst/string';
 import { tupleToPipes } from './toAst/tuple';
 import { undefinedToPipes } from './toAst/undefined';
+import { unionToPipes } from './toAst/union';
 import { unknownToPipes } from './toAst/unknown';
 import { voidToPipes } from './toAst/void';
 
@@ -143,16 +145,19 @@ export function createVisitor(
       }
     },
     intersection(items, schemas, parentSchema, ctx) {
-      const v = ctx.plugin.external('valibot.v');
-      const itemNodes = items.map((item) => pipesToNode(item.pipes, ctx.plugin));
+      const applyModifiers = (result: ValibotResult, opts?: { optional?: boolean }) =>
+        this.applyModifiers(result, ctx, opts) as ValibotFinal;
+
+      const { pipes } = intersectionToPipes({
+        applyModifiers,
+        childResults: items,
+        parentSchema,
+        plugin: ctx.plugin,
+      });
 
       return {
         meta: composeMeta(items, { default: parentSchema.default }),
-        pipes: [
-          $(v)
-            .attr(identifiers.schemas.intersect)
-            .call($.array(...itemNodes)),
-        ],
+        pipes,
       };
     },
     never(schema, ctx) {
@@ -290,33 +295,19 @@ export function createVisitor(
       };
     },
     union(items, schemas, parentSchema, ctx) {
-      const v = ctx.plugin.external('valibot.v');
+      const applyModifiers = (result: ValibotResult, opts?: { optional?: boolean }) =>
+        this.applyModifiers(result, ctx, opts) as ValibotFinal;
 
       const hasNull = schemas.some((s) => s.type === 'null') || items.some((i) => i.meta.nullable);
 
-      const nonNullItems: Array<ValibotResult> = [];
-      items.forEach((item, index) => {
-        const schema = schemas[index]!;
-        if (schema.type !== 'null') {
-          nonNullItems.push(item);
-        }
+      const { pipes } = unionToPipes({
+        applyModifiers,
+        childResults: items,
+        parentSchema,
+        plugin: ctx.plugin,
+        schemas,
       });
 
-      let pipes: Pipes;
-
-      if (nonNullItems.length === 0) {
-        pipes = [$(v).attr(identifiers.schemas.null).call()];
-      } else if (nonNullItems.length === 1) {
-        pipes = nonNullItems[0]!.pipes;
-      } else {
-        const itemNodes = nonNullItems.map((i) => pipesToNode(i.pipes, ctx.plugin));
-        pipes = [
-          $(v)
-            .attr(identifiers.schemas.union)
-            .call($.array(...itemNodes)),
-        ];
-      }
-
       return {
         meta: composeMeta(items, {
           default: parentSchema.default,