@api-client/core 0.19.9 → 0.19.11

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/DomainValidation.ts

@@ -1,6 +1,6 @@
 import { DataDomainKind } from '../models/kinds.js'
 import { DataDomain } from './DataDomain.js'
-import { DomainImpactReport } from './types.js'
+import type { DomainImpactReport } from './types.js'
 import { AssociationValidation } from './validation/association_validation.js'
 import { EntityValidation } from './validation/entity_validation.js'
 import { PropertyValidation } from './validation/property_validation.js'

package/src/modeling/ExposedEntity.ts

@@ -6,7 +6,7 @@ import { restoreAction } from './actions/index.js'
 import type { ApiModel } from './ApiModel.js'
 import { ensureLeadingSlash, joinPaths } from './helpers/endpointHelpers.js'
 import { AccessRule } from './rules/AccessRule.js'
-import { restoreAccessRule } from './rules/index.js'
+import { type RateLimitRule, restoreAccessRule } from './rules/index.js'
 import { RateLimitingConfiguration } from './rules/RateLimitingConfiguration.js'
 import type { AssociationTarget, ExposeOptions, ExposeParentRef, ExposedEntitySchema } from './types.js'
 
@@ -98,7 +98,7 @@ export class ExposedEntity extends EventTarget {
   /**
    * Optional configuration for rate limiting for this exposure.
    */
-  @observed({ deep: true }) accessor rateLimiting: RateLimitingConfiguration | undefined
+  @observed() accessor rateLimiting: RateLimitingConfiguration | undefined
 
   /**
    * When true, generation for this exposure hit configured limits
@@ -184,7 +184,7 @@ export class ExposedEntity extends EventTarget {
     this.isRoot = init.isRoot
     this.parent = init.parent
     this.exposeOptions = init.exposeOptions
-    this.actions = init.actions ? init.actions.map((a) => restoreAction(a)) : []
+    this.actions = init.actions ? init.actions.map((a) => restoreAction(this, a)) : []
     this.accessRule = init.accessRule ? init.accessRule.map((ar) => restoreAccessRule(ar)) : []
     this.rateLimiting = init.rateLimiting ? new RateLimitingConfiguration(init.rateLimiting) : undefined
     this.truncated = init.truncated
@@ -259,9 +259,7 @@ export class ExposedEntity extends EventTarget {
 
     // Check for collision if this is a root entity
     if (this.isRoot) {
-      const collision = this.api.exposes.find(
-        (e) => e.isRoot && e.key !== this.key && e.collectionPath === normalizedCollection
-      )
+      const collision = this.api.findCollectionPathCollision(normalizedCollection, this.key)
       if (collision) {
         throw new Error(`Collection path "${normalizedCollection}" is already in use by another root entity.`)
       }
@@ -328,7 +326,7 @@ export class ExposedEntity extends EventTarget {
     }
     // Check for collision if this is a root entity (singleton case)
     if (this.isRoot) {
-      const collision = this.api.exposes.find((e) => e.isRoot && e.key !== this.key && e.resourcePath === cleaned)
+      const collision = this.api.findResourcePathCollision(cleaned, this.key)
       if (collision) {
         throw new Error(`Resource path "${cleaned}" is already in use by another root entity.`)
       }
@@ -350,7 +348,7 @@ export class ExposedEntity extends EventTarget {
     // Traverse parents, always joining with the parent's resource path
     let parentKey = this.parent?.key
     while (parentKey) {
-      const parent = this.api.exposes.find((e) => e.key === parentKey)
+      const parent = this.api.exposes.get(parentKey)
       if (!parent) break
       const parentResource = ensureLeadingSlash(parent.resourcePath)
       absolute = joinPaths(parentResource, absolute)
@@ -372,7 +370,7 @@ export class ExposedEntity extends EventTarget {
     // Traverse parents, always joining with the parent's resource path
     let parentKey = this.parent?.key
     while (parentKey) {
-      const parent = this.api.exposes.find((e) => e.key === parentKey)
+      const parent = this.api.exposes.get(parentKey)
       if (!parent) break
       const parentResource = ensureLeadingSlash(parent.resourcePath)
       absolute = joinPaths(parentResource, absolute)
@@ -380,4 +378,60 @@ export class ExposedEntity extends EventTarget {
     }
     return absolute
   }
+
+  /**
+   * Returns all access rules for this exposure, including the ones from all the parents up to the API.
+   */
+  getAllRules(): AccessRule[] {
+    const rules: AccessRule[] = []
+    this.api.accessRule.forEach((rule) => rules.push(rule))
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    let current: ExposedEntity | undefined = this
+    while (current) {
+      if (current.accessRule) {
+        rules.push(...current.accessRule)
+      }
+      current = current.parent ? this.api.exposes.get(current.parent.key) : undefined
+    }
+    return rules
+  }
+
+  /**
+   * Returns all rate limiters for this exposure, including the ones from all the parents up to the API.
+   */
+  getAllRateLimiters(): RateLimitingConfiguration[] {
+    const rateLimiters: RateLimitingConfiguration[] = []
+    if (this.api.rateLimiting) {
+      rateLimiters.push(this.api.rateLimiting)
+    }
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    let current: ExposedEntity | undefined = this
+    while (current) {
+      if (current.rateLimiting) {
+        rateLimiters.push(current.rateLimiting)
+      }
+      current = current.parent ? this.api.exposes.get(current.parent.key) : undefined
+    }
+    return rateLimiters
+  }
+
+  /**
+   * Returns all rate limiter rules for this exposure, including the ones from all the parents up to the API.
+   * Similar to the getAllRules() method, but it flattens the rate limiters into a single list of rules.
+   */
+  getAllRateLimiterRules(): RateLimitRule[] {
+    const rules: RateLimitRule[] = []
+    if (this.api.rateLimiting) {
+      rules.push(...this.api.rateLimiting.rules)
+    }
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
+    let current: ExposedEntity | undefined = this
+    while (current) {
+      if (current.rateLimiting) {
+        rules.push(...current.rateLimiting.rules)
+      }
+      current = current.parent ? this.api.exposes.get(current.parent.key) : undefined
+    }
+    return rules
+  }
 }

package/src/modeling/actions/Action.ts

@@ -2,6 +2,7 @@ import { AccessRule, AccessRuleSchema } from '../rules/AccessRule.js'
 import { RateLimitingConfiguration, RateLimitingConfigurationSchema } from '../rules/RateLimitingConfiguration.js'
 import { observed } from '../../decorators/observed.js'
 import { restoreAccessRule } from '../rules/index.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 /**
  * A base interface for common properties across all actions.
@@ -37,10 +38,13 @@ export interface ActionSchema {
 export class Action extends EventTarget implements ActionSchema {
   @observed() accessor kind: string
   @observed({ deep: true }) accessor accessRule: AccessRule[]
-  @observed({ deep: true }) accessor rateLimiting: RateLimitingConfiguration | undefined
+  @observed() accessor rateLimiting: RateLimitingConfiguration | undefined
 
-  constructor(state: Partial<ActionSchema> = {}) {
+  protected parent: ExposedEntity
+
+  constructor(parent: ExposedEntity, state: Partial<ActionSchema> = {}) {
     super()
+    this.parent = parent
     this.kind = state.kind || ''
     this.accessRule = state.accessRule ? state.accessRule.map((rule) => restoreAccessRule(rule)) : []
     this.rateLimiting = state.rateLimiting ? new RateLimitingConfiguration(state.rateLimiting) : undefined
@@ -62,4 +66,23 @@ export class Action extends EventTarget implements ActionSchema {
     }
     return result
   }
+
+  /**
+   * Returns all access rules for this action, including the ones from all the parents up to the API.
+   */
+  getAllRules(): AccessRule[] {
+    const rules: AccessRule[] = [...this.parent.getAllRules(), ...this.accessRule]
+    return rules
+  }
+
+  /**
+   * Returns all rate limiters for this action, including the ones from all the parents up to the API.
+   */
+  getAllRateLimiters(): RateLimitingConfiguration[] {
+    const rateLimiters = this.parent.getAllRateLimiters()
+    if (this.rateLimiting) {
+      rateLimiters.push(this.rateLimiting)
+    }
+    return rateLimiters
+  }
 }

package/src/modeling/actions/CreateAction.ts

@@ -1,5 +1,6 @@
 import { Action, type ActionSchema } from './Action.js'
 import { observed } from '../../decorators/observed.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 /**
  * Enables adding a new resource to a collection.
@@ -16,8 +17,8 @@ export interface CreateActionSchema extends ActionSchema {
 export class CreateAction extends Action implements CreateActionSchema {
   @observed() override accessor kind: 'create'
 
-  constructor(state: Partial<CreateActionSchema> = {}) {
-    super(state)
+  constructor(parent: ExposedEntity, state: Partial<CreateActionSchema> = {}) {
+    super(parent, state)
     this.kind = 'create'
   }
 

package/src/modeling/actions/DeleteAction.ts

@@ -1,5 +1,6 @@
 import { Action, type ActionSchema } from './Action.js'
 import { observed } from '../../decorators/observed.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 export type DeleteStrategy = 'soft' | 'hard'
 
@@ -33,8 +34,8 @@ export class DeleteAction extends Action implements DeleteActionSchema {
   @observed() accessor strategy: DeleteStrategy
   @observed() accessor retentionPeriod: number
 
-  constructor(state: Partial<DeleteActionSchema> = {}) {
-    super(state)
+  constructor(parent: ExposedEntity, state: Partial<DeleteActionSchema> = {}) {
+    super(parent, state)
     this.kind = 'delete'
     this.strategy = state.strategy || 'soft'
     this.retentionPeriod = state.retentionPeriod ?? 30

package/src/modeling/actions/ListAction.ts

@@ -1,6 +1,7 @@
 import type { PaginationStrategy } from '../types.js'
 import { Action, type ActionSchema } from './Action.js'
 import { observed, toRaw } from '../../decorators/observed.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 /**
  * Enables retrieving a collection of resources.
@@ -35,8 +36,8 @@ export class ListAction extends Action implements ListActionSchema {
   @observed({ deep: true }) accessor filterableFields: string[] = []
   @observed({ deep: true }) accessor sortableFields: string[] = []
 
-  constructor(state: Partial<ListActionSchema> = {}) {
-    super(state)
+  constructor(parent: ExposedEntity, state: Partial<ListActionSchema> = {}) {
+    super(parent, state)
     this.kind = state.kind || 'list'
     this.pagination = state.pagination
       ? { ...state.pagination }

package/src/modeling/actions/ReadAction.ts

@@ -1,5 +1,6 @@
 import { Action, type ActionSchema } from './Action.js'
 import { observed } from '../../decorators/observed.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 /**
  * Enables retrieving a single resource by its ID.
@@ -18,8 +19,8 @@ export interface ReadActionSchema extends ActionSchema {
 export class ReadAction extends Action implements ReadActionSchema {
   @observed() override accessor kind: 'read'
 
-  constructor(state: Partial<ReadActionSchema> = {}) {
-    super(state)
+  constructor(parent: ExposedEntity, state: Partial<ReadActionSchema> = {}) {
+    super(parent, state)
     this.kind = 'read'
   }
 

package/src/modeling/actions/SearchAction.ts

@@ -1,5 +1,6 @@
 import { Action, type ActionSchema } from './Action.js'
 import { observed, toRaw } from '../../decorators/observed.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 /**
  * Enables keyword-based search across specified fields.
@@ -22,8 +23,8 @@ export class SearchAction extends Action implements SearchActionSchema {
   @observed() override accessor kind: 'search'
   @observed({ deep: true }) accessor fields: string[]
 
-  constructor(state: Partial<SearchActionSchema> = {}) {
-    super(state)
+  constructor(parent: ExposedEntity, state: Partial<SearchActionSchema> = {}) {
+    super(parent, state)
     this.kind = 'search'
     this.fields = state.fields ? [...state.fields] : []
   }

package/src/modeling/actions/UpdateAction.ts

@@ -1,5 +1,6 @@
 import { Action, type ActionSchema } from './Action.js'
 import { observed, toRaw } from '../../decorators/observed.js'
+import type { ExposedEntity } from '../ExposedEntity.js'
 
 /**
  * Enables modifying an existing resource.
@@ -25,8 +26,8 @@ export class UpdateAction extends Action implements UpdateActionSchema {
   @observed() override accessor kind: 'update'
   @observed({ deep: true }) accessor allowedMethods: ('PUT' | 'PATCH')[]
 
-  constructor(state: Partial<UpdateActionSchema> = {}) {
-    super(state)
+  constructor(parent: ExposedEntity, state: Partial<UpdateActionSchema> = {}) {
+    super(parent, state)
     this.kind = 'update'
     this.allowedMethods = state.allowedMethods ? [...state.allowedMethods] : ['PATCH']
   }

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
   }