@api-client/ui 0.0.17 → 0.1.1

package/src/amf/lib/AmfParameters.ts

@@ -1,11 +1,17 @@
 import { html, TemplateResult } from 'lit'
+import { IApiParameter } from '@api-client/core/amf/definitions/Api.js'
 import {
-  ApiSchemaValues,
-  AmfNamespace,
-  type ApiDefinitions,
-  type AmfShapes,
-  EventUtils,
-} from '@api-client/core/browser.js'
+  IApiAnyShape,
+  IApiArrayShape,
+  IApiScalarNode,
+  IApiScalarShape,
+  IApiTupleShape,
+  IApiUnionShape,
+  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 { cancelEvent } from '@api-client/core/lib/events/Utils.js'
 import { ifDefined } from 'lit/directives/if-defined.js'
 import { classMap } from 'lit/directives/class-map.js'
 import * as InputCache from './InputCache.js'
@@ -111,7 +117,7 @@ export class AmfParameters extends EventTarget {
    * @param isArray Whether the value should be read for an array.
    * @returns The value to set on the input. Note, it is not cast to the type.
    */
-  readInputValue(parameter: ApiDefinitions.IApiParameter, schema: AmfShapes.IApiScalarShape, isArray = false): unknown {
+  readInputValue(parameter: IApiParameter, schema: IApiScalarShape, isArray = false): unknown {
     const { target, globalCache } = this
     const { id } = parameter
     if (InputCache.has(target, id, globalCache)) {
@@ -144,7 +150,7 @@ export class AmfParameters extends EventTarget {
       return
     }
     // sets cached value of the input.
-    const typed = ApiSchemaValues.parseUserInput(value, param.schema as AmfShapes.IShapeUnion)
+    const typed = ApiSchemaValues.parseUserInput(value, param.schema as IShapeUnion)
     InputCache.set(
       this.target,
       domainId,
@@ -220,11 +226,11 @@ export class AmfParameters extends EventTarget {
     if (!param) {
       return
     }
-    const enumValues = (param.schema as AmfShapes.IShapeUnion).values as AmfShapes.IApiScalarNode[]
+    const enumValues = (param.schema as IShapeUnion).values as IApiScalarNode[]
     if (!enumValues) {
       return
     }
-    const typed = ApiSchemaValues.parseUserInput(value, param.schema as AmfShapes.IShapeUnion)
+    const typed = ApiSchemaValues.parseUserInput(value, param.schema as IShapeUnion)
     InputCache.set(
       this.target,
       domainId,
@@ -285,19 +291,19 @@ export class AmfParameters extends EventTarget {
    * @returns The template for the request parameter form control.
    */
   parameterSchemaTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IShapeUnion,
+    parameter: IApiParameter,
+    schema: IShapeUnion,
     opts: ShapeTemplateOptions = {}
   ): TemplateResult | string {
     const { types } = schema
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.ScalarShape)) {
-      return this.scalarShapeTemplate(parameter, schema as AmfShapes.IApiScalarShape, opts)
+      return this.scalarShapeTemplate(parameter, schema as IApiScalarShape, opts)
     }
     if (types.includes(AmfNamespace.w3.shacl.NodeShape)) {
       return this.nodeShapeTemplate()
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.UnionShape)) {
-      return this.unionShapeTemplate(parameter, schema as AmfShapes.IApiUnionShape)
+      return this.unionShapeTemplate(parameter, schema as IApiUnionShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.FileShape)) {
       return this.fileShapeTemplate()
@@ -309,12 +315,12 @@ export class AmfParameters extends EventTarget {
       types.includes(AmfNamespace.aml.vocabularies.shapes.ArrayShape) ||
       types.includes(AmfNamespace.aml.vocabularies.shapes.MatrixShape)
     ) {
-      return this.arrayShapeTemplate(parameter, schema as AmfShapes.IApiArrayShape)
+      return this.arrayShapeTemplate(parameter, schema as IApiArrayShape)
     }
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.TupleShape)) {
-      return this.tupleShapeTemplate(parameter, schema as AmfShapes.IApiTupleShape)
+      return this.tupleShapeTemplate(parameter, schema as IApiTupleShape)
     }
-    return this.anyShapeTemplate(parameter, schema as AmfShapes.IApiAnyShape)
+    return this.anyShapeTemplate(parameter, schema as IApiAnyShape)
   }
 
   /**
@@ -324,8 +330,8 @@ export class AmfParameters extends EventTarget {
    * @returns The template for the schema parameter.
    */
   scalarShapeTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiScalarShape,
+    parameter: IApiParameter,
+    schema: IApiScalarShape,
     opts: ShapeTemplateOptions = {}
   ): TemplateResult | string {
     const { readOnly, values, dataType = 'text' } = schema
@@ -346,7 +352,7 @@ export class AmfParameters extends EventTarget {
    * Corrects the `http://www.w3.org/2001/XMLSchema#dateTime` schema with the `date-time` or `rfc3339` formats
    * to remove the last `.ZZZ` part which is not recognizable by the `<input>` element.
    */
-  protected correctDateTimeParameter(schema: AmfShapes.IApiScalarShape, value: unknown): string | unknown {
+  protected correctDateTimeParameter(schema: IApiScalarShape, value: unknown): string | unknown {
     if (!value) {
       return value
     }
@@ -366,8 +372,8 @@ export class AmfParameters extends EventTarget {
    * @returns A template for an input form item for the given type and schema
    */
   textInputTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiScalarShape,
+    parameter: IApiParameter,
+    schema: IApiScalarShape,
     type?: SupportedInputTypes,
     opts: ShapeTemplateOptions = {}
   ): TemplateResult {
@@ -443,7 +449,7 @@ export class AmfParameters extends EventTarget {
   }
 
   /**
-   * @param paramId The ApiDefinitions.IApiParameter id.
+   * @param paramId The IApiParameter id.
    * @param arrayIndex When this is an array item, the index on the array.
    * @returns The template for the param remove button.
    */
@@ -469,8 +475,8 @@ export class AmfParameters extends EventTarget {
    * @returns The template for the enum input.
    */
   enumTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiScalarShape,
+    parameter: IApiParameter,
+    schema: IApiScalarShape,
     opts: ShapeTemplateOptions = {}
   ): TemplateResult | string {
     let required = false
@@ -480,7 +486,7 @@ export class AmfParameters extends EventTarget {
       required = parameter.required || false
     }
     const label = readLabelValue(parameter, schema)
-    const enumValues = (schema.values || []) as AmfShapes.IApiScalarNode[]
+    const enumValues = (schema.values || []) as IApiScalarNode[]
     const selectedValue = this.readInputValue(parameter, schema)
     const selected = enumValues.findIndex((i) => i.value === selectedValue)
     const { id, binding } = parameter
@@ -512,7 +518,7 @@ export class AmfParameters extends EventTarget {
             readOnly
             ?required="${required}"
             .value="${finalValue || ''}"
-            @select="${EventUtils.cancelEvent}"
+            @select="${cancelEvent}"
             name="${parameter.name || schema.name || ''}"
             ?disabled="${nillDisabled}"
             title="${ifDefined(title)}"
@@ -528,7 +534,7 @@ export class AmfParameters extends EventTarget {
     `
   }
 
-  protected renderEnumItem(item: AmfShapes.IApiScalarNode): TemplateResult {
+  protected renderEnumItem(item: IApiScalarNode): TemplateResult {
     const { dataType, value } = item
     return html`
       <ui-list-item role="menuitem" data-type="${ifDefined(dataType)}" data-value="${ifDefined(value)}"
@@ -541,8 +547,8 @@ export class AmfParameters extends EventTarget {
    * @returns The template for the checkbox input.
    */
   booleanTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiScalarShape,
+    parameter: IApiParameter,
+    schema: IApiScalarShape,
     opts: ShapeTemplateOptions = {}
   ): TemplateResult | string {
     const label = readLabelValue(parameter, schema)
@@ -589,7 +595,7 @@ export class AmfParameters extends EventTarget {
   /**
    * @returns The template for the nil checkbox input.
    */
-  nillInputTemplate(parameter: ApiDefinitions.IApiParameter): TemplateResult | string {
+  nillInputTemplate(parameter: IApiParameter): TemplateResult | string {
     return html`
       <label class="label-large">
         <ui-checkbox
@@ -617,10 +623,7 @@ export class AmfParameters extends EventTarget {
   /**
    * @returns The template for the union shape.
    */
-  unionShapeTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiUnionShape
-  ): TemplateResult | string {
+  unionShapeTemplate(parameter: IApiParameter, schema: IApiUnionShape): TemplateResult | string {
     const { anyOf } = schema
     if (!anyOf || !anyOf.length) {
       return ''
@@ -629,7 +632,7 @@ export class AmfParameters extends EventTarget {
     if (nil && anyOf.length === 2) {
       // this is a case where a scalar is marked as nillable instead of not required
       // (which for some reason is a common practice among RAML developers).
-      const scalar = anyOf.find((shape) => shape !== nil) as AmfShapes.IShapeUnion
+      const scalar = anyOf.find((shape) => shape !== nil) as IShapeUnion
       return this.parameterSchemaTemplate(parameter, scalar, {
         nillable: true,
       })
@@ -671,10 +674,7 @@ export class AmfParameters extends EventTarget {
   /**
    * @returns The template for the array shape.
    */
-  arrayShapeTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiArrayShape
-  ): TemplateResult | string {
+  arrayShapeTemplate(parameter: IApiParameter, schema: IApiArrayShape): TemplateResult | string {
     const { items } = schema
     if (!items) {
       return ''
@@ -702,10 +702,7 @@ export class AmfParameters extends EventTarget {
   /**
    * @returns The template for the tuple shape.
    */
-  tupleShapeTemplate(
-    parameter: ApiDefinitions.IApiParameter,
-    schema: AmfShapes.IApiTupleShape
-  ): TemplateResult | string {
+  tupleShapeTemplate(parameter: IApiParameter, schema: IApiTupleShape): TemplateResult | string {
     const { items } = schema
     if (!items) {
       return ''
@@ -717,7 +714,7 @@ export class AmfParameters extends EventTarget {
   /**
    * @returns The template for the Any shape.
    */
-  anyShapeTemplate(parameter: ApiDefinitions.IApiParameter, schema: AmfShapes.IApiAnyShape): TemplateResult | string {
+  anyShapeTemplate(parameter: IApiParameter, schema: IApiAnyShape): TemplateResult | string {
     return this.textInputTemplate(parameter, schema, 'text')
   }
 

package/src/amf/lib/AmfSecurity.ts

@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/no-extraneous-class */
-import { type ApiDefinitions } from '@api-client/core/browser.js'
 
+import type { IApiSecurityRequirement } from '@api-client/core/amf/definitions/Api.js'
 import type { SecuritySelectorListItem } from '../types.js'
 
 export class AmfSecurity {
-  static readSecurityList(security: ApiDefinitions.IApiSecurityRequirement[]): SecuritySelectorListItem[] {
+  static readSecurityList(security: IApiSecurityRequirement[]): SecuritySelectorListItem[] {
     const result: SecuritySelectorListItem[] = []
     if (!Array.isArray(security) || !security.length) {
       return result
@@ -19,7 +19,7 @@ export class AmfSecurity {
     return result
   }
 
-  static readSecurityListItem(item: ApiDefinitions.IApiSecurityRequirement): SecuritySelectorListItem {
+  static readSecurityListItem(item: IApiSecurityRequirement): SecuritySelectorListItem {
     const { schemes } = item
     const result: SecuritySelectorListItem = {
       types: [],

package/src/amf/lib/Oauth2RamlCustomData.ts

@@ -1,4 +1,14 @@
-import { AmfNamespace, type ApiDefinitions, type AmfShapes } from '@api-client/core/browser.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
+import type { IApiParameter } from '@api-client/core/amf/definitions/Api.js'
+import type {
+  IApiArrayShape,
+  IApiDataNodeUnion,
+  IApiObjectNode,
+  IApiScalarNode,
+  IApiScalarShape,
+  IApiShape,
+  IShapeUnion,
+} from '@api-client/core/amf/definitions/Shapes.js'
 
 /**
  * Computes a data model for custom definition for the OAuth 2 scheme
@@ -6,15 +16,15 @@ import { AmfNamespace, type ApiDefinitions, type AmfShapes } from '@api-client/c
  * https://github.com/raml-org/raml-annotations/tree/master/annotations/security-schemes
  */
 export class Oauth2RamlCustomData {
-  readParams(properties: Record<string, AmfShapes.IApiDataNodeUnion>): ApiDefinitions.IApiParameter[] {
-    const result: ApiDefinitions.IApiParameter[] = []
+  readParams(properties: Record<string, IApiDataNodeUnion>): IApiParameter[] {
+    const result: IApiParameter[] = []
     Object.keys(properties).forEach((key) => {
       const definition = properties[key]
       if (definition.types.includes(AmfNamespace.aml.vocabularies.data.Object)) {
-        const property = this.getProperty(definition as AmfShapes.IApiObjectNode)
+        const property = this.getProperty(definition as IApiObjectNode)
         result.push(property)
       } else if (definition.types.includes(AmfNamespace.aml.vocabularies.data.Scalar)) {
-        const property = this.getPropertyScalar(definition as AmfShapes.IApiScalarNode)
+        const property = this.getPropertyScalar(definition as IApiScalarNode)
         result.push(property)
       }
     })
@@ -22,12 +32,12 @@ export class Oauth2RamlCustomData {
   }
 
   /**
-   * Creates an ApiDefinitions.IApiParameter for an annotation that has properties.
+   * Creates an IApiParameter for an annotation that has properties.
    * This expects the properties to be defined like RAML's type definition.
    */
-  getProperty(definition: AmfShapes.IApiObjectNode): ApiDefinitions.IApiParameter {
+  getProperty(definition: IApiObjectNode): IApiParameter {
     const { properties = {}, id, name } = definition
-    const result: ApiDefinitions.IApiParameter = {
+    const result: IApiParameter = {
       id,
       name,
       examples: [],
@@ -40,19 +50,19 @@ export class Oauth2RamlCustomData {
       result.schema = schema
     }
     if (properties.required) {
-      const req = properties.required as AmfShapes.IApiScalarNode
+      const req = properties.required as IApiScalarNode
       result.required = req.value === 'true'
     }
     return result
   }
 
   /**
-   * Creates an ApiDefinitions.IApiParameter for an annotation that has no properties but rather a simplified
+   * Creates an IApiParameter for an annotation that has no properties but rather a simplified
    * notation of `propertyName: dataType`.
    */
-  getPropertyScalar(definition: AmfShapes.IApiScalarNode): ApiDefinitions.IApiParameter {
+  getPropertyScalar(definition: IApiScalarNode): IApiParameter {
     const { dataType = '', id, name } = definition
-    const result: ApiDefinitions.IApiParameter = {
+    const result: IApiParameter = {
       id,
       name,
       examples: [],
@@ -60,7 +70,7 @@ export class Oauth2RamlCustomData {
       types: [AmfNamespace.aml.vocabularies.apiContract.Parameter],
       customDomainProperties: [],
     }
-    const schema = this.createSchema() as AmfShapes.IApiScalarShape
+    const schema = this.createSchema() as IApiScalarShape
     schema.types = [AmfNamespace.aml.vocabularies.shapes.ScalarShape]
     schema.id = id
     schema.name = name
@@ -69,20 +79,14 @@ export class Oauth2RamlCustomData {
     return result
   }
 
-  readSchema(property: AmfShapes.IApiObjectNode): AmfShapes.IShapeUnion | undefined {
+  readSchema(property: IApiObjectNode): IShapeUnion | undefined {
     const { properties = {}, name, id } = property
     // const { example, examples, } = properties;
-    const isArray = this.readIsSchemaArray(
-      properties.type as AmfShapes.IApiScalarNode,
-      properties.items as AmfShapes.IApiScalarNode
-    )
-    const type = this.readSchemaType(
-      properties.type as AmfShapes.IApiScalarNode,
-      properties.items as AmfShapes.IApiScalarNode
-    )
-    let schema: AmfShapes.IShapeUnion | undefined
+    const isArray = this.readIsSchemaArray(properties.type as IApiScalarNode, properties.items as IApiScalarNode)
+    const type = this.readSchemaType(properties.type as IApiScalarNode, properties.items as IApiScalarNode)
+    let schema: IShapeUnion | undefined
     if (isArray) {
-      const s = this.createSchema() as AmfShapes.IApiArrayShape
+      const s = this.createSchema() as IApiArrayShape
       s.types = [AmfNamespace.aml.vocabularies.shapes.ArrayShape]
       s.id = id
       s.name = name
@@ -94,7 +98,7 @@ export class Oauth2RamlCustomData {
     return schema
   }
 
-  createTypedSchema(type: string, object: AmfShapes.IApiObjectNode): AmfShapes.IShapeUnion | undefined {
+  createTypedSchema(type: string, object: IApiObjectNode): IShapeUnion | undefined {
     switch (type) {
       case 'string':
       case 'number':
@@ -114,7 +118,7 @@ export class Oauth2RamlCustomData {
     }
   }
 
-  createSchema(): AmfShapes.IApiShape {
+  createSchema(): IApiShape {
     return {
       id: '',
       types: [],
@@ -128,64 +132,64 @@ export class Oauth2RamlCustomData {
     }
   }
 
-  createScalarSchema(object: AmfShapes.IApiObjectNode, type: string): AmfShapes.IApiScalarShape {
+  createScalarSchema(object: IApiObjectNode, type: string): IApiScalarShape {
     const { properties = {}, name, id } = object
-    const schema = this.createSchema() as AmfShapes.IApiScalarShape
+    const schema = this.createSchema() as IApiScalarShape
     schema.types = [AmfNamespace.aml.vocabularies.shapes.ScalarShape]
     schema.id = id
     schema.name = name
     schema.dataType = this.typeToSchemaType(type)
     if (properties.format) {
-      const item = properties.format as AmfShapes.IApiScalarNode
+      const item = properties.format as IApiScalarNode
       schema.format = item.value
     }
     if (properties.default) {
-      const item = properties.default as AmfShapes.IApiScalarNode
+      const item = properties.default as IApiScalarNode
       schema.defaultValueStr = item.value
       // schema.defaultValue = item.value;
     }
     if (properties.description) {
-      const item = properties.description as AmfShapes.IApiScalarNode
+      const item = properties.description as IApiScalarNode
       schema.description = item.value
     }
     if (properties.displayName) {
-      const item = properties.displayName as AmfShapes.IApiScalarNode
+      const item = properties.displayName as IApiScalarNode
       schema.displayName = item.value
     }
     if (properties.pattern) {
-      const item = properties.pattern as AmfShapes.IApiScalarNode
+      const item = properties.pattern as IApiScalarNode
       schema.pattern = item.value
     }
     if (properties.maximum) {
-      const item = properties.maximum as AmfShapes.IApiScalarNode
+      const item = properties.maximum as IApiScalarNode
       const value = Number(item.value)
       if (!Number.isNaN(value)) {
         schema.maximum = value
       }
     }
     if (properties.minimum) {
-      const item = properties.minimum as AmfShapes.IApiScalarNode
+      const item = properties.minimum as IApiScalarNode
       const value = Number(item.value)
       if (!Number.isNaN(value)) {
         schema.minimum = value
       }
     }
     if (properties.multipleOf) {
-      const item = properties.multipleOf as AmfShapes.IApiScalarNode
+      const item = properties.multipleOf as IApiScalarNode
       const value = Number(item.value)
       if (!Number.isNaN(value)) {
         schema.multipleOf = value
       }
     }
     if (properties.maxLength) {
-      const item = properties.maxLength as AmfShapes.IApiScalarNode
+      const item = properties.maxLength as IApiScalarNode
       const value = Number(item.value)
       if (!Number.isNaN(value)) {
         schema.maxLength = value
       }
     }
     if (properties.minLength) {
-      const item = properties.minLength as AmfShapes.IApiScalarNode
+      const item = properties.minLength as IApiScalarNode
       const value = Number(item.value)
       if (!Number.isNaN(value)) {
         schema.minLength = value
@@ -198,7 +202,7 @@ export class Oauth2RamlCustomData {
    * @param object
    * @param items The definition of the `items` property that corresponds to RAML's items property of an array
    */
-  readSchemaType(object: AmfShapes.IApiScalarNode, items?: AmfShapes.IApiScalarNode): string {
+  readSchemaType(object: IApiScalarNode, items?: IApiScalarNode): string {
     if (object.dataType !== AmfNamespace.w3.xmlSchema.string) {
       return AmfNamespace.w3.xmlSchema.string
     }
@@ -245,7 +249,7 @@ export class Oauth2RamlCustomData {
    * @param items The definition of the `items` property that corresponds to RAML's items property of an array
    * @returns True when the schema is an array.
    */
-  readIsSchemaArray(type: AmfShapes.IApiScalarNode, items: AmfShapes.IApiScalarNode): boolean {
+  readIsSchemaArray(type: IApiScalarNode, items: IApiScalarNode): boolean {
     if (!type && items) {
       return true
     }

package/src/amf/lib/PayloadUtils.ts

@@ -1,11 +1,9 @@
-import {
-  type ApiDefinitions,
-  type AmfShapes,
-  ApiExampleGenerator,
-  ApiMonacoSchemaGenerator,
-  ApiSchemaGenerator,
-  type IProperty,
-} from '@api-client/core/browser.js'
+import { ApiExampleGenerator } from '@api-client/core/amf/ApiExampleGenerator.js'
+import { ApiMonacoSchemaGenerator } from '@api-client/core/amf/ApiMonacoSchemaGenerator.js'
+import { ApiSchemaGenerator } from '@api-client/core/amf/ApiSchemaGenerator.js'
+import type { IApiPayload } from '@api-client/core/amf/definitions/Api.js'
+import type { IApiAnyShape } from '@api-client/core/amf/definitions/Shapes.js'
+import type { IProperty } from '@api-client/core/models/Property.js'
 
 export interface PayloadInfo {
   value: string | FormData | Blob
@@ -15,7 +13,7 @@ export interface PayloadInfo {
 
 const cache = new Map<string, PayloadInfo>()
 
-export function getPayloadValue(payload: ApiDefinitions.IApiPayload): PayloadInfo {
+export function getPayloadValue(payload: IApiPayload): PayloadInfo {
   if (cache.has(payload.id)) {
     return cache.get(payload.id) as PayloadInfo
   }
@@ -37,7 +35,7 @@ export function getPayloadValue(payload: ApiDefinitions.IApiPayload): PayloadInf
   const monacoSchemes = schemaFactory.generate(schema, id)
   let { examples } = payload
   if (!Array.isArray(examples) || !examples.length) {
-    examples = (schema as AmfShapes.IApiAnyShape).examples
+    examples = (schema as IApiAnyShape).examples
   }
   if (Array.isArray(examples) && examples.length) {
     const [example] = examples

package/src/amf/lib/QueryParameterProcessor.ts

@@ -1,4 +1,13 @@
-import { AmfNamespace, type ApiDefinitions, type AmfShapes } from '@api-client/core/browser.js'
+import { AmfNamespace } from '@api-client/core/amf/definitions/Namespace.js'
+import type { IApiParameter } from '@api-client/core/amf/definitions/Api.js'
+import type {
+  IShapeUnion,
+  IApiScalarShape,
+  IApiNodeShape,
+  IApiArrayShape,
+  IApiUnionShape,
+  IApiPropertyShape,
+} from '@api-client/core/amf/definitions/Shapes.js'
 import type { OperationParameter } from '../types.js'
 
 /**
@@ -10,26 +19,26 @@ export class QueryParameterProcessor {
    * @param binding The parameter binding.
    * @param source Optional parameter source.
    */
-  collectOperationParameters(schema: AmfShapes.IShapeUnion, binding: string, source?: string): OperationParameter[] {
+  collectOperationParameters(schema: IShapeUnion, binding: string, source?: string): OperationParameter[] {
     let result: OperationParameter[] = []
     if (!schema) {
       return result
     }
     const { types } = schema
     if (types.includes(AmfNamespace.aml.vocabularies.shapes.ScalarShape)) {
-      result.push(this.scalarShapeOperationParameter(schema as AmfShapes.IApiScalarShape, binding, source))
+      result.push(this.scalarShapeOperationParameter(schema as IApiScalarShape, binding, source))
     } else if (types.includes(AmfNamespace.w3.shacl.NodeShape)) {
-      const params = this.nodeShapeOperationParameter(schema as AmfShapes.IApiNodeShape, binding, source)
+      const params = this.nodeShapeOperationParameter(schema as IApiNodeShape, binding, source)
       result = result.concat(params)
     } else if (types.includes(AmfNamespace.aml.vocabularies.shapes.ArrayShape)) {
-      const arrResult = this.arrayShapeOperationParameter(schema as AmfShapes.IApiArrayShape, binding, source)
+      const arrResult = this.arrayShapeOperationParameter(schema as IApiArrayShape, binding, source)
       if (Array.isArray(arrResult)) {
         result = result.concat(arrResult)
       } else if (arrResult) {
         result.push(arrResult)
       }
     } else if (types.includes(AmfNamespace.aml.vocabularies.shapes.UnionShape)) {
-      const params = this.unionShapeOperationParameter(schema as AmfShapes.IApiUnionShape, binding, source)
+      const params = this.unionShapeOperationParameter(schema as IApiUnionShape, binding, source)
       if (params) {
         result = result.concat(params)
       }
@@ -42,13 +51,9 @@ export class QueryParameterProcessor {
    * @param binding The parameter binding.
    * @param source Optional parameter source.
    */
-  scalarShapeOperationParameter(
-    shape: AmfShapes.IApiScalarShape,
-    binding: string,
-    source?: string
-  ): OperationParameter {
+  scalarShapeOperationParameter(shape: IApiScalarShape, binding: string, source?: string): OperationParameter {
     const { id, name } = shape
-    const constructed: ApiDefinitions.IApiParameter = {
+    const constructed: IApiParameter = {
       id,
       binding,
       schema: shape,
@@ -74,7 +79,7 @@ export class QueryParameterProcessor {
    * @param binding The parameter binding.
    * @param source Optional parameter source.
    */
-  nodeShapeOperationParameter(shape: AmfShapes.IApiNodeShape, binding: string, source?: string): OperationParameter[] {
+  nodeShapeOperationParameter(shape: IApiNodeShape, binding: string, source?: string): OperationParameter[] {
     const result: OperationParameter[] = []
     const { properties = [] } = shape
     if (!properties.length) {
@@ -91,13 +96,9 @@ export class QueryParameterProcessor {
    * @param binding The parameter binding.
    * @param source Optional parameter source.
    */
-  parameterOperationParameter(
-    property: AmfShapes.IApiPropertyShape,
-    binding: string,
-    source?: string
-  ): OperationParameter {
+  parameterOperationParameter(property: IApiPropertyShape, binding: string, source?: string): OperationParameter {
     const { id, range, name, minCount = 0 } = property
-    const constructed: ApiDefinitions.IApiParameter = {
+    const constructed: IApiParameter = {
       id,
       binding,
       schema: range,
@@ -124,17 +125,17 @@ export class QueryParameterProcessor {
    * @param source Optional parameter source.
    */
   arrayShapeOperationParameter(
-    shape: AmfShapes.IApiArrayShape,
+    shape: IApiArrayShape,
     binding: string,
     source?: string
   ): OperationParameter | OperationParameter[] {
     const target = shape.items || shape
     if (target.types.includes(AmfNamespace.w3.shacl.NodeShape)) {
-      const typed = shape.items as AmfShapes.IApiNodeShape
+      const typed = shape.items as IApiNodeShape
       return this.collectOperationParameters(typed, binding, source)
     }
     const { id, name } = target
-    const constructed: ApiDefinitions.IApiParameter = {
+    const constructed: IApiParameter = {
       id,
       binding,
       schema: shape,
@@ -161,7 +162,7 @@ export class QueryParameterProcessor {
    * @param source Optional parameter source.
    */
   unionShapeOperationParameter(
-    shape: AmfShapes.IApiUnionShape,
+    shape: IApiUnionShape,
     binding: string,
     source?: string
   ): OperationParameter[] | undefined {