Release 3.1.1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # next release  
 
+# 3.1.1  
+
+Fixes:  
+- `name.includes is not a function` (issue #98)  
 
 # 3.1.0  
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-typescript-api",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "description": "Create typescript api module from swagger schema",
   "scripts": {
     "cli:json": "node index.js -r -d -p ./swagger-test-cli.json -n swagger-test-cli.ts",

src/modelNames.js

@@ -5,6 +5,12 @@ const isValidName = (name) => /^([A-Za-z$_]{1,})$/g.test(name);
 const formattedModelNamesMap = new Map();
 
 const checkAndRenameModelName = (name) => {
+  if (typeof name !== "string") {
+    console.warn("🔨 wrong name of the model name", name);
+
+    return name;
+  }
+
   if (formattedModelNamesMap.has(name)) {
     return formattedModelNamesMap.get(name);
   }

src/schema.js

@@ -32,9 +32,29 @@ const jsPrimitiveTypes = _.uniq(["number", "string", "boolean"]);
 const jsEmptyTypes = _.uniq(["null", "undefined"]);
 const formDataTypes = _.uniq([types.file, types.string.binary]);
 
+const stealTypeFromSchema = (rawSchema) => {
+  const schema = rawSchema || {};
+
+  if (schema.type) {
+    return schema.type;
+  }
+  if (schema.enum) {
+    const enumFieldType = typeof schema.enum[0];
+    if (enumFieldType === "undefined") return;
+
+    return enumFieldType;
+  }
+  if (_.keys(schema.properties).length) {
+    return "object";
+  }
+  if (!!schema.items) {
+    return "array";
+  }
+};
+
 const getTypeAlias = (rawSchema) => {
   const schema = rawSchema || {};
-  const type = toInternalCase(schema.type);
+  const type = toInternalCase(stealTypeFromSchema(schema));
   const format = toInternalCase(schema.format);
   const typeAlias = _.get(types, [type, format]) || _.get(types, [type, "$default"]) || types[type];
 

tests/generated/v2.0/another-example.ts

@@ -63,6 +63,8 @@ export enum PetNames {
 
 export type PetIds = 10 | 20 | 30 | 40;
 
+export type PetIdsWithWrongEnum = 10 | 20 | 30 | 40;
+
 /**
  * A pet for sale in the pet store
  */

tests/schemas/v2.0/another-example.json

@@ -887,6 +887,9 @@
       "type": "integer",
       "enum": [10, 20, 30, 40]
     },
+    "PetIdsWithWrongEnum": {
+      "enum": [10, 20, 30, 40]
+    },
     "Pet": {
       "type": "object",
       "required": ["name", "photoUrls"],