fix: #157 allOf w/ properties (#158)

* Reconcile a schema with properties & allOf

* Additional vscode setting to avoid trimming white space in test snapshots.

* Remove not needed import

* Make sure required taken into account.

Author: macyabbey-okta

.vscode/settings.json

@@ -1,3 +1,5 @@
 {
-  "typescript.tsdk": "node_modules\\typescript\\lib"
+  "typescript.tsdk": "node_modules\\typescript\\lib",
+  "editor.trimAutoWhitespace": false,
+  "files.trimTrailingWhitespace": false
 }

plugins/typescript/src/core/schemaToTypeAliasDeclaration.test.ts

@@ -621,6 +621,74 @@ describe("schemaToTypeAliasDeclaration", () => {
   });
 
   describe("allOf", () => {
+    it("should combine properties and allOf", () => {
+      const schema: SchemaObject = {
+        allOf: [
+          { type: "object", properties: { foo: { type: "string" } } },
+          { type: "object", properties: { bar: { type: "number" } } },
+        ],
+        properties: {
+          foobar: {type: "string"}
+        },
+        required: ['foo', 'foobar']
+      };
+
+      expect(printSchema(schema)).toMatchInlineSnapshot(`
+      "export type Test = {
+          foo: string;
+          bar?: number;
+          foobar: string;
+      };"
+    `);
+    });
+    
+    it("should combine additionalProperties and allOf", () => {
+      const schema: SchemaObject = {
+        allOf: [
+          { type: "object", properties: { foo: { type: "string" } } },
+          { type: "object", properties: { bar: { type: "number" } } },
+        ],
+        additionalProperties: {
+          type: "string"
+        }
+      };
+
+      expect(printSchema(schema)).toMatchInlineSnapshot(`
+      "export type Test = {
+          foo?: string;
+          bar?: number;
+      } & {
+          [key: string]: string;
+      };"
+    `);
+    });
+    
+    it("should combine properties & additionalProperties & allOf", () => {
+      const schema: SchemaObject = {
+        allOf: [
+          { type: "object", properties: { foo: { type: "string" } } },
+          { type: "object", properties: { bar: { type: "number" } } },
+        ],
+        additionalProperties: {
+          type: "string"
+        },
+        properties: {
+          foobar: {type: "string"}
+        },
+        required: ['bar', 'foobar']
+      };
+
+      expect(printSchema(schema)).toMatchInlineSnapshot(`
+      "export type Test = {
+          foo?: string;
+          bar: number;
+          foobar: string;
+      } & {
+          [key: string]: string;
+      };"
+    `);
+    });
+
     it("should combine inline types", () => {
       const schema: SchemaObject = {
         allOf: [

plugins/typescript/src/core/schemaToTypeAliasDeclaration.ts

@@ -128,7 +128,24 @@ export const getType = (
   }
 
   if (schema.allOf) {
-    return getAllOf(schema.allOf, context);
+    const adHocSchemas: Array<SchemaObject> = [];
+    if (schema.properties) {
+      adHocSchemas.push({
+        type: 'object',
+        properties: schema.properties,
+        required: schema.required
+      });
+    }
+    if (schema.additionalProperties) {
+      adHocSchemas.push({
+        type: 'object',
+        additionalProperties: schema.additionalProperties
+      });
+    }
+    return getAllOf([
+      ...schema.allOf,
+      ...adHocSchemas
+     ], context);
   }
 
   if (schema.enum) {