@api-client/core 0.18.29 → 0.18.31

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

@@ -42062,19 +42062,19 @@
 "@id": "#209"
 },
 {
-"@id": "#200"
+"@id": "#191"
 },
 {
-"@id": "#203"
+"@id": "#194"
 },
 {
-"@id": "#191"
+"@id": "#200"
 },
 {
 "@id": "#197"
 },
 {
-"@id": "#194"
+"@id": "#203"
 },
 {
 "@id": "#206"
@@ -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": "code: '5'\ndescription: 'Limited company'\n",
+"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43457,7 +43457,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "code: 'J'\ndescription: 'Information and communication'\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": [
 {
@@ -43499,7 +43499,7 @@
 "doc:ExternalDomainElement",
 "doc:DomainElement"
 ],
-"doc:raw": "countryCode: \"BE\"\ngraydonEnterpriseId: 1057155523\nregistrationId: \"0422319093\"\nvatNumber: \"BE0422319093\"\ngraydonCompanyId: \"0422319093\"\nisBranchOffice: false\n",
+"doc:raw": "code: '5'\ndescription: 'Limited company'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -43520,7 +43520,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: 'J'\ndescription: 'Information and communication'\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,12 +44756,12 @@
 {
 "@id": "#193/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#193",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(7,0)]"
 },
 {
 "@id": "#196/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#196",
-"sourcemaps:value": "[(1,0)-(3,0)]"
+"sourcemaps:value": "[(1,0)-(10,0)]"
 },
 {
 "@id": "#199/source-map/lexical/element_0",
@@ -44771,12 +44771,12 @@
 {
 "@id": "#202/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#202",
-"sourcemaps:value": "[(1,0)-(7,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#205/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#205",
-"sourcemaps:value": "[(1,0)-(10,0)]"
+"sourcemaps:value": "[(1,0)-(3,0)]"
 },
 {
 "@id": "#208/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.29",
+  "version": "0.18.31",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {
@@ -104,8 +104,8 @@
     "xpath": "^0.0.34"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.3.0",
-    "@commitlint/config-conventional": "^19.2.2",
+    "@commitlint/cli": "^20.1.0",
+    "@commitlint/config-conventional": "^20.0.0",
     "@eslint/js": "^9.20.0",
     "@japa/api-client": "^3.0.3",
     "@japa/assert": "^4.0.1",
@@ -116,7 +116,7 @@
     "@rollup/plugin-typescript": "^12.1.2",
     "@types/cors": "^2.8.12",
     "@types/express-ntlm": "^2.3.3",
-    "@types/jsdom": "^21.1.7",
+    "@types/jsdom": "^27.0.0",
     "@types/json-schema": "^7.0.15",
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.0.1",

package/src/modeling/ApiModel.ts

@@ -401,12 +401,20 @@ export class ApiModel extends DependentModel {
       throw new Error(`Entity not found in domain: ${entity.key}`)
     }
     const name = domainEntity.info.name || ''
+    const segment = pluralize(name.toLocaleLowerCase())
+    const relativeCollectionPath = `/${segment}`
+    const relativeResourcePath = `/${segment}/{id}`
+    const absoluteCollectionPath = relativeCollectionPath
+    const absoluteResourcePath = relativeResourcePath
     const newEntity: ExposedEntity = {
       key: nanoid(),
       entity: { ...entity },
       actions: [],
       isRoot: true,
-      path: pluralize(name.toLocaleLowerCase()),
+      relativeCollectionPath,
+      relativeResourcePath,
+      absoluteCollectionPath,
+      absoluteResourcePath,
     }
     if (options) {
       newEntity.exposeOptions = { ...options }
@@ -479,13 +487,24 @@ export class ApiModel extends DependentModel {
           if (!targetDomainEntity) continue
 
           const name = association.info.name || ''
+          const parentExposure = this.exposes.find((e) => e.key === parentKey)
+          const parentAbsResource = parentExposure?.absoluteResourcePath || ''
+          const segment = pluralize(name.toLocaleLowerCase())
+          const isCollection = association.multiple !== false
+          const relativeCollectionPath = isCollection ? `/${segment}` : undefined
+          const relativeResourcePath = isCollection ? `/${segment}/{id}` : `/${segment}`
+          const absoluteCollectionPath = isCollection ? `${parentAbsResource}${relativeCollectionPath}` : undefined
+          const absoluteResourcePath = `${parentAbsResource}${relativeResourcePath}`
           // Create nested exposure
           const nestedExposure: ExposedEntity = {
             key: nanoid(),
             entity: { ...target },
             actions: [],
             isRoot: false,
-            path: pluralize(name.toLocaleLowerCase()),
+            relativeCollectionPath,
+            relativeResourcePath,
+            absoluteCollectionPath,
+            absoluteResourcePath,
             parent: {
               key: parentKey,
               association: {

package/src/modeling/types.ts

@@ -449,9 +449,28 @@ export interface ExposedEntity {
    */
   entity: AssociationTarget
   /**
-   * The path segment for this exposure.
+   * Relative path to the collection endpoint for this exposure.
+   * Starts with '/'. Not set for 1:1 nested exposures where collection does not exist.
    */
-  path: string
+  relativeCollectionPath?: string
+
+  /**
+   * Relative path to the resource endpoint for this exposure.
+   * Starts with '/'. For 1:1 nested exposures the resource path typically does not include an id segment.
+   */
+  relativeResourcePath: string
+
+  /**
+   * Absolute path to the collection endpoint for this exposure (includes parent paths).
+   * Starts with '/'. Not set for 1:1 nested exposures where collection does not exist.
+   */
+  absoluteCollectionPath?: string
+
+  /**
+   * Absolute path to the resource endpoint for this exposure (includes parent paths).
+   * Starts with '/'.
+   */
+  absoluteResourcePath: string
 
   /**
    * Whether this exposure is a root exposure (top-level collection).
@@ -766,9 +785,9 @@ export interface MatchUserPropertyAccessRule extends BaseAccessRule {
 export interface MatchEmailDomainAccessRule extends BaseAccessRule {
   type: 'matchEmailDomain'
   /**
-   * The email domain that the authenticated user's email must match.
+   * The email domains that the authenticated user's email must match.
    */
-  domain: string
+  domains: string[]
 }
 
 /**

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

@@ -81,7 +81,8 @@ test.group('ApiModel.exposeEntity()', () => {
     const nestedB = model.exposes.find((e) => !e.isRoot && e.entity.key === eB.key)
     assert.isDefined(nestedB)
     assert.deepEqual(nestedB?.parent?.key, exposedA.key)
-    assert.strictEqual(nestedB?.path, 'entitybs')
+    assert.strictEqual(nestedB?.relativeCollectionPath, '/entitybs')
+    assert.strictEqual(nestedB?.absoluteCollectionPath, '/as/{id}/entitybs')
   })
 
   test('does not infinitely expose circular associations', ({ assert }) => {