@povio/openapi-codegen-cli 0.10.5 → 0.10.7

package/package.json

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

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

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

package/src/generators/templates/zod.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;
+  }
+}

package/src/assets/zodExtended.ts

@@ -1,24 +0,0 @@
-/* eslint-disable no-useless-escape */
-import { z } from "zod";
-
-export const zodExtended = {
-  sortingString: (enumSchema: z.ZodEnum<[string, ...string[]]>) =>
-    z.string().superRefine((val, ctx) => {
-      if (!isSortingStringValid(val, enumSchema)) {
-        ctx.addIssue({
-          code: z.ZodIssueCode.custom,
-          message: "Invalid sorting string.",
-        });
-      }
-    }),
-};
-
-function isSortingStringValid(val: string, enumSchema: z.ZodEnum<[string, ...string[]]>) {
-  if (val === "" || enumSchema.options.length === 0) {
-    return true;
-  }
-
-  const prefixedEnumOptions = `([+-]?(${enumSchema.options.join("|")}))`;
-  const commaSeparatedOptions = `(${prefixedEnumOptions})(\s*,\s*${prefixedEnumOptions})*`;
-  return new RegExp(`^${commaSeparatedOptions}$`).test(val);
-}