@povio/openapi-codegen-cli 0.5.1 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "main": "./dist/index.js",
   "bin": {
     "openapi-codegen": "./dist/sh.js"

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

@@ -0,0 +1,10 @@
+/** 
+ * {{#if (isQuery endpoint)}}Query{{else}}Mutation{{/if}} `{{queryName 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) as | endpointParam |}} * @param { {{endpointParam.type}} } {{#if (isQuery ../endpoint)}}object{{else}}mutation{{/if}}.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
+{{/each}}{{/if}} * @param {{#if (isQuery endpoint)}}{ AppQueryOptions } options Query options{{else}}{ AppMutationOptions } options Mutation options{{/if}}
+ * @returns { {{#if (isQuery endpoint)}}UseQueryResult{{else}}UseMutationResult{{/if}}<{{{importedZodSchemaInferedType endpoint.response}}}> } {{endpoint.responseDescription}}
+ * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
+ */

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

@@ -1,8 +1,6 @@
 export const keys = {
-    {{#each (allQueryKeys endpoints) as | queryKey |}}
-    {{queryKey.name}}: ["{{queryKey.path}}"] as const,
-    {{/each}}
-    {{#each endpoints as | endpoint |}}
-    {{endpointName endpoint}}: ({{{genEndpointParams endpoint}}}) => [{{{commaSeparated (endpointPathQueryKeys endpoint ../endpoints)}}}, {{{endpointArgs endpoint}}}] as const,
+    all: ["{{namespace}}"] as const,
+    {{#each queryEndpoints as | endpoint |}}
+    {{endpointName endpoint}}: ({{{genEndpointParams endpoint}}}) => [...keys.all, "{{endpoint.path}}", {{{endpointArgs endpoint}}}] as const,
     {{/each}}
 };

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

@@ -1,21 +1,13 @@
-/** 
- * Mutation `{{queryName 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) as | endpointParam |}} * @param { {{endpointParam.type}} } mutation.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
-{{/each}}{{/if}} * @param { AppMutationOptions } options Mutation options
- * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
- */
+{{{genQueryJsDocs endpoint}}}
 export const {{queryName endpoint}} = (options?: AppMutationOptions<typeof {{importedEndpointName endpoint}}, { {{{genEndpointParams endpoint}}} }>) => {
-  {{#if (endpointAllQueryKey endpoint endpoints)}} const queryClient = useQueryClient();{{/if}}
+  {{#if queryEndpoints}} const queryClient = useQueryClient();{{/if}}
 
   return {{queryHook}}({
     mutationFn: ({{#if (endpointParams endpoint)}} { {{{endpointArgs endpoint}}} } {{/if}}) => {{importedEndpointName endpoint}}({{{endpointArgs endpoint}}}),
-    ...options, {{#if (endpointAllQueryKey endpoint endpoints)}}
+    ...options, {{#if queryEndpoints}}
     onSuccess: (...args) => {
       if (options?.enableInvalidateAll) {
-        queryClient.invalidateQueries({ queryKey: keys.{{endpointAllQueryKey endpoint endpoints}} });
+        queryClient.invalidateQueries({ queryKey: keys.all });
       }
       options?.onSuccess?.(...args);
     },{{/if}}

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

@@ -1,12 +1,4 @@
-/** 
- * Query `{{queryName 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) as | endpointParam |}} * @param { {{endpointParam.type}} } object.{{endpointParam.name}} {{{endpointParamDescription endpointParam}}}
-{{/each}}{{/if}} * @param { AppQueryOptions } options Query options
- * @statusCodes [{{commaSeparated endpoint.responseStatusCodes}}]
- */
+{{{genQueryJsDocs endpoint}}}
 export const {{queryName endpoint}} = <TData>({{#if (endpointParams endpoint)}}{ {{{endpointArgs endpoint}}} }: { {{{genEndpointParams endpoint}}} }, {{/if}}options?: AppQueryOptions<typeof {{importedEndpointName endpoint}}, TData>) => {
   return {{queryHook}}({
     queryKey: keys.{{endpointName endpoint}}({{#if (endpointParams endpoint)}}{{{endpointArgs endpoint}}}{{/if}}),

package/src/generators/templates/queries.hbs

@@ -15,7 +15,7 @@
 export namespace {{namespace}} {
 {{/if}}
 {{! Query keys export}}
-{{{genQueryKeys queryEndpoints}}}
+{{{genQueryKeys queryEndpoints namespace}}}
 
 {{! Query export }}
 {{#each endpoints as | endpoint |}}

package/dist/generators/utils/deps.utils.d.ts

@@ -1,3 +0,0 @@
-import { GenerateOptions } from "src/generators/types/options";
-export declare function getAppRestClientImportPath(options: GenerateOptions): string;
-export declare function getQueryTypesImportPath(options: GenerateOptions): string;