@povio/openapi-codegen-cli 3.2.2 → 3.2.4-rc.1

package/README.md

@@ -4,9 +4,11 @@
 
 **NOTE:** Version 1+ requires zod v4 and is not compatible with zod v3.
 
-**NOTE:** Version 2+ includes supporting classes/types/components for the generated code as well as auth, therefore it has peerDependencies for @tanstack/react-query, axios, react and zod. @casl/ability and @casl/react are also required if you are generating ACL checks and/or using imports from "@povio/openapi-codegen-cli/acl"!
+**NOTE:** The package includes supporting classes, types, components, and auth utilities. Zod is a required peer dependency. Axios, @tanstack/react-query, react, i18next, @casl/ability, @casl/react, and Vite are optional peers; install the ones used by your chosen features.
 
-Use this tool to generate code (Zod schemas, TypeScript types, API definitions, and React queries) from an OpenAPI v3 specification. API definitions are generated to use a REST client wrapper that utilizes Axios. React queries are generated in alignment with our code standards, without the need for explicit types.
+Axios is required when using the Axios transport (the default) or the `/axios` entry point. Projects using the native transport can omit Axios: generate with `--restClient native` and import `NativeRestClient` from `@povio/openapi-codegen-cli/native`. The root exports remain available for compatibility and support tree-shaking in consumer bundles. For direct runtime imports without bundling, use `/native` and `/errors` to avoid loading the Axios client. The `/axios` entry point is also available for Axios-specific imports. CLI-only usage and the `/generator`, `/tiny`, `/vite`, and `/metro` entry points do not require Axios.
+
+Use this tool to generate code (Zod schemas, TypeScript types, API definitions, and React queries) from an OpenAPI v3 specification. API definitions use a REST client wrapper with either Axios or the native transport. React queries are generated in alignment with our code standards, without the need for explicit types.
 
 The tool partially leverages code from [openapi-zod-client](https://github.com/astahmer/openapi-zod-client) repository.
 
@@ -33,7 +35,7 @@ The CLI supports TypeScript configuration files to simplify command execution an
 Create an `openapi-codegen.config.ts` file:
 
 ```typescript
-import { OpenAPICodegenConfig } from "@povio/openapi-codegen-cli";
+import type { OpenAPICodegenConfig } from "@povio/openapi-codegen-cli";
 
 const config: OpenAPICodegenConfig = {
   input: "http://localhost:4000/docs-json/",
@@ -159,6 +161,10 @@ Set `OPENAPI_CODEGEN_NATIVE=0` to force the TypeScript path, or `OPENAPI_CODEGEN
 
 Release packages include native binaries for Linux x64, macOS arm64, and Windows x64. Build a binary for the current platform with `bun run build:native`.
 
+Run `bun run test:parity` after building the addon to compare every generated file across 64 layout combinations and representative values for every other renderer option. The matrix uses both `test/petstore.yaml` and `test/configuration.yaml`, exercises complete native and hybrid native generation, and loads generated models to check runtime references. The contradictory combination `modelsInCommon: true` with `modelsInModules: true` is rejected explicitly. Arbitrary strings and lists are covered by representative cases, not every possible value.
+
+The separate Renderer parity workflow generates this matrix with JavaScript and native on Linux and macOS, then compares exact file lists and SHA-256 hashes. Artifacts include route reports identifying complete versus hybrid native generation. Runner integration tests cover input/output, stale-file cleanup, and unchanged files; `incremental` is currently retained as a compatibility option and does not change the writer's unchanged-file optimization.
+
 ## Common Issues
 
 ### App REST Client Interceptors
@@ -206,7 +212,7 @@ directly in query callbacks, error boundaries, or their own normalization layer.
 In order to add interceptors to the used REST client, you must create your own instance of a RestClient and pass your implemented interceptors into the constructor. Make sure to set `restClientImportPath` in your openapi generation configuration too.
 
 ```ts
-import { RestInterceptor } from "@povio/openapi-codegen-cli";
+import { RestInterceptor } from "@povio/openapi-codegen-cli/axios";
 
 import { ACCESS_TOKEN_KEY } from "@/config/jwt.config";
 
@@ -223,7 +229,7 @@ export const AuthorizationHeaderInterceptor = new RestInterceptor((client) => {
 ```
 
 ```ts
-import { RestClient } from "@povio/openapi-codegen-cli";
+import { RestClient } from "@povio/openapi-codegen-cli/axios";
 
 import { AuthorizationHeaderInterceptor } from "@/clients/rest/interceptors/authorization-header.interceptor";
 import { AppConfig } from "@/config/app.config";
@@ -252,7 +258,8 @@ export default config;
 Set `mutationDefaultOnError: true` in codegen config (or pass `--mutationDefaultOnError`) to let generated mutation hooks fall back to `OpenApiQueryConfig.Provider` when a mutation call does not define its own `onError`.
 
 ```tsx
-import { ErrorHandler, OpenApiQueryConfig } from "@povio/openapi-codegen-cli";
+import { ErrorHandler } from "@povio/openapi-codegen-cli/errors";
+import { OpenApiQueryConfig } from "@povio/openapi-codegen-cli/query";
 
 <OpenApiQueryConfig.Provider
   onError={(error) => {
@@ -278,7 +285,7 @@ Use `OpenApiQueryConfig.Provider` to allow generated GET query hooks to return i
 Set `workspaceContext` to a list of param names in codegen config (or pass `--workspaceContext officeId,projectId`) and wrap your app subtree with `OpenApiWorkspaceContext.Provider` if generated hooks frequently repeat workspace-scoped params.
 
 ```tsx
-import { OpenApiWorkspaceContext } from "@povio/openapi-codegen-cli";
+import { OpenApiWorkspaceContext } from "@povio/openapi-codegen-cli/config";
 // openapi-codegen.config.ts -> { workspaceContext: ["officeId", "projectId"] }
 
 <OpenApiWorkspaceContext.Provider values={{ officeId: "office_123" }}>
@@ -550,3 +557,22 @@ export class JSONDto {
   nested: NestedDto;
 }
 ```
+
+### Runtime import paths
+
+Use package subpaths for runtime imports. Pure `import type` imports may use the package root.
+
+| Runtime exports | Subpath |
+| --- | --- |
+| `AuthContext`, `AuthGuard` | `/auth` |
+| `AbilityContext`, `useAclCheck`, `Can`, `createAclGuard` | `/acl` |
+| `ErrorHandler`, `SharedErrorHandler`, `ApplicationException`, `DomainErrorRegistry` | `/errors` |
+| `useMutationEffects`, `OpenApiQueryConfig` | `/query` |
+| `OpenApiRouter`, `OpenApiWorkspaceContext`, `useWorkspaceContext`, translation configuration | `/config` |
+| `ZodExtended` | `/zod` |
+| `HttpError`, transport types | `/rest` |
+| `NativeRestClient` | `/native` |
+| `RestClient`, `RestInterceptor` (Axios transport) | `/axios` |
+
+For example: `import { AuthContext, AuthGuard } from "@povio/openapi-codegen-cli/auth"`.
+Custom application helpers should import error helpers from `/errors`, `AbilityContext` from `/acl`, and mutation effects from `/query`.

package/dist/acl.mjs

@@ -1,4 +1,4 @@
-import { i as SharedErrorHandler } from "./error-handling-BeydPL7s.mjs";
+import { i as SharedErrorHandler } from "./error-handling-uS0DgYUR.mjs";
 import { t as OpenApiRouter } from "./router.context-EPlMBk3G.mjs";
 import { t as AuthContext } from "./auth.context-COWO6ssl.mjs";
 import { createContext, useCallback, useMemo } from "react";

package/dist/axios.mjs

@@ -1,2 +1,2 @@
-import { n as RestClient, t as RestInterceptor } from "./rest-interceptor-D5NCNTm1.mjs";
+import { n as RestClient, t as RestInterceptor } from "./rest-interceptor-Dm9DFErh.mjs";
 export { RestClient, RestInterceptor };

package/dist/{error-handling-BeydPL7s.mjs → error-handling-uS0DgYUR.mjs}

@@ -37,8 +37,8 @@ let RestUtils;
 		return null;
 	};
 	_RestUtils.extractContentDispositionFilename = (headers) => {
-		const contentDisposition = headers["content-disposition"];
-		return contentDisposition ? /filename=["']?([^"';]+)/i.exec(contentDisposition)?.[1] : void 0;
+		const contentDisposition = headers instanceof Headers ? headers.get("content-disposition") : headers["content-disposition"];
+		return typeof contentDisposition === "string" ? /filename=["']?([^"';]+)/i.exec(contentDisposition)?.[1] : void 0;
 	};
 })(RestUtils || (RestUtils = {}));
 //#endregion

package/dist/errors.d.mts

@@ -1,3 +1,3 @@
 import { a as ErrorHandler, c as SharedErrorHandler, i as ErrorEntry, n as DomainErrorEntry, o as ErrorHandlerOptions, r as DomainErrorRegistry, s as GeneralErrorCodes, t as ApplicationException } from "./error-handling-LPEPQV1V.mjs";
-import { t as RestUtils } from "./rest.utils-rezWAIYL.mjs";
+import { t as RestUtils } from "./rest.utils-DpiFIdhF.mjs";
 export { ApplicationException, type DomainErrorEntry, DomainErrorRegistry, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, RestUtils, SharedErrorHandler };

package/dist/errors.mjs

@@ -1,2 +1,2 @@
-import { a as RestUtils, i as SharedErrorHandler, n as DomainErrorRegistry, r as ErrorHandler, t as ApplicationException } from "./error-handling-BeydPL7s.mjs";
+import { a as RestUtils, i as SharedErrorHandler, n as DomainErrorRegistry, r as ErrorHandler, t as ApplicationException } from "./error-handling-uS0DgYUR.mjs";
 export { ApplicationException, DomainErrorRegistry, ErrorHandler, RestUtils, SharedErrorHandler };

package/dist/{generate.runner-BD9BbYIx.mjs → generate.runner-C3n76bDK.mjs}

@@ -367,6 +367,7 @@ const getNamespaceName = ({ type, tag, options }) => `${capitalize(tag)}${option
 //#endregion
 //#region src/generators/const/package.const.ts
 const PACKAGE_IMPORT_PATH = "@povio/openapi-codegen-cli";
+const AXIOS_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/axios`;
 const NATIVE_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/native`;
 const REST_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/rest`;
 const QUERY_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/query`;
@@ -617,10 +618,10 @@ function getSchemaDescriptions(schemaObj) {
 }
 //#endregion
 //#region src/generators/utils/generate/generate.zod.utils.ts
-const getZodSchemaInferedTypeName = (zodSchemaName, options) => removeSuffix(zodSchemaName, options.schemaSuffix);
+const getZodSchemaInferedTypeName = (zodSchemaName, options) => removeSuffix(isNamedZodSchema(zodSchemaName) ? zodSchemaName.split(".")[0] : zodSchemaName, options.schemaSuffix);
 const getImportedZodSchemaName = (resolver, zodSchemaName, namespaceTag) => {
 	if (!isNamedZodSchema(zodSchemaName)) return zodSchemaName;
-	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag);
+	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName.split(".")[0], namespaceTag);
 	return `${resolver.options.tsNamespaces ? `${getNamespaceName({
 		type: "models",
 		tag,
@@ -633,7 +634,7 @@ function getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag) {
 }
 const getImportedZodSchemaInferedTypeName = (resolver, zodSchemaName, currentTag, namespaceTag) => {
 	if (!isNamedZodSchema(zodSchemaName)) return zodSchemaName === "z.void()" ? "void" : zodSchemaName;
-	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag);
+	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName.split(".")[0], namespaceTag);
 	return `${resolver.options.tsNamespaces && (Boolean(namespaceTag) || tag !== currentTag) ? `${getNamespaceName({
 		type: "models",
 		tag,
@@ -834,13 +835,13 @@ const getImportedInfiniteQueryName = (endpoint, options) => {
 //#region src/generators/utils/generate/generate.imports.utils.ts
 function getModelsImports({ resolver, tag, zodSchemas = [], zodSchemasAsTypes = [] }) {
 	const type = "models";
-	const getTag = (zodSchemaName) => resolver.getTagByZodSchemaName(zodSchemaName);
+	const getTag = (zodSchemaName) => resolver.getTagByZodSchemaName(zodSchemaName.split(".")[0]);
 	const zodSchemaImports = getImports({
 		type,
 		tag,
 		entities: zodSchemas,
 		getTag,
-		getEntityName: (zodSchema) => zodSchema,
+		getEntityName: (zodSchema) => zodSchema.split(".")[0],
 		options: resolver.options
 	});
 	const zodSchemaTypeImports = getImports({
@@ -978,7 +979,7 @@ function getQueryModulesImportPath(options) {
 	return `${getImportPath(options)}${QUERY_MODULES_FILE.fileName}`;
 }
 function getQueryTypesImportPath(options) {
-	return options.queryTypesImportPath;
+	return options.queryTypesImportPath === "@povio/openapi-codegen-cli" ? QUERY_PACKAGE_IMPORT_PATH : options.queryTypesImportPath;
 }
 //#endregion
 //#region src/generators/utils/ts.utils.ts
@@ -1446,6 +1447,7 @@ function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, in
 		inlineEndpointsExcludeModules: inlineEndpointsExcludeModules?.split(","),
 		workspaceContext: workspaceContext?.split(",")
 	});
+	if (resolvedConfig.modelsInCommon && resolvedConfig.modelsInModules) throw new Error("modelsInCommon and modelsInModules cannot both be enabled");
 	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
 	resolvedConfig.workspaceContext = Array.from(new Set((resolvedConfig.workspaceContext ?? []).map((value) => value.trim()).filter(Boolean)));
 	return resolvedConfig;
@@ -1493,6 +1495,10 @@ function compileNativeData(source, yaml, optionsJson) {
 //#endregion
 //#region src/native/generateFilesFromNativeOpenAPI.ts
 function generateFilesFromNativeOpenAPI(source, yaml, options) {
+	if (options.standalone && options.importPath === "ts") options = {
+		...options,
+		importPath: "relative"
+	};
 	if (!supportsCompleteNativeRender(options)) {
 		if (process.env.OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE === "1") throw new Error("The selected options are not supported by the full native renderer");
 		return;
@@ -1519,7 +1525,7 @@ function generateFilesFromNativeOpenAPI(source, yaml, options) {
 	if (!options.modelsOnly) {
 		if (options.acl && nativeData.renderedShared.appAcl) files.push(outputFile(options, "acl/app.ability.ts", nativeData.renderedShared.appAcl));
 		if (options.mutationEffects && nativeData.renderedShared.queryModules) files.push(outputFile(options, "queryModules.ts", nativeData.renderedShared.queryModules));
-		if (!options.restClientImportPath) files.push(outputFile(options, "app-rest-client.ts", `import { ${options.restClient === "native" ? "NativeRestClient" : "RestClient"} } from "@povio/openapi-codegen-cli${options.restClient === "native" ? "/native" : ""}";\n\nexport const AppRestClient = new ${options.restClient === "native" ? "NativeRestClient" : "RestClient"}({\n  config: {\n    baseURL: "${nativeData.baseUrl}"\n  },\n});\n`));
+		if (!options.restClientImportPath) files.push(outputFile(options, "app-rest-client.ts", `import { ${options.restClient === "native" ? "NativeRestClient" : "RestClient"} } from "@povio/openapi-codegen-cli${options.restClient === "native" ? "/native" : "/axios"}";\n\nexport const AppRestClient = new ${options.restClient === "native" ? "NativeRestClient" : "RestClient"}({\n  config: {\n    baseURL: "${nativeData.baseUrl}"\n  },\n});\n`));
 		if (nativeData.renderedShared.domainErrors) files.push(outputFile(options, "domain-errors.ts", nativeData.renderedShared.domainErrors));
 	}
 	return files;
@@ -1569,7 +1575,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-idp1RVDa.mjs").then((n) => n.n);
+		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-eP5cooBd.mjs").then((n) => n.n);
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml
@@ -1657,4 +1663,4 @@ function getGenerateStats(filesData, config) {
 	};
 }
 //#endregion
-export { getImportedAbilityFunctionName as $, isPrimitiveType as $t, getEndpointsImports as A, NATIVE_RESPONSE_TYPE as An, APP_REST_CLIENT_NAME as At, getPrefetchInfiniteQueryName as B, getMostCommonAdjacentCombinationSplit as Bn, PACKAGE_IMPORT_PATH as Bt, getAppRestClientImportPath as C, ZOD_IMPORT as Cn, getParamZodSchemaName as Ct, getTagFileName as D, AXIOS_REQUEST_CONFIG_TYPE as Dn, isEnumZodSchema as Dt, getQueryTypesImportPath as E, AXIOS_REQUEST_CONFIG_NAME as En, getZodSchemaOperationName as Et, mergeImports as F, isTagIncluded as Fn, QUERY_MODULE_ENUM as Ft, getAbilityConditionType as G, getParameterEnumNames as Gt, getQueryName as H, removeWord as Hn, getNamespaceName as Ht, getImportedInfiniteQueryName as I, shouldInlineEndpointsForTag as In, QUERY_OPTIONS_TYPES as It, getAbilityFunctionName as J, isErrorStatus as Jt, getAbilityConditionsTypes as K, getSchemaNameByRef as Kt, getImportedQueryName as L, camelToSpaceSeparated as Ln, ZOD_EXTENDED as Lt, getInfiniteQueriesImports as M, formatTag as Mn, DOMAIN_ERRORS_FILE as Mt, getModelsImports as N, getEndpointTag as Nn, MUTATION_EFFECTS as Nt, getTagImportPath as O, BODY_PARAMETER_NAME as On, isNamedZodSchema as Ot, getQueriesImports as P, getOperationTag as Pn, QUERY_MODULES_FILE as Pt, getAppAbilitiesType as Q, isPathExcluded as Qt, getInfiniteQueryName as R, capitalize as Rn, CONFIG_PACKAGE_IMPORT_PATH as Rt, getTsTypeBase as S, VOID_SCHEMA as Sn, getEnumZodSchemaName as St, getQueryModulesImportPath as T, AXIOS_IMPORT as Tn, getZodSchemaName as Tt, getQueryOptionsName as U, snakeToCamel as Un, autocorrectRef as Ut, getPrefetchQueryName as V, kebabToCamel as Vn, REST_PACKAGE_IMPORT_PATH as Vt, getAbilityAction as W, Profiler as Wn, escapeControlCharacters as Wt, getAbilitySubjectTypes as X, isMediaTypeAllowed as Xt, getAbilitySubject as Y, isMainResponseStatus as Yt, getAclData as Z, isParamMediaTypeAllowed as Zt, hasEndpointConfig as _, INT_SCHEMA as _n, isReadAllEndpoint as _t, resolveConfig as a, wrapWithQuotesIfNeeded as an, getZodSchemaInferedTypeName as at, requiresBody as b, URL_SCHEMA as bn, invalidVariableNameCharactersToCamel as bt, getDestructuredVariables as c, isReferenceObject as cn, getSchemaDescriptions as ct, isQuery as d, ALLOWED_PATH_IN as dn, DEFAULT_GENERATE_OPTIONS as dt, isSortingParameterObject as en, hasAbilityConditions as et, getEndpointBody as f, ANY_SCHEMA as fn, getPathSegments as ft, getImportedEndpointName as g, ENUM_SCHEMA as gn, isPathSegmentParam as gt, getEndpointPath as h, EMAIL_SCHEMA as hn, isDeleteEndpoint as ht, shouldUseNativeCodegen as i, unwrapQuotesIfNeeded as in, getZodSchemaDescription as it, getImportPath as j, getRequestConfigTypeName as jn, BUILDERS_UTILS as jt, getAclImports as k, JSON_APPLICATION_FORMAT as kn, APP_REST_CLIENT_FILE as kt, isInfiniteQuery as l, isSchemaObject as ln, iterateSchema as lt, getEndpointName as m, DATETIME_SCHEMA as mn, isCreateEndpoint as mt, runGenerate as n, pathToVariableName as nn, getImportedZodSchemaInferedTypeName as nt, getOutputFileName as o, inferRequiredSchema as on, getZodSchemaPropertyDescriptions as ot, getEndpointConfig as p, BLOB_SCHEMA as pn, isBulkDeleteEndpoint as pt, getAbilityDescription as q, getSchemaRef as qt, compileNativeData as r, replaceHyphenatedPath as rn, getImportedZodSchemaName as rt, pick as s, isArraySchemaObject as sn, getZodSchemaType as st, getOpenApiDoc as t, pathParamToVariableName as tn, renderAclCheckCall as tt, isMutation as u, ALLOWED_METHODS as un, getUniqueArray as ut, mapEndpointParamsToFunctionParams as v, NUMBER_SCHEMA as vn, isReadEndpoint as vt, getFileNameWithExtension as w, AXIOS_DEFAULT_IMPORT_NAME as wn, getResponseZodSchemaName as wt, getSchemaTsMetaType as x, UUID_SCHEMA as xn, getBodyZodSchemaName as xt, renderMediaUploadMutationBody as y, STRING_SCHEMA as yn, isUpdateEndpoint as yt, getInfiniteQueryOptionsName as z, decapitalize as zn, NATIVE_PACKAGE_IMPORT_PATH as zt };
+export { getImportedAbilityFunctionName as $, isPrimitiveType as $t, getEndpointsImports as A, NATIVE_RESPONSE_TYPE as An, APP_REST_CLIENT_NAME as At, getPrefetchInfiniteQueryName as B, getMostCommonAdjacentCombinationSplit as Bn, NATIVE_PACKAGE_IMPORT_PATH as Bt, getAppRestClientImportPath as C, ZOD_IMPORT as Cn, getParamZodSchemaName as Ct, getTagFileName as D, AXIOS_REQUEST_CONFIG_TYPE as Dn, isEnumZodSchema as Dt, getQueryTypesImportPath as E, AXIOS_REQUEST_CONFIG_NAME as En, getZodSchemaOperationName as Et, mergeImports as F, isTagIncluded as Fn, QUERY_MODULE_ENUM as Ft, getAbilityConditionType as G, getParameterEnumNames as Gt, getQueryName as H, removeWord as Hn, getNamespaceName as Ht, getImportedInfiniteQueryName as I, shouldInlineEndpointsForTag as In, QUERY_OPTIONS_TYPES as It, getAbilityFunctionName as J, isErrorStatus as Jt, getAbilityConditionsTypes as K, getSchemaNameByRef as Kt, getImportedQueryName as L, camelToSpaceSeparated as Ln, ZOD_EXTENDED as Lt, getInfiniteQueriesImports as M, formatTag as Mn, DOMAIN_ERRORS_FILE as Mt, getModelsImports as N, getEndpointTag as Nn, MUTATION_EFFECTS as Nt, getTagImportPath as O, BODY_PARAMETER_NAME as On, isNamedZodSchema as Ot, getQueriesImports as P, getOperationTag as Pn, QUERY_MODULES_FILE as Pt, getAppAbilitiesType as Q, isPathExcluded as Qt, getInfiniteQueryName as R, capitalize as Rn, AXIOS_PACKAGE_IMPORT_PATH as Rt, getTsTypeBase as S, VOID_SCHEMA as Sn, getEnumZodSchemaName as St, getQueryModulesImportPath as T, AXIOS_IMPORT as Tn, getZodSchemaName as Tt, getQueryOptionsName as U, snakeToCamel as Un, autocorrectRef as Ut, getPrefetchQueryName as V, kebabToCamel as Vn, REST_PACKAGE_IMPORT_PATH as Vt, getAbilityAction as W, Profiler as Wn, escapeControlCharacters as Wt, getAbilitySubjectTypes as X, isMediaTypeAllowed as Xt, getAbilitySubject as Y, isMainResponseStatus as Yt, getAclData as Z, isParamMediaTypeAllowed as Zt, hasEndpointConfig as _, INT_SCHEMA as _n, isReadAllEndpoint as _t, resolveConfig as a, wrapWithQuotesIfNeeded as an, getZodSchemaInferedTypeName as at, requiresBody as b, URL_SCHEMA as bn, invalidVariableNameCharactersToCamel as bt, getDestructuredVariables as c, isReferenceObject as cn, getSchemaDescriptions as ct, isQuery as d, ALLOWED_PATH_IN as dn, DEFAULT_GENERATE_OPTIONS as dt, isSortingParameterObject as en, hasAbilityConditions as et, getEndpointBody as f, ANY_SCHEMA as fn, getPathSegments as ft, getImportedEndpointName as g, ENUM_SCHEMA as gn, isPathSegmentParam as gt, getEndpointPath as h, EMAIL_SCHEMA as hn, isDeleteEndpoint as ht, shouldUseNativeCodegen as i, unwrapQuotesIfNeeded as in, getZodSchemaDescription as it, getImportPath as j, getRequestConfigTypeName as jn, BUILDERS_UTILS as jt, getAclImports as k, JSON_APPLICATION_FORMAT as kn, APP_REST_CLIENT_FILE as kt, isInfiniteQuery as l, isSchemaObject as ln, iterateSchema as lt, getEndpointName as m, DATETIME_SCHEMA as mn, isCreateEndpoint as mt, runGenerate as n, pathToVariableName as nn, getImportedZodSchemaInferedTypeName as nt, getOutputFileName as o, inferRequiredSchema as on, getZodSchemaPropertyDescriptions as ot, getEndpointConfig as p, BLOB_SCHEMA as pn, isBulkDeleteEndpoint as pt, getAbilityDescription as q, getSchemaRef as qt, compileNativeData as r, replaceHyphenatedPath as rn, getImportedZodSchemaName as rt, pick as s, isArraySchemaObject as sn, getZodSchemaType as st, getOpenApiDoc as t, pathParamToVariableName as tn, renderAclCheckCall as tt, isMutation as u, ALLOWED_METHODS as un, getUniqueArray as ut, mapEndpointParamsToFunctionParams as v, NUMBER_SCHEMA as vn, isReadEndpoint as vt, getFileNameWithExtension as w, AXIOS_DEFAULT_IMPORT_NAME as wn, getResponseZodSchemaName as wt, getSchemaTsMetaType as x, UUID_SCHEMA as xn, getBodyZodSchemaName as xt, renderMediaUploadMutationBody as y, STRING_SCHEMA as yn, isUpdateEndpoint as yt, getInfiniteQueryOptionsName as z, decapitalize as zn, CONFIG_PACKAGE_IMPORT_PATH as zt };

package/dist/{generate.utils-BqlgVd-i.cjs → generate.utils-wn-hR9hY.cjs}

@@ -33,6 +33,7 @@ node_path = __toESM(node_path, 1);
 let openapi_types = require("openapi-types");
 //#region src/generators/const/package.const.ts
 const PACKAGE_IMPORT_PATH = "@povio/openapi-codegen-cli";
+const AXIOS_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/axios`;
 const NATIVE_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/native`;
 const REST_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/rest`;
 const QUERY_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/query`;
@@ -790,10 +791,10 @@ function getSchemaDescriptions(schemaObj) {
 }
 //#endregion
 //#region src/generators/utils/generate/generate.zod.utils.ts
-const getZodSchemaInferedTypeName = (zodSchemaName, options) => removeSuffix(zodSchemaName, options.schemaSuffix);
+const getZodSchemaInferedTypeName = (zodSchemaName, options) => removeSuffix(isNamedZodSchema(zodSchemaName) ? zodSchemaName.split(".")[0] : zodSchemaName, options.schemaSuffix);
 const getImportedZodSchemaName = (resolver, zodSchemaName, namespaceTag) => {
 	if (!isNamedZodSchema(zodSchemaName)) return zodSchemaName;
-	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag);
+	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName.split(".")[0], namespaceTag);
 	return `${resolver.options.tsNamespaces ? `${getNamespaceName({
 		type: "models",
 		tag,
@@ -806,7 +807,7 @@ function getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag) {
 }
 const getImportedZodSchemaInferedTypeName = (resolver, zodSchemaName, currentTag, namespaceTag) => {
 	if (!isNamedZodSchema(zodSchemaName)) return zodSchemaName === "z.void()" ? "void" : zodSchemaName;
-	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName, namespaceTag);
+	const tag = getOwningOrLocalProxyTag(resolver, zodSchemaName.split(".")[0], namespaceTag);
 	return `${resolver.options.tsNamespaces && (Boolean(namespaceTag) || tag !== currentTag) ? `${getNamespaceName({
 		type: "models",
 		tag,
@@ -1212,13 +1213,13 @@ const getImportedInfiniteQueryName = (endpoint, options) => {
 //#region src/generators/utils/generate/generate.imports.utils.ts
 function getModelsImports({ resolver, tag, zodSchemas = [], zodSchemasAsTypes = [] }) {
 	const type = "models";
-	const getTag = (zodSchemaName) => resolver.getTagByZodSchemaName(zodSchemaName);
+	const getTag = (zodSchemaName) => resolver.getTagByZodSchemaName(zodSchemaName.split(".")[0]);
 	const zodSchemaImports = getImports({
 		type,
 		tag,
 		entities: zodSchemas,
 		getTag,
-		getEntityName: (zodSchema) => zodSchema,
+		getEntityName: (zodSchema) => zodSchema.split(".")[0],
 		options: resolver.options
 	});
 	const zodSchemaTypeImports = getImports({
@@ -1356,7 +1357,7 @@ function getQueryModulesImportPath(options) {
 	return `${getImportPath(options)}${QUERY_MODULES_FILE.fileName}`;
 }
 function getQueryTypesImportPath(options) {
-	return options.queryTypesImportPath;
+	return options.queryTypesImportPath === "@povio/openapi-codegen-cli" ? QUERY_PACKAGE_IMPORT_PATH : options.queryTypesImportPath;
 }
 //#endregion
 Object.defineProperty(exports, "ALLOWED_METHODS", {
@@ -1401,6 +1402,12 @@ Object.defineProperty(exports, "AXIOS_IMPORT", {
 		return AXIOS_IMPORT;
 	}
 });
+Object.defineProperty(exports, "AXIOS_PACKAGE_IMPORT_PATH", {
+	enumerable: true,
+	get: function() {
+		return AXIOS_PACKAGE_IMPORT_PATH;
+	}
+});
 Object.defineProperty(exports, "AXIOS_REQUEST_CONFIG_NAME", {
 	enumerable: true,
 	get: function() {
@@ -1503,12 +1510,6 @@ Object.defineProperty(exports, "NUMBER_SCHEMA", {
 		return NUMBER_SCHEMA;
 	}
 });
-Object.defineProperty(exports, "PACKAGE_IMPORT_PATH", {
-	enumerable: true,
-	get: function() {
-		return PACKAGE_IMPORT_PATH;
-	}
-});
 Object.defineProperty(exports, "Profiler", {
 	enumerable: true,
 	get: function() {

package/dist/{generateCodeFromOpenAPIDoc-idp1RVDa.mjs → generateCodeFromOpenAPIDoc-eP5cooBd.mjs}

@@ -1,5 +1,5 @@
-import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cyrm3VKA.mjs";
-import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as NATIVE_RESPONSE_TYPE, At as APP_REST_CLIENT_NAME, B as getPrefetchInfiniteQueryName, Bt as PACKAGE_IMPORT_PATH, C as getAppRestClientImportPath, Cn as ZOD_IMPORT, D as getTagFileName, Dn as AXIOS_REQUEST_CONFIG_TYPE, Dt as isEnumZodSchema, E as getQueryTypesImportPath, En as AXIOS_REQUEST_CONFIG_NAME, F as mergeImports, Ft as QUERY_MODULE_ENUM, G as getAbilityConditionType, H as getQueryName, Ht as getNamespaceName, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as QUERY_OPTIONS_TYPES, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as ZOD_EXTENDED, M as getInfiniteQueriesImports, Mt as DOMAIN_ERRORS_FILE, N as getModelsImports, Nn as getEndpointTag, Nt as MUTATION_EFFECTS, O as getTagImportPath, Ot as isNamedZodSchema, P as getQueriesImports, Pt as QUERY_MODULES_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as CONFIG_PACKAGE_IMPORT_PATH, T as getQueryModulesImportPath, Tn as AXIOS_IMPORT, U as getQueryOptionsName, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as REST_PACKAGE_IMPORT_PATH, W as getAbilityAction, Wn as Profiler, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, Zt as isParamMediaTypeAllowed, _ as hasEndpointConfig, _t as isReadAllEndpoint, an as wrapWithQuotesIfNeeded, at as getZodSchemaInferedTypeName, b as requiresBody, bt as invalidVariableNameCharactersToCamel, c as getDestructuredVariables, cn as isReferenceObject, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as ANY_SCHEMA, ft as getPathSegments, g as getImportedEndpointName, gt as isPathSegmentParam, h as getEndpointPath, ht as isDeleteEndpoint, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as getRequestConfigTypeName, jt as BUILDERS_UTILS, k as getAclImports, kn as JSON_APPLICATION_FORMAT, kt as APP_REST_CLIENT_FILE, l as isInfiniteQuery, ln as isSchemaObject, m as getEndpointName, mt as isCreateEndpoint, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as isBulkDeleteEndpoint, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isReadEndpoint, w as getFileNameWithExtension, wn as AXIOS_DEFAULT_IMPORT_NAME, y as renderMediaUploadMutationBody, yt as isUpdateEndpoint, z as getInfiniteQueryOptionsName, zt as NATIVE_PACKAGE_IMPORT_PATH } from "./generate.runner-BD9BbYIx.mjs";
+import { r as getZodSchemaRefs, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cya5Q-2W.mjs";
+import { $ as getImportedAbilityFunctionName, A as getEndpointsImports, An as NATIVE_RESPONSE_TYPE, At as APP_REST_CLIENT_NAME, B as getPrefetchInfiniteQueryName, Bt as NATIVE_PACKAGE_IMPORT_PATH, C as getAppRestClientImportPath, Cn as ZOD_IMPORT, D as getTagFileName, Dn as AXIOS_REQUEST_CONFIG_TYPE, Dt as isEnumZodSchema, E as getQueryTypesImportPath, En as AXIOS_REQUEST_CONFIG_NAME, F as mergeImports, Ft as QUERY_MODULE_ENUM, G as getAbilityConditionType, H as getQueryName, Ht as getNamespaceName, I as getImportedInfiniteQueryName, In as shouldInlineEndpointsForTag, It as QUERY_OPTIONS_TYPES, J as getAbilityFunctionName, K as getAbilityConditionsTypes, L as getImportedQueryName, Ln as camelToSpaceSeparated, Lt as ZOD_EXTENDED, M as getInfiniteQueriesImports, Mt as DOMAIN_ERRORS_FILE, N as getModelsImports, Nn as getEndpointTag, Nt as MUTATION_EFFECTS, O as getTagImportPath, Ot as isNamedZodSchema, P as getQueriesImports, Pt as QUERY_MODULES_FILE, Q as getAppAbilitiesType, R as getInfiniteQueryName, Rn as capitalize, Rt as AXIOS_PACKAGE_IMPORT_PATH, T as getQueryModulesImportPath, Tn as AXIOS_IMPORT, U as getQueryOptionsName, V as getPrefetchQueryName, Vn as kebabToCamel, Vt as REST_PACKAGE_IMPORT_PATH, W as getAbilityAction, Wn as Profiler, X as getAbilitySubjectTypes, Y as getAbilitySubject, Z as getAclData, Zt as isParamMediaTypeAllowed, _ as hasEndpointConfig, _t as isReadAllEndpoint, an as wrapWithQuotesIfNeeded, at as getZodSchemaInferedTypeName, b as requiresBody, bt as invalidVariableNameCharactersToCamel, c as getDestructuredVariables, cn as isReferenceObject, ct as getSchemaDescriptions, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, et as hasAbilityConditions, f as getEndpointBody, fn as ANY_SCHEMA, ft as getPathSegments, g as getImportedEndpointName, gt as isPathSegmentParam, h as getEndpointPath, ht as isDeleteEndpoint, i as shouldUseNativeCodegen, it as getZodSchemaDescription, j as getImportPath, jn as getRequestConfigTypeName, jt as BUILDERS_UTILS, k as getAclImports, kn as JSON_APPLICATION_FORMAT, kt as APP_REST_CLIENT_FILE, l as isInfiniteQuery, ln as isSchemaObject, m as getEndpointName, mt as isCreateEndpoint, nt as getImportedZodSchemaInferedTypeName, o as getOutputFileName, ot as getZodSchemaPropertyDescriptions, p as getEndpointConfig, pt as isBulkDeleteEndpoint, q as getAbilityDescription, r as compileNativeData, rt as getImportedZodSchemaName, st as getZodSchemaType, tt as renderAclCheckCall, u as isMutation, ut as getUniqueArray, v as mapEndpointParamsToFunctionParams, vt as isReadEndpoint, w as getFileNameWithExtension, wn as AXIOS_DEFAULT_IMPORT_NAME, y as renderMediaUploadMutationBody, yt as isUpdateEndpoint, z as getInfiniteQueryOptionsName, zt as CONFIG_PACKAGE_IMPORT_PATH } from "./generate.runner-C3n76bDK.mjs";
 import "node:module";
 //#region \0rolldown/runtime.js
 var __defProp = Object.defineProperty;
@@ -1722,7 +1722,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 //#region src/generators/generate/generateAppRestClient.ts
 function generateAppRestClient(resolver) {
 	const clientName = resolver.options.restClient === "native" ? "NativeRestClient" : "RestClient";
-	return `import { ${clientName} } from "${resolver.options.restClient === "native" ? NATIVE_PACKAGE_IMPORT_PATH : PACKAGE_IMPORT_PATH}";
+	return `import { ${clientName} } from "${resolver.options.restClient === "native" ? NATIVE_PACKAGE_IMPORT_PATH : AXIOS_PACKAGE_IMPORT_PATH}";
 
 export const ${APP_REST_CLIENT_NAME} = new ${clientName}({
   config: {
@@ -1916,7 +1916,7 @@ var NativeSchemaResolver = class {
 		return this.nameByRef.get(normalizeRef(ref));
 	}
 	getTagByZodSchemaName(name) {
-		return this.options.modelsInCommon ? this.options.defaultTag : this.nativeData.schemaOwners[name];
+		return !this.options.splitByTags || this.options.modelsInCommon ? this.options.defaultTag : this.nativeData.schemaOwners[name] ?? this.options.defaultTag;
 	}
 	isSchemaCircular(ref) {
 		const name = this.nameByRef.get(normalizeRef(ref));
@@ -2032,8 +2032,8 @@ function getDataFromNativeOpenAPIDoc(openApiDoc, options, nativeSource) {
 	}
 	for (const endpoint of nativeData.endpoints) getTagElement(getEndpointTag(endpoint, options), data).endpoints.push(endpoint);
 	for (const [name, code] of Object.entries(nativeData.schemas)) {
-		const tag = options.modelsInCommon ? options.defaultTag : nativeData.schemaOwners[name];
-		if (tag) getTagElement(tag, data).zodSchemas[name] = code;
+		const tags = options.modelsInModules ? nativeData.schemaUsageTags[name] ?? [options.defaultTag] : [options.modelsInCommon ? options.defaultTag : nativeData.schemaOwners[name]];
+		for (const tag of tags) if (tag) getTagElement(tag, data).zodSchemas[name] = code;
 	}
 	if (process.env.OPENAPI_NATIVE_PROFILE === "1") console.error(`native bridge load=${(afterLoad - started).toFixed(1)}ms call=${(afterNative - afterLoad).toFixed(1)}ms parse=${(afterParse - afterNative).toFixed(1)}ms facade=${(afterResolver - afterParse).toFixed(1)}ms split=${(performance.now() - afterResolver).toFixed(1)}ms`);
 	return {

package/dist/{generateCodeFromOpenAPIDoc-CkVgg5Zy.cjs → generateCodeFromOpenAPIDoc-ejdqJZ2M.cjs}

@@ -1,4 +1,4 @@
-const require_generate_utils = require("./generate.utils-BqlgVd-i.cjs");
+const require_generate_utils = require("./generate.utils-wn-hR9hY.cjs");
 //#region src/generators/const/acl.const.ts
 const ACL_APP_ABILITY_FILE = {
 	fileName: "acl/app.ability",
@@ -3705,7 +3705,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 //#region src/generators/generate/generateAppRestClient.ts
 function generateAppRestClient(resolver) {
 	const clientName = resolver.options.restClient === "native" ? "NativeRestClient" : "RestClient";
-	return `import { ${clientName} } from "${resolver.options.restClient === "native" ? require_generate_utils.NATIVE_PACKAGE_IMPORT_PATH : require_generate_utils.PACKAGE_IMPORT_PATH}";
+	return `import { ${clientName} } from "${resolver.options.restClient === "native" ? require_generate_utils.NATIVE_PACKAGE_IMPORT_PATH : require_generate_utils.AXIOS_PACKAGE_IMPORT_PATH}";
 
 export const ${require_generate_utils.APP_REST_CLIENT_NAME} = new ${clientName}({
   config: {
@@ -3899,7 +3899,7 @@ var NativeSchemaResolver = class {
 		return this.nameByRef.get(normalizeRef(ref));
 	}
 	getTagByZodSchemaName(name) {
-		return this.options.modelsInCommon ? this.options.defaultTag : this.nativeData.schemaOwners[name];
+		return !this.options.splitByTags || this.options.modelsInCommon ? this.options.defaultTag : this.nativeData.schemaOwners[name] ?? this.options.defaultTag;
 	}
 	isSchemaCircular(ref) {
 		const name = this.nameByRef.get(normalizeRef(ref));
@@ -4015,8 +4015,8 @@ function getDataFromNativeOpenAPIDoc(openApiDoc, options, nativeSource) {
 	}
 	for (const endpoint of nativeData.endpoints) getTagElement(require_generate_utils.getEndpointTag(endpoint, options), data).endpoints.push(endpoint);
 	for (const [name, code] of Object.entries(nativeData.schemas)) {
-		const tag = options.modelsInCommon ? options.defaultTag : nativeData.schemaOwners[name];
-		if (tag) getTagElement(tag, data).zodSchemas[name] = code;
+		const tags = options.modelsInModules ? nativeData.schemaUsageTags[name] ?? [options.defaultTag] : [options.modelsInCommon ? options.defaultTag : nativeData.schemaOwners[name]];
+		for (const tag of tags) if (tag) getTagElement(tag, data).zodSchemas[name] = code;
 	}
 	if (process.env.OPENAPI_NATIVE_PROFILE === "1") console.error(`native bridge load=${(afterLoad - started).toFixed(1)}ms call=${(afterNative - afterLoad).toFixed(1)}ms parse=${(afterParse - afterNative).toFixed(1)}ms facade=${(afterResolver - afterParse).toFixed(1)}ms split=${(performance.now() - afterResolver).toFixed(1)}ms`);
 	return {

package/dist/generator.mjs

@@ -1,6 +1,6 @@
-import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-idp1RVDa.mjs";
-import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cyrm3VKA.mjs";
-import { H as getQueryName, Ht as getNamespaceName, Mn as formatTag, O as getTagImportPath, S as getTsTypeBase, Xt as isMediaTypeAllowed, Zt as isParamMediaTypeAllowed, bt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-BD9BbYIx.mjs";
+import { t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-eP5cooBd.mjs";
+import { t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cya5Q-2W.mjs";
+import { H as getQueryName, Ht as getNamespaceName, Mn as formatTag, O as getTagImportPath, S as getTsTypeBase, Xt as isMediaTypeAllowed, Zt as isParamMediaTypeAllowed, bt as invalidVariableNameCharactersToCamel, d as isQuery, dt as DEFAULT_GENERATE_OPTIONS, t as getOpenApiDoc, u as isMutation, x as getSchemaTsMetaType } from "./generate.runner-C3n76bDK.mjs";
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts
 async function getMetadataFromOpenAPIDoc(openApiDoc, options) {
 	const { resolver, data } = await getDataFromOpenAPIDoc(openApiDoc, options);

package/dist/{getDataFromOpenAPIDoc-Cyrm3VKA.mjs → getDataFromOpenAPIDoc-Cya5Q-2W.mjs}

@@ -1,4 +1,4 @@
-import { $t as isPrimitiveType, Bn as getMostCommonAdjacentCombinationSplit, Ct as getParamZodSchemaName, Et as getZodSchemaOperationName, Fn as isTagIncluded, Gt as getParameterEnumNames, Hn as removeWord, Ht as getNamespaceName, Jt as isErrorStatus, Kt as getSchemaNameByRef, Mn as formatTag, Nn as getEndpointTag, On as BODY_PARAMETER_NAME, Ot as isNamedZodSchema, Pn as getOperationTag, Qt as isPathExcluded, Rn as capitalize, Sn as VOID_SCHEMA, St as getEnumZodSchemaName, Tt as getZodSchemaName, Un as snakeToCamel, Ut as autocorrectRef, Wn as Profiler, Wt as escapeControlCharacters, Xt as isMediaTypeAllowed, Yt as isMainResponseStatus, Zt as isParamMediaTypeAllowed, _n as INT_SCHEMA, an as wrapWithQuotesIfNeeded, bn as URL_SCHEMA, bt as invalidVariableNameCharactersToCamel, cn as isReferenceObject, d as isQuery, dn as ALLOWED_PATH_IN, en as isSortingParameterObject, fn as ANY_SCHEMA, gn as ENUM_SCHEMA, hn as EMAIL_SCHEMA, in as unwrapQuotesIfNeeded, kn as JSON_APPLICATION_FORMAT, ln as isSchemaObject, lt as iterateSchema, mn as DATETIME_SCHEMA, nn as pathToVariableName, on as inferRequiredSchema, pn as BLOB_SCHEMA, qt as getSchemaRef, rn as replaceHyphenatedPath, s as pick, sn as isArraySchemaObject, tn as pathParamToVariableName, un as ALLOWED_METHODS, ut as getUniqueArray, vn as NUMBER_SCHEMA, wt as getResponseZodSchemaName, xn as UUID_SCHEMA, xt as getBodyZodSchemaName, yn as STRING_SCHEMA, zn as decapitalize } from "./generate.runner-BD9BbYIx.mjs";
+import { $t as isPrimitiveType, Bn as getMostCommonAdjacentCombinationSplit, Ct as getParamZodSchemaName, Et as getZodSchemaOperationName, Fn as isTagIncluded, Gt as getParameterEnumNames, Hn as removeWord, Ht as getNamespaceName, Jt as isErrorStatus, Kt as getSchemaNameByRef, Mn as formatTag, Nn as getEndpointTag, On as BODY_PARAMETER_NAME, Ot as isNamedZodSchema, Pn as getOperationTag, Qt as isPathExcluded, Rn as capitalize, Sn as VOID_SCHEMA, St as getEnumZodSchemaName, Tt as getZodSchemaName, Un as snakeToCamel, Ut as autocorrectRef, Wn as Profiler, Wt as escapeControlCharacters, Xt as isMediaTypeAllowed, Yt as isMainResponseStatus, Zt as isParamMediaTypeAllowed, _n as INT_SCHEMA, an as wrapWithQuotesIfNeeded, bn as URL_SCHEMA, bt as invalidVariableNameCharactersToCamel, cn as isReferenceObject, d as isQuery, dn as ALLOWED_PATH_IN, en as isSortingParameterObject, fn as ANY_SCHEMA, gn as ENUM_SCHEMA, hn as EMAIL_SCHEMA, in as unwrapQuotesIfNeeded, kn as JSON_APPLICATION_FORMAT, ln as isSchemaObject, lt as iterateSchema, mn as DATETIME_SCHEMA, nn as pathToVariableName, on as inferRequiredSchema, pn as BLOB_SCHEMA, qt as getSchemaRef, rn as replaceHyphenatedPath, s as pick, sn as isArraySchemaObject, tn as pathParamToVariableName, un as ALLOWED_METHODS, ut as getUniqueArray, vn as NUMBER_SCHEMA, wt as getResponseZodSchemaName, xn as UUID_SCHEMA, xt as getBodyZodSchemaName, yn as STRING_SCHEMA, zn as decapitalize } from "./generate.runner-C3n76bDK.mjs";
 //#region src/generators/const/validation.const.ts
 const HTTP_STATUS_CODES = {
 	"100": "Continue",

package/dist/index.d.mts

@@ -4,7 +4,7 @@ import { n as AuthGuardProps, r as AuthContext, t as AuthGuard } from "./AuthGua
 import { a as RestClient, i as Response, n as RequestConfig, o as RestInterceptor, r as RequestInfo, t as RestClient$1 } from "./rest-client-CQyFvqYC.mjs";
 import { n as useWorkspaceContext, r as OpenApiRouter, t as OpenApiWorkspaceContext } from "./workspace.context-isVY9ves.mjs";
 import { i as QueryModule, n as InvalidationMapFunc, r as OpenApiQueryConfig, t as InvalidationMap } from "./queryConfig.context-CRJOgf19.mjs";
-import { t as RestUtils } from "./rest.utils-rezWAIYL.mjs";
+import { t as RestUtils } from "./rest.utils-DpiFIdhF.mjs";
 import { t as OpenAPICodegenConfig } from "./config-DgrOddSC.mjs";
 import { d as TransportResponse, l as TransportRequest, n as HttpError, p as UploadProgress, u as TransportRequestConfig } from "./rest-transport.types-DM5-qyOJ.mjs";
 import { n as NativeRestInterceptor, r as NativeRestClient, t as NativeInterceptor } from "./native-rest-interceptor-PgziZt1f.mjs";

package/dist/index.mjs

@@ -1,7 +1,7 @@
 import { i as resources, n as ns, t as configureTranslations } from "./i18n-D-FesqFb.mjs";
-import { a as RestUtils, i as SharedErrorHandler, n as DomainErrorRegistry, r as ErrorHandler, t as ApplicationException } from "./error-handling-BeydPL7s.mjs";
+import { a as RestUtils, i as SharedErrorHandler, n as DomainErrorRegistry, r as ErrorHandler, t as ApplicationException } from "./error-handling-uS0DgYUR.mjs";
 import { t as HttpError } from "./rest-transport.types-DxitRtsB.mjs";
-import { n as RestClient, t as RestInterceptor } from "./rest-interceptor-D5NCNTm1.mjs";
+import { n as RestClient, t as RestInterceptor } from "./rest-interceptor-Dm9DFErh.mjs";
 import { n as NativeRestClient, t as NativeRestInterceptor } from "./native-rest-interceptor-Np4Ov54n.mjs";
 import { t as OpenApiQueryConfig } from "./queryConfig.context-CldQ5YL9.mjs";
 import { t as useMutationEffects } from "./useMutationEffects-PB1fvKWM.mjs";

package/dist/metro.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_generate_utils = require("./generate.utils-BqlgVd-i.cjs");
+const require_generate_utils = require("./generate.utils-wn-hR9hY.cjs");
 let fs = require("fs");
 fs = require_generate_utils.__toESM(fs, 1);
 let path = require("path");
@@ -14,6 +14,7 @@ function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, in
 		inlineEndpointsExcludeModules: inlineEndpointsExcludeModules?.split(","),
 		workspaceContext: workspaceContext?.split(",")
 	});
+	if (resolvedConfig.modelsInCommon && resolvedConfig.modelsInModules) throw new Error("modelsInCommon and modelsInModules cannot both be enabled");
 	resolvedConfig.checkAcl = resolvedConfig.acl && resolvedConfig.checkAcl;
 	resolvedConfig.workspaceContext = Array.from(new Set((resolvedConfig.workspaceContext ?? []).map((value) => value.trim()).filter(Boolean)));
 	return resolvedConfig;
@@ -21,6 +22,10 @@ function resolveConfig({ fileConfig = {}, params: { includeTags, excludeTags, in
 //#endregion
 //#region src/native/generateFilesFromNativeOpenAPI.ts
 function generateFilesFromNativeOpenAPI(source, yaml, options) {
+	if (options.standalone && options.importPath === "ts") options = {
+		...options,
+		importPath: "relative"
+	};
 	if (!supportsCompleteNativeRender(options)) {
 		if (process.env.OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE === "1") throw new Error("The selected options are not supported by the full native renderer");
 		return;
@@ -47,7 +52,7 @@ function generateFilesFromNativeOpenAPI(source, yaml, options) {
 	if (!options.modelsOnly) {
 		if (options.acl && nativeData.renderedShared.appAcl) files.push(outputFile(options, "acl/app.ability.ts", nativeData.renderedShared.appAcl));
 		if (options.mutationEffects && nativeData.renderedShared.queryModules) files.push(outputFile(options, "queryModules.ts", nativeData.renderedShared.queryModules));
-		if (!options.restClientImportPath) files.push(outputFile(options, "app-rest-client.ts", `import { ${options.restClient === "native" ? "NativeRestClient" : "RestClient"} } from "@povio/openapi-codegen-cli${options.restClient === "native" ? "/native" : ""}";\n\nexport const AppRestClient = new ${options.restClient === "native" ? "NativeRestClient" : "RestClient"}({\n  config: {\n    baseURL: "${nativeData.baseUrl}"\n  },\n});\n`));
+		if (!options.restClientImportPath) files.push(outputFile(options, "app-rest-client.ts", `import { ${options.restClient === "native" ? "NativeRestClient" : "RestClient"} } from "@povio/openapi-codegen-cli${options.restClient === "native" ? "/native" : "/axios"}";\n\nexport const AppRestClient = new ${options.restClient === "native" ? "NativeRestClient" : "RestClient"}({\n  config: {\n    baseURL: "${nativeData.baseUrl}"\n  },\n});\n`));
 		if (nativeData.renderedShared.domainErrors) files.push(outputFile(options, "domain-errors.ts", nativeData.renderedShared.domainErrors));
 	}
 	return files;
@@ -97,7 +102,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-CkVgg5Zy.cjs"));
+		const { generateCodeFromOpenAPIDoc } = await Promise.resolve().then(() => require("./generateCodeFromOpenAPIDoc-ejdqJZ2M.cjs"));
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml

package/dist/metro.mjs

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

package/dist/{openapi-codegen.runner-BZH4V6rq.mjs → openapi-codegen.runner-kQNEh1Mb.mjs}

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

package/dist/{rest-interceptor-D5NCNTm1.mjs → rest-interceptor-Dm9DFErh.mjs}

@@ -1,4 +1,4 @@
-import { i as SharedErrorHandler } from "./error-handling-BeydPL7s.mjs";
+import { i as SharedErrorHandler } from "./error-handling-uS0DgYUR.mjs";
 import axios from "axios";
 import { z } from "zod";
 //#region src/lib/rest/rest-client.ts

package/dist/rest.utils-DpiFIdhF.d.mts

@@ -0,0 +1,9 @@
+//#region src/lib/rest/rest.utils.d.ts
+declare namespace RestUtils {
+  const extractServerResponseCode: (e: unknown) => string | number | null;
+  const doesServerErrorMessageContain: (e: unknown, text: string) => boolean;
+  const extractServerErrorMessage: (e: unknown) => string | null;
+  const extractContentDispositionFilename: (headers: Headers | Record<string, unknown>) => string | undefined;
+}
+//#endregion
+export { RestUtils as t };

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-Cyrm3VKA.mjs";
-import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-BD9BbYIx.mjs";
+import { i as VALIDATION_ERROR_TYPE_TITLE, n as groupByType, t as getDataFromOpenAPIDoc } from "./getDataFromOpenAPIDoc-Cya5Q-2W.mjs";
+import { D as getTagFileName, Wn as Profiler, a as resolveConfig, n as runGenerate, o as getOutputFileName, t as getOpenApiDoc } from "./generate.runner-C3n76bDK.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.2";
+	return "3.2.4-rc.1";
 }
 //#endregion
 //#region src/helpers/yargs.helper.ts

package/dist/vite.mjs

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

package/dist/zod.mjs

@@ -1,4 +1,4 @@
-import { i as SharedErrorHandler } from "./error-handling-BeydPL7s.mjs";
+import { i as SharedErrorHandler } from "./error-handling-uS0DgYUR.mjs";
 import { z } from "zod";
 //#region src/zod.ts
 let ZodExtended;

package/package.json

@@ -91,7 +91,7 @@
     "test": "bun run build:native && bun run test:ts && bun run test:native",
     "test:ts": "OPENAPI_CODEGEN_NATIVE=0 vitest run",
     "test:native": "OPENAPI_CODEGEN_NATIVE=1 OPENAPI_CODEGEN_REQUIRE_FULL_NATIVE=1 vitest run",
-    "test:parity": "vitest run src/native/renderer-parity.test.ts src/native/renderer-parity-manifest.test.ts",
+    "test:parity": "vitest run src/native/renderer-parity.test.ts src/native/renderer-parity-manifest.test.ts src/native/model-imports.test.ts src/native/configuration-parity.test.ts src/native/configuration-runtime.test.ts src/native/configuration-lifecycle.test.ts",
     "test:watch": "vitest",
     "build": "tsdown && bun run build:native",
     "build:ts": "tsdown",
@@ -187,5 +187,5 @@
     "node": ">= 18"
   },
   "packageManager": "bun@1.4.1",
-  "version": "3.2.2"
+  "version": "3.2.4-rc.1"
 }

package/dist/rest.utils-rezWAIYL.d.mts

@@ -1,10 +0,0 @@
-import { AxiosError, AxiosResponseHeaders } from "axios";
-//#region src/lib/rest/rest.utils.d.ts
-declare namespace RestUtils {
-  const extractServerResponseCode: (e: unknown) => string | number | null;
-  const doesServerErrorMessageContain: (e: AxiosError, text: string) => boolean;
-  const extractServerErrorMessage: (e: unknown) => string | null;
-  const extractContentDispositionFilename: (headers: AxiosResponseHeaders) => string | undefined;
-}
-//#endregion
-export { RestUtils as t };