Sorting parse fix

Author: monikaboz

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "0.10.6",
+  "version": "0.10.7",
   "main": "./dist/index.js",
   "bin": {
     "openapi-codegen": "./dist/sh.js"

src/assets/zodExtended.ts

@@ -49,6 +49,7 @@ export async function generate({ input, excludeTags, monorepo, prettier, verbose
     input,
     excludeTags: excludeTags.split(","),
     restClientImportPath: TEMPLATE_IMPORTS.appRestClient[template],
+    errorHandlingImportPath: TEMPLATE_IMPORTS.errorHandling[template],
     queryTypesImportPath: TEMPLATE_IMPORTS.queryTypes[template],
     ...params,
   });

src/commands/generate.ts

@@ -1,4 +1,4 @@
-import { GenerateFile } from "../types/generate";
+import { GenerateFile, Import } from "../types/generate";
 
 export const APP_REST_CLIENT_NAME = "AppRestClient";
 
@@ -21,6 +21,19 @@ export const TEMPLATE_IMPORTS: Record<string, { template: string; monorepoTempla
     template: "@/types/react-query",
     monorepoTemplate: "@povio/utils/types/react-query",
   },
+  errorHandling: {
+    template: "@/util/vendor/error-handling",
+    monorepoTemplate: "@povio/utils/vendor/error-handling",
+  },
+};
+
+export const ERROR_HANDLERS = {
+  ErrorHandler: "ErrorHandler",
+  SharedErrorHandler: "SharedErrorHandler",
+};
+export const ERROR_HANDLING_IMPORT: Import = {
+  bindings: [ERROR_HANDLERS.ErrorHandler, ERROR_HANDLERS.SharedErrorHandler],
+  from: "@/util/vendor/error-handling",
 };
 
 // Standalone
@@ -48,9 +61,10 @@ export const INVALIDATE_QUERY_OPTIONS_FILE: GenerateFile = { fileName: "invalida
 
 // ZodExtended
 export const ZOD_EXTENDED = {
-  name: "zodExtended",
+  name: "zod",
   properties: {
     sortingString: "sortingString",
+    parse: "parse",
   },
 };
-export const ZOD_EXTENDED_FILE: GenerateFile = { fileName: "zodExtended", extension: "ts" };
+export const ZOD_EXTENDED_FILE: GenerateFile = { fileName: "zod", extension: "ts" };

src/generators/const/deps.const.ts

@@ -42,6 +42,7 @@ export const DEFAULT_GENERATE_OPTIONS: GenerateOptions = {
   replaceOptionalWithNullish: false,
   // Endpoints options
   restClientImportPath: TEMPLATE_IMPORTS.appRestClient.template,
+  errorHandlingImportPath: TEMPLATE_IMPORTS.errorHandling.template,
   removeOperationPrefixEndingWith: "Controller_",
   // Queries options
   queryTypesImportPath: TEMPLATE_IMPORTS.queryTypes.template,

src/generators/const/options.const.ts

@@ -0,0 +1,21 @@
+import { ERROR_HANDLERS, ERROR_HANDLING_IMPORT, ZOD_EXTENDED } from "../const/deps.const";
+import { ZOD_IMPORT } from "../const/zod.const";
+import { SchemaResolver } from "../core/SchemaResolver.class";
+import { getHbsTemplateDelegate } from "../utils/hbs/hbs-template.utils";
+
+export function generateZod(resolver: SchemaResolver) {
+  const hbsTemplate = getHbsTemplateDelegate(resolver, "zod");
+
+  return hbsTemplate({
+    zodImport: ZOD_IMPORT,
+    zodExtension: ZOD_EXTENDED.name,
+    sortingString: ZOD_EXTENDED.properties.sortingString,
+    parse: ZOD_EXTENDED.properties.parse,
+    errorHandler: ERROR_HANDLERS.ErrorHandler,
+    sharedErrorHandler: ERROR_HANDLERS.SharedErrorHandler,
+    errorHandlingImport: {
+      ...ERROR_HANDLING_IMPORT,
+      from: resolver.options.errorHandlingImportPath,
+    },
+  });
+}

src/generators/generate/generateZod.ts

@@ -15,6 +15,7 @@ import { generateEndpoints } from "./generate/generateEndpoints";
 import { generateInvalidateQueries } from "./generate/generateInvalidateQueries";
 import { generateModels } from "./generate/generateModels";
 import { generateQueries } from "./generate/generateQueries";
+import { generateZod } from "./generate/generateZod";
 import { GenerateData, GenerateFileData, GenerateType, GenerateTypeParams } from "./types/generate";
 import { GenerateOptions } from "./types/options";
 import { getOutputFileName, readAssetSync } from "./utils/file.utils";
@@ -76,11 +77,14 @@ export function generateCodeFromOpenAPIDoc(openApiDoc: OpenAPIV3.Document, cliOp
   }
 
   if (hasZodExtendedFile(data)) {
-    const fileName = getFileNameWithExtension(ZOD_EXTENDED_FILE);
-    generateFilesData.push({
-      content: readAssetSync(fileName),
-      fileName: getOutputFileName({ output: resolver.options.output, fileName }),
-    });
+    const zodContent = generateZod(resolver);
+    if (zodContent) {
+      const fileName = getOutputFileName({
+        output: options.output,
+        fileName: getFileNameWithExtension(ZOD_EXTENDED_FILE),
+      });
+      generateFilesData.push({ fileName, content: zodContent });
+    }
   }
 
   return generateFilesData;

src/generators/generateCodeFromOpenAPIDoc.ts

@@ -1 +1 @@
-{{zodExtended}}.{{sortingString}}({{importedZodSchemaName enumSchemaName}}).parse({{paramName}})
+{{zodExtended}}.{{parse}}({{zodExtended}}.{{sortingString}}({{importedZodSchemaName enumSchemaName}}), {{paramName}})

src/generators/templates/partials/endpoint-param-sorting.hbs

@@ -0,0 +1,40 @@
+/* eslint-disable no-useless-escape */
+{{! Zod import }}
+{{{genImport zodImport}}}
+{{! Error handling import }}
+{{{genImport errorHandlingImport}}}
+
+export const {{zodExtension}} = {
+  {{sortingString}}: (enumSchema: z.ZodEnum<[string, ...string[]]>) =>
+    z
+      .string()
+      .optional()
+      .superRefine((arg, ctx) => {
+        if (!isSortingStringValid(enumSchema, arg)) {
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            message: "Invalid sorting string.",
+          });
+        }
+      }),
+  {{parse}},
+};
+
+function isSortingStringValid(enumSchema: z.ZodEnum<[string, ...string[]]>, data?: string) {
+  if (data === undefined || data === "" || enumSchema.options.length === 0) {
+    return true;
+  }
+
+  const prefixedEnumOptions = `([+-]?(${enumSchema.options.join("|")}))`;
+  const commaSeparatedOptions = `(${prefixedEnumOptions})(\s*,\s*${prefixedEnumOptions})*`;
+  return new RegExp(`^${commaSeparatedOptions}$`).test(data);
+}
+
+function {{parse}}(schema: z.ZodSchema, data: unknown, errorHandler?: {{errorHandler}}<never>) {
+  try {
+    return schema.parse(data);
+  } catch (e: unknown) {
+    (errorHandler ?? {{sharedErrorHandler}}).rethrowError(e);
+    throw e;
+  }
+}

src/generators/templates/zod.hbs

@@ -14,6 +14,7 @@ interface ZodGenerateOptions {
 
 interface EndpointsGenerateOptions {
   restClientImportPath: string;
+  errorHandlingImportPath: string;
   withDeprecatedEndpoints?: boolean;
   removeOperationPrefixEndingWith?: string;
 }