@api-client/ui 0.0.17 → 0.1.1

package/src/amf/lib/Utils.ts

@@ -1,5 +1,15 @@
-import { AmfNamespace, type ApiDefinitions, type AmfShapes, Headers } from '@api-client/core/browser.js'
+import { Headers } from '@api-client/core/lib/headers/Headers.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
 import sanitizer from 'dompurify'
+import type {
+  IShapeUnion,
+  IApiScalarShape,
+  IApiTupleShape,
+  IApiArrayShape,
+  IApiNodeShape,
+  IApiUnionShape,
+} from '@api-client/core/amf/definitions/Shapes.js'
+import type { IApiParameter, IApiParametrizedDeclaration } from '@api-client/core/amf/definitions/Api.js'
 /**
  * Stops an event and cancels it.
  * @param e The event to stop
@@ -40,7 +50,7 @@ export function schemaToType(value: string): string {
  * @param isArray Used internally
  * @returns Computed label for a shape.
  */
-export function readPropertyTypeLabel(schema: AmfShapes.IShapeUnion, isArray = false): string | undefined {
+export function readPropertyTypeLabel(schema: IShapeUnion, isArray = false): string | undefined {
   if (!schema) {
     return undefined
   }
@@ -49,11 +59,11 @@ export function readPropertyTypeLabel(schema: AmfShapes.IShapeUnion, isArray = f
     return 'Nil'
   }
   if (types.includes(AmfNamespace.aml.vocabularies.shapes.ScalarShape)) {
-    const scalar = schema as AmfShapes.IApiScalarShape
+    const scalar = schema as IApiScalarShape
     return schemaToType(scalar.dataType || '')
   }
   if (types.includes(AmfNamespace.aml.vocabularies.shapes.TupleShape)) {
-    const array = schema as AmfShapes.IApiTupleShape
+    const array = schema as IApiTupleShape
     if (!array.items || !array.items.length) {
       return undefined
     }
@@ -61,7 +71,7 @@ export function readPropertyTypeLabel(schema: AmfShapes.IShapeUnion, isArray = f
     return `List of ${label}`
   }
   if (types.includes(AmfNamespace.aml.vocabularies.shapes.ArrayShape)) {
-    const array = schema as AmfShapes.IApiArrayShape
+    const array = schema as IApiArrayShape
     if (!array.items) {
       return undefined
     }
@@ -72,10 +82,10 @@ export function readPropertyTypeLabel(schema: AmfShapes.IShapeUnion, isArray = f
     return `List of ${label}`
   }
   if (types.includes(AmfNamespace.w3.shacl.NodeShape)) {
-    let { name } = schema as AmfShapes.IApiNodeShape
-    const { properties } = schema as AmfShapes.IApiNodeShape
+    let { name } = schema as IApiNodeShape
+    const { properties } = schema as IApiNodeShape
     if (isArray && properties && properties.length === 1) {
-      const potentialScalar = properties[0].range as AmfShapes.IApiScalarShape
+      const potentialScalar = properties[0].range as IApiScalarShape
       if (potentialScalar.types.includes(AmfNamespace.aml.vocabularies.shapes.ScalarShape)) {
         return schemaToType(potentialScalar.dataType || '')
       }
@@ -87,7 +97,7 @@ export function readPropertyTypeLabel(schema: AmfShapes.IShapeUnion, isArray = f
     return name || 'Object'
   }
   if (types.includes(AmfNamespace.aml.vocabularies.shapes.UnionShape)) {
-    const union = schema as AmfShapes.IApiUnionShape
+    const union = schema as IApiUnionShape
     const items = union.anyOf.map((i) => readPropertyTypeLabel(i))
     return items.join(' or ')
   }
@@ -101,7 +111,7 @@ export function readPropertyTypeLabel(schema: AmfShapes.IShapeUnion, isArray = f
  * @param shapes
  * @returns true when all of passed shapes are scalar.
  */
-function isAllScalar(shapes: AmfShapes.IShapeUnion[] = []): boolean {
+function isAllScalar(shapes: IShapeUnion[] = []): boolean {
   return !shapes.some((i) => !isScalarType(i.types))
 }
 
@@ -109,7 +119,7 @@ function isAllScalar(shapes: AmfShapes.IShapeUnion[] = []): boolean {
  * @param shape
  * @returns true when the passed union type consists of scalar values only. Nil counts as scalar.
  */
-export function isScalarUnion(shape: AmfShapes.IApiUnionShape): boolean {
+export function isScalarUnion(shape: IApiUnionShape): boolean {
   const { anyOf = [], or = [], and = [], xone = [] } = shape
   if (anyOf.length) {
     return isAllScalar(anyOf)
@@ -142,7 +152,7 @@ export function sanitizeHTML(HTML: string): string {
   return result.toString()
 }
 
-export function joinTraitNames(traits: ApiDefinitions.IApiParametrizedDeclaration[]): string {
+export function joinTraitNames(traits: IApiParametrizedDeclaration[]): string {
   const names = traits.map((trait) => trait.name).filter((i) => !!i)
   let value = ''
   if (names.length === 2) {
@@ -200,7 +210,7 @@ export function ensureContentType(headers: string, mime?: string): string {
  * @param schema
  * @returns The name to use in the input.
  */
-export function readLabelValue(parameter: ApiDefinitions.IApiParameter, schema: AmfShapes.IShapeUnion): string {
+export function readLabelValue(parameter: IApiParameter, schema: IShapeUnion): string {
   let label = parameter.paramName || schema.displayName || parameter.name || schema.name || ''
   const { required } = parameter
   if (required) {

package/src/amf/store/AmfGraphStore.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { type AmfDefinitions, uuidV4 } from '@api-client/core/browser.js'
+import { nanoid } from 'nanoid'
+import type { IAmfDomainElement } from '@api-client/core/amf/definitions/Amf.js'
 import { AmfStore } from './AmfStore.js'
 
 /**
@@ -26,8 +27,8 @@ export class AmfGraphStore {
    * @param graph The graph model to use to initialize the store.
    * @returns The store id to be used to reference when querying the store.
    */
-  async add(graph: AmfDefinitions.IAmfDomainElement): Promise<string> {
-    const id = uuidV4()
+  async add(graph: IAmfDomainElement): Promise<string> {
+    const id = nanoid()
     const instance = new AmfStore(this.target, graph)
     this.apis.set(id, instance)
     return id

package/src/amf/store/AmfStore.ts

@@ -1,18 +1,26 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-
-import {
-  type AmfDefinitions,
-  AmfSerializer,
-  type ApiDefinitions,
-  type AmfShapes,
-  type ServersQueryOptions,
-} from '@api-client/core/browser.js'
-import {
+import type { IAmfDocument } from '@api-client/core/amf/definitions/Amf.js'
+import type {
   DocumentMeta,
   ApiEndPointWithOperationsListItem,
   ApiSecuritySchemeListItem,
   ApiNodeShapeListItem,
 } from '../types.js'
+import { AmfSerializer } from '@api-client/core/amf/AmfSerializer.js'
+import type {
+  IApiSummary,
+  IApiEndPoint,
+  IApiServer,
+  IApiOperation,
+  IApiDocumentation,
+  IApiSecurityScheme,
+  IApiSecurityRequirement,
+  IApiRequest,
+  IApiResponse,
+  IApiPayload,
+} from '@api-client/core/amf/definitions/Api.js'
+import type { ServersQueryOptions } from '@api-client/core/amf/AmfMixin.js'
+import type { IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
 
 /**
  * An abstract base class for the store implementation that works with API Components.
@@ -31,7 +39,7 @@ export class AmfStore {
   /**
    * @param target The event target to dispatch the events on.
    */
-  constructor(target: EventTarget = window, graph?: AmfDefinitions.IAmfDocument) {
+  constructor(target: EventTarget = window, graph?: IAmfDocument) {
     this.readonly = true
     this.target = target
     let amf = graph
@@ -62,7 +70,7 @@ export class AmfStore {
   /**
    * @returns API summary for the summary view.
    */
-  async apiSummary(): Promise<ApiDefinitions.IApiSummary | undefined> {
+  async apiSummary(): Promise<IApiSummary | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -84,7 +92,7 @@ export class AmfStore {
    * Reads an endpoint by its id.
    * @param id The domain id of the endpoint.
    */
-  async getEndpoint(id: string): Promise<ApiDefinitions.IApiEndPoint | undefined> {
+  async getEndpoint(id: string): Promise<IApiEndPoint | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -92,7 +100,7 @@ export class AmfStore {
    * Reads an endpoint by its path.
    * @param path The path value of the endpoint or channel name.
    */
-  async getEndpointByPath(path: string): Promise<ApiDefinitions.IApiEndPoint | undefined> {
+  async getEndpointByPath(path: string): Promise<IApiEndPoint | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -108,7 +116,7 @@ export class AmfStore {
    * @param query Server query options
    * @returns The list of servers for given query.
    */
-  async queryServers(query?: ServersQueryOptions): Promise<ApiDefinitions.IApiServer[]> {
+  async queryServers(query?: ServersQueryOptions): Promise<IApiServer[]> {
     throw new Error('Not implemented')
   }
 
@@ -117,7 +125,7 @@ export class AmfStore {
    * @param operationId The domain id of the operation to read.
    * @param endpointId Optional endpoint id. When not set it searches through all endpoints.
    */
-  async getOperation(operationId: string, endpointId?: string): Promise<ApiDefinitions.IApiOperation | undefined> {
+  async getOperation(operationId: string, endpointId?: string): Promise<IApiOperation | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -125,14 +133,14 @@ export class AmfStore {
    * Finds an endpoint that has the operation.
    * @param id Method name or the domain id of the operation to find
    */
-  async getOperationParent(id: string): Promise<ApiDefinitions.IApiEndPoint | undefined> {
+  async getOperationParent(id: string): Promise<IApiEndPoint | undefined> {
     throw new Error('Not implemented')
   }
 
   /**
    * Lists the documentation definitions for the API.
    */
-  async listDocumentations(): Promise<ApiDefinitions.IApiDocumentation[] | undefined> {
+  async listDocumentations(): Promise<IApiDocumentation[] | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -141,7 +149,7 @@ export class AmfStore {
    * @param id The domain id of the documentation object
    * @returns The read documentation.
    */
-  async getDocumentation(id: string): Promise<ApiDefinitions.IApiDocumentation | undefined> {
+  async getDocumentation(id: string): Promise<IApiDocumentation | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -149,7 +157,7 @@ export class AmfStore {
    * Reads the SecurityScheme object from the graph.
    * @param id The domain id of the SecurityScheme
    */
-  async getSecurityScheme(id: string): Promise<ApiDefinitions.IApiSecurityScheme | undefined> {
+  async getSecurityScheme(id: string): Promise<IApiSecurityScheme | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -157,7 +165,7 @@ export class AmfStore {
    * Reads the SecurityRequirement object from the graph.
    * @param id The domain id of the SecurityRequirement
    */
-  async getSecurityRequirement(id: string): Promise<ApiDefinitions.IApiSecurityRequirement | undefined> {
+  async getSecurityRequirement(id: string): Promise<IApiSecurityRequirement | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -172,7 +180,7 @@ export class AmfStore {
    * Reads the Request object from the graph.
    * @param id The domain id of the Request
    */
-  async getRequest(id: string): Promise<ApiDefinitions.IApiRequest | undefined> {
+  async getRequest(id: string): Promise<IApiRequest | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -180,7 +188,7 @@ export class AmfStore {
    * Reads the response data from the graph.
    * @param id The domain id of the response.
    */
-  async getResponse(id: string): Promise<ApiDefinitions.IApiResponse | undefined> {
+  async getResponse(id: string): Promise<IApiResponse | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -188,7 +196,7 @@ export class AmfStore {
    * Reads Payload data from the graph
    * @param id The domain id of the payload
    */
-  async getPayload(id: string): Promise<ApiDefinitions.IApiPayload | undefined> {
+  async getPayload(id: string): Promise<IApiPayload | undefined> {
     throw new Error('Not implemented')
   }
 
@@ -202,7 +210,7 @@ export class AmfStore {
   /**
    * @param id The domain id of the API type (schema).
    */
-  async getType(id: string): Promise<AmfShapes.IShapeUnion | undefined> {
+  async getType(id: string): Promise<IShapeUnion | undefined> {
     throw new Error('Not implemented')
   }
 }

package/src/amf/store/InMemAmfGraphStore.ts

@@ -1,12 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import {
-  type AmfDefinitions,
-  type ApiDefinitions,
-  type AmfShapes,
-  AmfMixin,
-  AmfNamespace,
-  type ServersQueryOptions,
-} from '@api-client/core/browser.js'
 import { StoreEvents } from '../../events/amf/StoreEvents.js'
 import { AmfStore } from './AmfStore.js'
 import {
@@ -15,6 +7,22 @@ import {
   type ApiSecuritySchemeListItem,
   type ApiNodeShapeListItem,
 } from '../types.js'
+import { AmfMixin, ServersQueryOptions } from '@api-client/core/amf/AmfMixin.js'
+import { IAmfDocument, IAmfCreativeWork, IAmfApi, IAmfDomainElement } from '@api-client/core/amf/definitions/Amf.js'
+import {
+  IApiSummary,
+  IApiEndPoint,
+  IApiServer,
+  IApiOperation,
+  IApiDocumentation,
+  IApiSecurityScheme,
+  IApiSecurityRequirement,
+  IApiRequest,
+  IApiResponse,
+  IApiPayload,
+} from '@api-client/core/amf/definitions/Api.js'
+import type { IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
 
 /**
  * The store that provides an API to read data from the AMF graph model.
@@ -26,7 +34,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * @param target The event target to dispatch the events on.
    * @param graph The full API model.
    */
-  constructor(target: EventTarget = window, graph?: AmfDefinitions.IAmfDocument) {
+  constructor(target: EventTarget = window, graph?: IAmfDocument) {
     super(target, graph)
     let amf = graph
     if (Array.isArray(graph)) {
@@ -38,7 +46,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
     this.amf = amf
   }
 
-  override _amfChanged(amf: AmfDefinitions.IAmfDocument): void {
+  override _amfChanged(amf: IAmfDocument): void {
     super._amfChanged(amf)
     this.serializer.amf = amf
     if (this.target) {
@@ -103,7 +111,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
   /**
    * @returns API summary for the summary view.
    */
-  override async apiSummary(): Promise<ApiDefinitions.IApiSummary | undefined> {
+  override async apiSummary(): Promise<IApiSummary | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -149,7 +157,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * @param id The domain id of the endpoint.
    * @private
    */
-  findEndpoint(id: string): ApiDefinitions.IApiEndPoint | undefined {
+  findEndpoint(id: string): IApiEndPoint | undefined {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -170,7 +178,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads an endpoint by its id.
    * @param id The domain id of the endpoint.
    */
-  override async getEndpoint(id: string): Promise<ApiDefinitions.IApiEndPoint | undefined> {
+  override async getEndpoint(id: string): Promise<IApiEndPoint | undefined> {
     return this.findEndpoint(id)
   }
 
@@ -178,7 +186,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads an endpoint by its path.
    * @param path The path value of the endpoint or channel name.
    */
-  override async getEndpointByPath(path: string): Promise<ApiDefinitions.IApiEndPoint | undefined> {
+  override async getEndpointByPath(path: string): Promise<IApiEndPoint | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -223,7 +231,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * @param query Server query options
    * @returns The list of servers for given query.
    */
-  override async queryServers(query?: ServersQueryOptions): Promise<ApiDefinitions.IApiServer[]> {
+  override async queryServers(query?: ServersQueryOptions): Promise<IApiServer[]> {
     const { amf } = this
     if (!amf) {
       return []
@@ -240,7 +248,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * @param operationId The domain id of the operation to read.
    * @param endpointId Optional endpoint id. When not set it searches through all endpoints.
    */
-  findOperation(operationId: string, endpointId?: string): ApiDefinitions.IApiOperation | undefined {
+  findOperation(operationId: string, endpointId?: string): IApiOperation | undefined {
     if (endpointId) {
       const ep = this.findEndpoint(endpointId)
       if (!ep) {
@@ -284,7 +292,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * @param operationId The domain id of the operation to read.
    * @param endpointId Optional endpoint id. When not set it searches through all endpoints.
    */
-  override async getOperation(operationId: string, endpointId?: string): Promise<ApiDefinitions.IApiOperation> {
+  override async getOperation(operationId: string, endpointId?: string): Promise<IApiOperation> {
     const op = this.findOperation(operationId, endpointId)
     if (!op) {
       throw new Error(`No operation ${operationId} in the graph`)
@@ -296,7 +304,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Finds an endpoint that has the operation.
    * @param id Method name or the domain id of the operation to find
    */
-  override async getOperationParent(id: string): Promise<ApiDefinitions.IApiEndPoint | undefined> {
+  override async getOperationParent(id: string): Promise<IApiEndPoint | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -316,7 +324,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
   /**
    * Lists the documentation definitions for the API.
    */
-  override async listDocumentations(): Promise<ApiDefinitions.IApiDocumentation[] | undefined> {
+  override async listDocumentations(): Promise<IApiDocumentation[] | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -333,7 +341,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
       return undefined
     }
     const key = this._getAmfKey(AmfNamespace.aml.vocabularies.core.documentation) as string
-    const docs = this._ensureArray((api as any)[key]) as AmfDefinitions.IAmfCreativeWork[]
+    const docs = this._ensureArray((api as any)[key]) as IAmfCreativeWork[]
     if (docs) {
       return docs.map((doc) => this.serializer.documentation(doc))
     }
@@ -345,7 +353,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * @param id The domain id of the documentation object
    * @returns The read documentation.
    */
-  override async getDocumentation(id: string): Promise<ApiDefinitions.IApiDocumentation | undefined> {
+  override async getDocumentation(id: string): Promise<IApiDocumentation | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -354,7 +362,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
     // when we have loaded Documentation fragment then the id doesn't matter.
     if (types.includes(AmfNamespace.aml.vocabularies.apiContract.UserDocumentationFragment)) {
       const encodes = this._computeEncodes(amf)
-      return this.serializer.documentation(encodes as AmfDefinitions.IAmfApi)
+      return this.serializer.documentation(encodes as IAmfApi)
     }
     const api = this._computeApi(amf)
     if (!api) {
@@ -372,7 +380,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads the SecurityScheme object from the graph.
    * @param id The domain id of the SecurityScheme
    */
-  override async getSecurityScheme(id: string): Promise<ApiDefinitions.IApiSecurityScheme | undefined> {
+  override async getSecurityScheme(id: string): Promise<IApiSecurityScheme | undefined> {
     const types = this.getDocumentTypes()
     // when we have loaded Security fragment then the id doesn't matter.
     if (types.includes(AmfNamespace.aml.vocabularies.security.SecuritySchemeFragment)) {
@@ -381,7 +389,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
         return undefined
       }
       const encodes = this._computeEncodes(amf)
-      return this.serializer.securityScheme(encodes as AmfDefinitions.IAmfApi)
+      return this.serializer.securityScheme(encodes as IAmfApi)
     }
     const object = this.findSecurityScheme(id)
     if (!object) {
@@ -394,7 +402,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads the SecurityRequirement object from the graph.
    * @param id The domain id of the SecurityRequirement
    */
-  override async getSecurityRequirement(id: string): Promise<ApiDefinitions.IApiSecurityRequirement | undefined> {
+  override async getSecurityRequirement(id: string): Promise<IApiSecurityRequirement | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -449,7 +457,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads the Request object from the graph.
    * @param id The domain id of the Request
    */
-  override async getRequest(id: string): Promise<ApiDefinitions.IApiRequest | undefined> {
+  override async getRequest(id: string): Promise<IApiRequest | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -485,7 +493,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads the response data from the graph.
    * @param id The domain id of the response.
    */
-  override async getResponse(id: string): Promise<ApiDefinitions.IApiResponse | undefined> {
+  override async getResponse(id: string): Promise<IApiResponse | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -520,7 +528,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
   /**
    * Finds a payload in a request or a response object.
    */
-  findPayload(object: AmfDefinitions.IAmfDomainElement, domainId: string): ApiDefinitions.IApiPayload | undefined {
+  findPayload(object: IAmfDomainElement, domainId: string): IApiPayload | undefined {
     const list = (object as any)[this._getAmfKey(AmfNamespace.aml.vocabularies.apiContract.payload) as string]
     if (!Array.isArray(list) || !list.length) {
       return undefined
@@ -536,7 +544,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
    * Reads Payload data from the graph
    * @param id The domain id of the payload
    */
-  override async getPayload(id: string): Promise<ApiDefinitions.IApiPayload | undefined> {
+  override async getPayload(id: string): Promise<IApiPayload | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -600,7 +608,7 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
   /**
    * @param id The domain id of the API type (schema).
    */
-  override async getType(id: string): Promise<AmfShapes.IShapeUnion | undefined> {
+  override async getType(id: string): Promise<IShapeUnion | undefined> {
     const { amf } = this
     if (!amf) {
       return undefined
@@ -609,15 +617,11 @@ export class InMemAmfGraphStore extends AmfMixin(AmfStore) {
     // when we have loaded Type fragment then the id doesn't matter.
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.DataTypeFragment)) {
       const encodes = this._computeEncodes(amf)
-      return this.serializer.unknownShape(encodes as AmfDefinitions.IAmfApi)
+      return this.serializer.unknownShape(encodes as IAmfApi)
     }
     const declares = this._computeDeclares(amf)
     const references = this._computeReferences(amf)
-    const type = this._computeType(
-      declares as AmfDefinitions.IAmfDomainElement[],
-      references as AmfDefinitions.IAmfDomainElement[],
-      id
-    )
+    const type = this._computeType(declares as IAmfDomainElement[], references as IAmfDomainElement[], id)
     if (!type) {
       return undefined
     }

package/src/amf/types.ts

@@ -1,4 +1,11 @@
-import type { ApiDefinitions, AmfShapes } from '@api-client/core/browser.js'
+import type {
+  IApiDocumentation,
+  IApiEndPoint,
+  IApiParameter,
+  IApiSecurityRequirement,
+  IApiServer,
+} from '@api-client/core/amf/definitions/Api.js'
+import type { IApiDataExample, IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
 
 export interface PopulationInfo {
   annotationName: string
@@ -17,11 +24,11 @@ export interface OperationParameter {
    * The parameter definition transformed from the AMF graph model.
    * This is set for path, query, and header parameters.
    */
-  parameter: ApiDefinitions.IApiParameter
+  parameter: IApiParameter
   /**
    * The schema associated with the parameter. Determines the shape of the user input control.
    */
-  schema?: AmfShapes.IShapeUnion
+  schema?: IShapeUnion
   /**
    * Link to `parameter.id`.
    */
@@ -43,7 +50,7 @@ export interface OperationParameter {
 export interface SecuritySelectorListItem {
   types: (string | undefined)[]
   labels: (string | undefined)[]
-  security: ApiDefinitions.IApiSecurityRequirement
+  security: IApiSecurityRequirement
 }
 
 export interface ParameterRenderOptions {
@@ -72,12 +79,12 @@ export interface ComputeBaseUriOptions {
    * When the `baseUri` is set this value is ignored.
    * When both are missing then the URL computations ignores the base URI part and reads the path only.
    */
-  server?: ApiDefinitions.IApiServer
+  server?: IApiServer
   /**
    * The endpoint definition used to compute path of the URL.
    * When not set it ignores the path part.
    */
-  endpoint?: ApiDefinitions.IApiEndPoint
+  endpoint?: IApiEndPoint
   /**
    * The protocols to use with the computation of the URL.
    * When the server has no protocol (http or https) defined on the base URI
@@ -97,7 +104,7 @@ export interface ComputeBaseUriOptions {
 }
 
 // export interface OperationParameter {
-//   parameter: ApiDefinitions.IApiParameter;
+//   parameter: IApiParameter;
 //   schema?: ApiShapeUnion;
 //   paramId: string;
 //   schemaId?: string;
@@ -218,10 +225,7 @@ export declare interface EndpointItem extends ApiEndpointsTreeItem, SelectableMe
 export declare interface OperationItem extends ApiOperationListItem, SelectableMenuItem, EditableMenuItem {}
 export declare interface NodeShapeItem extends ApiNodeShapeListItem, SelectableMenuItem, EditableMenuItem {}
 export declare interface SecurityItem extends ApiSecuritySchemeListItem, SelectableMenuItem {}
-export declare interface DocumentationItem
-  extends ApiDefinitions.IApiDocumentation,
-    SelectableMenuItem,
-    EditableMenuItem {}
+export declare interface DocumentationItem extends IApiDocumentation, SelectableMenuItem, EditableMenuItem {}
 export declare type SchemaAddType = 'scalar' | 'object' | 'file' | 'array' | 'union'
 
 export declare interface TargetModel {
@@ -233,7 +237,7 @@ export declare interface TargetModel {
   _basePaths?: string[]
 }
 
-export declare interface SchemaExample extends AmfShapes.IApiDataExample {
+export declare interface SchemaExample extends IApiDataExample {
   /**
    * The value to render as the example value.
    */

package/src/bindings/base/ConfigurationBindings.ts

@@ -1,6 +1,6 @@
-import { TelemetryConfig } from '@api-client/core/browser.js'
 import { PlatformBindings } from './PlatformBindings.js'
 import { EventTypes } from '../../events/EventTypes.js'
+import type { TelemetryConfig } from '@api-client/core/config/index.js'
 
 export const KeyPrefix = 'api-client.config.'
 export const TelemetryKey = `${KeyPrefix}telemetry`

package/src/bindings/base/IoThread.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-console */
-import { ApiError } from '@api-client/core/browser.js'
+import { ApiError } from '@api-client/core/runtime/store/Errors.js'
 import { type IoEvent, type IoCommand, type IoNotification } from './PlatformBindings.js'
 
 /**

package/src/bindings/base/PlatformBindings.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-function-type */
-import { ApiError, type IApiError } from '@api-client/core/browser.js'
+import { ApiError, type IApiError } from '@api-client/core/runtime/store/Errors.js'
 import { Events } from '../../events/Events.js'
 
 /**

package/src/bindings/web/WebConfigurationBindings.ts

@@ -1,5 +1,4 @@
 import { get, set, del } from 'idb-keyval'
-import type { TelemetryConfig } from '@api-client/core/browser.js'
 import {
   ConfigurationBindings,
   type LocalConfiguration,
@@ -8,6 +7,7 @@ import {
   TelemetryKey,
 } from '../base/ConfigurationBindings.js'
 import { ConfigBroadcast, ConfigBroadcastChannel } from '../../lib/config/Config.js'
+import type { TelemetryConfig } from '@api-client/core/config/index.js'
 
 /**
  * The background worker supporting application configuration.

package/src/code-snippets/Bash/CurlSnippet.ts

@@ -1,4 +1,5 @@
-import { type Payload, type Headers } from '@api-client/core/browser.js'
+import type { Payload } from '@api-client/core/lib/transformers/PayloadSerializer.js'
+import type { Headers } from '@api-client/core/lib/headers/Headers.js'
 import CodeSnippet from '../CodeSnippet.js'
 import 'prismjs/components/prism-bash.min.js'
 

package/src/code-snippets/C/CcurlSnippet.ts

@@ -1,4 +1,5 @@
-import type { Payload, Headers } from '@api-client/core/browser.js'
+import type { Payload } from '@api-client/core/lib/transformers/PayloadSerializer.js'
+import type { Headers } from '@api-client/core/lib/headers/Headers.js'
 import CodeSnippet from '../CodeSnippet.js'
 
 export default class CcurlSnippet extends CodeSnippet {