Revert branded default option

Author: monikaboz

README.md

@@ -45,7 +45,7 @@ yarn openapi-codegen generate --input http://localhost:3001/docs-json --standalo
   --importPath                        Module import style for generated files (default: 'ts'; options: 'ts' | 'relative' | 'absolute')
   --removeOperationPrefixEndingWith   Remove operation name prefixes that end with the specified string (Default: 'Controller_')
   --extractEnums                      Extract enums into separate Zod schemas (default: true)
-  --branded                           Apply branded types to ambiguous Zod schemas (default: false)
+  --branded                           Apply branded types to ambiguous Zod schemas (default: true)
   --replaceOptionalWithNullish        Replace `.optional()` chains with `.nullish()` in generated Zod schemas (default: false)
 
   --axiosRequestConfig                Include Axios request config parameters in query hooks (default: false)

package.json

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

src/generators/const/options.const.ts

@@ -43,7 +43,7 @@ export const DEFAULT_GENERATE_OPTIONS: GenerateOptions = {
   enumSuffix: ENUM_SUFFIX,
   withDefaultValues: true,
   extractEnums: true,
-  branded: false,
+  branded: true,
   replaceOptionalWithNullish: false,
   // Endpoints options
   restClientImportPath: TEMPLATE_IMPORTS.appRestClient.template,

src/generators/generate/generateZodUtils.ts

@@ -12,6 +12,7 @@ export function generateZodUtils(resolver: SchemaResolver) {
     parse: ZOD_UTILS.exports.parse,
     sortExp: ZOD_UTILS.exports.sortExp,
     brand: ZOD_UTILS.exports.brand,
+    branded: resolver.options.branded,
     errorHandler: ERROR_HANDLERS.ErrorHandler,
     sharedErrorHandler: ERROR_HANDLERS.SharedErrorHandler,
     errorHandlingImport: {

src/generators/templates/zod-utils.hbs

@@ -43,12 +43,12 @@ export namespace {{zodUtilsNamespace}} {
     });
 
   {{#if branded}}
-  export class ZodBranded<T extends z.ZodTypeAny> extends z.ZodType<T["_output"], z.ZodTypeDef, T["_input"]> {
+  export class ZodBranded<T extends z.ZodTypeAny, B extends string> extends z.ZodType<T["_output"], z.ZodTypeDef, T["_input"]> {
     readonly _schema: T;
 
-    readonly _brand: string;
+    readonly _brand: B;
 
-    constructor(_schema: T, _brand: string) {
+    constructor(_schema: T, _brand: B) {
       super(_schema._def);
       this._schema = _schema;
       this._brand = _brand;
@@ -63,7 +63,7 @@ export namespace {{zodUtilsNamespace}} {
     }
   }
 
-  export function {{brand}}<T extends z.ZodTypeAny>(schema: T, _brand: string): ZodBranded<T> {
+  export function {{brand}}<T extends z.ZodTypeAny, B extends string>(schema: T, _brand: B): ZodBranded<T, B> {
     return new ZodBranded(schema, _brand);
   }
   {{/if}}