apigen-ts 1.4.0 → 1.5.0

package/dist/_template.ts

@@ -54,11 +54,24 @@ export class ApiClient {
     return new URL(path, base)
   }
 
+  // same as "${v}" in path template, but keeps "/", "?", "#" inside the path segment
+  EncodePathParam(v: unknown) {
+    return encodeURIComponent(String(v))
+  }
+
+  // query params with explode: false, eg. Swagger 2 `collectionFormat: csv`
+  JoinQueryParam(v: unknown, sep: string) {
+    return Array.isArray(v) ? v.join(sep) : v
+  }
+
   async Fetch<T>(method: string, path: string, opts: ApigenRequest = {}): Promise<T> {
     const url = this.PrepareFetchUrl(path)
 
+    // skip omitted values; arrays repeat the key per item (OpenAPI default: form + explode)
     for (const [k, v] of Object.entries(opts?.search ?? {})) {
-      url.searchParams.append(k, Array.isArray(v) ? v.join(",") : (v as string))
+      for (const x of Array.isArray(v) ? v : [v]) {
+        if (x !== undefined && x !== null) url.searchParams.append(k, x as string)
+      }
     }
 
     const configHeaders =
@@ -76,7 +89,7 @@ export class ApiClient {
       headers.delete("content-type")
       body = ct === "multipart/form-data" ? new FormData() : new URLSearchParams()
       for (const [k, v] of Object.entries(opts.body as Record<string, string>)) {
-        body.append(k, v)
+        if (v !== undefined && v !== null) body.append(k, v)
       }
     }
 

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as apigen, g as getCliConfig } from './main-BkWtFDlL.js';
+import { a as apigen, g as getCliConfig } from './main-Cn0HtcUt.js';
 import 'fs/promises';
 import 'path';
 import 'url';

package/dist/{main-BkWtFDlL.js → main-Cn0HtcUt.js}

@@ -10,7 +10,7 @@ import ts from 'typescript';
 import path from 'node:path';
 
 var name = "apigen-ts";
-var version = "1.4.0";
+var version = "1.5.0";
 
 const initCtx = (config) => {
   return {
@@ -455,13 +455,31 @@ const prepareUrl = (url, rename) => {
       const [name, ...rest] = x.split("}");
       const right = rest.join("}");
       return f$1.createTemplateSpan(
-        f$1.createIdentifier(name),
-        // no normalization required
+        f$1.createCallExpression(f$1.createIdentifier("this.EncodePathParam"), void 0, [
+          f$1.createIdentifier(name)
+          // no normalization required
+        ]),
         i === parts.length - 2 ? f$1.createTemplateTail(right) : f$1.createTemplateMiddle(right)
       );
     })
   );
 };
+const prepareSearch = (params) => {
+  const separators = { form: ",", spaceDelimited: " ", pipeDelimited: "|" };
+  const joined = params.flatMap((x) => {
+    const style = x.style ?? "form";
+    if ((x.explode ?? style === "form") || !(style in separators)) return [];
+    const key = /^[a-zA-Z_$][\w$]*$/.test(x.name) ? f$1.createPropertyAccessExpression(f$1.createIdentifier("search"), x.name) : f$1.createElementAccessExpression(f$1.createIdentifier("search"), f$1.createStringLiteral(x.name));
+    const value = f$1.createCallExpression(f$1.createIdentifier("this.JoinQueryParam"), void 0, [
+      key,
+      f$1.createStringLiteral(separators[style])
+    ]);
+    return [f$1.createPropertyAssignment(f$1.createStringLiteral(x.name), value)];
+  });
+  if (!joined.length) return f$1.createShorthandPropertyAssignment("search");
+  const search = [f$1.createSpreadAssignment(f$1.createIdentifier("search")), ...joined];
+  return f$1.createPropertyAssignment("search", f$1.createObjectLiteralExpression(search));
+};
 const prepareOp = (ctx, cfg, opName, httpMethod) => {
   cfg.parameters = cfg.parameters ?? [];
   const reqSchema = getReqSchema(ctx, cfg);
@@ -469,7 +487,7 @@ const prepareOp = (ctx, cfg, opName, httpMethod) => {
   const allParams = filterNullable(cfg.parameters.map((x) => unref(ctx, x)));
   const params = uniqBy(allParams.filter((x) => x.in === "path"), "name");
   if (reqSchema) params.push({ name: "body", schema: reqSchema[1] });
-  const search = allParams.filter((x) => x.in === "query");
+  const search = uniqBy(allParams.filter((x) => x.in === "query"), "name");
   allParams.filter((x) => x.in === "header");
   for (const [name, v] of Object.entries({ search })) {
     if (!v.length) continue;
@@ -496,7 +514,7 @@ const prepareOp = (ctx, cfg, opName, httpMethod) => {
   }
   const cbArgs = filterNullable([
     ctx.fetchOptions ? f$1.createSpreadAssignment(f$1.createIdentifier("opts")) : void 0,
-    search.length ? f$1.createShorthandPropertyAssignment("search") : void 0,
+    search.length ? prepareSearch(search) : void 0,
     reqSchema && f$1.createShorthandPropertyAssignment("body"),
     reqSchema && reqSchema[0] !== "application/json" ? f$1.createPropertyAssignment(
       "headers",

package/dist/main.cjs

@@ -378,13 +378,31 @@ const prepareUrl = (url, rename) => {
       const [name, ...rest] = x.split("}");
       const right = rest.join("}");
       return f$1.createTemplateSpan(
-        f$1.createIdentifier(name),
-        // no normalization required
+        f$1.createCallExpression(f$1.createIdentifier("this.EncodePathParam"), void 0, [
+          f$1.createIdentifier(name)
+          // no normalization required
+        ]),
         i === parts.length - 2 ? f$1.createTemplateTail(right) : f$1.createTemplateMiddle(right)
       );
     })
   );
 };
+const prepareSearch = (params) => {
+  const separators = { form: ",", spaceDelimited: " ", pipeDelimited: "|" };
+  const joined = params.flatMap((x) => {
+    const style = x.style ?? "form";
+    if ((x.explode ?? style === "form") || !(style in separators)) return [];
+    const key = /^[a-zA-Z_$][\w$]*$/.test(x.name) ? f$1.createPropertyAccessExpression(f$1.createIdentifier("search"), x.name) : f$1.createElementAccessExpression(f$1.createIdentifier("search"), f$1.createStringLiteral(x.name));
+    const value = f$1.createCallExpression(f$1.createIdentifier("this.JoinQueryParam"), void 0, [
+      key,
+      f$1.createStringLiteral(separators[style])
+    ]);
+    return [f$1.createPropertyAssignment(f$1.createStringLiteral(x.name), value)];
+  });
+  if (!joined.length) return f$1.createShorthandPropertyAssignment("search");
+  const search = [f$1.createSpreadAssignment(f$1.createIdentifier("search")), ...joined];
+  return f$1.createPropertyAssignment("search", f$1.createObjectLiteralExpression(search));
+};
 const prepareOp = (ctx, cfg, opName, httpMethod) => {
   cfg.parameters = cfg.parameters ?? [];
   const reqSchema = getReqSchema(ctx, cfg);
@@ -392,7 +410,7 @@ const prepareOp = (ctx, cfg, opName, httpMethod) => {
   const allParams = arrayUtilsTs.filterNullable(cfg.parameters.map((x) => unref(ctx, x)));
   const params = lodashEs.uniqBy(allParams.filter((x) => x.in === "path"), "name");
   if (reqSchema) params.push({ name: "body", schema: reqSchema[1] });
-  const search = allParams.filter((x) => x.in === "query");
+  const search = lodashEs.uniqBy(allParams.filter((x) => x.in === "query"), "name");
   allParams.filter((x) => x.in === "header");
   for (const [name, v] of Object.entries({ search })) {
     if (!v.length) continue;
@@ -419,7 +437,7 @@ const prepareOp = (ctx, cfg, opName, httpMethod) => {
   }
   const cbArgs = arrayUtilsTs.filterNullable([
     ctx.fetchOptions ? f$1.createSpreadAssignment(f$1.createIdentifier("opts")) : void 0,
-    search.length ? f$1.createShorthandPropertyAssignment("search") : void 0,
+    search.length ? prepareSearch(search) : void 0,
     reqSchema && f$1.createShorthandPropertyAssignment("body"),
     reqSchema && reqSchema[0] !== "application/json" ? f$1.createPropertyAssignment(
       "headers",

package/dist/main.js

@@ -1,7 +1,7 @@
 import 'fs/promises';
 import 'path';
 import 'url';
-export { a as apigen } from './main-BkWtFDlL.js';
+export { a as apigen } from './main-Cn0HtcUt.js';
 import 'cleye';
 import '@redocly/openapi-core';
 import 'array-utils-ts';

package/dist/main.mjs

@@ -375,13 +375,31 @@ const prepareUrl = (url, rename) => {
       const [name, ...rest] = x.split("}");
       const right = rest.join("}");
       return f$1.createTemplateSpan(
-        f$1.createIdentifier(name),
-        // no normalization required
+        f$1.createCallExpression(f$1.createIdentifier("this.EncodePathParam"), void 0, [
+          f$1.createIdentifier(name)
+          // no normalization required
+        ]),
         i === parts.length - 2 ? f$1.createTemplateTail(right) : f$1.createTemplateMiddle(right)
       );
     })
   );
 };
+const prepareSearch = (params) => {
+  const separators = { form: ",", spaceDelimited: " ", pipeDelimited: "|" };
+  const joined = params.flatMap((x) => {
+    const style = x.style ?? "form";
+    if ((x.explode ?? style === "form") || !(style in separators)) return [];
+    const key = /^[a-zA-Z_$][\w$]*$/.test(x.name) ? f$1.createPropertyAccessExpression(f$1.createIdentifier("search"), x.name) : f$1.createElementAccessExpression(f$1.createIdentifier("search"), f$1.createStringLiteral(x.name));
+    const value = f$1.createCallExpression(f$1.createIdentifier("this.JoinQueryParam"), void 0, [
+      key,
+      f$1.createStringLiteral(separators[style])
+    ]);
+    return [f$1.createPropertyAssignment(f$1.createStringLiteral(x.name), value)];
+  });
+  if (!joined.length) return f$1.createShorthandPropertyAssignment("search");
+  const search = [f$1.createSpreadAssignment(f$1.createIdentifier("search")), ...joined];
+  return f$1.createPropertyAssignment("search", f$1.createObjectLiteralExpression(search));
+};
 const prepareOp = (ctx, cfg, opName, httpMethod) => {
   cfg.parameters = cfg.parameters ?? [];
   const reqSchema = getReqSchema(ctx, cfg);
@@ -389,7 +407,7 @@ const prepareOp = (ctx, cfg, opName, httpMethod) => {
   const allParams = filterNullable(cfg.parameters.map((x) => unref(ctx, x)));
   const params = uniqBy(allParams.filter((x) => x.in === "path"), "name");
   if (reqSchema) params.push({ name: "body", schema: reqSchema[1] });
-  const search = allParams.filter((x) => x.in === "query");
+  const search = uniqBy(allParams.filter((x) => x.in === "query"), "name");
   allParams.filter((x) => x.in === "header");
   for (const [name, v] of Object.entries({ search })) {
     if (!v.length) continue;
@@ -416,7 +434,7 @@ const prepareOp = (ctx, cfg, opName, httpMethod) => {
   }
   const cbArgs = filterNullable([
     ctx.fetchOptions ? f$1.createSpreadAssignment(f$1.createIdentifier("opts")) : void 0,
-    search.length ? f$1.createShorthandPropertyAssignment("search") : void 0,
+    search.length ? prepareSearch(search) : void 0,
     reqSchema && f$1.createShorthandPropertyAssignment("body"),
     reqSchema && reqSchema[0] !== "application/json" ? f$1.createPropertyAssignment(
       "headers",

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "apigen-ts",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "license": "MIT",
   "author": "vladkens <v.pronsky@gmail.com>",
   "repository": {
@@ -21,22 +21,22 @@
     "node": ">=22"
   },
   "dependencies": {
-    "@redocly/openapi-core": "2.47.0",
+    "@redocly/openapi-core": "2.76.0",
     "@types/lodash-es": "4.17.12",
     "@types/swagger2openapi": "7.0.4",
     "array-utils-ts": "1.1.0",
-    "cleye": "2.6.0",
+    "cleye": "2.7.0",
     "lodash-es": "4.18.1",
     "swagger2openapi": "7.0.8"
   },
   "devDependencies": {
-    "@types/node": "26.2.0",
+    "@types/node": "26.6.6",
     "fetch-mock": "12.6.0",
-    "npm-check-updates": "23.0.2",
-    "pkgroll": "2.27.1",
-    "prettier": "3.9.6",
+    "npm-check-updates": "23.1.1",
+    "pkgroll": "2.29.0",
+    "prettier": "3.9.10",
     "prettier-plugin-organize-imports": "4.3.0",
-    "tsx": "4.23.12",
+    "tsx": "4.23.15",
     "typescript": "6.0.3"
   },
   "peerDependencies": {