@povio/openapi-codegen-cli 2.0.8-rc.36 → 2.0.8-rc.38

package/dist/{generate.runner-52viWKLA.mjs → generate.runner-BNSPwk_e.mjs}

@@ -1,4 +1,4 @@
-import { S as Profiler, i as writeGenerateFileData, m as DEFAULT_GENERATE_OPTIONS, o as deepMerge, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-WP1lRhb0.mjs";
+import { S as Profiler, i as writeGenerateFileData, m as DEFAULT_GENERATE_OPTIONS, o as deepMerge, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-CeqvxYG3.mjs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
 

package/dist/{generateCodeFromOpenAPIDoc-WP1lRhb0.mjs → generateCodeFromOpenAPIDoc-CeqvxYG3.mjs}

@@ -3134,13 +3134,19 @@ function generateAcl({ resolver, data, tag }) {
 	});
 	if (!aclData) return;
 	const { hasAdditionalAbilityImports, modelsImports, endpoints } = aclData;
+	const hasWorkspaceContext = endpoints.some((endpoint) => getWorkspaceConditionNames(resolver, endpoint).length > 0);
 	const caslAbilityTupleImport = {
 		bindings: [...hasAdditionalAbilityImports ? [CASL_ABILITY_BINDING.forcedSubject, CASL_ABILITY_BINDING.subject] : []],
 		typeBindings: [CASL_ABILITY_BINDING.abilityTuple],
 		from: CASL_ABILITY_IMPORT.from
 	};
+	const workspaceContextImport = {
+		bindings: ["useWorkspaceContext"],
+		from: PACKAGE_IMPORT_PATH
+	};
 	const lines = [];
 	lines.push(renderImport$4(caslAbilityTupleImport));
+	if (hasWorkspaceContext) lines.push(renderImport$4(workspaceContextImport));
 	for (const modelsImport of modelsImports) lines.push(renderImport$4(modelsImport));
 	lines.push("");
 	if (resolver.options.tsNamespaces) lines.push(`export namespace ${getNamespaceName({
@@ -3149,7 +3155,10 @@ function generateAcl({ resolver, data, tag }) {
 		options: resolver.options
 	})} {`);
 	for (const endpoint of endpoints) {
-		lines.push(renderAbilityFunction(endpoint));
+		lines.push(renderAbilityFunction({
+			resolver,
+			endpoint
+		}));
 		lines.push("");
 	}
 	if (resolver.options.tsNamespaces) lines.push("}");
@@ -3188,7 +3197,42 @@ function renderImport$4(importData) {
 	const names = [...importData.defaultImport ? [importData.defaultImport] : [], ...namedImports.length > 0 ? [`{ ${namedImports.join(", ")} }`] : []].join(", ");
 	return `import${importData.typeOnly ? " type" : ""} ${names} from "${importData.from}";`;
 }
-function renderAbilityFunction(endpoint) {
+function getWorkspaceContextAllowList$1(workspaceContext) {
+	return new Set(workspaceContext);
+}
+function getWorkspaceConditionNames(resolver, endpoint) {
+	const allowList = getWorkspaceContextAllowList$1(resolver.options.workspaceContext);
+	return (getAbilityConditionsTypes(endpoint) ?? []).map((condition) => condition.name).filter((name) => allowList.has(name));
+}
+function renderWorkspaceAclHook({ resolver, endpoint }) {
+	const abilityConditionsTypes = getAbilityConditionsTypes(endpoint) ?? [];
+	const workspaceConditionNames = getWorkspaceConditionNames(resolver, endpoint);
+	if (workspaceConditionNames.length === 0) return;
+	const workspaceConditionNameSet = new Set(workspaceConditionNames);
+	const objectRequired = abilityConditionsTypes.some((propertyType) => propertyType.required && !workspaceConditionNameSet.has(propertyType.name));
+	const objectParams = abilityConditionsTypes.map((propertyType) => {
+		const isWorkspaceCondition = workspaceConditionNameSet.has(propertyType.name);
+		return `${propertyType.name}${propertyType.required && !isWorkspaceCondition ? "" : "?"}: ${(propertyType.type ?? "") + (propertyType.zodSchemaName ?? "")}, `;
+	}).join("");
+	const contextType = abilityConditionsTypes.filter((propertyType) => workspaceConditionNameSet.has(propertyType.name)).map((propertyType) => `${propertyType.name}?: ${(propertyType.type ?? "") + (propertyType.zodSchemaName ?? "")}`).join("; ");
+	const contextBindings = workspaceConditionNames.map((name) => `${name}: ${name}Workspace`).join(", ");
+	const lines = [];
+	lines.push(`export const use${capitalize(getAbilityFunctionName(endpoint))} = (`);
+	lines.push(`  object${objectRequired ? "" : "?"}: { ${objectParams} } `);
+	lines.push(") => {");
+	lines.push(`  const { ${contextBindings} } = useWorkspaceContext<{ ${contextType} }>();`);
+	for (const conditionName of workspaceConditionNames) {
+		const resolvedName = `normalize${capitalize(conditionName)}`;
+		lines.push(`  const ${resolvedName} = object?.${conditionName} ?? ${conditionName}Workspace;`);
+		lines.push(`  if (!${resolvedName}) {`);
+		lines.push(`    throw Error(\`${capitalize(conditionName)} not provided\`);`);
+		lines.push("  }");
+	}
+	lines.push(`  return ${getAbilityFunctionName(endpoint)}({ ...object, ${workspaceConditionNames.map((conditionName) => `${conditionName}: normalize${capitalize(conditionName)}`).join(", ")} });`);
+	lines.push("};");
+	return lines.join("\n");
+}
+function renderAbilityFunction({ resolver, endpoint }) {
 	const abilityConditionsTypes = getAbilityConditionsTypes(endpoint) ?? [];
 	const hasConditions = hasAbilityConditions(endpoint);
 	const lines = [];
@@ -3205,6 +3249,14 @@ function renderAbilityFunction(endpoint) {
 	lines.push(`  "${getAbilityAction(endpoint)}",`);
 	lines.push(`  ${hasConditions ? `object ? subject("${getAbilitySubject(endpoint)}", object) : "${getAbilitySubject(endpoint)}"` : `"${getAbilitySubject(endpoint)}"`}`);
 	lines.push(`] as ${CASL_ABILITY_BINDING.abilityTuple}<"${getAbilityAction(endpoint)}", ${getAbilitySubjectTypes(endpoint).join(" | ")}>;`);
+	const workspaceAclHook = renderWorkspaceAclHook({
+		resolver,
+		endpoint
+	});
+	if (workspaceAclHook) {
+		lines.push("");
+		lines.push(workspaceAclHook);
+	}
 	return lines.join("\n");
 }
 
@@ -3979,7 +4031,7 @@ function generateQueries(params) {
 	};
 	const hasWorkspaceContext = resolver.options.workspaceContext && endpoints.some((endpoint) => getWorkspaceParamNames(resolver, endpoint).length > 0);
 	const workspaceContextImport = {
-		bindings: ["OpenApiWorkspaceContext"],
+		bindings: ["useWorkspaceContext"],
 		from: PACKAGE_IMPORT_PATH
 	};
 	const endpointParams = endpoints.flatMap((endpoint) => endpoint.parameters);
@@ -4174,15 +4226,40 @@ function getWorkspaceParamNames(resolver, endpoint) {
 	return getUniqueArray([...workspaceParamNames, ...aclParamNames]).filter((name) => allowList.has(name));
 }
 function getWorkspaceParamReplacements(resolver, endpoint) {
-	return Object.fromEntries(getWorkspaceParamNames(resolver, endpoint).map((name) => [name, `${name}FromWorkspace`]));
+	return Object.fromEntries(getWorkspaceParamNames(resolver, endpoint).map((name) => [name, `normalize${capitalize(name)}`]));
+}
+function getWorkspaceParamTypes(resolver, endpoint, modelNamespaceTag) {
+	const workspaceParamNames = new Set(getWorkspaceParamNames(resolver, endpoint));
+	return Object.fromEntries(getEndpointParamMapping(resolver, endpoint, { modelNamespaceTag }).filter((param) => workspaceParamNames.has(param.name)).map((param) => [param.name, param.type]));
 }
-function renderWorkspaceParamResolutions({ replacements, indent }) {
+function renderWorkspaceContextDestructure({ replacements, paramTypes, indent }) {
 	const workspaceParamNames = Object.keys(replacements);
 	if (workspaceParamNames.length === 0) return [];
-	const lines = [`${indent}const workspaceContext = OpenApiWorkspaceContext.useContext();`];
-	for (const paramName of workspaceParamNames) lines.push(`${indent}const ${replacements[paramName]} = OpenApiWorkspaceContext.resolveParam(workspaceContext, "${paramName}", ${paramName});`);
+	const workspaceParamBindings = workspaceParamNames.map((paramName) => `${paramName}: ${paramName}Workspace`);
+	const workspaceContextType = workspaceParamNames.map((paramName) => `${paramName}?: ${paramTypes[paramName] ?? "unknown"}`).join("; ");
+	return [`${indent}const { ${workspaceParamBindings.join(", ")} } = useWorkspaceContext<{ ${workspaceContextType} }>();`];
+}
+function renderWorkspaceParamCoalescing({ replacements, indent }) {
+	const workspaceParamNames = Object.keys(replacements);
+	const lines = [];
+	for (const paramName of workspaceParamNames) {
+		lines.push(`${indent}const ${replacements[paramName]} = ${paramName} ?? ${paramName}Workspace;`);
+		lines.push(`${indent}if (!${replacements[paramName]}) {`);
+		lines.push(`${indent}  throw Error(\`${capitalize(paramName)} not provided\`);`);
+		lines.push(`${indent}}`);
+	}
 	return lines;
 }
+function renderWorkspaceParamResolutions({ replacements, paramTypes, indent }) {
+	return [...renderWorkspaceContextDestructure({
+		replacements,
+		paramTypes,
+		indent
+	}), ...renderWorkspaceParamCoalescing({
+		replacements,
+		indent
+	})];
+}
 function renderAclCheckCall(resolver, endpoint, replacements, indent = "") {
 	const checkParams = getAbilityConditionsTypes(endpoint)?.map((condition) => invalidVariableNameCharactersToCamel(condition.name));
 	const paramNames = new Set(endpoint.parameters.map((param) => invalidVariableNameCharactersToCamel(param.name)));
@@ -4352,6 +4429,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	const hasAclCheck = resolver.options.checkAcl && endpoint.acl;
 	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
+	const workspaceParamTypes = getWorkspaceParamTypes(resolver, endpoint, tag);
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const resolvedEndpointArgs = renderEndpointObjectArgs(resolver, endpoint, {}, workspaceParamReplacements);
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
@@ -4372,6 +4450,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
+		paramTypes: workspaceParamTypes,
 		indent: "  "
 	}));
 	lines.push("  ");
@@ -4395,6 +4474,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
+	const workspaceParamTypes = getWorkspaceParamTypes(resolver, endpoint, tag);
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		includeFileParam: true,
 		optionalPathParams: resolver.options.workspaceContext,
@@ -4417,13 +4497,20 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	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}` : ""}) => {`);
 	if (hasMutationDefaultOnError) lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
-	if (Object.keys(workspaceParamReplacements).length > 0) lines.push("  const workspaceContext = OpenApiWorkspaceContext.useContext();");
+	lines.push(...renderWorkspaceContextDestructure({
+		replacements: workspaceParamReplacements,
+		paramTypes: workspaceParamTypes,
+		indent: "  "
+	}));
 	if (hasMutationEffects) lines.push(`  const { runMutationEffects } = useMutationEffects<typeof ${QUERY_MODULE_ENUM}.${tag}>({ currentModule: ${QUERIES_MODULE_NAME} });`);
 	lines.push("");
 	lines.push(`  return ${QUERY_HOOKS.mutation}({`);
 	const mutationFnArg = endpointParams ? `{ ${destructuredMutationArgs}${endpoint.mediaUpload ? `${destructuredMutationArgs ? ", " : ""}abortController, onUploadProgress` : ""} }` : "";
 	lines.push(`    mutationFn: ${endpoint.mediaUpload ? "async " : ""}(${mutationFnArg}) => ${hasMutationFnBody ? "{ " : ""}`);
-	for (const [paramName, resolvedParamName] of Object.entries(workspaceParamReplacements)) lines.push(`      const ${resolvedParamName} = OpenApiWorkspaceContext.resolveParam(workspaceContext, "${paramName}", ${paramName});`);
+	lines.push(...renderWorkspaceParamCoalescing({
+		replacements: workspaceParamReplacements,
+		indent: "      "
+	}));
 	if (hasAclCheck) lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "      "));
 	if (endpoint.mediaUpload) {
 		lines.push(`      const uploadInstructions = await ${endpointFunction}(${resolvedEndpointArgs}${hasAxiosRequestConfig ? `${resolvedEndpointArgs ? ", " : ""}${AXIOS_REQUEST_CONFIG_NAME}` : ""});`);
@@ -4461,7 +4548,10 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		lines.push("    onSuccess: async (resData, variables, onMutateResult, context) => {");
 		if (updateQueryEndpoints.length > 0) {
 			if (destructuredVariables.length > 0) lines.push(`      const { ${destructuredVariables.join(", ")} } = variables;`);
-			for (const [paramName, resolvedParamName] of Object.entries(workspaceParamReplacements)) lines.push(`      const ${resolvedParamName} = OpenApiWorkspaceContext.resolveParam(workspaceContext, "${paramName}", ${paramName});`);
+			lines.push(...renderWorkspaceParamCoalescing({
+				replacements: workspaceParamReplacements,
+				indent: "      "
+			}));
 			lines.push(`      const updateKeys = [${updateQueryEndpoints.map((e) => `keys.${getEndpointName(e)}(${renderEndpointArgs(resolver, e, { includeOnlyRequiredParams: true }, workspaceParamReplacements)})`).join(", ")}];`);
 			lines.push(`      await runMutationEffects(resData, variables, options, updateKeys);`);
 		} else lines.push("      await runMutationEffects(resData, variables, options);");
@@ -4514,6 +4604,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	const tag = getEndpointTag(endpoint, resolver.options);
 	const workspaceParamReplacements = resolver.options.workspaceContext ? getWorkspaceParamReplacements(resolver, endpoint) : {};
+	const workspaceParamTypes = getWorkspaceParamTypes(resolver, endpoint, tag);
 	const endpointParams = renderEndpointParams(resolver, endpoint, {
 		excludePageParam: true,
 		optionalPathParams: resolver.options.workspaceContext,
@@ -4535,6 +4626,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
+		paramTypes: workspaceParamTypes,
 		indent: "  "
 	}));
 	lines.push("");

package/dist/generator.mjs

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

package/dist/index.d.mts

@@ -145,9 +145,10 @@ declare namespace OpenApiWorkspaceContext {
     values,
     children
   }: PropsWithChildren<WorkspaceProviderProps>) => react_jsx_runtime0.JSX.Element;
-  const useContext: () => WorkspaceValues;
+  const useContext: <TValues extends WorkspaceValues = WorkspaceValues>() => TValues;
   const resolveParam: <T>(context: WorkspaceValues, name: string, value: T | null | undefined) => T;
 }
+declare const useWorkspaceContext: <TValues extends WorkspaceValues = WorkspaceValues>() => TValues;
 //#endregion
 //#region src/lib/config/i18n.d.ts
 declare const ns = "openapi";
@@ -227,4 +228,4 @@ declare const AuthGuard: ({
   children
 }: PropsWithChildren<AuthGuardProps>) => react.ReactNode;
 //#endregion
-export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MutationEffectsOptions, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects };
+export { type AppInfiniteQueryOptions, type AppMutationOptions, type AppQueryOptions, ApplicationException, AuthContext, AuthGuard, type AuthGuardProps, type ErrorEntry, ErrorHandler, type ErrorHandlerOptions, type GeneralErrorCodes, type RestClient as IRestClient, type InvalidationMap, type InvalidationMapFunc, type MutationEffectsOptions, OpenAPICodegenConfig, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, type QueryModule, type RequestConfig, type RequestInfo, type Response, RestClient$1 as RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/index.mjs

@@ -226,6 +226,7 @@ let OpenApiWorkspaceContext;
 		return workspaceValue;
 	};
 })(OpenApiWorkspaceContext || (OpenApiWorkspaceContext = {}));
+const useWorkspaceContext = () => OpenApiWorkspaceContext.useContext();
 
 //#endregion
 //#region src/lib/auth/AuthGuard.tsx
@@ -249,4 +250,4 @@ const AuthGuard = ({ type, redirectTo, children }) => {
 };
 
 //#endregion
-export { ApplicationException, AuthContext, AuthGuard, ErrorHandler, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects };
+export { ApplicationException, AuthContext, AuthGuard, ErrorHandler, OpenApiQueryConfig, OpenApiRouter, OpenApiWorkspaceContext, RestClient, RestInterceptor, RestUtils, SharedErrorHandler, ns, resources, useMutationEffects, useWorkspaceContext };

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, _ as groupByType, a as getDataFromOpenAPIDoc, d as getTagFileName, g as GenerateType, n as getOutputFileName } from "./generateCodeFromOpenAPIDoc-WP1lRhb0.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-52viWKLA.mjs";
+import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, _ as groupByType, a as getDataFromOpenAPIDoc, d as getTagFileName, g as GenerateType, n as getOutputFileName } from "./generateCodeFromOpenAPIDoc-CeqvxYG3.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-BNSPwk_e.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.36";
+	return "2.0.8-rc.38";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-WP1lRhb0.mjs";
-import { t as runGenerate } from "./generate.runner-52viWKLA.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-CeqvxYG3.mjs";
+import { t as runGenerate } from "./generate.runner-BNSPwk_e.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.36",
+  "version": "2.0.8-rc.38",
   "keywords": [
     "codegen",
     "openapi",