@api-client/ui 0.0.17 → 0.1.0

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

@@ -1,20 +1,23 @@
 import { html, nothing, TemplateResult } from 'lit'
 import { property, state } from 'lit/decorators.js'
 import { classMap } from 'lit/directives/class-map.js'
-import {
-  uuidV4,
-  Headers,
-  ApiDefinitions,
-  AmfShapes,
-  EventUtils,
-  Events as CoreEvents,
-  Request,
-  IRequest,
-  IRequestProxyInit,
-  HttpRequestKind,
-  IProxyResult,
-  IRequestLog,
-} from '@api-client/core/browser.js'
+import { nanoid } from 'nanoid'
+import { Headers } from '@api-client/core/lib/headers/Headers.js'
+import type {
+  IApiEndPoint,
+  IApiOperation,
+  IApiParameter,
+  IApiPayload,
+  IApiServer,
+} from '@api-client/core/amf/definitions/Api.js'
+import { IRequestProxyInit } from '@api-client/core/proxy/RequestProxy.js'
+import { IProxyResult } from '@api-client/core/proxy/Proxy.js'
+import { IRequestLog } from '@api-client/core/models/RequestLog.js'
+import { Request, type IRequest } from '@api-client/core/models/Request.js'
+import { IApiScalarNode } from '@api-client/core/amf/definitions/Shapes.js'
+import { Kind as HttpRequestKind } from '@api-client/core/models/HttpRequest.js'
+import { cancelEvent } from '@api-client/core/lib/events/Utils.js'
+import { Events as CoreEvents } from '@api-client/core/events/Events.js'
 import { ensureContentType, generateHeaders } from '../../amf/lib/Utils.js'
 import { cachePayloadValue, getPayloadValue, PayloadInfo, readCachePayloadValue } from '../../amf/lib/PayloadUtils.js'
 import {
@@ -184,13 +187,13 @@ export default class ApiRequestEditor extends ApiElement {
     this.processDebounce()
   }
 
-  protected endpointValue: ApiDefinitions.IApiEndPoint | undefined
+  protected endpointValue: IApiEndPoint | undefined
 
-  get endpoint(): ApiDefinitions.IApiEndPoint | undefined {
+  get endpoint(): IApiEndPoint | undefined {
     return this.endpointValue
   }
 
-  set endpoint(value: ApiDefinitions.IApiEndPoint | undefined) {
+  set endpoint(value: IApiEndPoint | undefined) {
     const old = this.endpointValue
     if (old === value) {
       return
@@ -241,18 +244,18 @@ export default class ApiRequestEditor extends ApiElement {
     this.requestUpdate('baseUri', old)
   }
 
-  protected serversValue: ApiDefinitions.IApiServer[] | undefined
+  protected serversValue: IApiServer[] | undefined
 
   /**
    * The computed list of servers.
    */
-  get servers(): ApiDefinitions.IApiServer[] | undefined {
+  get servers(): IApiServer[] | undefined {
     return this.serversValue
   }
 
-  protected serverLocalValue: ApiDefinitions.IApiServer | undefined
+  protected serverLocalValue: IApiServer | undefined
 
-  get server(): ApiDefinitions.IApiServer | undefined {
+  get server(): IApiServer | undefined {
     return this.serverLocalValue
   }
 
@@ -300,13 +303,13 @@ export default class ApiRequestEditor extends ApiElement {
   /**
    * The currently rendered payload, if any.
    */
-  get payload(): ApiDefinitions.IApiPayload | undefined {
+  get payload(): IApiPayload | undefined {
     const { payloads } = this
     if (!payloads) {
       return undefined
     }
     const { mimeType } = this
-    let payload: ApiDefinitions.IApiPayload | undefined
+    let payload: IApiPayload | undefined
     if (mimeType) {
       payload = payloads.find((i) => i.mediaType === mimeType)
     }
@@ -319,7 +322,7 @@ export default class ApiRequestEditor extends ApiElement {
   /**
    * The list of all possible payloads for this operation.
    */
-  get payloads(): ApiDefinitions.IApiPayload[] | undefined {
+  get payloads(): IApiPayload[] | undefined {
     const operation = this.operationValue
     if (!operation) {
       return undefined
@@ -385,7 +388,7 @@ export default class ApiRequestEditor extends ApiElement {
    * Set when the selection change, this is a JS object created form the
    * supportedOperation definition of the AMF graph.
    */
-  protected operationValue?: ApiDefinitions.IApiOperation
+  protected operationValue?: IApiOperation
 
   /**
    * The list of parameter groups that are opened when `allowHideOptional` is set.
@@ -733,7 +736,7 @@ export default class ApiRequestEditor extends ApiElement {
     if (!request) {
       return
     }
-    const uri: ApiDefinitions.IApiParameter[] = []
+    const uri: IApiParameter[] = []
     if (Array.isArray(request.uriParameters)) {
       // OAS has this weird thing where you can define URI parameters on the endpoint and the operation.
       // this eliminates the duplicates and merges the schemas
@@ -808,7 +811,7 @@ export default class ApiRequestEditor extends ApiElement {
   /**
    * Appends a list of parameters to the list of rendered parameters
    */
-  protected appendToParams(list: ApiDefinitions.IApiParameter[], source: string): void {
+  protected appendToParams(list: IApiParameter[], source: string): void {
     const params = this.amfParameters.parametersValue
     if (Array.isArray(list)) {
       list.forEach((param) => {
@@ -972,7 +975,7 @@ export default class ApiRequestEditor extends ApiElement {
       throw new Error(`No API operation defined on the editor`)
     }
     const method = (op.method || 'get').toUpperCase()
-    const params: ApiDefinitions.IApiParameter[] = []
+    const params: IApiParameter[] = []
     const { amfParameters } = this
     amfParameters.parametersValue.forEach((item) => {
       const { parameter, enabled } = item
@@ -1053,8 +1056,7 @@ export default class ApiRequestEditor extends ApiElement {
       allAnnotated.forEach((item) => {
         const { parameter, paramId } = item
         const hasAnnotation = (parameter.customDomainProperties || []).some(
-          (prop) =>
-            prop.name === annotationName && (prop.extension as AmfShapes.IApiScalarNode).value === annotationValue
+          (prop) => prop.name === annotationName && (prop.extension as IApiScalarNode).value === annotationValue
         )
         if (!hasAnnotation) {
           return
@@ -1180,7 +1182,7 @@ export default class ApiRequestEditor extends ApiElement {
     if (!['query', 'header'].includes(type as string)) {
       return
     }
-    const id = uuidV4()
+    const id = nanoid()
     const param: OperationParameter = {
       binding: type || '',
       source: 'custom',
@@ -1431,7 +1433,7 @@ export default class ApiRequestEditor extends ApiElement {
           readOnly
           name="authorization"
           .value="${finalValue || ''}"
-          @select="${EventUtils.cancelEvent}"
+          @select="${cancelEvent}"
         >
           <ui-icon icon="arrowDropDown" role="presentation" slot="suffix"></ui-icon>
         </ui-text-field>

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

@@ -1,7 +1,11 @@
 import { html, nothing, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
 import { classMap } from 'lit/directives/class-map.js'
-import { AmfNamespace, ApiDefinitions, IHttpRequest, IRequest, SecurityProcessor } from '@api-client/core/browser.js'
+import type { IRequest } from '@api-client/core/models/Request.js'
+import type { IApiEndPoint, IApiOperation, IApiServer } from '@api-client/core/amf/definitions/Api.js'
+import { SecurityProcessor } from '@api-client/core/authorization/lib/SecurityProcessor.js'
+import { IHttpRequest } from '@api-client/core/models/HttpRequest.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
 import { ApiDocumentationBase } from './ApiDocumentationBase.js'
 import { joinTraitNames } from '../../amf/lib/Utils.js'
 import * as UrlLib from '../../amf/lib/UrlUtils.js'
@@ -29,11 +33,11 @@ interface SnippetInfo {
  * @fires tryit
  */
 export default class ApiResourceDocument extends ApiDocumentationBase {
-  protected endpointValue?: ApiDefinitions.IApiEndPoint
+  protected endpointValue?: IApiEndPoint
 
-  protected serverInternal?: ApiDefinitions.IApiServer
+  protected serverInternal?: IApiServer
 
-  protected serversValue?: ApiDefinitions.IApiServer[]
+  protected serversValue?: IApiServer[]
 
   protected operationIdValue?: string
 
@@ -53,7 +57,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
 
   protected processSelectionTimeout?: number
 
-  get endpoint(): ApiDefinitions.IApiEndPoint | undefined {
+  get endpoint(): IApiEndPoint | undefined {
     return this.endpointValue
   }
 
@@ -107,7 +111,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
     this.requestUpdate()
   }
 
-  get server(): ApiDefinitions.IApiServer | undefined {
+  get server(): IApiServer | undefined {
     if (this.serverInternal) {
       return this.serverInternal
     }
@@ -134,7 +138,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
   /**
    * The list of the servers read from the API and the endpoint.
    */
-  get servers(): ApiDefinitions.IApiServer[] | undefined {
+  get servers(): IApiServer[] | undefined {
     return this.serversValue
   }
 
@@ -485,7 +489,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the Operation title.
    */
-  protected renderTitle(endpoint: ApiDefinitions.IApiEndPoint): TemplateResult | string {
+  protected renderTitle(endpoint: IApiEndPoint): TemplateResult | string {
     const { name, path } = endpoint
     const label = name || path
     if (!label) {
@@ -517,7 +521,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the list of operations.
    */
-  protected renderOperations(endpoint: ApiDefinitions.IApiEndPoint): TemplateResult | string {
+  protected renderOperations(endpoint: IApiEndPoint): TemplateResult | string {
     const { operations } = endpoint
     if (!operations.length) {
       return ''
@@ -531,10 +535,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
    * @param operation The operation to render.
    * @returns The template for the API operation.
    */
-  protected renderOperation(
-    endpoint: ApiDefinitions.IApiEndPoint,
-    operation: ApiDefinitions.IApiOperation
-  ): TemplateResult {
+  protected renderOperation(endpoint: IApiEndPoint, operation: IApiOperation): TemplateResult {
     const { serverId, baseUri, tryItPanel, tryItButton, asyncApi } = this
     const renderTryIt = !tryItPanel && !asyncApi && !!tryItButton
     const classes = {
@@ -567,7 +568,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
    * @param operation The operation to render.
    * @returns The template for the try it column panel rendered next to the operation documentation/
    */
-  protected renderTryItColumn(operation: ApiDefinitions.IApiOperation): TemplateResult | string {
+  protected renderTryItColumn(operation: IApiOperation): TemplateResult | string {
     if (this.asyncApi) {
       return ''
     }
@@ -584,7 +585,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
    * @param operation The operation to render.
    * @returns The template for the request editor.
    */
-  protected renderHttpRequest(operation: ApiDefinitions.IApiOperation): TemplateResult {
+  protected renderHttpRequest(operation: IApiOperation): TemplateResult {
     const content = html`
       <api-request
         .domainId="${operation.id}"
@@ -611,7 +612,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
    * @param operation The operation to render.
    * @returns The template for the request's code snippets.
    */
-  protected renderCodeSnippetsPanel(operation: ApiDefinitions.IApiOperation): TemplateResult | typeof nothing {
+  protected renderCodeSnippetsPanel(operation: IApiOperation): TemplateResult | typeof nothing {
     const values = this.snippetsInternal[operation.id]
     if (!values || !values.value) {
       return nothing
@@ -637,7 +638,7 @@ export default class ApiResourceDocument extends ApiDocumentationBase {
   /**
    * @return The template for the endpoint's extensions.
    */
-  protected renderExtensions(endpoint: ApiDefinitions.IApiEndPoint): TemplateResult | typeof nothing {
+  protected renderExtensions(endpoint: IApiEndPoint): TemplateResult | typeof nothing {
     const { extends: extensions } = endpoint
     if (!extensions || !extensions.length) {
       return nothing

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

@@ -1,6 +1,11 @@
 import { html, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
-import { ApiDefinitions } from '@api-client/core/browser.js'
+import type {
+  IApiIriTemplateMapping,
+  IApiPayload,
+  IApiResponse,
+  IApiTemplatedLink,
+} from '@api-client/core/amf/definitions/Api.js'
 import { ApiDocumentationBase } from './ApiDocumentationBase.js'
 import { Events } from '../../events/amf/Events.js'
 import RadioElement from '../../md/radio/internals/RadioElement.js'
@@ -12,9 +17,9 @@ import '../../md/radio/ui-radio.js'
  * A web component that renders the documentation page for an API response object.
  */
 export default class ApiResponseDocument extends ApiDocumentationBase {
-  protected responseValue?: ApiDefinitions.IApiResponse
+  protected responseValue?: IApiResponse
 
-  protected payloadsValue?: ApiDefinitions.IApiPayload[]
+  protected payloadsValue?: IApiPayload[]
 
   /**
    * @returns true when has headers parameters definition
@@ -27,7 +32,7 @@ export default class ApiResponseDocument extends ApiDocumentationBase {
     return Array.isArray(response.headers) && !!response.headers.length
   }
 
-  get payloadValue(): ApiDefinitions.IApiPayload | undefined {
+  get payloadValue(): IApiPayload | undefined {
     const { mimeType } = this
     const payloads = this.payloadsValue
     if (!Array.isArray(payloads) || !payloads.length) {
@@ -39,12 +44,12 @@ export default class ApiResponseDocument extends ApiDocumentationBase {
     return payloads.find((item) => item.mediaType === mimeType)
   }
 
-  get response(): ApiDefinitions.IApiResponse | undefined {
+  get response(): IApiResponse | undefined {
     return this.responseValue
   }
 
   @property({ type: Object })
-  set response(value: ApiDefinitions.IApiResponse | undefined) {
+  set response(value: IApiResponse | undefined) {
     const old = this.responseValue
     if (old === value) {
       return
@@ -228,7 +233,7 @@ export default class ApiResponseDocument extends ApiDocumentationBase {
   /**
    * @returns A template for the link
    */
-  protected renderLink(link: ApiDefinitions.IApiTemplatedLink): TemplateResult {
+  protected renderLink(link: IApiTemplatedLink): TemplateResult {
     const { name, mapping, operationId } = link
     return html`
       <div class="link-header text-selectable">${name}</div>
@@ -255,7 +260,7 @@ export default class ApiResponseDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the link's operation
    */
-  protected renderLinkMappings(mappings?: ApiDefinitions.IApiIriTemplateMapping[]): TemplateResult | string {
+  protected renderLinkMappings(mappings?: IApiIriTemplateMapping[]): TemplateResult | string {
     if (!mappings) {
       return ''
     }
@@ -273,7 +278,7 @@ export default class ApiResponseDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the link's operation
    */
-  protected renderLinkMapping(mapping: ApiDefinitions.IApiIriTemplateMapping): TemplateResult {
+  protected renderLinkMapping(mapping: IApiIriTemplateMapping): TemplateResult {
     const { linkExpression, templateVariable } = mapping
     return html`
       <tr>

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

@@ -1,7 +1,21 @@
 import { html, PropertyValues, TemplateResult } from 'lit'
 import { property } from 'lit/decorators.js'
-import { AmfNamespace, ApiSchemaGenerator, AmfShapes } from '@api-client/core/browser.js'
 import { classMap } from 'lit/directives/class-map.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
+import type {
+  IApiAnyShape,
+  IApiArrayShape,
+  IApiFileShape,
+  IApiNodeShape,
+  IApiPropertyShape,
+  IApiScalarShape,
+  IApiSchemaShape,
+  IApiShape,
+  IApiTupleShape,
+  IApiUnionShape,
+  IShapeUnion,
+} from '@api-client/core/amf/definitions/Shapes.js'
+import { ApiSchemaGenerator } from '@api-client/core/amf/ApiSchemaGenerator.js'
 import { readPropertyTypeLabel, isScalarUnion, isScalarType } from '../../amf/lib/Utils.js'
 import {
   detailsTemplate,
@@ -34,13 +48,13 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
    */
   @property({ type: String, reflect: true }) accessor mimeType: string | undefined
 
-  schemaValue?: AmfShapes.IShapeUnion
+  schemaValue?: IShapeUnion
 
-  get schema(): AmfShapes.IShapeUnion | undefined {
+  get schema(): IShapeUnion | undefined {
     return this.schemaValue
   }
 
-  set schema(value: AmfShapes.IShapeUnion | undefined) {
+  set schema(value: IShapeUnion | undefined) {
     const old = this.schemaValue
     if (old === value) {
       return
@@ -150,12 +164,12 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
       this.examplesValue = undefined
       return
     }
-    const anyShape = type as AmfShapes.IApiAnyShape
+    const anyShape = type as IApiAnyShape
     const { examples = [] } = anyShape
     let examplesCopy = [...examples]
     if (Array.isArray(type.inherits) && type.inherits.length) {
       type.inherits.forEach((item) => {
-        const anyParent = item as AmfShapes.IApiAnyShape
+        const anyParent = item as IApiAnyShape
         if (Array.isArray(anyParent.examples) && anyParent.examples.length) {
           examplesCopy = examplesCopy.concat([...anyParent.examples])
         }
@@ -197,7 +211,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   //  * @param {string} id
   //  * @param {any} updated
   //  */
-  // [checkSchemaPropertyUpdate](schema: AmfShapes.IShapeUnion, id: string, updated): void {
+  // [checkSchemaPropertyUpdate](schema: IShapeUnion, id: string, updated): void {
   //   if (!schema) {
   //     return;
   //   }
@@ -289,7 +303,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * Orders union items so the first is the one that has properties defined inline.
    */
-  orderUnion(shapes: AmfShapes.IShapeUnion[]): AmfShapes.IShapeUnion[] {
+  orderUnion(shapes: IShapeUnion[]): IShapeUnion[] {
     return [...shapes].sort((a, b) => {
       const aHasName = !!a.name && (!a.name.startsWith('item') as boolean)
       const bHasName = !!b.name && !b.name.startsWith('item')
@@ -315,7 +329,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the schema title.
    */
-  titleTemplate(schema: AmfShapes.IShapeUnion): TemplateResult | string {
+  titleTemplate(schema: IShapeUnion): TemplateResult | string {
     const { name, displayName } = schema
     const label = displayName || name || ''
     if (['schema', 'default'].includes(label)) {
@@ -342,46 +356,46 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
    * @param schema The shape to render.
    * @returns The template for the schema properties depending on the type
    */
-  schemaContentTemplate(schema: AmfShapes.IShapeUnion): TemplateResult | string {
+  schemaContentTemplate(schema: IShapeUnion): TemplateResult | string {
     const { noReadOnly } = this
     if (schema.readOnly && noReadOnly) {
       return ''
     }
     const { types } = schema
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.ScalarShape)) {
-      return this.scalarShapeTemplate(schema as AmfShapes.IApiScalarShape)
+      return this.scalarShapeTemplate(schema as IApiScalarShape)
     }
     if (types.includes(AmfNamespace.w3.shacl.NodeShape)) {
-      return this.nodeShapeTemplate(schema as AmfShapes.IApiNodeShape)
+      return this.nodeShapeTemplate(schema as IApiNodeShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.UnionShape)) {
-      return this.unionShapeTemplate(schema as AmfShapes.IApiUnionShape)
+      return this.unionShapeTemplate(schema as IApiUnionShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.FileShape)) {
-      return this.fileShapeTemplate(schema as AmfShapes.IApiFileShape)
+      return this.fileShapeTemplate(schema as IApiFileShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.SchemaShape)) {
-      return this.schemaShapeTemplate(schema as AmfShapes.IApiSchemaShape)
+      return this.schemaShapeTemplate(schema as IApiSchemaShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.TupleShape)) {
-      return this.tupleShapeTemplate(schema as AmfShapes.IApiTupleShape)
+      return this.tupleShapeTemplate(schema as IApiTupleShape)
     }
     if (
       types.includes(AmfNamespace.aml.vocabularies.shapes.ArrayShape) ||
       types.includes(AmfNamespace.aml.vocabularies.shapes.MatrixShape)
     ) {
-      return this.arrayShapeTemplate(schema as AmfShapes.IApiArrayShape)
+      return this.arrayShapeTemplate(schema as IApiArrayShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.NilShape)) {
-      return this.nilShapeTemplate(schema as AmfShapes.IApiShape)
+      return this.nilShapeTemplate(schema as IApiShape)
     }
-    return this.anyShapeTemplate(schema as AmfShapes.IApiAnyShape)
+    return this.anyShapeTemplate(schema as IApiAnyShape)
   }
 
   /**
    * @returns The template for the scalar shape.
    */
-  scalarShapeTemplate(schema: AmfShapes.IApiScalarShape): TemplateResult | string {
+  scalarShapeTemplate(schema: IApiScalarShape): TemplateResult | string {
     if (schema.readOnly && this.noReadOnly) {
       return ''
     }
@@ -393,7 +407,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the node shape.
    */
-  nodeShapeTemplate(schema: AmfShapes.IApiNodeShape): TemplateResult | string {
+  nodeShapeTemplate(schema: IApiNodeShape): TemplateResult | string {
     const { properties, inherits, readOnly } = schema
     if (readOnly && this.noReadOnly) {
       return ''
@@ -402,7 +416,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
     if (Array.isArray(inherits) && inherits.length) {
       inherits.forEach((item) => {
         if (item.types.includes(AmfNamespace.w3.shacl.NodeShape)) {
-          const typed = item as AmfShapes.IApiNodeShape
+          const typed = item as IApiNodeShape
           items = items.concat([...(typed.properties || [])])
         }
       })
@@ -414,7 +428,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   }
 
   // /**
-  //  * @param {AmfShapes.IShapeUnion[]} parents
+  //  * @param {IShapeUnion[]} parents
   //  * @returns {TemplateResult[]|undefined}
   //  */
   // [inheritedTemplate](parents) {
@@ -437,7 +451,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the union shape.
    */
-  unionShapeTemplate(schema: AmfShapes.IApiUnionShape): TemplateResult | string {
+  unionShapeTemplate(schema: IApiUnionShape): TemplateResult | string {
     const unionTemplate = unionDetailsTemplate(schema)
     const allScalar = isScalarUnion(schema)
     if (allScalar) {
@@ -463,7 +477,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
     return unionTemplate
   }
 
-  andUnionItemTemplate(shape: AmfShapes.IShapeUnion): TemplateResult {
+  andUnionItemTemplate(shape: IShapeUnion): TemplateResult {
     return html`
       <div class="and-union-member">${this.inheritanceNameTemplate(shape)} ${this.schemaContentTemplate(shape)}</div>
     `
@@ -472,7 +486,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the "and" union item's title, if inherited from another type.
    */
-  inheritanceNameTemplate(shape: AmfShapes.IShapeUnion): TemplateResult | string {
+  inheritanceNameTemplate(shape: IShapeUnion): TemplateResult | string {
     const { name = '' } = shape
     const hasName = !!name && !name.startsWith('item')
     if (hasName) {
@@ -485,10 +499,10 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the `any of` union.
    */
-  anyOfUnionTemplate(schemaId: string, items: AmfShapes.IShapeUnion[]): TemplateResult | string {
+  anyOfUnionTemplate(schemaId: string, items: IShapeUnion[]): TemplateResult | string {
     const allSelected = this.selectedUnionsValue
     let selected = allSelected[schemaId]
-    let renderedItem: AmfShapes.IShapeUnion | undefined
+    let renderedItem: IShapeUnion | undefined
     if (selected) {
       renderedItem = items.find((item) => item.id === selected)
     } else {
@@ -553,7 +567,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the file shape.
    */
-  fileShapeTemplate(schema: AmfShapes.IApiFileShape): TemplateResult | string {
+  fileShapeTemplate(schema: IApiFileShape): TemplateResult | string {
     if (schema.readOnly && this.noReadOnly) {
       return ''
     }
@@ -567,7 +581,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the schema shape.
    */
-  schemaShapeTemplate(schema: AmfShapes.IApiSchemaShape): TemplateResult | string {
+  schemaShapeTemplate(schema: IApiSchemaShape): TemplateResult | string {
     const { raw, readOnly } = schema
     if (readOnly && this.noReadOnly) {
       return ''
@@ -585,7 +599,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the array shape.
    */
-  arrayShapeTemplate(schema: AmfShapes.IApiArrayShape): TemplateResult | string {
+  arrayShapeTemplate(schema: IApiArrayShape): TemplateResult | string {
     const { items, readOnly } = schema
     if (readOnly && this.noReadOnly) {
       return ''
@@ -611,7 +625,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the tuple shape.
    */
-  tupleShapeTemplate(schema: AmfShapes.IApiTupleShape): TemplateResult | string {
+  tupleShapeTemplate(schema: IApiTupleShape): TemplateResult | string {
     const { items, readOnly } = schema
     if (readOnly && this.noReadOnly) {
       return ''
@@ -625,13 +639,13 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the Any shape.
    */
-  anyShapeTemplate(schema: AmfShapes.IApiAnyShape): TemplateResult | string {
+  anyShapeTemplate(schema: IApiAnyShape): TemplateResult | string {
     const { and = [], or = [], readOnly, xone = [] } = schema
     if (readOnly && this.noReadOnly) {
       return ''
     }
     if (and.length || or.length || xone.length) {
-      return this.unionShapeTemplate(schema as AmfShapes.IApiUnionShape)
+      return this.unionShapeTemplate(schema as IApiUnionShape)
     }
     return html`<p class="any-info text-selectable">Any schema is accepted as the value here.</p>`
   }
@@ -639,7 +653,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the Any shape.
    */
-  nilShapeTemplate(schema: AmfShapes.IApiShape): TemplateResult | string {
+  nilShapeTemplate(schema: IApiShape): TemplateResult | string {
     if (schema.readOnly && this.noReadOnly) {
       return ''
     }
@@ -649,7 +663,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the schema property item.
    */
-  shapePropertyTemplate(schema: AmfShapes.IApiPropertyShape): TemplateResult | string {
+  shapePropertyTemplate(schema: IApiPropertyShape): TemplateResult | string {
     const { range, minCount = 0, readOnly } = schema
     if (readOnly && this.noReadOnly) {
       return ''
@@ -669,15 +683,15 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
     let isComplex = complexTypes.includes(domainType)
     if (isComplex) {
       if (range.types.includes(AmfNamespace.aml.vocabularies.shapes.TupleShape)) {
-        const { items = [] } = range as AmfShapes.IApiTupleShape
+        const { items = [] } = range as IApiTupleShape
         isComplex = complexTypes.includes(items[0].types[0])
       } else if (range.types.includes(AmfNamespace.aml.vocabularies.shapes.ArrayShape)) {
-        const { items } = range as AmfShapes.IApiArrayShape
+        const { items } = range as IApiArrayShape
         if (items) {
           isComplex = complexTypes.includes(items.types[0])
         }
       } else if (range.types.includes(AmfNamespace.aml.vocabularies.shapes.UnionShape)) {
-        isComplex = !isScalarUnion(range as AmfShapes.IApiUnionShape)
+        isComplex = !isScalarUnion(range as IApiUnionShape)
       }
     }
     const allExpanded = this.expandedValue
@@ -747,7 +761,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
   /**
    * @returns The template for the schema property item that has no range information.
    */
-  shapePropertyWithoutRangeTemplate(schema: AmfShapes.IApiPropertyShape): TemplateResult {
+  shapePropertyWithoutRangeTemplate(schema: IApiPropertyShape): TemplateResult {
     const { minCount = 0, name, displayName, deprecated } = schema
     const label = name || displayName || 'Unnamed property'
     const required = minCount > 0
@@ -762,7 +776,7 @@ export default class ApiSchemaDocument extends ApiDocumentationBase {
     `
   }
 
-  propertyDescriptionTemplate(schema: AmfShapes.IApiPropertyShape): TemplateResult | string {
+  propertyDescriptionTemplate(schema: IApiPropertyShape): TemplateResult | string {
     const { range, description } = schema
     if (!range || description) {
       return this.descriptionTemplate(description)