swagger-typescript-api 12.0.4 → 13.0.0

package/package.json

@@ -1,22 +1,25 @@
 {
   "name": "swagger-typescript-api",
-  "version": "12.0.4",
+  "version": "13.0.0",
   "description": "Generate typescript/javascript api from swagger schema",
   "scripts": {
+    "update-deps-to-latest": "npx --yes npm-check-updates && npm i",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",
     "cli:yaml": "node index.js -r -d -p ./swagger-test-cli.yaml -n swagger-test-cli.ts",
     "node": "node swagger-test-cli/generate.js",
     "node:debug": "node --nolazy swagger-test-cli/generate.js",
     "contributors": "all-contributors generate",
     "cli:help": "node index.js -h",
-    "test-all": "node --unhandled-rejections=strict ./scriptsRunner.js generate validate test:*",
-    "test-all(update-snapshots)": "cross-env UPDATE_SNAPSHOTS=true node --unhandled-rejections=strict ./scriptsRunner.js generate validate test:*",
-    "test-all-extended": "node --unhandled-rejections=strict ./scriptsRunner.js generate-extended validate generate validate test:*",
-    "test-specific": "node ./scriptsRunner.js generate validate test:*",
-    "test-specific-only": "node ./scriptsRunner.js test:*",
+    "test-all": "npm run test-extended && npm run test-simple && npm run test-specific",
+    "test-all(update-snapshots)": "cross-env UPDATE_SNAPSHOTS=true npm run test-all",
+    "test-simple": "node --unhandled-rejections=strict scripts_runner.js generate validate",
+    "test-extended": "node --unhandled-rejections=strict scripts_runner.js generate-extended validate",
+    "test-specific": "node --unhandled-rejections=strict scripts_runner.js test:*",
+    "test-specific(update-snapshots)": "cross-env UPDATE_SNAPSHOTS=true node --unhandled-rejections=strict scripts_runner.js test:*",
     "generate": "node tests/generate.js",
     "generate-extended": "node tests/generate-extended.js",
-    "generate:debug": "node --nolazy tests/generate.js",
     "validate": "node tests/validate.js",
     "validate:debug": "node --nolazy tests/validate.js",
     "test:--route-types": "node tests/spec/routeTypes/test.js",
@@ -47,7 +50,7 @@
     "test:--type-suffix--type-prefix": "node tests/spec/typeSuffixPrefix/test.js",
     "test:--dot-path-params": "node tests/spec/dot-path-params/test.js",
     "test:--primitive-type-constructs": "node tests/spec/primitive-type-constructs/test.js",
-    "test:--cli": "node index.js -p tests/spec/cli/schema.json -o tests/spec/cli -n schema.ts --extract-response-body --extract-response-error --api-class-name MySuperApi --type-prefix Prefix && node tests/spec/cli/test.js",
+    "test:--cli": "rimraf tests/spec/cli/schema.ts && node index.js -p tests/spec/cli/schema.json -o tests/spec/cli -n schema.ts --extract-response-body --extract-response-error --api-class-name MySuperApi --type-prefix Prefix && node tests/spec/cli/test.js",
     "test:partialBaseTemplate": "node tests/spec/partialBaseTemplate/test.js",
     "test:partialDefaultTemplate": "node tests/spec/partialDefaultTemplate/test.js",
     "test:--patch": "node tests/spec/patch/test.js",
@@ -59,49 +62,51 @@
     "test:another-query-params": "node tests/spec/another-query-params/test.js",
     "test:on-insert-path-param": "node tests/spec/on-insert-path-param/test.js",
     "test:extra-templates": "node tests/spec/extra-templates/test.js",
-    "test:extract-enums": "node tests/spec/extract-enums/test.js"
+    "test:extract-enums": "node tests/spec/extract-enums/test.js",
+    "test:discriminator": "node tests/spec/discriminator/test.js",
+    "test:sort-types": "node tests/spec/sortTypes/test.js",
+    "test:sort-types-false": "node tests/spec/sortTypes-false/test.js"
   },
   "author": "acacode",
   "license": "MIT",
   "typings": "./index.d.ts",
   "main": "src/index.js",
   "devDependencies": {
-    "@types/lodash": "^4.14.186",
-    "@types/node": "^18.11.7",
-    "@types/prettier": "^2.7.1",
-    "all-contributors-cli": "^6.20.0",
-    "axios": "^1.1.3",
+    "eslint": "^8.44.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "@types/lodash": "^4.14.195",
+    "@types/node": "^20.4.1",
+    "@types/prettier": "^2.7.3",
+    "all-contributors-cli": "^6.26.1",
+    "axios": "^1.4.0",
     "cross-env": "^7.0.3",
+    "dotenv": "^16.3.1",
     "git-diff": "^2.0.6",
-    "husky": "^4.3.6",
-    "pretty-quick": "^3.1.0"
+    "husky": "^8.0.3",
+    "pretty-quick": "^3.1.3",
+    "rimraf": "^5.0.1"
   },
   "dependencies": {
     "@types/swagger-schema-official": "2.0.22",
-    "cosmiconfig": "7.0.1",
+    "cosmiconfig": "8.2.0",
     "didyoumean": "^1.2.2",
-    "eta": "^2.0.0",
+    "eta": "^2.2.0",
     "js-yaml": "4.1.0",
     "lodash": "4.17.21",
-    "make-dir": "3.1.0",
-    "nanoid": "3.3.4",
-    "node-emoji": "1.11.0",
-    "node-fetch": "^3.2.10",
-    "prettier": "2.7.1",
+    "make-dir": "4.0.0",
+    "nanoid": "3.3.6",
+    "node-emoji": "2.1.0",
+    "node-fetch": "^3.3.1",
+    "prettier": "3.0.0",
     "swagger-schema-official": "2.0.0-bab6bed",
     "swagger2openapi": "7.0.8",
-    "typescript": "4.8.4"
+    "typescript": "5.1.6"
   },
   "bin": {
     "swagger-typescript-api": "index.js",
     "sta": "index.js"
   },
-  "husky": {
-    "hooks": {
-      "pre-commit": "pretty-quick --staged",
-      "post-commit": "git update-index -g"
-    }
-  },
   "keywords": [
     "openapi",
     "swagger",

package/src/code-formatter.js

@@ -1,6 +1,6 @@
-const _ = require("lodash");
-const ts = require("typescript");
-const prettier = require("prettier");
+const _ = require('lodash');
+const ts = require('typescript');
+const prettier = require('prettier');
 
 class CodeFormatter {
   /**
@@ -8,18 +8,18 @@ class CodeFormatter {
    */
   config;
 
-  constructor(config) {
+  constructor({ config }) {
     this.config = config;
   }
 
   removeUnusedImports = (content) => {
-    const tempFileName = "file.ts";
+    const tempFileName = 'file.ts';
 
     const host = new TsLanguageServiceHost(tempFileName, content);
     const languageService = ts.createLanguageService(host);
 
     const fileTextChanges = languageService.organizeImports(
-      { type: "file", fileName: tempFileName },
+      { type: 'file', fileName: tempFileName },
       { newLineCharacter: ts.sys.newLine },
     )[0];
 
@@ -27,7 +27,9 @@ class CodeFormatter {
       return _.reduceRight(
         fileTextChanges.textChanges,
         (content, { span, newText }) =>
-          `${content.slice(0, span.start)}${newText}${content.slice(span.start + span.length)}`,
+          `${content.slice(0, span.start)}${newText}${content.slice(
+            span.start + span.length,
+          )}`,
         content,
       );
     }
@@ -35,16 +37,27 @@ class CodeFormatter {
     return content;
   };
 
-  prettierFormat = (content) => {
-    return prettier.format(content, this.config.prettierOptions);
+  /**
+   * @param content
+   * @returns {Promise<string>}
+   */
+  prettierFormat = async (content) => {
+    const formatted = await prettier.format(
+      content,
+      this.config.prettierOptions,
+    );
+    return formatted;
   };
 
-  formatCode = (code, { removeUnusedImports = true, prettierFormat = true } = {}) => {
+  formatCode = async (
+    code,
+    { removeUnusedImports = true, prettierFormat = true } = {},
+  ) => {
     if (removeUnusedImports) {
       code = this.removeUnusedImports(code);
     }
     if (prettierFormat) {
-      code = this.prettierFormat(code);
+      code = await this.prettierFormat(code);
     }
     return code;
   };
@@ -58,13 +71,15 @@ class TsLanguageServiceHost {
       fileName,
       content,
       compilerOptions: tsconfig
-        ? ts.convertCompilerOptionsFromJson(ts.readConfigFile(tsconfig, ts.sys.readFile).config.compilerOptions).options
+        ? ts.convertCompilerOptionsFromJson(
+            ts.readConfigFile(tsconfig, ts.sys.readFile).config.compilerOptions,
+          ).options
         : ts.getDefaultCompilerOptions(),
     });
   }
 
   getNewLine() {
-    return "newLine" in ts.sys ? ts.sys.newLine : "\n";
+    return 'newLine' in ts.sys ? ts.sys.newLine : '\n';
   }
   getScriptFileNames() {
     return [this.fileName];