swagger-typescript-api 10.0.0 → 10.0.2

package/src/components.js

@@ -47,9 +47,7 @@ const createComponentsMap = (components) => {
   config.componentsMap = {};
 
   _.each(components, (component, componentName) =>
-    _.each(component, (rawTypeData, typeName) =>
-      createComponent(componentName, typeName, rawTypeData),
-    ),
+    _.each(component, (rawTypeData, typeName) => createComponent(componentName, typeName, rawTypeData)),
   );
 
   return config.componentsMap;
@@ -80,9 +78,9 @@ const getTypeData = (typeInfo) => {
 /**
  *
  * @param {string} ref
- * @returns {TypeInfo | undefined}
+ * @returns {TypeInfo | null}
  */
-const getComponentByRef = (ref) => config.componentsMap[ref];
+const getComponentByRef = (ref) => config.componentsMap[ref] || null;
 
 module.exports = {
   getTypeData,

package/src/config.js

@@ -93,6 +93,10 @@ const config = {
   componentTypeNameResolver: new NameResolver([]),
   /** name of the main exported class */
   apiClassName: "Api",
+  debug: false,
+  internalTemplateOptions: {
+    addUtilRequiredKeysType: false,
+  },
 };
 
 /** needs to use data everywhere in project */

package/src/constants.js

@@ -13,6 +13,12 @@ const TS_KEYWORDS = {
   TYPE: "type",
   ENUM: "enum",
   INTERFACE: "interface",
+  TYPE_AND_OPERATOR: " & ",
+  TYPE_OR_OPERATOR: " | ",
+};
+
+const TS_EXTERNAL = {
+  RECORD: "Record<string, any>",
 };
 
 const JS_PRIMITIVE_TYPES = [TS_KEYWORDS.NUMBER, TS_KEYWORDS.STRING, TS_KEYWORDS.BOOLEAN];
@@ -49,6 +55,7 @@ module.exports = {
   JS_PRIMITIVE_TYPES,
   JS_EMPTY_TYPES,
   TS_KEYWORDS,
+  TS_EXTERNAL,
   SCHEMA_TYPES,
   HTTP_CLIENT,
   RESERVED_QUERY_ARG_NAMES,

package/src/filePrefix.js

@@ -1,14 +1,14 @@
-module.exports = {
-  filePrefix: `/* eslint-disable */
-/* tslint:disable */
-/*
- * ---------------------------------------------------------------
- * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
- * ##                                                           ##
- * ## AUTHOR: acacode                                           ##
- * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
- * ---------------------------------------------------------------
- */
-
-`,
-};
+module.exports = {
+  filePrefix: `/* eslint-disable */
+/* tslint:disable */
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+`,
+};

package/src/files.js

@@ -21,7 +21,11 @@ const pathIsDir = (path) => {
 
 const removeDir = (path) => {
   try {
-    fs.rmdirSync(path, { recursive: true });
+    if (typeof fs.rmSync === "function") {
+      fs.rmSync(path, { recursive: true });
+    } else {
+      fs.rmdirSync(path, { recursive: true });
+    }
   } catch (e) {}
 };
 
@@ -39,11 +43,7 @@ const cleanDir = (path) => {
 const pathIsExist = (path) => path && fs.existsSync(path);
 
 const createFile = ({ path, fileName, content, withPrefix }) =>
-  fs.writeFileSync(
-    resolve(__dirname, path, `./${fileName}`),
-    `${withPrefix ? filePrefix : ""}${content}`,
-    _.noop,
-  );
+  fs.writeFileSync(resolve(__dirname, path, `./${fileName}`), `${withPrefix ? filePrefix : ""}${content}`, _.noop);
 
 module.exports = {
   createFile,

package/src/formatFileContent.js

@@ -11,15 +11,13 @@ class LanguageServiceHost {
       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 "\n";
+    return "newLine" in ts.sys ? ts.sys.newLine : "\n";
   }
   getScriptFileNames() {
     return [this.fileName];
@@ -39,6 +37,16 @@ class LanguageServiceHost {
   getScriptSnapshot() {
     return ts.ScriptSnapshot.fromString(this.content);
   }
+  readFile(fileName, encoding) {
+    if (fileName === this.fileName) {
+      return this.content;
+    }
+
+    return ts.sys.readFile(fileName, encoding);
+  }
+  fileExists(path) {
+    return ts.sys.fileExists(path);
+  }
 }
 
 const removeUnusedImports = (content) => {
@@ -70,5 +78,4 @@ const prettierFormat = (content) => {
 
 const formatters = [removeUnusedImports, prettierFormat];
 
-module.exports = (content) =>
-  formatters.reduce((fixedContent, formatter) => formatter(fixedContent), content);
+module.exports = (content) => formatters.reduce((fixedContent, formatter) => formatter(fixedContent), content);