@api-client/core 0.18.10 → 0.18.11

package/data/models/example-generator-api.json

@@ -42071,10 +42071,10 @@
 "@id": "#197"
 },
 {
-"@id": "#200"
+"@id": "#203"
 },
 {
-"@id": "#203"
+"@id": "#200"
 },
 {
 "@id": "#206"
@@ -42810,16 +42810,16 @@
 "@id": "#219"
 },
 {
-"@id": "#210"
+"@id": "#216"
 },
 {
-"@id": "#213"
+"@id": "#219"
 },
 {
-"@id": "#216"
+"@id": "#210"
 },
 {
-"@id": "#219"
+"@id": "#213"
 }
 ],
 "doc:root": false,
@@ -43499,7 +43499,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
+"doc:raw": "code: 'J'\ndescription: 'Information and communication'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43520,7 +43520,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: 'J'\ndescription: 'Information and communication'\n",
+"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44232,7 +44232,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '22'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)22 000000'\n",
+"doc:raw": "-\n  type: 'GENERAL'\n  value: 'info@company.be'\n-\n  type: 'IT_DEPT'\n  value: 'it-service@company.be'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44253,7 +44253,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
+"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44274,7 +44274,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "-\n  type: 'GENERAL'\n  value: 'info@company.be'\n-\n  type: 'IT_DEPT'\n  value: 'it-service@company.be'\n",
+"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '22'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)22 000000'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44295,7 +44295,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\n",
+"doc:raw": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44771,12 +44771,12 @@
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#205",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#208/source-map/lexical/element_0",
@@ -45116,22 +45116,22 @@
 {
 "@id": "#212/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#212",
-"sourcemaps:value": "[(1,0)-(6,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#215/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#215",
-"sourcemaps:value": "[(1,0)-(6,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#218/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#218",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#221/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#221",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#338/source-map/synthesized-field/element_1",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.18.10",
+  "version": "0.18.11",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/DomainSerialization.ts

@@ -272,19 +272,25 @@ export function deserialize(root: DataDomain, json?: SerializedGraph, dependenci
     return g
   }
   if (Array.isArray(json.nodes)) {
+    // 1st pass - set up nodes
+    const parentInfo = new Map<string, string[]>()
     for (const entry of json.nodes) {
       g.setNode(entry.v, prepareNode(root, entry.value, json.edges))
       if (entry.parents) {
-        for (const parent of entry.parents) {
-          // In data domain graph, all nodes that can have parents can only have a single parent.
-          // It's the business logic of the library.
-          // Parent-child relationships:
-          // - Namespace -> Namespace
-          // - Namespace -> Model
-          // - Model -> Entity
-          // Entities and Association are associated with the parent entity through edges.
-          g.setParent(entry.v, parent)
-        }
+        parentInfo.set(entry.v, entry.parents)
+      }
+    }
+    // 2nd pass - set up parents
+    for (const [key, parents] of parentInfo) {
+      // In data domain graph, all nodes that can have parents can only have a single parent.
+      // It's the business logic of the library.
+      // Parent-child relationships:
+      // - Namespace -> Namespace
+      // - Namespace -> Model
+      // - Model -> Entity
+      // Entities and Association are associated with the parent entity through edges.
+      for (const parent of parents) {
+        g.setParent(key, parent)
       }
     }
   }

package/tests/unit/modeling/data_domain_serialization.spec.ts

@@ -291,4 +291,104 @@ test.group('DataDomain Serialization and Deserialization', () => {
     assert.isTrue(restored.graph.hasEdge(e1.key, a1.key), 'has edge from e1 to a1')
     assert.isFalse(restored.graph.hasEdge(a1.key, `${fd.key}:${fe1.key}`), 'has no edge from a1 to fe1')
   }).tags(['@modeling', '@serialization'])
+
+  test('should serialize and deserialize parent-child relationships in the graph', ({ assert }) => {
+    const domain = new DataDomain()
+
+    // Create hierarchical structure: root > ns1 > ns2 > m1 > e1, e2 (e2 inherits from e1)
+    const ns1 = domain.addNamespace({ key: 'ns1' })
+    const ns2 = ns1.addNamespace({ key: 'ns2' })
+    const m1 = ns2.addModel({ key: 'm1' })
+    const m2 = domain.addModel({ key: 'm2' }) // root level model
+    const e1 = m1.addEntity({ key: 'e1' })
+    const e2 = m1.addEntity({ key: 'e2' })
+    const e3 = m2.addEntity({ key: 'e3' })
+
+    // Add entity inheritance relationships
+    e2.addParent(e1.key) // e2 inherits from e1
+    e3.addParent(e2.key) // e3 inherits from e2 (multi-level inheritance)
+
+    // Add properties and associations
+    const p1 = e1.addProperty({ type: 'string', key: 'p1' })
+    const p2 = e2.addProperty({ type: 'number', key: 'p2' })
+    const a1 = e1.addAssociation({ key: e3.key }, { key: 'a1' })
+
+    const serialized = domain.toJSON()
+    const restored = new DataDomain(serialized)
+
+    // Verify basic domain properties
+    assert.equal(restored.key, domain.key)
+    assert.equal(restored.kind, domain.kind)
+    assert.deepEqual(restored.info.toJSON(), domain.info.toJSON())
+
+    // Verify all nodes are restored
+    assert.equal([...restored.graph.nodes()].length, 10) // 2 ns + 2 models + 3 entities + 2 properties + 1 association
+
+    // Verify namespace hierarchy: ns1 (root) -> ns2 (child of ns1)
+    const rns1 = restored.findNamespace(ns1.key)
+    const rns2 = restored.findNamespace(ns2.key)
+    assert.isDefined(rns1)
+    assert.isDefined(rns2)
+    assert.isUndefined(restored.graph.parent(ns1.key), 'ns1 should be at root level')
+    assert.equal(restored.graph.parent(ns2.key), ns1.key, 'ns2 should be child of ns1')
+
+    // Verify model hierarchy: m1 (child of ns2), m2 (root level)
+    const rm1 = restored.findModel(m1.key)
+    const rm2 = restored.findModel(m2.key)
+    assert.isDefined(rm1)
+    assert.isDefined(rm2)
+    assert.equal(restored.graph.parent(m1.key), ns2.key, 'm1 should be child of ns2')
+    assert.isUndefined(restored.graph.parent(m2.key), 'm2 should be at root level')
+
+    // Verify entity hierarchy: e1, e2 (children of m1), e3 (child of m2)
+    const re1 = restored.findEntity(e1.key)
+    const re2 = restored.findEntity(e2.key)
+    const re3 = restored.findEntity(e3.key)
+    assert.isDefined(re1)
+    assert.isDefined(re2)
+    assert.isDefined(re3)
+    assert.equal(restored.graph.parent(e1.key), m1.key, 'e1 should be child of m1')
+    assert.equal(restored.graph.parent(e2.key), m1.key, 'e2 should be child of m1')
+    assert.equal(restored.graph.parent(e3.key), m2.key, 'e3 should be child of m2')
+
+    // Verify entity inheritance relationships (via edges, not parent-child)
+    assert.isTrue(restored.graph.hasEdge(e2.key, e1.key), 'e2 should inherit from e1')
+    assert.equal(restored.graph.edge(e2.key, e1.key)?.type, 'parent', 'inheritance edge should have type parent')
+    assert.isTrue(restored.graph.hasEdge(e3.key, e2.key), 'e3 should inherit from e2')
+    assert.equal(restored.graph.edge(e3.key, e2.key)?.type, 'parent', 'inheritance edge should have type parent')
+
+    // Verify entity inheritance works functionally
+    const restoredParentsE2 = [...re2!.listParents()]
+    const restoredParentsE3 = [...re3!.listParents()]
+    assert.equal(restoredParentsE2.length, 1, 'e2 should have 1 parent')
+    assert.equal(restoredParentsE2[0].key, e1.key, 'e2 parent should be e1')
+    assert.equal(restoredParentsE3.length, 1, 'e3 should have 1 parent')
+    assert.equal(restoredParentsE3[0].key, e2.key, 'e3 parent should be e2')
+
+    // Verify property hierarchy: p1 (child of e1), p2 (child of e2)
+    const rp1 = restored.findProperty(p1.key)
+    const rp2 = restored.findProperty(p2.key)
+    assert.isDefined(rp1)
+    assert.isDefined(rp2)
+    assert.isTrue(restored.graph.hasEdge(e1.key, p1.key), 'e1 should have edge to p1')
+    assert.equal(restored.graph.edge(e1.key, p1.key)?.type, 'property', 'property edge should have type property')
+    assert.isTrue(restored.graph.hasEdge(e2.key, p2.key), 'e2 should have edge to p2')
+    assert.equal(restored.graph.edge(e2.key, p2.key)?.type, 'property', 'property edge should have type property')
+
+    // Verify association hierarchy: a1 (child of e1) -> e3
+    const ra1 = restored.findAssociation(a1.key)
+    assert.isDefined(ra1)
+    assert.isTrue(restored.graph.hasEdge(e1.key, a1.key), 'e1 should have edge to a1')
+    assert.equal(
+      restored.graph.edge(e1.key, a1.key)?.type,
+      'association',
+      'association edge should have type association'
+    )
+    assert.isTrue(restored.graph.hasEdge(a1.key, e3.key), 'a1 should have edge to e3')
+    assert.equal(
+      restored.graph.edge(a1.key, e3.key)?.type,
+      'association',
+      'association target edge should have type association'
+    )
+  }).tags(['@modeling', '@serialization'])
 })