@api-client/core 0.19.10 → 0.19.12

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

@@ -1,7 +1,6 @@
 import { test } from '@japa/runner'
 import {
   DomainAssociation,
-  AmfShapes,
   DomainAssociationKind,
   Thing,
   AssociationBinding,
@@ -10,6 +9,7 @@ import {
   SemanticType,
   type OnDeleteRule,
 } from '../../../src/index.js'
+import { Shapes } from '@api-client/amf-core'
 
 test.group('DomainAssociation.createSchema()', () => {
   test('creates a valid schema with default values', ({ assert }) => {
@@ -58,7 +58,7 @@ test.group('DomainAssociation.createSchema()', () => {
   })
 
   test('creates a schema with provided schema', ({ assert }) => {
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const schema = DomainAssociation.createSchema({ schema: schemaDefinition })
     assert.deepEqual(schema.schema, schemaDefinition)
   })
@@ -88,7 +88,7 @@ test.group('DomainAssociation.createSchema()', () => {
   test('creates a schema with all properties', ({ assert }) => {
     const key = 'test-key'
     const info = { name: 'Test Association', description: 'Test description' }
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const multiple = true
     const required = true
     const bindings: AssociationBinding[] = [{ type: 'web', schema: { hidden: false } }]
@@ -144,7 +144,7 @@ test.group('DomainAssociation.createSchema()', () => {
   })
 
   test('creates a schema with cloned schema', ({ assert }) => {
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const schema = DomainAssociation.createSchema({ schema: schemaDefinition })
     assert.deepEqual(schema.schema, schemaDefinition)
     assert.notStrictEqual(schema.schema, schemaDefinition)
@@ -212,7 +212,7 @@ test.group('DomainAssociation.constructor()', () => {
   test('creates an instance with provided schema', ({ assert }) => {
     const dataDomain = new DataDomain()
     const parentKey = 'test-parent'
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const association = new DomainAssociation(dataDomain, parentKey, { schema: schemaDefinition })
     assert.deepEqual(association.schema, schemaDefinition)
   })
@@ -252,7 +252,7 @@ test.group('DomainAssociation.constructor()', () => {
     const parentKey = 'test-parent'
     const key = 'test-key'
     const info = { name: 'Test Association', description: 'Test description' }
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const multiple = true
     const required = true
     const bindings: AssociationBinding[] = [{ type: 'web', schema: { hidden: false } }]
@@ -316,7 +316,7 @@ test.group('DomainAssociation.constructor()', () => {
   test('creates an instance with cloned schema', ({ assert }) => {
     const dataDomain = new DataDomain()
     const parentKey = 'test-parent'
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const association = new DomainAssociation(dataDomain, parentKey, { schema: schemaDefinition })
     assert.deepEqual(association.schema, schemaDefinition)
     assert.notStrictEqual(association.schema, schemaDefinition)
@@ -390,7 +390,7 @@ test.group('DomainAssociation.toJSON()', () => {
   test('returns a JSON representation with provided schema', ({ assert }) => {
     const dataDomain = new DataDomain()
     const parentKey = 'test-parent'
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const association = new DomainAssociation(dataDomain, parentKey, { schema: schemaDefinition })
     const json = association.toJSON()
     assert.deepEqual(json.schema, schemaDefinition)
@@ -438,7 +438,7 @@ test.group('DomainAssociation.toJSON()', () => {
     const parentKey = 'test-parent'
     const key = 'test-key'
     const info = { name: 'Test Association', description: 'Test description' }
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const multiple = true
     const required = true
     const bindings: AssociationBinding[] = [{ type: 'web', schema: { hidden: false } }]
@@ -527,7 +527,7 @@ test.group('DomainAssociation.toJSON()', () => {
   test('returns a JSON representation with cloned schema', ({ assert }) => {
     const dataDomain = new DataDomain()
     const parentKey = 'test-parent'
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const association = new DomainAssociation(dataDomain, parentKey, { schema: schemaDefinition })
     const json = association.toJSON()
     assert.deepEqual(json.schema, schemaDefinition)
@@ -538,7 +538,7 @@ test.group('DomainAssociation.toJSON()', () => {
     const dataDomain = new DataDomain()
     const parentKey = 'test-parent'
     const association = new DomainAssociation(dataDomain, parentKey)
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     association.schema = schemaDefinition
     const json = association.toJSON()
     assert.deepEqual(json.schema, schemaDefinition)
@@ -672,7 +672,7 @@ test.group('DomainAssociation.ensureSchema()', () => {
 
   test('returns the existing schema object if it exists', ({ assert }) => {
     const dataDomain = new DataDomain()
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const association = new DomainAssociation(dataDomain, 'test-parent', { schema: schemaDefinition })
     const originalSchema = association.schema
     const schema = association.ensureSchema()
@@ -682,7 +682,7 @@ test.group('DomainAssociation.ensureSchema()', () => {
 
   test('does not modify the existing schema object', ({ assert }) => {
     const dataDomain = new DataDomain()
-    const schemaDefinition: AmfShapes.IApiAssociationShape = { linked: false }
+    const schemaDefinition: Shapes.IApiAssociationShape = { linked: false }
     const association = new DomainAssociation(dataDomain, 'test-parent', { schema: schemaDefinition })
     const originalSchema = association.schema
     association.ensureSchema()

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

@@ -1,6 +1,6 @@
 import { test } from '@japa/runner'
 import { DomainValidation } from '../../../src/modeling/DomainValidation.js'
-import { DataDomain, DataDomainKind } from '../../../src/index.js'
+import { DataDomain } from '../../../src/index.js'
 import { SemanticType } from '../../../src/modeling/Semantics.js'
 
 test.group('DomainImpactAnalysis.validate()', (group) => {
@@ -14,12 +14,7 @@ test.group('DomainImpactAnalysis.validate()', (group) => {
 
   test('validate() should return an empty report when the domain is empty', ({ assert }) => {
     const report = analysis.validate()
-    assert.deepEqual(report, {
-      key: '',
-      kind: DataDomainKind,
-      impact: [],
-      canProceed: true,
-    })
+    assert.deepEqual(report, [])
   })
 
   test('validate() should return validation errors for entities', ({ assert }) => {
@@ -27,7 +22,7 @@ test.group('DomainImpactAnalysis.validate()', (group) => {
     model.addEntity({ key: 'entity', info: { name: 'Invalid-Name' } }) // Invalid name
 
     const report = analysis.validate()
-    assert.lengthOf(report.impact, 8)
+    assert.lengthOf(report, 8)
     // we test specific rules in the validation tests
   })
 
@@ -37,7 +32,7 @@ test.group('DomainImpactAnalysis.validate()', (group) => {
     entity.addProperty({ key: 'invalid-property', type: 'string', info: { name: 'invalid-property' } })
 
     const report = analysis.validate()
-    assert.lengthOf(report.impact, 6)
+    assert.lengthOf(report, 6)
     // we test specific rules in the validation tests
   })
 
@@ -48,7 +43,7 @@ test.group('DomainImpactAnalysis.validate()', (group) => {
     entity1.addAssociation({ targets: [{ key: entity2.key }], info: { name: 'Invalid-Name' } })
 
     const report = analysis.validate()
-    assert.lengthOf(report.impact, 12)
+    assert.lengthOf(report, 12)
     // we test specific rules in the validation tests
   })
 
@@ -60,7 +55,7 @@ test.group('DomainImpactAnalysis.validate()', (group) => {
     entity1.addAssociation({ targets: [{ key: entity2.key }], info: { name: 'Invalid-Name' } })
 
     const report = analysis.validate()
-    assert.lengthOf(report.impact, 16)
+    assert.lengthOf(report, 16)
     // we test specific rules in the validation tests
   })
 
@@ -88,7 +83,6 @@ test.group('DomainImpactAnalysis.validate()', (group) => {
     p5e1.addSemantic({ id: SemanticType.DeletedFlag })
 
     const report = analysis.validate()
-    assert.lengthOf(report.impact, 0)
-    assert.equal(report.canProceed, true)
+    assert.lengthOf(report, 0)
   })
 })

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'
@@ -305,9 +305,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 +316,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'))
   })
 })

package/tests/unit/runtime/runners/http_assertion_runner.spec.ts

@@ -4,7 +4,6 @@ import {
   FlowResponseDataEnum,
   FlowSourceEnum,
   EqualAssertion,
-  AmfNamespace as ns,
   ISentRequest,
   IncludesAssertion,
   IResponse,
@@ -30,6 +29,7 @@ import {
 } from '../../../../src/index.js'
 import { HttpAssertionRunner } from '../../../../src/runtime/http-runner/HttpAssertionRunner.js'
 import driveList from '../../../resources/http/drive-list.js'
+import { AmfNamespace as ns } from '@api-client/amf-core'
 
 const request: ISentRequest = Object.freeze({
   startTime: 0,

package/tests/unit/runtime/runners/http_flow_runner.spec.ts

@@ -8,7 +8,6 @@ import {
   SetVariableStep,
   FlowRequestDataEnum,
   InMemoryCookieJar,
-  AmfNamespace as ns,
   IHttpRequest,
   ISentRequest,
   Property,
@@ -24,6 +23,7 @@ import {
 } from '../../../../src/index.js'
 import { clearStore } from '../../../../src/cookies/InMemoryCookieJar.js'
 import { HttpFlowRunner } from '../../../../src/runtime/http-runner/HttpFlowRunner.js'
+import { AmfNamespace as ns } from '@api-client/amf-core'
 
 test.group('Request flows', (group) => {
   let variables: Record<string, string>

package/tests/unit/runtime/runners/project_runner.spec.ts

@@ -15,7 +15,6 @@ import {
   SetVariableStep,
   FlowRequestDataEnum,
   InMemoryCookieJar,
-  AmfNamespace as ns,
   createLogger,
   ProjectRequestRunner,
   Environment,
@@ -23,6 +22,7 @@ import {
   RequestAuthorization,
   IBasicAuthorization,
 } from '../../../../src/index.js'
+import { AmfNamespace as ns } from '@api-client/amf-core'
 
 const logger = createLogger()
 

package/tests/unit/runtime/runners/request_runner.spec.ts

@@ -8,7 +8,6 @@ import {
   SetVariableStep,
   FlowRequestDataEnum,
   InMemoryCookieJar,
-  AmfNamespace as ns,
   createLogger,
   HttpRequestRunner,
   IHttpRequest,
@@ -23,6 +22,7 @@ import {
   SetCookieStep,
   RequestAuthorizationKind,
 } from '../../../../src/index.js'
+import { AmfNamespace as ns } from '@api-client/amf-core'
 
 const logger = createLogger()
 

package/tests/unit/runtime/runners/serial_runner.spec.ts

@@ -20,8 +20,8 @@ import {
   SetVariableStep,
   FlowRequestDataEnum,
   InMemoryCookieJar,
-  AmfNamespace as ns,
 } from '../../../../src/index.js'
+import { AmfNamespace as ns } from '@api-client/amf-core'
 
 test.group('projects requests', (group) => {
   let project: HttpProject