Fix circular reference related bug.

Author: LesterLyu

src/graphDBModel.js

@@ -28,7 +28,7 @@ class GraphDBModel {
    */
   internalKey2Option;
   /**
-   * @type {Map<string, GraphDBModel>}
+   * @type {Uri2ModelMap}
    */
   nestedType2Model;
   /**

src/graphDBSchema.ts

@@ -68,7 +68,7 @@ export function createGraphDBModel(schema: GraphDBSchema, schemaOptions: SchemaO
     const internalKey2Option = new Map();
 
     // nested model information
-    const nestedType2Model = new Map();
+    const nestedType2Model = new Uri2ModelMap();
 
     for (let [key, options] of Object.entries(schema)) {
       // Map to our data structure with some predefined options
@@ -103,9 +103,6 @@ export function createGraphDBModel(schema: GraphDBSchema, schemaOptions: SchemaO
           else
             nestedType2Model.set(SPARQL.getFullURI(nestedRdfType), nestedModel);
         }
-        for (const [innerKey, innerVal] of nestedModel.nestedType2Model?.entries() || []) {
-          nestedType2Model.set(innerKey, innerVal);
-        }
 
       }
     }
@@ -131,4 +128,39 @@ function getGraphDBModel(name: string) {
   return store[`:${name}`];
 }
 
+class Uri2ModelMap {
+  private map = new Map<string, GraphDBModel>();
+
+  /**
+   * Recursively find the model by URI.
+   */
+  public get(uri: string, iterated = new Set()) {
+    if (iterated.has(this)) {
+      return;
+    }
+    iterated.add(this);
+
+    if (this.map.has(uri)) {
+      return this.map.get(uri);
+    } else {
+      return this._getFromNestedModels(uri, iterated);
+    }
+  }
+
+  public set(uri: string, model: GraphDBModel) {
+    this.map.set(uri, model);
+  }
+
+  private _getFromNestedModels(uri: string, iterated = new Set()) {
+    for (const nestedModel of this.map.values()) {
+      const nestedResult = nestedModel.nestedType2Model.get(uri, iterated);
+      if (nestedResult) {
+        return nestedResult;
+      }
+    }
+    return undefined;
+  }
+}
+
+
 module.exports = {Types, DeleteType, regexBuilder, createGraphDBModel, getGraphDBModel}

tests/index.ts

@@ -29,6 +29,7 @@ describe("GraphDB", function () {
         'foaf': 'http://xmlns.com/foaf/0.1/',
         'cwrc': 'http://sparql.cwrc.ca/ontologies/cwrc#',
         'tove_org': 'http://ontology.eil.utoronto.ca/tove/organization#',
+        'iso21972': 'http://ontology.eil.utoronto.ca/ISO21972/iso21972#',
       };
 
       const result = await initGraphDB({

tests/populateIssue.ts

@@ -66,6 +66,7 @@ export function PopulateIssue(repository: any) {
             await indicator1.save();
             outcome.indicators = [indicator1];
             await outcome.save();
+            await GDBOrganizationModel.find({});
             const outcomes = await GDBOutcomeModel.find({_uri: outcome._uri}, {populates: ['indicators.unitOfMeasure']})
             expect(await GDBOutcomeModel.find({}, {populates: ['indicators']}));
             const result = await GDBOutcomeModel.find({});