Merge branch 'main' into fix/formdata-array-handling

Author: omarmciver

.envrc

@@ -11,18 +11,19 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node-version: [24, 22, 20]
+        node-version: [25, 24, 22, 20]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout tree
-        uses: actions/checkout@v5
-      - name: Set-up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - name: Set-up Mise
+        uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
         with:
-          check-latest: true
-          node-version: ${{ matrix.node-version }}
-          package-manager-cache: false
-      - run: corepack enable
+          cache: false
+          mise_toml: |
+            [tools]
+            node = "${{ matrix.node-version }}"
+            yarn = "4"
       - run: yarn install --immutable
       - run: yarn format:check
       - run: yarn build

.github/workflows/main.yml

@@ -24,22 +24,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout tree
-        uses: actions/checkout@v5
-      - name: Set-up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - name: Set-up Mise
+        uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
         with:
-          check-latest: true
-          node-version-file: .nvmrc
-          package-manager-cache: false
-      - run: corepack enable
+          cache: false
       - run: yarn install --immutable
       - run: yarn typedoc
       - name: Set-up Pages
-        uses: actions/configure-pages@v5
+        uses: actions/configure-pages@983d7736d9b0ae728b81ab479565c72886d7745b # v5.0.0
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+        uses: actions/upload-pages-artifact@7b1f4a764d45c48632c6b24a0339c27f5614fb0b # v4.0.0
         with:
           path: docs
       - name: Deploy odoc to GitHub Pages
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@d6db90164ac5ed86f2b6aed7e0febac5b3c0c03e # v4.0.5
         id: deployment

.github/workflows/typedoc.yml

@@ -20,17 +20,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout tree
-        uses: actions/checkout@v5
-      - name: Set-up Node.js
-        uses: actions/setup-node@v5
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - name: Set-up Mise
+        uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
         with:
-          check-latest: true
-          node-version-file: .nvmrc
-          package-manager-cache: false
-      - run: corepack enable
+          cache: false
       - run: yarn install --immutable
       - name: Create Release Pull Request
-        uses: changesets/action@v1
+        uses: changesets/action@e0145edc7d9d8679003495b11f87bd8ef63c0cba # v1.5.3
         with:
           version: yarn changeset version
           publish: yarn npm publish --tolerate-republish

.github/workflows/version-or-publish.yml

@@ -1,5 +1,43 @@
 # swagger-typescript-api
 
+## 13.2.16
+
+### Patch Changes
+
+- [#1459](https://github.com/acacode/swagger-typescript-api/pull/1459) [`6b485dd`](https://github.com/acacode/swagger-typescript-api/commit/6b485dd70228a7e3697c4bd4a9ca5537e456f512) Thanks [@smorimoto](https://github.com/smorimoto)! - Downgrade eta from 4.0.1 to 3.5.0 to fix module resolution error.
+
+  After the upgrade to eta@4.0.1 in version 13.2.11, API generation started
+  failing with `ERR_PACKAGE_PATH_NOT_EXPORTED: No "exports" main defined in
+eta/package.json`. This issue is caused by incorrect package export
+  configuration in eta@4.0.1, which is tracked in the upstream repository.
+
+  Downgrading to eta@3.5.0 resolves the module resolution error whilst
+  maintaining compatibility with the existing template system.
+
+  Fixes #1427.
+
+## 13.2.15
+
+### Patch Changes
+
+- [`afc2448`](https://github.com/acacode/swagger-typescript-api/commit/afc24481bbbe891942264c1dacf1101e521f039a) Thanks [@js2me](https://github.com/js2me)! - added ability to override usageSchema and originalSchema after onInit hook and before all other operations
+
+## 13.2.14
+
+### Patch Changes
+
+- [#1398](https://github.com/acacode/swagger-typescript-api/pull/1398) [`d987aee`](https://github.com/acacode/swagger-typescript-api/commit/d987aee6a2f7dbf6edba73b58a2df2fceb32a876) Thanks [@k1rd3rf](https://github.com/k1rd3rf)! - Fix modular template to always generate class property syntax.
+
+  The modular template was incorrectly using object method syntax (`:` and
+  `,`) when route.namespace was present, introduced by PR #1326. This
+  caused TypeScript syntax errors in generated code.
+
+  The modular template should always generate class properties with arrow
+  functions (`=` and `;`), regardless of namespace presence.
+
+  This resolves the issue reported in #1366 where version 13.2.8 generated
+  invalid TypeScript code with modular templates.
+
 ## 13.2.13
 
 ### Patch Changes

.nvmrc

@@ -0,0 +1,3 @@
+[tools]
+node = "25"
+yarn = "4"

CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "13.2.13",
+  "version": "13.2.16",
   "description": "Generate the API client for Fetch or Axios from an OpenAPI Specification",
   "homepage": "https://github.com/acacode/swagger-typescript-api",
   "bugs": "https://github.com/acacode/swagger-typescript-api/issues",
@@ -13,19 +13,18 @@
   "type": "module",
   "exports": {
     ".": {
-      "import": {
-        "types": "./dist/lib.d.ts",
-        "default": "./dist/lib.js"
-      },
-      "require": {
-        "types": "./dist/lib.d.cts",
-        "default": "./dist/lib.cjs"
-      }
-    }
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
+    },
+    "./cli": {
+      "import": "./dist/cli.js",
+      "require": "./dist/cli.cjs"
+    },
+    "./package.json": "./package.json"
   },
-  "main": "./dist/lib.cjs",
-  "module": "./dist/lib.js",
-  "types": "./dist/lib.d.cts",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.cts",
   "bin": {
     "sta": "./dist/cli.js",
     "swagger-typescript-api": "./dist/cli.js"
@@ -47,36 +46,36 @@
     "typedoc": "typedoc"
   },
   "dependencies": {
-    "@biomejs/js-api": "3.0.0",
-    "@biomejs/wasm-nodejs": "2.2.4",
+    "@biomejs/js-api": "4.0.0",
+    "@biomejs/wasm-nodejs": "2.3.8",
     "@types/lodash": "^4.17.20",
     "@types/swagger-schema-official": "^2.0.25",
     "c12": "^3.3.0",
     "citty": "^0.1.6",
     "consola": "^3.4.2",
-    "eta": "^4.0.1",
+    "eta": "^3.5.0",
     "lodash": "^4.17.21",
-    "nanoid": "^5.1.5",
+    "nanoid": "^5.1.6",
     "openapi-types": "^12.1.3",
     "swagger-schema-official": "2.0.0-bab6bed",
     "swagger2openapi": "^7.0.8",
-    "typescript": "~5.9.2",
+    "typescript": "~5.9.3",
     "yaml": "^2.8.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.4",
-    "@changesets/changelog-github": "0.5.1",
-    "@changesets/cli": "2.29.7",
-    "@tsconfig/node20": "20.1.6",
-    "@tsconfig/strictest": "2.0.6",
-    "@types/node": "24.5.2",
+    "@biomejs/biome": "2.3.8",
+    "@changesets/changelog-github": "0.5.2",
+    "@changesets/cli": "2.29.8",
+    "@tsconfig/node20": "20.1.8",
+    "@tsconfig/strictest": "2.0.8",
+    "@types/node": "24.10.1",
     "@types/swagger2openapi": "7.0.4",
-    "axios": "1.12.2",
-    "tsdown": "0.15.4",
-    "typedoc": "0.28.13",
-    "vitest": "3.2.4"
+    "axios": "1.13.2",
+    "tsdown": "0.16.8",
+    "typedoc": "0.28.15",
+    "vitest": "4.0.15"
   },
-  "packageManager": "yarn@4.10.2",
+  "packageManager": "yarn@4.12.0",
   "engines": {
     "node": ">=20"
   },

mise.toml

@@ -112,6 +112,13 @@ export class CodeGenProcess {
       this.config.hooks.onInit(this.config, this) || this.config,
     );
 
+    if (this.config.swaggerSchema) {
+      swagger.usageSchema = this.config.swaggerSchema;
+    }
+    if (this.config.originalSchema) {
+      swagger.originalSchema = this.config.originalSchema;
+    }
+
     this.schemaComponentsMap.clear();
 
     lodash.each(swagger.usageSchema.components, (component, componentName) =>

package.json

@@ -65,11 +65,11 @@ export class SchemaRoutes {
     ]);
   }
 
-  createRequestsMap = (routeInfoByMethodsMap) => {
-    const parameters = lodash.get(routeInfoByMethodsMap, "parameters");
+  createRequestsMap = (routesByMethod) => {
+    const parameters = lodash.get(routesByMethod, "parameters");
 
     return lodash.reduce(
-      routeInfoByMethodsMap,
+      routesByMethod,
       (acc, requestInfo, method) => {
         if (
           method.startsWith("x-") ||
@@ -91,10 +91,9 @@ export class SchemaRoutes {
     );
   };
 
-  parseRouteName = (originalRouteName) => {
+  parseRouteName = (rawRoute) => {
     const routeName =
-      this.config.hooks.onPreBuildRoutePath(originalRouteName) ||
-      originalRouteName;
+      this.config.hooks.onPreBuildRoutePath(rawRoute) || rawRoute;
 
     // TODO forbid leading symbols [\]^` in a major release (allowed yet for backwards compatibility)
     const pathParamMatches = (routeName || "").match(
@@ -157,15 +156,16 @@ export class SchemaRoutes {
       );
 
       for (const paramName of paramNames) {
-        // @ts-expect-error TS(2339) FIXME: Property 'includes' does not exist on type 'unknow... Remove this comment to see the full error message
-        if (paramName.includes("-")) {
+        if (typeof paramName === "string" && paramName.includes("-")) {
           consola.warn("wrong query param name", paramName);
         }
 
         queryParams.push({
           $match: paramName,
-          // @ts-expect-error TS(2345) FIXME: Argument of type 'unknown' is not assignable to pa... Remove this comment to see the full error message
-          name: lodash.camelCase(paramName),
+          name:
+            typeof paramName === "string"
+              ? lodash.camelCase(paramName)
+              : lodash.camelCase(String(paramName)),
           required: true,
           type: "string",
           description: "",
@@ -178,7 +178,7 @@ export class SchemaRoutes {
     }
 
     const result = {
-      originalRoute: originalRouteName || "",
+      originalRoute: rawRoute || "",
       route: fixedRoute,
       pathParams,
       queryParams,
@@ -241,9 +241,7 @@ export class SchemaRoutes {
         routeParam.name = lodash.camelCase(routeParam.name);
       }
 
-      if (routeParam) {
-        routeParams[routeParam.in].push(routeParam);
-      }
+      routeParams[routeParam.in].push(routeParam);
     });
 
     // used in case when path parameters is not declared in requestInfo.parameters ("in": "path")
@@ -418,8 +416,7 @@ export class SchemaRoutes {
     lodash.reduce(
       requestInfos,
       (acc, requestInfo, status) => {
-        // @ts-expect-error TS(2554) FIXME: Expected 2 arguments, but got 1.
-        const contentTypes = this.getContentTypes([requestInfo]);
+        const contentTypes = this.getContentTypes([requestInfo], operationId);
 
         return [
           ...acc,