@api-client/ui 0.0.17 → 0.1.1

package/src/elements/amf/ApiNavigation.element.ts

@@ -1,9 +1,15 @@
 import { html, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
-import { ApiDefinitions } from '@api-client/core/browser.js'
 import { styleMap } from 'lit/directives/style-map.js'
 import { classMap } from 'lit/directives/class-map.js'
 import { ifDefined } from 'lit/directives/if-defined.js'
+import type {
+  IApiEndPointWithOperationsListItem,
+  IDocumentationItem,
+  IEndpointItem,
+  INodeShapeItem,
+  ISecurityItem,
+} from '@api-client/core/amf/definitions/Api.js'
 import { ApiSorting } from '../../amf/lib/navigation-layout/ApiSorting.js'
 import { EndpointsTree } from '../../amf/lib/navigation-layout/EndpointsTree.js'
 import { NaturalTree } from '../../amf/lib/navigation-layout/NaturalTree.js'
@@ -72,9 +78,9 @@ export default class ApiNavigation extends ApiElement {
     return [...endpointsInternal]
   }
 
-  protected documentationsInternal?: ApiDefinitions.IDocumentationItem[]
+  protected documentationsInternal?: IDocumentationItem[]
 
-  get documentations(): ApiDefinitions.IDocumentationItem[] | undefined {
+  get documentations(): IDocumentationItem[] | undefined {
     const { documentationsInternal } = this
     if (!documentationsInternal) {
       return undefined
@@ -82,9 +88,9 @@ export default class ApiNavigation extends ApiElement {
     return [...documentationsInternal]
   }
 
-  protected schemasInternal?: ApiDefinitions.INodeShapeItem[]
+  protected schemasInternal?: INodeShapeItem[]
 
-  get schemas(): ApiDefinitions.INodeShapeItem[] | undefined {
+  get schemas(): INodeShapeItem[] | undefined {
     const { schemasInternal } = this
     if (!schemasInternal) {
       return undefined
@@ -92,9 +98,9 @@ export default class ApiNavigation extends ApiElement {
     return [...schemasInternal]
   }
 
-  protected securityInternal?: ApiDefinitions.ISecurityItem[]
+  protected securityInternal?: ISecurityItem[]
 
-  get security(): ApiDefinitions.ISecurityItem[] | undefined {
+  get security(): ISecurityItem[] | undefined {
     const { securityInternal } = this
     if (!securityInternal) {
       return undefined
@@ -120,7 +126,7 @@ export default class ApiNavigation extends ApiElement {
     return [...itemsInternal]
   }
 
-  @state() accessor sourceEndpoints: ApiDefinitions.IApiEndPointWithOperationsListItem[] | undefined
+  @state() accessor sourceEndpoints: IApiEndPointWithOperationsListItem[] | undefined
 
   protected shiftTabPressedInternal?: boolean
 
@@ -580,7 +586,7 @@ export default class ApiNavigation extends ApiElement {
     }
   }
 
-  createFlatTreeItems(items: ApiDefinitions.IApiEndPointWithOperationsListItem[]): ApiDefinitions.IEndpointItem[] {
+  createFlatTreeItems(items: IApiEndPointWithOperationsListItem[]): IEndpointItem[] {
     if (!Array.isArray(items) || !items.length) {
       return []
     }
@@ -840,7 +846,7 @@ export default class ApiNavigation extends ApiElement {
   /**
    * @returns The list of documentation items filtered by the current query.
    */
-  getFilteredDocumentations(): ApiDefinitions.IDocumentationItem[] {
+  getFilteredDocumentations(): IDocumentationItem[] {
     const items = this.documentationsInternal
     if (!Array.isArray(items) || !items.length) {
       return []
@@ -855,7 +861,7 @@ export default class ApiNavigation extends ApiElement {
   /**
    * @returns The list of schemas items filtered by the current query.
    */
-  getFilteredSchemas(): ApiDefinitions.INodeShapeItem[] {
+  getFilteredSchemas(): INodeShapeItem[] {
     const items = this.schemasInternal
     if (!Array.isArray(items) || !items.length) {
       return []
@@ -873,7 +879,7 @@ export default class ApiNavigation extends ApiElement {
   /**
    * @returns The list of security items filtered by the current query.
    */
-  getFilteredSecurity(): ApiDefinitions.ISecurityItem[] {
+  getFilteredSecurity(): ISecurityItem[] {
     const items = this.securityInternal
     if (!Array.isArray(items) || !items.length) {
       return []

package/src/elements/amf/ApiOperationDocument.element.ts

@@ -1,14 +1,20 @@
 import { html, nothing, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
-import {
-  AmfShapes,
-  ApiDefinitions,
-  ApiSchemaGenerator,
-  ApiSchemaValues,
-  AmfNamespace,
-  IHttpRequest,
-} from '@api-client/core/browser.js'
 import { classMap } from 'lit/directives/class-map.js'
+import type {
+  IApiCallback,
+  IApiEndPoint,
+  IApiOperation,
+  IApiParameter,
+  IApiResponse,
+  IApiSecurityRequirement,
+  IApiServer,
+} from '@api-client/core/amf/definitions/Api.js'
+import type { IApiAnyShape, IApiScalarShape, IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
+import { ApiSchemaValues } from '@api-client/core/amf/ApiSchemaValues.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
+import { ApiSchemaGenerator } from '@api-client/core/amf/ApiSchemaGenerator.js'
+import type { IHttpRequest } from '@api-client/core/models/HttpRequest.js'
 import { QueryParameterProcessor } from '../../amf/lib/QueryParameterProcessor.js'
 import { ApiDocumentationBase } from './ApiDocumentationBase.js'
 import { Events } from '../../events/amf/Events.js'
@@ -34,13 +40,13 @@ import '../../define/http/http-snippets.js'
  * @fires tryit
  */
 export default class ApiOperationDocument extends ApiDocumentationBase {
-  protected endpointValue?: ApiDefinitions.IApiEndPoint
+  protected endpointValue?: IApiEndPoint
 
-  protected operationValue?: ApiDefinitions.IApiOperation
+  protected operationValue?: IApiOperation
 
-  protected serversValue?: ApiDefinitions.IApiServer[]
+  protected serversValue?: IApiServer[]
 
-  protected responsesValue?: ApiDefinitions.IApiResponse[]
+  protected responsesValue?: IApiResponse[]
 
   protected serverIdValue?: string
 
@@ -82,14 +88,14 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * The computed list of servers.
    */
-  get servers(): ApiDefinitions.IApiServer[] | undefined {
+  get servers(): IApiServer[] | undefined {
     return this.serversValue
   }
 
   /**
    * The current server in use.
    */
-  get server(): ApiDefinitions.IApiServer | undefined {
+  get server(): IApiServer | undefined {
     const servers = this.serversValue
     const serverId = this.serverIdValue
     let server
@@ -103,7 +109,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     return server
   }
 
-  get operation(): ApiDefinitions.IApiOperation | undefined {
+  get operation(): IApiOperation | undefined {
     return this.operationValue
   }
 
@@ -116,7 +122,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     this.processGraph()
   }
 
-  get endpoint(): ApiDefinitions.IApiEndPoint | undefined {
+  get endpoint(): IApiEndPoint | undefined {
     return this.endpointValue
   }
 
@@ -168,7 +174,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * The computed list of responses for this operation.
    */
-  get responses(): ApiDefinitions.IApiResponse[] | undefined {
+  get responses(): IApiResponse[] | undefined {
     return this.responsesValue
   }
 
@@ -466,12 +472,12 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
       return
     }
     const { queryParameters, queryString } = request
-    let params: ApiDefinitions.IApiParameter[] | undefined
+    let params: IApiParameter[] | undefined
     if (Array.isArray(queryParameters) && queryParameters.length) {
       params = queryParameters
     } else if (queryString) {
       const factory = new QueryParameterProcessor()
-      const items = factory.collectOperationParameters(request.queryString as AmfShapes.IShapeUnion, 'query')
+      const items = factory.collectOperationParameters(request.queryString as IShapeUnion, 'query')
       if (Array.isArray(items) && items.length) {
         params = items.map((i) => i.parameter)
       }
@@ -489,7 +495,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
       if (!parameterName) {
         return
       }
-      const anySchema = schema as AmfShapes.IApiAnyShape
+      const anySchema = schema as IApiAnyShape
       const { defaultValueStr, examples = [] } = anySchema
       if (defaultValueStr) {
         qp[parameterName] = defaultValueStr
@@ -499,7 +505,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
           qp[parameterName] = exp.value
         }
       } else {
-        const value = ApiSchemaValues.generateDefaultValue(schema as AmfShapes.IApiScalarShape)
+        const value = ApiSchemaValues.generateDefaultValue(schema as IApiScalarShape)
         if (value || value === false || value === 0 || value === null) {
           qp[parameterName] = value
         }
@@ -540,7 +546,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     }
     const { examples = [], schema } = payload
     let examplesCopy = [...examples]
-    const anySchema = schema as AmfShapes.IApiAnyShape
+    const anySchema = schema as IApiAnyShape
     if (Array.isArray(anySchema.examples) && anySchema.examples.length) {
       examplesCopy = examplesCopy.concat(anySchema.examples)
     }
@@ -553,7 +559,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
       }
     }
     if (!payloadValue) {
-      payloadValue = ApiSchemaGenerator.asExample(schema as AmfShapes.IShapeUnion, requestMimeType, {
+      payloadValue = ApiSchemaGenerator.asExample(schema as IShapeUnion, requestMimeType, {
         renderExamples: true,
         renderOptional: true,
       })
@@ -587,7 +593,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
       if (!schema || !schema.types.includes(AmfNamespace.aml.vocabularies.shapes.ScalarShape)) {
         return
       }
-      const typedScalar = schema as AmfShapes.IApiScalarShape
+      const typedScalar = schema as IApiScalarShape
       let value = ApiSchemaValues.readInputValue(param, typedScalar, { fromExamples: true })
       if (Array.isArray(value)) {
         value = value.join(',')
@@ -677,7 +683,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the Operation title.
    */
-  protected renderTitle(operation: ApiDefinitions.IApiOperation): TemplateResult {
+  protected renderTitle(operation: IApiOperation): TemplateResult {
     const { name, method, deprecated } = operation
     const label = name || method
     const labelClasses = {
@@ -700,7 +706,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the Operation traits.
    */
-  protected renderTraits(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderTraits(operation: IApiOperation): TemplateResult | string {
     const { extends: traits } = operation
     if (!traits || !traits.length) {
       return ''
@@ -714,7 +720,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the operation summary filed.
    */
-  protected renderSummary(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderSummary(operation: IApiOperation): TemplateResult | string {
     const { summary } = operation
     if (!summary) {
       return ''
@@ -725,7 +731,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the Operation meta information.
    */
-  protected renderMetaData(operation: ApiDefinitions.IApiOperation): TemplateResult[] | string {
+  protected renderMetaData(operation: IApiOperation): TemplateResult[] | string {
     const { operationId } = operation
     const result = []
     if (operationId) {
@@ -740,7 +746,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the deprecated message.
    */
-  protected renderDeprecated(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderDeprecated(operation: IApiOperation): TemplateResult | string {
     const { deprecated } = operation
     if (!deprecated) {
       return ''
@@ -756,7 +762,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the operation's URL.
    */
-  protected renderUrl(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderUrl(operation: IApiOperation): TemplateResult | string {
     if (this.asyncApi) {
       return ''
     }
@@ -790,7 +796,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     `
   }
 
-  protected renderCallbacks(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderCallbacks(operation: IApiOperation): TemplateResult | string {
     const { callbacks } = operation
     if (!Array.isArray(callbacks) || !callbacks.length) {
       return ''
@@ -802,7 +808,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the operation's request documentation element.
    */
-  protected renderCallback(callback: ApiDefinitions.IApiCallback): TemplateResult {
+  protected renderCallback(callback: IApiCallback): TemplateResult {
     const { name, endpoint } = callback
     if (!endpoint) {
       return html``
@@ -840,7 +846,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
    * @param responses The responses to render.
    * @returns The template for the responses selector.
    */
-  protected renderResponseTabs(responses: ApiDefinitions.IApiResponse[]): TemplateResult | string {
+  protected renderResponseTabs(responses: IApiResponse[]): TemplateResult | string {
     const { selectedStatus } = this
     const filtered = responses.filter((item) => !!item.statusCode)
     if (!filtered.length) {
@@ -864,7 +870,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
    * @param responses The responses to render.
    * @returns The template for the currently selected response.
    */
-  protected renderResponseContent(responses: ApiDefinitions.IApiResponse[]): TemplateResult {
+  protected renderResponseContent(responses: IApiResponse[]): TemplateResult {
     const { selectedStatus } = this
     const response = responses.find((item) => item.statusCode === selectedStatus)
     if (!response) {
@@ -885,7 +891,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the security list section.
    */
-  protected renderSecuritySection(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderSecuritySection(operation: IApiOperation): TemplateResult | string {
     const { showSecurity: renderSecurity, securityId } = this
     if (!renderSecurity || !operation || !Array.isArray(operation.security) || !operation.security.length) {
       return ''
@@ -904,7 +910,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     return this.paramsSectionTemplate('Security', 'securityOpened', content)
   }
 
-  protected renderSecurity(security: ApiDefinitions.IApiSecurityRequirement): TemplateResult {
+  protected renderSecurity(security: IApiSecurityRequirement): TemplateResult {
     return html`<api-security-requirement-document
       .domainId="${security.id}"
       .securityRequirement="${security}"
@@ -912,7 +918,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     ></api-security-requirement-document>`
   }
 
-  protected renderSecuritySelector(operation: ApiDefinitions.IApiOperation): TemplateResult {
+  protected renderSecuritySelector(operation: IApiOperation): TemplateResult {
     const { securityId } = this
     const { security } = operation
     return html`
@@ -929,7 +935,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
     `
   }
 
-  protected renderSecurityTab(security: ApiDefinitions.IApiSecurityRequirement): TemplateResult {
+  protected renderSecurityTab(security: IApiSecurityRequirement): TemplateResult {
     const { name, schemes = [], id } = security
     let label = 'unknown'
     if (name) {
@@ -956,7 +962,7 @@ export default class ApiOperationDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the code snippets.
    */
-  protected renderSnippets(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderSnippets(operation: IApiOperation): TemplateResult | string {
     if (!this.renderCodeSnippets || this.asyncApi) {
       return ''
     }

package/src/elements/amf/ApiParameterDocument.element.ts

@@ -1,20 +1,21 @@
 import { html, TemplateResult } from 'lit'
-import { AmfShapes, ApiDefinitions } from '@api-client/core/browser.js'
 import { readPropertyTypeLabel } from '../../amf/lib/Utils.js'
 import { paramNameTemplate, typeValueTemplate, detailsTemplate, pillTemplate } from './SchemaCommonTemplates.js'
 import { ApiDocumentationBase } from './ApiDocumentationBase.js'
+import type { IApiParameter } from '@api-client/core/amf/definitions/Api.js'
+import type { IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
 
 /**
  * A web component that renders the documentation for a single request / response parameter.
  */
 export default class ApiParameterDocument extends ApiDocumentationBase {
-  protected parameterValue?: ApiDefinitions.IApiParameter
+  protected parameterValue?: IApiParameter
 
-  protected schemaValue?: AmfShapes.IShapeUnion
+  protected schemaValue?: IShapeUnion
 
   protected typeLabelValue?: string
 
-  get parameter(): ApiDefinitions.IApiParameter | undefined {
+  get parameter(): IApiParameter | undefined {
     return this.parameterValue
   }
 

package/src/elements/amf/ApiParametrizedSecurityScheme.element.ts

@@ -1,11 +1,16 @@
 import { TemplateResult } from 'lit'
-import { ApiDefinitions, AmfNamespace } from '@api-client/core/browser.js'
+import type {
+  IApiSecurityOAuth2Settings,
+  IApiSecurityScheme,
+  IApiSecuritySettingsUnion,
+} from '@api-client/core/amf/definitions/Api.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
 import ApiSecurityDocumentElement from './ApiSecurityDocument.element.js'
 
 export default class ApiParametrizedSecurityScheme extends ApiSecurityDocumentElement {
-  protected settingsValue: ApiDefinitions.IApiSecuritySettingsUnion | undefined
+  protected settingsValue: IApiSecuritySettingsUnion | undefined
 
-  get settings(): ApiDefinitions.IApiSecuritySettingsUnion | undefined {
+  get settings(): IApiSecuritySettingsUnion | undefined {
     return this.settingsValue
   }
 
@@ -21,7 +26,7 @@ export default class ApiParametrizedSecurityScheme extends ApiSecurityDocumentEl
   /**
    * @returns The template for the security settings, when required.
    */
-  override settingsTemplate(scheme: ApiDefinitions.IApiSecurityScheme): TemplateResult | string {
+  override settingsTemplate(scheme: IApiSecurityScheme): TemplateResult | string {
     const appliedSettings = this.settingsValue
     if (!appliedSettings) {
       return super.settingsTemplate(scheme)
@@ -40,7 +45,7 @@ export default class ApiParametrizedSecurityScheme extends ApiSecurityDocumentEl
       return this.openIdConnectSettingsTemplate(mergedSettings)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.security.OAuth2Settings)) {
-      return this.oAuth2SettingsTemplate(mergedSettings as ApiDefinitions.IApiSecurityOAuth2Settings)
+      return this.oAuth2SettingsTemplate(mergedSettings as IApiSecurityOAuth2Settings)
     }
     return ''
   }
@@ -51,16 +56,16 @@ export default class ApiParametrizedSecurityScheme extends ApiSecurityDocumentEl
    * @returns The merged settings to render.
    */
   protected mergeSettings(
-    applied: ApiDefinitions.IApiSecuritySettingsUnion,
-    scheme: ApiDefinitions.IApiSecuritySettingsUnion
-  ): ApiDefinitions.IApiSecuritySettingsUnion {
-    const result = { ...scheme } as ApiDefinitions.IApiSecuritySettingsUnion
+    applied: IApiSecuritySettingsUnion,
+    scheme: IApiSecuritySettingsUnion
+  ): IApiSecuritySettingsUnion {
+    const result = { ...scheme } as IApiSecuritySettingsUnion
     Object.keys(applied).forEach((key) => {
       if (['id', 'types', 'additionalProperties'].includes(key)) {
         return
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      result[key as keyof ApiDefinitions.IApiSecuritySettingsUnion] = (applied as any)[key]
+      result[key as keyof IApiSecuritySettingsUnion] = (applied as any)[key]
     })
     return result
   }

package/src/elements/amf/ApiPayloadDocument.element.ts

@@ -1,14 +1,14 @@
 import { html, nothing, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
-import { ApiDefinitions } from '@api-client/core/browser.js'
 import { ApiDocumentationBase } from './ApiDocumentationBase.js'
 import { Events } from '../../events/amf/Events.js'
+import type { IApiPayload } from '@api-client/core/amf/definitions/Api.js'
 import '../../define/amf/api-schema-document.js'
 
 export default class ApiPayloadDocument extends ApiDocumentationBase {
-  protected payloadValue: ApiDefinitions.IApiPayload | undefined
+  protected payloadValue: IApiPayload | undefined
 
-  get payload(): ApiDefinitions.IApiPayload | undefined {
+  get payload(): IApiPayload | undefined {
     return this.payloadValue
   }
 
@@ -83,7 +83,7 @@ export default class ApiPayloadDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the payload mime type.
    */
-  protected renderMediaType(payload: ApiDefinitions.IApiPayload): TemplateResult | typeof nothing {
+  protected renderMediaType(payload: IApiPayload): TemplateResult | typeof nothing {
     const { mediaType } = payload
     if (!mediaType) {
       return nothing
@@ -99,7 +99,7 @@ export default class ApiPayloadDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the payload name
    */
-  protected renderName(payload: ApiDefinitions.IApiPayload): TemplateResult | typeof nothing {
+  protected renderName(payload: IApiPayload): TemplateResult | typeof nothing {
     const { name } = payload
     if (!name) {
       return nothing
@@ -110,7 +110,7 @@ export default class ApiPayloadDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the payload's schema
    */
-  protected renderSchema(payload: ApiDefinitions.IApiPayload): TemplateResult {
+  protected renderSchema(payload: IApiPayload): TemplateResult {
     const { schema, mediaType } = payload
     if (!schema) {
       return html`<div class="empty-info">Schema is not defined for this payload.</div>`

package/src/elements/amf/ApiRequest.element.ts

@@ -1,6 +1,7 @@
 import { html, nothing, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
-import { IRequest, IRequestLog } from '@api-client/core/browser.js'
+import type { IRequestLog } from '@api-client/core/models/RequestLog.js'
+import type { IRequest } from '@api-client/core/models/Request.js'
 import { EventTypes } from '../../events/amf/EventTypes.js'
 import { ApiNavigationEvent } from '../../events/amf/NavigationEvents.js'
 import { Oauth2Credentials } from '../authorization/types.js'

package/src/elements/amf/ApiRequestDocument.element.ts

@@ -1,6 +1,5 @@
 import { html, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
-import { AmfShapes, ApiDefinitions } from '@api-client/core/browser.js'
 import { ApiDocumentationBase } from './ApiDocumentationBase.js'
 import { QueryParameterProcessor } from '../../amf/lib/QueryParameterProcessor.js'
 import { Events } from '../../events/amf/Events.js'
@@ -10,14 +9,22 @@ import '../../define/amf/api-payload-document.js'
 import '../../define/amf/api-parameter-document.js'
 import '../../md/radio/ui-radio.js'
 import '../../md/divider/ui-divider.js'
+import { IApiNodeShape, IShapeUnion } from '@api-client/core/amf/definitions/Shapes.js'
+import {
+  IApiEndPoint,
+  IApiParameter,
+  IApiPayload,
+  IApiRequest,
+  IApiServer,
+} from '@api-client/core/amf/definitions/Api.js'
 
 /**
  * A web component that renders the documentation page for an API request object.
  */
 export default class ApiRequestDocument extends ApiDocumentationBase {
-  protected requestValue?: ApiDefinitions.IApiRequest
+  protected requestValue?: IApiRequest
 
-  protected payloadsValue?: ApiDefinitions.IApiPayload[]
+  protected payloadsValue?: IApiPayload[]
 
   /**
    * @returns true when has cookie parameters definition
@@ -55,10 +62,10 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
   /**
    * @returns The combined list of path parameters in the server, endpoint, and the request.
    */
-  get uriParameters(): ApiDefinitions.IApiParameter[] {
+  get uriParameters(): IApiParameter[] {
     const request = this.requestValue
     const { server, endpoint } = this
-    let result: ApiDefinitions.IApiParameter[] = []
+    let result: IApiParameter[] = []
     if (server && Array.isArray(server.variables) && server.variables.length) {
       result = result.concat(server.variables)
     }
@@ -82,7 +89,7 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
     return !!request.queryString
   }
 
-  get payloadValue(): ApiDefinitions.IApiPayload | undefined {
+  get payloadValue(): IApiPayload | undefined {
     const { mimeType } = this
     const payloads = this.payloadsValue
     if (!Array.isArray(payloads) || !payloads.length) {
@@ -94,11 +101,11 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
     return payloads.find((item) => item.mediaType === mimeType)
   }
 
-  get request(): ApiDefinitions.IApiRequest | undefined {
+  get request(): IApiRequest | undefined {
     return this.requestValue
   }
 
-  set request(value: ApiDefinitions.IApiRequest | undefined) {
+  set request(value: IApiRequest | undefined) {
     const old = this.requestValue
     if (old === value) {
       return
@@ -141,13 +148,13 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
    * The current server in use.
    * It adds path parameters defined for the server.
    */
-  @property({ type: Object }) accessor server: ApiDefinitions.IApiServer | undefined
+  @property({ type: Object }) accessor server: IApiServer | undefined
 
   /**
    * The parent endpoint of this request.
    * It adds path parameters defined for the endpoint.
    */
-  @property({ type: Object }) accessor endpoint: ApiDefinitions.IApiEndPoint | undefined
+  @property({ type: Object }) accessor endpoint: IApiEndPoint | undefined
 
   protected queryParametersValue?: OperationParameter[]
 
@@ -203,12 +210,12 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
     if (!request) {
       return
     }
-    const nodeShape = request.queryString as AmfShapes.IApiNodeShape
+    const nodeShape = request.queryString as IApiNodeShape
     if (!nodeShape) {
       return
     }
     const factory = new QueryParameterProcessor()
-    const params = factory.collectOperationParameters(request.queryString as AmfShapes.IShapeUnion, 'query')
+    const params = factory.collectOperationParameters(request.queryString as IShapeUnion, 'query')
     this.queryParametersValue = params
   }
 
@@ -276,7 +283,7 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
       return ''
     }
     const { request } = this
-    let queryParameters: ApiDefinitions.IApiParameter[] = []
+    let queryParameters: IApiParameter[] = []
     if (request && Array.isArray(request.queryParameters)) {
       queryParameters = request.queryParameters
     }
@@ -309,9 +316,7 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
       return ''
     }
     const { request } = this
-    const content = (request as ApiDefinitions.IApiRequest).headers.map((param) =>
-      this.schemaItemTemplate(param, 'header')
-    )
+    const content = (request as IApiRequest).headers.map((param) => this.schemaItemTemplate(param, 'header'))
     return this.paramsSectionTemplate('Headers', 'headersOpened', content)
   }
 
@@ -323,9 +328,7 @@ export default class ApiRequestDocument extends ApiDocumentationBase {
       return ''
     }
     const { request } = this
-    const content = (request as ApiDefinitions.IApiRequest).cookieParameters.map((param) =>
-      this.schemaItemTemplate(param, 'cookie')
-    )
+    const content = (request as IApiRequest).cookieParameters.map((param) => this.schemaItemTemplate(param, 'cookie'))
     return this.paramsSectionTemplate('Cookies', 'cookiesOpened', content)
   }