@icib.dev/api-client 1.0.4 → 1.0.5

package/README.md

@@ -42,7 +42,7 @@ npx api-client-generate --url https://api.example.com/docs/openapi --out api
 # Using BASE_URL env (default: $BASE_URL/docs/openapi)
 BASE_URL=https://api.example.com npx api-client-generate --out api
 
-# Custom base path (overrides spec; default from spec or empty)
+# Custom base path (default empty; when set, included in axios baseURL)
 npx api-client-generate --base-path /v1/api
 BASE_PATH=/v2 npx api-client-generate
 ```

package/dist/api/client.js

@@ -5,7 +5,7 @@ export function setAuthToken(token) {
     _token = token;
 }
 export const client = axios.create({
-    baseURL: "https://api.example.com",
+    baseURL: "https://api.example.com/api",
     headers: {
         "Content-Type": "application/json",
     },

package/dist/api/contexts/items.js

@@ -3,6 +3,6 @@ import { client } from "../client.js";
 /** API client for items endpoints */
 export const items = {
     async list() {
-        return client.get("/api/items/");
+        return client.get("/items/");
     }
 };

package/dist/scripts/generate.js

@@ -26,7 +26,8 @@ function parseArgs() {
         else if (args[i] === "--out" && args[i + 1]) {
             out = args[++i];
         }
-        else if ((args[i] === "--base-path" || args[i] === "--basePath") && args[i + 1]) {
+        else if ((args[i] === "--base-path" || args[i] === "--basePath") &&
+            args[i + 1]) {
             basePath = args[++i];
         }
     }
@@ -70,10 +71,6 @@ function getOrigin(doc) {
     }
     return "https://api.icib.dev";
 }
-function getBasePath(doc) {
-    const oas2 = doc;
-    return oas2.basePath ?? "";
-}
 function getDefinitions(doc) {
     return doc.definitions ?? doc.components?.schemas ?? {};
 }
@@ -172,11 +169,11 @@ function generateTypes(definitions) {
     lines.push("}\n");
     return lines.join("\n");
 }
-function extractOperations(paths, basePath, definitions) {
+function extractOperations(paths, definitions) {
     const ops = [];
     const methods = ["get", "post", "put", "patch", "delete"];
     for (const [path, pathItem] of Object.entries(paths)) {
-        const fullPath = basePath + (path.startsWith("/") ? path : `/${path}`);
+        const fullPath = path.startsWith("/") ? path : `/${path}`;
         for (const method of methods) {
             const op = pathItem[method];
             if (!op?.operationId)
@@ -625,7 +622,7 @@ async function main() {
     const doc = await parseSpec(rawSpec);
     const baseUrl = getOrigin(doc);
     const basePath = (() => {
-        const raw = basePathOverride ?? getBasePath(doc);
+        const raw = basePathOverride ?? "";
         if (raw === "")
             return "";
         return raw.startsWith("/") ? raw : `/${raw}`;
@@ -636,7 +633,7 @@ async function main() {
     console.log(`Base path: ${basePath}`);
     console.log(`Paths: ${Object.keys(paths).length}`);
     console.log(`Definitions: ${Object.keys(definitions).length}`);
-    const ops = extractOperations(paths, basePath, definitions);
+    const ops = extractOperations(paths, definitions);
     const byTag = groupByTag(ops, paths);
     const cwd = process.cwd();
     const outDir = join(cwd, out);
@@ -644,8 +641,11 @@ async function main() {
     const contextsDir = join(outDir, "contexts");
     mkdirSync(typesDir, { recursive: true });
     mkdirSync(contextsDir, { recursive: true });
+    const clientBaseUrl = basePath
+        ? `${baseUrl.replace(/\/$/, "")}${basePath}`
+        : baseUrl;
     writeFileSync(join(typesDir, "index.ts"), generateTypes(definitions));
-    writeFileSync(join(outDir, "client.ts"), generateClient(baseUrl));
+    writeFileSync(join(outDir, "client.ts"), generateClient(clientBaseUrl));
     const sortedTags = [...byTag.keys()].sort();
     for (const tag of sortedTags) {
         const ctxName = sanitizeContextName(tag);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@icib.dev/api-client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Strictly-typed TypeScript API client for ICIB API",
   "type": "module",
   "main": "./dist/api/index.js",