Merge remote-tracking branch 'origin/main' into feature_refs_in_paths

Author: js2me

CHANGELOG.md

@@ -1,5 +1,21 @@
 # swagger-typescript-api
 
+## 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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "13.2.13",
+  "version": "13.2.14",
   "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",
@@ -48,32 +48,32 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "12.0.0",
     "@biomejs/js-api": "3.0.0",
-    "@biomejs/wasm-nodejs": "2.2.4",
+    "@biomejs/wasm-nodejs": "2.2.5",
     "@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",
     "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",
     "yummies": "5.7.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "2.2.4",
+    "@biomejs/biome": "2.2.5",
     "@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",
+    "@types/node": "24.6.2",
     "@types/swagger2openapi": "7.0.4",
     "axios": "1.12.2",
-    "tsdown": "0.15.4",
+    "tsdown": "0.15.6",
     "typedoc": "0.28.13",
     "vitest": "3.2.4"
   },

templates/modular/procedure-call.ejs

@@ -90,7 +90,7 @@ const isValidIdentifier = (name) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
 <%~ routeDocs.lines %>
 
  */
-<% if (isValidIdentifier(route.routeName.usage)) { %><%~ route.routeName.usage %><%~ route.namespace ? ': ' : ' = ' %><% } else { %>"<%~ route.routeName.usage %>"<%~ route.namespace ? ': ' : ' = ' %><% } %>(<%~ wrapperArgs %>)<%~ config.toJS ? `: ${describeReturnType()}` : "" %> =>
+<% if (isValidIdentifier(route.routeName.usage)) { %><%~ route.routeName.usage %><% } else { %>"<%~ route.routeName.usage %>"<% } %> = (<%~ wrapperArgs %>)<%~ config.toJS ? `: ${describeReturnType()}` : "" %> =>
     <%~ config.singleHttpClient ? 'this.http.request' : 'this.request' %><<%~ type %>, <%~ errorType %>>({
         path: `<%~ path %>`,
         method: '<%~ _.upperCase(method) %>',
@@ -100,4 +100,4 @@ const isValidIdentifier = (name) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(name);
         <%~ bodyContentKindTmpl ? `type: ${bodyContentKindTmpl},` : '' %>
         <%~ responseFormatTmpl ? `format: ${responseFormatTmpl},` : '' %>
         ...<%~ _.get(requestConfigParam, "name") %>,
-    })<%~ route.namespace ? ',' : '' %>
+    })