swagger-typescript-api 13.0.3 → 13.0.5

package/src/type-name-formatter.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 /**
  * @typedef {"enum-key" | "type-name"} FormattingSchemaType
@@ -30,27 +30,27 @@ class TypeNameFormatter {
     /**
      * @type {FormattingSchemaType}
      */
-    const schemaType = options.type || 'type-name';
+    const schemaType = options.type || "type-name";
 
     const typePrefix =
-      schemaType === 'enum-key'
+      schemaType === "enum-key"
         ? this.config.enumKeyPrefix
         : this.config.typePrefix;
     const typeSuffix =
-      schemaType === 'enum-key'
+      schemaType === "enum-key"
         ? this.config.enumKeySuffix
         : this.config.typeSuffix;
 
     const hashKey = `${typePrefix}_${name}_${typeSuffix}`;
 
-    if (typeof name !== 'string') {
-      this.logger.warn('wrong name of the model name', name);
+    if (typeof name !== "string") {
+      this.logger.warn("wrong name of the model name", name);
       return name;
     }
 
     // constant names like LEFT_ARROW, RIGHT_FORWARD, ETC_KEY, _KEY_NUM_
     if (/^([A-Z_]{1,})$/g.test(name)) {
-      return _.compact([typePrefix, name, typeSuffix]).join('_');
+      return _.compact([typePrefix, name, typeSuffix]).join("_");
     }
 
     if (this.formattedModelNamesMap.has(hashKey)) {
@@ -62,7 +62,7 @@ class TypeNameFormatter {
     const formattedName = _.replace(
       _.startCase(`${typePrefix}_${fixedModelName}_${typeSuffix}`),
       /\s/g,
-      '',
+      "",
     );
     const formattedResultName =
       this.config.hooks.onFormatTypeName(formattedName, name, schemaType) ||
@@ -86,22 +86,22 @@ class TypeNameFormatter {
     if (!this.isValidName(name)) {
       if (!/^[a-zA-Z_$]/g.test(name)) {
         const fixPrefix =
-          type === 'enum-key'
+          type === "enum-key"
             ? this.config.fixInvalidEnumKeyPrefix
             : this.config.fixInvalidTypeNamePrefix;
         name = `${fixPrefix} ${name}`;
       }
 
       // specific replaces for TSOA 3.x
-      if (name.includes('.'))
+      if (name.includes("."))
         name = name
-          .replace(/Exclude_keyof[A-Za-z]+/g, () => 'ExcludeKeys')
-          .replace(/%22~AND~%22/g, 'And')
-          .replace(/%22~OR~%22/g, 'Or')
-          .replace(/(\.?%22)|\./g, '_')
-          .replace(/__+$/, '');
+          .replace(/Exclude_keyof[A-Za-z]+/g, () => "ExcludeKeys")
+          .replace(/%22~AND~%22/g, "And")
+          .replace(/%22~OR~%22/g, "Or")
+          .replace(/(\.?%22)|\./g, "_")
+          .replace(/__+$/, "");
 
-      if (name.includes('-')) name = _.startCase(name).replace(/ /g, '');
+      if (name.includes("-")) name = _.startCase(name).replace(/ /g, "");
     }
 
     return name;

package/src/util/file-system.js

@@ -1,8 +1,7 @@
-const fs = require('fs');
-const makeDir = require('make-dir');
-const { resolve } = require('path');
-const _ = require('lodash');
-const { Logger } = require('./logger');
+const fs = require("node:fs");
+const { resolve } = require("node:path");
+const _ = require("lodash");
+const { Logger } = require("./logger");
 
 const FILE_PREFIX = `/* eslint-disable */
 /* tslint:disable */
@@ -21,12 +20,12 @@ class FileSystem {
   /** @type {Logger} */
   logger;
 
-  constructor({ logger = new Logger('file-system') } = {}) {
+  constructor({ logger = new Logger("file-system") } = {}) {
     this.logger = logger;
   }
 
   getFileContent = (path) => {
-    return fs.readFileSync(path, { encoding: 'UTF-8' });
+    return fs.readFileSync(path, { encoding: "UTF-8" });
   };
 
   readDir = (path) => {
@@ -45,32 +44,32 @@ class FileSystem {
   };
 
   cropExtension = (fileName) => {
-    const fileNameParts = _.split(fileName, '.');
+    const fileNameParts = _.split(fileName, ".");
 
     if (fileNameParts.length > 1) {
       fileNameParts.pop();
     }
 
-    return fileNameParts.join('.');
+    return fileNameParts.join(".");
   };
 
   removeDir = (path) => {
     try {
-      if (typeof fs.rmSync === 'function') {
+      if (typeof fs.rmSync === "function") {
         fs.rmSync(path, { recursive: true });
       } else {
         fs.rmdirSync(path, { recursive: true });
       }
     } catch (e) {
-      this.logger.debug('failed to remove dir', e);
+      this.logger.debug("failed to remove dir", e);
     }
   };
 
   createDir = (path) => {
     try {
-      makeDir.sync(path);
+      fs.mkdirSync(path, { recursive: true });
     } catch (e) {
-      this.logger.debug('failed to create dir', e);
+      this.logger.debug("failed to create dir", e);
     }
   };
 
@@ -85,7 +84,7 @@ class FileSystem {
 
   createFile = ({ path, fileName, content, withPrefix }) => {
     const absolutePath = resolve(__dirname, path, `./${fileName}`);
-    const fileContent = `${withPrefix ? FILE_PREFIX : ''}${content}`;
+    const fileContent = `${withPrefix ? FILE_PREFIX : ""}${content}`;
 
     return fs.writeFileSync(absolutePath, fileContent, _.noop);
   };

package/src/util/id.js

@@ -1,6 +1,6 @@
-const { customAlphabet } = require('nanoid');
+const { customAlphabet } = require("nanoid");
 
-const ALPHABET = 'abcdefghijklmnopqrstuvwxyz0123456789';
+const ALPHABET = "abcdefghijklmnopqrstuvwxyz0123456789";
 
 const generateId = customAlphabet(ALPHABET, 12);
 

package/src/util/internal-case.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 module.exports = {
   internalCase: (value) => _.camelCase(_.lowerCase(value)),

package/src/util/logger.js

@@ -1,5 +1,5 @@
-const { emojify } = require('node-emoji');
-const _ = require('lodash');
+const { emojify } = require("node-emoji");
+const _ = require("lodash");
 
 class Logger {
   firstLog = true;
@@ -22,43 +22,43 @@ class Logger {
       this.log(
         `swagger-typescript-api(${this.config.version}),${
           process.env.npm_config_user_agent || `nodejs(${process.version})`
-        },debug mode ${this.config.debug ? 'ENABLED' : 'DISABLED'}`,
+        },debug mode ${this.config.debug ? "ENABLED" : "DISABLED"}`,
       );
     }
 
-    if (type === 'debug' || this.config.debug) {
+    if (type === "debug" || this.config.debug) {
       const trace = new Error().stack
-        .split('\n')
+        .split("\n")
         .splice(3)
         .filter(
           (line) =>
-            !line.includes('swagger-typescript-api\\node_modules') &&
-            !line.includes('swagger-typescript-api/node_modules'),
+            !line.includes("swagger-typescript-api\\node_modules") &&
+            !line.includes("swagger-typescript-api/node_modules"),
         )
         .slice(0, 10);
       const logFn = console[type] || console.log;
       logFn(`${emoji}  [${type}]`, new Date().toISOString());
       if (this.config.debugExtras && Array.isArray(this.config.debugExtras)) {
-        logFn(`[${this.config.debugExtras.join(' ')}]`);
+        logFn(`[${this.config.debugExtras.join(" ")}]`);
       }
       logFn(
-        '[message]',
+        "[message]",
         ..._.map(messages, (message) =>
-          _.startsWith(message, '\n')
-            ? `\n          ${message.replace(/\n/, '')}`
+          _.startsWith(message, "\n")
+            ? `\n          ${message.replace(/\n/, "")}`
             : message,
         ),
       );
-      logFn(trace.join('\n') + '\n---');
+      logFn(trace.join("\n") + "\n---");
       return;
     }
 
     console[type](
       emoji,
-      ' ',
+      " ",
       ..._.map(messages, (message) =>
-        _.startsWith(message, '\n')
-          ? `\n${emoji}   ${message.replace(/\n/, '')}`
+        _.startsWith(message, "\n")
+          ? `\n${emoji}   ${message.replace(/\n/, "")}`
           : message,
       ),
     );
@@ -70,8 +70,8 @@ class Logger {
    */
   log = (...messages) =>
     this.createLogMessage({
-      type: 'log',
-      emojiName: ':sparkles:',
+      type: "log",
+      emojiName: ":sparkles:",
       messages,
     });
 
@@ -82,8 +82,8 @@ class Logger {
    */
   event = (...messages) =>
     this.createLogMessage({
-      type: 'log',
-      emojiName: ':star:',
+      type: "log",
+      emojiName: ":star:",
       messages,
     });
 
@@ -94,8 +94,8 @@ class Logger {
    */
   success = (...messages) =>
     this.createLogMessage({
-      type: 'log',
-      emojiName: ':white_check_mark:',
+      type: "log",
+      emojiName: ":white_check_mark:",
       messages,
     });
 
@@ -106,8 +106,8 @@ class Logger {
    */
   warn = (...messages) =>
     this.createLogMessage({
-      type: 'warn',
-      emojiName: ':exclamation:',
+      type: "warn",
+      emojiName: ":exclamation:",
       messages,
     });
 
@@ -118,8 +118,8 @@ class Logger {
    */
   error = (...messages) =>
     this.createLogMessage({
-      type: 'error',
-      emojiName: ':no_entry:',
+      type: "error",
+      emojiName: ":no_entry:",
       messages,
     });
 
@@ -132,8 +132,8 @@ class Logger {
     if (!this.config.debug) return;
 
     this.createLogMessage({
-      type: 'debug',
-      emojiName: ':black_large_square:',
+      type: "debug",
+      emojiName: ":black_large_square:",
       messages,
     });
   };

package/src/util/name-resolver.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 class NameResolver {
   reservedNames = [];
@@ -51,14 +51,14 @@ class NameResolver {
    * @returns {string | null}
    */
   resolve(variants, resolver, extras, shouldReserve = true) {
-    if (typeof resolver === 'function') {
+    if (typeof resolver === "function") {
       let usageName = null;
       while (usageName === null) {
         const variant = resolver(variants, extras);
 
         if (variant === undefined) {
           this.logger.warn(
-            'unable to resolve name. current reserved names: ',
+            "unable to resolve name. current reserved names: ",
             this.reservedNames,
           );
           return null;
@@ -86,14 +86,14 @@ class NameResolver {
       }
 
       this.logger.debug(
-        'trying to resolve name with using fallback name generator using variants',
+        "trying to resolve name with using fallback name generator using variants",
         variants,
       );
       return this.resolve(variants, this.getFallbackName, extras);
     }
 
     this.logger.debug(
-      'problem with reserving names. current reserved names: ',
+      "problem with reserving names. current reserved names: ",
       this.reservedNames,
     );
     return null;

package/src/util/object-assign.js

@@ -1,9 +1,9 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 const objectAssign = (target, updaterFn) => {
   if (!updaterFn) return;
   const update =
-    typeof updaterFn === 'function' ? updaterFn(target) : updaterFn;
+    typeof updaterFn === "function" ? updaterFn(target) : updaterFn;
   const undefinedKeys = _.map(
     update,
     (value, key) => value === undefined && key,

package/src/util/pascal-case.js

@@ -1,4 +1,4 @@
-const _ = require('lodash');
+const _ = require("lodash");
 
 module.exports = {
   pascalCase: (value) => _.upperFirst(_.camelCase(value)),

package/src/util/request.js

@@ -1,6 +1,4 @@
-const _ = require('lodash');
-const https = require('https');
-const fetch = require('node-fetch-h2');
+const _ = require("lodash");
 
 class Request {
   /**
@@ -18,23 +16,30 @@ class Request {
   }
 
   /**
-   *
    * @param url {string}
    * @param disableStrictSSL
    * @param authToken
-   * @param options {Partial<import("node-fetch").RequestInit>}
+   * @param options {Partial<RequestInit>}
    * @return {Promise<string>}
    */
   async download({ url, disableStrictSSL, authToken, ...options }) {
     /**
-     * @type {Partial<import("node-fetch").RequestInit>}
+     * @type {Partial<RequestInit>}
      */
     const requestOptions = {};
 
-    if (disableStrictSSL && !_.startsWith(url, 'http://')) {
-      requestOptions.agent = new https.Agent({
-        rejectUnauthorized: false,
+    if (disableStrictSSL && !_.startsWith(url, "http://")) {
+      const undiciGlobalDispatcher =
+        global[Symbol.for("undici.globalDispatcher.1")];
+      if (!undiciGlobalDispatcher) {
+        throw new Error("Could not find the global Undici dispatcher");
+      }
+      const newDispatcher = new undiciGlobalDispatcher.constructor({
+        connect: {
+          rejectUnauthorized: false,
+        },
       });
+      global[unidiciGlobalDispatcherSymbol] = newDispatcher;
     }
     if (authToken) {
       requestOptions.headers = {
@@ -49,7 +54,7 @@ class Request {
       return await response.text();
     } catch (error) {
       const message = `error while fetching data from URL "${url}"`;
-      this.logger.error(message, 'response' in error ? error.response : error);
+      this.logger.error(message, "response" in error ? error.response : error);
       return message;
     }
   }

package/templates/README.md

@@ -1,17 +1,18 @@
-# swagger-typescript-api  
+# swagger-typescript-api
 
-# templates  
+# templates
 
-Templates:  
-- `api.ejs` - *(generates file)* Api class module (locations: [default](https://github.com/acacode/swagger-typescript-api/tree/next/templates/default/api.ejs), [modular](https://github.com/acacode/swagger-typescript-api/tree/next/templates/modular/api.ejs))  
-- `data-contracts.ejs` - *(generates file)* all types (data contracts) from swagger schema (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/data-contracts.ejs))  
-- `http-client.ejs` - *(generates file)* HttpClient class module (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/http-client.ejs))  
-- `procedure-call.ejs` - *(subtemplate)* route in Api class (locations: [default](https://github.com/acacode/swagger-typescript-api/tree/next/templates/default/procedure-call.ejs), [modular](https://github.com/acacode/swagger-typescript-api/tree/next/templates/modular/procedure-call.ejs))  
-- `route-docs.ejs` - *(generates file)* documentation for route in Api class (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/route-docs.ejs))  
-- `route-name.ejs` - *(subtemplate)* route name for route in Api class (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/route-name.ejs))  
-- `route-type.ejs` - *(`--route-types` option)* *(subtemplate)* (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/route-type.ejs))  
-- `route-types.ejs` - *(`--route-types` option)* *(subtemplate)* (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/route-types.ejs))  - `data-contract-jsdoc.ejs` - *(subtemplate)* generates JSDOC for data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/data-contract-jsdoc.ejs))
+Templates:
 
-[//]: # (- `enum-data-contract.ejs` - *(subtemplate)* generates `enum` data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/enum-data-contract.ejs)))
-[//]: # (- `interface-data-contract.ejs` - *(subtemplate)* generates `interface` data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/interface-data-contract.ejs)))
-[//]: # (- `type-data-contract.ejs` - *(subtemplate)* generates `type` data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/next/templates/base/type-data-contract.ejs)))
+- `api.ejs` - _(generates file)_ Api class module (locations: [default](https://github.com/acacode/swagger-typescript-api/tree/main/templates/default/api.ejs), [modular](https://github.com/acacode/swagger-typescript-api/tree/main/templates/modular/api.ejs))
+- `data-contracts.ejs` - _(generates file)_ all types (data contracts) from swagger schema (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/data-contracts.ejs))
+- `http-client.ejs` - _(generates file)_ HttpClient class module (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/http-client.ejs))
+- `procedure-call.ejs` - _(subtemplate)_ route in Api class (locations: [default](https://github.com/acacode/swagger-typescript-api/tree/main/templates/default/procedure-call.ejs), [modular](https://github.com/acacode/swagger-typescript-api/tree/main/templates/modular/procedure-call.ejs))
+- `route-docs.ejs` - _(generates file)_ documentation for route in Api class (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/route-docs.ejs))
+- `route-name.ejs` - _(subtemplate)_ route name for route in Api class (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/route-name.ejs))
+- `route-type.ejs` - _(`--route-types` option)_ _(subtemplate)_ (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/route-type.ejs))
+- `route-types.ejs` - _(`--route-types` option)_ _(subtemplate)_ (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/route-types.ejs)) - `data-contract-jsdoc.ejs` - _(subtemplate)_ generates JSDOC for data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/data-contract-jsdoc.ejs))
+
+[//]: # "- `enum-data-contract.ejs` - *(subtemplate)* generates `enum` data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/enum-data-contract.ejs))"
+[//]: # "- `interface-data-contract.ejs` - *(subtemplate)* generates `interface` data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/interface-data-contract.ejs))"
+[//]: # "- `type-data-contract.ejs` - *(subtemplate)* generates `type` data contract (locations: [base](https://github.com/acacode/swagger-typescript-api/tree/main/templates/base/type-data-contract.ejs))"

package/templates/base/README.md

@@ -1,8 +1,7 @@
-# swagger-typescript-api  
+# swagger-typescript-api
 
-# templates/base  
+# templates/base
 
-This templates use both for multiple api files and single api file  
+This templates use both for multiple api files and single api file
 
-
-path prefix `@base`  
+path prefix `@base`

package/templates/base/http-clients/fetch-http-client.ejs

@@ -189,7 +189,7 @@ export class HttpClient<SecurityDataType = unknown> {
             body: typeof body === "undefined" || body === null ? null : payloadFormatter(body),
         }
         ).then(async (response) => {
-            const r = response as HttpResponse<T, E>;
+            const r = response.clone() as HttpResponse<T, E>;
             r.data = (null as unknown) as T;
             r.error = (null as unknown) as E;
 

package/templates/base/route-name.ejs

@@ -24,10 +24,10 @@ const methodAliases = {
 
 const createCustomOperationId = (method, route, moduleName) => {
   const hasPathInserts = /\{(\w){1,}\}/g.test(route);
-  const splitedRouteBySlash = _.compact(_.replace(route, /\{(\w){1,}\}/g, "").split("/"));
-  const routeParts = (splitedRouteBySlash.length > 1
-    ? splitedRouteBySlash.splice(1)
-    : splitedRouteBySlash
+  const splittedRouteBySlash = _.compact(_.replace(route, /\{(\w){1,}\}/g, "").split("/"));
+  const routeParts = (splittedRouteBySlash.length > 1
+    ? splittedRouteBySlash.splice(1)
+    : splittedRouteBySlash
   ).join("_");
   return routeParts.length > 3 && methodAliases[method]
     ? methodAliases[method](routeParts, hasPathInserts)

package/templates/default/README.md

@@ -1,7 +1,7 @@
-# swagger-typescript-api  
+# swagger-typescript-api
 
-# templates/default  
+# templates/default
 
-This templates use for single api file (without `--modular` option)  
+This templates use for single api file (without `--modular` option)
 
-path prefix `@default`  
+path prefix `@default`

package/templates/modular/README.md

@@ -1,7 +1,7 @@
-# swagger-typescript-api  
+# swagger-typescript-api
 
-# templates/modular  
+# templates/modular
 
-This templates use for multiple api files (`--modular` option)  
+This templates use for multiple api files (`--modular` option)
 
-path prefix `@modular`  
+path prefix `@modular`