@api-client/core 0.18.53 → 0.18.54

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

@@ -42813,10 +42813,10 @@
 "@id": "#210"
 },
 {
-"@id": "#213"
+"@id": "#216"
 },
 {
-"@id": "#216"
+"@id": "#213"
 },
 {
 "@id": "#219"
@@ -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": "-\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": [
 {
@@ -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 : '21'\nsubscriberNumber: '12.87.00'\nformatted: '+32-(0)21 302099'\n",
 "core:mediaType": "application/yaml",
 "sourcemaps:sources": [
 {
@@ -45121,12 +45121,12 @@
 {
 "@id": "#215/source-map/lexical/element_0",
 "sourcemaps:element": "amf://id#215",
-"sourcemaps:value": "[(1,0)-(6,0)]"
+"sourcemaps:value": "[(1,0)-(7,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",

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.53",
+  "version": "0.18.54",
   "license": "Apache-2.0",
   "exports": {
     "./browser.js": {

package/src/modeling/helpers/Intelisense.ts

@@ -29,6 +29,8 @@ export function addAutoField(entity: DomainEntity, autoField: string): DomainEle
       return addEmailField(entity)
     case 'name':
       return addNameField(entity)
+    case 'display-name':
+      return addDisplayNameField(entity)
     case 'description':
       return addDescriptionField(entity)
     case 'status':
@@ -49,6 +51,8 @@ export function addAutoField(entity: DomainEntity, autoField: string): DomainEle
       return addIsDeletedField(entity)
     case 'deleted':
       return addDeletedAtField(entity)
+    case 'role':
+      return addRoleField(entity)
     case 'first-name':
       return addFirstNameField(entity)
     case 'last-name':
@@ -70,8 +74,12 @@ export function addAutoField(entity: DomainEntity, autoField: string): DomainEle
     case 'images':
       return addImagesField(entity)
     case 'session-id':
+      // This was removed from the UI. We will not support session id configuration
+      // as the platform will handle it to separate the business logic from the transport layer.
       return addSessionIdField(entity)
     case 'expires-at':
+      // This was removed from the UI. We will not support expires at configuration
+      // as the platform will handle it to separate the business logic from the transport layer.
       return addExpiresAtField(entity)
     case 'unit-price':
       return addUnitPriceField(entity)
@@ -198,6 +206,21 @@ export function addNameField(entity: DomainEntity, info: Partial<IThing> = {}):
   return prop
 }
 
+export function addDisplayNameField(entity: DomainEntity, info: Partial<IThing> = {}): DomainProperty {
+  const existing = findDisplayNameField(entity, true)
+  if (existing) {
+    return existing
+  }
+  const prop = entity.addProperty({
+    info: { name: 'display-name', displayName: 'Display Name', ...info },
+    type: 'string',
+  })
+  prop.addSemantic({
+    id: SemanticType.Name,
+  })
+  return prop
+}
+
 /**
  * Adds a description field to the specified entity.
  * If a description field already exists, it returns the existing field.
@@ -472,6 +495,24 @@ export function addDeletedAtField(entity: DomainEntity, info: Partial<IThing> =
   return prop
 }
 
+export function addRoleField(entity: DomainEntity, info: Partial<IThing> = {}): DomainProperty {
+  const existing = findRoleField(entity, true)
+  if (existing) {
+    return existing
+  }
+  const prop = entity.addProperty({
+    info: { name: 'role', displayName: 'Role', ...info },
+    type: 'string',
+    required: true,
+    index: true,
+    schema: { defaultValue: { type: 'literal', value: 'user' }, enum: ['user', 'admin'] },
+  })
+  prop.addSemantic({
+    id: SemanticType.UserRole,
+  })
+  return prop
+}
+
 /**
  * Adds an is_deleted field to the specified entity.
  * If an is_deleted field already exists, it returns the existing field.
@@ -1134,6 +1175,10 @@ function findNameField(entity: DomainEntity, direct = false): DomainProperty | u
   return findPropertyField(entity, (property) => property.hasSemantic(SemanticType.Title), direct)
 }
 
+function findDisplayNameField(entity: DomainEntity, direct = false): DomainProperty | undefined {
+  return findPropertyField(entity, (property) => property.hasSemantic(SemanticType.Name), direct)
+}
+
 function findDescriptionField(entity: DomainEntity, direct = false): DomainProperty | undefined {
   return findPropertyField(entity, (property) => property.hasSemantic(SemanticType.Description), direct)
 }
@@ -1196,6 +1241,10 @@ function findDeletedAtField(entity: DomainEntity, direct = false): DomainPropert
   )
 }
 
+function findRoleField(entity: DomainEntity, direct = false): DomainProperty | undefined {
+  return findPropertyField(entity, (property) => property.hasSemantic(SemanticType.UserRole), direct)
+}
+
 function findIsDeletedField(entity: DomainEntity, direct = false): DomainProperty | undefined {
   return findPropertyField(entity, (property) => property.hasSemantic(SemanticType.DeletedFlag), direct)
 }

package/tests/unit/modeling/helpers/intellisense.spec.ts

@@ -32,6 +32,8 @@ import {
   addUnitPriceField,
   addCurrencyAmountField,
   addRecommendedFields,
+  addDisplayNameField,
+  addRoleField,
 } from '../../../../src/modeling/helpers/Intelisense.js'
 import { SemanticType } from '../../../../src/modeling/Semantics.js'
 
@@ -402,6 +404,33 @@ test.group('addNameField()', () => {
   })
 })
 
+test.group('addDisplayNameField()', () => {
+  test('creates new display name field when none exists', ({ assert }) => {
+    const entity = createTestEntity()
+    const field = addDisplayNameField(entity) as DomainProperty
+    assert.instanceOf(field, DomainProperty)
+    assert.equal(field.info.name, 'display-name')
+    assert.equal(field.info.displayName, 'Display Name')
+    assert.equal(field.type, 'string')
+    assert.isTrue(field.semantics.length > 0)
+  })
+
+  test('returns existing display name field when one exists', ({ assert }) => {
+    const entity = createTestEntity()
+    const firstField = addDisplayNameField(entity) as DomainProperty
+    const secondField = addDisplayNameField(entity) as DomainProperty
+    assert.equal(firstField, secondField)
+    assert.lengthOf([...entity.properties], 1)
+  })
+
+  test('adds semantic annotation', ({ assert }) => {
+    const entity = createTestEntity()
+    const field = addDisplayNameField(entity) as DomainProperty
+    const hasSemantic = field.hasSemantic(SemanticType.Name)
+    assert.isTrue(hasSemantic)
+  })
+})
+
 test.group('addDescriptionField()', () => {
   test('creates new description field when none exists', ({ assert }) => {
     const entity = createTestEntity()
@@ -568,6 +597,36 @@ test.group('addDeletedAtField()', () => {
   })
 })
 
+test.group('addRoleField()', () => {
+  test('creates new role field when none exists', ({ assert }) => {
+    const entity = createTestEntity()
+    const field = addRoleField(entity)
+    assert.instanceOf(field, DomainProperty)
+    assert.equal(field.info.name, 'role')
+    assert.equal(field.info.displayName, 'Role')
+    assert.equal(field.type, 'string')
+    assert.isTrue(field.index)
+    assert.deepEqual(field.schema?.defaultValue, { type: 'literal', value: 'user' })
+    assert.deepEqual(field.schema?.enum, ['user', 'admin'])
+    assert.isTrue(field.hasSemantic(SemanticType.UserRole))
+  })
+
+  test('returns existing role field when one exists', ({ assert }) => {
+    const entity = createTestEntity()
+    const firstField = addRoleField(entity)
+    const secondField = addRoleField(entity)
+    assert.equal(firstField, secondField)
+    assert.lengthOf([...entity.properties], 1)
+  })
+
+  test('merges custom info with defaults', ({ assert }) => {
+    const entity = createTestEntity()
+    const field = addRoleField(entity, { description: 'User role' })
+    assert.equal(field.info.name, 'role')
+    assert.equal(field.info.description, 'User role')
+  })
+})
+
 test.group('addIsDeletedField()', () => {
   test('creates new is deleted field when none exists', ({ assert }) => {
     const entity = createTestEntity()