@povio/openapi-codegen-cli 2.0.8-rc.14 → 2.0.8-rc.16

package/dist/{generate.runner-D5SXtGjD.mjs → generate.runner-DF2eZ4P-.mjs}

@@ -1,4 +1,4 @@
-import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-BzDj8b_0.mjs";
+import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-ao1R1u57.mjs";
 import fs from "fs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";

package/dist/{generateCodeFromOpenAPIDoc-BzDj8b_0.mjs → generateCodeFromOpenAPIDoc-ao1R1u57.mjs}

@@ -3986,7 +3986,7 @@ function renderAclCheckCall(resolver, endpoint, replacements, indent = "") {
 function addAsteriskAfterNewLine(str) {
 	return str.replace(/\n/g, "\n *");
 }
-function renderQueryJsDocs({ resolver, endpoint, mode }) {
+function renderQueryJsDocs({ resolver, endpoint, mode, tag }) {
 	const lines = ["/** "];
 	if (mode === "infiniteQuery") lines.push(` * Infinite query \`${getInfiniteQueryName(endpoint)}${endpoint.summary ? "" : ""}`);
 	else if (mode === "query") lines.push(` * Query \`${getQueryName(endpoint)}\`${endpoint.summary && endpoint.mediaDownload ? " - recommended when file should be cached" : ""}`);
@@ -3994,13 +3994,16 @@ function renderQueryJsDocs({ resolver, endpoint, mode }) {
 	if (endpoint.summary) lines.push(` * @summary ${addAsteriskAfterNewLine(endpoint.summary)}`);
 	if (endpoint.description) lines.push(` * @description ${addAsteriskAfterNewLine(endpoint.description)}`);
 	if (endpoint.acl) lines.push(` * @permission Requires \`${getAbilityFunctionName(endpoint)}\` ability `);
-	const params = getEndpointParamMapping(resolver, endpoint, { ...mode !== "infiniteQuery" ? { includeFileParam: true } : {} });
+	const params = getEndpointParamMapping(resolver, endpoint, {
+		...mode !== "infiniteQuery" ? { includeFileParam: true } : {},
+		modelNamespaceTag: tag
+	});
 	for (const endpointParam of params) lines.push(` * @param { ${endpointParam.type} } ${endpointParam.name} ${renderEndpointParamDescription(endpointParam)}`);
 	if (mode === "query") lines.push(" * @param { AppQueryOptions } options Query options");
 	else if (mode === "mutation") lines.push(` * @param { AppMutationOptions${resolver.options.mutationEffects ? ` & ${MUTATION_EFFECTS.optionsType}` : ""} } options Mutation options`);
 	else lines.push(" * @param { AppInfiniteQueryOptions } options Infinite query options");
 	const withAxiosResponse = endpoint.mediaDownload && mode !== "infiniteQuery";
-	const resultType = `${withAxiosResponse ? "AxiosResponse<" : ""}${getImportedZodSchemaInferedTypeName(resolver, endpoint.response)}${withAxiosResponse ? ">" : ""}`;
+	const resultType = `${withAxiosResponse ? "AxiosResponse<" : ""}${getImportedZodSchemaInferedTypeName(resolver, endpoint.response, void 0, tag)}${withAxiosResponse ? ">" : ""}`;
 	if (mode === "query") lines.push(` * @returns { UseQueryResult<${resultType}> } ${endpoint.responseDescription ?? ""}`);
 	else if (mode === "mutation") lines.push(` * @returns { UseMutationResult<${resultType}> } ${endpoint.responseDescription ?? ""}`);
 	else lines.push(` * @returns { UseInfiniteQueryResult<${resultType}> } ${endpoint.responseDescription ?? ""}`);
@@ -4081,10 +4084,14 @@ function renderInlineEndpointConfig(resolver, endpoint, modelNamespaceTag) {
 function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
+	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const resolvedEndpointArgs = renderEndpointArgs(resolver, endpoint, {}, workspaceParamReplacements);
-	const endpointParams = renderEndpointParams(resolver, endpoint, { optionalPathParams: resolver.options.workspaceContext });
+	const endpointParams = renderEndpointParams(resolver, endpoint, {
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag
+	});
 	const hasQueryFn = endpointArgs.length > 0 || hasAxiosRequestConfig || hasAclCheck;
 	const hasQueryFnBody = Boolean(hasAclCheck) || Object.keys(workspaceParamReplacements).length > 0;
 	const importedEndpoint = inlineEndpoints ? getEndpointName(endpoint) : getImportedEndpointName(endpoint, resolver.options);
@@ -4092,10 +4099,10 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(renderQueryJsDocs({
 		resolver,
 		endpoint,
-		mode: "query"
+		mode: "query",
+		tag
 	}));
 	lines.push(`export const ${getQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: AppQueryOptions<typeof ${importedEndpoint}, TData>${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
-	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
@@ -4118,10 +4125,12 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
 	const hasMutationEffects = resolver.options.mutationEffects;
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
+	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		includeFileParam: true,
-		optionalPathParams: resolver.options.workspaceContext
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag
 	});
 	const resolvedEndpointArgs = renderEndpointArgs(resolver, endpoint, {}, workspaceParamReplacements);
 	const destructuredMutationArgs = renderEndpointArgs(resolver, endpoint, { includeFileParam: true });
@@ -4134,7 +4143,8 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	lines.push(renderQueryJsDocs({
 		resolver,
 		endpoint,
-		mode: "mutation"
+		mode: "mutation",
+		tag
 	}));
 	lines.push(`export const ${getQueryName(endpoint, true)} = (options?: AppMutationOptions<typeof ${endpointFunction}, { ${mutationVariablesType} }>${hasMutationEffects ? ` & ${MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
 	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
@@ -4234,14 +4244,15 @@ function groupEndpoints(endpoints, resolver) {
 function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
+	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		excludePageParam: true,
-		optionalPathParams: resolver.options.workspaceContext
+		optionalPathParams: resolver.options.workspaceContext,
+		modelNamespaceTag: tag
 	});
 	const endpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
 	const resolvedEndpointArgsWithoutPage = renderEndpointArgs(resolver, endpoint, { excludePageParam: true }, workspaceParamReplacements);
-	renderEndpointArgs(resolver, endpoint, { replacePageParam: true });
 	const resolvedEndpointArgsWithPage = renderEndpointArgs(resolver, endpoint, { replacePageParam: true }, workspaceParamReplacements);
 	const endpointFunction = inlineEndpoints ? getEndpointName(endpoint) : getImportedEndpointName(endpoint, resolver.options);
 	const hasQueryFnBody = Boolean(hasAclCheck) || Object.keys(workspaceParamReplacements).length > 0;
@@ -4249,10 +4260,10 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(renderQueryJsDocs({
 		resolver,
 		endpoint,
-		mode: "infiniteQuery"
+		mode: "infiniteQuery",
+		tag
 	}));
 	lines.push(`export const ${getInfiniteQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }, ` : ""}options?: AppInfiniteQueryOptions<typeof ${endpointFunction}, TData>${hasAxiosRequestConfig ? `, ${AXIOS_REQUEST_CONFIG_NAME}?: ${AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
-	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,

package/dist/generator.mjs

@@ -1,4 +1,4 @@
-import { _ as isMediaTypeAllowed, b as formatTag, c as getSchemaTsMetaType, d as getTagImportPath, f as getQueryName, h as GenerateType, i as getDataFromOpenAPIDoc, l as getTsTypeBase, m as getNamespaceName, o as isMutation, p as DEFAULT_GENERATE_OPTIONS, s as isQuery, t as generateCodeFromOpenAPIDoc, v as isParamMediaTypeAllowed, y as invalidVariableNameCharactersToCamel } from "./generateCodeFromOpenAPIDoc-BzDj8b_0.mjs";
+import { _ as isMediaTypeAllowed, b as formatTag, c as getSchemaTsMetaType, d as getTagImportPath, f as getQueryName, h as GenerateType, i as getDataFromOpenAPIDoc, l as getTsTypeBase, m as getNamespaceName, o as isMutation, p as DEFAULT_GENERATE_OPTIONS, s as isQuery, t as generateCodeFromOpenAPIDoc, v as isParamMediaTypeAllowed, y as invalidVariableNameCharactersToCamel } from "./generateCodeFromOpenAPIDoc-ao1R1u57.mjs";
 import SwaggerParser from "@apidevtools/swagger-parser";
 
 //#region src/generators/core/getMetadataFromOpenAPIDoc.ts

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { S as VALIDATION_ERROR_TYPE_TITLE, g as groupByType, h as GenerateType, i as getDataFromOpenAPIDoc, n as getOutputFileName, u as getTagFileName, x as Profiler } from "./generateCodeFromOpenAPIDoc-BzDj8b_0.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-D5SXtGjD.mjs";
+import { S as VALIDATION_ERROR_TYPE_TITLE, g as groupByType, h as GenerateType, i as getDataFromOpenAPIDoc, n as getOutputFileName, u as getTagFileName, x as Profiler } from "./generateCodeFromOpenAPIDoc-ao1R1u57.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-DF2eZ4P-.mjs";
 import { createRequire } from "node:module";
 import yargs from "yargs";
 import { hideBin } from "yargs/helpers";
@@ -39,7 +39,7 @@ function logBanner(message) {
 * Fetch the version from package.json
 */
 function getVersion() {
-	return "2.0.8-rc.14";
+	return "2.0.8-rc.16";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { x as Profiler } from "./generateCodeFromOpenAPIDoc-BzDj8b_0.mjs";
-import { t as runGenerate } from "./generate.runner-D5SXtGjD.mjs";
+import { x as Profiler } from "./generateCodeFromOpenAPIDoc-ao1R1u57.mjs";
+import { t as runGenerate } from "./generate.runner-DF2eZ4P-.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.8-rc.14",
+  "version": "2.0.8-rc.16",
   "keywords": [
     "codegen",
     "openapi",