@penkov/swagger-code-gen 1.11.1 → 1.13.0

package/dist/components-parse.js

@@ -91,12 +91,8 @@ export function resolvePaths(json, schemasTypes, options, pool) {
 export function generateInPlace(paths, schemasTypes, options, pool) {
     const collectInplaceFromProperty = (p) => {
         if (p.inPlace.isDefined) {
-            if (p.type === 'array') {
-                return Collection.of(SchemaObject.fromDefinition(p.items, p.inPlace.get, schemasTypes, options, pool));
-            }
-            else {
-                return Collection.of(SchemaObject.fromDefinition(p.type, p.inPlace.get, schemasTypes, options, pool));
-            }
+            const targetType = p.isArray ? p.items : p.type;
+            return Collection.of(SchemaObject.fromDefinition(targetType, p.inPlace.get, schemasTypes, options, pool));
         }
         else {
             return Nil;
@@ -120,7 +116,8 @@ export function generateInPlace(paths, schemasTypes, options, pool) {
     let pending = res.toCollection.flatMap(s => s.properties).filter(p => p.inPlace.isDefined);
     while (pending.nonEmpty) {
         const pass2 = pending.map(p => {
-            return SchemaObject.fromDefinition(p.type, p.inPlace.get, schemasTypes, options, pool);
+            const targetType = p.isArray ? p.items : p.type;
+            return SchemaObject.fromDefinition(targetType, p.inPlace.get, schemasTypes, options, pool);
         });
         res.appendAll(pass2);
         pending = pass2.flatMap(s => s.properties).filter(p => p.inPlace.isDefined);

package/dist/renderer.js

@@ -3,11 +3,11 @@ import * as fs from 'fs';
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import * as scatsLib from 'scats';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+const currentFilename = typeof __filename !== 'undefined' ? __filename : fileURLToPath(import.meta.url);
+const currentDirname = typeof __dirname !== 'undefined' ? __dirname : dirname(currentFilename);
 export class Renderer {
     async renderToFile(schemas, methods, enableScats, targetNode, file) {
-        const view = await ejs.renderFile(path.resolve(__dirname, 'templates/index.ejs'), {
+        const view = await ejs.renderFile(path.resolve(currentDirname, 'templates/index.ejs'), {
             scatsLib: scatsLib,
             schemas: schemas,
             methods: methods,

package/dist/templates/method.ejs

@@ -46,7 +46,7 @@ export async function <%= method.endpointName %><%= body.map(b => b.suffix).getO
     <%_ }  -%>
     <%_ }) -%>
     <%_ method.parameters.filter(x => x.in === 'query' && !x.required).foreach(p => { -%>
-    if (!!<%= method.wrapParamsInObject ? 'params.' : '' %><%= p.uniqueName %>) {
+    if (<%= method.wrapParamsInObject ? 'params.' : '' %><%= p.uniqueName %> !== undefined) {
         <%_ if (p.isArray) { -%>
         <%= method.wrapParamsInObject ? 'params.' : '' %><%= p.uniqueName %>.forEach(p => {
             queryParams.push(`<%= p.name %>=${p}`);

package/jest.config.cjs

@@ -0,0 +1,18 @@
+/** @type {import('jest').Config} */
+module.exports = {
+  preset: 'ts-jest/presets/default-esm',
+  testEnvironment: 'node',
+  extensionsToTreatAsEsm: ['.ts'],
+  transform: {
+    '^.+\\.(ts|tsx)$': [
+      'ts-jest',
+      {
+        useESM: true,
+        tsconfig: './tsconfig.jest.json'
+      }
+    ]
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1'
+  }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@penkov/swagger-code-gen",
-  "version": "1.11.1",
+  "version": "1.13.0",
   "type": "module",
   "bin": {
     "generate-client": "./dist/cli.mjs"
@@ -22,6 +22,7 @@
   },
   "homepage": "https://github.com/papirosko/swagger-code-gen#readme",
   "scripts": {
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
     "test:petstore": "node --loader ts-node/esm ./src/cli.mjs --enableScats --targetNode --url https://petstore3.swagger.io/api/v3/openapi.json tmp/petstore.ts",
     "clean": "rimraf dist",
     "lint": "eslint \"{src,test}/**/*.ts\" --fix",
@@ -39,10 +40,13 @@
   },
   "devDependencies": {
     "@types/ejs": "^3.1.1",
+    "@types/jest": "^29.5.12",
     "@typescript-eslint/eslint-plugin": "^5.10.2",
     "@typescript-eslint/parser": "^5.10.2",
     "eslint": "^7.30.0",
+    "jest": "^29.7.0",
     "rimraf": "^3.0.2",
+    "ts-jest": "^29.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^4.9.3"
   }

package/tsconfig.jest.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "ES2020",
+    "moduleResolution": "node",
+    "target": "ES2020",
+    "isolatedModules": true,
+    "types": ["jest"]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.mjs",
+    "test/**/*.ts"
+  ]
+}