elysia-openapi-codegen 0.1.9 → 0.2.1

package/README.md

@@ -19,7 +19,7 @@ bunx elysia-openapi-codegen -i https://api.example.com/openapi.json -o ./src/api
 
 ## Installation
 
-### Using Bun (Recommended)
+### Using Bun
 
 ```bash
 bun add -d elysia-openapi-codegen

package/dist/index.js

@@ -43,7 +43,8 @@ ${props.join(`
 }`;
   }
   if (schema.anyOf || schema.oneOf) {
-    return (schema.anyOf || schema.oneOf || []).map(resolveType).join(" | ");
+    const members = [...new Set((schema.anyOf || schema.oneOf || []).map(resolveType))];
+    return members.join(" | ");
   }
   if (schema.allOf) {
     return schema.allOf.map(resolveType).join(" & ");
@@ -63,11 +64,11 @@ function getPathGroup(pathUrl) {
   const segment = pathUrl.split("/").filter(Boolean)[0] || "root";
   return toSafeIdentifier(segment);
 }
-function generateGroups(spec) {
+function generateGroups(spec, hooksMode) {
   const groups = {};
   const getGroup = (name) => {
     if (!groups[name])
-      groups[name] = { types: [], hooks: [] };
+      groups[name] = { types: [], functions: [] };
     return groups[name];
   };
   if (spec.components?.schemas) {
@@ -120,6 +121,7 @@ ${paramProps.join(`
         for (const p of pathParamsList) {
           urlPath = urlPath.replace(`{${p.name}}`, `\${params.${p.name}}`);
         }
+        urlPath = urlPath.replace(/\/+$/, "");
         const qsLines = (indent) => queryParamsList.map((p) => `${indent}if (params?.${p.name} !== undefined) _qs.set('${p.name}', String(params.${p.name}));`).join(`
 `);
         if (!hasResponse) {
@@ -127,19 +129,24 @@ ${paramProps.join(`
 ${qsLines("  ")}
   const _qstr = _qs.toString();
   return \`\${baseUrl}${urlPath}\${_qstr ? '?' + _qstr : ''}\`;` : `  return \`\${baseUrl}${urlPath}\`;`;
-          g.hooks.push(`
+          g.functions.push(`
 export const ${opId}Url = (params${hasParams ? "" : "?"}: ${paramsType}): string => {
 ${body}
 };`);
           continue;
         }
-        const fetchStatement = queryParamsList.length > 0 ? `      const _qs = new URLSearchParams();
+        if (hooksMode) {
+          const fetchStatement = queryParamsList.length > 0 ? `      const _qs = new URLSearchParams();
 ${qsLines("      ")}
       const _qstr = _qs.toString();
       const res = await fetch(\`\${baseUrl}${urlPath}\${_qstr ? '?' + _qstr : ''}\`);` : `      const res = await fetch(\`\${baseUrl}${urlPath}\`);`;
-        const enabledGuard = pathParamsList.length > 0 ? `
-    enabled: ${pathParamsList.map((p) => `params.${p.name} != null`).join(" && ")},` : "";
-        g.hooks.push(`
+          const guardParams = [
+            ...pathParamsList,
+            ...queryParamsList.filter((p) => p.required)
+          ];
+          const enabledGuard = guardParams.length > 0 ? `
+    enabled: ${guardParams.map((p) => `params.${p.name} != null`).join(" && ")},` : "";
+          g.functions.push(`
 export const use${capitalize(opId)} = (
   params${hasParams ? "" : "?"}: ${paramsType},
   options?: Omit<UseQueryOptions<${responseType}>, 'queryKey' | 'queryFn'>
@@ -154,6 +161,18 @@ ${fetchStatement}
     ...options,
   });
 };`);
+        } else {
+          const fetchStatement = queryParamsList.length > 0 ? `  const _qs = new URLSearchParams();
+${qsLines("  ")}
+  const _qstr = _qs.toString();
+  const res = await fetch(\`\${baseUrl}${urlPath}\${_qstr ? '?' + _qstr : ''}\`);` : `  const res = await fetch(\`\${baseUrl}${urlPath}\`);`;
+          g.functions.push(`
+export async function ${opId}(params${hasParams ? "" : "?"}: ${paramsType}): Promise<${responseType}> {
+${fetchStatement}
+  if (!res.ok) throw new Error(\`\${res.status}: \${await res.text()}\`);
+  return res.json();
+}`);
+        }
       } else {
         const pathParamsList = params.filter((p) => p.in === "path");
         const queryParamsList = params.filter((p) => p.in === "query");
@@ -164,41 +183,43 @@ ${fetchStatement}
         for (const p of pathParamsList) {
           urlPath = urlPath.replace(`{${p.name}}`, `\${${p.name}}`);
         }
+        urlPath = urlPath.replace(/\/+$/, "");
         const mutQsCode = hasQueryParams ? `
-      const _qs = new URLSearchParams();
-${queryParamsList.map((p) => `      if (${p.name} !== undefined) _qs.set('${p.name}', String(${p.name}));`).join(`
+  const _qs = new URLSearchParams();
+${queryParamsList.map((p) => `  if (${p.name} !== undefined) _qs.set('${p.name}', String(${p.name}));`).join(`
 `)}
-      const _qstr = _qs.toString();` : "";
+  const _qstr = _qs.toString();` : "";
         const fetchUrlExpr = hasQueryParams ? `\`\${baseUrl}${urlPath}\${_qstr ? '?' + _qstr : ''}\`` : `\`\${baseUrl}${urlPath}\``;
         const allParamNames = [
           ...pathParamsList.map((p) => p.name),
           ...queryParamsList.map((p) => p.name)
         ];
         let inputType;
-        let mutationArg;
+        let destructureArg;
         if (hasBody && hasAnyParams) {
           inputType = `${capitalize(opId)}Params & ${capitalize(opId)}Body`;
-          mutationArg = `{ ${allParamNames.join(", ")}, ...body }`;
+          destructureArg = `{ ${allParamNames.join(", ")}, ...body }`;
         } else if (hasBody) {
           inputType = bodyType;
-          mutationArg = "body";
+          destructureArg = "body";
         } else if (hasAnyParams) {
           inputType = paramsType;
-          mutationArg = `{ ${allParamNames.join(", ")} }`;
+          destructureArg = `{ ${allParamNames.join(", ")} }`;
         } else {
           inputType = "void";
-          mutationArg = "";
+          destructureArg = "";
         }
         const fetchBodyLines = hasBody ? useFormData ? `
         body: Object.entries(body as Record<string, unknown>).reduce((f, [k, v]) => { f.append(k, v as any); return f; }, new FormData()),` : `
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(body),` : "";
-        g.hooks.push(`
+        if (hooksMode) {
+          g.functions.push(`
 export const use${capitalize(opId)} = (
   options?: UseMutationOptions<${responseType}, Error, ${inputType}>
 ) => {
   return useMutation<${responseType}, Error, ${inputType}>({
-    mutationFn: async (${mutationArg}) => {${mutQsCode}
+    mutationFn: async (${destructureArg}) => {${mutQsCode.replace(/^  /gm, "      ")}
       const res = await fetch(${fetchUrlExpr}, {
         method: '${method.toUpperCase()}',${fetchBodyLines}
       });
@@ -208,6 +229,26 @@ export const use${capitalize(opId)} = (
     ...options,
   });
 };`);
+        } else {
+          const argDecl = inputType === "void" ? "" : `input: ${inputType}`;
+          const destructure = inputType === "void" ? "" : hasBody && hasAnyParams ? `  const { ${allParamNames.join(", ")}, ...body } = input;
+` : hasAnyParams ? `  const { ${allParamNames.join(", ")} } = input;
+` : `  const body = input;
+`;
+          const fetchBodyLinesApi = hasBody ? useFormData ? `
+      body: Object.entries(body as Record<string, unknown>).reduce((f, [k, v]) => { f.append(k, v as any); return f; }, new FormData()),` : `
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(body),` : "";
+          g.functions.push(`
+export async function ${opId}(${argDecl}): Promise<${responseType}> {
+${destructure}${mutQsCode.replace(/^\n/, "")}
+  const res = await fetch(${fetchUrlExpr}, {
+    method: '${method.toUpperCase()}',${fetchBodyLinesApi}
+  });
+  if (!res.ok) throw new Error(\`\${res.status}: \${await res.text()}\`);
+  return res.json();
+}`);
+        }
       }
     }
   }
@@ -215,7 +256,7 @@ export const use${capitalize(opId)} = (
 }
 function parseArgs() {
   const args = process.argv.slice(2);
-  const config = { input: "", output: "" };
+  const config = { input: "", output: "", hooks: false };
   for (let i = 0;i < args.length; i++) {
     const arg = args[i];
     if (!arg)
@@ -234,6 +275,8 @@ function parseArgs() {
         process.exit(1);
       }
       config.output = value;
+    } else if (arg === "--hooks" || arg === "-hooks") {
+      config.hooks = true;
     } else if (!arg.startsWith("-")) {
       if (!config.input)
         config.input = arg;
@@ -246,19 +289,21 @@ function parseArgs() {
 function showHelp() {
   console.log(`
 Elysia OpenAPI Code Generator
-Generate React Query hooks and TypeScript types from OpenAPI specifications.
+Generate TypeScript API functions or React Query hooks from OpenAPI specifications.
 
 Usage:
-  elysia-codegen -i <source> -o <output>
-  elysia-codegen --input <source> --output <output>
+  elysia-codegen -i <source> -o <output> [--hooks]
+  elysia-codegen --input <source> --output <output> [--hooks]
   elysia-codegen <source> <output>
 
 Arguments:
   -i, --input <source>    OpenAPI spec source (URL or file path)
   -o, --output <output>   Output directory for generated files
+  --hooks, -hooks         Generate React Query hooks instead of plain async functions
 
 Examples:
   elysia-codegen -i https://api.example.com/openapi.json -o ./src/api
+  elysia-codegen -i https://api.example.com/openapi.json -o ./src/api --hooks
   elysia-codegen ./openapi.json ./generated
 `);
 }
@@ -268,17 +313,17 @@ async function main() {
     showHelp();
     process.exit(0);
   }
-  const { input, output } = parseArgs();
+  const { input, output, hooks } = parseArgs();
   if (!input || !output) {
     console.error(`Error: Both input source and output directory are required.
 `);
     showHelp();
     process.exit(1);
   }
-  console.log("Fetching OpenAPI spec...");
+  console.log(`Fetching OpenAPI spec... (mode: ${hooks ? "hooks" : "api"})`);
   try {
     const spec = await fetchSpec(input);
-    const groups = generateGroups(spec);
+    const groups = generateGroups(spec, hooks);
     const serverPath = spec.servers?.[0]?.url || "";
     const baseUrl = input.startsWith("http://") || input.startsWith("https://") ? new URL(input).origin + serverPath : serverPath;
     if (!fs.existsSync(output)) {
@@ -289,27 +334,27 @@ async function main() {
 export let baseUrl = '${baseUrl}';
 `);
     const groupNames = [];
-    for (const [groupName, { types, hooks }] of Object.entries(groups)) {
-      if (types.length === 0 && hooks.length === 0)
+    for (const [groupName, { types, functions }] of Object.entries(groups)) {
+      if (types.length === 0 && functions.length === 0)
         continue;
-      const hasHooks = hooks.length > 0;
+      const hasFunctions = functions.length > 0;
       const sections = [`/* eslint-disable */`, `import { baseUrl } from './base';`];
-      if (hasHooks) {
+      if (hasFunctions && hooks) {
         sections.push(`import { useQuery, useMutation, UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';`);
       }
       if (types.length > 0)
         sections.push(types.join(`
 
 `));
-      if (hooks.length > 0)
-        sections.push(hooks.join(`
+      if (functions.length > 0)
+        sections.push(functions.join(`
 `));
       fs.writeFileSync(path.join(output, `${groupName}.ts`), sections.join(`
 
 `) + `
 `);
       groupNames.push(groupName);
-      console.log(`  ↳ ${groupName}.ts (${types.length} types, ${hooks.length} hooks)`);
+      console.log(`  ↳ ${groupName}.ts (${types.length} types, ${functions.length} ${hooks ? "hooks" : "functions"})`);
     }
     const indexContent = ["base", ...groupNames].map((f) => `export * from './${f}';`).join(`
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elysia-openapi-codegen",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "author": "Khantamir mkhantamir77@gmail.com",
   "repository": {
     "type": "git",