@povio/openapi-codegen-cli 2.0.8-rc.13 → 2.0.8-rc.15

package/dist/{generate.runner-DZC8Pd8t.mjs → generate.runner-tAVdp_fl.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-BvUyx8CZ.mjs";
+import { a as deepMerge, p as DEFAULT_GENERATE_OPTIONS, r as writeGenerateFileData, t as generateCodeFromOpenAPIDoc, x as Profiler } from "./generateCodeFromOpenAPIDoc-CxXf-IaZ.mjs";
 import fs from "fs";
 import path from "path";
 import SwaggerParser from "@apidevtools/swagger-parser";

package/dist/{generateCodeFromOpenAPIDoc-BvUyx8CZ.mjs → generateCodeFromOpenAPIDoc-CxXf-IaZ.mjs}

@@ -3773,8 +3773,11 @@ function generateQueries(params) {
 	const queryImport = {
 		bindings: [
 			...queryEndpoints.length > 0 ? [QUERY_HOOKS.query] : [],
+			...queryEndpoints.length > 0 ? ["UseQueryResult"] : [],
 			...resolver.options.infiniteQueries && infiniteQueryEndpoints.length > 0 ? [QUERY_HOOKS.infiniteQuery] : [],
-			...mutationEndpoints.length > 0 ? [QUERY_HOOKS.mutation] : []
+			...resolver.options.infiniteQueries && infiniteQueryEndpoints.length > 0 ? ["UseInfiniteQueryResult"] : [],
+			...mutationEndpoints.length > 0 ? [QUERY_HOOKS.mutation] : [],
+			...mutationEndpoints.length > 0 ? ["UseMutationResult"] : []
 		],
 		from: QUERY_IMPORT.from
 	};
@@ -4092,7 +4095,6 @@ function renderQuery({ resolver, endpoint, inlineEndpoints }) {
 		mode: "query"
 	}));
 	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,
@@ -4175,6 +4177,7 @@ function renderMutation({ resolver, endpoint, inlineEndpoints, precomputed }) {
 	if (hasMutationFnBody) lines.push("    },");
 	else lines.push(",");
 	lines.push("    ...options,");
+	lines.push("    onError: options?.onError ?? queryConfig.onError,");
 	if (hasMutationEffects) {
 		lines.push("    onSuccess: async (resData, variables, onMutateResult, context) => {");
 		if (updateQueryEndpoints.length > 0) {
@@ -4266,6 +4269,7 @@ function renderInfiniteQuery({ resolver, endpoint, inlineEndpoints }) {
 	lines.push(`      return pageParam * limitParam < ${resolver.options.infiniteQueryResponseParamNames.totalItems} ? pageParam + 1 : null;`);
 	lines.push("    },");
 	lines.push("    ...options,");
+	lines.push("    onError: options?.onError ?? queryConfig.onError,");
 	lines.push("  });");
 	lines.push("};");
 	return lines.join("\n");

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-BvUyx8CZ.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-CxXf-IaZ.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-BvUyx8CZ.mjs";
-import { n as resolveConfig, t as runGenerate } from "./generate.runner-DZC8Pd8t.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-CxXf-IaZ.mjs";
+import { n as resolveConfig, t as runGenerate } from "./generate.runner-tAVdp_fl.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.13";
+	return "2.0.8-rc.15";
 }
 
 //#endregion

package/dist/vite.mjs

@@ -1,5 +1,5 @@
-import { x as Profiler } from "./generateCodeFromOpenAPIDoc-BvUyx8CZ.mjs";
-import { t as runGenerate } from "./generate.runner-DZC8Pd8t.mjs";
+import { x as Profiler } from "./generateCodeFromOpenAPIDoc-CxXf-IaZ.mjs";
+import { t as runGenerate } from "./generate.runner-tAVdp_fl.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.13",
+  "version": "2.0.8-rc.15",
   "keywords": [
     "codegen",
     "openapi",
@@ -21,8 +21,7 @@
   "files": [
     "README.md",
     "dist/*",
-    "src/assets/**",
-    "src/generators/templates/**"
+    "src/assets/**"
   ],
   "type": "module",
   "main": "./dist/index.mjs",
@@ -69,7 +68,6 @@
   },
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
-    "handlebars": "^4.7.8",
     "i18next": "^25.8.13",
     "import-fresh": "^3.3.1",
     "prompt-sync": "^4.2.0",

package/src/generators/templates/acl-check.hbs

@@ -1,29 +0,0 @@
-{{! CASL ability import }}
-{{{genImport abilityTupleImport}}}
-{{! Error handling import }}
-{{{genImport errorHandlingImport}}}
-{{! Ability context import }}
-{{{genImport abilityContextImport}}}
-import { useCallback } from "react";
-
-{{! App abilities import }}
-{{{genImport appAbilitiesImport}}}
-
-interface UseAclCheckProps {
-  errorHandler?: {{errorHandler}}<never>;
-}
-
-export function {{aclCheckHook}}({ errorHandler }: UseAclCheckProps = {}) {
-  const ability = {{abilityContext}}.useAbility{{#if hasGenericAppAbilities}}<{{appAbilities}}>{{/if}}();
-
-  const checkAcl = useCallback(
-    (appAbility: {{appAbilities}}) => {
-      if (!ability.can(...(appAbility as {{abilityTuple}}))) {
-        (errorHandler ?? {{sharedErrorHandler}}).rethrowError(new Error("ACL check failed"));
-      }
-    },
-    [ability, errorHandler],
-  );
-
-  return { checkAcl };
-}

package/src/generators/templates/acl.hbs

@@ -1,19 +0,0 @@
-{{! Casl AbilityTuple import}}
-{{{genImport caslAbilityTupleImport}}}
-{{! Models import }}
-{{#each modelsImports as | modelsImport |}}
-{{{genImport modelsImport}}}
-{{/each}}
-
-{{#if includeNamespace}}
-export namespace {{namespace}} {
-{{/if}}
-
-{{! Ability functions }}
-{{#each endpoints as | endpoint |}}
-{{{genCaslAbilityFunction endpoint}}}
-
-{{/each}}
-{{#if includeNamespace}}
-}
-{{/if}}

package/src/generators/templates/app-acl.hbs

@@ -1,17 +0,0 @@
-{{! Casl AbilityTuple import}}
-{{{genImport caslAbilityTupleImport}}}
-{{! Models import }}
-{{#each modelsImports as | modelsImport |}}
-{{{genImport modelsImport}}}
-{{/each}}
-
-{{! AppAbilities union type }}
-export type {{appAbilities}} = {{#if appAbilitiesType}} 
-{{#each appAbilitiesType as | appAbilityType |}}
-| {{../abilityTuple}}<"{{@key}}", {{{union appAbilityType}}}>
-{{/each}}
-{{else}}
-{{abilityTuple}}<string, {{subjectType}}>;
-{{/if}}
-
-export type AppAbility = PureAbility<{{appAbilities}}>;

package/src/generators/templates/app-rest-client.hbs

@@ -1,7 +0,0 @@
-import { RestClient } from "{{restClientImportPath}}";
-
-export const {{appRestClientName}} = new RestClient({
-  config: {
-    baseURL: "{{baseUrl}}"
-  },
-});

package/src/generators/templates/configs.hbs

@@ -1,80 +0,0 @@
-{{! Zod import }}
-{{#if hasZodImport}}
-{{{genImport zodImport}}}
-{{/if}}
-{{! Dynamic inputs import }}
-{{#if hasDynamicInputsImport}}
-{{{genImport dynamicInputsImport}}}
-{{/if}}
-{{! Dynamic columns import }}
-{{#if hasDynamicColumnsImport}}
-{{{genImport dynamicColumnsImport}}}
-{{/if}}
-{{! Models import }}
-{{#each modelsImports as | modelsImport |}}
-{{{genImport modelsImport}}}
-{{/each}}
-{{! Queries import }}
-{{#each queriesImports as | queriesImport |}}
-{{{genImport queriesImport}}}
-{{/each}}
-{{! Acl import }}
-{{#each aclImports as | aclImport |}}
-{{{genImport aclImport}}}
-{{/each}}
-
-{{#if includeNamespace}}
-export namespace {{namespace}} {
-{{/if}}
-{{! Configs export }}
-{{#each configs as |config|}}
-export const {{config.name}} = {
-    meta: {
-        title: "{{{config.title}}}",
-    },
-    readAll: { 
-        {{#if config.readAll.acl}} acl: {{{config.readAll.acl}}}, 
-        {{/if}} schema: {{{config.readAll.columns.schema}}},
-        paginated: {{{config.readAll.paginated}}}, {{#if config.readAll.infinite}}
-        infinite: {{{config.readAll.infinite}}}, 
-        {{/if}} {{#if config.readAll.filters}} filters: {
-            schema: {{{config.readAll.filters.schema}}},
-            filterDefs: {{../dynamicInputs}}({{{genInputsConfig config.readAll.filters}}})
-        },
-        {{/if}} columns: {{../dynamicColumns}}({{{genColumnsConfig config.readAll.columns}}}),
-    }, {{#if config.read}}
-    read: {
-        {{#if config.read.acl}} acl: {{{config.read.acl}}}, 
-        {{/if}} schema: {{{config.read.schema}}},
-        query: {{{config.read.query}}},
-    },{{/if}} {{#if config.create}}
-    create: {
-        {{#if config.create.acl}} acl: {{{config.create.acl}}}, 
-        {{/if}} {{#if config.create.inputDefs}} schema: {{{config.create.inputDefs.schema}}},
-        {{/if}} mutation: {{{config.create.mutation}}}, 
-        {{#if config.create.inputDefs}} inputDefs: {{../dynamicInputs}}({{{genInputsConfig config.create.inputDefs}}}) 
-        {{/if}}
-    },{{/if}} {{#if config.update}}
-    update: {
-        {{#if config.update.acl}} acl: {{{config.update.acl}}}, 
-        {{/if}} {{#if config.update.inputDefs}} schema: {{{config.update.inputDefs.schema}}},
-        {{/if}} mutation: {{{config.update.mutation}}}, 
-        {{#if config.update.inputDefs}} inputDefs: {{../dynamicInputs}}({{{genInputsConfig config.update.inputDefs}}}) 
-        {{/if}}
-    },{{/if}} {{#if config.delete}}
-    delete: {
-        {{#if config.delete.acl}} acl: {{{config.delete.acl}}}, 
-        {{/if}} mutation: {{{config.delete.mutation}}},
-    },{{/if}} {{!-- {{#if config.bulkDelete}}
-    bulkDelete: {
-        {{#if config.bulkDelete.acl}} acl: {{{config.bulkDelete.acl}}}, 
-        {{/if}} mutation: {{{config.bulkDelete.mutation}}}, 
-        {{#if config.bulkDelete.inputDefs}} inputDefs: {{../dynamicInputs}}({{{genInputsConfig config.bulkDelete.inputDefs}}}) 
-        {{/if}}
-    },{{/if}} --}}
-};
-
-{{/each}}
-{{#if includeNamespace}}
-}
-{{/if}}

package/src/generators/templates/endpoints.hbs

@@ -1,43 +0,0 @@
-{{! App rest client import}}
-{{{genImport appRestClientImport}}}
-{{! Axios import }}
-{{#if hasAxiosImport}}
-{{{genImport axiosImport}}}
-{{/if}}
-{{! Zod import }}
-{{#if hasZodImport}}
-{{{genImport zodImport}}}
-{{/if}}
-{{! Zod extended import }}
-{{#if hasZodExtendedImport}}
-{{{genImport zodExtendedImport}}}
-{{/if}}
-{{! Models import }}
-{{#each modelsImports as | modelsImport |}}
-{{{genImport modelsImport}}}
-{{/each}}
-
-{{#if includeNamespace}}
-export namespace {{namespace}} {
-{{/if}}
-{{! Endpoints export }}
-{{#each endpoints as | endpoint |}}
-export const {{endpointName endpoint}} = ({{{genEndpointParams endpoint}}}{{#if ../hasAxiosRequestConfig}}{{../axiosRequestConfigName}}?: {{../axiosRequestConfigType}}{{/if}}) => { 
-    return {{../restClientName}}.{{endpoint.method}}( 
-        {{! Response }}
-        { resSchema: {{importedZodSchemaName endpoint.response}} }, 
-        {{! Path }}
-        `{{endpointPath endpoint}}`,
-        {{! Body }}
-        {{#with (endpointBody endpoint) as | endpointBody |}}
-        {{#if endpointBody}}{{#if ../../generateParse}}{{{genEndpointParamParse endpointBody endpointBody.name}}}{{else}}{{endpointBody.name}}{{/if}}, {{/if}}
-        {{/with}}
-        {{#if (hasUndefinedEndpointBody endpoint)}} undefined, 
-        {{! Config }}
-        {{/if}}{{{genEndpointConfig endpoint}}}
-    )
-};
-{{/each}}
-{{#if includeNamespace}}
-}
-{{/if}}

package/src/generators/templates/models.hbs

@@ -1,23 +0,0 @@
-{{! Zod import}}
-{{{genImport zodImport}}}
-{{! Models import }}
-{{#each modelsImports as | modelsImport |}}
-{{{genImport modelsImport}}}
-{{/each}}
-
-{{#if includeNamespace}}
-export namespace {{namespace}} {
-{{/if}}
-{{#each zodSchemasData as | zodSchema |}}
-{{! Js docs }}
-{{{genModelJsDocs @key zodSchema ../tag}}}
-{{! Zod schema export }}
-export const {{@key}} = {{{zodSchema.code}}};
-{{! Zod schema infered type export }}
-export type {{zodInferedType @key}} = z.infer<typeof {{@key}}>;
-{{#if zodSchema.isEnum}}export const {{zodInferedType @key}} = {{@key}}.enum;{{/if}}
-
-{{/each}}
-{{#if includeNamespace}}
-}
-{{/if}}

package/src/generators/templates/partials/acl-check-call.hbs

@@ -1 +0,0 @@
-checkAcl({{importedAbilityFunctionName endpoint}}({{#if generateAclCheckParams}}{ {{#each (abilityConditionsTypes endpoint) as | propertyType |}}{{propertyType.name}}, {{/each}} } {{/if}}));

package/src/generators/templates/partials/casl-ability-function.hbs

@@ -1,12 +0,0 @@
-/**
- * Use for {{{genCaslAbilityQuery endpoint}}} ability. {{#if (hasAbilityConditions endpoint)}}For global ability, omit the object parameter.{{/if}}{{#if (abilityDescription endpoint)}}
- * @description {{abilityDescription endpoint}}{{/if}} 
-{{#if (hasAbilityConditions endpoint)}}{{#each (abilityConditionsTypes endpoint) as | propertyType |}} * @param { {{propertyType.type}}{{propertyType.zodSchemaName}} } object.{{propertyType.name}} {{propertyType.name}} from {{propertyType.info}}
-{{/each}}{{/if}} * @returns { AbilityTuple } An ability tuple indicating the user's ability to use {{{genCaslAbilityQuery endpoint}}}
- */
-export const {{abilityFunctionName endpoint}} = (
-  {{#if (hasAbilityConditions endpoint)}}object?: { {{#each (abilityConditionsTypes endpoint) as | propertyType |}}{{propertyType.name}}{{#unless propertyType.required}}?{{/unless}}: {{propertyType.type}}{{propertyType.zodSchemaName}}, {{/each}} } {{/if}}
-) => [
-  "{{ablityAction endpoint}}", 
-  {{#if (hasAbilityConditions endpoint)}}object ? subject("{{ablitySubject endpoint}}", object) : "{{ablitySubject endpoint}}"{{else}}"{{ablitySubject endpoint}}"{{/if}}
-] as {{{genCaslAbilityType endpoint}}};

package/src/generators/templates/partials/casl-ability-query.hbs

@@ -1 +0,0 @@
-{{#if (isQuery endpoint)}}{{#if (isMutation endpoint)}}`{{queryName endpoint}}` query or `{{queryName endpoint mutation=true}}` mutation{{else}}`{{queryName endpoint}}` query{{/if}}{{else}}`{{queryName endpoint}}` mutation{{/if}}

package/src/generators/templates/partials/casl-ability-type.hbs

@@ -1 +0,0 @@
-{{abilityTuple}}<"{{ablityAction endpoint}}", {{{union (abilitySubjectTypes endpoint)}}}>

package/src/generators/templates/partials/columns-config.hbs

@@ -1,11 +0,0 @@
-{ 
-    schema: {{columnsConfig.schema}},
-    options: {
-        columns: {
-            {{#each columnsConfig.options.columns}}
-                {{@key}}: true,
-            {{/each}}
-        }, {{#if columnsConfig.options.sortable}}
-        sortable: {{columnsConfig.options.sortable}}, {{/if}}
-    }
-}

package/src/generators/templates/partials/endpoint-config.hbs

@@ -1,31 +0,0 @@
-{
-    {{! Query params}}
-    {{#if hasAxiosRequestConfig}}
-    ...{{axiosRequestConfigName}},
-    {{/if}}
-    {{#if endpointConfig.params}}
-    params: {
-        {{#each endpointConfig.params as | param |}}
-        {{#if (isEqual param.name param.value) }}
-        {{{param.name}}}{{#if ../generateParse}}: {{{genEndpointParamParse param param.name}}}{{/if}}, 
-        {{else}}
-        {{{param.name}}}: {{#if ../generateParse}}{{{genEndpointParamParse param param.value}}}{{else}}{{param.value}}{{/if}},
-        {{/if}}
-        {{/each}}
-    },
-    {{/if}}
-    {{! Headers}}
-    {{#if endpointConfig.headers}}
-    headers: {
-        {{#each endpointConfig.headers as | header |}}
-        '{{@key}}': {{{header}}},
-        {{/each}}
-    },
-    {{/if}}
-    {{#if hasBlobResponse}}
-    responseType: "blob",
-    {{/if}}
-    {{#if hasFileDownload}}
-    rawResponse: true,
-    {{/if}}
-}

package/src/generators/templates/partials/endpoint-param-parse.hbs

@@ -1 +0,0 @@
-{{zodExtendedNamespace}}.{{parse}}({{#if param.parameterSortingEnumSchemaName}}{{zodExtendedNamespace}}.{{sortExp}}({{{importedZodSchemaName param.parameterSortingEnumSchemaName}}}){{#if addOptional}}.optional(){{/if}}{{else}}{{{importedZodSchemaName param.zodSchema}}}{{#if addOptional}}.optional(){{/if}}{{/if}}, {{paramName}}{{#if isQuery}}, { type: "query", name: "{{paramName}}" }{{/if}})

package/src/generators/templates/partials/endpoint-params.hbs

@@ -1 +0,0 @@
-{{#each (endpointParams endpoint options) as | endpointParam |}}{{endpointParam.name}}{{#unless endpointParam.required}}?{{/unless}}: {{endpointParam.type}}, {{/each}}

package/src/generators/templates/partials/import.hbs

@@ -1 +0,0 @@
-import {{importNames import.bindings import.defaultImport}} from "{{import.from}}";

package/src/generators/templates/partials/inputs-config.hbs

@@ -1,10 +0,0 @@
-{ 
-    schema: {{inputsConfig.schema}},
-    options: {
-        inputs: {
-            {{#each inputsConfig.options.inputs}}
-                {{@key}}: true,
-            {{/each}}
-        }
-    }
-}

package/src/generators/templates/partials/model-js-docs.hbs

@@ -1,6 +0,0 @@
-/** 
- * {{name}} 
- * @type { {{zodSchemaType zodSchema}} }{{#if (zodSchemaDescription zodSchema)}}
- * @description {{{zodSchemaDescription zodSchema}}}{{/if}}
-{{#if (zodSchemaPropertyDescriptions zodSchema tag)}}{{#each (zodSchemaPropertyDescriptions zodSchema tag) as | property |}} * @property { {{property.type}} } {{@key}} {{{addAsteriskAfterNewLine property.description}}} 
-{{/each}}{{/if}} */

package/src/generators/templates/partials/query-js-docs.hbs

@@ -1,31 +0,0 @@
-{{#if infiniteQuery}}
-/** 
- * Infinite query `{{infiniteQueryName endpoint}}{{#if endpoint.summary}}
- * @summary {{addAsteriskAfterNewLine endpoint.summary}}{{/if}}{{#if endpoint.description}} 
- * @description {{addAsteriskAfterNewLine endpoint.description}}{{/if}}{{#if endpoint.acl}}
- * @permission Requires `{{abilityFunctionName endpoint}}` ability {{/if}}
-{{#if (endpointParams endpoint)}}{{#each (endpointParams endpoint infiniteQuery excludePageParam=true) as | endpointParam |}} * @param { {{{endpointParam.type}}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
-{{/each}}{{/if}} * @param { AppInfiniteQueryOptions } options Infinite query options
- * @returns { UseInfiniteQueryResult<{{{importedZodSchemaInferedType endpoint.response}}}> } {{endpoint.responseDescription}}
- * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
- */{{else if query}}
- /** 
- * Query `{{queryName endpoint}}`{{#if endpoint.summary}}{{#if endpoint.mediaDownload}} - recommended when file should be cached{{/if}}
- * @summary {{addAsteriskAfterNewLine endpoint.summary}}{{/if}}{{#if endpoint.description}} 
- * @description {{addAsteriskAfterNewLine endpoint.description}}{{/if}}{{#if endpoint.acl}}
- * @permission Requires `{{abilityFunctionName endpoint}}` ability {{/if}}
-{{#if (endpointParams endpoint includeFileParam=true)}}{{#each (endpointParams endpoint includeFileParam=true) as | endpointParam |}} * @param { {{{endpointParam.type}}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
-{{/each}}{{/if}} * @param { AppQueryOptions } options Query options
- * @returns { UseQueryResult<{{#if endpoint.mediaDownload}}AxiosResponse<{{/if}}{{{importedZodSchemaInferedType endpoint.response}}}{{#if endpoint.mediaDownload}}>{{/if}}> } {{endpoint.responseDescription}}
- * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
- */{{else if mutation}}
- /** 
- * Mutation `{{queryName endpoint mutation=true}}`{{#if endpoint.summary}}{{#if endpoint.mediaDownload}} - recommended when file should not be cached{{/if}}
- * @summary {{addAsteriskAfterNewLine endpoint.summary}}{{/if}}{{#if endpoint.description}} 
- * @description {{addAsteriskAfterNewLine endpoint.description}}{{/if}}{{#if endpoint.acl}}
- * @permission Requires `{{abilityFunctionName endpoint}}` ability {{/if}}
-{{#if (endpointParams endpoint includeFileParam=true)}}{{#each (endpointParams endpoint includeFileParam=true) as | endpointParam |}} * @param { {{{endpointParam.type}}} } mutation.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
-{{/each}}{{/if}} * @param { AppMutationOptions{{#if hasMutationEffects}} & {{mutationEffectsType}}{{/if}} } options Mutation options
- * @returns { UseMutationResult<{{#if endpoint.mediaDownload}}AxiosResponse<{{/if}}{{{importedZodSchemaInferedType endpoint.response}}}{{#if endpoint.mediaDownload}}>{{/if}}> } {{endpoint.responseDescription}}
- * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
- */{{/if}}

package/src/generators/templates/partials/query-keys.hbs

@@ -1,11 +0,0 @@
-export const keys = {
-    all: [{{queriesModuleName}}] as const,
-    {{#each queryEndpoints as | endpoint |}}
-    {{endpointName endpoint}}: ({{{genEndpointParams endpoint pathParamsRequiredOnly=true}}}) => [...keys.all, "{{endpoint.path}}", {{{endpointArgs endpoint}}}] as const,
-    {{#if ../generateInfiniteQueries}}
-    {{#if (isInfiniteQuery endpoint)}}
-    {{endpointName endpoint}}Infinite: ({{{genEndpointParams endpoint excludePageParam=true pathParamsRequiredOnly=true}}}) => [...keys.all, "{{endpoint.path}}", "infinite", {{{endpointArgs endpoint excludePageParam=true}}}] as const,
-    {{/if}}
-    {{/if}}
-    {{/each}}
-};

package/src/generators/templates/partials/query-use-infinite-query.hbs

@@ -1,21 +0,0 @@
-{{! Js docs }}
-{{{genQueryJsDocs endpoint infiniteQuery=true}}}
-{{! Infinite query definition}}
-export const {{infiniteQueryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint excludePageParam=true}}} }: { {{{genEndpointParams endpoint excludePageParam=true}}} }, {{/if}}options?: AppInfiniteQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
-  {{! Use acl check }}
-  {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
-
-  return {{infiniteQueryHook}}({
-    queryKey: keys.{{endpointName endpoint}}Infinite({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint excludePageParam=true}}}{{/if}}),
-    queryFn: ({ pageParam }) => {{#if hasQueryFnBody}}{ {{/if}} 
-    {{#if hasAclCheck}}{{{genAclCheckCall endpoint}}}{{/if}}
-    {{#if hasQueryFnBody}}return {{/if}}{{importedEndpointName endpoint}}({{{endpointArgs endpoint replacePageParam=true}}}{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}{{/if}})
-    {{#if hasQueryFnBody}} }{{/if}},
-    initialPageParam: 1,
-    getNextPageParam: ({ {{pageParamName}}, {{totalItemsName}}, {{limitParamName}}: limitParam }) => {
-      const pageParam = {{pageParamName}} ?? 1;
-      return pageParam * limitParam < {{totalItemsName}} ? pageParam + 1 : null;
-    },
-    ...options,
-  });
-};

package/src/generators/templates/partials/query-use-mutation.hbs

@@ -1,54 +0,0 @@
-{{! Js docs }}
-{{{genQueryJsDocs endpoint mutation=true}}}
-{{! Mutation definition}}
-export const {{queryName endpoint mutation=true}} = (options?: AppMutationOptions<typeof {{importedEndpointName endpoint}}, { {{{genEndpointParams endpoint includeFileParam=true}}}{{#if endpoint.mediaUpload}} abortController?: AbortController, onUploadProgress?: (progress: { loaded: number; total: number }) => void{{/if}} }>{{#if hasMutationEffects}} & {{mutationEffectsType}}{{/if}}{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
-  {{! Use acl check }}
-  {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
-  {{! Use mutation effects }}
-  {{#if hasMutationEffects}}const { runMutationEffects } = useMutationEffects({ currentModule: {{queriesModuleName}} });{{/if}}
-
-  return {{queryHook}}({
-    mutationFn: {{#if endpoint.mediaUpload}}async {{/if}}({{#if (endpointParams endpoint includeFileParam=true)}} { {{{endpointArgs endpoint includeFileParam=true}}}{{#if endpoint.mediaUpload}}, abortController, onUploadProgress{{/if}} } {{/if}}) => {{#if hasMutationFnBody}} { {{/if}}
-      {{#if hasAclCheck}}{{{genAclCheckCall endpoint}}}{{/if}}
-      {{#if endpoint.mediaUpload}}const uploadInstructions = await {{importedEndpointName endpoint}}({{{endpointArgs endpoint}}}{{#if hasAxiosRequestConfig}}{{#if (endpointArgs endpoint)}}, {{/if}}{{axiosRequestConfigName}}{{/if}});
-
-      if (file && uploadInstructions.url) {
-        const method = (data?.method?.toLowerCase() ?? "put") as 'put' | 'post';
-        let dataToSend: File | FormData = file;
-        if (method === "post") {
-          dataToSend = new FormData();
-          if (uploadInstructions.fields) {
-            for (const [key, value] of uploadInstructions.fields) {
-              dataToSend.append(key, value);
-            }
-          }
-          dataToSend.append('file', file);
-        }
-        await axios[method](uploadInstructions.url, dataToSend, {
-          headers: {
-            "Content-Type": file.type,
-          },
-          signal: abortController?.signal,
-          onUploadProgress: onUploadProgress
-          ? (progressEvent) => onUploadProgress({ loaded: progressEvent.loaded, total: progressEvent.total ?? 0 })
-          : undefined,
-        });
-      }
-
-      return uploadInstructions;
-      {{else}}
-      {{#if hasMutationFnBody}}return {{/if}}{{importedEndpointName endpoint}}({{{endpointArgs endpoint}}}{{#if hasAxiosRequestConfig}}{{#if (endpointArgs endpoint)}}, {{/if}}{{axiosRequestConfigName}}{{/if}})
-      {{/if}}
-    {{#if hasMutationFnBody}} }{{/if}},
-    ...options, {{#if hasMutationEffects}}
-    onSuccess: async (resData, variables, onMutateResult, context) => {
-      {{! Mutation effects }}
-      {{#if updateQueryEndpoints}}
-      {{#if destructuredVariables}}const { {{commaSeparated destructuredVariables }} } = variables;{{/if}}
-      const updateKeys = [{{#each updateQueryEndpoints as | endpoint |}}keys.{{endpointName endpoint}}({{{endpointArgs endpoint includeOnlyRequiredParams=true}}}), {{/each}}];
-      {{/if}}
-      await runMutationEffects(resData, variables, options{{#if updateQueryEndpoints}}, updateKeys{{/if}});
-      options?.onSuccess?.(resData, variables, onMutateResult, context);
-    },{{/if}}
-  });
-};

package/src/generators/templates/partials/query-use-query.hbs

@@ -1,16 +0,0 @@
-{{! Js docs }}
-{{{genQueryJsDocs endpoint query=true}}}
-{{! Query definition}}
-export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint}}} }: { {{{genEndpointParams endpoint}}} }, {{/if}}options?: AppQueryOptions<typeof {{importedEndpointName endpoint}}, TData>{{#if hasAxiosRequestConfig}}, {{axiosRequestConfigName}}?: {{axiosRequestConfigType}}{{/if}}) => {
-  {{! Use acl check }}
-  {{#if hasAclCheck}}const { checkAcl } = {{aclCheckHook}}();{{/if}}
-  
-  return {{queryHook}}({
-    queryKey: keys.{{endpointName endpoint}}({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint}}}{{/if}}),
-    queryFn: {{#if hasQueryFn}}() => {{#if hasQueryFnBody}}{ {{/if}} 
-    {{#if hasAclCheck}}{{{genAclCheckCall endpoint}}}{{/if}}
-    {{#if hasQueryFnBody}}return {{/if}}{{importedEndpointName endpoint}}({{{endpointArgs endpoint}}}{{#if hasAxiosRequestConfig}}{{#if (endpointArgs endpoint)}}, {{/if}}{{axiosRequestConfigName}}{{/if}}){{else}}{{importedEndpointName endpoint}}{{/if}}
-    {{#if hasQueryFnBody}} }{{/if}},
-    ...options,
-  });
-};

package/src/generators/templates/queries.hbs

@@ -1,54 +0,0 @@
-{{! Axios import }}
-{{#if hasAxiosImport}}
-{{{genImport axiosImport}}}
-{{/if}}
-{{! React query import }}
-{{{genImport queryImport}}}
-{{! Query modules import }}
-{{#if hasMutationEffects}}
-{{{genImport queryModulesImport}}}
-{{/if}}
-{{! Mutation effects import }}
-{{#if hasMutationEffectsImport}}
-{{{genImport mutationEffectsImport}}}
-{{/if}}
-{{! Acl check import }}
-{{#if hasAclCheck}}
-{{{genImport aclCheckImport}}}
-{{#each aclImports as | aclImport |}}
-{{{genImport aclImport}}}
-{{/each}}
-{{/if}}
-{{! React query types import }}
-{{{genImport queryTypesImport}}}
-{{! Models import }}
-{{#each modelsImports as | modelsImport |}}
-{{{genImport modelsImport}}}
-{{/each}}
-{{! Endpoints import }}
-{{#each endpointsImports as | endpointsImport |}}
-{{{genImport endpointsImport}}}
-{{/each}}
-
-{{#if includeNamespace}}
-export namespace {{namespace}} {
-{{/if}}
-
-export const {{queriesModuleName}} = {{#if hasMutationEffects}}{{queryModuleEnum}}.{{tag}}{{else}}"{{namespace}}"{{/if}};
-
-{{! Query keys export}}
-{{{genQueryKeys queryEndpoints}}}
-
-{{! Query export }}
-{{#each endpoints as | endpoint |}}
-{{{genQuery endpoint}}}
-
-{{{genMutation endpoint ../queryEndpoints}}}
-
-{{{genInfiniteQuery endpoint}}}
-
-{{/each}}
-
-{{#if includeNamespace}}
-}
-{{/if}}

package/src/generators/templates/query-modules.hbs

@@ -1,5 +0,0 @@
-export const enum QueryModule {
-   {{#each modules as | module |}}
-   {{module.tag}} = "{{module.namespace}}",
-   {{/each}}
-}

package/src/generators/templates/zod-extended.hbs

@@ -1,49 +0,0 @@
-{{! Zod import }}
-{{{genImport zodImport}}}
-{{! Error handling import }}
-{{{genImport errorHandlingImport}}}
-
-export namespace ZodExtended {
-  interface ParseOptions {
-    type: "body" | "query";
-    name?: string;
-    errorHandler?: ErrorHandler<never>;
-  }
-
-  export function {{parse}}<ZOutput, ZInput>(
-    schema: z.ZodType<ZOutput, ZInput>,
-    data: unknown,
-    { type, name, errorHandler }: ParseOptions = { type: "body" },
-  ) {
-    try {
-      return schema.parse(data);
-    } catch (e) {
-      if (e instanceof z.ZodError) {
-        e.name = `FE Request ${type === "body" ? "body" : "query param"}${name ? ` ("${name}")` : ""} schema mismatch - ZodError`;
-      }
-      (errorHandler ?? {{sharedErrorHandler}}).rethrowError(e);
-      throw e;
-    }
-  }
-
-  function is{{capitalize sortExp}}Valid(enumSchema: z.ZodEnum, data?: string) {
-    if (data === undefined || data === "" || enumSchema.options.length === 0) {
-      return true;
-    }
-
-    const prefixedEnumOptions = `([+-]?(${enumSchema.options.join("|")}))`;
-    const commaSeparatedOptions = `(${prefixedEnumOptions})(\s*,\s*${prefixedEnumOptions})*`;
-    return new RegExp(`^${commaSeparatedOptions}$`).test(data);
-  }
-
-  export const {{sortExp}} = (enumSchema: z.ZodEnum) =>
-    z.string().superRefine((arg, ctx) => {
-      if (!is{{capitalize sortExp}}Valid(enumSchema, arg)) {
-        ctx.addIssue({
-          code: "invalid_value",
-          message: "Invalid sorting string.",
-          values: [],
-        });
-      }
-    });
-}