@api-client/core 0.14.7 → 0.14.8

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

@@ -42062,13 +42062,10 @@
 "@id": "#209"
 },
 {
-"@id": "#191"
-},
-{
 "@id": "#194"
 },
 {
-"@id": "#203"
+"@id": "#191"
 },
 {
 "@id": "#197"
@@ -42077,6 +42074,9 @@
 "@id": "#200"
 },
 {
+"@id": "#203"
+},
+{
 "@id": "#206"
 },
 {
@@ -42810,16 +42810,16 @@
 "@id": "#219"
 },
 {
-"@id": "#210"
+"@id": "#219"
 },
 {
-"@id": "#213"
+"@id": "#210"
 },
 {
 "@id": "#216"
 },
 {
-"@id": "#219"
+"@id": "#213"
 }
 ],
 "doc:root": false,
@@ -43436,7 +43436,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
+"doc:raw": "addressType: 'REGISTERED-OFFICE-ADDRESS'\nstreetName: 'UITBREIDINGSTRAAT'\nhouseNumber: '84'\nhouseNumberAddition: '/1'\npostalCode: '2600'\ncity: 'BERCHEM (ANTWERPEN)'\ncountry: 'Belgium'\ncountryCode: 'BE'\nfullFormatedAddress: \"UITBREIDINGSTRAAT 84 /1, 2600 BERCHEM (ANTWERPEN), BELIUM\"\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43457,7 +43457,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "addressType: 'REGISTERED-OFFICE-ADDRESS'\nstreetName: 'UITBREIDINGSTRAAT'\nhouseNumber: '84'\nhouseNumberAddition: '/1'\npostalCode: '2600'\ncity: 'BERCHEM (ANTWERPEN)'\ncountry: 'Belgium'\ncountryCode: 'BE'\nfullFormatedAddress: \"UITBREIDINGSTRAAT 84 /1, 2600 BERCHEM (ANTWERPEN), BELIUM\"\n",
+"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43478,7 +43478,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
+"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43499,7 +43499,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": [
 {
@@ -43520,7 +43520,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
+"doc:raw": "code: 'J'\ndescription: 'Information and communication'\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": "type: 'GENERAL'\ncountryDialCode : '+32'\nareaCode : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\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": [
 {
@@ -44295,7 +44295,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: \"GENERAL\"\nvalue: \"www.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": [
 {
@@ -44756,22 +44756,22 @@
 {
 "@id": "#193/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#193",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(10,0)]"
 },
 {
 "@id": "#196/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#196",
-"sourcemaps:value": "[(1,0)-(10,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#199/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#199",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
@@ -45121,7 +45121,7 @@
 {
 "@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",
@@ -45131,7 +45131,7 @@
 {
 "@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.14.7",
+  "version": "0.14.8",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/DataDomain.ts

@@ -431,10 +431,41 @@ export class DataDomain extends DependentModel {
     }
   }
 
+  /**
+   * Builds a reference key for a domain object.
+   *
+   * If the namespace is provided and it is different from the domain key,
+   * it will return the key in the format `namespace:key`. The foreign namespace
+   * must be registered in the domain's dependencies otherwise an error will be thrown.
+   *
+   * @param key The key of the namespace or model.
+   * @param namespace The namespace to search in. When different from the domain key, it looks for a foreign namespace.
+   * @returns The reference key in the format `namespace:key` or just `key` if no namespace is provided.
+   * @throws Error When the foreign domain is not found.
+   * @example
+   * ```typescript
+   * const refKey = dataDomain.buildReferenceKey('userModel', 'domainKey');
+   * ```
+   */
+  buildReferenceKey(key: string, namespace?: string): string {
+    if (namespace && namespace !== this.key) {
+      if (typeof namespace !== 'string' || namespace.length === 0) {
+        throw new Error(`Invalid namespace key. Expected a string, got ${typeof namespace}`)
+      }
+      const foreignDomain = this.dependencies.get(namespace)
+      if (!foreignDomain) {
+        throw new Error(`Foreign domain ${namespace} not found`)
+      }
+      return `${namespace}:${key}`
+    }
+    return key
+  }
+
   /**
    * Finds a namespace by its key.
    *
    * @param key The key of the namespace to find.
+   * @param namespace The namespace to search in. When different from the domain key, it looks for a foreign namespace.
    * @returns The namespace instance or undefined if not
    *   found.
    * @example
@@ -445,8 +476,8 @@ export class DataDomain extends DependentModel {
    * }
    * ```
    */
-  findNamespace(key: string): DomainNamespace | undefined {
-    const result = this.graph.node(key) as DomainNamespace | undefined
+  findNamespace(key: string, namespace?: string): DomainNamespace | undefined {
+    const result = this.graph.node(this.buildReferenceKey(key, namespace)) as DomainNamespace | undefined
     if (result && result.kind === DomainNamespaceKind) {
       return result
     }
@@ -689,6 +720,7 @@ export class DataDomain extends DependentModel {
    * Finds a data model by its key.
    *
    * @param key The key of the data model to find.
+   * @param namespace The namespace to search in. When different from the domain key, it looks for a foreign entity.
    * @returns The data model instance or undefined if not
    *   found.
    * @example
@@ -699,8 +731,8 @@ export class DataDomain extends DependentModel {
    * }
    * ```
    */
-  findModel(key: string): DomainModel | undefined {
-    const value = this.graph.node(key) as DomainModel | undefined
+  findModel(key: string, namespace?: string): DomainModel | undefined {
+    const value = this.graph.node(this.buildReferenceKey(key, namespace)) as DomainModel | undefined
     if (value && value.kind === DomainModelKind) {
       return value
     }
@@ -877,6 +909,7 @@ export class DataDomain extends DependentModel {
    * Finds an entity by its key.
    *
    * @param key The key of the entity to find.
+   * @param namespace The namespace to search in. When different from the domain key, it looks for a foreign entity.
    * @returns The entity instance or undefined if not found.
    * @example
    * ```typescript
@@ -886,8 +919,8 @@ export class DataDomain extends DependentModel {
    * }
    * ```
    */
-  findEntity(key: string): DomainEntity | undefined {
-    const node = this.graph.node(key) as DomainEntity | undefined
+  findEntity(key: string, namespace?: string): DomainEntity | undefined {
+    const node = this.graph.node(this.buildReferenceKey(key, namespace)) as DomainEntity | undefined
     if (node && node.kind === DomainEntityKind) {
       return node
     }
@@ -1005,6 +1038,7 @@ export class DataDomain extends DependentModel {
    * Finds an association by its key.
    *
    * @param key The key of the association to find.
+   * @param namespace The namespace to search in. When different from the domain key, it looks for a foreign association
    * @returns The association instance or undefined if not
    *   found.
    * @example
@@ -1015,8 +1049,8 @@ export class DataDomain extends DependentModel {
    * }
    * ```
    */
-  findAssociation(key: string): DomainAssociation | undefined {
-    const node = this.graph.node(key) as DomainAssociation | undefined
+  findAssociation(key: string, namespace?: string): DomainAssociation | undefined {
+    const node = this.graph.node(this.buildReferenceKey(key, namespace)) as DomainAssociation | undefined
     if (node && node.kind === DomainAssociationKind) {
       return node
     }
@@ -1090,6 +1124,7 @@ export class DataDomain extends DependentModel {
    * Finds a property by its key.
    *
    * @param key The key of the property to find.
+   * @param namespace The namespace to search in. When different from the domain key, it looks for a foreign property
    * @returns The property instance or undefined if not
    *   found.
    * @example
@@ -1100,8 +1135,8 @@ export class DataDomain extends DependentModel {
    * }
    * ```
    */
-  findProperty(key: string): DomainProperty | undefined {
-    const node = this.graph.node(key) as DomainProperty | undefined
+  findProperty(key: string, namespace?: string): DomainProperty | undefined {
+    const node = this.graph.node(this.buildReferenceKey(key, namespace)) as DomainProperty | undefined
     if (node && node.kind === DomainPropertyKind) {
       return node
     }
@@ -1175,6 +1210,8 @@ export class DataDomain extends DependentModel {
    *   console.log(foreignUser.key);
    * }
    * ```
+   * @deprecated Use `findEntity` with the `namespace` parameter instead.
+   * This method is kept for backward compatibility but will be removed in the future.
    */
   findForeignEntity(entityKey: string, domainKey: string): DomainEntity | undefined {
     const foreignDomain = this.dependencies.get(domainKey)

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

@@ -142,7 +142,66 @@ test.group('DataDomain.registerForeignDomain()', () => {
   })
 })
 
-test.group('DataDomain.findForeignEntity()', () => {
+test.group('DataDomain.findNamespace()', () => {
+  test('finds a foreign namespace by its key and domain key', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    const ns = fd.addNamespace({ key: 'test-namespace' })
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findNamespace('test-namespace', fd.key)
+    assert.deepEqual(result, ns)
+  })
+
+  test('returns undefined when namespace not found', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findNamespace('other-namespace', fd.key)
+    assert.isUndefined(result)
+  })
+
+  test("throws when namespace's namespace not found", ({ assert }) => {
+    const domain = new DataDomain()
+    domain.addNamespace({ key: 'test-namespace' })
+    assert.throws(() => {
+      domain.findNamespace('test-namespace', 'non-existent-domain')
+    }, `Foreign domain non-existent-domain not found`)
+  })
+})
+
+test.group('DataDomain.findModel()', () => {
+  test('finds a foreign model by its key and domain key', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    const ns = fd.addNamespace({ key: 'test-namespace' })
+    const model = ns.addModel({ key: 'test-model' })
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findModel('test-model', fd.key)
+    assert.deepEqual(result, model)
+  })
+
+  test('returns undefined when model not found', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findModel('other-model', fd.key)
+    assert.isUndefined(result)
+  })
+
+  test("throws when model's namespace not found", ({ assert }) => {
+    const domain = new DataDomain()
+    domain.addNamespace({ key: 'test-namespace' })
+    assert.throws(() => {
+      domain.findModel('test-model', 'non-existent-domain')
+    }, `Foreign domain non-existent-domain not found`)
+  })
+})
+
+test.group('DataDomain.findEntity()', () => {
   test('finds a foreign entity by its key and domain key', ({ assert }) => {
     const dataDomain = new DataDomain()
     const foreignDomain = new DataDomain()
@@ -150,14 +209,16 @@ test.group('DataDomain.findForeignEntity()', () => {
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
-    const foundEntity = dataDomain.findForeignEntity('test-entity', foreignDomain.key)
+    const foundEntity = dataDomain.findEntity('test-entity', foreignDomain.key)
     assert.deepEqual(foundEntity, entity)
   })
 
-  test('returns undefined if the foreign domain does not exist', ({ assert }) => {
+  test('throws when the foreign domain does not exist', ({ assert }) => {
     const dataDomain = new DataDomain()
-    const foundEntity = dataDomain.findForeignEntity('test-entity', 'non-existent-domain')
-    assert.isUndefined(foundEntity)
+    assert.throws(
+      () => dataDomain.findEntity('test-entity', 'non-existent-domain'),
+      `Foreign domain non-existent-domain not found`
+    )
   })
 
   test('returns undefined if the entity does not exist in the foreign domain', ({ assert }) => {
@@ -165,7 +226,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
-    const foundEntity = dataDomain.findForeignEntity('non-existent-entity', foreignDomain.key)
+    const foundEntity = dataDomain.findEntity('non-existent-entity', foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -175,7 +236,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     const model = foreignDomain.addModel({ key: 'test-model' })
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
-    const foundEntity = dataDomain.findForeignEntity(model.key, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity(model.key, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -185,7 +246,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(undefined, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity(undefined, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -195,7 +256,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(null, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity(null, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -204,7 +265,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
-    const foundEntity = dataDomain.findForeignEntity('', foreignDomain.key)
+    const foundEntity = dataDomain.findEntity('', foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -214,7 +275,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(123, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity(123, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -224,7 +285,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(true, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity(true, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -234,7 +295,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity({}, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity({}, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -244,7 +305,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity([], foreignDomain.key)
+    const foundEntity = dataDomain.findEntity([], foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -254,7 +315,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     foreignDomain.info.version = '1.0.0'
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(() => {}, foreignDomain.key)
+    const foundEntity = dataDomain.findEntity(() => {}, foreignDomain.key)
     assert.isUndefined(foundEntity)
   })
 
@@ -265,8 +326,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, undefined)
+    const foundEntity = dataDomain.findEntity(entity.key, undefined)
     assert.isUndefined(foundEntity)
   })
 
@@ -278,7 +338,7 @@ test.group('DataDomain.findForeignEntity()', () => {
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
     // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, null)
+    const foundEntity = dataDomain.findEntity(entity.key, null)
     assert.isUndefined(foundEntity)
   })
 
@@ -289,67 +349,140 @@ test.group('DataDomain.findForeignEntity()', () => {
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    const foundEntity = dataDomain.findForeignEntity(entity.key, '')
+    const foundEntity = dataDomain.findEntity(entity.key, '')
     assert.isUndefined(foundEntity)
   })
 
-  test('returns undefined if domainKey is a number', ({ assert }) => {
+  test('throws when domainKey is a number', ({ assert }) => {
     const dataDomain = new DataDomain()
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, 123)
-    assert.isUndefined(foundEntity)
+    assert.throws(
+      // @ts-expect-error For testing purposes
+      () => dataDomain.findEntity(entity.key, 123),
+      `Invalid namespace key. Expected a string, got number`
+    )
   })
 
-  test('returns undefined if domainKey is a boolean', ({ assert }) => {
+  test('throws when domainKey is a boolean', ({ assert }) => {
     const dataDomain = new DataDomain()
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, true)
-    assert.isUndefined(foundEntity)
+    assert.throws(
+      // @ts-expect-error For testing purposes
+      () => dataDomain.findEntity(entity.key, true),
+      `Invalid namespace key. Expected a string, got boolean`
+    )
   })
 
-  test('returns undefined if domainKey is an object', ({ assert }) => {
+  test('throws when domainKey is an object', ({ assert }) => {
     const dataDomain = new DataDomain()
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, {})
-    assert.isUndefined(foundEntity)
+    assert.throws(
+      // @ts-expect-error For testing purposes
+      () => dataDomain.findEntity(entity.key, {}),
+      `Invalid namespace key. Expected a string, got object`
+    )
   })
 
-  test('returns undefined if domainKey is an array', ({ assert }) => {
+  test('throws when domainKey is an array', ({ assert }) => {
     const dataDomain = new DataDomain()
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, [])
-    assert.isUndefined(foundEntity)
+    assert.throws(
+      // @ts-expect-error For testing purposes
+      () => dataDomain.findEntity(entity.key, []),
+      `Invalid namespace key. Expected a string, got object`
+    )
   })
 
-  test('returns undefined if domainKey is a function', ({ assert }) => {
+  test('throws when domainKey is a function', ({ assert }) => {
     const dataDomain = new DataDomain()
     const foreignDomain = new DataDomain()
     foreignDomain.info.version = '1.0.0'
     const model = foreignDomain.addModel({ key: 'test-model' })
     const entity = foreignDomain.addEntity(model.key, { key: 'test-entity' })
     dataDomain.registerForeignDomain(foreignDomain)
-    // @ts-expect-error For testing purposes
-    const foundEntity = dataDomain.findForeignEntity(entity.key, () => {})
-    assert.isUndefined(foundEntity)
+    assert.throws(
+      // @ts-expect-error For testing purposes
+      () => dataDomain.findEntity(entity.key, () => {}),
+      `Invalid namespace key. Expected a string, got function`
+    )
+  })
+})
+
+test.group('DataDomain.findAssociation()', () => {
+  test('finds a foreign association by its key and domain key', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    const m1 = fd.addModel()
+    const e1 = m1.addEntity()
+    const e2 = m1.addEntity()
+    const a1 = e1.addAssociation({ key: e2.key })
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findAssociation(a1.key, fd.key)
+    assert.deepEqual(result, a1)
+  })
+
+  test('returns undefined when association not found', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findAssociation('other-association', fd.key)
+    assert.isUndefined(result)
+  })
+
+  test("throws when association's namespace not found", ({ assert }) => {
+    const domain = new DataDomain()
+    domain.addNamespace({ key: 'test-namespace' })
+    assert.throws(() => {
+      domain.findAssociation('test-association', 'non-existent-domain')
+    }, `Foreign domain non-existent-domain not found`)
+  })
+})
+
+test.group('DataDomain.findProperty()', () => {
+  test('finds a foreign property by its key and domain key', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    const m1 = fd.addModel()
+    const e1 = m1.addEntity()
+    const p1 = e1.addProperty()
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findProperty(p1.key, fd.key)
+    assert.deepEqual(result, p1)
+  })
+
+  test('returns undefined when property not found', ({ assert }) => {
+    const domain = new DataDomain()
+    const fd = new DataDomain()
+    fd.info.version = '1.0.0'
+    domain.registerForeignDomain(fd)
+    const result = domain.findProperty('other-property', fd.key)
+    assert.isUndefined(result)
+  })
+
+  test("throws when property's namespace not found", ({ assert }) => {
+    const domain = new DataDomain()
+    domain.addNamespace({ key: 'test-namespace' })
+    assert.throws(() => {
+      domain.findProperty('test-property', 'non-existent-domain')
+    }, `Foreign domain non-existent-domain not found`)
   })
 })