@povio/openapi-codegen-cli 3.0.0-rc.15 → 3.0.0-rc.16

package/dist/acl.mjs

@@ -11,14 +11,17 @@ let AbilityContext;
 (function(_AbilityContext) {
 	const createAppAbilityBuilder = () => new AbilityBuilder(createMongoAbility);
 	const initialAppAbility = createAppAbilityBuilder().build();
-	const Context = createContext({});
+	const Context = createContext(initialAppAbility);
 	const { Consumer } = Context;
 	_AbilityContext.Consumer = Consumer;
 	_AbilityContext.Provider = ({ children }) => {
 		const [ability, setAbility] = useState(initialAppAbility);
 		const { user } = AuthContext.useAuth();
 		useEffect(() => {
-			if (!user || !("aclRules" in user)) return;
+			if (!user || !("aclRules" in user)) {
+				setAbility(initialAppAbility);
+				return;
+			}
 			const { can, build } = createAppAbilityBuilder();
 			const packedRules = user.aclRules;
 			unpackRules(packedRules).forEach(({ action, subject, conditions }) => {
@@ -41,10 +44,15 @@ let AbilityContext;
 const createAclGuard = () => ({ canUse, redirectTo = "/", children }) => {
 	const ability = AbilityContext.useAbility();
 	const { replace } = OpenApiRouter.useRouter();
-	if (!ability.can(canUse[0], canUse[1])) {
-		replace(redirectTo);
-		return null;
-	}
+	const shouldRedirect = !ability.can(canUse[0], canUse[1]);
+	useEffect(() => {
+		if (shouldRedirect) replace(redirectTo);
+	}, [
+		redirectTo,
+		replace,
+		shouldRedirect
+	]);
+	if (shouldRedirect) return null;
 	return children;
 };
 

package/dist/{generate.runner-DmjWJwgS.mjs → generate.runner-bJnq9ZZJ.mjs}

@@ -1,4 +1,4 @@
-import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-DjVJepG8.mjs";
+import { S as Profiler, h as deepMerge, i as writeGenerateFileData, p as DEFAULT_GENERATE_OPTIONS, r as removeStaleGeneratedFiles, t as generateCodeFromOpenAPIDoc } from "./generateCodeFromOpenAPIDoc-x7KFQcSq.mjs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";
 

package/dist/{generateCodeFromOpenAPIDoc-DjVJepG8.mjs → generateCodeFromOpenAPIDoc-x7KFQcSq.mjs}

@@ -4580,7 +4580,10 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	}));
 	lines.push(`export const ${getQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: AppQueryOptions<typeof ${inlineEndpoints ? getEndpointName(endpoint) : getImportedEndpointName(endpoint, resolver.options)}, 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}();`);
+	if (hasAclCheck) {
+		lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
+		lines.push("  const { skipAcl, ...queryOptions } = options ?? {};");
+	}
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
 		paramTypes: workspaceParamTypes,
@@ -4591,11 +4594,15 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(`    ...${queryOptionsName}(${queryOptionsArgs}),`);
 	if (hasQueryFnOverride) {
 		lines.push("    queryFn: async () => {");
-		if (hasAclCheck) lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "    "));
+		if (hasAclCheck) {
+			lines.push("      if (!skipAcl) {");
+			lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "        "));
+			lines.push("      }");
+		}
 		lines.push(`      return ${queryOptionsName}(${queryOptionsArgs}).queryFn();`);
 		lines.push("    },");
 	}
-	lines.push("    ...options,");
+	lines.push(`    ...${hasAclCheck ? "queryOptions" : "options"},`);
 	lines.push("  });");
 	lines.push("};");
 	return lines.join("\n");
@@ -4650,7 +4657,10 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	}));
 	lines.push(`export const ${getQueryName(endpoint, true)} = (${pathParamFirstArg}options?: AppMutationOptions<typeof ${endpointFunction}${mutationOptionsTypeArg}>${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 (hasAclCheck) {
+		lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
+		lines.push("  const { skipAcl, ...queryOptions } = options ?? {};");
+	}
 	lines.push(...renderWorkspaceContextDestructure({
 		replacements: workspaceParamReplacements,
 		paramTypes: workspaceParamTypes,
@@ -4671,7 +4681,11 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		replacements: workspaceParamReplacements,
 		indent: "      "
 	}));
-	if (hasAclCheck) lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "      "));
+	if (hasAclCheck) {
+		lines.push("      if (!skipAcl) {");
+		lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "        "));
+		lines.push("      }");
+	}
 	if (endpoint.mediaUpload) {
 		lines.push(`      const uploadInstructions = await ${endpointFunction}(${resolvedEndpointArgs}${hasAxiosRequestConfig ? `${resolvedEndpointArgs ? ", " : ""}${AXIOS_REQUEST_CONFIG_NAME}` : ""});`);
 		lines.push("      ");
@@ -4706,8 +4720,8 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		const scopePathParamInterpolations = scopePathParams.map((p) => `:\${${p.name}}`).join("");
 		lines.push(`    scope: { id: \`${getEndpointName(endpoint)}${scopePathParamInterpolations}\` },`);
 	}
-	lines.push("    ...options,");
-	if (hasMutationDefaultOnError) lines.push("    onError: options?.onError ?? queryConfig.onError,");
+	lines.push(`    ...${hasAclCheck ? "queryOptions" : "options"},`);
+	if (hasMutationDefaultOnError) lines.push(`    onError: ${hasAclCheck ? "queryOptions" : "options"}?.onError ?? queryConfig.onError,`);
 	if (hasMutationEffects) {
 		lines.push("    onSuccess: async (resData, variables, onMutateResult, context) => {");
 		if (updateQueryEndpoints.length > 0) {
@@ -4719,9 +4733,9 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 				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);");
-		lines.push("      options?.onSuccess?.(resData, variables, onMutateResult, context);");
+			lines.push(`      await runMutationEffects(resData, variables, ${hasAclCheck ? "queryOptions" : "options"}, updateKeys);`);
+		} else lines.push(`      await runMutationEffects(resData, variables, ${hasAclCheck ? "queryOptions" : "options"});`);
+		lines.push(`      ${hasAclCheck ? "queryOptions" : "options"}?.onSuccess?.(resData, variables, onMutateResult, context);`);
 		lines.push("    },");
 	}
 	lines.push("  });");
@@ -4791,7 +4805,10 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	}));
 	lines.push(`export const ${getInfiniteQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }, ` : ""}options?: AppInfiniteQueryOptions<typeof ${inlineEndpoints ? getEndpointName(endpoint) : getImportedEndpointName(endpoint, resolver.options)}, 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}();`);
+	if (hasAclCheck) {
+		lines.push(`  const { checkAcl } = ${ACL_CHECK_HOOK}();`);
+		lines.push("  const { skipAcl, ...queryOptions } = options ?? {};");
+	}
 	lines.push(...renderWorkspaceParamResolutions({
 		replacements: workspaceParamReplacements,
 		paramTypes: workspaceParamTypes,
@@ -4802,11 +4819,13 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(`    ...${queryOptionsName}(${queryOptionsArgs}),`);
 	if (hasQueryFnOverride) {
 		lines.push("    queryFn: async ({ pageParam }) => {");
-		lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "      "));
+		lines.push("      if (!skipAcl) {");
+		lines.push(renderAclCheckCall(resolver, endpoint, workspaceParamReplacements, "        "));
+		lines.push("      }");
 		lines.push(`      return ${queryOptionsName}(${queryOptionsArgs}).queryFn({ pageParam });`);
 		lines.push("    },");
 	}
-	lines.push("    ...options,");
+	lines.push(`    ...${hasAclCheck ? "queryOptions" : "options"},`);
 	lines.push("  });");
 	lines.push("};");
 	return lines.join("\n");

package/dist/generator.mjs

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

package/dist/index.d.mts

@@ -77,9 +77,12 @@ type Function = (...args: any) => any;
 type IfAny<T, Y, N> = 0 extends 1 & T ? Y : N;
 type IsAny<T> = IfAny<T, true, never>;
 type IsUnknown<T, Y, N = T> = IsAny<T> extends never ? (unknown extends T ? Y : N) : N;
-type AppQueryOptions<TFunction extends Function, TData = Awaited<ReturnType<TFunction>>, TErrorCodes = GeneralErrorCodes> = Omit<UseQueryOptions<Awaited<ReturnType<TFunction>>, ApplicationException<TErrorCodes>, IsUnknown<TData, Awaited<ReturnType<TFunction>>>>, "queryKey" | "queryFn">;
-type AppMutationOptions<TFunction extends Function, TVariables = void, TData = Awaited<ReturnType<TFunction>>, TErrorCodes = GeneralErrorCodes> = Omit<UseMutationOptions<TData, ApplicationException<TErrorCodes>, TVariables>, "mutationKey" | "mutationFn">;
-type AppInfiniteQueryOptions<TFunction extends Function, TData = InfiniteData<Awaited<ReturnType<TFunction>>>, TErrorCodes = GeneralErrorCodes, TQueryKey extends QueryKey = QueryKey, TPageParam = number> = Omit<UseInfiniteQueryOptions<Awaited<ReturnType<TFunction>>, ApplicationException<TErrorCodes>, IsUnknown<TData, InfiniteData<Awaited<ReturnType<TFunction>>>>, TQueryKey, TPageParam>, "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam">;
+interface OpenApiAclCheckOptions {
+  skipAcl?: boolean;
+}
+type AppQueryOptions<TFunction extends Function, TData = Awaited<ReturnType<TFunction>>, TErrorCodes = GeneralErrorCodes> = Omit<UseQueryOptions<Awaited<ReturnType<TFunction>>, ApplicationException<TErrorCodes>, IsUnknown<TData, Awaited<ReturnType<TFunction>>>>, "queryKey" | "queryFn"> & OpenApiAclCheckOptions;
+type AppMutationOptions<TFunction extends Function, TVariables = void, TData = Awaited<ReturnType<TFunction>>, TErrorCodes = GeneralErrorCodes> = Omit<UseMutationOptions<TData, ApplicationException<TErrorCodes>, TVariables>, "mutationKey" | "mutationFn"> & OpenApiAclCheckOptions;
+type AppInfiniteQueryOptions<TFunction extends Function, TData = InfiniteData<Awaited<ReturnType<TFunction>>>, TErrorCodes = GeneralErrorCodes, TQueryKey extends QueryKey = QueryKey, TPageParam = number> = Omit<UseInfiniteQueryOptions<Awaited<ReturnType<TFunction>>, ApplicationException<TErrorCodes>, IsUnknown<TData, InfiniteData<Awaited<ReturnType<TFunction>>>>, TQueryKey, TPageParam>, "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam"> & OpenApiAclCheckOptions;
 //#endregion
 //#region src/lib/config/queryConfig.context.d.ts
 type QueryModule = string | number | symbol;

package/dist/index.mjs

@@ -248,15 +248,18 @@ const AuthGuard = ({ type, redirectTo, children }) => {
 	useEffect(() => {
 		setHasMounted(true);
 	}, []);
+	const privateRedirectTo = redirectTo || routes?.unauthenticated || "/";
+	const publicRedirectTo = redirectTo || routes?.authenticated || "/";
+	const redirectTarget = type === "private" && !isAuthenticated ? privateRedirectTo : type === "public-only" && isAuthenticated ? publicRedirectTo : null;
+	useEffect(() => {
+		if (hasMounted && redirectTarget) replace(redirectTarget);
+	}, [
+		hasMounted,
+		redirectTarget,
+		replace
+	]);
 	if (!hasMounted) return loadingState;
-	if (type === "private" && !isAuthenticated) {
-		replace(redirectTo || routes?.unauthenticated || "/");
-		return null;
-	}
-	if (type === "public-only" && isAuthenticated) {
-		replace(redirectTo || routes?.authenticated || "/");
-		return null;
-	}
+	if (redirectTarget) return null;
 	return children;
 };
 

package/dist/metro.mjs

@@ -1,6 +1,6 @@
-import "./generateCodeFromOpenAPIDoc-DjVJepG8.mjs";
-import "./generate.runner-DmjWJwgS.mjs";
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-CtfeBizk.mjs";
+import "./generateCodeFromOpenAPIDoc-x7KFQcSq.mjs";
+import "./generate.runner-bJnq9ZZJ.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-NNdDG0V4.mjs";
 import fs from "fs";
 import path from "path";
 

package/dist/{openapi-codegen.runner-CtfeBizk.mjs → openapi-codegen.runner-NNdDG0V4.mjs}

@@ -1,5 +1,5 @@
-import { S as Profiler } from "./generateCodeFromOpenAPIDoc-DjVJepG8.mjs";
-import { t as runGenerate } from "./generate.runner-DmjWJwgS.mjs";
+import { S as Profiler } from "./generateCodeFromOpenAPIDoc-x7KFQcSq.mjs";
+import { t as runGenerate } from "./generate.runner-bJnq9ZZJ.mjs";
 import path from "path";
 
 //#region src/plugins/openapi-codegen.runner.ts

package/dist/sh.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, a as getDataFromOpenAPIDoc, m as groupByType, n as getOutputFileName, u as getTagFileName, v as GenerateType } from "./generateCodeFromOpenAPIDoc-DjVJepG8.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-DmjWJwgS.mjs";
+import { C as VALIDATION_ERROR_TYPE_TITLE, S as Profiler, a as getDataFromOpenAPIDoc, m as groupByType, n as getOutputFileName, u as getTagFileName, v as GenerateType } from "./generateCodeFromOpenAPIDoc-x7KFQcSq.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-bJnq9ZZJ.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 "3.0.0-rc.15";
+	return "3.0.0-rc.16";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,6 +1,6 @@
-import "./generateCodeFromOpenAPIDoc-DjVJepG8.mjs";
-import "./generate.runner-DmjWJwgS.mjs";
-import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-CtfeBizk.mjs";
+import "./generateCodeFromOpenAPIDoc-x7KFQcSq.mjs";
+import "./generate.runner-bJnq9ZZJ.mjs";
+import { t as createOpenApiCodegenRunner } from "./openapi-codegen.runner-NNdDG0V4.mjs";
 import path from "path";
 
 //#region src/vite/openapi-codegen.plugin.ts

package/package.json

@@ -1,6 +1,5 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "3.0.0-rc.15",
   "keywords": [
     "codegen",
     "openapi",
@@ -131,5 +130,6 @@
     "node": ">= 14",
     "pnpm": ">= 9"
   },
-  "packageManager": "pnpm@10.4.0"
+  "packageManager": "pnpm@10.4.0",
+  "version": "3.0.0-rc.16"
 }