@povio/openapi-codegen-cli 3.2.0-rc.2 → 3.2.0-rc.3

package/dist/{config-DFpV8mjG.d.mts → config-mWuUhYNE.d.mts}

@@ -1,4 +1,4 @@
-import { t as GenerateOptions } from "./options-DtAnhCLZ.mjs";
+import { t as GenerateOptions } from "./options-B47gUU4P.mjs";
 //#region src/generators/types/config.d.ts
 type OpenAPICodegenConfig = Partial<GenerateOptions>;
 //#endregion

package/dist/{generate.runner-BGhsnDm8.mjs → generate.runner-wLYGEefS.mjs}

@@ -480,6 +480,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	excludePathRegex: "",
 	excludeRedundantZodSchemas: true,
 	tsNamespaces: true,
+	treeShakeableNamespaces: false,
 	tsPath: "@/data",
 	importPath: "ts",
 	configs: {
@@ -510,6 +511,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	schemaSuffix: SCHEMA_SUFFIX,
 	enumSuffix: ENUM_SUFFIX,
 	modelsInCommon: false,
+	modelsInModules: false,
 	withDefaultValues: true,
 	extractEnums: true,
 	replaceOptionalWithNullish: false,
@@ -641,7 +643,7 @@ const getImportedZodSchemaName = (resolver, zodSchemaName, namespaceTag) => {
 	})}.` : ""}${zodSchemaName}`;
 };
 function getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag) {
-	if (namespaceTag && resolver.options.modelsInCommon && resolver.options.splitByTags) return namespaceTag;
+	if (namespaceTag && (resolver.options.modelsInCommon || resolver.options.modelsInModules) && resolver.options.splitByTags) return namespaceTag;
 	return resolver.getTagByZodSchemaName(zodSchemaName) ?? namespaceTag;
 }
 const getImportedZodSchemaInferedTypeName = (resolver, zodSchemaName, currentTag, namespaceTag) => {
@@ -919,7 +921,7 @@ function getImportPath(options, fromRoot = false) {
 function getImports({ type = "models", tag: currentTag, entities, getTag, getEntityName, options }) {
 	const imports = /* @__PURE__ */ new Map();
 	entities.forEach((entity) => {
-		const tag = type === "models" && options.modelsInCommon && options.splitByTags ? currentTag : getTag(entity);
+		const tag = type === "models" && (options.modelsInCommon || options.modelsInModules) && options.splitByTags ? currentTag : getTag(entity);
 		if (!imports.has(tag)) {
 			const sameTagDir = currentTag === tag;
 			imports.set(tag, {
@@ -1583,7 +1585,7 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
 			if (nativeFiles) return nativeFiles;
 		}
-		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-CLQbTTwF.mjs").then((n) => n.n);
+		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-C_DFpWCZ.mjs").then((n) => n.n);
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/{generate.utils-C29zzyBl.cjs → generate.utils-1rU0zIjA.cjs}

@@ -70,6 +70,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	excludePathRegex: "",
 	excludeRedundantZodSchemas: true,
 	tsNamespaces: true,
+	treeShakeableNamespaces: false,
 	tsPath: "@/data",
 	importPath: "ts",
 	configs: {
@@ -100,6 +101,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	schemaSuffix: SCHEMA_SUFFIX,
 	enumSuffix: ENUM_SUFFIX,
 	modelsInCommon: false,
+	modelsInModules: false,
 	withDefaultValues: true,
 	extractEnums: true,
 	replaceOptionalWithNullish: false,
@@ -819,7 +821,7 @@ const getImportedZodSchemaName = (resolver, zodSchemaName, namespaceTag) => {
 	})}.` : ""}${zodSchemaName}`;
 };
 function getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag) {
-	if (namespaceTag && resolver.options.modelsInCommon && resolver.options.splitByTags) return namespaceTag;
+	if (namespaceTag && (resolver.options.modelsInCommon || resolver.options.modelsInModules) && resolver.options.splitByTags) return namespaceTag;
 	return resolver.getTagByZodSchemaName(zodSchemaName) ?? namespaceTag;
 }
 const getImportedZodSchemaInferedTypeName = (resolver, zodSchemaName, currentTag, namespaceTag) => {
@@ -1298,7 +1300,7 @@ function getImportPath(options, fromRoot = false) {
 function getImports({ type = "models", tag: currentTag, entities, getTag, getEntityName, options }) {
 	const imports = /* @__PURE__ */ new Map();
 	entities.forEach((entity) => {
-		const tag = type === "models" && options.modelsInCommon && options.splitByTags ? currentTag : getTag(entity);
+		const tag = type === "models" && (options.modelsInCommon || options.modelsInModules) && options.splitByTags ? currentTag : getTag(entity);
 		if (!imports.has(tag)) {
 			const sameTagDir = currentTag === tag;
 			imports.set(tag, {

package/dist/{generateCodeFromOpenAPIDoc-CLQbTTwF.mjs → generateCodeFromOpenAPIDoc-C_DFpWCZ.mjs}

@@ -1,5 +1,5 @@
-import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-fPRPa4_t.mjs";
-import { $ as getImportedAbilityFunctionName, $t as isParamMediaTypeAllowed, A as getEndpointsImports, B as getPrefetchInfiniteQueryName, Bt as QUERY_MODULE_ENUM, C as getAppRestClientImportPath, Ct as isReadEndpoint, D as getTagFileName, Dn as AXIOS_IMPORT, E as getQueryTypesImportPath, En as AXIOS_DEFAULT_IMPORT_NAME, F as mergeImports, Ft as APP_REST_CLIENT_NAME, G as getAbilityConditionType, H as getQueryName, Ht as ZOD_EXTENDED, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as BUILDERS_UTILS, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as DOMAIN_ERRORS_FILE, M as getInfiniteQueriesImports, Mt as isEnumZodSchema, N as getModelsImports, Nn as getEndpointTag, Nt as isNamedZodSchema, O as getTagImportPath, On as AXIOS_REQUEST_CONFIG_NAME, P as getQueriesImports, Pt as APP_REST_CLIENT_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as MUTATION_EFFECTS, St as isReadAllEndpoint, T as getQueryModulesImportPath, Tn as ZOD_IMPORT, Tt as invalidVariableNameCharactersToCamel, U as getQueryOptionsName, Ut as PACKAGE_IMPORT_PATH, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as QUERY_OPTIONS_TYPES, W as getAbilityAction, Wn as Profiler, Wt as getNamespaceName, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, _ as hasEndpointConfig, _t as getPathSegments, at as getZodSchemaInferedTypeName, b as requiresBody, bt as isDeleteEndpoint, c as getDestructuredVariables, ct as getSchemaDescriptions, d as isQuery, dn as isSchemaObject, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, ft as ACL_APP_ABILITIES, g as getImportedEndpointName, gt as CASL_ABILITY_IMPORT, h as getEndpointPath, ht as CASL_ABILITY_BINDING, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as JSON_APPLICATION_FORMAT, k as getAclImports, kn as AXIOS_REQUEST_CONFIG_TYPE, l as isInfiniteQuery, m as getEndpointName, mn as ANY_SCHEMA, mt as ACL_CHECK_HOOK, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as ACL_APP_ABILITY_FILE, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, un as isReferenceObject, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isBulkDeleteEndpoint, w as getFileNameWithExtension, wt as isUpdateEndpoint, xt as isPathSegmentParam, y as renderMediaUploadMutationBody, yt as isCreateEndpoint, z as getInfiniteQueryOptionsName, zt as QUERY_MODULES_FILE } from "./generate.runner-BGhsnDm8.mjs";
+import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Dm8V5UY9.mjs";
+import { $ as getImportedAbilityFunctionName, $t as isParamMediaTypeAllowed, A as getEndpointsImports, B as getPrefetchInfiniteQueryName, Bt as QUERY_MODULE_ENUM, C as getAppRestClientImportPath, Ct as isReadEndpoint, D as getTagFileName, Dn as AXIOS_IMPORT, E as getQueryTypesImportPath, En as AXIOS_DEFAULT_IMPORT_NAME, F as mergeImports, Ft as APP_REST_CLIENT_NAME, G as getAbilityConditionType, H as getQueryName, Ht as ZOD_EXTENDED, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as BUILDERS_UTILS, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as DOMAIN_ERRORS_FILE, M as getInfiniteQueriesImports, Mt as isEnumZodSchema, N as getModelsImports, Nn as getEndpointTag, Nt as isNamedZodSchema, O as getTagImportPath, On as AXIOS_REQUEST_CONFIG_NAME, P as getQueriesImports, Pt as APP_REST_CLIENT_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as MUTATION_EFFECTS, St as isReadAllEndpoint, T as getQueryModulesImportPath, Tn as ZOD_IMPORT, Tt as invalidVariableNameCharactersToCamel, U as getQueryOptionsName, Ut as PACKAGE_IMPORT_PATH, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as QUERY_OPTIONS_TYPES, W as getAbilityAction, Wn as Profiler, Wt as getNamespaceName, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, _ as hasEndpointConfig, _t as getPathSegments, at as getZodSchemaInferedTypeName, b as requiresBody, bt as isDeleteEndpoint, c as getDestructuredVariables, ct as getSchemaDescriptions, d as isQuery, dn as isSchemaObject, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, ft as ACL_APP_ABILITIES, g as getImportedEndpointName, gt as CASL_ABILITY_IMPORT, h as getEndpointPath, ht as CASL_ABILITY_BINDING, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as JSON_APPLICATION_FORMAT, k as getAclImports, kn as AXIOS_REQUEST_CONFIG_TYPE, l as isInfiniteQuery, m as getEndpointName, mn as ANY_SCHEMA, mt as ACL_CHECK_HOOK, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as ACL_APP_ABILITY_FILE, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, un as isReferenceObject, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isBulkDeleteEndpoint, w as getFileNameWithExtension, wt as isUpdateEndpoint, xt as isPathSegmentParam, y as renderMediaUploadMutationBody, yt as isCreateEndpoint, z as getInfiniteQueryOptionsName, zt as QUERY_MODULES_FILE } from "./generate.runner-wLYGEefS.mjs";
 import "node:module";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -700,7 +700,7 @@ function generateEndpoints({ resolver, data, tag }) {
 	return lines.join("\n").trimEnd() + "\n";
 }
 function renderRequestInfo(resolver, endpoint, tag) {
-	return `{ resSchema: ${getImportedZodSchemaName(resolver, endpoint.response, resolver.options.modelsInCommon && resolver.options.splitByTags ? tag : void 0)} }`;
+	return `{ resSchema: ${getImportedZodSchemaName(resolver, endpoint.response, (resolver.options.modelsInCommon || resolver.options.modelsInModules) && resolver.options.splitByTags ? tag : void 0)} }`;
 }
 function getRequestConfigType$1() {
 	return `${AXIOS_REQUEST_CONFIG_TYPE} & { allowInvalidResponseData?: boolean }`;

package/dist/{generateCodeFromOpenAPIDoc-B0Cmn2dx.cjs → generateCodeFromOpenAPIDoc-wCGWkmv1.cjs}

@@ -1,4 +1,4 @@
-const require_generate_utils = require("./generate.utils-C29zzyBl.cjs");
+const require_generate_utils = require("./generate.utils-1rU0zIjA.cjs");
 //#region src/generators/core/zod/getZodChain.ts
 const zodChainCache = /* @__PURE__ */ new WeakMap();
 function getZodChain({ schema, meta, options }) {
@@ -1139,7 +1139,7 @@ function resolveOperationName({ path, method, operation, options, tag, keepOpera
 		const regex = new RegExp(`^.*${options.removeOperationPrefixEndingWith}`);
 		operationName = operationName.replace(regex, "");
 	}
-	if (options.tsNamespaces && !keepOperationTag) {
+	if ((options.tsNamespaces || options.treeShakeableNamespaces) && !keepOperationTag) {
 		const operationNameWithoutTag = require_generate_utils.removeWord(operationName, tag);
 		if (operationNameWithoutTag === "") operationName = method.toLowerCase();
 		else if (!RESERVED_WORDS.includes(operationNameWithoutTag)) operationName = operationNameWithoutTag;
@@ -1581,6 +1581,17 @@ var SchemaResolver = class {
 		this.zodSchemaTagCache?.set(zodSchemaName, tag);
 		return tag;
 	}
+	getTagsByZodSchemaName(zodSchemaName) {
+		if (!this.options.splitByTags) return [require_generate_utils.formatTag(this.options.defaultTag)];
+		const extractedEnum = this.extractedEnumZodSchemaData.find((data) => data.zodSchemaName === zodSchemaName);
+		if (extractedEnum) {
+			const tags = require_generate_utils.getUniqueArray(extractedEnum.meta.tags);
+			return (tags.length > 0 ? tags : [extractedEnum.tag ?? this.options.defaultTag]).map(require_generate_utils.formatTag);
+		}
+		const schemaRef = this.getRefByZodSchemaName(zodSchemaName);
+		const tags = require_generate_utils.getUniqueArray(schemaRef ? this.getSchemaDataByRef(schemaRef)?.tags ?? [] : [], this.zodSchemaDataByName.get(zodSchemaName)?.tags ?? []);
+		return (tags.length > 0 ? tags : [this.options.defaultTag]).map(require_generate_utils.formatTag);
+	}
 	enableZodSchemaTagCache() {
 		this.zodSchemaTagCache = /* @__PURE__ */ new Map();
 	}
@@ -1955,9 +1966,21 @@ function splitDataByTags({ resolver, endpoints, zodSchemas, options }) {
 		getTagElement$1(require_generate_utils.getEndpointTag(endpoint, options), data).endpoints.push(endpoint);
 	});
 	Object.entries(zodSchemas).forEach(([zodSchemaName, zodSchemaCode]) => {
+		if (options.modelsInModules) {
+			for (const tag of resolver.getTagsByZodSchemaName(zodSchemaName)) getTagElement$1(tag, data).zodSchemas[zodSchemaName] = zodSchemaCode;
+			return;
+		}
 		const tag = options.modelsInCommon ? options.defaultTag : resolver.getTagByZodSchemaName(zodSchemaName);
 		if (tag) getTagElement$1(tag, data).zodSchemas[zodSchemaName] = zodSchemaCode;
 	});
+	if (options.modelsInModules) for (const tagData of data.values()) {
+		const pending = Object.keys(tagData.zodSchemas);
+		for (let index = 0; index < pending.length; index++) for (const dependencyName of getZodSchemaRefs(resolver, pending[index])) {
+			if (tagData.zodSchemas[dependencyName] || !zodSchemas[dependencyName]) continue;
+			tagData.zodSchemas[dependencyName] = zodSchemas[dependencyName];
+			pending.push(dependencyName);
+		}
+	}
 	return data;
 }
 function getTagElement$1(tag, data) {
@@ -2655,7 +2678,7 @@ function generateEndpoints({ resolver, data, tag }) {
 	return lines.join("\n").trimEnd() + "\n";
 }
 function renderRequestInfo(resolver, endpoint, tag) {
-	return `{ resSchema: ${require_generate_utils.getImportedZodSchemaName(resolver, endpoint.response, resolver.options.modelsInCommon && resolver.options.splitByTags ? tag : void 0)} }`;
+	return `{ resSchema: ${require_generate_utils.getImportedZodSchemaName(resolver, endpoint.response, (resolver.options.modelsInCommon || resolver.options.modelsInModules) && resolver.options.splitByTags ? tag : void 0)} }`;
 }
 function getRequestConfigType$1() {
 	return `${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE} & { allowInvalidResponseData?: boolean }`;

package/dist/generator.d.mts

@@ -1,4 +1,4 @@
-import { n as GenerateFileData, t as GenerateOptions } from "./options-DtAnhCLZ.mjs";
+import { n as GenerateFileData, t as GenerateOptions } from "./options-B47gUU4P.mjs";
 import { OpenAPIV3 } from "openapi-types";
 //#region src/generators/types/metadata.d.ts
 interface GenerateParams {

package/dist/generator.mjs

@@ -1,6 +1,6 @@
-import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-CLQbTTwF.mjs";
-import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-fPRPa4_t.mjs";
-import { $t as isParamMediaTypeAllowed, H as getQueryName, Mn as formatTag, O as getTagImportPath, Qt as isMediaTypeAllowed, S as getTsTypeBase, Tt as invalidVariableNameCharactersToCamel, Wt as getNamespaceName, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-BGhsnDm8.mjs";
+import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-C_DFpWCZ.mjs";
+import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Dm8V5UY9.mjs";
+import { $t as isParamMediaTypeAllowed, H as getQueryName, Mn as formatTag, O as getTagImportPath, Qt as isMediaTypeAllowed, S as getTsTypeBase, Tt as invalidVariableNameCharactersToCamel, Wt as getNamespaceName, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-wLYGEefS.mjs";
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts
 async function getMetadataFromOpenAPIDoc(openApiDoc, options) {
 	const { resolver, data } = await getDataFromOpenAPIDoc(openApiDoc, options);

package/dist/{getDataFromOpenAPIDoc-fPRPa4_t.mjs → getDataFromOpenAPIDoc-Dm8V5UY9.mjs}

@@ -1,4 +1,4 @@
-import { $t as isParamMediaTypeAllowed, An as BODY_PARAMETER_NAME, At as getZodSchemaName, Bn as getMostCommonAdjacentCombinationSplit, Cn as UUID_SCHEMA, Dt as getEnumZodSchemaName, Et as getBodyZodSchemaName, Fn as isTagIncluded, Gt as autocorrectRef, Hn as removeWord, Jt as getSchemaNameByRef, Kt as escapeControlCharacters, Mn as formatTag, Nn as getEndpointTag, Nt as isNamedZodSchema, Ot as getParamZodSchemaName, Pn as getOperationTag, Qt as isMediaTypeAllowed, Rn as capitalize, Sn as URL_SCHEMA, Tt as invalidVariableNameCharactersToCamel, Un as snakeToCamel, Wn as Profiler, Wt as getNamespaceName, Xt as isErrorStatus, Yt as getSchemaRef, Zt as isMainResponseStatus, _n as EMAIL_SCHEMA, an as replaceHyphenatedPath, bn as NUMBER_SCHEMA, cn as inferRequiredSchema, d as isQuery, dn as isSchemaObject, en as isPathExcluded, fn as ALLOWED_METHODS, gn as DATETIME_SCHEMA, hn as BLOB_SCHEMA, in as pathToVariableName, jn as JSON_APPLICATION_FORMAT, jt as getZodSchemaOperationName, kt as getResponseZodSchemaName, ln as isArraySchemaObject, lt as iterateSchema, mn as ANY_SCHEMA, nn as isSortingParameterObject, on as unwrapQuotesIfNeeded, pn as ALLOWED_PATH_IN, qt as getParameterEnumNames, rn as pathParamToVariableName, s as pick, sn as wrapWithQuotesIfNeeded, tn as isPrimitiveType, un as isReferenceObject, ut as getUniqueArray, vn as ENUM_SCHEMA, wn as VOID_SCHEMA, xn as STRING_SCHEMA, yn as INT_SCHEMA, zn as decapitalize } from "./generate.runner-BGhsnDm8.mjs";
+import { $t as isParamMediaTypeAllowed, An as BODY_PARAMETER_NAME, At as getZodSchemaName, Bn as getMostCommonAdjacentCombinationSplit, Cn as UUID_SCHEMA, Dt as getEnumZodSchemaName, Et as getBodyZodSchemaName, Fn as isTagIncluded, Gt as autocorrectRef, Hn as removeWord, Jt as getSchemaNameByRef, Kt as escapeControlCharacters, Mn as formatTag, Nn as getEndpointTag, Nt as isNamedZodSchema, Ot as getParamZodSchemaName, Pn as getOperationTag, Qt as isMediaTypeAllowed, Rn as capitalize, Sn as URL_SCHEMA, Tt as invalidVariableNameCharactersToCamel, Un as snakeToCamel, Wn as Profiler, Wt as getNamespaceName, Xt as isErrorStatus, Yt as getSchemaRef, Zt as isMainResponseStatus, _n as EMAIL_SCHEMA, an as replaceHyphenatedPath, bn as NUMBER_SCHEMA, cn as inferRequiredSchema, d as isQuery, dn as isSchemaObject, en as isPathExcluded, fn as ALLOWED_METHODS, gn as DATETIME_SCHEMA, hn as BLOB_SCHEMA, in as pathToVariableName, jn as JSON_APPLICATION_FORMAT, jt as getZodSchemaOperationName, kt as getResponseZodSchemaName, ln as isArraySchemaObject, lt as iterateSchema, mn as ANY_SCHEMA, nn as isSortingParameterObject, on as unwrapQuotesIfNeeded, pn as ALLOWED_PATH_IN, qt as getParameterEnumNames, rn as pathParamToVariableName, s as pick, sn as wrapWithQuotesIfNeeded, tn as isPrimitiveType, un as isReferenceObject, ut as getUniqueArray, vn as ENUM_SCHEMA, wn as VOID_SCHEMA, xn as STRING_SCHEMA, yn as INT_SCHEMA, zn as decapitalize } from "./generate.runner-wLYGEefS.mjs";
 //#region src/generators/const/validation.const.ts
 const HTTP_STATUS_CODES = {
 	"100": "Continue",
@@ -1156,7 +1156,7 @@ function resolveOperationName({ path, method, operation, options, tag, keepOpera
 		const regex = new RegExp(`^.*${options.removeOperationPrefixEndingWith}`);
 		operationName = operationName.replace(regex, "");
 	}
-	if (options.tsNamespaces && !keepOperationTag) {
+	if ((options.tsNamespaces || options.treeShakeableNamespaces) && !keepOperationTag) {
 		const operationNameWithoutTag = removeWord(operationName, tag);
 		if (operationNameWithoutTag === "") operationName = method.toLowerCase();
 		else if (!RESERVED_WORDS.includes(operationNameWithoutTag)) operationName = operationNameWithoutTag;
@@ -1598,6 +1598,17 @@ var SchemaResolver = class {
 		this.zodSchemaTagCache?.set(zodSchemaName, tag);
 		return tag;
 	}
+	getTagsByZodSchemaName(zodSchemaName) {
+		if (!this.options.splitByTags) return [formatTag(this.options.defaultTag)];
+		const extractedEnum = this.extractedEnumZodSchemaData.find((data) => data.zodSchemaName === zodSchemaName);
+		if (extractedEnum) {
+			const tags = getUniqueArray(extractedEnum.meta.tags);
+			return (tags.length > 0 ? tags : [extractedEnum.tag ?? this.options.defaultTag]).map(formatTag);
+		}
+		const schemaRef = this.getRefByZodSchemaName(zodSchemaName);
+		const tags = getUniqueArray(schemaRef ? this.getSchemaDataByRef(schemaRef)?.tags ?? [] : [], this.zodSchemaDataByName.get(zodSchemaName)?.tags ?? []);
+		return (tags.length > 0 ? tags : [this.options.defaultTag]).map(formatTag);
+	}
 	enableZodSchemaTagCache() {
 		this.zodSchemaTagCache = /* @__PURE__ */ new Map();
 	}
@@ -1972,9 +1983,21 @@ function splitDataByTags({ resolver, endpoints, zodSchemas, options }) {
 		getTagElement(getEndpointTag(endpoint, options), data).endpoints.push(endpoint);
 	});
 	Object.entries(zodSchemas).forEach(([zodSchemaName, zodSchemaCode]) => {
+		if (options.modelsInModules) {
+			for (const tag of resolver.getTagsByZodSchemaName(zodSchemaName)) getTagElement(tag, data).zodSchemas[zodSchemaName] = zodSchemaCode;
+			return;
+		}
 		const tag = options.modelsInCommon ? options.defaultTag : resolver.getTagByZodSchemaName(zodSchemaName);
 		if (tag) getTagElement(tag, data).zodSchemas[zodSchemaName] = zodSchemaCode;
 	});
+	if (options.modelsInModules) for (const tagData of data.values()) {
+		const pending = Object.keys(tagData.zodSchemas);
+		for (let index = 0; index < pending.length; index++) for (const dependencyName of getZodSchemaRefs(resolver, pending[index])) {
+			if (tagData.zodSchemas[dependencyName] || !zodSchemas[dependencyName]) continue;
+			tagData.zodSchemas[dependencyName] = zodSchemas[dependencyName];
+			pending.push(dependencyName);
+		}
+	}
 	return data;
 }
 function getTagElement(tag, data) {

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { a as ErrorHandler, c as SharedErrorHandler, d as ns, f as resources, i as ErrorEntry, l as TranslateFunction, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as GeneralErrorCodes, t as ApplicationException, u as configureTranslations } from "./error-handling-CNOHs4Fc.mjs";
-import { t as OpenAPICodegenConfig } from "./config-DFpV8mjG.mjs";
+import { t as OpenAPICodegenConfig } from "./config-mWuUhYNE.mjs";
 import { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse, AxiosResponseHeaders, CreateAxiosDefaults } from "axios";
 import { z } from "zod";
 import { PropsWithChildren, ReactNode } from "react";

package/dist/metro.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generate_utils = require("./generate.utils-C29zzyBl.cjs");
+const require_generate_utils = require("./generate.utils-1rU0zIjA.cjs");
 let fs = require("fs");
 fs = require_generate_utils.__toESM(fs, 1);
 let path = require("path");
@@ -97,7 +97,7 @@ async function runGenerate({ fileConfig, params, formatGeneratedFile, profiler =
 			const nativeFiles = generateFilesFromNativeOpenAPI(nativeInput.source, nativeInput.yaml, config);
 			if (nativeFiles) return nativeFiles;
 		}
-		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-B0Cmn2dx.cjs"));
+		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-wCGWkmv1.cjs"));
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/metro.d.mts

@@ -1,6 +1,6 @@
-import { r as GenerateFileFormatter } from "./options-DtAnhCLZ.mjs";
-import { t as OpenAPICodegenConfig } from "./config-DFpV8mjG.mjs";
-import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-zPcbJwpP.mjs";
+import { r as GenerateFileFormatter } from "./options-B47gUU4P.mjs";
+import { t as OpenAPICodegenConfig } from "./config-mWuUhYNE.mjs";
+import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-DmJoXvFj.mjs";
 import { IncomingMessage, ServerResponse } from "http";
 //#region src/metro/openapi-codegen.plugin.d.ts
 type OpenApiCodegenMetroConfig = OpenAPICodegenConfig & {

package/dist/metro.mjs

@@ -1,4 +1,4 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BtaqQSH2.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-Bd03hQJd.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-BZ6ZLgRO.mjs";
 import fs from "fs";
 import path from "path";

package/dist/{openapi-codegen.runner-BtaqQSH2.mjs → openapi-codegen.runner-Bd03hQJd.mjs}

@@ -1,4 +1,4 @@
-import { Wn as Profiler, n as runGenerate } from "./generate.runner-BGhsnDm8.mjs";
+import { Wn as Profiler, n as runGenerate } from "./generate.runner-wLYGEefS.mjs";
 import path from "path";
 //#region src/plugins/openapi-codegen.runner.ts
 function createOpenApiCodegenRunner(config, options = {}) {

package/dist/{openapi-source.runner-zPcbJwpP.d.mts → openapi-source.runner-DmJoXvFj.d.mts}

@@ -1,4 +1,4 @@
-import { t as OpenAPICodegenConfig } from "./config-DFpV8mjG.mjs";
+import { t as OpenAPICodegenConfig } from "./config-mWuUhYNE.mjs";
 //#region src/tiny/openapi.d.ts
 interface GenerateOpenApiFileOptions {
   argv?: readonly string[];

package/dist/{options-DtAnhCLZ.d.mts → options-B47gUU4P.d.mts}

@@ -18,6 +18,7 @@ interface ZodGenerateOptions {
   schemaSuffix: string;
   enumSuffix: string;
   modelsInCommon?: boolean;
+  modelsInModules?: boolean;
   withImplicitRequiredProps?: boolean;
   withDefaultValues?: boolean;
   withDescription?: boolean;
@@ -90,6 +91,7 @@ interface BaseGenerateOptions {
   excludePathRegex: string;
   excludeRedundantZodSchemas: boolean;
   tsNamespaces: boolean;
+  treeShakeableNamespaces?: boolean;
   tsPath: string;
   importPath: "ts" | "relative" | "absolute";
   configs: Record<GenerateType, GenerateConfig>;

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env bun
-import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-fPRPa4_t.mjs";
-import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-BGhsnDm8.mjs";
+import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Dm8V5UY9.mjs";
+import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-wLYGEefS.mjs";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
 import { styleText } from "node:util";
@@ -31,7 +31,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "3.2.0-rc.2";
+	return "3.2.0-rc.3";
 }
 //#endregion
 //#region src/helpers/yargs.helper.ts
@@ -253,6 +253,7 @@ var GenerateOptions = class {
 	clearOutput;
 	incremental;
 	tsNamespaces;
+	treeShakeableNamespaces;
 	tsPath;
 	splitByTags;
 	defaultTag;
@@ -263,6 +264,7 @@ var GenerateOptions = class {
 	importPath;
 	extractEnums;
 	modelsInCommon;
+	modelsInModules;
 	zodImportPath;
 	mutationEffectsImportPath;
 	aclCheckImportPath;
@@ -300,6 +302,10 @@ __decorate([YargOption({
 	envAlias: "tsNamespaces",
 	type: "boolean"
 }), __decorateMetadata("design:type", Boolean)], GenerateOptions.prototype, "tsNamespaces", void 0);
+__decorate([YargOption({
+	envAlias: "treeShakeableNamespaces",
+	type: "boolean"
+}), __decorateMetadata("design:type", Boolean)], GenerateOptions.prototype, "treeShakeableNamespaces", void 0);
 __decorate([YargOption({ envAlias: "tsPath" }), __decorateMetadata("design:type", String)], GenerateOptions.prototype, "tsPath", void 0);
 __decorate([YargOption({
 	envAlias: "splitByTags",
@@ -322,6 +328,10 @@ __decorate([YargOption({
 	envAlias: "modelsInCommon",
 	type: "boolean"
 }), __decorateMetadata("design:type", Boolean)], GenerateOptions.prototype, "modelsInCommon", void 0);
+__decorate([YargOption({
+	envAlias: "modelsInModules",
+	type: "boolean"
+}), __decorateMetadata("design:type", Boolean)], GenerateOptions.prototype, "modelsInModules", void 0);
 __decorate([YargOption({ envAlias: "zodImportPath" }), __decorateMetadata("design:type", String)], GenerateOptions.prototype, "zodImportPath", void 0);
 __decorate([YargOption({ envAlias: "mutationEffectsImportPath" }), __decorateMetadata("design:type", String)], GenerateOptions.prototype, "mutationEffectsImportPath", void 0);
 __decorate([YargOption({ envAlias: "aclCheckImportPath" }), __decorateMetadata("design:type", String)], GenerateOptions.prototype, "aclCheckImportPath", void 0);

package/dist/tiny.d.mts

@@ -1,2 +1,2 @@
-import { $ as getModuleOpenApiTag, A as collectApiModelSchemaExports, At as toOpenAPI30Document, B as collectReachableModelSchemas, C as applyEnumExtensions, Ct as procedureSchemaName, D as applyRobodevModuleExtensions, Dt as schemaExportName, E as applyParameterExtensions, Et as schemaComponentRef, F as collectExtraSchemas, G as findComponentEnumNames, H as compactTagName, I as collectModelSchemaExports, J as generateOpenApiFile, K as findEnumNames, L as collectModuleModelSchemaExports, M as collectContractSchemas, Mt as toOpenAPIAclRule, N as collectDbTableModelSchemaExport, Nt as toPascalCase, O as applyRobodevUserRolesExtension, Ot as sharedSchemaExportName, P as collectDbTableModelSchemaExports, Pt as visitZodSchema, Q as getModuleOpenApiController, R as collectOperationMeta, S as addContractSchema, St as operationKey, T as applyPaginatedItemSchemas, Tt as routeHasPathParameters, U as createModelSchemaNameGetter, V as collectSchemaRegistryRoots, W as defineOpenApiSchemas, X as getContractProcedureData, Y as getComponentSchemas, Z as getDerivedOperationId, _ as OpenApiSchemaRegistry, _t as namedControllerActionSchema, a as isTinyOpenApiFakeMode, at as getProcedureInputSchemaRole, b as TinyOpenApiUserRole, bt as namedOpenApiResponseSchema, c as AnyContractRouter, ct as isContractProcedure, d as GenerateOpenApiFile, dt as isObject, et as getObjectPropertySchema, f as GenerateOpenApiFileOptions, ft as isProcedureMeta, g as JsonObject, gt as namedControllerActionInputDtoSchema, h as GenerateTinyOpenApiFileOptions, ht as modelSchemaNameEntries, i as getLocalInputPath, it as getPaginatedItemSchema, j as collectContractSchemaRoots, jt as toOpenAPI30Schema, k as asStringArray, kt as stripNoContentResponseBodies, l as AnySchema, lt as isNullSchema, m as GenerateOpenApiSpec, mt as modelSchemaExportName, nt as getOperationAction, o as normalizeWatchFolders, ot as getRobodevModuleRoles, p as GenerateOpenApiFileResult, pt as isZodSchema, q as generateORPCOpenAPISpec, r as createTinyOpenApiSourceRunner, rt as getOperationController, s as AclRule, st as getStringEnumValues, t as TinyOpenApiSourceRunnerConfig, tt as getOpenApiSchemaName, u as GenerateORPCOpenAPISpecOptions, ut as isNullableOnlySchema, v as ProcedureMeta, vt as namedOpenApiOutputSchema, w as applyOperationMeta, wt as resolveOpenApiOutputPath, x as ZodSchema, xt as namedOpenApiSchema, y as TinyOpenApiModule, yt as namedOpenApiRequestSchema, z as collectOperationTags } from "./openapi-source.runner-zPcbJwpP.mjs";
+import { $ as getModuleOpenApiTag, A as collectApiModelSchemaExports, At as toOpenAPI30Document, B as collectReachableModelSchemas, C as applyEnumExtensions, Ct as procedureSchemaName, D as applyRobodevModuleExtensions, Dt as schemaExportName, E as applyParameterExtensions, Et as schemaComponentRef, F as collectExtraSchemas, G as findComponentEnumNames, H as compactTagName, I as collectModelSchemaExports, J as generateOpenApiFile, K as findEnumNames, L as collectModuleModelSchemaExports, M as collectContractSchemas, Mt as toOpenAPIAclRule, N as collectDbTableModelSchemaExport, Nt as toPascalCase, O as applyRobodevUserRolesExtension, Ot as sharedSchemaExportName, P as collectDbTableModelSchemaExports, Pt as visitZodSchema, Q as getModuleOpenApiController, R as collectOperationMeta, S as addContractSchema, St as operationKey, T as applyPaginatedItemSchemas, Tt as routeHasPathParameters, U as createModelSchemaNameGetter, V as collectSchemaRegistryRoots, W as defineOpenApiSchemas, X as getContractProcedureData, Y as getComponentSchemas, Z as getDerivedOperationId, _ as OpenApiSchemaRegistry, _t as namedControllerActionSchema, a as isTinyOpenApiFakeMode, at as getProcedureInputSchemaRole, b as TinyOpenApiUserRole, bt as namedOpenApiResponseSchema, c as AnyContractRouter, ct as isContractProcedure, d as GenerateOpenApiFile, dt as isObject, et as getObjectPropertySchema, f as GenerateOpenApiFileOptions, ft as isProcedureMeta, g as JsonObject, gt as namedControllerActionInputDtoSchema, h as GenerateTinyOpenApiFileOptions, ht as modelSchemaNameEntries, i as getLocalInputPath, it as getPaginatedItemSchema, j as collectContractSchemaRoots, jt as toOpenAPI30Schema, k as asStringArray, kt as stripNoContentResponseBodies, l as AnySchema, lt as isNullSchema, m as GenerateOpenApiSpec, mt as modelSchemaExportName, nt as getOperationAction, o as normalizeWatchFolders, ot as getRobodevModuleRoles, p as GenerateOpenApiFileResult, pt as isZodSchema, q as generateORPCOpenAPISpec, r as createTinyOpenApiSourceRunner, rt as getOperationController, s as AclRule, st as getStringEnumValues, t as TinyOpenApiSourceRunnerConfig, tt as getOpenApiSchemaName, u as GenerateORPCOpenAPISpecOptions, ut as isNullableOnlySchema, v as ProcedureMeta, vt as namedOpenApiOutputSchema, w as applyOperationMeta, wt as resolveOpenApiOutputPath, x as ZodSchema, xt as namedOpenApiSchema, y as TinyOpenApiModule, yt as namedOpenApiRequestSchema, z as collectOperationTags } from "./openapi-source.runner-DmJoXvFj.mjs";
 export { AclRule, AnyContractRouter, AnySchema, GenerateORPCOpenAPISpecOptions, GenerateOpenApiFile, GenerateOpenApiFileOptions, GenerateOpenApiFileResult, GenerateOpenApiSpec, GenerateTinyOpenApiFileOptions, JsonObject, OpenApiSchemaRegistry, ProcedureMeta, TinyOpenApiModule, type TinyOpenApiSourceRunnerConfig, TinyOpenApiUserRole, ZodSchema, addContractSchema, applyEnumExtensions, applyOperationMeta, applyPaginatedItemSchemas, applyParameterExtensions, applyRobodevModuleExtensions, applyRobodevUserRolesExtension, asStringArray, collectApiModelSchemaExports, collectContractSchemaRoots, collectContractSchemas, collectDbTableModelSchemaExport, collectDbTableModelSchemaExports, collectExtraSchemas, collectModelSchemaExports, collectModuleModelSchemaExports, collectOperationMeta, collectOperationTags, collectReachableModelSchemas, collectSchemaRegistryRoots, compactTagName, createModelSchemaNameGetter, createTinyOpenApiSourceRunner, defineOpenApiSchemas, findComponentEnumNames, findEnumNames, generateORPCOpenAPISpec, generateOpenApiFile, getComponentSchemas, getContractProcedureData, getDerivedOperationId, getModuleOpenApiController, getModuleOpenApiTag, getObjectPropertySchema, getOpenApiSchemaName, getOperationAction, getOperationController, getPaginatedItemSchema, getProcedureInputSchemaRole, getRobodevModuleRoles, getStringEnumValues, getLocalInputPath as getTinyOpenApiLocalInputPath, isContractProcedure, isNullSchema, isNullableOnlySchema, isObject, isProcedureMeta, isTinyOpenApiFakeMode, isZodSchema, modelSchemaExportName, modelSchemaNameEntries, namedControllerActionInputDtoSchema, namedControllerActionSchema, namedOpenApiOutputSchema, namedOpenApiRequestSchema, namedOpenApiResponseSchema, namedOpenApiSchema, normalizeWatchFolders as normalizeTinyOpenApiWatchFolders, operationKey, procedureSchemaName, resolveOpenApiOutputPath, routeHasPathParameters, schemaComponentRef, schemaExportName, sharedSchemaExportName, stripNoContentResponseBodies, toOpenAPI30Document, toOpenAPI30Schema, toOpenAPIAclRule, toPascalCase, visitZodSchema };

package/dist/vite.d.mts

@@ -1,6 +1,6 @@
-import { r as GenerateFileFormatter } from "./options-DtAnhCLZ.mjs";
-import { t as OpenAPICodegenConfig } from "./config-DFpV8mjG.mjs";
-import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-zPcbJwpP.mjs";
+import { r as GenerateFileFormatter } from "./options-B47gUU4P.mjs";
+import { t as OpenAPICodegenConfig } from "./config-mWuUhYNE.mjs";
+import { d as GenerateOpenApiFile, m as GenerateOpenApiSpec, n as TinyOpenApiSpecModuleConfig } from "./openapi-source.runner-DmJoXvFj.mjs";
 import { Plugin, PluginOption } from "vite";
 //#region src/plugins/openapi-codegen.runner.d.ts
 type OpenApiCodegenPluginConfig = OpenAPICodegenConfig & {

package/dist/vite.mjs

@@ -1,4 +1,4 @@
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-BtaqQSH2.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-Bd03hQJd.mjs";
 import { i as normalizeWatchFolders, r as isTinyOpenApiFakeMode, t as createTinyOpenApiSourceRunner } from "./openapi-source.runner-BZ6ZLgRO.mjs";
 import path from "path";
 //#region src/vite/openapi-codegen.plugin.ts

package/package.json

@@ -141,5 +141,5 @@
     "node": ">= 18"
   },
   "packageManager": "bun@1.3.14",
-  "version": "3.2.0-rc.2"
+  "version": "3.2.0-rc.3"
 }