Initial work and unit test.

Author: tjprescott

src/definitions.ts

@@ -120,6 +120,7 @@ export class DefinitionRegistry {
     this.currentPath = [];
     this.client = client;
     this.#gatherDefinitions(map);
+    this.#expandInheritanceChains();
     this.#expandReferences();
   }
 
@@ -302,6 +303,7 @@ export class DefinitionRegistry {
     this.referenceStack = [];
     for (const [filepath, values] of collection.data.entries()) {
       for (const [key, value] of values.entries()) {
+        console.log(key);
         this.currentPath.push(key);
         let expanded = this.#expand(value, key, filepath);
         collection.data.get(filepath)!.set(key, expanded);
@@ -417,9 +419,12 @@ export class DefinitionRegistry {
         this.data.securityDefinitions.add(path, name, data);
       }
     }
+  }
+
+  #expandInheritanceChains() {
     // ensure each base class has a list of derived classes for use
     // when interpretting allOf.
-    for (const [ref, set] of this.polymorphicMap.entries()) {
+    for (const [ref, derived_set] of this.polymorphicMap.entries()) {
       const refResult = parseReference(ref);
       if (!refResult) {
         throw new Error(`Could not parse reference: ${ref}`);
@@ -429,7 +434,17 @@ export class DefinitionRegistry {
         this.logUnresolvedReference(ref);
         continue;
       }
-      baseClass["$derivedClasses"] = Array.from(set);
+      // check if refKey also has derived classes and combine them
+      for (const derived of derived_set) {
+        const derivedRef = parseReference(derived)!.expandedRef;
+        const match = this.polymorphicMap.get(derivedRef);
+        if (match !== undefined) {
+          for (const item of match) {
+            derived_set.add(item);
+          }
+        }
+      }
+      baseClass["$derivedClasses"] = Array.from(derived_set);
     }
   }
 

test/definition-registry.test.ts

@@ -158,3 +158,24 @@ it("should ignore example references", async () => {
     expect(ref.includes("examples")).toBe(false);
   }
 });
+
+it("expands inheritance chains", async () => {
+  const config: DiffClientConfig = {
+    lhs: ["test/files/inheritanceChain.json"],
+    rhs: ["test/files/inheritanceChain.json"],
+    args: {},
+    rules: getApplicableRules({}),
+  };
+  const client = await TestableDiffClient.create(config);
+  client.parse();
+  const [parser, _] = client.getParsers();
+  const defRegistry = getDefinitionRegistry(parser).getCollection(
+    RegistryKind.Definition
+  );
+  let filePath = Object.keys(defRegistry)[0];
+  let quad = defRegistry[filePath].get("Quadrilateral");
+  let expected_properties = ["length", "width", "sides", "name"];
+  for (const prop of expected_properties) {
+    expect(quad.properties).toHaveProperty(prop);
+  }
+});

test/files/inheritanceChain.json

@@ -0,0 +1,63 @@
+{
+  "swagger": "2.0",
+  "info": {
+    "title": "(title)",
+    "version": "0000-00-00",
+    "x-typespec-generated": [
+      {
+        "emitter": "@azure-tools/typespec-autorest"
+      }
+    ]
+  },
+  "schemes": ["https"],
+  "produces": ["application/json"],
+  "consumes": ["application/json"],
+  "tags": [],
+  "paths": {},
+  "definitions": {
+    "Polygon": {
+      "type": "object",
+      "properties": {
+        "sides": {
+          "type": "integer",
+          "format": "int16"
+        }
+      },
+      "required": ["sides"],
+      "allOf": [
+        {
+          "$ref": "#/definitions/Shape"
+        }
+      ]
+    },
+    "Quadrilateral": {
+      "type": "object",
+      "properties": {
+        "length": {
+          "type": "integer",
+          "format": "int16"
+        },
+        "width": {
+          "type": "integer",
+          "format": "int16"
+        }
+      },
+      "required": ["length", "width"],
+      "allOf": [
+        {
+          "$ref": "#/definitions/Polygon"
+        }
+      ]
+    },
+    "Shape": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        }
+      },
+      "required": ["name"]
+    }
+  },
+  "parameters": {}
+}