@api-client/core 0.18.60 → 0.18.62

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

@@ -42062,6 +42062,9 @@
 "@id": "#209"
 },
 {
+"@id": "#206"
+},
+{
 "@id": "#191"
 },
 {
@@ -42071,13 +42074,10 @@
 "@id": "#197"
 },
 {
-"@id": "#203"
-},
-{
 "@id": "#200"
 },
 {
-"@id": "#206"
+"@id": "#203"
 },
 {
 "@id": "#209"
@@ -42813,13 +42813,13 @@
 "@id": "#210"
 },
 {
-"@id": "#219"
-},
-{
 "@id": "#213"
 },
 {
 "@id": "#216"
+},
+{
+"@id": "#219"
 }
 ],
 "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": "code: '5'\ndescription: 'Limited company'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43478,7 +43478,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: '5'\ndescription: 'Limited company'\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": "class: '3'\ndescription: '150 - 300'\nnumberOfFte: 5500\nnumberOfEmployees: 5232\n",
+"doc:raw": "code: '7487'\ndescription: 'Financial and insurance activities'\ntype: \"PRIMARY\"\nclassificationCode: 'BE_NACEBEL2008'\nactivityGroupCode: 'ABCDE'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43541,7 +43541,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: '7487'\ndescription: 'Financial and insurance activities'\ntype: \"PRIMARY\"\nclassificationCode: 'BE_NACEBEL2008'\nactivityGroupCode: 'ABCDE'\n",
+"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44253,7 +44253,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 : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -44274,7 +44274,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "type: \"GENERAL\"\nvalue: \"www.company.be\"\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": [
 {
@@ -44295,7 +44295,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": [
 {
@@ -44756,17 +44756,17 @@
 {
 "@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)-(3,0)]"
 },
 {
 "@id": "#199/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#199",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(5,0)]"
 },
 {
 "@id": "#202/source-map/lexical/element_0",
@@ -44776,12 +44776,12 @@
 {
 "@id": "#205/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#205",
-"sourcemaps:value": "[(1,0)-(5,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#208/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#208",
-"sourcemaps:value": "[(1,0)-(6,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#223/source-map/lexical/element_0",
@@ -45121,17 +45121,17 @@
 {
 "@id": "#215/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#215",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(6,0)]"
 },
 {
 "@id": "#218/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#218",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#221/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#221",
-"sourcemaps:value": "[(1,0)-(6,0)]"
+"sourcemaps:value": "[(1,0)-(3,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.60",
+  "version": "0.18.62",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/rules/MatchResourceOwner.ts

@@ -9,13 +9,22 @@ import { observed } from '../../decorators/observed.js'
 export interface MatchResourceOwnerAccessRuleSchema extends AccessRuleSchema {
   type: 'matchResourceOwner'
   /**
-   * The property on the resource that should match the authenticated user's ID.
-   * This is typically the ID of the user who owns the resource.
+   * The property on the resource that references the user's ID (the key in the semantically annotated `User` entity).
+   *
+   * When the current exposed entity has a property annotated with the "ResourceOwnerIdentifier" semantic,
+   * this property should be used. It directly references the user's key.
    *
    * The domain model should annotate this property with the "ResourceOwnerIdentifier" semantic
    * to indicate that it is used for ownership checks.
    */
-  property: string
+  property?: string
+
+  /**
+   * The target for the ownership check.
+   * - `property`: The check is performed against a specific property on the resource (default).
+   * - `user-entity`: The check is performed against the entity itself (used when the entity represents the user).
+   */
+  target?: 'property' | 'user-entity'
 }
 
 /**
@@ -26,18 +35,24 @@ export interface MatchResourceOwnerAccessRuleSchema extends AccessRuleSchema {
 export class MatchResourceOwnerAccessRule extends AccessRule implements MatchResourceOwnerAccessRuleSchema {
   override readonly type: 'matchResourceOwner'
 
-  @observed() accessor property: string
+  @observed() accessor property: string | undefined
+  @observed() accessor target: 'property' | 'user-entity'
 
   constructor(state: Partial<MatchResourceOwnerAccessRuleSchema> = {}) {
     super(state)
     this.type = 'matchResourceOwner'
-    this.property = state.property ?? ''
+    this.property = state.property
+    this.target = state.target ?? 'property'
   }
 
   override toJSON(): MatchResourceOwnerAccessRuleSchema {
-    return {
+    const json: MatchResourceOwnerAccessRuleSchema = {
       ...(super.toJSON() as MatchResourceOwnerAccessRuleSchema),
-      property: this.property,
+      target: this.target,
+    }
+    if (this.property) {
+      json.property = this.property
     }
+    return json
   }
 }

package/src/sdk/DataCatalogSdk.ts

@@ -388,9 +388,19 @@ export class DataCatalogSdk extends SdkBase {
     return data
   }
 
-  async checkPublicationStatus(domainId: string, request: SdkOptions = {}): Promise<DataCatalogStatus> {
+  /**
+   * Checks the publication status of a data domain.
+   * @param domainKey The key of the data domain to check.
+   * @param oid The optional ID of the organization. Optional for public domains.
+   * @param request The request options.
+   * @returns The publication status of the data domain.
+   */
+  async checkPublicationStatus(domainKey: string, oid?: string, request: SdkOptions = {}): Promise<DataCatalogStatus> {
     const { token } = request
-    const url = this.sdk.getUrl(RouteBuilder.dataCatalogStatus(domainId))
+    const url = this.sdk.getUrl(RouteBuilder.dataCatalogStatus(domainKey))
+    if (oid) {
+      url.searchParams.set('oid', oid)
+    }
     const result = await this.sdk.http.get(url.toString(), { token })
     this.inspectCommonStatusCodes(result)
     const E_PREFIX = 'Unable to check data domain publication status. '

package/tests/unit/modeling/rules/MatchResourceOwner.spec.ts

@@ -5,7 +5,8 @@ test.group('MatchResourceOwnerAccessRule', () => {
   test('initializes with default values', ({ assert }) => {
     const rule = new MatchResourceOwnerAccessRule()
     assert.equal(rule.type, 'matchResourceOwner')
-    assert.equal(rule.property, '')
+    assert.isUndefined(rule.property)
+    assert.equal(rule.target, 'property')
   }).tags(['@modeling', '@rule', '@match-resource-owner'])
 
   test('initializes with provided values', ({ assert }) => {
@@ -13,6 +14,15 @@ test.group('MatchResourceOwnerAccessRule', () => {
 
     assert.equal(rule.type, 'matchResourceOwner')
     assert.equal(rule.property, 'creatorId')
+    assert.equal(rule.target, 'property')
+  }).tags(['@modeling', '@rule', '@match-resource-owner'])
+
+  test('initializes with target user-entity', ({ assert }) => {
+    const rule = new MatchResourceOwnerAccessRule({ target: 'user-entity' })
+
+    assert.equal(rule.type, 'matchResourceOwner')
+    assert.isUndefined(rule.property)
+    assert.equal(rule.target, 'user-entity')
   }).tags(['@modeling', '@rule', '@match-resource-owner'])
 
   test('toJSON returns valid schema', ({ assert }) => {
@@ -21,6 +31,16 @@ test.group('MatchResourceOwnerAccessRule', () => {
 
     assert.equal(json.type, 'matchResourceOwner')
     assert.equal(json.property, 'creatorId')
+    assert.equal(json.target, 'property')
+  }).tags(['@modeling', '@rule', '@match-resource-owner', '@serialization'])
+
+  test('toJSON omits property when undefined', ({ assert }) => {
+    const rule = new MatchResourceOwnerAccessRule({ target: 'user-entity' })
+    const json = rule.toJSON()
+
+    assert.equal(json.type, 'matchResourceOwner')
+    assert.isUndefined(json.property)
+    assert.equal(json.target, 'user-entity')
   }).tags(['@modeling', '@rule', '@match-resource-owner', '@serialization'])
 
   test('notifies change when property changes', async ({ assert }) => {