@povio/openapi-codegen-cli 0.8.3 → 0.9.1

package/package.json

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

package/src/assets/zodExtended.ts

@@ -0,0 +1,24 @@
+/* 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);
+}

package/src/generators/templates/endpoints.hbs

@@ -8,6 +8,10 @@
 {{#if hasZodImport}}
 {{{genImport zodImport}}}
 {{/if}}
+{{! Zod extended import }}
+{{#if hasZodExtendedImport}}
+{{{genImport zodExtendedImport}}}
+{{/if}}
 {{! Models import }}
 {{#each modelsImports as | modelsImport |}}
 {{{genImport modelsImport}}}

package/src/generators/templates/partials/endpoint-config.hbs

@@ -7,9 +7,9 @@
     params: {
         {{#each endpointConfig.params as | param |}}
         {{#if (isEqual param.name param.value) }}
-        {{{param.name}}},
+        {{{param.name}}}{{#if param.parameterSortingEnumSchemaName}}: {{{genEndpointParamSorting param.parameterSortingEnumSchemaName param.name}}}{{/if}}, 
         {{else}}
-        {{{param.name}}}: {{param.value}},
+        {{{param.name}}}: {{#if param.parameterSortingEnumSchemaName}}{{{genEndpointParamSorting param.parameterSortingEnumSchemaName param.value}}}{{else}}{{param.value}}{{/if}},
         {{/if}}
         {{/each}}
     },

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

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