react-query-lightbase-codegen 1.0.3 → 1.0.6

package/dist/convertSwaggerFile.d.ts

@@ -0,0 +1,5 @@
+import { OpenAPIObject } from 'openapi3-ts';
+/**
+ * Import and parse the openapi spec from a yaml/json
+ */
+export declare const convertSwaggerFile: (data: string, extension: 'yaml' | 'json') => Promise<OpenAPIObject>;

package/dist/convertSwaggerFile.js

@@ -0,0 +1,26 @@
+import swagger2openapi from 'swagger2openapi';
+import yaml from 'js-yaml';
+/**
+ * Import and parse the openapi spec from a yaml/json
+ */
+export const convertSwaggerFile = (data, extension) => {
+    const schema = extension === 'yaml' ? yaml.load(data) : JSON.parse(data);
+    return new Promise((resolve, reject) => {
+        if (!schema.openapi || !schema.openapi.startsWith('3.')) {
+            swagger2openapi.convertObj(schema, {}, (err, convertedObj) => {
+                if (err) {
+                    reject(err);
+                }
+                else {
+                    // @ts-ignore
+                    convertedObj.openapi.basePath = convertedObj.original.basePath;
+                    resolve(convertedObj.openapi);
+                }
+            });
+        }
+        else {
+            resolve(schema);
+        }
+    });
+};
+//# sourceMappingURL=convertSwaggerFile.js.map

package/dist/convertSwaggerFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"convertSwaggerFile.js","sourceRoot":"","sources":["../src/convertSwaggerFile.ts"],"names":[],"mappings":"AACA,OAAO,eAAe,MAAM,iBAAiB,CAAC;AAC9C,OAAO,IAAI,MAAM,SAAS,CAAC;AAE3B;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,SAA0B,EAA0B,EAAE;IACrG,MAAM,MAAM,GAAG,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACrC,IAAI,CAAC,MAAM,CAAC,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvD,eAAe,CAAC,UAAU,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;gBAC3D,IAAI,GAAG,EAAE;oBACP,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;qBAAM;oBACL,aAAa;oBACb,YAAY,CAAC,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC,QAAQ,CAAC,QAAQ,CAAC;oBAC/D,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;iBAC/B;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,MAAM,CAAC,CAAC;SACjB;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/dist/generateHooks.d.ts

@@ -0,0 +1,25 @@
+import { ComponentsObject, OperationObject, ParameterObject, ReferenceObject } from 'openapi3-ts';
+/**
+ * Generate a react-query component from openapi operation specs
+ */
+export declare const createHook: ({ operation, verb, route, operationIds, parameters, schemasComponents, headerFilters, overrides, }: {
+    operation: OperationObject;
+    verb: string;
+    route: string;
+    operationIds: string[];
+    parameters: (ReferenceObject | ParameterObject)[] | undefined;
+    schemasComponents?: ComponentsObject | undefined;
+    headerFilters?: string[] | undefined;
+    overrides?: Record<string, {
+        type: 'query';
+    } | {
+        type: 'mutation';
+    } | {
+        type: 'infiniteQuery';
+        infiniteQueryParm: string;
+    }> | undefined;
+}) => {
+    implementation: string;
+    imports: string[];
+    queryImports: ("query" | "mutation" | "infiniteQuery")[];
+};

package/dist/generateHooks.js

@@ -0,0 +1,393 @@
+import lodash from 'lodash';
+const { get, groupBy } = lodash;
+import { formatDescription, getResReqTypes, isReference, resolveValue } from './utils.js';
+import pasCase from 'case';
+import chalk from 'chalk';
+const { pascal, camel } = pasCase;
+const IdentifierRegexp = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+/**
+ * Return every params in a path
+ */
+const getParamsInPath = (path) => {
+    let n;
+    const output = [];
+    const templatePathRegex = /\{(\w+)}/g;
+    while ((n = templatePathRegex.exec(path)) !== null) {
+        output.push(n[1]);
+    }
+    return output;
+};
+/**
+ * Generate a react-query component from openapi operation specs
+ */
+export const createHook = ({ operation, verb, route, operationIds, parameters, schemasComponents, headerFilters, overrides, }) => {
+    const { operationId = route.replace('/', '') } = operation;
+    if (operationId === '*') {
+        throw new Error(`Invalid operationId/Route set for ${verb} ${route}`);
+    }
+    if (operationIds.includes(operationId)) {
+        return { implementation: '', imports: [], queryImports: [] };
+    }
+    operationIds.push(operationId);
+    route = route.replace(/\{/g, '${').replace('//', '/'); // `/pet/{id}` => `/pet/${id}`
+    // Remove the last param of the route if we are in the DELETE case
+    let lastParamInTheRoute = null;
+    const componentName = pascal(operationId);
+    const isOk = ([statusCode]) => statusCode.toString().startsWith('2');
+    const responseTypes = getResReqTypes(Object.entries(operation.responses).filter(isOk)) || 'void';
+    const requestBodyTypes = getResReqTypes([['body', operation.requestBody]]);
+    let imports = [responseTypes];
+    let queryImports = [];
+    const paramsInPath = getParamsInPath(route).filter((param) => !(verb === 'delete' && param === lastParamInTheRoute));
+    const { query: queryParams = [], path: pathParams = [], header = [], } = groupBy([...(parameters || []), ...(operation.parameters || [])].map((p) => {
+        if (isReference(p)) {
+            return get(schemasComponents, p.$ref.replace('#/components/', '').replace('/', '.'));
+        }
+        else {
+            return p;
+        }
+    }), 'in');
+    const headerParams = header.filter((p) => !headerFilters?.includes(p.name));
+    let enabled = [];
+    // TODO: extract all requestBody or remove useQuery variants
+    let enabledParam = '!!params';
+    [...queryParams, ...pathParams, ...headerParams].forEach((item) => {
+        if (item.required) {
+            enabled.push(`["${item.name}"]`);
+            if (enabledParam && enabledParam !== '!!params') {
+                enabledParam += `&& params['${item.name}'] != null`;
+            }
+            else {
+                enabledParam = `params['${item.name}'] != null`;
+            }
+        }
+    });
+    // `!props${enabled.join('== null && !props')}`;
+    const paramsTypes = paramsInPath
+        .map((p) => {
+        try {
+            const { name, required, schema } = pathParams.find((i) => i.name === p);
+            return `${name}${required ? '' : '?'}: ${resolveValue(schema)}`;
+        }
+        catch (err) {
+            throw new Error(`The path params ${p} can't be found in parameters (${operationId})`);
+        }
+    })
+        .join('; ');
+    const queryParamsType = queryParams
+        .map((p) => {
+        const processedName = IdentifierRegexp.test(p.name) ? p.name : `"${p.name}"`;
+        return `${formatDescription(p.description)}
+      ${processedName}${p.required ? '' : '?'}: ${resolveValue(p.schema)}`;
+    })
+        .join(';\n  ');
+    const headerType = headerParams
+        .map((p) => {
+        try {
+            const { name, required, schema } = headerParams.find((i) => i.name === p.name);
+            return `"${name}"${required ? '' : '?'}: ${resolveValue(schema)}`;
+        }
+        catch (err) {
+            throw new Error(`The path params ${p} can't be found in parameters (${operationId})`);
+        }
+    })
+        .join('; ');
+    // Retrieve the type of the param for delete verb
+    const lastParamInTheRouteDefinition = operation.parameters && lastParamInTheRoute
+        ? operation.parameters.find((p) => {
+            if (isReference(p)) {
+                return false;
+            }
+            return p.name === lastParamInTheRoute;
+        }) // Reference is not possible
+        : { schema: { type: 'string' } };
+    if (!lastParamInTheRouteDefinition) {
+        throw new Error(`The path params ${lastParamInTheRoute} can't be found in parameters (${operationId})`);
+    }
+    const defaultDescription = `type: ${verb}\noperationId: ${operationId}\nurl: ${route}`;
+    const description = formatDescription(operation.summary && operation.description
+        ? `${defaultDescription}\n\n${operation.summary}\n\n${operation.description}`
+        : `${defaultDescription}`);
+    let output = `\n\n${description}`;
+    const headerParam = headerType && headerType !== 'void' ? `${headerType};` : '';
+    const queryParam = queryParamsType && queryParamsType !== 'void' ? `${queryParamsType}` : '';
+    const requestBodyComponent = requestBodyTypes && requestBodyTypes !== 'void' ? `${requestBodyTypes}` : '';
+    if (requestBodyComponent) {
+        imports.push(requestBodyComponent);
+    }
+    const isUpdateRequest = ['post', 'patch', 'put'].includes(verb);
+    const fetchName = camel(componentName);
+    const createQueryHooks = (emptyParams) => {
+        const params = emptyParams ? '' : `params: ${componentName}Params,`;
+        const key = emptyParams ? '' : `params`;
+        const mutationParams = emptyParams ? 'void' : `${componentName}Params`;
+        const queryParamType = emptyParams ? '' : `${componentName}Params &`;
+        const filterParams = emptyParams
+            ? '{ filters }: { filters?: QueryFilters }'
+            : `{ params, filters }: { params: ${componentName}Params, filters?: QueryFilters }`;
+        const cacheParams = emptyParams
+            ? `{updater, options}: {updater: Updater<${responseTypes} | undefined, ${responseTypes} | undefined>, options?: SetDataOptions | undefined}`
+            : `{params, updater, options}: {params: ${componentName}Params, updater: Updater<${responseTypes} | undefined, ${responseTypes} | undefined>, options?: SetDataOptions | undefined}`;
+        const queryKey = emptyParams
+            ? `use${componentName}Query.baseKey()`
+            : `[...use${componentName}Query.baseKey(), params]`;
+        const createQuery = () => `
+    type ${componentName}QueryProps<T = ${responseTypes}> = ${queryParamType} {
+      options?: UseQueryOptions<${responseTypes}, AxiosError, T, any> 
+    }
+    export function use${componentName}Query<T = ${responseTypes}>({ options = {}, ...params }: ${componentName}QueryProps<T>) { 
+      return useQuery(use${componentName}Query.queryKey(${key}), async () => ${fetchName}(${key}), { enabled: ${enabledParam}, ...options });
+    }
+
+    use${componentName}Query.baseKey = (): QueryKey => ["${componentName.toLowerCase()}"];
+  
+    use${componentName}Query.queryKey = (${params}): QueryKey => ${queryKey};
+  
+    use${componentName}Query.updateCache = (${cacheParams}) => queryClient.setQueryData<${responseTypes}>(use${componentName}Query.queryKey(${key}), updater, options);
+    
+    use${componentName}Query.getQueryState = (${filterParams})=> queryClient.getQueryState<${responseTypes}>(use${componentName}Query.queryKey(${key}), filters);
+    
+    use${componentName}Query.getQueryData = (${filterParams})=> queryClient.getQueryData<${responseTypes}>(use${componentName}Query.queryKey(${key}), filters);
+    
+    use${componentName}Query.prefetch = (${params}) => queryClient.prefetchQuery<${responseTypes}>(use${componentName}Query.queryKey(${key}), ()=> ${fetchName}(${key}));
+  
+    use${componentName}Query.cancelQueries = (${params}) => queryClient.cancelQueries(use${componentName}Query.queryKey(${key}))
+  
+    use${componentName}Query.invalidate = (${params}) => queryClient.invalidateQueries<${responseTypes}>(use${componentName}Query.queryKey(${key}));
+  
+    use${componentName}Query.refetchStale = (${params}) => queryClient.refetchQueries<${responseTypes}>(use${componentName}Query.queryKey(${key}), { stale: true });
+  `;
+        const getInfiniteQuery = ({ pageParam }) => `
+    type ${componentName}QueryProps<T = ${responseTypes}> = ${queryParamType} {
+      options: UseInfiniteQueryOptions<${responseTypes}, AxiosError, T, any> 
+    }
+    export function use${componentName}Query<T = ${responseTypes}>({ options = {}, ...params }: ${componentName}QueryProps<T>) { 
+      return useInfiniteQuery(use${componentName}Query.queryKey(${key}), async ({ pageParam = 0 }) => ${fetchName}({${pageParam}: pageParam, ...params}), { enabled: ${enabledParam}, ...options });
+    }
+
+    use${componentName}Query.baseKey = (): QueryKey => ["${componentName.toLowerCase()}"];
+  
+    use${componentName}Query.queryKey = (${params}): QueryKey => ${queryKey};
+  
+  `;
+        const createMutation = () => `
+    type ${componentName}MutationProps<T> = {
+      options?: UseMutationOptions<${responseTypes}, AxiosError, ${mutationParams}, T> 
+    }
+    export function use${componentName}Mutation<T = ${responseTypes}>(props?: ${componentName}MutationProps<T>) { 
+      return useMutation(async (${key}) => ${fetchName}(${key}), props?.options)
+    };
+    `;
+        const override = overrides?.[operationId];
+        if (override?.type === 'query') {
+            console.log(chalk.blue(`⚙️  [${operationId}] has been changed to a useQuery hook`));
+            queryImports.push('query');
+            return createQuery();
+        }
+        if (override?.type === 'mutation') {
+            queryImports.push('mutation');
+            console.log(chalk.blue(`⚙️  [${operationId}] has been changed to a useMutation hook`));
+            return createMutation();
+        }
+        if (override?.type === 'infiniteQuery') {
+            console.log(chalk.blue(`⚙️  [${operationId}] has been changed to a useInfiniteQuery hook`));
+            queryImports.push('infiniteQuery');
+            return getInfiniteQuery({ pageParam: override.infiniteQueryParm });
+        }
+        if (verb === 'get') {
+            queryImports.push('query');
+            return createQuery();
+        }
+        queryImports.push('mutation');
+        return createMutation();
+    };
+    output += createQueryHooks(!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam);
+    const hasRequestBodyArrray = requestBodyComponent && requestBodyComponent.includes('[]');
+    const body = hasRequestBodyArrray ? `{body: ${requestBodyComponent}}` : `${requestBodyComponent}`;
+    const bodyProps = hasRequestBodyArrray ? `{body, ...props}` : '{props}';
+    const generateProps = (props) => {
+        return props.map((item) => `["${item.name}"]: props["${item.name}"]`).join(',');
+    };
+    const generateBodyProps = () => {
+        const definitionKey = Object.keys(schemasComponents?.schemas || {}).find((key) => pascal(key) === requestBodyComponent);
+        if (definitionKey && !hasRequestBodyArrray) {
+            const scheme = schemasComponents?.schemas?.[definitionKey];
+            const generatedBodyProps = Object.keys(scheme.properties)
+                .map((item) => `["${item}"]: props["${item}"]`)
+                .join(',');
+            return `const body = {${generatedBodyProps}}`;
+        }
+        return '';
+    };
+    if (!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
+        output += `
+    const ${fetchName} = async () => {
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`);
+      return result.data;
+    }
+    `;
+    }
+    if (!requestBodyComponent && paramsInPath.length && queryParam && !headerParam) {
+        const config = isUpdateRequest ? 'body,{params}' : '{params}';
+        output += `
+    type ${componentName}Params = {
+      ${paramsTypes}
+      ${queryParamsType}; 
+    }
+
+     const ${fetchName} = async (props:${componentName}Params) => {
+      const {${paramsInPath.join(', ')}, ...params} = props
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
+      return result.data;
+    }`;
+    }
+    if (!requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
+        output += `
+    type ${componentName}Params = {
+      ${paramsTypes}
+    }
+
+    const ${fetchName} = async (props: ${componentName}Params ) => {
+      const result = await api.${verb}<${responseTypes}>(\`${route.replace(/\{/g, '{props.')}\`);
+      return result.data;
+    }
+    `;
+    }
+    if (!requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
+        const config = isUpdateRequest ? 'null,{params}' : '{params}';
+        output += `
+    type ${componentName}Params = { 
+      ${queryParamsType} 
+    }
+
+    const ${fetchName} = async (params: ${componentName}Params) => {
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
+      return result.data;
+    }
+    `;
+    }
+    if (!requestBodyComponent && !paramsInPath.length && queryParam && headerParam) {
+        const config = isUpdateRequest ? 'null,{headers, params: queryParams}' : '{headers, params: queryParams}';
+        output += `
+      type ${componentName}Params = {
+        ${headerParam}
+        ${queryParamsType}
+      }
+      const ${fetchName} = async (props: ${componentName}Params) => {
+        const headers = {${generateProps(header)}}
+        const queryParams = {${generateProps(queryParams)}}
+        const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
+        return result.data
+      }`;
+    }
+    if (!requestBodyComponent && !paramsInPath.length && !queryParam && headerParam) {
+        const config = isUpdateRequest ? 'null,{headers}' : '{headers}';
+        output += `
+      type ${componentName}Params = {
+        ${headerParam}
+      };
+  
+      const ${fetchName} = async (headers: ${componentName}Params) => {
+        const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config});
+        return result.data;
+      }
+      `;
+    }
+    if (requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
+        output += `
+    type ${componentName}Params = ${requestBodyComponent}
+
+    const ${fetchName} = async (body: ${componentName}Params) => {
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, body)
+      return result.data
+    } 
+      `;
+    }
+    if (requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
+        output += `
+      type ${componentName}Params =  ${body} & {
+        ${queryParamsType}
+      }
+
+     const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {   
+      ${generateBodyProps()}
+      const params =  {${generateProps(queryParams)}}
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {params})
+      return result.data
+    }
+    `;
+    }
+    if (requestBodyComponent && !paramsInPath.length && !queryParam && headerParam) {
+        output += `
+    type ${componentName}Params =  ${body} & {
+      ${headerParam}
+    };
+
+    const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
+      ${generateBodyProps()}
+      const headers = {${generateProps(header)}}
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers})
+      return result.data
+    }
+    `;
+    }
+    if (requestBodyComponent && !paramsInPath.length && queryParam && headerParam) {
+        output += `
+    type ${componentName}Params = ${body} & {
+      ${headerParam}
+      ${paramsTypes}
+    };
+
+    const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
+      ${generateBodyProps()}
+      const headers = {${generateProps(header)}}
+      const params =  {${generateProps(queryParams)}}
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers, params})
+      return result.data
+    }
+    `;
+    }
+    if (requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
+        output += `
+    type ${componentName}Params = ${body} & {
+      ${headerParam}
+      ${paramsTypes}
+    };
+
+    const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
+      ${generateBodyProps()}
+      const result = await api.${verb}<${responseTypes}>(\`${route.replace(/\{/g, '{props.')}\`, body)
+      return result.data
+    }
+    `;
+    }
+    if (requestBodyComponent && paramsInPath.length && queryParam && !headerParam) {
+        output += `// TODO: NOT SUPPORTED requestBodyComponent && paramsInPath && queryParam)`;
+    }
+    if (requestBodyComponent && paramsInPath.length && queryParam && headerParam) {
+        output += `// TODO: NOT SUPPORTED requestBodyComponent && paramsInPath && queryParam && headerParam)`;
+    }
+    if (!requestBodyComponent && paramsInPath.length && !queryParam && headerParam) {
+        const config = isUpdateRequest ? 'null,{headers}' : '{headers}';
+        output += `
+    type ${componentName}Params = {
+      ${headerParam}
+      ${paramsTypes}
+    };
+
+    const ${fetchName} = async (props: ${componentName}Params) => {
+      const headers = {${generateProps(header)}}
+      const result = await api.${verb}<${responseTypes}>(\`${route.replace(/\{/g, '{props.')}\`, ${config})
+      return result.data
+    }
+    `;
+    }
+    if (!requestBodyComponent && paramsInPath.length && queryParam && headerParam) {
+        output += `// TODO: NOT SUPPORTED (paramsInPath && queryParam && headerParam)`;
+    }
+    if (requestBodyComponent && paramsInPath.length && !queryParam && headerParam) {
+        output += `// TODO: NOT SUPPORTED (requestBodyComponent && paramsInPath && headerParam)`;
+    }
+    return { implementation: output, imports, queryImports };
+};
+//# sourceMappingURL=generateHooks.js.map

package/dist/generateHooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateHooks.js","sourceRoot":"","sources":["../src/generateHooks.ts"],"names":[],"mappings":"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"}

package/dist/generateImports.d.ts

@@ -0,0 +1,7 @@
+export declare const generateImports: ({ schemaName, apiDirectory, queryClientDir, schemaImports, queryImports, }: {
+    apiDirectory: string;
+    queryClientDir: string;
+    schemaName: string;
+    schemaImports: string[];
+    queryImports: ('query' | 'mutation' | 'infiniteQuery')[];
+}) => string;

package/dist/generateImports.js

@@ -0,0 +1,28 @@
+export const generateImports = ({ schemaName, apiDirectory, queryClientDir, schemaImports, queryImports, }) => {
+    const importTypes = schemaImports.join(',');
+    let imports = [];
+    if (queryImports.includes('query')) {
+        imports = [...imports, 'useQuery', 'UseQueryOptions', 'QueryKey', 'SetDataOptions', 'QueryFilters'];
+    }
+    if (queryImports.includes('infiniteQuery')) {
+        imports = [...imports, 'useInfiniteQuery', 'UseInfiniteQueryOptions', 'QueryKey'];
+    }
+    if (queryImports.includes('mutation')) {
+        imports = [...imports, 'UseMutationOptions', 'useMutation'];
+    }
+    const importString = [...new Set(imports)].join(',');
+    return `
+  import {
+    ${importString}
+  } from '@tanstack/react-query';
+  
+  import { AxiosError } from 'axios';
+  import { api } from '${apiDirectory}';
+  import { queryClient } from '${queryClientDir}';
+
+  import {${importTypes}} from './${schemaName}'
+
+  type Updater<TInput, TOutput> = TOutput | ((input: TInput) => TOutput);  
+  `;
+};
+//# sourceMappingURL=generateImports.js.map

package/dist/generateImports.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateImports.js","sourceRoot":"","sources":["../src/generateImports.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAC9B,UAAU,EACV,YAAY,EACZ,cAAc,EACd,aAAa,EACb,YAAY,GAOb,EAAE,EAAE;IACH,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,OAAO,GAAG,EAAc,CAAC;IAC7B,IAAI,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAClC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;KACrG;IACD,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;QAC1C,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,UAAU,CAAC,CAAC;KACnF;IACD,IAAI,YAAY,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QACrC,OAAO,GAAG,CAAC,GAAG,OAAO,EAAE,oBAAoB,EAAE,aAAa,CAAC,CAAC;KAC7D;IAED,MAAM,YAAY,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAErD,OAAO;;MAEH,YAAY;;;;yBAIO,YAAY;iCACJ,cAAc;;YAEnC,WAAW,aAAa,UAAU;;;GAG3C,CAAC;AACJ,CAAC,CAAC"}

package/dist/generateSchemas.d.ts

@@ -0,0 +1,7 @@
+import { OpenAPIObject } from 'openapi3-ts';
+/**
+ * Extract all types from #/components/schemas
+ */
+export declare const generateSchemas: ({ spec }: {
+    spec: OpenAPIObject;
+}) => string;

package/dist/generateSchemas.js

@@ -0,0 +1,97 @@
+import pasCase from 'case';
+import lodash from 'lodash';
+const { isEmpty } = lodash;
+const { pascal } = pasCase;
+import { formatDescription, getScalar, isReference, resolveValue } from './utils.js';
+import { getDocs, getResReqTypes } from './utils.js';
+/**
+ * Generate the interface string
+ */
+const generateInterface = (name, schema) => {
+    const scalar = getScalar(schema);
+    return `${formatDescription(schema.description)}
+       export type ${pascal(name)} = ${scalar}
+     `;
+};
+/**
+ * Extract all types from #/components/schemas
+ */
+const generateSchemasDefinition = (schemas = {}) => {
+    if (isEmpty(schemas)) {
+        return '';
+    }
+    return ('\n // SCEHMAS \n' +
+        Object.entries(schemas)
+            .map(([name, schema]) => !isReference(schema) &&
+            (!schema.type || schema.type === 'object') &&
+            !schema.allOf &&
+            !schema.oneOf &&
+            !isReference(schema) &&
+            !schema.nullable
+            ? generateInterface(name, schema)
+            : `${formatDescription(isReference(schema) ? undefined : schema.description)} export type ${pascal(name)} = ${resolveValue(schema)};`)
+            .join('\n\n') +
+        '\n');
+};
+/**
+ * Extract all types from #/components/requestBodies
+ */
+const generateRequestBodiesDefinition = (requestBodies = {}) => {
+    if (isEmpty(requestBodies)) {
+        return '';
+    }
+    return ('\n // REQUEST BODIES \n' +
+        Object.entries(requestBodies)
+            .map(([name, requestBody]) => {
+            const doc = getDocs(requestBody);
+            const type = getResReqTypes([['', requestBody]]);
+            const isEmptyInterface = type === '{}';
+            if (isEmptyInterface) {
+                return `${doc}\nexport type ${pascal(name)}RequestBody = ${type}`;
+            }
+            else if (type.includes('{') && !type.includes('|') && !type.includes('&')) {
+                return `${doc}\nexport type ${pascal(name)}RequestBody = ${type}`;
+            }
+            else {
+                return `${doc}\nexport type ${pascal(name)}RequestBody = ${type};`;
+            }
+        })
+            .join('\n\n') +
+        '\n');
+};
+/**
+ * Extract all types from #/components/responses
+ */
+const generateResponsesDefinition = (responses = {}) => {
+    if (isEmpty(responses)) {
+        return '';
+    }
+    return ('\n // RESPONSES \n' +
+        Object.entries(responses)
+            .map(([name, response]) => {
+            const doc = getDocs(response);
+            const type = getResReqTypes([['', response]]);
+            const isEmptyInterface = type === '{}';
+            if (isEmptyInterface) {
+                return `export type RQ${pascal(name)}Response = ${type}`;
+            }
+            else if (type.includes('{') && !type.includes('|') && !type.includes('&')) {
+                return `${doc}export type RQ${pascal(name)}Response = ${type}`;
+            }
+            else {
+                return `${doc}export type RQ${pascal(name)}Response = ${type};`;
+            }
+        })
+            .join('\n\n') +
+        '\n');
+};
+/**
+ * Extract all types from #/components/schemas
+ */
+export const generateSchemas = ({ spec }) => {
+    const schemaOutput = generateRequestBodiesDefinition(spec.components?.requestBodies) +
+        generateResponsesDefinition(spec.components?.responses) +
+        generateSchemasDefinition(spec.components?.schemas);
+    return schemaOutput;
+};
+//# sourceMappingURL=generateSchemas.js.map

package/dist/generateSchemas.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generateSchemas.js","sourceRoot":"","sources":["../src/generateSchemas.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,MAAM,CAAC;AAC3B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;AAC3B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;AAE3B,OAAO,EAAE,iBAAiB,EAAE,SAAS,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAErF,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAErD;;GAEG;AACH,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,MAAoB,EAAE,EAAE;IAC/D,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACjC,OAAO,GAAG,iBAAiB,CAAC,MAAM,CAAC,WAAW,CAAC;qBAC5B,MAAM,CAAC,IAAI,CAAC,MAAM,MAAM;MACvC,CAAC;AACP,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,yBAAyB,GAAG,CAAC,UAAuC,EAAE,EAAE,EAAE;IAC9E,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACpB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,CACL,kBAAkB;QAClB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;aACpB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CACtB,CAAC,WAAW,CAAC,MAAM,CAAC;YACpB,CAAC,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;YAC1C,CAAC,MAAM,CAAC,KAAK;YACb,CAAC,MAAM,CAAC,KAAK;YACb,CAAC,WAAW,CAAC,MAAM,CAAC;YACpB,CAAC,MAAM,CAAC,QAAQ;YACd,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,CAAC;YACjC,CAAC,CAAC,GAAG,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,gBAAgB,MAAM,CAC9F,IAAI,CACL,MAAM,YAAY,CAAC,MAAM,CAAC,GAAG,CACnC;aACA,IAAI,CAAC,MAAM,CAAC;QACf,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,+BAA+B,GAAG,CAAC,gBAAmD,EAAE,EAAE,EAAE;IAChG,IAAI,OAAO,CAAC,aAAa,CAAC,EAAE;QAC1B,OAAO,EAAE,CAAC;KACX;IAED,OAAO,CACL,yBAAyB;QACzB,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC;aAC1B,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE;YAC3B,MAAM,GAAG,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;YACjC,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC;YACjD,MAAM,gBAAgB,GAAG,IAAI,KAAK,IAAI,CAAC;YACvC,IAAI,gBAAgB,EAAE;gBACpB,OAAO,GAAG,GAAG,iBAAiB,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;aACnE;iBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3E,OAAO,GAAG,GAAG,iBAAiB,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,EAAE,CAAC;aACnE;iBAAM;gBACL,OAAO,GAAG,GAAG,iBAAiB,MAAM,CAAC,IAAI,CAAC,iBAAiB,IAAI,GAAG,CAAC;aACpE;QACH,CAAC,CAAC;aACD,IAAI,CAAC,MAAM,CAAC;QACf,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,2BAA2B,GAAG,CAAC,YAA2C,EAAE,EAAE,EAAE;IACpF,IAAI,OAAO,CAAC,SAAS,CAAC,EAAE;QACtB,OAAO,EAAE,CAAC;KACX;IAED,OAAO,CACL,oBAAoB;QACpB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;aACtB,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,EAAE;YACxB,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;YAC9B,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC9C,MAAM,gBAAgB,GAAG,IAAI,KAAK,IAAI,CAAC;YACvC,IAAI,gBAAgB,EAAE;gBACpB,OAAO,iBAAiB,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;aAC1D;iBAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3E,OAAO,GAAG,GAAG,iBAAiB,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,EAAE,CAAC;aAChE;iBAAM;gBACL,OAAO,GAAG,GAAG,iBAAiB,MAAM,CAAC,IAAI,CAAC,cAAc,IAAI,GAAG,CAAC;aACjE;QACH,CAAC,CAAC;aACD,IAAI,CAAC,MAAM,CAAC;QACf,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,EAAE,IAAI,EAA2B,EAAE,EAAE;IACnE,MAAM,YAAY,GAChB,+BAA+B,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC;QAC/D,2BAA2B,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;QACvD,yBAAyB,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAEtD,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}

package/dist/importSpecs.d.ts

@@ -0,0 +1,15 @@
+export declare function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, queryClientDir, headerFilters, overrides, }: {
+    sourceDirectory: string;
+    exportDirectory: string;
+    apiDirectory: string;
+    queryClientDir: string;
+    headerFilters?: string[];
+    overrides?: Record<string, {
+        type: 'query';
+    } | {
+        type: 'mutation';
+    } | {
+        type: 'infiniteQuery';
+        infiniteQueryParm: string;
+    }>;
+}): void;

package/dist/importSpecs.js

@@ -0,0 +1,83 @@
+import Case from 'case';
+import chalk from 'chalk';
+import { readFileSync, writeFileSync, readdir, mkdirSync } from 'fs';
+import { join, parse } from 'path';
+import { convertSwaggerFile } from './convertSwaggerFile.js';
+import { createHook } from './generateHooks.js';
+import { generateImports } from './generateImports.js';
+import { generateSchemas } from './generateSchemas.js';
+export function importSpecs({ sourceDirectory, exportDirectory, apiDirectory, queryClientDir, headerFilters, overrides, }) {
+    readdir(sourceDirectory, function (err, filenames) {
+        if (err) {
+            console.log(err);
+            throw err;
+        }
+        filenames.map(async (filename) => {
+            try {
+                const data = readFileSync(join(process.cwd(), sourceDirectory + '/' + filename), 'utf-8');
+                const { ext } = parse(sourceDirectory + '/' + filename);
+                const format = ['.yaml', '.yml'].includes(ext.toLowerCase()) ? 'yaml' : 'json';
+                let spec = await convertSwaggerFile(data, format);
+                const formattedFileName = Case.camel(`useQueries, ${filename.split('.')[0]}`);
+                const schemaName = `${formattedFileName}.schema`;
+                const hooksName = `${formattedFileName}`;
+                const name = filename.split('.')[0];
+                mkdirSync(join(process.cwd(), `${exportDirectory}/${name}`), { recursive: true });
+                const operationIds = [];
+                let hooks = '';
+                let schemaImportsArray = [];
+                let collectedQueryImports = [];
+                Object.entries(spec.paths).forEach(([route, verbs]) => {
+                    Object.entries(verbs).forEach(([verb, operation]) => {
+                        if (['get', 'post', 'patch', 'put', 'delete'].includes(verb) && !operation.deprecated) {
+                            const { implementation, imports, queryImports } = createHook({
+                                operation,
+                                verb,
+                                route: (spec.basePath || '') + route,
+                                operationIds,
+                                parameters: verbs.parameters,
+                                schemasComponents: spec.components,
+                                headerFilters,
+                                overrides,
+                            });
+                            hooks += implementation;
+                            imports.forEach((element) => {
+                                const formattedImport = element.replace('[]', '');
+                                if (!schemaImportsArray.includes(formattedImport) &&
+                                    element !== 'void' &&
+                                    element !== 'string' &&
+                                    !element.includes('{')) {
+                                    schemaImportsArray.push(formattedImport);
+                                }
+                            });
+                            queryImports.forEach((element) => {
+                                if (!schemaImportsArray.includes(element)) {
+                                    collectedQueryImports.push(element);
+                                }
+                            });
+                        }
+                    });
+                });
+                const imports = generateImports({
+                    apiDirectory,
+                    queryClientDir,
+                    schemaName,
+                    schemaImports: schemaImportsArray,
+                    queryImports: collectedQueryImports,
+                });
+                writeFileSync(join(process.cwd(), `${exportDirectory}/${name}/${hooksName}.tsx`), imports + hooks);
+                const schemas = generateSchemas({ spec });
+                writeFileSync(join(process.cwd(), `${exportDirectory}/${name}/${schemaName}.tsx`), schemas);
+                console.log(chalk.green(`🎉 [${filename}] Your OpenAPI spec has been converted into react query hooks`));
+            }
+            catch (error) {
+                if (error.code === 'EISDIR') {
+                    console.log(chalk.red('nested folder structure not supported'));
+                    return;
+                }
+                console.log(chalk.red(`[${filename}]:`), chalk.red(error));
+            }
+        });
+    });
+}
+//# sourceMappingURL=importSpecs.js.map

package/dist/importSpecs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"importSpecs.js","sourceRoot":"","sources":["../src/importSpecs.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+import { convertSwaggerFile } from './convertSwaggerFile.js';
+import { importSpecs } from './importSpecs.js';
+export { importSpecs, convertSwaggerFile };

package/dist/index.js

@@ -0,0 +1,4 @@
+import { convertSwaggerFile } from './convertSwaggerFile.js';
+import { importSpecs } from './importSpecs.js';
+export { importSpecs, convertSwaggerFile };
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC"}

package/dist/utils.d.ts

@@ -0,0 +1,24 @@
+import { ReferenceObject, RequestBodyObject, ResponseObject, SchemaObject } from 'openapi3-ts';
+export declare const getDocs: (data: ReferenceObject | {
+    description?: string;
+}) => string;
+/**
+ * Discriminator helper for `ReferenceObject`
+ */
+export declare const isReference: (property: any) => property is ReferenceObject;
+/**
+ * Return the typescript equivalent of open-api data type
+ */
+export declare const getScalar: (item: SchemaObject) => string;
+/**
+ * Resolve the value of a schema object to a proper type definition.
+ */
+export declare const resolveValue: (schema: SchemaObject) => string;
+/**
+ * Format a description to code documentation.
+ */
+export declare const formatDescription: (description?: string) => string;
+/**
+ * Extract responses / request types from open-api specs
+ */
+export declare const getResReqTypes: (responsesOrRequests: Array<[string, ResponseObject | ReferenceObject | RequestBodyObject]>) => string;

package/dist/utils.js

@@ -0,0 +1,157 @@
+import lodash from 'lodash';
+const { uniq, isEmpty } = lodash;
+import pasCase from 'case';
+const { pascal } = pasCase;
+export const getDocs = (data) => isReference(data) ? '' : formatDescription(data.description);
+/**
+ * Discriminator helper for `ReferenceObject`
+ */
+export const isReference = (property) => {
+    return Boolean(property.$ref);
+};
+/**
+ * Return the typescript equivalent of open-api data type
+ */
+export const getScalar = (item) => {
+    const nullable = item.nullable ? ' | null' : '';
+    switch (item.type) {
+        case 'number':
+        case 'integer':
+            return 'number' + nullable;
+        case 'boolean':
+            return 'boolean' + nullable;
+        case 'array':
+            return getArray(item) + nullable;
+        case 'string':
+            return (item.enum ? `"${item.enum.join(`" | "`)}"` : 'string') + nullable;
+        case 'object':
+        default:
+            return getObject(item) + nullable;
+    }
+};
+/**
+ * Return the output type from the $ref
+ */
+const getRef = ($ref) => {
+    if ($ref.startsWith('#/components/schemas')) {
+        return pascal($ref.replace('#/components/schemas/', ''));
+    }
+    else if ($ref.startsWith('#/components/responses')) {
+        return pascal($ref.replace('#/components/responses/', '')) + 'Response';
+    }
+    else if ($ref.startsWith('#/components/parameters')) {
+        return pascal($ref.replace('#/components/parameters/', '')) + 'Parameter';
+    }
+    else if ($ref.startsWith('#/components/requestBodies')) {
+        return pascal($ref.replace('#/components/requestBodies/', '')) + 'RequestBody';
+    }
+    else {
+        throw new Error('This library only resolve $ref that are include into `#/components/*` for now');
+    }
+};
+/**
+ * Return the output type from an array
+ */
+const getArray = (item) => {
+    if (item.items) {
+        if (!isReference(item.items) && (item.items.oneOf || item.items.allOf || item.items.enum)) {
+            return `(${resolveValue(item.items)})[]`;
+        }
+        else {
+            return `${resolveValue(item.items)}[]`;
+        }
+    }
+    else {
+        throw new Error('All arrays must have an `items` key define');
+    }
+};
+/**
+ * Return the output type from an object
+ */
+const getObject = (item) => {
+    if (isReference(item)) {
+        return getRef(item.$ref);
+    }
+    if (item.allOf) {
+        return item.allOf.map(resolveValue).join(' & ');
+    }
+    if (item.oneOf) {
+        return item.oneOf.map(resolveValue).join(' | ');
+    }
+    if (!item.type && !item.properties && !item.additionalProperties) {
+        return '{}';
+    }
+    // Free form object (https://swagger.io/docs/specification/data-models/data-types/#free-form)
+    if (item.type === 'object' &&
+        !item.properties &&
+        (!item.additionalProperties || item.additionalProperties === true || isEmpty(item.additionalProperties))) {
+        return '{[key: string]: any}';
+    }
+    const IdentifierRegexp = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
+    // Consolidation of item.properties & item.additionalProperties
+    let output = '{\n';
+    if (item.properties) {
+        output += Object.entries(item.properties)
+            .map(([key, prop]) => {
+            const doc = getDocs(prop);
+            const isRequired = (item.required || []).includes(key);
+            const processedKey = IdentifierRegexp.test(key) ? key : `"${key}"`;
+            return `${doc}\n${processedKey}${isRequired ? '' : '?'}: ${resolveValue(prop)};`;
+        })
+            .join('');
+    }
+    if (item.additionalProperties) {
+        if (item.properties) {
+            output += '\n';
+        }
+        output += `} & { [key: string]: ${item.additionalProperties === true ? 'any' : resolveValue(item.additionalProperties)}`;
+    }
+    if (item.properties || item.additionalProperties) {
+        if (output === '{\n') {
+            return '{}';
+        }
+        return output + '\n}';
+    }
+    return item.type === 'object' ? '{[key: string]: any}' : 'any';
+};
+/**
+ * Resolve the value of a schema object to a proper type definition.
+ */
+export const resolveValue = (schema) => isReference(schema) ? getRef(schema.$ref) : getScalar(schema);
+/**
+ * Format a description to code documentation.
+ */
+export const formatDescription = (description) => {
+    if (!description) {
+        return '';
+    }
+    return `\n/**\n${description
+        .split('\n')
+        .map((i) => `*  ${i}`)
+        .join('\n')}\n */`;
+};
+/**
+ * Extract responses / request types from open-api specs
+ */
+export const getResReqTypes = (responsesOrRequests) => {
+    return uniq(responsesOrRequests.map(([_, res]) => {
+        if (!res) {
+            return;
+        }
+        if (isReference(res)) {
+            return getRef(res.$ref);
+        }
+        if (res.content) {
+            for (let contentType of Object.keys(res.content)) {
+                if (contentType.startsWith('application/json') ||
+                    contentType.startsWith('application/octet-stream')) {
+                    const schema = res.content[contentType].schema;
+                    return resolveValue(schema);
+                }
+            }
+            return;
+        }
+        return;
+    })).join(' | ');
+};
+//# sourceMappingURL=utils.js.map

package/dist/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "react-query-lightbase-codegen",
   "description": "Fully typed react query code generation tool based on openApi specifications",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "license": "MIT",
   "type": "module",
   "exports": "./dist/index.js",
@@ -38,6 +38,7 @@
     "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
     "tsc": "tsc -p tsconfig.json",
     "test": "yarn tsc && node test/script.mjs && prettier --check ./test/generated/**/*.tsx --write && eslint ./test/generated/**/*.tsx --fix",
+    "deploy": "tsc && semantic-release --no-ci",
     "prepare": "husky install"
   },
   "dependencies": {

package/src/generateHooks.ts

@@ -183,22 +183,6 @@ export const createHook = ({
 
   const isUpdateRequest = ['post', 'patch', 'put'].includes(verb);
 
-  const generateProps = (props: ParameterObject[]) => {
-    return props.map((item) => `["${item.name}"]: props["${item.name}"]`).join(',');
-  };
-
-  const generateBodyProps = () => {
-    const definitionKey = Object.keys(schemasComponents?.schemas || {}).find(
-      (key) => pascal(key) === requestBodyComponent
-    );
-    if (definitionKey) {
-      const scheme = schemasComponents?.schemas?.[definitionKey] as SchemaObject;
-      return Object.keys(scheme.properties as SchemaObject)
-        .map((item: string) => `["${item}"]: props["${item}"]`)
-        .join(',');
-    }
-  };
-
   const fetchName = camel(componentName);
 
   const createQueryHooks = (emptyParams?: boolean) => {
@@ -296,6 +280,28 @@ export const createHook = ({
 
   output += createQueryHooks(!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam);
 
+  const hasRequestBodyArrray = requestBodyComponent && requestBodyComponent.includes('[]');
+  const body = hasRequestBodyArrray ? `{body: ${requestBodyComponent}}` : `${requestBodyComponent}`;
+  const bodyProps = hasRequestBodyArrray ? `{body, ...props}` : '{props}';
+
+  const generateProps = (props: ParameterObject[]) => {
+    return props.map((item) => `["${item.name}"]: props["${item.name}"]`).join(',');
+  };
+
+  const generateBodyProps = () => {
+    const definitionKey = Object.keys(schemasComponents?.schemas || {}).find(
+      (key) => pascal(key) === requestBodyComponent
+    );
+    if (definitionKey && !hasRequestBodyArrray) {
+      const scheme = schemasComponents?.schemas?.[definitionKey] as SchemaObject;
+      const generatedBodyProps = Object.keys(scheme.properties as SchemaObject)
+        .map((item: string) => `["${item}"]: props["${item}"]`)
+        .join(',');
+      return `const body = {${generatedBodyProps}}`;
+    }
+    return '';
+  };
+
   if (!requestBodyComponent && !paramsInPath.length && !queryParam && !headerParam) {
     output += `
     const ${fetchName} = async () => {
@@ -386,22 +392,15 @@ export const createHook = ({
   }
 
   if (requestBodyComponent && !paramsInPath.length && queryParam && !headerParam) {
-    const config = isUpdateRequest ? 'null,{headers, params: queryParams}' : '{headers, params: queryParams}';
-    const queryParamsProps = queryParams.map((item) => `["${item.name}"]: props["${item.name}"]`);
     output += `
-    type ${componentName}Params = ${requestBodyComponent}  & {
-      ${queryParamsType}
-    }
+      type ${componentName}Params =  ${body} & {
+        ${queryParamsType}
+      }
 
-    type ${componentName}QueryProps<T = ${responseTypes}> = ${componentName}Params & {
-      const body =  {${generateBodyProps()}}
+     const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {   
+      ${generateBodyProps()}
       const params =  {${generateProps(queryParams)}}
-      options?: UseQueryOptions<${responseTypes}, AxiosError, T, any> 
-    }
-
-     const ${fetchName} = async ({body, params}: ${componentName}Params) => {   
-      const queryParams = {${queryParamsProps.join(',')}}
-      const result = await api.${verb}<${responseTypes}>(\`${route}\`, ${config})
+      const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {params})
       return result.data
     }
     `;
@@ -409,13 +408,13 @@ export const createHook = ({
 
   if (requestBodyComponent && !paramsInPath.length && !queryParam && headerParam) {
     output += `
-    type ${componentName}Params =  ${requestBodyComponent} & {
+    type ${componentName}Params =  ${body} & {
       ${headerParam}
     };
 
-    const ${fetchName} = async (props: ${componentName}Params) => {
+    const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
+      ${generateBodyProps()}
       const headers = {${generateProps(header)}}
-      const body =  {${generateBodyProps()}}
       const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers})
       return result.data
     }
@@ -424,13 +423,13 @@ export const createHook = ({
 
   if (requestBodyComponent && !paramsInPath.length && queryParam && headerParam) {
     output += `
-    type ${componentName}Params = ${requestBodyComponent} & {
+    type ${componentName}Params = ${body} & {
       ${headerParam}
       ${paramsTypes}
     };
 
-    const ${fetchName} = async (props: ${componentName}Params) => {
-      const body =  {${generateBodyProps()}}
+    const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
+      ${generateBodyProps()}
       const headers = {${generateProps(header)}}
       const params =  {${generateProps(queryParams)}}
       const result = await api.${verb}<${responseTypes}>(\`${route}\`, body, {headers, params})
@@ -441,13 +440,13 @@ export const createHook = ({
 
   if (requestBodyComponent && paramsInPath.length && !queryParam && !headerParam) {
     output += `
-    type ${componentName}Params = ${requestBodyComponent} & {
+    type ${componentName}Params = ${body} & {
       ${headerParam}
       ${paramsTypes}
     };
 
-    const ${fetchName} = async (props: ${componentName}Params) => {
-      const body =  {${generateBodyProps()}}
+    const ${fetchName} = async (${bodyProps}: ${componentName}Params) => {
+      ${generateBodyProps()}
       const result = await api.${verb}<${responseTypes}>(\`${route.replace(/\{/g, '{props.')}\`, body)
       return result.data
     }

package/src/importSpecs.ts

@@ -1,3 +1,4 @@
+import Case from 'case';
 import chalk from 'chalk';
 import { readFileSync, writeFileSync, readdir, mkdirSync } from 'fs';
 import { OperationObject, PathItemObject } from 'openapi3-ts';
@@ -37,8 +38,9 @@ export function importSpecs({
         const format = ['.yaml', '.yml'].includes(ext.toLowerCase()) ? 'yaml' : 'json';
         let spec = await convertSwaggerFile(data, format);
 
-        const schemaName = `useQueries${filename.split('.')[0]}.schema`;
-        const hooksName = `useQueries${filename.split('.')[0]}`;
+        const formattedFileName = Case.camel(`useQueries, ${filename.split('.')[0]}`);
+        const schemaName = `${formattedFileName}.schema`;
+        const hooksName = `${formattedFileName}`;
         const name = filename.split('.')[0];
         mkdirSync(join(process.cwd(), `${exportDirectory}/${name}`), { recursive: true });