@povio/openapi-codegen-cli 0.13.11 → 0.14.0

package/package.json

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

package/src/generators/templates/endpoints.hbs

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

package/src/generators/templates/models.hbs

@@ -1,5 +1,9 @@
 {{! Zod import}}
 {{{genImport zodImport}}}
+{{! Zod utils import }}
+{{#if hasZodUtilsImport}}
+{{{genImport zodUtilsImport}}}
+{{/if}}
 {{! Models import }}
 {{#each modelsImports as | modelsImport |}}
 {{{genImport modelsImport}}}

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

@@ -1 +1 @@
-{{zodExtended}}.{{parse}}({{#if param.parameterSortingEnumSchemaName}}{{zodExtended}}.{{sortingString}}({{{importedZodSchemaName param.parameterSortingEnumSchemaName}}}){{#if addOptional}}.optional(){{/if}}{{else}}{{{importedZodSchemaName param.zodSchema}}}{{#if addOptional}}.optional(){{/if}}{{/if}}, {{paramName}}{{#if isQuery}}, { type: "query", name: "{{paramName}}" }{{/if}})
+{{zodUtilsNamespace}}.{{parse}}({{#if param.parameterSortingEnumSchemaName}}{{zodUtilsNamespace}}.{{sortExp}}({{{importedZodSchemaName param.parameterSortingEnumSchemaName}}}){{#if addOptional}}.optional(){{/if}}{{else}}{{{importedZodSchemaName param.zodSchema}}}{{#if addOptional}}.optional(){{/if}}{{/if}}, {{paramName}}{{#if isQuery}}, { type: "query", name: "{{paramName}}" }{{/if}})

package/src/generators/templates/partials/query-js-docs.hbs

@@ -4,7 +4,7 @@
  * @summary {{addAsteriskAfterNewLine endpoint.summary}}{{/if}}{{#if endpoint.description}} 
  * @description {{addAsteriskAfterNewLine endpoint.description}}{{/if}}{{#if endpoint.acl}}
  * @permission Requires `{{abilityFunctionName endpoint}}` ability {{/if}}
-{{#if (endpointParams endpoint)}}{{#each (endpointParams endpoint infiniteQuery excludePageParam=true) as | endpointParam |}} * @param { {{endpointParam.type}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
+{{#if (endpointParams endpoint)}}{{#each (endpointParams endpoint infiniteQuery excludePageParam=true) as | endpointParam |}} * @param { {{{endpointParam.type}}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
 {{/each}}{{/if}} * @param { AppInfiniteQueryOptions } options Infinite query options
  * @returns { UseInfiniteQueryResult<{{{importedZodSchemaInferedType endpoint.response}}}> } {{endpoint.responseDescription}}
  * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
@@ -14,7 +14,7 @@
  * @summary {{addAsteriskAfterNewLine endpoint.summary}}{{/if}}{{#if endpoint.description}} 
  * @description {{addAsteriskAfterNewLine endpoint.description}}{{/if}}{{#if endpoint.acl}}
  * @permission Requires `{{abilityFunctionName endpoint}}` ability {{/if}}
-{{#if (endpointParams endpoint includeFileParam=true)}}{{#each (endpointParams endpoint includeFileParam=true) as | endpointParam |}} * @param { {{endpointParam.type}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
+{{#if (endpointParams endpoint includeFileParam=true)}}{{#each (endpointParams endpoint includeFileParam=true) as | endpointParam |}} * @param { {{{endpointParam.type}}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
 {{/each}}{{/if}} * @param { AppQueryOptions } options Query options
  * @returns { UseQueryResult<{{#if endpoint.mediaDownload}}AxiosResponse<{{/if}}{{{importedZodSchemaInferedType endpoint.response}}}{{#if endpoint.mediaDownload}}>{{/if}}> } {{endpoint.responseDescription}}
  * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
@@ -24,7 +24,7 @@
  * @summary {{addAsteriskAfterNewLine endpoint.summary}}{{/if}}{{#if endpoint.description}} 
  * @description {{addAsteriskAfterNewLine endpoint.description}}{{/if}}{{#if endpoint.acl}}
  * @permission Requires `{{abilityFunctionName endpoint}}` ability {{/if}}
-{{#if (endpointParams endpoint includeFileParam=true)}}{{#each (endpointParams endpoint includeFileParam=true) as | endpointParam |}} * @param { {{endpointParam.type}} } mutation.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
+{{#if (endpointParams endpoint includeFileParam=true)}}{{#each (endpointParams endpoint includeFileParam=true) as | endpointParam |}} * @param { {{{endpointParam.type}}} } mutation.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
 {{/each}}{{/if}} * @param { AppMutationOptions{{#if hasMutationEffects}} & {{mutationEffectsType}}{{/if}} } options Mutation options
  * @returns { UseMutationResult<{{#if endpoint.mediaDownload}}AxiosResponse<{{/if}}{{{importedZodSchemaInferedType endpoint.response}}}{{#if endpoint.mediaDownload}}>{{/if}}> } {{endpoint.responseDescription}}
  * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]

package/src/generators/templates/zod-utils.hbs

@@ -0,0 +1,80 @@
+/* eslint-disable no-underscore-dangle, no-useless-escape */
+{{! Zod import }}
+{{{genImport zodImport}}}
+{{! Error handling import }}
+{{{genImport errorHandlingImport}}}
+
+interface ParseOptions {
+  type: "body" | "query";
+  name?: string;
+  errorHandler?: ErrorHandler<never>;
+}
+
+function is{{capitalize sortExp}}Valid(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);
+}
+
+const ZOD_UTILS_BRAND: unique symbol = Symbol("__zod_utils_brand");
+
+export namespace {{zodUtilsNamespace}} {
+  export function {{parse}}<T>(schema: z.ZodSchema<T>, data: unknown, { type, name, errorHandler }: ParseOptions = { type: "body" }) {
+    try {
+      return schema.parse(data);
+    } catch (e) {
+      if (e instanceof z.ZodError) {
+        e.name = `FE Request ${type === "body" ? "body" : "query param"}${name ? ` ("${name}")` : ""} schema mismatch - ZodError`;
+      }
+      (errorHandler ?? {{sharedErrorHandler}}).rethrowError(e);
+      throw e;
+    }
+  }
+
+  export const {{sortExp}} = (enumSchema: z.ZodEnum<[string, ...string[]]>) =>
+    z.string().superRefine((arg, ctx) => {
+      if (!is{{capitalize sortExp}}Valid(enumSchema, arg)) {
+        ctx.addIssue({
+          code: z.ZodIssueCode.custom,
+          message: "Invalid sorting string.",
+        });
+      }
+    });
+
+  export interface ZodBrand<T extends string | number | symbol> {
+    readonly [ZOD_UTILS_BRAND]: T;
+  }
+
+  export class ZodBranded<T extends z.ZodTypeAny, B extends string | number | symbol> extends z.ZodType<
+    T["_output"] | (T["_output"] & ZodBrand<B>),
+    z.ZodTypeDef,
+    T["_input"]
+  > {
+    readonly _schema: T;
+
+    readonly _brand: B;
+
+    constructor(_schema: T, _brand: B) {
+      super(_schema._def);
+      this._schema = _schema;
+      this._brand = _brand;
+    }
+
+    _parse(input: z.ParseInput) {
+      return this._schema._parse(input);
+    }
+  }
+
+  export type ExtractZodBrand<T> = T extends ZodBrand<infer B> ? B : never;
+
+  export function {{brand}}<T extends z.ZodTypeAny, B extends string | number | symbol>(
+    schema: T,
+    _brand: B,
+  ): ZodBranded<T, B> {
+    return new ZodBranded(schema, _brand);
+  }
+}

package/dist/generators/generate/generateZod.d.ts

@@ -1,2 +0,0 @@
-import { SchemaResolver } from "../core/SchemaResolver.class";
-export declare function generateZod(resolver: SchemaResolver): string;

package/src/generators/templates/zod.hbs

@@ -1,48 +0,0 @@
-/* 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()
-      .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);
-}
-
-interface ParseOptions {
-  type: "body" | "query";
-  name?: string;
-  errorHandler?: {{errorHandler}}<never>;
-}
-
-function {{parse}}<T>(schema: z.ZodSchema<T>, data: unknown, { type, name, errorHandler }: ParseOptions = { type: "body" }) {
-  try {
-    return schema.parse(data);
-  } catch (e) {
-    if (e instanceof z.ZodError) {
-      e.name = `FE Request ${type === "body" ? "body" : "query param"}${name ? ` ("${name}")` : ""} schema mismatch - ZodError`;
-    }
-    (errorHandler ?? {{sharedErrorHandler}}).rethrowError(e);
-    throw e;
-  }
-}