Merge pull request #53 from acacode/next

Release 1.8.3

Author: js2me

.vscode/launch.json

@@ -14,13 +14,22 @@
       "port": 9229
     },
     {
-      "name": "Debug CLI",
+      "name": "Debug JSON CLI",
       "type": "node",
       "request": "launch",
       "cwd": "${workspaceFolder}",
       "runtimeExecutable": "npm",
-      "runtimeArgs": ["run-script", "cli:debug"],
+      "runtimeArgs": ["run-script", "cli:debug:json"],
+      "port": 9229
+    },
+    {
+      "name": "Debug YAML CLI",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceFolder}",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run-script", "cli:debug:yaml"],
       "port": 9229
     }
   ]
-}
+}

CHANGELOG.md

@@ -1,5 +1,32 @@
 # next release  
 
+# 1.8.3  
+
+Fixes:  
+- Generating invalid code in composed schema contexts ([#51 issue](https://github.com/acacode/swagger-typescript-api/issues/51)) 
+  ```yaml
+  components:
+  schemas:
+    Test:
+      type: object
+      allOf:
+        - type: object
+          properties:
+            x:
+              type: array
+              items:
+                type: string
+                enum:
+                  - A-B
+        - type: object
+          properties:
+            y:
+              type: string
+  ```
+  ```ts
+  export type Test = XAB & { y?: string };
+  ```
+
 # 1.8.2  
 
 Fixes:  

package-lock.json

@@ -1,10 +1,12 @@
 {
   "name": "swagger-typescript-api",
-  "version": "1.8.2",
+  "version": "1.8.3",
   "description": "Create typescript api module from swagger schema",
   "scripts": {
-    "cli": "node index.js -r -d -p http://localhost:8080/api/v1/swagger.json -n swagger-test-cli.ts",
-    "cli:debug": "node  --nolazy --inspect-brk=9229 index.js -p ./swagger-test-cli.json -n swagger-test-cli.ts",
+    "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",
+    "cli:debug:json": "node  --nolazy --inspect-brk=9229 index.js -p ./swagger-test-cli.json -n swagger-test-cli.ts",
+    "cli:debug:yaml": "node  --nolazy --inspect-brk=9229 index.js -p ./swagger-test-cli.yaml -n swagger-test-cli.ts",
     "cli:help": "node index.js -h",
     "test:all": "npm-run-all generate validate test:routeTypes test:noClient test:defaultAsSuccess test:responses --continue-on-error",
     "generate": "node tests/generate.js",

package.json

@@ -132,11 +132,20 @@ const getComplexType = (schema) => {
   throw new Error("Uknown complex type");
 };
 
+const attachParsedRef = (originalSchema, parsedSchema) => {
+  if (originalSchema) {
+    originalSchema.$parsed = parsedSchema;
+  }
+
+  return parsedSchema;
+};
+
 const schemaParsers = {
   enum: (schema, typeName) => {
     const type = getType(schema);
     const isIntegerEnum = type === types.number;
-    return {
+
+    return attachParsedRef(schema, {
       $parsedSchema: true,
       schemaType: "enum",
       type: isIntegerEnum ? "intEnum" : "enum",
@@ -148,7 +157,7 @@ const schemaParsers = {
         type,
         value: isIntegerEnum ? `${key}` : `"${key}"`,
       })),
-    };
+    });
   },
   object: (schema, typeName) => {
     if (_.isArray(schema.required) && schema.properties) {
@@ -162,7 +171,7 @@ const schemaParsers = {
     const properties = _.get(schema, "properties");
     const typeContent = getObjectTypeContent(properties);
 
-    return {
+    return attachParsedRef(schema, {
       $parsedSchema: true,
       schemaType: "object",
       type: "object",
@@ -171,20 +180,20 @@ const schemaParsers = {
       description: formatDescription(schema.description),
       allFieldsAreOptional: !_.some(_.values(typeContent), (part) => part.isRequired),
       content: typeContent,
-    };
+    });
   },
   complex: (schema, typeName) => {
     const complexType = getComplexType(schema);
 
-    return {
+    return attachParsedRef(schema, {
       $parsedSchema: true,
       schemaType: "complex",
       type: "type",
       typeIdentifier: "type",
       name: typeName,
       description: formatDescription(schema.description),
       content: complexSchemaParsers[complexType](schema),
-    };
+    });
   },
   primitive: (schema, typeName) => {
     let contentType = null;
@@ -195,7 +204,7 @@ const schemaParsers = {
       contentType = `Record<string, ${fieldType}>`;
     }
 
-    return {
+    return attachParsedRef(schema, {
       $parsedSchema: true,
       schemaType: "primitive",
       type: "primitive",
@@ -204,7 +213,7 @@ const schemaParsers = {
       description: formatDescription(description),
       // TODO: probably it should be refactored. `type === 'null'` is not flexible
       content: type === "null" ? type : contentType || getType(schema),
-    };
+    });
   },
 };
 
@@ -227,9 +236,9 @@ const parseSchema = (rawSchema, typeName, formattersMap) => {
     return rawSchema;
   }
 
-  if (rawSchema.$parsedSchema) {
-    schemaType = rawSchema.schemaType;
-    parsedSchema = rawSchema;
+  if (rawSchema.$parsed) {
+    schemaType = rawSchema.$parsed.schemaType;
+    parsedSchema = rawSchema.$parsed;
   } else {
     const fixedRawSchema = checkAndFixSchema(rawSchema);
     schemaType = getInternalSchemaType(fixedRawSchema);

src/schema.js

@@ -28,13 +28,13 @@ const formatters = {
       return `${commonText}${result}`;
     }).join(""),
   type: (content) => {
-    if (content.includes(" & ")) {
-      return content.split(" & ").map(checkAndRenameModelName).join(" & ");
-    }
+    // const separators = [" & ", " | "];
 
-    if (content.includes(" | ")) {
-      return content.split(" | ").map(checkAndRenameModelName).join(" | ");
-    }
+    // for (const separator of separators) {
+    //   if (content.includes(separator)) {
+    //     return content.split(separator).map(checkAndRenameModelName).join(separator);
+    //   }
+    // }
 
     return content;
   },