@api-client/core 0.19.11 → 0.19.13

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

@@ -43,12 +43,12 @@ test.group('ExposedEntity Path Setter Validation', () => {
 
     // Set exp1 resource path to something specific
     exp1.hasCollection = false
-    exp1.setResourcePath('/shared/path')
+    exp1.setResourcePath('/shared')
 
     // Try to set exp2 resource path to same
     assert.throws(
-      () => exp2.setResourcePath('/shared/path'),
-      'Resource path "/shared/path" is already in use by another root entity.'
+      () => exp2.setResourcePath('/shared'),
+      'Resource path "/shared" is already in use by another root entity.'
     )
   })
 
@@ -67,8 +67,8 @@ test.group('ExposedEntity Path Setter Validation', () => {
     assert.equal(exp1.collectionPath, '/new-path')
 
     exp1.hasCollection = false // allow arbitrary resource path
-    exp1.setResourcePath('/custom/resource')
-    assert.equal(exp1.resourcePath, '/custom/resource')
+    exp1.setResourcePath('/custom')
+    assert.equal(exp1.resourcePath, '/custom')
   })
 
   test('does not validate collision for non-root entities', ({ assert }) => {

package/tests/unit/modeling/validation/api_model_rules.spec.ts

@@ -9,8 +9,8 @@ import {
   validateApiModelMetadata,
   validateExposedEntity,
   validateAction,
-  validateApiModel,
 } from '../../../../src/modeling/validation/api_model_rules.js'
+import { ApiValidation } from '../../../../src/modeling/ApiValidation.js'
 import { ExposedEntity } from '../../../../src/modeling/ExposedEntity.js'
 import { ListAction } from '../../../../src/modeling/actions/ListAction.js'
 import { DeleteAction } from '../../../../src/modeling/actions/DeleteAction.js'
@@ -235,6 +235,19 @@ test.group('ApiModel Validation', () => {
     assert.isTrue(issues.some((i) => i.code === 'EXPOSURE_INVALID_RESOURCE_PATH_FORMAT'))
   })
 
+  test('validateExposedEntity - path integrity (no collection)', ({ assert }) => {
+    const domain = new DataDomain({ info: { version: '1.0.0' } })
+    const model = new ApiModel({}, domain)
+    const exposure = new ExposedEntity(model, {
+      entity: { key: 'fake' },
+      hasCollection: false,
+    })
+    exposure.resourcePath = '/invalid/two_segments'
+    exposure.actions = [new ReadAction(exposure)]
+    const issues = validateExposedEntity(exposure, model)
+    assert.isTrue(issues.some((i) => i.code === 'EXPOSURE_INVALID_RESOURCE_PATH_FORMAT'))
+  })
+
   test('validateAction - List needs pagination', ({ assert }) => {
     const model = new ApiModel()
     const exposure = new ExposedEntity(model, { entity: { key: '1' } })
@@ -305,9 +318,10 @@ test.group('ApiModel Validation', () => {
       },
       domain
     )
-    const result = validateApiModel(model)
-    assert.isTrue(result.isValid)
-    assert.isEmpty(result.issues.filter((i) => i.severity === 'error'))
+    const validator = new ApiValidation(model)
+    const report = validator.validate()
+    assert.equal(validator.errorCount, 0)
+    assert.isEmpty(report.filter((i) => i.severity === 'error'))
   })
 
   test('validateApiModel - fails on multiple errors', ({ assert }) => {
@@ -315,10 +329,11 @@ test.group('ApiModel Validation', () => {
       info: { name: '' },
     })
     // Now it's missing name, missing domain, missing security context, missing contact.
-    const result = validateApiModel(model)
-    assert.isFalse(result.isValid)
-    assert.isTrue(result.issues.some((i) => i.code === 'API_MISSING_NAME'))
-    assert.isTrue(result.issues.some((i) => i.code === 'API_MISSING_DOMAIN'))
-    assert.isTrue(result.issues.some((i) => i.code === 'API_MISSING_AUTHENTICATION'))
+    const validator = new ApiValidation(model)
+    const report = validator.validate()
+    assert.isAbove(validator.errorCount, 0)
+    assert.isTrue(report.some((i) => i.code === 'API_MISSING_NAME'))
+    assert.isTrue(report.some((i) => i.code === 'API_MISSING_DOMAIN'))
+    assert.isTrue(report.some((i) => i.code === 'API_MISSING_AUTHENTICATION'))
   })
 })