elysia-openapi-codegen 0.1.5 → 0.1.6

package/dist/index.js

@@ -77,7 +77,7 @@ function generateTypes(spec) {
       if (!["get", "post", "put", "patch", "delete"].includes(method))
         continue;
       const op = operation;
-      const opId = op.operationId || `${method}${pathUrl.replace(/[^a-zA-Z0-9]/g, "")}`;
+      const opId = toSafeIdentifier(op.operationId || `${method}${pathUrl.replace(/[^a-zA-Z0-9]/g, "")}`);
       const response = op.responses?.["200"];
       if (response?.content?.["application/json"]?.schema) {
         const responseType = resolveType(response.content["application/json"].schema);
@@ -112,7 +112,7 @@ function generateHooks(spec) {
       if (!["get", "post", "put", "patch", "delete"].includes(method))
         continue;
       const op = operation;
-      const opId = op.operationId || `${method}${pathUrl.replace(/[^a-zA-Z0-9]/g, "")}`;
+      const opId = toSafeIdentifier(op.operationId || `${method}${pathUrl.replace(/[^a-zA-Z0-9]/g, "")}`);
       const hasResponse = !!op.responses?.["200"]?.content?.["application/json"]?.schema;
       const responseType = hasResponse ? `${capitalize(opId)}Response` : "any";
       const params = op.parameters || [];
@@ -121,8 +121,18 @@ function generateHooks(spec) {
       const hasBody = !!op.requestBody?.content?.["application/json"]?.schema;
       const bodyType = hasBody ? `${capitalize(opId)}Body` : "void";
       if (method === "get") {
-        const queryParams = params.map((p) => p.name);
-        const queryString = queryParams.length > 0 ? `?${queryParams.map((p) => `\${params?.${p} !== undefined ? '${p}=' + params.${p} : ''}`).join("&")}` : "";
+        const pathParamsList = params.filter((p) => p.in === "path");
+        const queryParamsList = params.filter((p) => p.in === "query");
+        let urlPath = pathUrl;
+        for (const p of pathParamsList) {
+          urlPath = urlPath.replace(`{${p.name}}`, `\${params.${p.name}}`);
+        }
+        const qsLines = queryParamsList.map((p) => `      if (params?.${p.name} !== undefined) _qs.set('${p.name}', String(params.${p.name}));`).join(`
+`);
+        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}\`);`;
         hooks.push(`
 export const use${capitalize(opId)} = (
   params${hasParams ? "" : "?"}: ${paramsType},
@@ -131,7 +141,7 @@ export const use${capitalize(opId)} = (
   return useQuery<${responseType}>({
     queryKey: ['${opId}', params],
     queryFn: async () => {
-      const res = await fetch(\`\${baseUrl}${pathUrl}${queryString}\`);
+${fetchStatement}
       if (!res.ok) throw new Error('API Error');
       return res.json();
     },
@@ -139,26 +149,40 @@ export const use${capitalize(opId)} = (
   });
 };`);
       } else {
-        let inputType = "void";
-        let inputArg = "";
-        if (hasBody) {
+        const pathParamsList = params.filter((p) => p.in === "path");
+        const hasPathParams = pathParamsList.length > 0;
+        let urlPath = pathUrl;
+        for (const p of pathParamsList) {
+          urlPath = urlPath.replace(`{${p.name}}`, `\${${p.name}}`);
+        }
+        let inputType;
+        let mutationArg;
+        if (hasBody && hasPathParams) {
+          inputType = `${capitalize(opId)}Params & ${capitalize(opId)}Body`;
+          const pathParamNames = pathParamsList.map((p) => p.name).join(", ");
+          mutationArg = `{ ${pathParamNames}, ...body }`;
+        } else if (hasBody) {
           inputType = bodyType;
-          inputArg = "body";
-        } else if (hasParams) {
+          mutationArg = "body";
+        } else if (hasPathParams) {
           inputType = paramsType;
-          inputArg = "params";
+          const pathParamNames = pathParamsList.map((p) => p.name).join(", ");
+          mutationArg = `{ ${pathParamNames} }`;
+        } else {
+          inputType = "void";
+          mutationArg = "";
         }
-        const hasInput = inputType !== "void";
+        const fetchBodyLine = hasBody ? `
+        body: JSON.stringify(body),` : "";
         hooks.push(`
 export const use${capitalize(opId)} = (
   options?: UseMutationOptions<${responseType}, Error, ${inputType}>
 ) => {
   return useMutation<${responseType}, Error, ${inputType}>({
-    mutationFn: async (${hasInput ? inputArg : ""}) => {
-      const res = await fetch(\`\${baseUrl}${pathUrl}\`, {
+    mutationFn: async (${mutationArg}) => {
+      const res = await fetch(\`\${baseUrl}${urlPath}\`, {
         method: '${method.toUpperCase()}',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify(${hasInput ? inputArg : "{}"}),
+        headers: { 'Content-Type': 'application/json' },${fetchBodyLine}
       });
       if (!res.ok) throw new Error('API Error');
       return res.json();
@@ -175,6 +199,9 @@ export const use${capitalize(opId)} = (
 function capitalize(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
 }
+function toSafeIdentifier(id) {
+  return id.replace(/[^a-zA-Z0-9_-]/g, "").replace(/[-_]+(.?)/g, (_, c) => c ? c.toUpperCase() : "");
+}
 async function parseArgs() {
   const args = process.argv.slice(2);
   const config = {

package/package.json

@@ -1,25 +1,30 @@
 {
   "name": "elysia-openapi-codegen",
-  "version": "0.1.5",
-  "description": "Generate React Query hooks and fully typed TypeScript interfaces from Elysia OpenAPI specs.",
-  "module": "index.ts",
-  "type": "module",
-  "bin": {
-    "elysia-codegen": "./dist/index.js"
-  },
-  "files": [
-    "dist",
-    "README.md"
-  ],
+  "version": "0.1.6",
   "author": "Khantamir mkhantamir77@gmail.com",
-  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/mkhantamir/elysia-openapi-codegen.git"
   },
+  "main": "dist/index.js",
+  "module": "index.ts",
+  "devDependencies": {
+    "@types/bun": "latest"
+  },
+  "peerDependencies": {
+    "typescript": "^6.0.2"
+  },
+  "bin": {
+    "elysia-codegen": "./dist/index.js"
+  },
   "bugs": {
     "url": "https://github.com/mkhantamir/elysia-openapi-codegen/issues"
   },
+  "description": "Generate React Query hooks and fully typed TypeScript interfaces from Elysia OpenAPI specs.",
+  "files": [
+    "dist",
+    "README.md"
+  ],
   "homepage": "https://github.com/mkhantamir/elysia-openapi-codegen#readme",
   "keywords": [
     "elysia",
@@ -29,14 +34,9 @@
     "react-query",
     "tanstack-query"
   ],
-  "devDependencies": {
-    "@types/bun": "latest"
-  },
-  "peerDependencies": {
-    "typescript": "^6.0.2"
-  },
+  "license": "MIT",
   "scripts": {
     "build": "bun build index.ts --outfile dist/index.js --target node"
   },
-  "main": "dist/index.js"
+  "type": "module"
 }