Use plugin as variable instead of a new config variable

Author: harkor

packages/openapi-ts/src/plugins/zod/plugin.ts

@@ -40,13 +40,13 @@ const zIdentifier = compiler.identifier({ text: 'z' });
 const nameTransformer = (name: string) => `z-${name}`;
 
 const arrayTypeToZodSchema = ({
-  config,
   context,
+  plugin,
   result,
   schema,
 }: {
-  config: Omit<Config, 'name'>;
   context: IR.Context;
+  plugin: Config;
   result: Result;
   schema: SchemaWithType<'array'>;
 }): ts.CallExpression => {
@@ -75,8 +75,8 @@ const arrayTypeToZodSchema = ({
     // at least one item is guaranteed
     const itemExpressions = schema.items!.map((item) =>
       schemaToZodSchema({
-        config,
         context,
+        plugin,
         result,
         schema: item,
       }),
@@ -334,13 +334,13 @@ const numberTypeToZodSchema = ({
 };
 
 const objectTypeToZodSchema = ({
-  config,
   context,
+  plugin,
   result,
   schema,
 }: {
-  config: Omit<Config, 'name'>;
   context: IR.Context;
+  plugin: Config;
   result: Result;
   schema: SchemaWithType<'object'>;
 }) => {
@@ -358,9 +358,9 @@ const objectTypeToZodSchema = ({
     const isRequired = required.includes(name);
 
     const propertyExpression = schemaToZodSchema({
-      config,
       context,
       optional: !isRequired,
+      plugin,
       result,
       schema: property,
     });
@@ -438,11 +438,11 @@ const objectTypeToZodSchema = ({
 };
 
 const stringTypeToZodSchema = ({
-  config,
+  plugin,
   schema,
 }: {
-  config: Omit<Config, 'name'>;
   context: IR.Context;
+  plugin: Config;
   schema: SchemaWithType<'string'>;
 }) => {
   if (typeof schema.const === 'string') {
@@ -472,8 +472,8 @@ const stringTypeToZodSchema = ({
             name: compiler.identifier({ text: 'datetime' }),
           }),
           parameters: [
-            config.dateTimeOptions
-              ? JSON.stringify(config.dateTimeOptions)
+            plugin.dateTimeOptions
+              ? JSON.stringify(plugin.dateTimeOptions)
               : undefined,
           ],
         });
@@ -655,21 +655,21 @@ const voidTypeToZodSchema = ({
 };
 
 const schemaTypeToZodSchema = ({
-  config,
   context,
+  plugin,
   result,
   schema,
 }: {
-  config: Omit<Config, 'name'>;
   context: IR.Context;
+  plugin: Config;
   result: Result;
   schema: IR.SchemaObject;
 }): ts.Expression => {
   switch (schema.type as Required<IR.SchemaObject>['type']) {
     case 'array':
       return arrayTypeToZodSchema({
-        config,
         context,
+        plugin,
         result,
         schema: schema as SchemaWithType<'array'>,
       });
@@ -701,15 +701,15 @@ const schemaTypeToZodSchema = ({
       });
     case 'object':
       return objectTypeToZodSchema({
-        config,
         context,
+        plugin,
         result,
         schema: schema as SchemaWithType<'object'>,
       });
     case 'string':
       return stringTypeToZodSchema({
-        config,
         context,
+        plugin,
         schema: schema as SchemaWithType<'string'>,
       });
     case 'tuple':
@@ -736,14 +736,14 @@ const schemaTypeToZodSchema = ({
 };
 
 const operationToZodSchema = ({
-  config,
   context,
   operation,
+  plugin,
   result,
 }: {
-  config: Omit<Config, 'name'>;
   context: IR.Context;
   operation: IR.OperationObject;
+  plugin: Config;
   result: Result;
 }) => {
   if (operation.responses) {
@@ -756,8 +756,8 @@ const operationToZodSchema = ({
           id: operation.id,
           type: 'response',
         }),
-        config,
         context,
+        plugin,
         result,
         schema: response,
       });
@@ -767,24 +767,24 @@ const operationToZodSchema = ({
 
 const schemaToZodSchema = ({
   $ref,
-  config,
   context,
   optional,
+  plugin,
   result,
   schema,
 }: {
   /**
    * When $ref is supplied, a node will be emitted to the file.
    */
   $ref?: string;
-  config: Omit<Config, 'name'>;
   context: IR.Context;
   /**
    * Accept `optional` to handle optional object properties. We can't handle
    * this inside the object function because `.optional()` must come before
    * `.default()` which is handled in this function.
    */
   optional?: boolean;
+  plugin: Config;
   result: Result;
   schema: IR.SchemaObject;
 }): ts.Expression => {
@@ -821,8 +821,8 @@ const schemaToZodSchema = ({
     if (!identifierRef.name) {
       const ref = context.resolveIrRef<IR.SchemaObject>(schema.$ref);
       expression = schemaToZodSchema({
-        config,
         context,
+        plugin,
         result,
         schema: ref,
       });
@@ -860,8 +860,8 @@ const schemaToZodSchema = ({
     }
   } else if (schema.type) {
     expression = schemaTypeToZodSchema({
-      config,
       context,
+      plugin,
       result,
       schema,
     });
@@ -871,8 +871,8 @@ const schemaToZodSchema = ({
     if (schema.items) {
       const itemTypes = schema.items.map((item) =>
         schemaToZodSchema({
-          config,
           context,
+          plugin,
           result,
           schema: item,
         }),
@@ -921,17 +921,17 @@ const schemaToZodSchema = ({
       }
     } else {
       expression = schemaToZodSchema({
-        config,
         context,
+        plugin,
         result,
         schema,
       });
     }
   } else {
     // catch-all fallback for failed schemas
     expression = schemaTypeToZodSchema({
-      config,
       context,
+      plugin,
       result,
       schema: {
         type: 'unknown',
@@ -1010,20 +1010,16 @@ export const handler: Plugin.Handler<Config> = ({ context, plugin }) => {
     name: 'z',
   });
 
-  const config: Omit<Config, 'name'> = {
-    dateTimeOptions: plugin.dateTimeOptions,
-  };
-
   context.subscribe('operation', ({ operation }) => {
     const result: Result = {
       circularReferenceTracker: new Set(),
       hasCircularReference: false,
     };
 
     operationToZodSchema({
-      config,
       context,
       operation,
+      plugin,
       result,
     });
   });
@@ -1036,8 +1032,8 @@ export const handler: Plugin.Handler<Config> = ({ context, plugin }) => {
 
     schemaToZodSchema({
       $ref,
-      config,
       context,
+      plugin,
       result,
       schema,
     });

packages/openapi-ts/src/plugins/zod/types.d.ts

@@ -22,8 +22,8 @@ export interface Config extends Plugin.Name<'zod'> {
    * Customise the Zod schema name. By default, `z{{name}}` is used,
    * where `name` is a definition name or an operation name.
    */
-// nameBuilder?: (model: IR.OperationObject | IR.SchemaObject) => string;
-/**
+  // nameBuilder?: (model: IR.OperationObject | IR.SchemaObject) => string;
+  /**
    * Name of the generated file.
    *
    * @default 'zod'