@api-client/core 0.19.10 → 0.19.11

package/eslint.config.js

@@ -80,7 +80,6 @@ export default [
       'src/models/SerializablePayload.ts',
       'src/lib/calculators/DataCalculator.ts',
       'src/lib/Buffer.ts',
-      'src/events/amf/AmfEvents.ts',
       'src/authorization/lib/SecurityProcessor.ts',
     ],
     languageOptions: {

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@api-client/core",
   "description": "The API Client's core client library. Works in NodeJS and in a ES enabled browser.",
-  "version": "0.19.10",
-  "license": "Apache-2.0",
+  "version": "0.19.11",
+  "license": "UNLICENSED",
   "exports": {
     "./browser.js": {
       "default": "./build/src/browser.js",
@@ -19,8 +19,6 @@
     },
     "./package.json": "./package.json",
     "./nanoid.js": "./build/src/nanoid.js",
-    "./amf/*.js": "./build/src/amf/*.js",
-    "./amf/*": "./build/src/amf/*",
     "./authorization/*.js": "./build/src/authorization/*.js",
     "./authorization/*": "./build/src/authorization/*",
     "./config/*.js": "./build/src/config/*.js",
@@ -53,7 +51,6 @@
     "./testing/*": "./build/src/testing/*"
   },
   "imports": {
-    "#amf/*": "./src/amf/*",
     "#authorization/*": "./src/authorization/*",
     "#cookies/*": "./src/cookies/*",
     "#data/*": "./src/data/*",
@@ -84,6 +81,7 @@
     "url": "https://github.com/api-client/core/issues"
   },
   "dependencies": {
+    "@api-client/amf-core": "^0.1.2",
     "@api-client/graph": "^0.3.5",
     "@api-client/json": "^0.2.0",
     "@esm-bundle/chai": "^4.3.4-fix.0",
@@ -95,7 +93,6 @@
     "@pawel-up/data-mock": "^0.4.0",
     "@pawel-up/jexl": "^4.0.1",
     "@xmldom/xmldom": "^0.8.11",
-    "amf-json-ld-lib": "^0.0.15",
     "chalk": "^5.4.1",
     "console-table-printer": "^2.11.2",
     "dompurify": "^3.2.6",
@@ -109,10 +106,7 @@
     "@commitlint/cli": "^20.1.0",
     "@commitlint/config-conventional": "^20.0.0",
     "@eslint/js": "^10.0.1",
-    "@japa/api-client": "^3.0.3",
     "@japa/assert": "^4.0.1",
-    "@japa/browser-client": "^2.1.1",
-    "@japa/expect-type": "^2.0.3",
     "@japa/runner": "^5.3.0",
     "@pawel-up/semver": "^0.1.4",
     "@types/chai-as-promised": "^8.0.2",
@@ -128,7 +122,6 @@
     "@web/dev-server-rollup": "^0.6.4",
     "@web/test-runner": "^0.20.0",
     "@web/test-runner-playwright": "^0.11.0",
-    "amf-client-js": "^5.10.0-0",
     "c8": "^11.0.0",
     "chai-as-promised": "^8.0.2",
     "conventional-changelog": "^7.1.0",
@@ -148,7 +141,6 @@
     "prettier": "^3.5.1",
     "schema-org-json-schemas": "^2.1.4",
     "sinon": "^21.0.0",
-    "ts-lit-plugin": "^2.0.2",
     "ts-node-maintained": "^10.9.5",
     "typescript": "^5.5.2",
     "typescript-eslint": "^8.24.1"
@@ -158,7 +150,7 @@
     "build:ts": "tsc --project tsconfig.json",
     "build:node": "tsc --project tsconfig.node.json",
     "build": "npm run build:ts && npm run copy:assets",
-    "prepare": "husky && npm run fixes && npm run build:ts && npm run build:api-models",
+    "prepare": "husky && npm run fixes && npm run build:ts",
     "fixes": "node scripts/fix-rollup-plugin.js",
     "tsc": "tsc",
     "tsc:tests": "tsc --project tsconfig.browser.json",
@@ -169,7 +161,6 @@
     "test:coverage": "npm run test:node:coverage && npm run test:browser",
     "test:node": "node --import ts-node-maintained/register/esm --enable-source-maps bin/test.ts",
     "test:node:coverage": "c8 --reporter lcov --reporter text node --import ts-node-maintained/register/esm --enable-source-maps bin/test.ts",
-    "build:api-models": "node data/model.js",
     "copy:assets": "cp -f ./oauth-popup.html ./build/oauth-popup.html",
     "start": "echo \"Use the npm run dev instead\"",
     "lint": "npm run lint:prettier && npm run lint:eslint",
@@ -184,8 +175,14 @@
     "release:major": "node scripts/release.js major"
   },
   "lint-staged": {
+    "*.js": [
+      "eslint --fix"
+    ],
     "*.ts": [
-      "npm run format"
+      "eslint --fix"
+    ],
+    "*.json": [
+      "prettier --write"
     ]
   },
   "engines": {

package/src/events/EventTypes.ts

@@ -6,10 +6,8 @@ import { ReportingEventTypes } from './reporting/ReportingEventTypes.js'
 import { TelemetryEventTypes } from './telemetry/TelemetryEventTypes.js'
 import { EnvironmentEventTypes } from './environment/EnvironmentEventTypes.js'
 import { TransportEventTypes } from './transport/TransportEventTypes.js'
-import { AmfEventTypes } from './amf/AmfEventTypes.js'
 
 export const EventTypes = Object.freeze({
-  Amf: AmfEventTypes,
   Authorization: AuthorizationEventTypes,
   Cookie: CookieEventTypes,
   Encryption: EncryptionEventTypes,

package/src/events/Events.ts

@@ -6,10 +6,8 @@ import { ReportingEvents } from './reporting/ReportingEvents.js'
 import { TelemetryEvents } from './telemetry/TelemetryEvents.js'
 import { TransportEvent } from './transport/TransportEvents.js'
 import { EnvironmentEvents } from './environment/EnvironmentEvents.js'
-import { AmfEvents } from './amf/AmfEvents.js'
 
 export const Events = Object.freeze({
-  Amf: AmfEvents,
   Authorization: AuthorizationEvents,
   Cookie: CookieEvents,
   Encryption: EncryptionEvents,

package/src/modeling/Bindings.ts

@@ -1,5 +1,5 @@
-import { IApiXmlSerializer } from '../amf/definitions/Shapes.js'
-import { DomainPropertyFormat } from './DataFormat.js'
+import type { Shapes } from '@api-client/amf-core'
+import type { DomainPropertyFormat } from './DataFormat.js'
 
 interface Binding {
   /**
@@ -69,7 +69,7 @@ export interface PropertyWebBindings {
   /**
    * The XML encoding instructions.
    */
-  xml?: IApiXmlSerializer
+  xml?: Shapes.IApiXmlSerializer
   /**
    * Only valid for the `file` property type.
    * The list of file mime types.

package/src/modeling/DomainAssociation.ts

@@ -5,7 +5,7 @@ import { nanoid } from '../nanoid.js'
 import { type IThing, Thing } from '../models/Thing.js'
 import { observed, retargetChange, toRaw } from '../decorators/observed.js'
 import type { DomainEntity } from './DomainEntity.js'
-import type { IApiAssociationShape, IApiPropertyShape } from '../amf/definitions/Shapes.js'
+import type { Shapes } from '@api-client/amf-core'
 import type { AssociationBinding, AssociationBindings, AssociationWebBindings } from './Bindings.js'
 import { DomainAttributeAttribute, DomainAttributeAttributes } from './DataFormat.js'
 import type { AssociationTarget, DomainGraphEdge } from './types.js'
@@ -53,7 +53,7 @@ export interface DomainAssociationSchema extends DomainElementSchema {
    * referenced entities schemas. Note, changes in the referenced entities may not be propagated
    * to schemas altered by the user.
    */
-  schema?: IApiAssociationShape
+  schema?: Shapes.IApiAssociationShape
   /**
    * The list of bindings for this property.
    *
@@ -153,7 +153,7 @@ export class DomainAssociation extends DomainElement {
    * The schema allowing to translate the model into a
    * specific format (like JSON, RAML, XML, etc.)
    */
-  @observed({ deep: true }) accessor schema: IApiAssociationShape | undefined
+  @observed({ deep: true }) accessor schema: Shapes.IApiAssociationShape | undefined
 
   /**
    * The list of bindings for this property.
@@ -351,7 +351,7 @@ export class DomainAssociation extends DomainElement {
    * const schema = association.ensureSchema();
    * ```
    */
-  ensureSchema(): IApiAssociationShape {
+  ensureSchema(): Shapes.IApiAssociationShape {
     if (!this.schema) {
       this.schema = {}
     }
@@ -547,7 +547,7 @@ export class DomainAssociation extends DomainElement {
    *
    * @returns AMF property shape definition.
    */
-  toApiShape(): IApiPropertyShape {
+  toApiShape(): Shapes.IApiPropertyShape {
     const serializer = new ShapeGenerator()
     return serializer.associationProperty(this)
   }

package/src/modeling/DomainEntity.ts

@@ -4,7 +4,8 @@ import { DomainElement, type DomainElementSchema } from './DomainElement.js'
 import { nanoid } from '../nanoid.js'
 import { type IThing, Thing } from '../models/Thing.js'
 import { observed, retargetChange, toRaw } from '../decorators/observed.js'
-import type { IShapeUnion } from '../amf/definitions/Shapes.js'
+import type { Shapes, IShapeRenderOptions } from '@api-client/amf-core'
+import { ApiSchemaGenerator } from '@api-client/amf-core'
 import { DomainProperty, type DomainPropertySchema } from './DomainProperty.js'
 import { RemovePropertyException } from '../exceptions/remove_property_exception.js'
 import { DomainAssociation, DomainAssociationSchema } from './DomainAssociation.js'
@@ -13,8 +14,6 @@ import type { DomainModel } from './DomainModel.js'
 import type { DomainNamespace } from './DomainNamespace.js'
 import { ValidationError } from '../exceptions/validation_error.js'
 import { ShapeGenerator } from './amf/ShapeGenerator.js'
-import type { IShapeRenderOptions } from '../amf/shape/ShapeBase.js'
-import { ApiSchemaGenerator } from '../amf/ApiSchemaGenerator.js'
 import { removeGraphNode } from './GraphUtils.js'
 import { DataSemantics, isEntitySemantic, type SemanticType, type AppliedDataSemantic } from './Semantics.js'
 
@@ -806,7 +805,7 @@ export class DomainEntity extends DomainElement {
    *
    * @returns AMF property shape definition.
    */
-  toApiShape(): IShapeUnion {
+  toApiShape(): Shapes.IShapeUnion {
     const serializer = new ShapeGenerator()
     return serializer.entity(this)
   }

package/src/modeling/DomainProperty.ts

@@ -20,11 +20,10 @@ import { ShapeGenerator } from './amf/ShapeGenerator.js'
 import type { PropertyBinding, PropertyBindings, PropertyWebBindings } from './Bindings.js'
 import type { ModelValidationOptions } from '../models/types.js'
 import type { DomainEntity } from './DomainEntity.js'
-import type { IApiPropertyShape } from '../amf/definitions/Shapes.js'
+import type { Shapes, IShapeRenderOptions } from '@api-client/amf-core'
+import { ApiSchemaGenerator } from '@api-client/amf-core'
 import type { PropertySchema } from './types.js'
 import { DataSemantics, isPropertySemantic, type SemanticType, type AppliedDataSemantic } from './Semantics.js'
-import { ApiSchemaGenerator } from '../amf/ApiSchemaGenerator.js'
-import type { IShapeRenderOptions } from '../amf/shape/ShapeBase.js'
 
 export interface DomainPropertySchema extends DomainElementSchema {
   kind: typeof DomainPropertyKind
@@ -576,7 +575,7 @@ export class DomainProperty extends DomainElement {
    *
    * @returns AMF property shape definition.
    */
-  toApiShape(): IApiPropertyShape {
+  toApiShape(): Shapes.IApiPropertyShape {
     const serializer = new ShapeGenerator()
     return serializer.property(this)
   }

package/src/modeling/ai/types.ts

@@ -1,4 +1,4 @@
-import type { IApiAssociationShape } from '../../amf/definitions/Shapes.js'
+import type { Shapes } from '@api-client/amf-core'
 import type { Exception } from '../../exceptions/exception.js'
 import type { AiSessionSchema } from '../../models/AiSession.js'
 import type { DomainPropertyType } from '../DataFormat.js'
@@ -150,7 +150,7 @@ export interface AiDomainAssociation {
   multiple?: boolean
   onDelete?: OnDeleteRule
   semantics?: AiDomainSemantic[]
-  schema?: IApiAssociationShape
+  schema?: Shapes.IApiAssociationShape
 }
 
 /**

package/src/{amf → modeling/amf}/DataValueGenerator.ts

@@ -1,6 +1,5 @@
-import { nanoid } from '../nanoid.js'
-import uuidV4 from '../lib/uuid.js'
-import { DomainPropertyType } from '../modeling/DataFormat.js'
+import { nanoid } from '../../nanoid.js'
+import { DomainPropertyType } from '../DataFormat.js'
 
 export const noValue = Symbol('noValue')
 
@@ -56,7 +55,7 @@ export class DataValueGenerator {
         // TODO: we need more settings controlling the random string generation.
         return nanoid(8)
       case 'uuid-v4':
-        return uuidV4()
+        return crypto.randomUUID()
       default:
         return noValue
     }

package/src/modeling/amf/ShapeGenerator.ts

@@ -2,31 +2,9 @@ import { type AssociationBindings, type PropertyWebBindings } from '../Bindings.
 import type { DomainAssociation } from '../DomainAssociation.js'
 import type { DomainProperty } from '../DomainProperty.js'
 import type { DomainEntity } from '../DomainEntity.js'
-import { IAmfExampleTypes, modelTypeToAmfDataType } from '../../amf/AmfTypes.js'
-import { AmfNamespace } from '../../amf/definitions/Namespace.js'
-import {
-  anyShape,
-  arrayShape,
-  fileShape,
-  IApiAnyShape,
-  IApiArrayShape,
-  IApiDataExample,
-  IApiFileShape,
-  IApiNodeShape,
-  IApiPropertyShape,
-  IApiRecursiveShape,
-  IApiScalarShape,
-  IApiShape,
-  IApiUnionShape,
-  IShapeUnion,
-  nodeShape,
-  propertyShape,
-  recursiveShape,
-  scalarShape,
-  unionShape,
-} from '../../amf/definitions/Shapes.js'
-import { AmfDataNode } from '../../amf/models/AmfDataNode.js'
-import { DataValueGenerator } from '../../amf/DataValueGenerator.js'
+import { modelTypeToAmfDataType } from './core_types.js'
+import { AmfNamespace, type Shapes, AmfDataNode, AmfTypes, ShapeHelpers } from '@api-client/amf-core'
+import { DataValueGenerator } from './DataValueGenerator.js'
 import { nanoid } from '../../nanoid.js'
 import { DomainEntityKind, DomainPropertyKind } from '../../models/kinds.js'
 import type { PropertySchema } from '../types.js'
@@ -107,13 +85,13 @@ export class ShapeGenerator {
    * const amfShape = generator.entity(myDomainEntity);
    * ```
    */
-  entity(input: DomainEntity, visited = new Set<string>()): IApiNodeShape | IApiRecursiveShape {
+  entity(input: DomainEntity, visited = new Set<string>()): Shapes.IApiNodeShape | Shapes.IApiRecursiveShape {
     if (visited.has(input.key)) {
       // create a recursive shape.
       return this.createRecursiveShape(input)
     }
     visited.add(input.key)
-    const result = nodeShape(input.key)
+    const result = ShapeHelpers.nodeShape(input.key)
     result.id = input.key
     this.updateBaseProperties(input, result)
     result.properties = []
@@ -158,9 +136,9 @@ export class ShapeGenerator {
    * const amfShape = generator.property(myDomainProperty);
    * ```
    */
-  property(input: DomainProperty): IApiPropertyShape {
+  property(input: DomainProperty): Shapes.IApiPropertyShape {
     const { required, key } = input
-    const result = propertyShape(key)
+    const result = ShapeHelpers.propertyShape(key)
     result.path = `${AmfNamespace.aml.vocabularies.data.key}${input.info.name}`
     if (required) {
       result.minCount = 1
@@ -198,9 +176,9 @@ export class ShapeGenerator {
    * const amfShape = generator.associationProperty(myDomainAssociation);
    * ```
    */
-  associationProperty(input: DomainAssociation, visited: Set<string> = new Set<string>()): IApiPropertyShape {
+  associationProperty(input: DomainAssociation, visited: Set<string> = new Set<string>()): Shapes.IApiPropertyShape {
     const { required, key } = input
-    const result = propertyShape(key)
+    const result = ShapeHelpers.propertyShape(key)
     result.path = `${AmfNamespace.aml.vocabularies.data.key}${input.info.name}`
     if (required) {
       result.minCount = 1
@@ -219,7 +197,7 @@ export class ShapeGenerator {
    *                recursive shape generation and avoids infinite loops. Defaults to a new empty `Set`.
    * @returns The range value for the PropertyShape.
    */
-  associationShape(input: DomainAssociation, visited: Set<string> = new Set<string>()): IShapeUnion | undefined {
+  associationShape(input: DomainAssociation, visited: Set<string> = new Set<string>()): Shapes.IShapeUnion | undefined {
     const schema = input.schema
     if (schema && schema.linked) {
       return this.createLinkedShape(input)
@@ -235,7 +213,7 @@ export class ShapeGenerator {
     if (unionType === UNION_TYPE_NOT) {
       // Need to investigate more about "not" union type.
       // AMF supports it, but I am not sure how to handle it.
-      const wrapper = anyShape(input.key)
+      const wrapper = ShapeHelpers.anyShape(input.key)
       wrapper.id = `not-shape-${input.key}`
       wrapper.not = items
       return wrapper
@@ -250,17 +228,20 @@ export class ShapeGenerator {
    * @param input The data association instance.
    * @returns An AMF API scalar shape with the link to the schema.
    */
-  protected createLinkedShape(input: DomainAssociation): IApiScalarShape {
+  protected createLinkedShape(input: DomainAssociation): Shapes.IApiScalarShape {
     // This is a link to the schema. In an API that would be the id
     // of a resource to request the data from.
-    const range = scalarShape(input.key)
+    const range = ShapeHelpers.scalarShape(input.key)
     range.id = `link-${input.key}`
     range.dataType = modelTypeToAmfDataType(DATA_TYPE_STRING)
     return range
   }
 
-  protected createUnionShape(input: DomainAssociation, items: IShapeUnion[]): IApiUnionShape | IApiArrayShape {
-    const range = unionShape(input.key)
+  protected createUnionShape(
+    input: DomainAssociation,
+    items: Shapes.IShapeUnion[]
+  ): Shapes.IApiUnionShape | Shapes.IApiArrayShape {
+    const range = ShapeHelpers.unionShape(input.key)
     this.updateBaseProperties(input, range)
     range.anyOf = []
     const unionType = (input.schema && input.schema.unionType) || UNION_TYPE_ANY_OF
@@ -291,8 +272,8 @@ export class ShapeGenerator {
   associationUnion(
     input: DomainAssociation,
     visited: Set<string> = new Set<string>()
-  ): IShapeUnion | IShapeUnion[] | undefined {
-    const result: IShapeUnion[] = []
+  ): Shapes.IShapeUnion | Shapes.IShapeUnion[] | undefined {
+    const result: Shapes.IShapeUnion[] = []
     for (const item of input.listTargets()) {
       result.push(this.entity(item, visited))
     }
@@ -312,7 +293,7 @@ export class ShapeGenerator {
    *
    * @param input
    */
-  protected getRange(input: DomainProperty): IApiArrayShape | IApiFileShape | IApiScalarShape {
+  protected getRange(input: DomainProperty): Shapes.IApiArrayShape | Shapes.IApiFileShape | Shapes.IApiScalarShape {
     const bindings = input.readBinding('web') as PropertyWebBindings | undefined
     let schema: PropertySchema | undefined
     if (input.schema) {
@@ -339,7 +320,7 @@ export class ShapeGenerator {
    */
   protected setShapeSchema(
     input: DomainProperty,
-    result: IApiAnyShape,
+    result: Shapes.IApiAnyShape,
     schema: PropertySchema,
     type: string,
     isArray?: boolean
@@ -374,8 +355,8 @@ export class ShapeGenerator {
     input: DomainProperty,
     schema?: PropertySchema,
     bindings?: PropertyWebBindings
-  ): IApiArrayShape {
-    const result = arrayShape(input.key)
+  ): Shapes.IApiArrayShape {
+    const result = ShapeHelpers.arrayShape(input.key)
     const { type } = input
     if (type === DATA_TYPE_BINARY) {
       // we do not pass schema to the range generator as we set schema's properties on the array shape.
@@ -384,7 +365,7 @@ export class ShapeGenerator {
       result.items = this.createScalarShape(input, undefined, bindings)
     }
     if (schema) {
-      const type = (result.items as IApiScalarShape).dataType as string
+      const type = (result.items as Shapes.IApiScalarShape).dataType as string
       this.setShapeSchema(input, result, schema, type, input.multiple)
     }
     return result
@@ -394,8 +375,8 @@ export class ShapeGenerator {
     input: DomainProperty,
     schema?: PropertySchema,
     bindings?: PropertyWebBindings
-  ): IApiScalarShape {
-    const result = scalarShape(input.key)
+  ): Shapes.IApiScalarShape {
+    const result = ShapeHelpers.scalarShape(input.key)
     this.updateBaseProperties(input, result)
     this.setScalarCommonProperties(result, input, bindings)
     if (!result.dataType) {
@@ -407,14 +388,14 @@ export class ShapeGenerator {
     return result
   }
 
-  protected createExamples(examples: string[], type: string): IApiDataExample[] {
-    const result: IApiDataExample[] = []
+  protected createExamples(examples: string[], type: string): Shapes.IApiDataExample[] {
+    const result: Shapes.IApiDataExample[] = []
     for (const current of examples) {
-      const item: IApiDataExample = {
+      const item: Shapes.IApiDataExample = {
         id: nanoid(),
         customDomainProperties: [],
         strict: true,
-        types: IAmfExampleTypes,
+        types: [...AmfTypes.IAmfExampleTypes],
         structuredValue: AmfDataNode.scalar(current, type).toJSON(),
       }
       result.push(item)
@@ -422,12 +403,12 @@ export class ShapeGenerator {
     return result
   }
 
-  protected createArrayExamples(examples: string[], type: string): IApiDataExample[] {
-    const item: IApiDataExample = {
+  protected createArrayExamples(examples: string[], type: string): Shapes.IApiDataExample[] {
+    const item: Shapes.IApiDataExample = {
       id: nanoid(),
       customDomainProperties: [],
       strict: true,
-      types: IAmfExampleTypes,
+      types: [...AmfTypes.IAmfExampleTypes],
     }
     const value = new AmfDataNode('array')
     for (const item of examples) {
@@ -438,8 +419,8 @@ export class ShapeGenerator {
     return [item]
   }
 
-  protected createFileShape(input: DomainProperty, bindings?: PropertyWebBindings): IApiFileShape {
-    const result = fileShape(input.key)
+  protected createFileShape(input: DomainProperty, bindings?: PropertyWebBindings): Shapes.IApiFileShape {
+    const result = ShapeHelpers.fileShape(input.key)
     this.updateBaseProperties(input, result)
     if (bindings) {
       if (Array.isArray(bindings.fileTypes)) {
@@ -454,7 +435,7 @@ export class ShapeGenerator {
   }
 
   protected setScalarCommonProperties(
-    result: IApiFileShape | IApiScalarShape,
+    result: Shapes.IApiFileShape | Shapes.IApiScalarShape,
     input: DomainProperty,
     bindings?: PropertyWebBindings
   ): void {
@@ -521,7 +502,10 @@ export class ShapeGenerator {
     }
   }
 
-  protected updateBaseProperties(input: DomainProperty | DomainAssociation | DomainEntity, target: IApiShape): void {
+  protected updateBaseProperties(
+    input: DomainProperty | DomainAssociation | DomainEntity,
+    target: Shapes.IApiShape
+  ): void {
     target.name = input.info.name
     target.displayName = input.info.displayName
     target.description = input.info.description
@@ -532,8 +516,8 @@ export class ShapeGenerator {
     }
   }
 
-  protected createRecursiveShape(input: DomainEntity): IApiRecursiveShape {
-    return recursiveShape(input.key, input.key)
+  protected createRecursiveShape(input: DomainEntity): Shapes.IApiRecursiveShape {
+    return ShapeHelpers.recursiveShape(input.key, input.key)
   }
 
   /**
@@ -544,8 +528,8 @@ export class ShapeGenerator {
    * @param shape The shape to wrap as an array.
    * @returns Array shape.
    */
-  protected refactorShapeToArray(id: string, shape: IShapeUnion): IApiArrayShape {
-    const result = arrayShape(id)
+  protected refactorShapeToArray(id: string, shape: Shapes.IShapeUnion): Shapes.IApiArrayShape {
+    const result = ShapeHelpers.arrayShape(id)
     result.items = shape
     return result
   }

package/src/modeling/amf/core_types.ts

@@ -0,0 +1,47 @@
+import { PropertyWebBindings } from '../Bindings.js'
+import { DomainPropertyType } from '../DataFormat.js'
+import { AmfNamespace } from '@api-client/amf-core'
+
+/**
+ * Translates the DomainProperty type to an AMF data type.
+ * @param type The property data type
+ * @returns AMF shape dataType
+ */
+export function modelTypeToAmfDataType(type: DomainPropertyType, bindings?: PropertyWebBindings): string {
+  if (type === 'number') {
+    if (bindings?.format === 'int32' || bindings?.format === 'int64') {
+      return AmfNamespace.w3.xmlSchema.integer
+    }
+    return AmfNamespace.w3.xmlSchema.number
+  }
+  if (type === 'boolean') {
+    return AmfNamespace.aml.vocabularies.shapes.boolean
+  }
+  if (type === 'date') {
+    return AmfNamespace.w3.xmlSchema.date
+  }
+  if (type === 'datetime') {
+    return AmfNamespace.w3.xmlSchema.dateTime
+  }
+  if (type === 'time') {
+    return AmfNamespace.aml.vocabularies.shapes.dateTimeOnly
+  }
+  if (type === 'binary' && bindings && bindings.format === 'base64') {
+    return AmfNamespace.w3.xmlSchema.base64Binary
+  }
+  return AmfNamespace.w3.xmlSchema.string
+  // switch (type) {
+  //   // case 'nil':
+  //   //   return AmfNamespace.aml.vocabularies.shapes.nil
+  //   // case 'any':
+  //   //   return AmfNamespace.aml.vocabularies.shapes.AnyShape
+  //   default:
+  //     if (type === 'binary' && bindings && bindings.format === 'base64') {
+  //       return AmfNamespace.w3.xmlSchema.base64Binary
+  //     }
+  //     // if (bindings && bindings.format === 'binary') {
+  //     //   return AmfNamespace.w3.xmlSchema.base64Binary
+  //     // }
+  //     return AmfNamespace.w3.xmlSchema.string
+  // }
+}

package/src/models/http-flows/LegacyTranslator.ts

@@ -10,7 +10,7 @@ import {
   DataSourceConfiguration,
 } from '../../models/legacy/actions/Actions.js'
 import { IHttpFlow, IHttpAction, FlowSourceEnum, FlowRequestDataEnum, FlowResponseDataEnum } from './HttpFlows.js'
-import { AmfNamespace } from '../../amf/definitions/Namespace.js'
+import { AmfNamespace } from '@api-client/amf-core'
 import { IHttpStep } from './HttpStep.js'
 import { IReadDataStep, ReadDataStep, ReadDataStepKind } from './steps/data/ReadDataStep.js'
 import { ISetDataStep, SetDataStepKind } from './steps/data/SetDataStep.js'

package/src/runtime/http-runner/HttpFlows.ts

@@ -27,7 +27,7 @@ import { ISubstringStep, SubstringStepKind } from '../../models/http-flows/steps
 import { TrimStepKind } from '../../models/http-flows/steps/transformation/TrimStep.js'
 import { EqualAssertionKind, IEqualAssertion } from '../../models/http-flows/steps/assertion/EqualAssertion.js'
 import { INotEqualAssertion, NotEqualAssertionKind } from '../../models/http-flows/steps/assertion/NotEqualAssertion.js'
-import { ApiSchemaValues } from '../../amf/ApiSchemaValues.js'
+import { ApiSchemaValues } from '@api-client/amf-core'
 import {
   GreaterThanAssertionKind,
   IGreaterThanAssertion,

package/tests/unit/{amf → modeling/amf}/data_value_generator.spec.ts

@@ -1,6 +1,6 @@
 import { test } from '@japa/runner'
-import { DataValueGenerator, noValue } from '../../../src/amf/DataValueGenerator.js'
-import type { DomainPropertyType } from '../../../src/modeling/DataFormat.js'
+import { DataValueGenerator, noValue } from '../../../../src/modeling/amf/DataValueGenerator.js'
+import type { DomainPropertyType } from '../../../../src/modeling/DataFormat.js'
 
 test.group('DataValueGenerator', (group) => {
   let generator: DataValueGenerator