@povio/openapi-codegen-cli 3.2.0-rc.5 → 3.2.0-rc.7

package/README.md

@@ -89,7 +89,8 @@ bunx openapi-codegen generate --config my-config.ts
   --modelsInCommon                    Keep all schema declarations in defaultTag models and emit per-module proxy exports (default: false)
   --replaceOptionalWithNullish        Replace `.optional()` chains with `.nullish()` in generated Zod schemas (default: false)
 
-  --axiosRequestConfig                Include Axios request config parameters in query hooks (default: false)
+  --restClient                        REST transport to generate: 'axios' or 'native' (default: 'axios')
+  --axiosRequestConfig                Include transport request config parameters in query hooks (default: false)
   --infiniteQueries                   Generate infinite queries for paginated API endpoints (default: false)
   --mutationEffects                   Add mutation effects options to mutation hooks (default: true)
   --mutationScope                     Serialize mutations for the same path-param resource via TanStack scope.id (default: false).
@@ -162,6 +163,46 @@ Release packages include native binaries for Linux x64, macOS arm64, and Windows
 
 ### App REST Client Interceptors
 
+Select the fetch-based client without changing endpoint and query APIs:
+
+```ts
+import type { OpenAPICodegenConfig } from "@povio/openapi-codegen-cli";
+
+export default {
+  restClient: "native",
+} satisfies OpenAPICodegenConfig;
+```
+
+Native mode imports common request/response contracts from `@povio/openapi-codegen-cli/rest` and the concrete
+`NativeRestClient` from `@povio/openapi-codegen-cli/native`. It uses `fetch` for normal requests and uploads, switching
+to `XMLHttpRequest` in browsers only when an upload progress callback is provided.
+
+Native interceptors use the common transport interface:
+
+```ts
+import { NativeRestClient } from "@povio/openapi-codegen-cli/native";
+import type { RestTransportInterceptor } from "@povio/openapi-codegen-cli/rest";
+
+const authorizationInterceptor: RestTransportInterceptor = {
+  onRequest(request) {
+    request.headers.set("Authorization", `Bearer ${localStorage.getItem("accessToken")}`);
+    return request;
+  },
+};
+
+export const AppRestClient = new NativeRestClient({
+  config: { baseURL: "https://api.example.com" },
+  interceptors: [authorizationInterceptor],
+});
+```
+
+Axios remains the default for backward compatibility. The existing Axios interceptor API remains available in Axios
+mode.
+
+Native mode does not run the library `ErrorHandler` or create `ApplicationException` values. It throws `HttpError` for
+non-success HTTP responses and preserves Zod, network, cancellation, and timeout errors so applications can handle them
+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

package/dist/acl.mjs

@@ -1,4 +1,4 @@
-import { i as SharedErrorHandler } from "./error-handling-DDIXMA-R.mjs";
+import { i as SharedErrorHandler } from "./error-handling-BMXC5P08.mjs";
 import { n as OpenApiRouter, t as AuthContext } from "./auth.context-YFWzkwoN.mjs";
 import { createContext, useCallback, useMemo } from "react";
 import { jsx } from "react/jsx-runtime";

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

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

package/dist/{error-handling-DDIXMA-R.mjs → error-handling-BMXC5P08.mjs}

@@ -1,4 +1,4 @@
-import { isAxiosError, isCancel } from "axios";
+import { t as HttpError } from "./rest-transport.types-DxitRtsB.mjs";
 import { z } from "zod";
 //#region src/lib/assets/locales/en/translation.json
 var translation_default$1 = { openapi: { "sharedErrors": {
@@ -35,14 +35,26 @@ function resolveT() {
 	return getT();
 }
 //#endregion
+//#region src/lib/rest/http-error.utils.ts
+function isAxiosErrorLike(error) {
+	return typeof error === "object" && error !== null && "isAxiosError" in error;
+}
+function isCanceledRequest(error) {
+	if (error instanceof DOMException && ["AbortError", "TimeoutError"].includes(error.name)) return true;
+	if (isAxiosErrorLike(error)) return error.code === "ERR_CANCELED" || error.code === "ECONNABORTED";
+	return false;
+}
+//#endregion
 //#region src/lib/rest/rest.utils.ts
+function getResponseData(error) {
+	if (error instanceof HttpError) return error.response.data;
+	return isAxiosErrorLike(error) ? error.response?.data : void 0;
+}
 let RestUtils;
 (function(_RestUtils) {
 	_RestUtils.extractServerResponseCode = (e) => {
 		if (e instanceof z.ZodError) return "validation-exception";
-		if (!isAxiosError(e)) return null;
-		if (!e.response) return null;
-		const data = e.response.data;
+		const data = getResponseData(e);
 		if (typeof data?.code === "string") return data.code;
 		if (typeof data?.code === "number") return data.code;
 		return null;
@@ -54,9 +66,7 @@ let RestUtils;
 	};
 	const extractServerErrorMessage = _RestUtils.extractServerErrorMessage = (e) => {
 		if (e instanceof z.ZodError) return e.message;
-		if (!isAxiosError(e)) return null;
-		if (!e.response) return null;
-		const data = e.response.data;
+		const data = getResponseData(e);
 		if (typeof data?.message === "string") return data.message;
 		return null;
 	};
@@ -109,7 +119,8 @@ var ErrorHandler = class ErrorHandler {
 		const internalError = {
 			code: "INTERNAL_ERROR",
 			condition: (e) => {
-				if (isAxiosError(e)) return e.response?.status != null && e.response.status >= 500 && e.response.status < 600;
+				if (isAxiosErrorLike(e)) return e.response?.status != null && e.response.status >= 500 && e.response.status < 600;
+				if (e instanceof HttpError) return e.response.status >= 500 && e.response.status < 600;
 				return false;
 			},
 			getMessage: () => resolveT()("openapi.sharedErrors.internalError", { ns })
@@ -117,7 +128,8 @@ var ErrorHandler = class ErrorHandler {
 		const networkError = {
 			code: "NETWORK_ERROR",
 			condition: (e) => {
-				if (isAxiosError(e)) return e.code === "ERR_NETWORK";
+				if (isAxiosErrorLike(e)) return e.code === "ERR_NETWORK";
+				if (e instanceof TypeError) return true;
 				return false;
 			},
 			getMessage: () => resolveT()("openapi.sharedErrors.networkError", { ns })
@@ -125,9 +137,7 @@ var ErrorHandler = class ErrorHandler {
 		const canceledError = {
 			code: "CANCELED_ERROR",
 			condition: (e) => {
-				if (isCancel(e)) return true;
-				if (isAxiosError(e) && e.code === "ECONNABORTED") return true;
-				return false;
+				return isCanceledRequest(e);
 			},
 			getMessage: () => resolveT()("openapi.sharedErrors.canceledError", { ns })
 		};

package/dist/{generate.runner-BxdZdYX4.mjs → generate.runner-BvSprH6D.mjs}

@@ -154,12 +154,17 @@ const BODY_PARAMETER_NAME = "data";
 const AXIOS_DEFAULT_IMPORT_NAME = "axios";
 const AXIOS_REQUEST_CONFIG_NAME = "config";
 const AXIOS_REQUEST_CONFIG_TYPE = "AxiosRequestConfig";
+const NATIVE_REQUEST_CONFIG_TYPE = "TransportRequestConfig";
+const NATIVE_RESPONSE_TYPE = "TransportResponse";
 const AXIOS_IMPORT = {
 	defaultImport: AXIOS_DEFAULT_IMPORT_NAME,
 	bindings: [],
 	typeBindings: [AXIOS_REQUEST_CONFIG_TYPE],
 	from: "axios"
 };
+function getRequestConfigTypeName(restClient) {
+	return restClient === "native" ? NATIVE_REQUEST_CONFIG_TYPE : AXIOS_REQUEST_CONFIG_TYPE;
+}
 //#endregion
 //#region src/generators/const/zod.const.ts
 const SCHEMA_SUFFIX = "Schema";
@@ -362,6 +367,8 @@ 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 NATIVE_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/native`;
+const REST_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/rest`;
 //#endregion
 //#region src/generators/const/deps.const.ts
 const APP_REST_CLIENT_NAME = "AppRestClient";
@@ -515,6 +522,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	withDefaultValues: true,
 	extractEnums: true,
 	replaceOptionalWithNullish: false,
+	restClient: "axios",
 	restClientImportPath: "",
 	zodImportPath: "@povio/openapi-codegen-cli/zod",
 	errorHandlingImportPath: "",
@@ -1282,15 +1290,14 @@ function renderMediaUploadMutationBody({ resolver, endpointFunction, resolvedEnd
 		"    }",
 		"    dataToSend.append(\"file\", file);",
 		"  }",
-		"  await axios[method](uploadInstructions.url, dataToSend, {",
-		"    headers: {",
-		"      \"Content-Type\": file.type,",
-		"    },",
+		resolver.options.restClient === "native" ? "  await AppRestClient.upload(uploadInstructions.url, dataToSend, {" : "  await axios[method](uploadInstructions.url, dataToSend, {",
+		resolver.options.restClient === "native" ? "    headers: method === \"put\" ? { \"Content-Type\": file.type } : undefined," : "    headers: {",
+		...resolver.options.restClient === "native" ? [] : ["      \"Content-Type\": file.type,", "    },"],
 		"    signal: abortController?.signal,",
 		"    onUploadProgress: onUploadProgress",
 		"    ? (progressEvent) => onUploadProgress({ loaded: progressEvent.loaded, total: progressEvent.total ?? 0 })",
 		"    : undefined,",
-		"  });",
+		resolver.options.restClient === "native" ? "  }, method);" : "  });",
 		"}",
 		"",
 		"return uploadInstructions;"
@@ -1535,7 +1542,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 { RestClient } from "@povio/openapi-codegen";\n\nexport const AppRestClient = new 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" : ""}";\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;
@@ -1585,7 +1592,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-BOuCcW6U.mjs").then((n) => n.n);
+		const { generateCodeFromOpenAPIDoc } = await import("./generateCodeFromOpenAPIDoc-glAKBEGP.mjs").then((n) => n.n);
 		return generateCodeFromOpenAPIDoc(openApiDoc, config, profiler, {
 			source: nativeInput.source,
 			yaml: nativeInput.yaml
@@ -1673,4 +1680,4 @@ function getGenerateStats(filesData, config) {
 	};
 }
 //#endregion
-export { getImportedAbilityFunctionName as $, isParamMediaTypeAllowed as $t, getEndpointsImports as A, BODY_PARAMETER_NAME as An, getZodSchemaName as At, getPrefetchInfiniteQueryName as B, getMostCommonAdjacentCombinationSplit as Bn, QUERY_MODULE_ENUM as Bt, getAppRestClientImportPath as C, UUID_SCHEMA as Cn, isReadEndpoint as Ct, getTagFileName as D, AXIOS_IMPORT as Dn, getEnumZodSchemaName as Dt, getQueryTypesImportPath as E, AXIOS_DEFAULT_IMPORT_NAME as En, getBodyZodSchemaName as Et, mergeImports as F, isTagIncluded as Fn, APP_REST_CLIENT_NAME as Ft, getAbilityConditionType as G, autocorrectRef as Gt, getQueryName as H, removeWord as Hn, ZOD_EXTENDED as Ht, getImportedInfiniteQueryName as I, shouldInlineEndpointsForTag as In, BUILDERS_UTILS as It, getAbilityFunctionName as J, getSchemaNameByRef as Jt, getAbilityConditionsTypes as K, escapeControlCharacters as Kt, getImportedQueryName as L, camelToSpaceSeparated as Ln, DOMAIN_ERRORS_FILE as Lt, getInfiniteQueriesImports as M, formatTag as Mn, isEnumZodSchema as Mt, getModelsImports as N, getEndpointTag as Nn, isNamedZodSchema as Nt, getTagImportPath as O, AXIOS_REQUEST_CONFIG_NAME as On, getParamZodSchemaName as Ot, getQueriesImports as P, getOperationTag as Pn, APP_REST_CLIENT_FILE as Pt, getAppAbilitiesType as Q, isMediaTypeAllowed as Qt, getInfiniteQueryName as R, capitalize as Rn, MUTATION_EFFECTS as Rt, getTsTypeBase as S, URL_SCHEMA as Sn, isReadAllEndpoint as St, getQueryModulesImportPath as T, ZOD_IMPORT as Tn, invalidVariableNameCharactersToCamel as Tt, getQueryOptionsName as U, snakeToCamel as Un, PACKAGE_IMPORT_PATH as Ut, getPrefetchQueryName as V, kebabToCamel as Vn, QUERY_OPTIONS_TYPES as Vt, getAbilityAction as W, Profiler as Wn, getNamespaceName as Wt, getAbilitySubjectTypes as X, isErrorStatus as Xt, getAbilitySubject as Y, getSchemaRef as Yt, getAclData as Z, isMainResponseStatus as Zt, hasEndpointConfig as _, EMAIL_SCHEMA as _n, getPathSegments as _t, resolveConfig as a, replaceHyphenatedPath as an, getZodSchemaInferedTypeName as at, requiresBody as b, NUMBER_SCHEMA as bn, isDeleteEndpoint as bt, getDestructuredVariables as c, inferRequiredSchema as cn, getSchemaDescriptions as ct, isQuery as d, isSchemaObject as dn, DEFAULT_GENERATE_OPTIONS as dt, isPathExcluded as en, hasAbilityConditions as et, getEndpointBody as f, ALLOWED_METHODS as fn, ACL_APP_ABILITIES as ft, getImportedEndpointName as g, DATETIME_SCHEMA as gn, CASL_ABILITY_IMPORT as gt, getEndpointPath as h, BLOB_SCHEMA as hn, CASL_ABILITY_BINDING as ht, shouldUseNativeCodegen as i, pathToVariableName as in, getZodSchemaDescription as it, getImportPath as j, JSON_APPLICATION_FORMAT as jn, getZodSchemaOperationName as jt, getAclImports as k, AXIOS_REQUEST_CONFIG_TYPE as kn, getResponseZodSchemaName as kt, isInfiniteQuery as l, isArraySchemaObject as ln, iterateSchema as lt, getEndpointName as m, ANY_SCHEMA as mn, ACL_CHECK_HOOK as mt, runGenerate as n, isSortingParameterObject as nn, getImportedZodSchemaInferedTypeName as nt, getOutputFileName as o, unwrapQuotesIfNeeded as on, getZodSchemaPropertyDescriptions as ot, getEndpointConfig as p, ALLOWED_PATH_IN as pn, ACL_APP_ABILITY_FILE as pt, getAbilityDescription as q, getParameterEnumNames as qt, compileNativeData as r, pathParamToVariableName as rn, getImportedZodSchemaName as rt, pick as s, wrapWithQuotesIfNeeded as sn, getZodSchemaType as st, getOpenApiDoc as t, isPrimitiveType as tn, renderAclCheckCall as tt, isMutation as u, isReferenceObject as un, getUniqueArray as ut, mapEndpointParamsToFunctionParams as v, ENUM_SCHEMA as vn, isBulkDeleteEndpoint as vt, getFileNameWithExtension as w, VOID_SCHEMA as wn, isUpdateEndpoint as wt, getSchemaTsMetaType as x, STRING_SCHEMA as xn, isPathSegmentParam as xt, renderMediaUploadMutationBody as y, INT_SCHEMA as yn, isCreateEndpoint as yt, getInfiniteQueryOptionsName as z, decapitalize as zn, QUERY_MODULES_FILE as zt };
+export { getImportedAbilityFunctionName as $, isMainResponseStatus as $t, getEndpointsImports as A, AXIOS_REQUEST_CONFIG_NAME as An, getZodSchemaName as At, getPrefetchInfiniteQueryName as B, shouldInlineEndpointsForTag as Bn, QUERY_MODULE_ENUM as Bt, getAppRestClientImportPath as C, STRING_SCHEMA as Cn, isReadEndpoint as Ct, getTagFileName as D, ZOD_IMPORT as Dn, getEnumZodSchemaName as Dt, getQueryTypesImportPath as E, VOID_SCHEMA as En, getBodyZodSchemaName as Et, mergeImports as F, getRequestConfigTypeName as Fn, APP_REST_CLIENT_NAME as Ft, getAbilityConditionType as G, kebabToCamel as Gn, REST_PACKAGE_IMPORT_PATH as Gt, getQueryName as H, capitalize as Hn, ZOD_EXTENDED as Ht, getImportedInfiniteQueryName as I, formatTag as In, BUILDERS_UTILS as It, getAbilityFunctionName as J, Profiler as Jn, escapeControlCharacters as Jt, getAbilityConditionsTypes as K, removeWord as Kn, getNamespaceName as Kt, getImportedQueryName as L, getEndpointTag as Ln, DOMAIN_ERRORS_FILE as Lt, getInfiniteQueriesImports as M, BODY_PARAMETER_NAME as Mn, isEnumZodSchema as Mt, getModelsImports as N, JSON_APPLICATION_FORMAT as Nn, isNamedZodSchema as Nt, getTagImportPath as O, AXIOS_DEFAULT_IMPORT_NAME as On, getParamZodSchemaName as Ot, getQueriesImports as P, NATIVE_RESPONSE_TYPE as Pn, APP_REST_CLIENT_FILE as Pt, getAppAbilitiesType as Q, isErrorStatus as Qt, getInfiniteQueryName as R, getOperationTag as Rn, MUTATION_EFFECTS as Rt, getTsTypeBase as S, NUMBER_SCHEMA as Sn, isReadAllEndpoint as St, getQueryModulesImportPath as T, UUID_SCHEMA as Tn, invalidVariableNameCharactersToCamel as Tt, getQueryOptionsName as U, decapitalize as Un, NATIVE_PACKAGE_IMPORT_PATH as Ut, getPrefetchQueryName as V, camelToSpaceSeparated as Vn, QUERY_OPTIONS_TYPES as Vt, getAbilityAction as W, getMostCommonAdjacentCombinationSplit as Wn, PACKAGE_IMPORT_PATH as Wt, getAbilitySubjectTypes as X, getSchemaNameByRef as Xt, getAbilitySubject as Y, getParameterEnumNames as Yt, getAclData as Z, getSchemaRef as Zt, hasEndpointConfig as _, BLOB_SCHEMA as _n, getPathSegments as _t, resolveConfig as a, pathParamToVariableName as an, getZodSchemaInferedTypeName as at, requiresBody as b, ENUM_SCHEMA as bn, isDeleteEndpoint as bt, getDestructuredVariables as c, unwrapQuotesIfNeeded as cn, getSchemaDescriptions as ct, isQuery as d, isArraySchemaObject as dn, DEFAULT_GENERATE_OPTIONS as dt, isMediaTypeAllowed as en, hasAbilityConditions as et, getEndpointBody as f, isReferenceObject as fn, ACL_APP_ABILITIES as ft, getImportedEndpointName as g, ANY_SCHEMA as gn, CASL_ABILITY_IMPORT as gt, getEndpointPath as h, ALLOWED_PATH_IN as hn, CASL_ABILITY_BINDING as ht, shouldUseNativeCodegen as i, isSortingParameterObject as in, getZodSchemaDescription as it, getImportPath as j, AXIOS_REQUEST_CONFIG_TYPE as jn, getZodSchemaOperationName as jt, getAclImports as k, AXIOS_IMPORT as kn, getResponseZodSchemaName as kt, isInfiniteQuery as l, wrapWithQuotesIfNeeded as ln, iterateSchema as lt, getEndpointName as m, ALLOWED_METHODS as mn, ACL_CHECK_HOOK as mt, runGenerate as n, isPathExcluded as nn, getImportedZodSchemaInferedTypeName as nt, getOutputFileName as o, pathToVariableName as on, getZodSchemaPropertyDescriptions as ot, getEndpointConfig as p, isSchemaObject as pn, ACL_APP_ABILITY_FILE as pt, getAbilityDescription as q, snakeToCamel as qn, autocorrectRef as qt, compileNativeData as r, isPrimitiveType as rn, getImportedZodSchemaName as rt, pick as s, replaceHyphenatedPath as sn, getZodSchemaType as st, getOpenApiDoc as t, isParamMediaTypeAllowed as tn, renderAclCheckCall as tt, isMutation as u, inferRequiredSchema as un, getUniqueArray as ut, mapEndpointParamsToFunctionParams as v, DATETIME_SCHEMA as vn, isBulkDeleteEndpoint as vt, getFileNameWithExtension as w, URL_SCHEMA as wn, isUpdateEndpoint as wt, getSchemaTsMetaType as x, INT_SCHEMA as xn, isPathSegmentParam as xt, renderMediaUploadMutationBody as y, EMAIL_SCHEMA as yn, isCreateEndpoint as yt, getInfiniteQueryOptionsName as z, isTagIncluded as zn, QUERY_MODULES_FILE as zt };

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

@@ -33,6 +33,8 @@ 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 NATIVE_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/native`;
+const REST_PACKAGE_IMPORT_PATH = `${PACKAGE_IMPORT_PATH}/rest`;
 //#endregion
 //#region src/generators/const/zod.const.ts
 const SCHEMA_SUFFIX = "Schema";
@@ -105,6 +107,7 @@ const DEFAULT_GENERATE_OPTIONS = {
 	withDefaultValues: true,
 	extractEnums: true,
 	replaceOptionalWithNullish: false,
+	restClient: "axios",
 	restClientImportPath: "",
 	zodImportPath: "@povio/openapi-codegen-cli/zod",
 	errorHandlingImportPath: "",
@@ -991,12 +994,17 @@ const BODY_PARAMETER_NAME = "data";
 const AXIOS_DEFAULT_IMPORT_NAME = "axios";
 const AXIOS_REQUEST_CONFIG_NAME = "config";
 const AXIOS_REQUEST_CONFIG_TYPE = "AxiosRequestConfig";
+const NATIVE_REQUEST_CONFIG_TYPE = "TransportRequestConfig";
+const NATIVE_RESPONSE_TYPE = "TransportResponse";
 const AXIOS_IMPORT = {
 	defaultImport: AXIOS_DEFAULT_IMPORT_NAME,
 	bindings: [],
 	typeBindings: [AXIOS_REQUEST_CONFIG_TYPE],
 	from: "axios"
 };
+function getRequestConfigTypeName(restClient) {
+	return restClient === "native" ? NATIVE_REQUEST_CONFIG_TYPE : AXIOS_REQUEST_CONFIG_TYPE;
+}
 //#endregion
 //#region src/generators/utils/endpoint.utils.ts
 const isGetEndpoint = (endpoint) => endpoint.method === openapi_types.OpenAPIV3.HttpMethods.GET;
@@ -1167,15 +1175,14 @@ function renderMediaUploadMutationBody({ resolver, endpointFunction, resolvedEnd
 		"    }",
 		"    dataToSend.append(\"file\", file);",
 		"  }",
-		"  await axios[method](uploadInstructions.url, dataToSend, {",
-		"    headers: {",
-		"      \"Content-Type\": file.type,",
-		"    },",
+		resolver.options.restClient === "native" ? "  await AppRestClient.upload(uploadInstructions.url, dataToSend, {" : "  await axios[method](uploadInstructions.url, dataToSend, {",
+		resolver.options.restClient === "native" ? "    headers: method === \"put\" ? { \"Content-Type\": file.type } : undefined," : "    headers: {",
+		...resolver.options.restClient === "native" ? [] : ["      \"Content-Type\": file.type,", "    },"],
 		"    signal: abortController?.signal,",
 		"    onUploadProgress: onUploadProgress",
 		"    ? (progressEvent) => onUploadProgress({ loaded: progressEvent.loaded, total: progressEvent.total ?? 0 })",
 		"    : undefined,",
-		"  });",
+		resolver.options.restClient === "native" ? "  }, method);" : "  });",
 		"}",
 		"",
 		"return uploadInstructions;"
@@ -1525,6 +1532,18 @@ Object.defineProperty(exports, "MUTATION_EFFECTS", {
 		return MUTATION_EFFECTS;
 	}
 });
+Object.defineProperty(exports, "NATIVE_PACKAGE_IMPORT_PATH", {
+	enumerable: true,
+	get: function() {
+		return NATIVE_PACKAGE_IMPORT_PATH;
+	}
+});
+Object.defineProperty(exports, "NATIVE_RESPONSE_TYPE", {
+	enumerable: true,
+	get: function() {
+		return NATIVE_RESPONSE_TYPE;
+	}
+});
 Object.defineProperty(exports, "NUMBER_SCHEMA", {
 	enumerable: true,
 	get: function() {
@@ -1561,6 +1580,12 @@ Object.defineProperty(exports, "QUERY_OPTIONS_TYPES", {
 		return QUERY_OPTIONS_TYPES;
 	}
 });
+Object.defineProperty(exports, "REST_PACKAGE_IMPORT_PATH", {
+	enumerable: true,
+	get: function() {
+		return REST_PACKAGE_IMPORT_PATH;
+	}
+});
 Object.defineProperty(exports, "STRING_SCHEMA", {
 	enumerable: true,
 	get: function() {
@@ -1927,6 +1952,12 @@ Object.defineProperty(exports, "getQueryTypesImportPath", {
 		return getQueryTypesImportPath;
 	}
 });
+Object.defineProperty(exports, "getRequestConfigTypeName", {
+	enumerable: true,
+	get: function() {
+		return getRequestConfigTypeName;
+	}
+});
 Object.defineProperty(exports, "getResponseZodSchemaName", {
 	enumerable: true,
 	get: function() {

package/dist/{generateCodeFromOpenAPIDoc-5VZFVFK1.cjs → generateCodeFromOpenAPIDoc-CZT3sThI.cjs}

@@ -1,4 +1,4 @@
-const require_generate_utils = require("./generate.utils-1rU0zIjA.cjs");
+const require_generate_utils = require("./generate.utils-CH2U2Dpr.cjs");
 //#region src/generators/core/zod/getZodChain.ts
 const zodChainCache = /* @__PURE__ */ new WeakMap();
 function getZodChain({ schema, meta, options }) {
@@ -2397,14 +2397,24 @@ function generateConfigs(generateTypeParams) {
 	const hasMutationEffects = resolver.options.mutationEffects && hasMutation;
 	const hasMutationDefaultOnError = resolver.options.mutationDefaultOnError && hasMutation;
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
-	const hasAxiosDefaultImport = endpoints.some((e) => e.mediaUpload);
-	const hasAxiosImport = hasAxiosRequestConfig || hasAxiosDefaultImport;
+	const nativeClient = resolver.options.restClient === "native";
+	const hasAxiosDefaultImport = !nativeClient && endpoints.some((e) => e.mediaUpload);
+	const hasAxiosImport = !nativeClient && (hasAxiosRequestConfig || hasAxiosDefaultImport);
 	const axiosImport = {
 		defaultImport: hasAxiosDefaultImport ? require_generate_utils.AXIOS_DEFAULT_IMPORT_NAME : void 0,
 		bindings: [],
 		typeBindings: hasAxiosImport ? [require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE] : [],
 		from: "axios"
 	};
+	const nativeImport = {
+		bindings: [],
+		typeBindings: nativeClient && hasAxiosRequestConfig ? [require_generate_utils.getRequestConfigTypeName("native")] : [],
+		from: require_generate_utils.REST_PACKAGE_IMPORT_PATH
+	};
+	const appRestClientImport = {
+		bindings: [require_generate_utils.APP_REST_CLIENT_NAME],
+		from: require_generate_utils.getAppRestClientImportPath(resolver.options)
+	};
 	const endpointsImports = require_generate_utils.getEndpointsImports({
 		tag,
 		endpoints,
@@ -2444,6 +2454,8 @@ function generateConfigs(generateTypeParams) {
 	};
 	const lines = [];
 	if (hasAxiosImport) lines.push(renderImport$3(axiosImport));
+	if (nativeImport.typeBindings?.length) lines.push(renderImport$3(nativeImport));
+	if (nativeClient && endpoints.some((endpoint) => endpoint.mediaUpload)) lines.push(renderImport$3(appRestClientImport));
 	if (hasZodImport) lines.push(renderImport$3(require_generate_utils.ZOD_IMPORT));
 	if (hasDynamicInputsImport) lines.push(renderImport$3(dynamicInputsImport));
 	if (hasDynamicColumnsImport) lines.push(renderImport$3(dynamicColumnsImport));
@@ -2519,7 +2531,7 @@ function renderMutationContent(resolver, endpoint, tag) {
 	const endpointFunction = require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
 	const mutationVariablesType = endpoint.mediaUpload ? `{ ${endpointParamsStr}${endpointParamsStr ? "; " : ""}abortController?: AbortController; onUploadProgress?: (progress: { loaded: number; total: number }) => void }` : `{ ${endpointParamsStr} }`;
 	const lines = [];
-	lines.push(`(options?: AppMutationOptions<typeof ${endpointFunction}, ${mutationVariablesType}>${hasMutationEffects ? ` & ${require_generate_utils.MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, config?: ${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
+	lines.push(`(options?: AppMutationOptions<typeof ${endpointFunction}, ${mutationVariablesType}>${hasMutationEffects ? ` & ${require_generate_utils.MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, config?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	if (hasMutationDefaultOnError) lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasMutationEffects) lines.push(`  const { runMutationEffects } = useMutationEffects<${require_generate_utils.QUERY_MODULE_ENUM}.${endpointTag}>({ currentModule: ${require_generate_utils.QUERY_MODULE_ENUM}.${tag} });`);
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
@@ -2621,12 +2633,18 @@ function generateEndpoints({ resolver, data, tag }) {
 	};
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
 	const hasGetEndpoints = endpoints.some((endpoint) => endpoint.method === "get");
-	const hasAxiosImport = hasAxiosRequestConfig || hasGetEndpoints;
+	const nativeClient = resolver.options.restClient === "native";
+	const hasAxiosImport = !nativeClient && (hasAxiosRequestConfig || hasGetEndpoints);
 	const axiosImport = {
 		bindings: [],
 		typeBindings: hasAxiosImport ? [require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE] : [],
 		from: require_generate_utils.AXIOS_IMPORT.from
 	};
+	const nativeImport = {
+		bindings: [],
+		typeBindings: nativeClient && (hasAxiosRequestConfig || hasGetEndpoints) ? [require_generate_utils.getRequestConfigTypeName("native")] : [],
+		from: require_generate_utils.REST_PACKAGE_IMPORT_PATH
+	};
 	const generateParse = resolver.options.parseRequestParams;
 	const endpointParams = endpoints.flatMap((endpoint) => endpoint.parameters);
 	const endpointParamsParseSchemas = endpointParams.filter((param) => !["Path", "Header"].includes(param.type)).map((param) => param.parameterSortingEnumSchemaName ?? param.zodSchema);
@@ -2647,6 +2665,7 @@ function generateEndpoints({ resolver, data, tag }) {
 	const lines = [];
 	lines.push(renderImport$2(appRestClientImport));
 	if (hasAxiosImport) lines.push(renderImport$2(axiosImport));
+	if (nativeImport.typeBindings?.length) lines.push(renderImport$2(nativeImport));
 	if (hasZodImport) lines.push(renderImport$2(require_generate_utils.ZOD_IMPORT));
 	if (hasZodExtendedImport) lines.push(renderImport$2(zodExtendedImport));
 	for (const modelsImport of modelsImports) lines.push(renderImport$2(modelsImport));
@@ -2664,7 +2683,7 @@ function generateEndpoints({ resolver, data, tag }) {
 		const hasUndefinedEndpointBody = require_generate_utils.requiresBody(endpoint) && !endpointBody && require_generate_utils.hasEndpointConfig(endpoint, resolver);
 		const endpointConfig = renderEndpointConfig(resolver, endpoint, tag);
 		const hasRequestConfigParam = hasAxiosRequestConfig || endpoint.method === "get";
-		lines.push(`export const ${require_generate_utils.getEndpointName(endpoint)} = (${endpointParams}${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType$1()}` : ""}) => {`);
+		lines.push(`export const ${require_generate_utils.getEndpointName(endpoint)} = (${endpointParams}${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType$1(resolver)}` : ""}) => {`);
 		lines.push(`    return ${require_generate_utils.APP_REST_CLIENT_NAME}.${endpoint.method}(`);
 		lines.push(`        ${renderRequestInfo(resolver, endpoint, tag)},`);
 		lines.push(`        \`${require_generate_utils.getEndpointPath(endpoint)}\`,`);
@@ -2680,8 +2699,8 @@ function generateEndpoints({ resolver, data, tag }) {
 function renderRequestInfo(resolver, endpoint, tag) {
 	return `{ resSchema: ${require_generate_utils.getImportedZodSchemaName(resolver, endpoint.response, (resolver.options.modelsInCommon || resolver.options.modelsInModules) && resolver.options.splitByTags ? tag : void 0)} }`;
 }
-function getRequestConfigType$1() {
-	return `${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE} & { allowInvalidResponseData?: boolean }`;
+function getRequestConfigType$1(resolver) {
+	return `${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)} & { allowInvalidResponseData?: boolean }`;
 }
 function renderImport$2(importData) {
 	const namedImports = [...importData.bindings, ...(importData.typeBindings ?? []).map((binding) => importData.typeOnly ? binding : `type ${binding}`)];
@@ -2892,15 +2911,23 @@ function generateQueries(params) {
 	if (!endpoints || endpoints.length === 0) return;
 	const endpointGroups = groupEndpoints(endpoints, resolver);
 	const hasAxiosRequestConfig = resolver.options.axiosRequestConfig;
-	const hasAxiosDefaultImport = endpoints.some(({ mediaUpload }) => mediaUpload);
+	const nativeClient = resolver.options.restClient === "native";
+	const hasNativeMediaUpload = nativeClient && endpoints.some(({ mediaUpload }) => mediaUpload);
+	const requestConfigType = require_generate_utils.getRequestConfigTypeName(resolver.options.restClient);
+	const hasAxiosDefaultImport = !nativeClient && endpoints.some(({ mediaUpload }) => mediaUpload);
 	const hasGetEndpoints = endpoints.some((endpoint) => endpoint.method === "get");
-	const hasAxiosImport = hasAxiosRequestConfig || hasAxiosDefaultImport || hasGetEndpoints;
+	const hasAxiosImport = !nativeClient && (hasAxiosRequestConfig || hasAxiosDefaultImport || hasGetEndpoints);
 	const axiosImport = {
 		defaultImport: hasAxiosDefaultImport ? require_generate_utils.AXIOS_DEFAULT_IMPORT_NAME : void 0,
 		bindings: [],
 		typeBindings: hasAxiosImport ? [require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE] : [],
 		from: require_generate_utils.AXIOS_IMPORT.from
 	};
+	const nativeTransportImport = {
+		bindings: [],
+		typeBindings: nativeClient ? [...hasAxiosRequestConfig || hasGetEndpoints ? [requestConfigType] : [], ...endpoints.some(({ mediaDownload }) => mediaDownload) ? [require_generate_utils.NATIVE_RESPONSE_TYPE] : []] : [],
+		from: require_generate_utils.REST_PACKAGE_IMPORT_PATH
+	};
 	const { queryEndpoints, infiniteQueryEndpoints, mutationEndpoints, aclEndpoints } = endpointGroups;
 	const hasMutationDefaultOnError = resolver.options.mutationDefaultOnError && mutationEndpoints.length > 0;
 	const queryImport = {
@@ -2979,8 +3006,9 @@ function generateQueries(params) {
 	});
 	const lines = [];
 	if (hasAxiosImport) lines.push(renderImport(axiosImport));
+	if (nativeTransportImport.typeBindings?.length) lines.push(renderImport(nativeTransportImport));
+	if (inlineEndpoints || hasNativeMediaUpload) lines.push(renderImport(appRestClientImport));
 	if (inlineEndpoints) {
-		lines.push(renderImport(appRestClientImport));
 		if (hasZodImport) lines.push(renderImport(require_generate_utils.ZOD_IMPORT));
 		if (hasZodExtendedImport) lines.push(renderImport(zodExtendedImport));
 	}
@@ -3211,8 +3239,9 @@ function renderQueryJsDocs({ resolver, endpoint, mode, tag }) {
 	if (mode === "query") lines.push(" * @param { AppQueryOptions } options Query options");
 	else if (mode === "mutation") lines.push(` * @param { AppMutationOptions${resolver.options.mutationEffects ? ` & ${require_generate_utils.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<" : ""}${require_generate_utils.getImportedZodSchemaInferedTypeName(resolver, endpoint.response, void 0, tag)}${withAxiosResponse ? ">" : ""}`;
+	const withRawResponse = endpoint.mediaDownload && mode !== "infiniteQuery";
+	const responseType = resolver.options.restClient === "native" ? require_generate_utils.NATIVE_RESPONSE_TYPE : "AxiosResponse";
+	const resultType = `${withRawResponse ? `${responseType}<` : ""}${require_generate_utils.getImportedZodSchemaInferedTypeName(resolver, endpoint.response, void 0, tag)}${withRawResponse ? ">" : ""}`;
 	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 ?? ""}`);
@@ -3247,7 +3276,7 @@ function renderInlineEndpoints({ resolver, endpoints, tag }) {
 		const hasUndefinedEndpointBody = require_generate_utils.requiresBody(endpoint) && !endpointBody && require_generate_utils.hasEndpointConfig(endpoint, resolver);
 		const endpointConfig = renderInlineEndpointConfig(resolver, endpoint, tag);
 		const hasRequestConfigParam = resolver.options.axiosRequestConfig || endpoint.method === "get";
-		lines.push(`const ${require_generate_utils.getEndpointName(endpoint)} = (${endpointParams}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType()}` : ""}) => {`);
+		lines.push(`const ${require_generate_utils.getEndpointName(endpoint)} = (${endpointParams}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => {`);
 		lines.push(`  return ${require_generate_utils.APP_REST_CLIENT_NAME}.${endpoint.method}(`);
 		lines.push(`    ${renderInlineRequestInfo(resolver, endpoint, tag)},`);
 		lines.push(`    \`${require_generate_utils.getEndpointPath(endpoint)}\`,`);
@@ -3263,8 +3292,8 @@ function renderInlineEndpoints({ resolver, endpoints, tag }) {
 function renderInlineRequestInfo(resolver, endpoint, tag) {
 	return `{ resSchema: ${require_generate_utils.getImportedZodSchemaName(resolver, endpoint.response, tag)} }`;
 }
-function getRequestConfigType() {
-	return `${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE} & { allowInvalidResponseData?: boolean }`;
+function getRequestConfigType(resolver) {
+	return `${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)} & { allowInvalidResponseData?: boolean }`;
 }
 function renderRequestConfigWithSignal(hasRequestConfigParam) {
 	return `{ ${hasRequestConfigParam ? `...${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}, ` : ""}signal }`;
@@ -3313,7 +3342,7 @@ function renderQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const endpointFunction = inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
 	const lines = [];
-	lines.push(`const ${require_generate_utils.getQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType()}` : ""}) => ({`);
+	lines.push(`const ${require_generate_utils.getQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => ({`);
 	lines.push(`  queryKey: keys.${require_generate_utils.getEndpointName(endpoint)}(${endpointArgs}),`);
 	const requestConfigWithSignal = renderRequestConfigWithSignal(hasRequestConfigParam);
 	lines.push(`  queryFn: ({ signal }: { signal: AbortSignal }) => ${endpointFunction}(${endpointArgs}${hasRequestConfigParam ? `${endpointArgs ? ", " : ""}${requestConfigWithSignal}` : ""}),`);
@@ -3330,7 +3359,7 @@ function renderInfiniteQueryOptions({ resolver, endpoint, inlineEndpoints }) {
 	const endpointArgsWithPage = renderEndpointArgs(resolver, endpoint, { replacePageParam: true });
 	const endpointFunction = inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options);
 	const lines = [];
-	lines.push(`const ${require_generate_utils.getInfiniteQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType()}` : ""}) => ({`);
+	lines.push(`const ${require_generate_utils.getInfiniteQueryOptionsName(endpoint)} = (${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${getRequestConfigType(resolver)}` : ""}) => ({`);
 	lines.push(`  queryKey: keys.${require_generate_utils.getEndpointName(endpoint)}Infinite(${endpointArgsWithoutPage}),`);
 	const requestConfigWithSignal = renderRequestConfigWithSignal(hasRequestConfigParam);
 	lines.push(`  queryFn: ({ pageParam, signal }: { pageParam: number; signal: AbortSignal }) => ${endpointFunction}(${endpointArgsWithPage}${hasRequestConfigParam ? `, ${requestConfigWithSignal}` : ""}),`);
@@ -3347,7 +3376,7 @@ function renderPrefetchQuery({ resolver, endpoint }) {
 	const endpointParams = renderEndpointParams(resolver, endpoint, { modelNamespaceTag: require_generate_utils.getEndpointTag(endpoint, resolver.options) });
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, {});
 	const lines = [];
-	lines.push(`export const ${require_generate_utils.getPrefetchQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchQuery"]>[0], "queryKey" | "queryFn">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE}, ` : ""}throwOnError = false) => {`);
+	lines.push(`export const ${require_generate_utils.getPrefetchQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchQuery"]>[0], "queryKey" | "queryFn">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}, ` : ""}throwOnError = false) => {`);
 	lines.push(`  const queryOptions = { ...${require_generate_utils.getQueryOptionsName(endpoint)}(${endpointParams ? `{ ${endpointArgs} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}` : ""}), ...options };`);
 	lines.push(`  return throwOnError ? queryClient.fetchQuery(queryOptions) : queryClient.prefetchQuery(queryOptions);`);
 	lines.push("};");
@@ -3362,7 +3391,7 @@ function renderPrefetchInfiniteQuery({ resolver, endpoint }) {
 	const endpointArgs = renderEndpointArgs(resolver, endpoint, { excludePageParam: true });
 	const optionsArgs = `${endpointParams ? `{ ${endpointArgs} }` : ""}${hasRequestConfigParam ? `${endpointParams ? ", " : ""}${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}` : ""}`;
 	const lines = [];
-	lines.push(`export const ${require_generate_utils.getPrefetchInfiniteQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchInfiniteQuery"]>[0], "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE}, ` : ""}throwOnError = false) => {`);
+	lines.push(`export const ${require_generate_utils.getPrefetchInfiniteQueryName(endpoint)} = (queryClient: QueryClient, ${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: Omit<Parameters<QueryClient["prefetchInfiniteQuery"]>[0], "queryKey" | "queryFn" | "initialPageParam" | "getNextPageParam">, ${hasRequestConfigParam ? `${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}, ` : ""}throwOnError = false) => {`);
 	lines.push(`  const queryOptions = { ...${require_generate_utils.getInfiniteQueryOptionsName(endpoint)}(${optionsArgs}), ...(options as {}) };`);
 	lines.push(`  return throwOnError ? queryClient.fetchInfiniteQuery(queryOptions) : queryClient.prefetchInfiniteQuery(queryOptions);`);
 	lines.push("};");
@@ -3391,7 +3420,7 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 		mode: "query",
 		tag
 	}));
-	lines.push(`export const ${require_generate_utils.getQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: AppQueryOptions<typeof ${inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options)}, TData>${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
+	lines.push(`export const ${require_generate_utils.getQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgs} }: { ${endpointParams} }, ` : ""}options?: AppQueryOptions<typeof ${inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options)}, TData>${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
@@ -3461,7 +3490,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 		mode: "mutation",
 		tag
 	}));
-	lines.push(`export const ${require_generate_utils.getQueryName(endpoint, true)} = (${pathParamFirstArg}options?: AppMutationOptions<typeof ${endpointFunction}${mutationOptionsTypeArg}>${hasMutationEffects ? ` & ${require_generate_utils.MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
+	lines.push(`export const ${require_generate_utils.getQueryName(endpoint, true)} = (${pathParamFirstArg}options?: AppMutationOptions<typeof ${endpointFunction}${mutationOptionsTypeArg}>${hasMutationEffects ? ` & ${require_generate_utils.MUTATION_EFFECTS.optionsType}` : ""}${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	if (hasMutationDefaultOnError) lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceContextDestructure({
@@ -3580,7 +3609,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 		mode: "infiniteQuery",
 		tag
 	}));
-	lines.push(`export const ${require_generate_utils.getInfiniteQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }, ` : ""}options?: AppInfiniteQueryOptions<typeof ${inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options)}, TData>${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.AXIOS_REQUEST_CONFIG_TYPE}` : ""}) => {`);
+	lines.push(`export const ${require_generate_utils.getInfiniteQueryName(endpoint)} = <TData>(${endpointParams ? `{ ${endpointArgsWithoutPage} }: { ${endpointParams} }, ` : ""}options?: AppInfiniteQueryOptions<typeof ${inlineEndpoints ? require_generate_utils.getEndpointName(endpoint) : require_generate_utils.getImportedEndpointName(endpoint, resolver.options)}, TData>${hasAxiosRequestConfig ? `, ${require_generate_utils.AXIOS_REQUEST_CONFIG_NAME}?: ${require_generate_utils.getRequestConfigTypeName(resolver.options.restClient)}` : ""}) => {`);
 	lines.push("  const queryConfig = OpenApiQueryConfig.useConfig();");
 	if (hasAclCheck) lines.push(`  const { checkAcl } = ${require_generate_utils.ACL_CHECK_HOOK}();`);
 	lines.push(...renderWorkspaceParamResolutions({
@@ -3605,9 +3634,10 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 //#endregion
 //#region src/generators/generate/generateAppRestClient.ts
 function generateAppRestClient(resolver) {
-	return `import { RestClient } from "${require_generate_utils.PACKAGE_IMPORT_PATH}";
+	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}";
 
-export const ${require_generate_utils.APP_REST_CLIENT_NAME} = new RestClient({
+export const ${require_generate_utils.APP_REST_CLIENT_NAME} = new ${clientName}({
   config: {
     baseURL: "${resolver.getBaseUrl()}"
   },