@api-client/core 0.7.12 → 0.8.0

package/src/amf/AmfMixin.ts

@@ -1,3 +1,7 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unused-vars */
 /**
 @license
 Copyright 2018 The Advanced REST client authors <arc@mulesoft.com>
@@ -11,9 +15,10 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 License for the specific language governing permissions and limitations under
 the License.
 */
+
 // @ts-ignore
 import { AmfModelExpander, JsonLdOptions, JsonLd } from 'amf-json-ld-lib';
-import { AmfDocument, DomainElement, EndPoint, LdValue, SecurityScheme, Shape, WebApi, Operation, AsyncApi, Server, Request } from './definitions/Amf.js';
+import { IAmfDocument, IAmfDomainElement, IAmfEndPoint, IAmfLdValue, IAmfSecurityScheme, IAmfShape, IAmfWebApi, IAmfOperation, IAmfAsyncApi, IAmfServer, IAmfRequest } from './definitions/Amf.js';
 import { AmfNamespace as ns } from './definitions/Namespace.js';
 
 export const expandKey = Symbol('expandKey');
@@ -51,14 +56,14 @@ export interface ServerQueryOptions {
 type Constructor<T = {}> = new (...args: any[]) => T;
 
 export declare class AmfMixinInterface {
-  amf?: AmfDocument;
+  amf?: IAmfDocument;
   /**
    * This is an abstract method to be implemented by the components.
    * If, instead, the component uses `amf` setter you must use `super.amf` to
    * set the value.
    * @param amf Current AMF model. Can be undefined.
    */
-  _amfChanged(amf?: AmfDocument): void;
+  _amfChanged(amf?: IAmfDocument): void;
 
   /**
    * Expands flattened AMF model
@@ -71,7 +76,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Compact model property name or the same value if value not found in the context.
    */
-  _getAmfKey(property?: string, context?: Record<string, string>): string | undefined;
+  _getAmfKey(property?: string, context?: Record<string, string>): string;
 
   /**
    * Ensures that the model is AMF object.
@@ -79,7 +84,7 @@ export declare class AmfMixinInterface {
    * @param amf AMF json/ld model
    * @returns The API spec
    */
-  _ensureAmfModel(amf: any): AmfDocument | undefined;
+  _ensureAmfModel(amf: any): IAmfDocument | undefined;
 
   /**
    * Ensures that the value is an array.
@@ -98,7 +103,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Value for key
    */
-  _getValue(model: DomainElement, untrustedKey: string, context?: Record<string, string>): string | number | boolean | undefined | null;
+  _getValue(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): string | number | boolean | undefined | null;
 
   /**
    * Gets values from a model as an array of `@value` properties.
@@ -107,7 +112,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns The value for key
    */
-  _getValueArray(model: DomainElement, untrustedKey: string, context?: Record<string, string>): (string | number | boolean | null)[] | undefined;
+  _getValueArray(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): (string | number | boolean | null)[] | undefined;
 
   /**
    * Reads an array from the model.
@@ -117,7 +122,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Value for the key
    */
-  [getArrayItems](model?: DomainElement, untrustedKey?: string, context?: Record<string, string>): DomainElement[] | undefined;
+  [getArrayItems](model?: IAmfDomainElement, untrustedKey?: string, context?: Record<string, string>): IAmfDomainElement[] | undefined;
 
   /**
    * Reads the value of the `@id` property.
@@ -125,7 +130,7 @@ export declare class AmfMixinInterface {
    * @param untrustedKey Model key to search for the @id
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _getLinkValue(model: DomainElement, untrustedKey: string, context?: Record<string, string>): string | undefined;
+  _getLinkValue(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): string | undefined;
 
   /**
    * Reads the list of value for the `@id` property.
@@ -133,7 +138,7 @@ export declare class AmfMixinInterface {
    * @param untrustedKey Model key to search for the @id
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _getLinkValues(model: DomainElement, untrustedKey: string, context?: Record<string, string>): string[] | undefined;
+  _getLinkValues(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): string[] | undefined;
 
   /**
    * Checks if a model has a type.
@@ -142,7 +147,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns True if model has a type.
    */
-  _hasType(model?: DomainElement, type?: string, context?: Record<string, string>): boolean;
+  _hasType(model?: IAmfDomainElement, type?: string, context?: Record<string, string>): boolean;
 
   /**
    * Checks if a shape has a property.
@@ -150,7 +155,7 @@ export declare class AmfMixinInterface {
    * @param untrustedKey Property name to test
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _hasProperty(shape: DomainElement, untrustedKey: string, context?: Record<string, string>): boolean;
+  _hasProperty(shape: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): boolean;
 
   /**
    * Computes array value of a property in a model (shape).
@@ -159,7 +164,7 @@ export declare class AmfMixinInterface {
    * @param untrustedKey Property name
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _computePropertyArray(shape?: DomainElement, untrustedKey?: string, context?: Record<string, string>): (string|number|boolean|null|Object)[] | undefined;
+  _computePropertyArray(shape?: IAmfDomainElement, untrustedKey?: string, context?: Record<string, string>): (string | number | boolean | null | Object)[] | undefined;
 
   /**
    * Computes API version from the AMF model.
@@ -167,7 +172,7 @@ export declare class AmfMixinInterface {
    * @param amf
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _computeApiVersion(amf?: AmfDocument, context?: Record<string, string>): string | undefined;
+  _computeApiVersion(amf?: IAmfDocument, context?: Record<string, string>): string | undefined;
 
   /**
    * Computes model's `encodes` property.
@@ -176,7 +181,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns List of encodes
    */
-  _computeEncodes(model?: AmfDocument, context?: Record<string, string>): DomainElement | undefined;
+  _computeEncodes(model?: IAmfDocument, context?: Record<string, string>): IAmfDomainElement | undefined;
 
   /**
    * Computes list of declarations in the AMF api model.
@@ -185,7 +190,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns List of declarations
    */
-  _computeDeclares(model?: AmfDocument, context?: Record<string, string>): DomainElement[] | undefined;
+  _computeDeclares(model?: IAmfDocument, context?: Record<string, string>): IAmfDomainElement[] | undefined;
 
   /**
    * Computes list of references in the AMF api model.
@@ -194,7 +199,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns List of declarations
    */
-  _computeReferences(model?: AmfDocument, context?: Record<string, string>): DomainElement[] | undefined;
+  _computeReferences(model?: IAmfDocument, context?: Record<string, string>): IAmfDomainElement[] | undefined;
 
   /**
    * Computes AMF's `http://schema.org/WebAPI` model
@@ -203,7 +208,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Web API declaration.
    */
-  _computeWebApi(model?: AmfDocument, context?: Record<string, string>): WebApi|undefined;
+  _computeWebApi(model?: IAmfDocument, context?: Record<string, string>): IAmfWebApi | undefined;
 
   /**
    * Computes AMF's `http://schema.org/API` model
@@ -212,7 +217,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns  API declaration.
    */
-  _computeApi(model?: AmfDocument, context?: Record<string, string>): AsyncApi|WebApi|undefined;
+  _computeApi(model?: IAmfDocument, context?: Record<string, string>): IAmfAsyncApi | IAmfWebApi | undefined;
 
   /**
    * Returns whether an AMF node is a WebAPI node
@@ -220,7 +225,7 @@ export declare class AmfMixinInterface {
    * @param model  AMF json/ld model for an API
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _isWebAPI(model?: AmfDocument, context?: Record<string, string>): boolean;
+  _isWebAPI(model?: IAmfDocument, context?: Record<string, string>): boolean;
 
   /**
    * Returns whether an AMF node is an AsyncAPI node
@@ -228,7 +233,7 @@ export declare class AmfMixinInterface {
    * @param model  AMF json/ld model for an API
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _isAsyncAPI(model?: AmfDocument, context?: Record<string, string>): boolean;
+  _isAsyncAPI(model?: IAmfDocument, context?: Record<string, string>): boolean;
 
   /**
    * Returns whether an AMF node is an API node
@@ -236,7 +241,7 @@ export declare class AmfMixinInterface {
    * @param model  AMF json/ld model for an API
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _isAPI(model?: AmfDocument, context?: Record<string, string>): boolean;
+  _isAPI(model?: IAmfDocument, context?: Record<string, string>): boolean;
 
   /**
    * Determines whether a partial model is valid for reading servers from
@@ -249,14 +254,14 @@ export declare class AmfMixinInterface {
    * to read servers
    * @private
    */
-  _isValidServerPartial(model: DomainElement, context?: Record<string, string>): boolean;
+  _isValidServerPartial(model: IAmfDomainElement, context?: Record<string, string>): boolean;
 
   /**
    * @param options Server query options
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns List of servers for method, if defined, or endpoint, if defined, or root level
    */
-  _getServers(options?: ServersQueryOptions, context?: Record<string, string>): Server[] | undefined;
+  _getServers(options?: ServersQueryOptions, context?: Record<string, string>): IAmfServer[] | undefined;
 
   /**
    * Computes value for the `expects` property.
@@ -264,7 +269,7 @@ export declare class AmfMixinInterface {
    * @param method AMF `supportedOperation` model
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _computeExpects(method?: Operation, context?: Record<string, string>): Request | undefined;
+  _computeExpects(method?: IAmfOperation, context?: Record<string, string>): IAmfRequest | undefined;
 
   /**
    * Computes list of endpoints from a WebApi model.
@@ -272,7 +277,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns An array of endpoints.
    */
-  _computeEndpoints(webApi?: WebApi, context?: Record<string, string>): EndPoint[] | undefined;
+  _computeEndpoints(webApi?: IAmfWebApi, context?: Record<string, string>): IAmfEndPoint[] | undefined;
   /**
    * Computes model for an endpoint documentation.
    *
@@ -281,7 +286,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns An endpoint definition
    */
-  _computeEndpointModel(webApi?: WebApi, id?: string, context?: Record<string, string>): EndPoint | undefined;
+  _computeEndpointModel(webApi?: IAmfWebApi, id?: string, context?: Record<string, string>): IAmfEndPoint | undefined;
 
   /**
    * Computes method for the method documentation.
@@ -291,7 +296,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns A method definition
    */
-  _computeMethodModel(webApi?: WebApi, selected?: string, context?: Record<string, string>): Operation | undefined;
+  _computeMethodModel(webApi?: IAmfWebApi, selected?: string, context?: Record<string, string>): IAmfOperation | undefined;
 
   /**
    * Computes an endpoint for a method.
@@ -300,7 +305,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns An endpoint model of undefined.
    */
-  _computeMethodEndpoint(webApi?: WebApi, methodId?: string, context?: Record<string, string>): EndPoint|undefined;
+  _computeMethodEndpoint(webApi?: IAmfWebApi, methodId?: string, context?: Record<string, string>): IAmfEndPoint | undefined;
 
   /**
    * Computes a list of methods for an endpoint that contains a method with
@@ -311,7 +316,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns A list of sibling methods or undefined.
    */
-  __computeMethodsListForMethod(webApi?: WebApi, methodId?: string, context?: Record<string, string>): Operation[] | undefined;
+  __computeMethodsListForMethod(webApi?: IAmfWebApi, methodId?: string, context?: Record<string, string>): IAmfOperation[] | undefined;
 
   /**
    * Computes a type documentation model.
@@ -322,7 +327,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns A type definition
    */
-  _computeType(declares?: DomainElement[], references?: DomainElement[], selected?: string, context?: Record<string, string>): Shape | undefined;
+  _computeType(declares?: IAmfDomainElement[], references?: IAmfDomainElement[], selected?: string, context?: Record<string, string>): IAmfShape | undefined;
 
   /**
    * Finds a type in the model declares and references.
@@ -330,7 +335,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns The AMF shape or undefined when not found.
    */
-  [findAmfType](domainId?: string, context?: Record<string, string>): Shape|undefined;
+  [findAmfType](domainId?: string, context?: Record<string, string>): IAmfShape | undefined;
 
   /**
    * Searches for an object in model's references list.
@@ -340,7 +345,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns The domain object or undefined.
    */
-  [findReferenceObject](domainId: string, context?: Record<string, string>): DomainElement | undefined;
+  [findReferenceObject](domainId: string, context?: Record<string, string>): IAmfDomainElement | undefined;
 
   /**
    * Computes a type model from a reference (library for example).
@@ -349,7 +354,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Type definition or undefined if not found.
    */
-  _computeReferenceType(reference?: DomainElement, selected?: string, context?: Record<string, string>): Shape|undefined;
+  _computeReferenceType(reference?: IAmfDomainElement, selected?: string, context?: Record<string, string>): IAmfShape | undefined;
 
   /**
    * Computes a documentation model.
@@ -358,7 +363,7 @@ export declare class AmfMixinInterface {
    * @param selected Selected shape
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  _computeDocument(webApi?: DomainElement, selected?: string, context?: Record<string, string>): DomainElement|undefined;
+  _computeDocument(webApi?: IAmfDomainElement, selected?: string, context?: Record<string, string>): IAmfDomainElement | undefined;
 
   /**
    * Resolves a reference to an external fragment.
@@ -375,7 +380,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Resolved shape for given reference, undefined otherwise
    */
-  _getLinkTarget(amf?: AmfDocument, id?: string , context?: Record<string, string>): DomainElement | undefined;
+  _getLinkTarget(amf?: IAmfDocument, id?: string, context?: Record<string, string>): IAmfDomainElement | undefined;
 
   /**
    * Resolves the shape of a given reference.
@@ -385,7 +390,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Resolved shape for given reference, undefined otherwise
    */
-  _obtainShapeFromReferences(references?: DomainElement[], id?: string, context?: Record<string, string>): DomainElement | undefined;
+  _obtainShapeFromReferences(references?: IAmfDomainElement[], id?: string, context?: Record<string, string>): IAmfDomainElement | undefined;
 
   /**
    * Searches a node with a given ID in an array
@@ -394,9 +399,9 @@ export declare class AmfMixinInterface {
    * @param id Id to search for
    * @returns Node with the given ID when found, undefined otherwise
    */
-  _findById(array?: DomainElement[], id?: string): DomainElement | undefined;
+  _findById(array?: IAmfDomainElement[], id?: string): IAmfDomainElement | undefined;
 
-  _getReferenceId(amf?: AmfDocument, id?: string, context?: Record<string, string>): DomainElement | undefined;
+  _getReferenceId(amf?: IAmfDocument, id?: string, context?: Record<string, string>): IAmfDomainElement | undefined;
 
   _resolveRecursive(shape: any, context?: Record<string, string>): void;
 
@@ -435,7 +440,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Type definition or undefined if not found.
    */
-  findSecurityScheme(domainId: string, context?: Record<string, string>): SecurityScheme | undefined;
+  findSecurityScheme(domainId: string, context?: Record<string, string>): IAmfSecurityScheme | undefined;
 
   /**
    * Computes a security model from a reference (library for example).
@@ -444,7 +449,7 @@ export declare class AmfMixinInterface {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Type definition or undefined if not found.
    */
-  [computeReferenceSecurity](reference: DomainElement, selected: string, context?: Record<string, string>): SecurityScheme | undefined;
+  [computeReferenceSecurity](reference: IAmfDomainElement, selected: string, context?: Record<string, string>): IAmfSecurityScheme | undefined;
 
   /**
    * Collects domain objects by a domain type.
@@ -452,7 +457,7 @@ export declare class AmfMixinInterface {
    * @param type The domain type
    * @param context A context to use. If not set, it looks for the context of the passed model
    */
-  getByType(source: DomainElement, type: string, context?: Record<string, string>): DomainElement[];
+  getByType(source: IAmfDomainElement, type: string, context?: Record<string, string>): IAmfDomainElement[];
 }
 
 /**
@@ -460,15 +465,15 @@ export declare class AmfMixinInterface {
  */
 export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor<AmfMixinInterface> & T => {
   class AmfMixin extends superClass {
-    _amf?: AmfDocument;
+    _amf?: IAmfDocument;
     _flattenedAmf?: any;
     __cachedKeys?: any;
 
-    get amf(): AmfDocument | undefined {
+    get amf(): IAmfDocument | undefined {
       return this._amf;
     }
 
-    set amf(value: AmfDocument | undefined) {
+    set amf(value: IAmfDocument | undefined) {
       const old = this._amf;
       if (old === value) {
         return;
@@ -499,7 +504,9 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param amf Current AMF model. Can be undefined.
      */
     /* eslint-disable-next-line no-unused-vars */
-    _amfChanged(amf?: AmfDocument): void { }
+    _amfChanged(amf?: IAmfDocument): void {
+      // ...
+    }
 
     /**
      * Expands flattened AMF model
@@ -522,9 +529,9 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Compact model property name or the same value if value not found in the context.
      */
-    _getAmfKey(property?: string, context?: Record<string, string>): string | undefined {
+    _getAmfKey(property?: string, context?: Record<string, string>): string {
       if (!property) {
-        return undefined;
+        return '';
       }
       let { amf } = this;
       if (!amf && !context) {
@@ -572,7 +579,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param amf AMF json/ld model
      * @returns The API spec
      */
-    _ensureAmfModel(amf: any): AmfDocument | undefined {
+    _ensureAmfModel(amf: any): IAmfDocument | undefined {
       if (!amf) {
         return undefined;
       }
@@ -610,12 +617,12 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Value for key
      */
-    _getValue(model: DomainElement, untrustedKey: string, context?: Record<string, string>): string | number | boolean | undefined | null {
+    _getValue(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): string | number | boolean | undefined | null {
       const key = this._getAmfKey(untrustedKey, context);
       if (!key) {
         return undefined;
       }
-      let data = model && model[key as keyof DomainElement] as string | number | boolean | undefined | null;
+      let data = model && model[key as keyof IAmfDomainElement] as string | number | boolean | undefined | null;
       if (!data) {
         // This includes "undefined", "false", "null" and "0"
         return data;
@@ -630,7 +637,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       if (['string', 'number', 'boolean', 'undefined'].includes(type)) {
         return data;
       }
-      return ((data as unknown) as LdValue<any>)['@value'];
+      return ((data as unknown) as IAmfLdValue<any>)['@value'];
     }
 
     /**
@@ -640,7 +647,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns The value for key
      */
-    _getValueArray(model: DomainElement, untrustedKey: string, context?: Record<string, string>): (string | number | boolean | null)[] | undefined {
+    _getValueArray(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): (string | number | boolean | null)[] | undefined {
       const key = this._getAmfKey(untrustedKey, context);
       if (!key) {
         return undefined;
@@ -660,12 +667,12 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Value for the key
      */
-    [getArrayItems](model?: DomainElement, untrustedKey?: string, context?: Record<string, string>): DomainElement[] | undefined {
+    [getArrayItems](model?: IAmfDomainElement, untrustedKey?: string, context?: Record<string, string>): IAmfDomainElement[] | undefined {
       const k = this._getAmfKey(untrustedKey, context);
       if (!k) {
         return undefined;
       }
-      const data = model && this._ensureArray((model as any)[k]) as DomainElement[];
+      const data = model && this._ensureArray((model as any)[k]) as IAmfDomainElement[];
       if (!Array.isArray(data)) {
         return undefined;
       }
@@ -678,7 +685,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param untrustedKey Model key to search for the @id
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _getLinkValue(model: DomainElement, untrustedKey: string, context?: Record<string, string>): string | undefined {
+    _getLinkValue(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): string | undefined {
       const k = this._getAmfKey(untrustedKey, context);
       if (!k) {
         return undefined;
@@ -702,12 +709,12 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param untrustedKey Model key to search for the @id
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _getLinkValues(model: DomainElement, untrustedKey: string, context?: Record<string, string>): string[] | undefined {
+    _getLinkValues(model: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): string[] | undefined {
       const k = this._getAmfKey(untrustedKey, context);
       if (!k) {
         return undefined;
       }
-      let data = (model && (model as any)[k]) as DomainElement[] | undefined;
+      let data = (model && (model as any)[k]) as IAmfDomainElement[] | undefined;
       if (!data) {
         return undefined;
       }
@@ -724,7 +731,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns True if model has a type.
      */
-    _hasType(model?: DomainElement, type?: string, context?: Record<string, string>): boolean {
+    _hasType(model?: IAmfDomainElement, type?: string, context?: Record<string, string>): boolean {
       const types = this._ensureArray(model && model['@type']);
       if (!types || !types.length) {
         return false;
@@ -744,8 +751,8 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param untrustedKey Property name to test
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _hasProperty(shape: DomainElement, untrustedKey: string, context?: Record<string, string>): boolean {
-      const key = this._getAmfKey(untrustedKey, context)!;
+    _hasProperty(shape: IAmfDomainElement, untrustedKey: string, context?: Record<string, string>): boolean {
+      const key = this._getAmfKey(untrustedKey, context) as string;
       return !!(shape && key && key in shape);
     }
 
@@ -756,7 +763,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param untrustedKey Property name
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _computePropertyArray(shape?: DomainElement, untrustedKey?: string, context?: Record<string, string>): (string|number|boolean|null|Object)[] | undefined {
+    _computePropertyArray(shape?: IAmfDomainElement, untrustedKey?: string, context?: Record<string, string>): (string | number | boolean | null | Object)[] | undefined {
       if (!shape) {
         return undefined;
       }
@@ -778,7 +785,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param amf
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _computeApiVersion(amf?: AmfDocument, context?: Record<string, string>): string | undefined {
+    _computeApiVersion(amf?: IAmfDocument, context?: Record<string, string>): string | undefined {
       const api = this._computeApi(amf);
       if (!api) {
         return undefined;
@@ -793,7 +800,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns List of encodes
      */
-    _computeEncodes(model?: AmfDocument, context?: Record<string, string>): DomainElement | undefined {
+    _computeEncodes(model?: IAmfDocument, context?: Record<string, string>): IAmfDomainElement | undefined {
       if (!model) {
         return undefined;
       }
@@ -818,7 +825,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns List of declarations
      */
-    _computeDeclares(model?: AmfDocument, context?: Record<string, string>): DomainElement[] | undefined {
+    _computeDeclares(model?: IAmfDocument, context?: Record<string, string>): IAmfDomainElement[] | undefined {
       if (!model) {
         return undefined;
       }
@@ -832,7 +839,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       if (!key) {
         return undefined;
       }
-      const data = this._ensureArray((model as any)[key]) as DomainElement[];
+      const data = this._ensureArray((model as any)[key]) as IAmfDomainElement[];
       return Array.isArray(data) ? data : undefined;
     }
 
@@ -843,7 +850,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns List of declarations
      */
-    _computeReferences(model?: AmfDocument, context?: Record<string, string>): DomainElement[] | undefined {
+    _computeReferences(model?: IAmfDocument, context?: Record<string, string>): IAmfDomainElement[] | undefined {
       if (!model) {
         return undefined;
       }
@@ -857,7 +864,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       if (!key) {
         return undefined;
       }
-      const data = this._ensureArray((model as any)[key]) as DomainElement[];
+      const data = this._ensureArray((model as any)[key]) as IAmfDomainElement[];
       return data instanceof Array ? data : undefined;
     }
 
@@ -868,7 +875,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Web API declaration.
      */
-    _computeWebApi(model?: AmfDocument, context?: Record<string, string>): WebApi|undefined {
+    _computeWebApi(model?: IAmfDocument, context?: Record<string, string>): IAmfWebApi | undefined {
       const enc = this._computeEncodes(model, context);
       if (!enc) {
         return undefined;
@@ -886,7 +893,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns  API declaration.
      */
-    _computeApi(model?: AmfDocument, context?: Record<string, string>): AsyncApi|WebApi|undefined {
+    _computeApi(model?: IAmfDocument, context?: Record<string, string>): IAmfAsyncApi | IAmfWebApi | undefined {
       const enc = this._computeEncodes(model, context);
       if (!enc) {
         return undefined;
@@ -903,7 +910,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param model  AMF json/ld model for an API
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _isWebAPI(model?: AmfDocument, context?: Record<string, string>): boolean {
+    _isWebAPI(model?: IAmfDocument, context?: Record<string, string>): boolean {
       const enc = this._computeEncodes(model, context);
       if (!enc) {
         return false;
@@ -917,7 +924,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param model  AMF json/ld model for an API
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _isAsyncAPI(model?: AmfDocument, context?: Record<string, string>): boolean {
+    _isAsyncAPI(model?: IAmfDocument, context?: Record<string, string>): boolean {
       const enc = this._computeEncodes(model, context);
       if (!enc) {
         return false;
@@ -931,7 +938,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param model  AMF json/ld model for an API
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _isAPI(model?: AmfDocument, context?: Record<string, string>): boolean {
+    _isAPI(model?: IAmfDocument, context?: Record<string, string>): boolean {
       const enc = this._computeEncodes(model, context);
       if (!enc) {
         return false;
@@ -950,7 +957,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * to read servers
      * @private
      */
-    _isValidServerPartial(model: DomainElement, context?: Record<string, string>): boolean {
+    _isValidServerPartial(model: IAmfDomainElement, context?: Record<string, string>): boolean {
       if (Array.isArray(model)) {
         [model] = model;
       }
@@ -974,7 +981,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns List of servers for method, if defined, or endpoint, if defined, or root level
      */
-    _getServers(options: ServersQueryOptions = {}, context?: Record<string, string>): Server[] | undefined {
+    _getServers(options: ServersQueryOptions = {}, context?: Record<string, string>): IAmfServer[] | undefined {
       const { endpointId, methodId } = options;
       const { amf } = this;
       if (!amf) {
@@ -994,18 +1001,18 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
 
       const serverKey = this._getAmfKey(ns.aml.vocabularies.apiContract.server, context);
 
-      const getRootServers = (): Server[] | undefined => (this[getArrayItems](api, serverKey, context) as Server[]);
-      const getEndpointServers = (): Server[] | undefined => {
+      const getRootServers = (): IAmfServer[] | undefined => (this[getArrayItems](api, serverKey, context) as IAmfServer[]);
+      const getEndpointServers = (): IAmfServer[] | undefined => {
         const endpoint = this._computeEndpointModel(api, endpointId, context);
-        const servers = (this[getArrayItems](endpoint, serverKey, context) as Server[]);
+        const servers = (this[getArrayItems](endpoint, serverKey, context) as IAmfServer[]);
         if (servers) {
           return servers;
         }
         return getRootServers();
       };
-      const getMethodServers = (): Server[] | undefined => {
+      const getMethodServers = (): IAmfServer[] | undefined => {
         const method = this._computeMethodModel(api, methodId, context);
-        const servers = (this[getArrayItems](method, serverKey, context)) as Server[];
+        const servers = (this[getArrayItems](method, serverKey, context)) as IAmfServer[];
         if (servers) {
           return servers;
         }
@@ -1026,11 +1033,11 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param method AMF `supportedOperation` model
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _computeExpects(method?: Operation, context?: Record<string, string>): Request | undefined {
+    _computeExpects(method?: IAmfOperation, context?: Record<string, string>): IAmfRequest | undefined {
       const operationKey = ns.aml.vocabularies.apiContract.Operation;
       const expectsKey = ns.aml.vocabularies.apiContract.expects;
       if (this._hasType(method, operationKey, context)) {
-        const key = this._getAmfKey(expectsKey, context)!;
+        const key = this._getAmfKey(expectsKey, context) as string;
         const expects = this._ensureArray((method as any)[key]);
         if (expects) {
           return Array.isArray(expects) ? expects[0] : expects;
@@ -1045,13 +1052,13 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns An array of endpoints.
      */
-    _computeEndpoints(webApi?: WebApi, context?: Record<string, string>): EndPoint[] | undefined {
+    _computeEndpoints(webApi?: IAmfWebApi, context?: Record<string, string>): IAmfEndPoint[] | undefined {
       if (!webApi) {
         return [];
       }
       const endpointKey = ns.aml.vocabularies.apiContract.endpoint;
-      const key = this._getAmfKey(endpointKey, context)!;
-      return this._ensureArray((webApi as any)[key]) as EndPoint[];
+      const key = this._getAmfKey(endpointKey, context) as string;
+      return this._ensureArray((webApi as any)[key]) as IAmfEndPoint[];
     }
 
     /**
@@ -1062,7 +1069,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns An endpoint definition
      */
-    _computeEndpointModel(webApi?: WebApi, id?: string, context?: Record<string, string>): EndPoint | undefined {
+    _computeEndpointModel(webApi?: IAmfWebApi, id?: string, context?: Record<string, string>): IAmfEndPoint | undefined {
       if (this._hasType(webApi, ns.aml.vocabularies.apiContract.EndPoint, context)) {
         return webApi;
       }
@@ -1081,7 +1088,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns A method definition
      */
-    _computeMethodModel(webApi?: WebApi, selected?: string, context?: Record<string, string>): Operation | undefined {
+    _computeMethodModel(webApi?: IAmfWebApi, selected?: string, context?: Record<string, string>): IAmfOperation | undefined {
       const methods = this.__computeMethodsListForMethod(webApi, selected, context);
       if (!methods) {
         return undefined;
@@ -1096,7 +1103,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns An endpoint model of undefined.
      */
-    _computeMethodEndpoint(webApi?: WebApi, methodId?: string, context?: Record<string, string>): EndPoint|undefined {
+    _computeMethodEndpoint(webApi?: IAmfWebApi, methodId?: string, context?: Record<string, string>): IAmfEndPoint | undefined {
       if (!webApi || !methodId) {
         return undefined;
       }
@@ -1107,10 +1114,10 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       if (!endpoints) {
         return undefined;
       }
-      const opKey = this._getAmfKey(ns.aml.vocabularies.apiContract.supportedOperation, context)!;
+      const opKey = this._getAmfKey(ns.aml.vocabularies.apiContract.supportedOperation, context);
       for (let i = 0, len = endpoints.length; i < len; i++) {
         const endpoint = endpoints[i];
-        let methods = (endpoint as any)[opKey] as Operation[];
+        let methods = (endpoint as any)[opKey] as IAmfOperation[];
         if (!methods) {
           continue;
         }
@@ -1135,13 +1142,13 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns A list of sibling methods or undefined.
      */
-    __computeMethodsListForMethod(webApi?: WebApi, methodId?: string, context?: Record<string, string>): Operation[] | undefined {
+    __computeMethodsListForMethod(webApi?: IAmfWebApi, methodId?: string, context?: Record<string, string>): IAmfOperation[] | undefined {
       const endpoint = this._computeMethodEndpoint(webApi, methodId, context);
       if (!endpoint) {
         return undefined;
       }
-      const opKey = this._getAmfKey(ns.aml.vocabularies.apiContract.supportedOperation, context)!;
-      return this._ensureArray((endpoint as any)[opKey]) as Operation[] | undefined;
+      const opKey = this._getAmfKey(ns.aml.vocabularies.apiContract.supportedOperation, context);
+      return this._ensureArray((endpoint as any)[opKey]) as IAmfOperation[] | undefined;
     }
 
     /**
@@ -1153,7 +1160,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns A type definition
      */
-    _computeType(declares?: DomainElement[], references?: DomainElement[], selected?: string, context?: Record<string, string>): Shape | undefined {
+    _computeType(declares?: IAmfDomainElement[], references?: IAmfDomainElement[], selected?: string, context?: Record<string, string>): IAmfShape | undefined {
       if ((!declares && !references) || !selected) {
         return undefined;
       }
@@ -1181,7 +1188,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns The AMF shape or undefined when not found.
      */
-    [findAmfType](domainId?: string, context?: Record<string, string>): Shape|undefined {
+    [findAmfType](domainId?: string, context?: Record<string, string>): IAmfShape | undefined {
       let { amf } = this;
       if (!amf || !domainId) {
         return undefined;
@@ -1208,7 +1215,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns The domain object or undefined.
      */
-    [findReferenceObject](domainId: string, context?: Record<string, string>): DomainElement | undefined {
+    [findReferenceObject](domainId: string, context?: Record<string, string>): IAmfDomainElement | undefined {
       let { amf } = this;
       if (Array.isArray(amf)) {
         [amf] = amf;
@@ -1222,7 +1229,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       }
       const compactId = domainId.replace('amf://id', '');
       for (let i = 0, len = references.length; i < len; i++) {
-        const ref = /** @type AmfDocument */ (references[i]);
+        const ref = /** @type IAmfDocument */ (references[i]);
         const declares = this._computeDeclares(ref, context);
         if (!Array.isArray(declares)) {
           continue;
@@ -1247,7 +1254,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Type definition or undefined if not found.
      */
-    _computeReferenceType(reference?: DomainElement, selected?: string, context?: Record<string, string>): Shape|undefined {
+    _computeReferenceType(reference?: IAmfDomainElement, selected?: string, context?: Record<string, string>): IAmfShape | undefined {
       const declare = this._computeDeclares(reference, context);
       if (!declare || !selected) {
         return undefined;
@@ -1275,12 +1282,12 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param selected Selected shape
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    _computeDocument(webApi?: DomainElement, selected?: string, context?: Record<string, string>): DomainElement|undefined {
+    _computeDocument(webApi?: IAmfDomainElement, selected?: string, context?: Record<string, string>): IAmfDomainElement | undefined {
       if (!webApi || !selected) {
         return undefined;
       }
-      const key = this._getAmfKey(ns.aml.vocabularies.core.documentation, context)!;
-      const docs = this._ensureArray((webApi as any)[key]) as DomainElement[];
+      const key = this._getAmfKey(ns.aml.vocabularies.core.documentation, context);
+      const docs = this._ensureArray((webApi as any)[key]) as IAmfDomainElement[];
       return docs && docs.find((item) => (item as any)['@id'] as string === selected);
     }
 
@@ -1296,8 +1303,8 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       if (typeof shape !== 'object' || Array.isArray(shape) || !amf || shape.__apicResolved) {
         return shape;
       }
-      let refKey = this._getAmfKey(ns.aml.vocabularies.document.linkTarget, context)!;
-      let refValue = this._ensureArray(shape[refKey]) as DomainElement[];
+      let refKey = this._getAmfKey(ns.aml.vocabularies.document.linkTarget, context);
+      let refValue = this._ensureArray(shape[refKey]) as IAmfDomainElement[];
       let refData;
       if (refValue) {
         const rk = refValue[0]['@id'];
@@ -1308,8 +1315,8 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
         }
         refData = this._getLinkTarget(amf, rk, context);
       } else {
-        refKey = this._getAmfKey(ns.aml.vocabularies.document.referenceId, context)!;
-        refValue = this._ensureArray(shape[refKey]) as DomainElement[];
+        refKey = this._getAmfKey(ns.aml.vocabularies.document.referenceId, context);
+        refValue = this._ensureArray(shape[refKey]) as IAmfDomainElement[];
         if (refValue) {
           const rk = refValue[0]['@id'];
           if (rk === shape['@id']) {
@@ -1348,7 +1355,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Resolved shape for given reference, undefined otherwise
      */
-    _getLinkTarget(amf?: AmfDocument, id?: string , context?: Record<string, string>): DomainElement | undefined {
+    _getLinkTarget(amf?: IAmfDocument, id?: string, context?: Record<string, string>): IAmfDomainElement | undefined {
       if (!amf || !id) {
         return undefined;
       }
@@ -1377,7 +1384,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Resolved shape for given reference, undefined otherwise
      */
-    _obtainShapeFromReferences(references?: DomainElement[], id?: string, context?: Record<string, string>): DomainElement | undefined {
+    _obtainShapeFromReferences(references?: IAmfDomainElement[], id?: string, context?: Record<string, string>): IAmfDomainElement | undefined {
       if (!Array.isArray(references) || !references.length) {
         return undefined;
       }
@@ -1406,7 +1413,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param id Id to search for
      * @returns Node with the given ID when found, undefined otherwise
      */
-    _findById(array?: DomainElement[], id?: string): DomainElement | undefined {
+    _findById(array?: IAmfDomainElement[], id?: string): IAmfDomainElement | undefined {
       if (!array) return undefined;
       let target;
       for (let i = 0; i < array.length; i++) {
@@ -1419,7 +1426,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       return target;
     }
 
-    _getReferenceId(amf?: AmfDocument, id?: string, context?: Record<string, string>): DomainElement | undefined {
+    _getReferenceId(amf?: IAmfDocument, id?: string, context?: Record<string, string>): IAmfDomainElement | undefined {
       if (!amf || !id) {
         return undefined;
       }
@@ -1465,7 +1472,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       const merged = { ...shapeA, ...shapeB };
       const specialMerges = [
         {
-          key: this._getAmfKey(ns.aml.vocabularies.docSourceMaps.sources, context)!,
+          key: this._getAmfKey(ns.aml.vocabularies.docSourceMaps.sources, context),
           merger: this._mergeSourceMapsSources.bind(this)
         },
       ];
@@ -1488,7 +1495,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @private
      */
     _mergeSourceMapsSources(shapeA: any, shapeB: any, context?: Record<string, string>): (any | {})[] {
-      const sourcesKey = this._getAmfKey(ns.aml.vocabularies.docSourceMaps.sources, context)!;
+      const sourcesKey = this._getAmfKey(ns.aml.vocabularies.docSourceMaps.sources, context);
       let aSources = shapeA[sourcesKey] || {};
       if (Array.isArray(aSources)) {
         aSources = aSources[0];
@@ -1534,7 +1541,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Type definition or undefined if not found.
      */
-    findSecurityScheme(domainId: string, context?: Record<string, string>): SecurityScheme | undefined {
+    findSecurityScheme(domainId: string, context?: Record<string, string>): IAmfSecurityScheme | undefined {
       const { amf } = this;
       const declares = this._computeDeclares(amf, context);
       let result;
@@ -1567,7 +1574,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param context A context to use. If not set, it looks for the context of the passed model
      * @returns Type definition or undefined if not found.
      */
-    [computeReferenceSecurity](reference: DomainElement, selected: string, context?: Record<string, string>): SecurityScheme | undefined {
+    [computeReferenceSecurity](reference: IAmfDomainElement, selected: string, context?: Record<string, string>): IAmfSecurityScheme | undefined {
       const declare = this._computeDeclares(reference, context);
       if (!declare) {
         return undefined;
@@ -1591,17 +1598,17 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
      * @param type The domain type
      * @param context A context to use. If not set, it looks for the context of the passed model
      */
-    getByType(source: DomainElement, type: string, context?: Record<string, string>): DomainElement[] {
+    getByType(source: IAmfDomainElement, type: string, context?: Record<string, string>): IAmfDomainElement[] {
       if (!source) {
         return [];
       }
-      let result: DomainElement[] = [];
+      let result: IAmfDomainElement[] = [];
       const declares = this._computeDeclares(source);
       const key = this._getAmfKey(type, context);
       if (declares && declares.length) {
         declares.forEach((declared) => {
           if (this._hasType(declared, key)) {
-            result.push(declared as DomainElement);
+            result.push(declared as IAmfDomainElement);
           }
         });
       }
@@ -1609,7 +1616,7 @@ export const AmfMixin = <T extends Constructor<any>>(superClass: T): Constructor
       if (Array.isArray(references) && references.length) {
         for (const ref of references) {
           if (this._hasType(ref, ns.aml.vocabularies.document.Module)) {
-            const items = this.getByType(ref as DomainElement, type, context);
+            const items = this.getByType(ref as IAmfDomainElement, type, context);
             if (items.length) {
               result = result.concat(items);
             }