fix: Change the actions setting method to v.pipe()

Author: MH4GF

src/valibot/index.ts

@@ -121,36 +121,45 @@ function generateFieldTypeValibotSchema(config: ValidationSchemaPluginConfig, vi
     if (isListType(parentType))
       return `v.nullable(${gen})`;
 
-    let appliedDirectivesGen = applyDirectives(config, field, gen);
-
     if (field.kind === Kind.INPUT_VALUE_DEFINITION) {
       const { defaultValue } = field;
       if (defaultValue?.kind === Kind.INT || defaultValue?.kind === Kind.FLOAT || defaultValue?.kind === Kind.BOOLEAN)
-        appliedDirectivesGen = `v.optional(${appliedDirectivesGen}, ${defaultValue.value})`;
+        gen = `v.optional(${gen}, ${defaultValue.value})`;
 
       if (defaultValue?.kind === Kind.STRING || defaultValue?.kind === Kind.ENUM)
-        appliedDirectivesGen = `v.optional(${appliedDirectivesGen}, "${defaultValue.value}")`;
-
+        gen = `v.optional(${gen}, "${defaultValue.value}")`;
     }
+
+    const actions = actionsFromDirectives(config, field);
+
     if (isNonNullType(parentType)) {
-      if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value))
-        return "v.string([v.minLength(1)])"; // TODO
+      if (visitor.shouldEmitAsNotAllowEmptyString(type.name.value)) {
+        actions.push('v.minLength(1)');
+      }
 
-      return appliedDirectivesGen;
+      return pipeSchemaAndActions(gen, actions);
     }
 
-    return `v.nullish(${appliedDirectivesGen})`;
+    return `v.nullish(${pipeSchemaAndActions(gen, actions)})`;
   }
   console.warn('unhandled type:', type);
   return '';
 }
 
-function applyDirectives(config: ValidationSchemaPluginConfig, field: InputValueDefinitionNode | FieldDefinitionNode, gen: string): string {
+function actionsFromDirectives(config: ValidationSchemaPluginConfig, field: InputValueDefinitionNode | FieldDefinitionNode): string[] {
   if (config.directives && field.directives) {
     const formatted = formatDirectiveConfig(config.directives);
-    return `v.pipe(${gen}, ${buildApiForValibot(formatted, field.directives).join(', ')})`;
+    return buildApiForValibot(formatted, field.directives);
   }
-  return gen;
+
+  return [];
+}
+
+function pipeSchemaAndActions(schema: string, actions: string[]): string {
+  if (actions.length === 0)
+    return schema;
+
+  return `v.pipe(${schema}, ${actions.join(', ')})`;
 }
 
 function generateNameNodeValibotSchema(config: ValidationSchemaPluginConfig, visitor: Visitor, node: NameNode): string {

tests/valibot.spec.ts

@@ -236,8 +236,8 @@ describe('valibot', () => {
 
       export function PrimitiveInputSchema() {
         return v.object({
-          a: v.string([v.minLength(1)]),
-          b: v.string([v.minLength(1)]),
+          a: v.pipe(v.string(), v.minLength(1)),
+          b: v.pipe(v.string(), v.minLength(1)),
           c: v.boolean(),
           d: v.number(),
           e: v.number()
@@ -280,7 +280,7 @@ describe('valibot', () => {
 
       export function InputNestedSchema() {
         return v.object({
-          field: v.string([v.minLength(1)])
+          field: v.pipe(v.string(), v.minLength(1))
         })
       }
       "
@@ -439,4 +439,42 @@ describe('valibot', () => {
 
     it.todo('list field');
   })
+
+  describe('pR #112', () => {
+    it('with notAllowEmptyString', async () => {
+      const schema = buildSchema(/* GraphQL */ `
+        input UserCreateInput {
+          profile: String! @constraint(maxLength: 5000)
+          age: Int!
+        }
+
+        directive @constraint(maxLength: Int!) on INPUT_FIELD_DEFINITION
+      `);
+      const result = await plugin(
+        schema,
+        [],
+        {
+          schema: 'valibot',
+          notAllowEmptyString: true,
+          directives: {
+            constraint: {
+              maxLength: ['maxLength', '$1', 'Please input less than $1'],
+            },
+          },
+        },
+        {},
+      );
+      expect(result.content).toMatchInlineSnapshot(`
+        "
+
+        export function UserCreateInputSchema() {
+          return v.object({
+            profile: v.pipe(v.string(), v.maxLength(5000, "Please input less than 5000"), v.minLength(1)),
+            age: v.number()
+          })
+        }
+        "
+      `)
+    });
+  });
 })