@api-client/core 0.7.11 → 0.8.0

package/src/amf/AmfSerializer.ts

@@ -1,9 +1,9 @@
 import { AmfMixin, expandKey, findAmfType, getArrayItems } from "./AmfMixin.js";
-import { AnyShape, Api, ArrayNode, ArrayShape, AsyncApi, CreativeWork, DataArrangeShape, DataNode, DocumentSourceMaps, DomainElement, EndPoint, Example, FileShape, License, NodeShape, ObjectNode, Operation, Organization, Parameter, PropertyShape, RecursiveShape, ScalarNode, ScalarShape, SchemaShape, SecurityRequirement, Server, Shape, SynthesizedField, TupleShape, UnionShape, WebApi, XMLSerializer, Payload, Tag, Callback, Request, Response, TemplatedLink, IriTemplateMapping, ParametrizedSecurityScheme, SecurityScheme, Settings, OAuth1Settings, OAuth2Settings, ApiKeySettings, HttpSettings, OpenIdConnectSettings, OAuth2Flow, Scope, ParametrizedDeclaration, ParametrizedTrait, ParametrizedResourceType, VariableValue, AbstractDeclaration } from "./definitions/Amf.js";
-import { ApiAbstractDeclaration, ApiAsync, ApiBase, ApiCallback, ApiDocumentation, ApiDocumentSourceMaps, ApiEndPoint, ApiEndPointWithOperationsListItem, ApiIriTemplateMapping, ApiLicense, ApiOperation, ApiOperationListItem, ApiOrganization, ApiParameter, ApiParametrizedDeclaration, ApiParametrizedResourceType, ApiParametrizedSecurityScheme, ApiParametrizedTrait, ApiPayload, ApiRequest, ApiResponse, ApiSecurityApiKeySettings, ApiSecurityHttpSettings, ApiSecurityOAuth1Settings, ApiSecurityOAuth2Flow, ApiSecurityOAuth2Settings, ApiSecurityOpenIdConnectSettings, ApiSecurityRequirement, ApiSecurityScheme, ApiSecuritySchemeListItem, ApiSecurityScope, ApiSecuritySettings, ApiSecuritySettingsUnion, ApiServer, ApiSummary, ApiSynthesizedField, ApiTag, ApiTemplatedLink, ApiVariableValue, ApiWeb, ShapeProcessingOptions } from "./definitions/Api.js";
-import { ICustomDomainProperty } from "./definitions/Base.js";
+import { IAmfAnyShape, IAmfApi, IAmfArrayNode, IAmfArrayShape, IAmfAsyncApi, IAmfCreativeWork, IAmfDataArrangeShape, IAmfDataNode, IAmfDocumentSourceMaps, IAmfDomainElement, IAmfEndPoint, IAmfExample, IAmfFileShape, IAmfLicense, IAmfNodeShape, IAmfObjectNode, IAmfOperation, IAmfOrganization, IAmfParameter, IAmfPropertyShape, IAmfRecursiveShape, IAmfScalarNode, IAmfScalarShape, IAmfSchemaShape, IAmfSecurityRequirement, IAmfServer, IAmfShape, IAmfSynthesizedField, IAmfTupleShape, IAmfUnionShape, IAmfWebApi, IAmfXMLSerializer, IAmfPayload, IAmfTag, IAmfCallback, IAmfRequest, IAmfResponse, IAmfTemplatedLink, IAmfIriTemplateMapping, IAmfParametrizedSecurityScheme, IAmfSecurityScheme, IAmfSettings, IAmfOAuth1Settings, IAmfOAuth2Settings, IAmfApiKeySettings, IAmfHttpSettings, IAmfOpenIdConnectSettings, IAmfOAuth2Flow, IAmfScope, IAmfParametrizedDeclaration, IAmfParametrizedTrait, IAmfParametrizedResourceType, IAmfVariableValue, IAmfAbstractDeclaration } from "./definitions/Amf.js";
+import { IApiAbstractDeclaration, IApiAsync, IApiBase, IApiCallback, IApiDocumentation, IApiDocumentSourceMaps, IApiEndPoint, IApiEndPointWithOperationsListItem, IApiIriTemplateMapping, IApiLicense, IApiOperation, IApiOperationListItem, IApiOrganization, IApiParameter, IApiParametrizedDeclaration, IApiParametrizedResourceType, IApiParametrizedSecurityScheme, IApiParametrizedTrait, IApiPayload, IApiRequest, IApiResponse, IApiSecurityApiKeySettings, IApiSecurityHttpSettings, IApiSecurityOAuth1Settings, IApiSecurityOAuth2Flow, IApiSecurityOAuth2Settings, IApiSecurityOpenIdConnectSettings, IApiSecurityRequirement, IApiSecurityScheme, IApiSecuritySchemeListItem, IApiSecurityScope, IApiSecuritySettings, IApiSecuritySettingsUnion, IApiServer, IApiSummary, IApiSynthesizedField, IApiTag, IApiTemplatedLink, IApiVariableValue, IApiWeb, IShapeProcessingOptions } from "./definitions/Api.js";
+import { IApiCustomDomainProperty } from "./definitions/Base.js";
 import { AmfNamespace as ns } from './definitions/Namespace.js';
-import { IAnyShape, IArrayNode, IArrayShape, IDataArrangeShape, IDataExample, IDataNode, IDataNodeUnion, IFileShape, INodeShape, IObjectNode, IPropertyShape, IRecursiveShape, IScalarNode, IScalarShape, ISchemaShape, IShape, IShapeUnion, ITupleShape, IUnionShape, IXmlSerializer } from "./definitions/Shapes.js";
+import { IApiAnyShape, IApiArrayNode, IApiArrayShape, IApiDataArrangeShape, IApiDataExample, IApiDataNode, IApiDataNodeUnion, IApiFileShape, IApiNodeShape, IApiObjectNode, IApiPropertyShape, IApiRecursiveShape, IApiScalarNode, IApiScalarShape, IApiSchemaShape, IApiShape, IShapeUnion, IApiTupleShape, IApiUnionShape, IApiXmlSerializer } from "./definitions/Shapes.js";
 
 /**
  * A class that takes AMF's ld+json model and outputs JavaScript interface of it.
@@ -12,7 +12,7 @@ export class AmfSerializer extends AmfMixin(Object) {
   /**
    * @param graph Optional AMF generated graph model.
    */
-  constructor(graph?: DomainElement) {
+  constructor(graph?: IAmfDomainElement) {
     super();
     if (graph) {
       this.amf = graph;
@@ -38,9 +38,9 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param object The API to serialize.
    * @returns API summary, without complex objects.
    */
-  apiSummary(object: Api): ApiSummary {
+  apiSummary(object: IAmfApi): IApiSummary {
     const context = object['@context'];
-    const result: ApiSummary = {
+    const result: IApiSummary = {
       id: object['@id'],
       types: this.readTypes(object['@type'], context),
       customDomainProperties: this.customDomainProperties(object, context),
@@ -68,76 +68,76 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (termsOfService && typeof termsOfService === 'string') {
       result.termsOfService = termsOfService;
     }
-    const accepts = object[this._getAmfKey(ns.aml.vocabularies.apiContract.accepts, context) as keyof Api] as any;
+    const accepts = object[this._getAmfKey(ns.aml.vocabularies.apiContract.accepts, context) as keyof IAmfApi] as any;
     if (Array.isArray(accepts) && accepts.length) {
       result.accepts = this._getValueArray(object, ns.aml.vocabularies.apiContract.accepts, context) as string[];
     }
-    const contentType = object[this._getAmfKey(ns.aml.vocabularies.apiContract.contentType, context) as keyof Api];
+    const contentType = object[this._getAmfKey(ns.aml.vocabularies.apiContract.contentType, context) as keyof IAmfApi];
     if (Array.isArray(contentType) && contentType.length) {
       result.contentType = this._getValueArray(object, ns.aml.vocabularies.apiContract.contentType, context) as string[];
     }
-    const schemes = object[this._getAmfKey(ns.aml.vocabularies.apiContract.scheme, context) as keyof Api];
+    const schemes = object[this._getAmfKey(ns.aml.vocabularies.apiContract.scheme, context) as keyof IAmfApi];
     if (Array.isArray(schemes) && schemes.length) {
       result.schemes = this._getValueArray(object, ns.aml.vocabularies.apiContract.scheme, context) as string[];
     }
-    let provider = object[this._getAmfKey(ns.aml.vocabularies.core.provider, context) as keyof Api] as Organization[] | Organization;
+    let provider = object[this._getAmfKey(ns.aml.vocabularies.core.provider, context) as keyof IAmfApi] as IAmfOrganization[] | IAmfOrganization;
     if (Array.isArray(provider)) {
       [provider] = provider;
     }
     if (provider) {
       result.provider = this.provider(provider);
     }
-    let license = object[this._getAmfKey(ns.aml.vocabularies.core.license, context) as keyof Api] as License | License[];
+    let license = object[this._getAmfKey(ns.aml.vocabularies.core.license, context) as keyof IAmfApi] as IAmfLicense | IAmfLicense[];
     if (Array.isArray(license)) {
       [license] = license;
     }
     if (license) {
       result.license = this.license(license);
     }
-    const tags = object[this._getAmfKey(ns.aml.vocabularies.apiContract.tag, context) as keyof Api] as Tag[] | undefined;
+    const tags = object[this._getAmfKey(ns.aml.vocabularies.apiContract.tag, context) as keyof IAmfApi] as IAmfTag[] | undefined;
     if (Array.isArray(tags) && tags.length) {
       result.tags = tags.map(t => this.tag(t));
     }
-    const docs = object[this._getAmfKey(ns.aml.vocabularies.core.documentation, context) as keyof Api] as CreativeWork[] | undefined;
+    const docs = object[this._getAmfKey(ns.aml.vocabularies.core.documentation, context) as keyof IAmfApi] as IAmfCreativeWork[] | undefined;
     if (Array.isArray(docs) && docs.length) {
       result.documentations = docs.map(d => this.documentation(d));
     }
     return result;
   }
 
-  api(object: Api, context?: Record<string, string>): ApiBase {
+  api(object: IAmfApi, context?: Record<string, string>): IApiBase {
     const objectContext = context || object['@context'];
-    const result = this.apiSummary(object) as ApiBase;
+    const result = this.apiSummary(object) as IApiBase;
     result.endPoints = [];
     result.servers = [];
     result.security = [];
     
-    const endPoints = object[this._getAmfKey(ns.aml.vocabularies.apiContract.endpoint, objectContext) as keyof Api] as EndPoint[] | undefined;
+    const endPoints = object[this._getAmfKey(ns.aml.vocabularies.apiContract.endpoint, objectContext) as keyof IAmfApi] as IAmfEndPoint[] | undefined;
     if (Array.isArray(endPoints) && endPoints.length) {
       result.endPoints = endPoints.map(e => this.endPoint(e, objectContext));
     }
-    const servers = object[this._getAmfKey(ns.aml.vocabularies.apiContract.server, objectContext) as keyof Api] as Server | Server[] | undefined;
+    const servers = object[this._getAmfKey(ns.aml.vocabularies.apiContract.server, objectContext) as keyof IAmfApi] as IAmfServer | IAmfServer[] | undefined;
     if (Array.isArray(servers) && servers.length) {
       result.servers = servers.map(s => this.server(s, objectContext));
     }
-    const security = object[this._getAmfKey(ns.aml.vocabularies.security.security, objectContext) as keyof Api] as SecurityRequirement[] | undefined;
+    const security = object[this._getAmfKey(ns.aml.vocabularies.security.security, objectContext) as keyof IAmfApi] as IAmfSecurityRequirement[] | undefined;
     if (Array.isArray(security) && security.length) {
       result.security = security.map(s => this.securityRequirement(s, objectContext));
     }
     return result;
   }
 
-  webApi(object: WebApi, context?: Record<string, string>): ApiWeb {
+  webApi(object: IAmfWebApi, context?: Record<string, string>): IApiWeb {
     return this.api(object, context);
   }
   
-  asyncApi(object: AsyncApi, context?: Record<string, string>): ApiAsync {
+  asyncApi(object: IAmfAsyncApi, context?: Record<string, string>): IApiAsync {
     return this.api(object, context);
   }
 
-  provider(object: Organization, context?: Record<string, string>): ApiOrganization {
+  provider(object: IAmfOrganization, context?: Record<string, string>): IApiOrganization {
     const objectContext = context || object['@context'];
-    const result: ApiOrganization = {
+    const result: IApiOrganization = {
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -159,9 +159,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  license(object: License, context?: Record<string, string>): ApiLicense {
+  license(object: IAmfLicense, context?: Record<string, string>): IApiLicense {
     const objectContext = context || object['@context'];
-    const result: ApiLicense = {
+    const result: IApiLicense = {
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -183,11 +183,11 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param object The AMF Server to serialize.
    * @returns Serialized Server
    */
-  server(object: Server, context?: Record<string, string>): ApiServer {
+  server(object: IAmfServer, context?: Record<string, string>): IApiServer {
     const objectContext = context || object['@context'];
     
     const url = this._getValue(object, ns.aml.vocabularies.core.urlTemplate, objectContext) as string || '';
-    const result: ApiServer = ({
+    const result: IApiServer = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       url,
@@ -199,7 +199,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (description && typeof description === 'string') {
       result.description = description;
     }
-    const variables = (object[this._getAmfKey(ns.aml.vocabularies.apiContract.variable, objectContext) as keyof Server]) as Parameter[];
+    const variables = (object[this._getAmfKey(ns.aml.vocabularies.apiContract.variable, objectContext) as keyof IAmfServer]) as IAmfParameter[];
     if (Array.isArray(variables) && variables.length) {
       result.variables = variables.map((p) => this.parameter(p, objectContext));
     }
@@ -211,7 +211,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (protocolVersion) {
       result.protocolVersion = protocolVersion;
     }
-    const security = (object[this._getAmfKey(ns.aml.vocabularies.security.security, objectContext) as keyof Server]) as SecurityRequirement[];
+    const security = (object[this._getAmfKey(ns.aml.vocabularies.security.security, objectContext) as keyof IAmfServer]) as IAmfSecurityRequirement[];
     if (Array.isArray(security) && security.length) {
       result.security = security.map((p) => this.securityRequirement(p, objectContext));
     }
@@ -222,9 +222,9 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param object The Parameter to serialize.
    * @returns Serialized Parameter
    */
-  parameter(object: Parameter, context?: Record<string, string>): ApiParameter {
+  parameter(object: IAmfParameter, context?: Record<string, string>): IApiParameter {
     const objectContext = context || object['@context'];
-    const result: ApiParameter = ({
+    const result: IApiParameter = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       payloads: [],
@@ -273,63 +273,63 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (binding && typeof binding === 'string') {
       result.binding = binding;
     }
-    const schemas = object[this._getAmfKey(ns.aml.vocabularies.shapes.schema, objectContext) as keyof Parameter] as Shape[];
+    const schemas = object[this._getAmfKey(ns.aml.vocabularies.shapes.schema, objectContext) as keyof IAmfParameter] as IAmfShape[];
     if (Array.isArray(schemas) && schemas.length) {
       const [schema] = schemas;
       result.schema = this.unknownShape(schema, {
         trackedId: object['@id'],
       }, objectContext);
     }
-    const payloads = object[this._getAmfKey(ns.aml.vocabularies.apiContract.payload, objectContext) as keyof Parameter] as Payload[];
+    const payloads = object[this._getAmfKey(ns.aml.vocabularies.apiContract.payload, objectContext) as keyof IAmfParameter] as IAmfPayload[];
     if (Array.isArray(payloads) && payloads.length) {
       result.payloads = payloads.map(p => this.payload(p, objectContext));
     }
-    const examples = object[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof Parameter] as Parameter[];
+    const examples = object[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof IAmfParameter] as IAmfParameter[];
     if (Array.isArray(examples) && examples.length) {
       result.examples = examples.map(e => this.example(e, objectContext));
     }
     return result;
   }
 
-  unknownShape(object: Shape, options?: ShapeProcessingOptions, context?: Record<string, string>): IShapeUnion {
+  unknownShape(object: IAmfShape, options?: IShapeProcessingOptions, context?: Record<string, string>): IShapeUnion {
     const objectContext = context || object['@context'];
     const types = this.readTypes(object['@type'], objectContext);
     
     if (types.includes(ns.aml.vocabularies.shapes.ScalarShape)) {
-      return this.scalarShape(object as ScalarShape, options, objectContext);
+      return this.scalarShape(object as IAmfScalarShape, options, objectContext);
     }
     if (types.includes(ns.w3.shacl.NodeShape)) {
-      return this.nodeShape(object as NodeShape, options, objectContext);
+      return this.nodeShape(object as IAmfNodeShape, options, objectContext);
     }
     if (types.includes(ns.aml.vocabularies.shapes.UnionShape)) {
-      return this.unionShape((object as UnionShape), options, objectContext);
+      return this.unionShape((object as IAmfUnionShape), options, objectContext);
     }
     if (types.includes(ns.aml.vocabularies.shapes.FileShape)) {
-      return this.fileShape((object as FileShape), options, objectContext);
+      return this.fileShape((object as IAmfFileShape), options, objectContext);
     }
     if (types.includes(ns.aml.vocabularies.shapes.SchemaShape)) {
-      return this.schemaShape((object as SchemaShape), options, objectContext);
+      return this.schemaShape((object as IAmfSchemaShape), options, objectContext);
     }
     // this must be before the ArrayShape
     if (types.includes(ns.aml.vocabularies.shapes.TupleShape)) {
-      return this.tupleShape((object as TupleShape), options, objectContext);
+      return this.tupleShape((object as IAmfTupleShape), options, objectContext);
     }
     if (types.includes(ns.aml.vocabularies.shapes.ArrayShape) || types.includes(ns.aml.vocabularies.shapes.MatrixShape)) {
-      return this.arrayShape((object as ArrayShape), options, objectContext);
+      return this.arrayShape((object as IAmfArrayShape), options, objectContext);
     }
     if (types.includes(ns.aml.vocabularies.shapes.RecursiveShape)) {
-      return this.recursiveShape((object as RecursiveShape), objectContext);
+      return this.recursiveShape((object as IAmfRecursiveShape), objectContext);
     }
     // recursiveShape
-    return this.anyShape((object as AnyShape), options, objectContext);
+    return this.anyShape((object as IAmfAnyShape), options, objectContext);
   }
 
-  isLink(object: DomainElement, context?: Record<string, string>): boolean {
+  isLink(object: IAmfDomainElement, context?: Record<string, string>): boolean {
     const objectContext = context || object['@context'];
     return !!this._getLinkValue(object, ns.aml.vocabularies.document.linkTarget, objectContext);
   }
 
-  getLinkTarget<T extends DomainElement>(object: T, context?: Record<string, string>): T | undefined {
+  getLinkTarget<T extends IAmfDomainElement>(object: T, context?: Record<string, string>): T | undefined {
     const objectContext = context || object['@context'];
     const id = this._getLinkValue(object, ns.aml.vocabularies.document.linkTarget, objectContext);
     if (!id) {
@@ -338,7 +338,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     return this[findAmfType](id, objectContext) as T | undefined;
   }
 
-  shape(object: Shape, context?: Record<string, string>): IShape {
+  shape(object: IAmfShape, context?: Record<string, string>): IApiShape {
     const objectContext = context || object['@context'];
     this._resolve(object);
     let linkLabel: string | undefined;
@@ -346,12 +346,12 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (this.isLink(target)) {
       linkLabel = (this._getValue(target, ns.aml.vocabularies.document.linkLabel, objectContext)) as string;
       const id = this._getLinkValue(target, ns.aml.vocabularies.document.linkTarget, objectContext);
-      const value = this[findAmfType](id, objectContext) as Shape | undefined;
+      const value = this[findAmfType](id, objectContext) as IAmfShape | undefined;
       if (value) {
         target = value;
       }
     }
-    const result: IShape = ({
+    const result: IApiShape = ({
       id: target['@id'],
       types: this.readTypes(object['@type'], objectContext),
       values: [],
@@ -399,31 +399,31 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (typeof writeOnly === 'boolean') {
       result.writeOnly = writeOnly;
     }
-    const defValue = target[this._getAmfKey(ns.w3.shacl.defaultValue, objectContext) as keyof Shape];
+    const defValue = target[this._getAmfKey(ns.w3.shacl.defaultValue, objectContext) as keyof IAmfShape];
     if (Array.isArray(defValue) && defValue.length) {
-      result.defaultValue = this.unknownDataNode(defValue[0] as any, objectContext);
+      result.defaultValue = this.unknownDataNode(defValue[0] as IAmfDataNode, objectContext);
     }
     // @TODO:
     // if (Array.isArray(inherits) && inherits.length) {
     //   result.inherits = inherits.map((item) => this.unknownShape(item));
     // }
-    const orKey = this._getAmfKey(ns.w3.shacl.or, objectContext) as keyof Shape;
-    const orGroup = (target[orKey]) as Shape[];
+    const orKey = this._getAmfKey(ns.w3.shacl.or, objectContext) as keyof IAmfShape;
+    const orGroup = (target[orKey]) as IAmfShape[];
     if (Array.isArray(orGroup) && orGroup.length) {
       result.or = orGroup.map((item) => this.unknownShape(item, undefined, objectContext));
     }
-    const andKey = this._getAmfKey(ns.w3.shacl.and, objectContext) as keyof Shape;
-    const andGroup = (target[andKey]) as Shape[];
+    const andKey = this._getAmfKey(ns.w3.shacl.and, objectContext) as keyof IAmfShape;
+    const andGroup = (target[andKey]) as IAmfShape[];
     if (Array.isArray(andGroup) && andGroup.length) {
       result.and = andGroup.map((item) => this.unknownShape(item, undefined, objectContext));
     }
-    const xoneKey = this._getAmfKey(ns.w3.shacl.xone, objectContext) as keyof Shape;
-    const xone = (target[xoneKey]) as Shape[];
+    const xoneKey = this._getAmfKey(ns.w3.shacl.xone, objectContext) as keyof IAmfShape;
+    const xone = (target[xoneKey]) as IAmfShape[];
     if (Array.isArray(xone) && xone.length) {
       result.xone = xone.map((item) => this.unknownShape(item, undefined, objectContext));
     }
     
-    const valuesList = target[this._getAmfKey(ns.w3.shacl.in, objectContext) as keyof Shape];
+    const valuesList = target[this._getAmfKey(ns.w3.shacl.in, objectContext) as keyof IAmfShape];
     if (Array.isArray(valuesList) && valuesList.length) {
       const [values] = valuesList;
       const prefix = ns.w3.rdfSchema.key;
@@ -441,29 +441,29 @@ export class AmfSerializer extends AmfMixin(Object) {
         }
       });
     }
-    const notKey = this._getAmfKey(ns.w3.shacl.not, objectContext) as keyof Shape;
-    let not = target[notKey] as Shape | undefined;
+    const notKey = this._getAmfKey(ns.w3.shacl.not, objectContext) as keyof IAmfShape;
+    let not = target[notKey] as IAmfShape | undefined;
     if (not) {
       if (Array.isArray(not)) {
         [not] = not;
       }
-      result.not = this.unknownShape(not!, undefined, objectContext);
+      result.not = this.unknownShape(not as IAmfShape, undefined, objectContext);
     }
     return result;
   }
 
-  anyShape(object: AnyShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): IAnyShape {
+  anyShape(object: IAmfAnyShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiAnyShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.shape(target, objectContext)) as IAnyShape;
+    const result = (this.shape(target, objectContext)) as IApiAnyShape;
     if (this.isLink(target)) {
-      const value = (this.getLinkTarget(target, objectContext)) as Shape | undefined;
+      const value = (this.getLinkTarget(target, objectContext)) as IAmfShape | undefined;
       if (value) {
         target = value;
       }
     }
     result.examples = [];
-    const examples = target[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof AnyShape] as Example[];
+    const examples = target[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof IAmfAnyShape] as IAmfExample[];
     
     if (Array.isArray(examples) && examples.length) {
       if (options.trackedId) {
@@ -474,14 +474,14 @@ export class AmfSerializer extends AmfMixin(Object) {
         result.examples = filtered.map((item) => this.example(item, objectContext));
       }
     }
-    const docs = target[this._getAmfKey(ns.aml.vocabularies.core.documentation, objectContext) as keyof AnyShape] as CreativeWork[] | undefined;
+    const docs = target[this._getAmfKey(ns.aml.vocabularies.core.documentation, objectContext) as keyof IAmfAnyShape] as IAmfCreativeWork[] | undefined;
     if (Array.isArray(docs) && docs.length) {
       const [documentation] = docs;
       result.documentation = this.documentation(documentation, objectContext);
     }
-    const xml = target[this._getAmfKey(ns.aml.vocabularies.shapes.xmlSerialization, objectContext) as keyof AnyShape] as XMLSerializer[] | undefined;
+    const xml = target[this._getAmfKey(ns.aml.vocabularies.shapes.xmlSerialization, objectContext) as keyof IAmfAnyShape] as IAmfXMLSerializer[] | undefined;
     if (Array.isArray(xml) && xml.length) {
-      result.xmlSerialization = this.xmlSerializer(xml[0] as XMLSerializer, objectContext);
+      result.xmlSerialization = this.xmlSerializer(xml[0] as IAmfXMLSerializer, objectContext);
     }
     return result;
   }
@@ -491,24 +491,24 @@ export class AmfSerializer extends AmfMixin(Object) {
    * 
    * This function is copied from old `api-example-generator/ExampleGenerator`.
    */
-  filterTrackedExamples(examples: Example[], trackedId: string, context?: Record<string, string>): Example[] {
+  filterTrackedExamples(examples: IAmfExample[], trackedId: string, context?: Record<string, string>): IAmfExample[] {
     const { docSourceMaps } = ns.aml.vocabularies;
-    const sourceKey = this._getAmfKey(docSourceMaps.sources, context) as keyof Example;
-    const trackedKey = this._getAmfKey(docSourceMaps.trackedElement, context) as keyof DocumentSourceMaps;
+    const sourceKey = this._getAmfKey(docSourceMaps.sources, context) as keyof IAmfExample;
+    const trackedKey = this._getAmfKey(docSourceMaps.trackedElement, context) as keyof IAmfDocumentSourceMaps;
     const longId = trackedId.indexOf('amf') === -1 ? `amf://id${trackedId}` : trackedId;
     return examples.filter((item) => {
       let example = item;
       if (Array.isArray(example)) {
         [example] = example;
       }
-      let sm = example[sourceKey] as DocumentSourceMaps[] | DocumentSourceMaps | undefined;
+      let sm = example[sourceKey] as IAmfDocumentSourceMaps[] | IAmfDocumentSourceMaps | undefined;
       if (!sm) {
         return true
       }
       if (Array.isArray(sm)) {
         [sm] = sm;
       }
-      let tracked = sm[trackedKey] as SynthesizedField[] | SynthesizedField | undefined;
+      let tracked = sm[trackedKey] as IAmfSynthesizedField[] | IAmfSynthesizedField | undefined;
       if (!tracked) {
         return true;
       }
@@ -532,23 +532,23 @@ export class AmfSerializer extends AmfMixin(Object) {
    * defined for the parent Shape (ed in the type declaration). It filters out all examples
    * defined in a payload.
    */
-  filterNonTrackedExamples(examples: Example[], context?: Record<string, string>): Example[] {
+  filterNonTrackedExamples(examples: IAmfExample[], context?: Record<string, string>): IAmfExample[] {
     const { docSourceMaps } = ns.aml.vocabularies;
-    const sourceKey = this._getAmfKey(docSourceMaps.sources, context) as keyof Example;
-    const trackedKey = this._getAmfKey(docSourceMaps.trackedElement, context) as keyof DocumentSourceMaps;
+    const sourceKey = this._getAmfKey(docSourceMaps.sources, context) as keyof IAmfExample;
+    const trackedKey = this._getAmfKey(docSourceMaps.trackedElement, context) as keyof IAmfDocumentSourceMaps;
     return examples.filter((item) => {
       let example = item;
       if (Array.isArray(example)) {
         [example] = example;
       }
-      let sm = example[sourceKey] as DocumentSourceMaps[] | DocumentSourceMaps | undefined;
+      let sm = example[sourceKey] as IAmfDocumentSourceMaps[] | IAmfDocumentSourceMaps | undefined;
       if (!sm) {
         return true
       }
       if (Array.isArray(sm)) {
         [sm] = sm;
       }
-      let tracked = sm[trackedKey] as SynthesizedField[] | SynthesizedField | undefined;
+      let tracked = sm[trackedKey] as IAmfSynthesizedField[] | IAmfSynthesizedField | undefined;
       if (!tracked) {
         return true;
       }
@@ -563,12 +563,12 @@ export class AmfSerializer extends AmfMixin(Object) {
     });
   }
 
-  scalarShape(object: ScalarShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): IScalarShape {
+  scalarShape(object: IAmfScalarShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiScalarShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.anyShape(target, options, objectContext)) as IScalarShape;
+    const result = (this.anyShape(target, options, objectContext)) as IApiScalarShape;
     if (this.isLink(target)) {
-      const value = (this.getLinkTarget(target, objectContext)) as ScalarShape | undefined;
+      const value = (this.getLinkTarget(target, objectContext)) as IAmfScalarShape | undefined;
       if (value) {
         target = value;
       }
@@ -611,10 +611,10 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  nodeShape(object: NodeShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): INodeShape {
+  nodeShape(object: IAmfNodeShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiNodeShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.anyShape(target, options, objectContext)) as INodeShape;
+    const result = (this.anyShape(target, options, objectContext)) as IApiNodeShape;
     if (this.isLink(target)) {
       const value = this.getLinkTarget(target, objectContext);
       if (value) {
@@ -655,7 +655,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     // } else {
     //   result.customShapePropertyDefinitions = [];
     // }
-    const properties = (target[this._getAmfKey(ns.w3.shacl.property, objectContext) as keyof NodeShape]) as PropertyShape[];
+    const properties = (target[this._getAmfKey(ns.w3.shacl.property, objectContext) as keyof IAmfNodeShape]) as IAmfPropertyShape[];
     if (Array.isArray(properties) && properties.length) {
       result.properties = properties.map((item) => this.propertyShape(item, objectContext));
     } else {
@@ -670,10 +670,10 @@ export class AmfSerializer extends AmfMixin(Object) {
   }
 
 
-  propertyShape(object: PropertyShape, context?: Record<string, string>): IPropertyShape {
+  propertyShape(object: IAmfPropertyShape, context?: Record<string, string>): IApiPropertyShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.shape(target, objectContext)) as IPropertyShape;
+    const result = (this.shape(target, objectContext)) as IApiPropertyShape;
     if (this.isLink(target)) {
       const value = this.getLinkTarget(target, objectContext);
       if (value) {
@@ -697,7 +697,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     //   result.patternName = patternName.value();
     // }
     
-    const ranges = (target[this._getAmfKey(ns.aml.vocabularies.shapes.range, objectContext) as keyof PropertyShape]) as Shape[];
+    const ranges = (target[this._getAmfKey(ns.aml.vocabularies.shapes.range, objectContext) as keyof IAmfPropertyShape]) as IAmfShape[];
     if (Array.isArray(ranges) && ranges.length) {
       const [range] = ranges;
       result.range = this.unknownShape(range, undefined, objectContext);
@@ -705,10 +705,10 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  unionShape(object: UnionShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): IUnionShape {
+  unionShape(object: IAmfUnionShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiUnionShape {
     const objectContext = context || object['@context'];
-    const anyOf = (object[this._getAmfKey(ns.aml.vocabularies.shapes.anyOf, objectContext) as keyof UnionShape]) as Shape[];
-    const result = (this.anyShape(object, options, objectContext)) as IUnionShape;
+    const anyOf = (object[this._getAmfKey(ns.aml.vocabularies.shapes.anyOf, objectContext) as keyof IAmfUnionShape]) as IAmfShape[];
+    const result = (this.anyShape(object, options, objectContext)) as IApiUnionShape;
     if (Array.isArray(anyOf) && anyOf.length) {
       const opt = { ...options, trackedId: undefined };
       result.anyOf = anyOf.map((shape) => this.unknownShape(shape, opt, objectContext));
@@ -718,10 +718,10 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  fileShape(object: FileShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): IFileShape {
+  fileShape(object: IAmfFileShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiFileShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.anyShape(target, options, objectContext)) as IFileShape;
+    const result = (this.anyShape(target, options, objectContext)) as IApiFileShape;
     if (this.isLink(target)) {
       const value = (this.getLinkTarget(target, objectContext));
       if (value) {
@@ -766,10 +766,10 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  schemaShape(object: SchemaShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): ISchemaShape {
+  schemaShape(object: IAmfSchemaShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiSchemaShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.anyShape(target, options, objectContext)) as ISchemaShape;
+    const result = (this.anyShape(target, options, objectContext)) as IApiSchemaShape;
     if (this.isLink(target)) {
       const value = (this.getLinkTarget(target, objectContext));
       if (value) {
@@ -789,10 +789,10 @@ export class AmfSerializer extends AmfMixin(Object) {
   }
 
 
-  recursiveShape(object: RecursiveShape, context?: Record<string, string>): IRecursiveShape {
+  recursiveShape(object: IAmfRecursiveShape, context?: Record<string, string>): IApiRecursiveShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.shape(target, objectContext)) as IRecursiveShape;
+    const result = (this.shape(target, objectContext)) as IApiRecursiveShape;
     if (this.isLink(target)) {
       const value = (this.getLinkTarget(target, objectContext));
       if (value) {
@@ -807,10 +807,10 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  dataArrangeShape(object: DataArrangeShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): IDataArrangeShape {
+  dataArrangeShape(object: IAmfDataArrangeShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiDataArrangeShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.anyShape(target, options, objectContext)) as IDataArrangeShape;
+    const result = (this.anyShape(target, options, objectContext)) as IApiDataArrangeShape;
     if (this.isLink(target)) {
       const value = (this.getLinkTarget(target, objectContext));
       if (value) {
@@ -831,10 +831,10 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  arrayShape(object: ArrayShape, options: ShapeProcessingOptions={}, context?: Record<string, string>): IArrayShape {
+  arrayShape(object: IAmfArrayShape, options: IShapeProcessingOptions={}, context?: Record<string, string>): IApiArrayShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.dataArrangeShape(target, options, objectContext)) as IArrayShape;
+    const result = (this.dataArrangeShape(target, options, objectContext)) as IApiArrayShape;
     if (this.isLink(target)) {
       const value = (this.getLinkTarget(target, objectContext));
       if (value) {
@@ -842,7 +842,7 @@ export class AmfSerializer extends AmfMixin(Object) {
       }
     }
 
-    const items = target[this._getAmfKey(ns.aml.vocabularies.shapes.items, objectContext) as keyof ArrayShape] as Shape[] | undefined;
+    const items = target[this._getAmfKey(ns.aml.vocabularies.shapes.items, objectContext) as keyof IAmfArrayShape] as IAmfShape[] | undefined;
     if (Array.isArray(items) && items.length) {
       const [item] = items;
       result.items = this.unknownShape(item, undefined, objectContext);
@@ -850,17 +850,17 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  tupleShape(object: TupleShape, options?: ShapeProcessingOptions, context?: Record<string, string>): ITupleShape {
+  tupleShape(object: IAmfTupleShape, options?: IShapeProcessingOptions, context?: Record<string, string>): IApiTupleShape {
     const objectContext = context || object['@context'];
     let target = object;
-    const result = (this.dataArrangeShape(target, options, objectContext)) as ITupleShape;
+    const result = (this.dataArrangeShape(target, options, objectContext)) as IApiTupleShape;
     if (this.isLink(target)) {
       const value = (this.getLinkTarget(target, objectContext));
       if (value) {
         target = value;
       }
     }
-    const items = target[this._getAmfKey(ns.aml.vocabularies.shapes.items, objectContext) as keyof TupleShape] as any[] | undefined;
+    const items = target[this._getAmfKey(ns.aml.vocabularies.shapes.items, objectContext) as keyof IAmfTupleShape] as any[] | undefined;
     const prefix = this._getAmfKey(ns.w3.rdfSchema.key, objectContext) as string;
     if (Array.isArray(items) && items.length) {
       result.items = [];
@@ -887,9 +887,9 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param object The CreativeWork to serialize.
    * @returns Serialized CreativeWork
    */
-  documentation(object: CreativeWork, context?: Record<string, string>): ApiDocumentation {
+  documentation(object: IAmfCreativeWork, context?: Record<string, string>): IApiDocumentation {
     const objectContext = context || object['@context'];
-    const result: ApiDocumentation = ({
+    const result: IApiDocumentation = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -914,10 +914,10 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param object The Example to serialize.
    * @returns Serialized Example
    */
-  example(object: Example, context?: Record<string, string>): IDataExample {
+  example(object: IAmfExample, context?: Record<string, string>): IApiDataExample {
     const objectContext = context || object['@context'];
     this._resolve(object);
-    const result: IDataExample = ({
+    const result: IApiDataExample = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -952,7 +952,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     // if (!mediaType.isNullOrEmpty) {
     //   result.mediaType = mediaType.value();
     // }
-    const structuredValue = object[this._getAmfKey(ns.aml.vocabularies.document.structuredValue, objectContext) as keyof Example] as DataNode[] | undefined;
+    const structuredValue = object[this._getAmfKey(ns.aml.vocabularies.document.structuredValue, objectContext) as keyof IAmfExample] as IAmfDataNode[] | undefined;
     if (Array.isArray(structuredValue) && structuredValue.length) {
       const [value] = structuredValue;
       result.structuredValue = this.unknownDataNode(value, objectContext);
@@ -960,9 +960,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  xmlSerializer(object: XMLSerializer, context?: Record<string, string>): IXmlSerializer {
+  xmlSerializer(object: IAmfXMLSerializer, context?: Record<string, string>): IApiXmlSerializer {
     const objectContext = context || object['@context'];
-    const result: IXmlSerializer = ({
+    const result: IApiXmlSerializer = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -992,23 +992,23 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  unknownDataNode(object: DataNode, context?: Record<string, string>): IDataNodeUnion | undefined {
+  unknownDataNode(object: IAmfDataNode, context?: Record<string, string>): IApiDataNodeUnion | undefined {
     const types = this.readTypes(object['@type'], context);
     
     if (types.includes(ns.aml.vocabularies.data.Scalar)) {
-      return this.scalarNode((object as ScalarNode), context);
+      return this.scalarNode((object as IAmfScalarNode), context);
     }
     if (types.includes(ns.aml.vocabularies.data.Object)) {
-      return this.objectNode((object as ObjectNode), context);
+      return this.objectNode((object as IAmfObjectNode), context);
     }
     if (types.includes(ns.aml.vocabularies.data.Array)) {
-      return this.arrayNode((object as ArrayNode), context);
+      return this.arrayNode((object as IAmfArrayNode), context);
     }
     return undefined;
   }
 
-  dataNode(object: DataNode, context?: Record<string, string>): IDataNode {
-    const result: IDataNode = {
+  dataNode(object: IAmfDataNode, context?: Record<string, string>): IApiDataNode {
+    const result: IApiDataNode = {
       id: object['@id'],
       types: this.readTypes(object['@type'], context),
       customDomainProperties: this.customDomainProperties(object, context),
@@ -1021,9 +1021,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  scalarNode(object: ScalarNode, context?: Record<string, string>): IScalarNode {
+  scalarNode(object: IAmfScalarNode, context?: Record<string, string>): IApiScalarNode {
     const objectContext = context || object['@context'];
-    const result = (this.dataNode(object, context)) as IScalarNode;
+    const result = (this.dataNode(object, context)) as IApiScalarNode;
     
     const value = this._getValue(object, ns.aml.vocabularies.data.value, objectContext);
     if (value && typeof value === 'string') {
@@ -1036,20 +1036,20 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  objectNode(object: ObjectNode, context?: Record<string, string>): IObjectNode {
+  objectNode(object: IAmfObjectNode, context?: Record<string, string>): IApiObjectNode {
     const objectContext = context || object['@context'];
-    const result = (this.dataNode(object, context)) as IObjectNode;
+    const result = (this.dataNode(object, context)) as IApiObjectNode;
     result.properties = {};
     const prefix = ns.aml.vocabularies.data.key;
     const prefixCompact = `${this._getAmfKey(prefix, objectContext)}:`;
     Object.keys(object).forEach((key) => {
       if (key.startsWith(prefix) || key.startsWith(prefixCompact)) {
-        let value = object[key as keyof ObjectNode] as any | undefined;
+        let value = object[key as keyof IAmfObjectNode] as IAmfDataNode | undefined;
         if (Array.isArray(value)) {
           [value] = value;
         }
         const name = key.replace(prefix, '').replace(prefixCompact, '');
-        const nodeValue = this.unknownDataNode(value, context);
+        const nodeValue = this.unknownDataNode(value as IAmfDataNode, context);
         if (nodeValue) {
           result.properties[name] = nodeValue;
         }
@@ -1058,13 +1058,18 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  arrayNode(object: ArrayNode, context?: Record<string, string>): IArrayNode {
+  arrayNode(object: IAmfArrayNode, context?: Record<string, string>): IApiArrayNode {
     const objectContext = context || object['@context'];
-    const result = (this.dataNode(object, objectContext)) as IArrayNode;
+    const result = (this.dataNode(object, objectContext)) as IApiArrayNode;
     result.members = [];
-    const members = (this._computePropertyArray(object, ns.w3.rdfSchema.member)) as DataNode[];
+    const members = (this._computePropertyArray(object, ns.w3.rdfSchema.member)) as IAmfDataNode[];
     if (Array.isArray(members) && members.length) {
-      result.members = members.map((item) => this.unknownDataNode(item)!);
+      members.forEach(n => {
+        const item = this.unknownDataNode(n);
+        if (item) {
+          result.members.push(item);
+        }
+      });
     }
     return result;
   }
@@ -1073,14 +1078,14 @@ export class AmfSerializer extends AmfMixin(Object) {
    * Adds the custom domain properties to the currently processed property, a.k.a annotations.
    * @returns  The list of custom domain properties.
    */
-  customDomainProperties(object: DomainElement, context?: Record<string, string>): ICustomDomainProperty[] {
-    const result: ICustomDomainProperty[] = [];
+  customDomainProperties(object: IAmfDomainElement, context?: Record<string, string>): IApiCustomDomainProperty[] {
+    const result: IApiCustomDomainProperty[] = [];
     const objectContext = context || object['@context'];
     const ids = this._getLinkValues(object, ns.aml.vocabularies.document.customDomainProperties, objectContext);
     if (Array.isArray(ids) && ids.length) {
       ids.forEach((id) => {
         const key = `amf://id${id}`;
-        let value = (object[id as keyof DomainElement] || object[key as keyof DomainElement]) as DomainElement[] | DomainElement | undefined;
+        let value = (object[id as keyof IAmfDomainElement] || object[key as keyof IAmfDomainElement]) as IAmfDomainElement[] | IAmfDomainElement | undefined;
         if (!value) {
           return;
         }
@@ -1092,7 +1097,7 @@ export class AmfSerializer extends AmfMixin(Object) {
         if (!name || !extension) {
           return;
         }
-        const cdp: ICustomDomainProperty = ({
+        const cdp: IApiCustomDomainProperty = ({
           id: key,
           name,
           extension,
@@ -1103,9 +1108,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  endPoint(object: EndPoint, context?: Record<string, string>): ApiEndPoint {
+  endPoint(object: IAmfEndPoint, context?: Record<string, string>): IApiEndPoint {
     const objectContext = context || object['@context'];
-    const result: ApiEndPoint = ({
+    const result: IApiEndPoint = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1137,7 +1142,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     }
     const operations = this[getArrayItems](object, ns.aml.vocabularies.apiContract.supportedOperation, objectContext);
     if (Array.isArray(operations) && operations.length) {
-      result.operations = operations.map(i => this.operation((i as Operation), objectContext));
+      result.operations = operations.map(i => this.operation((i as IAmfOperation), objectContext));
     }
     const parameters = this[getArrayItems](object, ns.aml.vocabularies.apiContract.parameter, objectContext);
     if (Array.isArray(parameters) && parameters.length) {
@@ -1145,7 +1150,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     }
     const payloads = this[getArrayItems](object, ns.aml.vocabularies.apiContract.payload, objectContext);
     if (Array.isArray(payloads) && payloads.length) {
-      result.payloads = payloads.map(i => this.payload(/** @type Payload */(i as Payload), objectContext));
+      result.payloads = payloads.map(i => this.payload(/** @type IAmfPayload */(i as IAmfPayload), objectContext));
     }
     const servers = this[getArrayItems](object, ns.aml.vocabularies.apiContract.server, objectContext);
     if (Array.isArray(servers) && servers.length) {
@@ -1173,9 +1178,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  operation(object: Operation, context?: Record<string, string>): ApiOperation {
+  operation(object: IAmfOperation, context?: Record<string, string>): IApiOperation {
     const objectContext = context || object['@context'];
-    const result: ApiOperation = ({
+    const result: IApiOperation = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1230,50 +1235,50 @@ export class AmfSerializer extends AmfMixin(Object) {
       result.contentType = contentType;
     }
 
-    let expects = object[this._getAmfKey(ns.aml.vocabularies.apiContract.expects, objectContext) as keyof Operation] as Request[] | Request | undefined;
+    let expects = object[this._getAmfKey(ns.aml.vocabularies.apiContract.expects, objectContext) as keyof IAmfOperation] as IAmfRequest[] | IAmfRequest | undefined;
     if (expects) {
       if (Array.isArray(expects)) {
         [expects] = expects;
       }
       result.request = this.request(expects, objectContext);
     }
-    let documentation = object[this._getAmfKey(ns.aml.vocabularies.core.documentation, objectContext) as keyof Operation] as CreativeWork[] | CreativeWork | undefined;
+    let documentation = object[this._getAmfKey(ns.aml.vocabularies.core.documentation, objectContext) as keyof IAmfOperation] as IAmfCreativeWork[] | IAmfCreativeWork | undefined;
     if (documentation) {
       if (Array.isArray(documentation)) {
         [documentation] = documentation;
       }
       result.documentation = this.documentation(documentation, objectContext);
     }
-    const responses = object[this._getAmfKey(ns.aml.vocabularies.apiContract.returns, objectContext) as keyof Operation] as Response[] | undefined;
+    const responses = object[this._getAmfKey(ns.aml.vocabularies.apiContract.returns, objectContext) as keyof IAmfOperation] as IAmfResponse[] | undefined;
     if (Array.isArray(responses)) {
       result.responses = responses.map(r => this.response(r, objectContext));
     }
-    const callbacks = object[this._getAmfKey(ns.aml.vocabularies.apiContract.callback, objectContext) as keyof Operation] as Callback[] | undefined;
+    const callbacks = object[this._getAmfKey(ns.aml.vocabularies.apiContract.callback, objectContext) as keyof IAmfOperation] as IAmfCallback[] | undefined;
     if (Array.isArray(callbacks)) {
       result.callbacks = callbacks.map(c => this.callback(c, objectContext));
     }
-    const servers = object[this._getAmfKey(ns.aml.vocabularies.apiContract.server, objectContext) as keyof Operation] as Server[] | undefined;
+    const servers = object[this._getAmfKey(ns.aml.vocabularies.apiContract.server, objectContext) as keyof IAmfOperation] as IAmfServer[] | undefined;
     if (Array.isArray(servers)) {
       result.servers = servers.map(s => this.server(s));
     }
-    const security = object[this._getAmfKey(ns.aml.vocabularies.security.security, objectContext) as keyof Operation] as SecurityRequirement[] | undefined;
+    const security = object[this._getAmfKey(ns.aml.vocabularies.security.security, objectContext) as keyof IAmfOperation] as IAmfSecurityRequirement[] | undefined;
     if (Array.isArray(security)) {
       result.security = security.map(s => this.securityRequirement(s, objectContext));
     }
-    const tags = object[this._getAmfKey(ns.aml.vocabularies.apiContract.tag, objectContext) as keyof Operation] as Tag[] | undefined;
+    const tags = object[this._getAmfKey(ns.aml.vocabularies.apiContract.tag, objectContext) as keyof IAmfOperation] as IAmfTag[] | undefined;
     if (Array.isArray(tags) && tags.length) {
       result.tags = tags.map(s => this.tag(s, objectContext));
     }
-    const traits = object[this._getAmfKey(ns.aml.vocabularies.document.extends, objectContext) as keyof Operation] as ParametrizedTrait[] | undefined;
+    const traits = object[this._getAmfKey(ns.aml.vocabularies.document.extends, objectContext) as keyof IAmfOperation] as IAmfParametrizedTrait[] | undefined;
     if (Array.isArray(traits) && traits.length) {
       result.extends = traits.map(t => this.parametrizedTrait(t, objectContext));
     }
     return result;
   }
 
-  tag(object: Tag, context?: Record<string, string>): ApiTag {
+  tag(object: IAmfTag, context?: Record<string, string>): IApiTag {
     const objectContext = context || object['@context'];
-    const result: ApiTag = ({
+    const result: IApiTag = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1287,9 +1292,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  callback(object: Callback, context?: Record<string, string>): ApiCallback {
+  callback(object: IAmfCallback, context?: Record<string, string>): IApiCallback {
     const objectContext = context || object['@context'];
-    const result: ApiCallback = ({
+    const result: IApiCallback = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1304,7 +1309,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (expression && typeof expression === 'string') {
       result.expression = expression;
     }
-    let endpoint = object[this._getAmfKey(ns.aml.vocabularies.apiContract.endpoint, objectContext) as keyof Callback] as EndPoint[] | EndPoint | undefined;
+    let endpoint = object[this._getAmfKey(ns.aml.vocabularies.apiContract.endpoint, objectContext) as keyof IAmfCallback] as IAmfEndPoint[] | IAmfEndPoint | undefined;
     if (endpoint) {
       if (Array.isArray(endpoint)) {
         [endpoint] = endpoint;
@@ -1315,9 +1320,9 @@ export class AmfSerializer extends AmfMixin(Object) {
   }
 
 
-  request(object: Request, context?: Record<string, string>): ApiRequest {
+  request(object: IAmfRequest, context?: Record<string, string>): IApiRequest {
     const objectContext = context || object['@context'];
-    const result: ApiRequest = ({
+    const result: IApiRequest = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1338,7 +1343,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (required && typeof required === 'boolean') {
       result.required = required;
     }
-    let queryString = object[this._getAmfKey(ns.aml.vocabularies.apiContract.queryString, objectContext) as keyof Request] as Shape[] | Shape | undefined;
+    let queryString = object[this._getAmfKey(ns.aml.vocabularies.apiContract.queryString, objectContext) as keyof IAmfRequest] as IAmfShape[] | IAmfShape | undefined;
     if (queryString) {
       if (Array.isArray(queryString)) {
         [queryString] = queryString;
@@ -1361,16 +1366,16 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (Array.isArray(cookieParameters) && cookieParameters.length) {
       result.cookieParameters = cookieParameters.map(p => this.parameter(p, objectContext));
     }
-    const payloads = this[getArrayItems](object, ns.aml.vocabularies.apiContract.payload, objectContext) as Payload[] | undefined;
+    const payloads = this[getArrayItems](object, ns.aml.vocabularies.apiContract.payload, objectContext) as IAmfPayload[] | undefined;
     if (Array.isArray(payloads) && payloads.length) {
       result.payloads = payloads.map(p => this.payload(p, objectContext));
     }
     return result;
   }
 
-  response(object: Response, context?: Record<string, string>): ApiResponse {
+  response(object: IAmfResponse, context?: Record<string, string>): IApiResponse {
     const objectContext = context || object['@context'];
-    const result: ApiResponse = ({
+    const result: IApiResponse = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1397,24 +1402,24 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (Array.isArray(headers) && headers.length) {
       result.headers = headers.map(p => this.parameter(p, objectContext));
     }
-    const payloads = this[getArrayItems](object, ns.aml.vocabularies.apiContract.payload, objectContext) as Payload[] | undefined;
+    const payloads = this[getArrayItems](object, ns.aml.vocabularies.apiContract.payload, objectContext) as IAmfPayload[] | undefined;
     if (Array.isArray(payloads) && payloads.length) {
       result.payloads = payloads.map(p => this.payload(p, objectContext));
     }
-    const examples = object[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof Response] as Example[] | undefined;
+    const examples = object[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof IAmfResponse] as IAmfExample[] | undefined;
     if (Array.isArray(examples) && examples.length) {
       result.examples = examples.map(e => this.example(e, objectContext));
     }
-    const links = object[this._getAmfKey(ns.aml.vocabularies.apiContract.link, objectContext) as keyof Response] as TemplatedLink[] | undefined;
+    const links = object[this._getAmfKey(ns.aml.vocabularies.apiContract.link, objectContext) as keyof IAmfResponse] as IAmfTemplatedLink[] | undefined;
     if (Array.isArray(links) && links.length) {
       result.links = links.map(p => this.templatedLink(p, objectContext));
     }
     return result;
   }
 
-  payload(object: Payload, context?: Record<string, string>): ApiPayload {
+  payload(object: IAmfPayload, context?: Record<string, string>): IApiPayload {
     const objectContext = context || object['@context'];
-    const result: ApiPayload = ({
+    const result: IApiPayload = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1431,7 +1436,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (mediaType && typeof mediaType === 'string') {
       result.mediaType = mediaType;
     }
-    let schema = object[this._getAmfKey(ns.aml.vocabularies.shapes.schema, objectContext) as keyof Payload] as Shape | Shape[] | undefined;
+    let schema = object[this._getAmfKey(ns.aml.vocabularies.shapes.schema, objectContext) as keyof IAmfPayload] as IAmfShape | IAmfShape[] | undefined;
     if (schema) {
       if (Array.isArray(schema)) {
         [schema] = schema;
@@ -1440,7 +1445,7 @@ export class AmfSerializer extends AmfMixin(Object) {
         trackedId: result.id,
       }, objectContext);
     }
-    const examples = object[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof Payload] as Example[] | undefined;
+    const examples = object[this._getAmfKey(ns.aml.vocabularies.apiContract.examples, objectContext) as keyof IAmfPayload] as IAmfExample[] | undefined;
     if (Array.isArray(examples) && examples.length) {
       result.examples = examples.map(e => this.example(e, objectContext));
     }
@@ -1450,9 +1455,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  templatedLink(object: TemplatedLink, context?: Record<string, string>): ApiTemplatedLink {
+  templatedLink(object: IAmfTemplatedLink, context?: Record<string, string>): IApiTemplatedLink {
     const objectContext = context || object['@context'];
-    const result: ApiTemplatedLink = ({
+    const result: IApiTemplatedLink = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1472,14 +1477,14 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (operationId && typeof operationId === 'string') {
       result.operationId = operationId;
     }
-    let server = object[this._getAmfKey(ns.aml.vocabularies.apiContract.server, objectContext) as keyof TemplatedLink] as Server[] | Server | undefined;
+    let server = object[this._getAmfKey(ns.aml.vocabularies.apiContract.server, objectContext) as keyof IAmfTemplatedLink] as IAmfServer[] | IAmfServer | undefined;
     if (server) {
       if (Array.isArray(server)) {
         [server] = server;
       }
       result.server = this.server(server, objectContext);
     }
-    let mapping = (object[this._getAmfKey(ns.aml.vocabularies.apiContract.mapping, objectContext) as keyof TemplatedLink]) as IriTemplateMapping[] | undefined;
+    let mapping = (object[this._getAmfKey(ns.aml.vocabularies.apiContract.mapping, objectContext) as keyof IAmfTemplatedLink]) as IAmfIriTemplateMapping[] | undefined;
     if (mapping) {
       if (mapping && !Array.isArray(mapping)) {
         mapping = [mapping];
@@ -1497,9 +1502,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  iriTemplateMapping(object: IriTemplateMapping, context?: Record<string, string>): ApiIriTemplateMapping {
+  iriTemplateMapping(object: IAmfIriTemplateMapping, context?: Record<string, string>): IApiIriTemplateMapping {
     const objectContext = context || object['@context'];
-    const result: ApiIriTemplateMapping = ({
+    const result: IApiIriTemplateMapping = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1518,9 +1523,9 @@ export class AmfSerializer extends AmfMixin(Object) {
   }
 
 
-  parametrizedSecurityScheme(object: ParametrizedSecurityScheme, context?: Record<string, string>): ApiParametrizedSecurityScheme {
+  parametrizedSecurityScheme(object: IAmfParametrizedSecurityScheme, context?: Record<string, string>): IApiParametrizedSecurityScheme {
     const objectContext = context || object['@context'];
-    const result: ApiParametrizedSecurityScheme = ({
+    const result: IApiParametrizedSecurityScheme = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1531,14 +1536,14 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (name && typeof name === 'string') {
       result.name = name;
     }
-    let scheme = object[this._getAmfKey(ns.aml.vocabularies.security.scheme, objectContext) as keyof ParametrizedSecurityScheme] as SecurityScheme | SecurityScheme[] | undefined;
+    let scheme = object[this._getAmfKey(ns.aml.vocabularies.security.scheme, objectContext) as keyof IAmfParametrizedSecurityScheme] as IAmfSecurityScheme | IAmfSecurityScheme[] | undefined;
     if (scheme) {
       if (Array.isArray(scheme)) {
         [scheme] = scheme;
       }
       result.scheme = this.securityScheme(scheme, objectContext);
     }
-    let settings = object[this._getAmfKey(ns.aml.vocabularies.security.settings, objectContext) as keyof ParametrizedSecurityScheme] as Settings | Settings[] | undefined;
+    let settings = object[this._getAmfKey(ns.aml.vocabularies.security.settings, objectContext) as keyof IAmfParametrizedSecurityScheme] as IAmfSettings | IAmfSettings[] | undefined;
     if (settings) {
       if (Array.isArray(settings)) {
         [settings] = settings;
@@ -1549,10 +1554,10 @@ export class AmfSerializer extends AmfMixin(Object) {
   }
 
 
-  securitySchemeListItem(object: SecurityScheme, context?: Record<string, string>): ApiSecuritySchemeListItem {
+  securitySchemeListItem(object: IAmfSecurityScheme, context?: Record<string, string>): IApiSecuritySchemeListItem {
     const objectContext = context || object['@context'];
     
-    const result: ApiSecuritySchemeListItem = ({
+    const result: IApiSecuritySchemeListItem = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       type: '',
@@ -1573,9 +1578,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  securityScheme(object: SecurityScheme, context?: Record<string, string>): ApiSecurityScheme {
+  securityScheme(object: IAmfSecurityScheme, context?: Record<string, string>): IApiSecurityScheme {
     const objectContext = context || object['@context'];
-    const result: ApiSecurityScheme = ({
+    const result: IApiSecurityScheme = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1601,14 +1606,14 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (type && typeof type === 'string') {
       result.type = type;
     }
-    let settings = object[this._getAmfKey(ns.aml.vocabularies.security.settings, objectContext) as keyof SecurityScheme] as Settings[] | Settings | undefined;
+    let settings = object[this._getAmfKey(ns.aml.vocabularies.security.settings, objectContext) as keyof IAmfSecurityScheme] as IAmfSettings[] | IAmfSettings | undefined;
     if (settings) {
       if (Array.isArray(settings)) {
         [settings] = settings;
       }
       result.settings = this.securitySettings(settings, objectContext);
     }
-    let queryString = object[this._getAmfKey(ns.aml.vocabularies.apiContract.queryString, objectContext) as keyof SecurityScheme] as Shape[] | Shape | undefined;
+    let queryString = object[this._getAmfKey(ns.aml.vocabularies.apiContract.queryString, objectContext) as keyof IAmfSecurityScheme] as IAmfShape[] | IAmfShape | undefined;
     if (queryString) {
       if (Array.isArray(queryString)) {
         [queryString] = queryString;
@@ -1623,16 +1628,16 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (Array.isArray(queryParameters) && queryParameters.length) {
       result.queryParameters = queryParameters.map(p => this.parameter(p, objectContext));
     }
-    const responses = this[getArrayItems](object, ns.aml.vocabularies.apiContract.response, objectContext) as Response[] | undefined;
+    const responses = this[getArrayItems](object, ns.aml.vocabularies.apiContract.response, objectContext) as IAmfResponse[] | undefined;
     if (Array.isArray(responses) && responses.length) {
       result.responses = responses.map(p => this.response(p, objectContext));
     }
     return result;
   }
 
-  securityRequirement(object: SecurityRequirement, context?: Record<string, string>): ApiSecurityRequirement {
+  securityRequirement(object: IAmfSecurityRequirement, context?: Record<string, string>): IApiSecurityRequirement {
     const objectContext = context || object['@context'];
-    const result: ApiSecurityRequirement = ({
+    const result: IApiSecurityRequirement = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1644,42 +1649,42 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (name && typeof name === 'string') {
       result.name = name;
     }
-    const schemes = (object[this._getAmfKey(ns.aml.vocabularies.security.schemes, objectContext) as keyof SecurityRequirement]) as ParametrizedSecurityScheme[] | undefined;
+    const schemes = (object[this._getAmfKey(ns.aml.vocabularies.security.schemes, objectContext) as keyof IAmfSecurityRequirement]) as IAmfParametrizedSecurityScheme[] | undefined;
     if (Array.isArray(schemes) && schemes.length) {
       result.schemes = schemes.map(p => this.parametrizedSecurityScheme(p, objectContext));
     }
     return result;
   }
 
-  securitySettings(object: Settings, context?: Record<string, string>): ApiSecuritySettingsUnion {
+  securitySettings(object: IAmfSettings, context?: Record<string, string>): IApiSecuritySettingsUnion {
     const objectContext = context || object['@context'];
     const types = this.readTypes(object['@type'], objectContext);
     if (types.includes(ns.aml.vocabularies.security.OAuth1Settings)) {
-      return this.oAuth1Settings((object as OAuth1Settings), objectContext);
+      return this.oAuth1Settings((object as IAmfOAuth1Settings), objectContext);
     }
     if (types.includes(ns.aml.vocabularies.security.OAuth2Settings)) {
-      return this.oAuth2Settings((object as OAuth2Settings), objectContext);
+      return this.oAuth2Settings((object as IAmfOAuth2Settings), objectContext);
     }
     if (types.includes(ns.aml.vocabularies.security.ApiKeySettings)) {
-      return this.apiKeySettings((object as ApiKeySettings), objectContext);
+      return this.apiKeySettings((object as IAmfApiKeySettings), objectContext);
     }
     if (types.includes(ns.aml.vocabularies.security.HttpSettings)) {
-      return this.httpSettings(object as HttpSettings, objectContext);
+      return this.httpSettings(object as IAmfHttpSettings, objectContext);
     }
     if (types.includes(ns.aml.vocabularies.security.OpenIdConnectSettings)) {
-      return this.openIdConnectSettings(object as OpenIdConnectSettings, objectContext);
+      return this.openIdConnectSettings(object as IAmfOpenIdConnectSettings, objectContext);
     }
     return this.settings(object, objectContext);
   }
 
   /**
-   * @param {Settings} object
+   * @param {IAmfSettings} object
    * @param context
-   * @returns {ApiSecuritySettings}
+   * @returns {IApiSecuritySettings}
    */
-  settings(object: Settings, context?: Record<string, string>): ApiSecuritySettings {
+  settings(object: IAmfSettings, context?: Record<string, string>): IApiSecuritySettings {
     const objectContext = context || object['@context'];
-    const result: ApiSecuritySettings = ({
+    const result: IApiSecuritySettings = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1691,9 +1696,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  oAuth1Settings(object: OAuth1Settings, context?: Record<string, string>): ApiSecurityOAuth1Settings {
+  oAuth1Settings(object: IAmfOAuth1Settings, context?: Record<string, string>): IApiSecurityOAuth1Settings {
     const objectContext = context || object['@context'];
-    const result = (this.settings(object, objectContext)) as ApiSecurityOAuth1Settings;
+    const result = (this.settings(object, objectContext)) as IApiSecurityOAuth1Settings;
     
     const authorizationUri = this._getValue(object, ns.aml.vocabularies.security.authorizationUri, objectContext);
     if (authorizationUri && typeof authorizationUri === 'string') {
@@ -1716,9 +1721,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  oAuth2Settings(object: OAuth2Settings, context?: Record<string, string>): ApiSecurityOAuth2Settings {
+  oAuth2Settings(object: IAmfOAuth2Settings, context?: Record<string, string>): IApiSecurityOAuth2Settings {
     const objectContext = context || object['@context'];
-    const result = this.settings(object, objectContext) as ApiSecurityOAuth2Settings;
+    const result = this.settings(object, objectContext) as IApiSecurityOAuth2Settings;
     
     const grants = (this._getValueArray(object, ns.aml.vocabularies.security.authorizationGrant, objectContext)) as string[];
     if (Array.isArray(grants) && grants.length) {
@@ -1726,7 +1731,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     } else {
       result.authorizationGrants = [];
     }
-    const flows = (object[this._getAmfKey(ns.aml.vocabularies.security.flows, objectContext) as keyof OAuth2Settings]) as OAuth2Flow[] | undefined;
+    const flows = (object[this._getAmfKey(ns.aml.vocabularies.security.flows, objectContext) as keyof IAmfOAuth2Settings]) as IAmfOAuth2Flow[] | undefined;
     if (Array.isArray(flows) && flows.length) {
       result.flows = flows.map((p) => this.oAuth2Flow(p, objectContext));
     } else {
@@ -1735,9 +1740,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  oAuth2Flow(object: OAuth2Flow, context?: Record<string, string>): ApiSecurityOAuth2Flow {
+  oAuth2Flow(object: IAmfOAuth2Flow, context?: Record<string, string>): IApiSecurityOAuth2Flow {
     const objectContext = context || object['@context'];
-    const result: ApiSecurityOAuth2Flow = ({
+    const result: IApiSecurityOAuth2Flow = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1761,16 +1766,16 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (refreshUri && typeof refreshUri === 'string') {
       result.refreshUri = refreshUri;
     }
-    const scopes = object[this._getAmfKey(ns.aml.vocabularies.security.scope, objectContext) as keyof OAuth2Flow] as Scope[] | undefined;
+    const scopes = object[this._getAmfKey(ns.aml.vocabularies.security.scope, objectContext) as keyof IAmfOAuth2Flow] as IAmfScope[] | undefined;
     if (Array.isArray(scopes) && scopes.length) {
       result.scopes = scopes.map((p) => this.scope(p, objectContext));
     }
     return result;
   }
 
-  scope(object: Scope, context?: Record<string, string>): ApiSecurityScope {
+  scope(object: IAmfScope, context?: Record<string, string>): IApiSecurityScope {
     const objectContext = context || object['@context'];
-    const result: ApiSecurityScope = ({
+    const result: IApiSecurityScope = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1788,9 +1793,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  apiKeySettings(object: ApiKeySettings, context?: Record<string, string>): ApiSecurityApiKeySettings {
+  apiKeySettings(object: IAmfApiKeySettings, context?: Record<string, string>): IApiSecurityApiKeySettings {
     const objectContext = context || object['@context'];
-    const result = (this.settings(object, objectContext)) as ApiSecurityApiKeySettings;
+    const result = (this.settings(object, objectContext)) as IApiSecurityApiKeySettings;
     
     const name = this._getValue(object, ns.aml.vocabularies.core.name, objectContext);
     if (name && typeof name === 'string') {
@@ -1803,9 +1808,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  httpSettings(object: HttpSettings, context?: Record<string, string>): ApiSecurityHttpSettings {
+  httpSettings(object: IAmfHttpSettings, context?: Record<string, string>): IApiSecurityHttpSettings {
     const objectContext = context || object['@context'];
-    const result = (this.settings(object, objectContext)) as ApiSecurityHttpSettings;
+    const result = (this.settings(object, objectContext)) as IApiSecurityHttpSettings;
     
     const scheme = this._getValue(object, ns.aml.vocabularies.security.scheme, objectContext);
     if (scheme && typeof scheme === 'string') {
@@ -1818,9 +1823,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  openIdConnectSettings(object: OpenIdConnectSettings, context?: Record<string, string>): ApiSecurityOpenIdConnectSettings {
+  openIdConnectSettings(object: IAmfOpenIdConnectSettings, context?: Record<string, string>): IApiSecurityOpenIdConnectSettings {
     const objectContext = context || object['@context'];
-    const result = (this.settings(object, objectContext)) as ApiSecurityOpenIdConnectSettings;
+    const result = (this.settings(object, objectContext)) as IApiSecurityOpenIdConnectSettings;
     
     const url = this._getValue(object, ns.aml.vocabularies.security.openIdConnectUrl, objectContext);
     if (url && typeof url === 'string') {
@@ -1832,55 +1837,55 @@ export class AmfSerializer extends AmfMixin(Object) {
   /**
    * Serializes source maps, when available.
    */
-  sourceMap(object: DocumentSourceMaps, context?: Record<string, string>): ApiDocumentSourceMaps|undefined {
+  sourceMap(object: IAmfDocumentSourceMaps, context?: Record<string, string>): IApiDocumentSourceMaps|undefined {
     const objectContext = context || object['@context'];
-    let sm = object[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.sources, objectContext) as keyof DocumentSourceMaps] as DocumentSourceMaps[] | DocumentSourceMaps | undefined;
+    let sm = object[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.sources, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfDocumentSourceMaps[] | IAmfDocumentSourceMaps | undefined;
     if (!sm) {
       return undefined;
     }
     if (Array.isArray(sm)) {
       [sm] = sm;
     }
-    const result: ApiDocumentSourceMaps = ({
+    const result: IApiDocumentSourceMaps = ({
       id: sm['@id'],
       types: this.readTypes(sm['@type']),
     });
-    const synthesizedField = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.synthesizedField, objectContext) as keyof DocumentSourceMaps] as SynthesizedField[] | undefined;
+    const synthesizedField = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.synthesizedField, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfSynthesizedField[] | undefined;
     if (Array.isArray(synthesizedField) && synthesizedField.length) {
       result.synthesizedField = synthesizedField.map(i => this.synthesizedField(i, objectContext));
     }
-    const lexical = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.lexical, objectContext) as keyof DocumentSourceMaps] as SynthesizedField[] | undefined;
+    const lexical = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.lexical, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfSynthesizedField[] | undefined;
     if (Array.isArray(lexical) && lexical.length) {
       result.lexical = lexical.map(i => this.synthesizedField(i, objectContext))
     }
-    const trackedElement = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.trackedElement, objectContext) as keyof DocumentSourceMaps] as SynthesizedField[] | undefined;
+    const trackedElement = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.trackedElement, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfSynthesizedField[] | undefined;
     if (Array.isArray(trackedElement) && trackedElement.length) {
       result.trackedElement = this.synthesizedField(trackedElement[0], objectContext);
     }
-    const autoName = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.autoGeneratedName, objectContext) as keyof DocumentSourceMaps] as SynthesizedField[] | undefined;
+    const autoName = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.autoGeneratedName, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfSynthesizedField[] | undefined;
     if (Array.isArray(autoName) && autoName.length) {
       result.autoGeneratedName = autoName.map(i => this.synthesizedField(i, objectContext))
     }
-    const jsonSchema = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.parsedJsonSchema, objectContext) as keyof DocumentSourceMaps] as SynthesizedField[] | undefined;
+    const jsonSchema = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.parsedJsonSchema, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfSynthesizedField[] | undefined;
     if (Array.isArray(jsonSchema) && jsonSchema.length) {
       result.parsedJsonSchema = this.synthesizedField(jsonSchema[0], objectContext);
     }
-    const declaredElement = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.declaredElement, objectContext) as keyof DocumentSourceMaps] as SynthesizedField[] | undefined;
+    const declaredElement = sm[this._getAmfKey(ns.aml.vocabularies.docSourceMaps.declaredElement, objectContext) as keyof IAmfDocumentSourceMaps] as IAmfSynthesizedField[] | undefined;
     if (Array.isArray(declaredElement) && declaredElement.length) {
       result.declaredElement = this.synthesizedField(declaredElement[0], objectContext);
     }
     return result;
   }
 
-  synthesizedField(object: SynthesizedField, context?: Record<string, string>): ApiSynthesizedField {
+  synthesizedField(object: IAmfSynthesizedField, context?: Record<string, string>): IApiSynthesizedField {
     // compact model
     if (typeof object === 'string') {
       return {
         id: 'synthesizedField/generated',
         value: object,
-      } as ApiSynthesizedField;
+      } as IApiSynthesizedField;
     }
-    const result: ApiSynthesizedField = {
+    const result: IApiSynthesizedField = {
       id: object['@id'],
       value: '',
     };
@@ -1895,9 +1900,9 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  parametrizedDeclaration(object: ParametrizedDeclaration, context?: Record<string, string>): ApiParametrizedDeclaration {
+  parametrizedDeclaration(object: IAmfParametrizedDeclaration, context?: Record<string, string>): IApiParametrizedDeclaration {
     const objectContext = context || object['@context'];
-    const result: ApiParametrizedDeclaration = ({
+    const result: IApiParametrizedDeclaration = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       variables: [],
@@ -1909,13 +1914,13 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (name && typeof name === 'string') {
       result.name = name;
     }
-    const variables = object[this._getAmfKey(ns.aml.vocabularies.document.variable, objectContext) as keyof ParametrizedDeclaration] as VariableValue[] | undefined;
+    const variables = object[this._getAmfKey(ns.aml.vocabularies.document.variable, objectContext) as keyof IAmfParametrizedDeclaration] as IAmfVariableValue[] | undefined;
     if (Array.isArray(variables)) {
       variables.forEach((item) => {
         result.variables.push(this.variableValue(item, objectContext));
       });
     }
-    const targets = object[this._getAmfKey(ns.aml.vocabularies.document.target, objectContext) as keyof ParametrizedDeclaration] as AbstractDeclaration[] | undefined;
+    const targets = object[this._getAmfKey(ns.aml.vocabularies.document.target, objectContext) as keyof IAmfParametrizedDeclaration] as IAmfAbstractDeclaration[] | undefined;
     if (Array.isArray(targets) && targets.length) {
       const [target] = targets;
       result.target = this.abstractDeclaration(target, objectContext);
@@ -1923,30 +1928,30 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  parametrizedTrait(object: ParametrizedTrait, context?: Record<string, string>): ApiParametrizedTrait {
+  parametrizedTrait(object: IAmfParametrizedTrait, context?: Record<string, string>): IApiParametrizedTrait {
     const objectContext = context || object['@context'];
-    const result = (this.parametrizedDeclaration(object, objectContext)) as ApiParametrizedTrait;
+    const result = (this.parametrizedDeclaration(object, objectContext)) as IApiParametrizedTrait;
     return result;
   }
 
-  parametrizedResourceType(object: ParametrizedResourceType, context?: Record<string, string>): ApiParametrizedResourceType {
+  parametrizedResourceType(object: IAmfParametrizedResourceType, context?: Record<string, string>): IApiParametrizedResourceType {
     const objectContext = context || object['@context'];
-    const result = (this.parametrizedDeclaration(object, objectContext)) as ApiParametrizedResourceType;
+    const result = (this.parametrizedDeclaration(object, objectContext)) as IApiParametrizedResourceType;
     return result;
   }
 
-  variableValue(object: VariableValue, context?: Record<string, string>): ApiVariableValue {
+  variableValue(object: IAmfVariableValue, context?: Record<string, string>): IApiVariableValue {
     const objectContext = context || object['@context'];
     
     const name = this._getValue(object, ns.aml.vocabularies.core.name, objectContext) as string;
-    const result: ApiVariableValue = ({
+    const result: IApiVariableValue = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
       sourceMaps: this.sourceMap(object, objectContext),
       name,
     });
-    const values = object[this._getAmfKey(ns.aml.vocabularies.document.value, objectContext) as keyof VariableValue] as DataNode[] | undefined;
+    const values = object[this._getAmfKey(ns.aml.vocabularies.document.value, objectContext) as keyof IAmfVariableValue] as IAmfDataNode[] | undefined;
     if (Array.isArray(values)) {
       const [item] = values;
       result.value = this.unknownDataNode(item, objectContext);
@@ -1954,11 +1959,11 @@ export class AmfSerializer extends AmfMixin(Object) {
     return result;
   }
 
-  abstractDeclaration(object: AbstractDeclaration, context?: Record<string, string>): ApiAbstractDeclaration {
+  abstractDeclaration(object: IAmfAbstractDeclaration, context?: Record<string, string>): IApiAbstractDeclaration {
     const objectContext = context || object['@context'];
     
     const name = this._getValue(object, ns.aml.vocabularies.core.name, objectContext) as string;
-    const result: ApiAbstractDeclaration = ({
+    const result: IApiAbstractDeclaration = ({
       id: object['@id'],
       types: this.readTypes(object['@type'], objectContext),
       customDomainProperties: this.customDomainProperties(object, objectContext),
@@ -1974,7 +1979,7 @@ export class AmfSerializer extends AmfMixin(Object) {
     if (description && typeof description === 'string') {
       result.description = description;
     }
-    const dataNode = object[this._getAmfKey(ns.aml.vocabularies.document.dataNode, objectContext) as keyof AbstractDeclaration] as DataNode[] | undefined;
+    const dataNode = object[this._getAmfKey(ns.aml.vocabularies.document.dataNode, objectContext) as keyof IAmfAbstractDeclaration] as IAmfDataNode[] | undefined;
     if (Array.isArray(dataNode)) {
       const [item] = dataNode;
       result.dataNode = this.unknownDataNode(item, objectContext);
@@ -1986,14 +1991,14 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param object The EndPoint to serialize as a list item.
    * @returns Serialized EndPoint as a list item.
    */
-  endPointWithOperationsListItem(object: EndPoint, context?: Record<string, string>): ApiEndPointWithOperationsListItem {
+  endPointWithOperationsListItem(object: IAmfEndPoint, context?: Record<string, string>): IApiEndPointWithOperationsListItem {
     const path = this._getValue(object, ns.aml.vocabularies.apiContract.path, context) as string;
-    const result: ApiEndPointWithOperationsListItem = ({
+    const result: IApiEndPointWithOperationsListItem = ({
       id: object['@id'],
       path,
       operations: [],
     });
-    const operations = this[getArrayItems](object, ns.aml.vocabularies.apiContract.supportedOperation, context) as Operation[] | undefined;
+    const operations = this[getArrayItems](object, ns.aml.vocabularies.apiContract.supportedOperation, context) as IAmfOperation[] | undefined;
     if (Array.isArray(operations) && operations.length) {
       result.operations = operations.map(i => this.operationListItem(i, context));
     }
@@ -2009,8 +2014,8 @@ export class AmfSerializer extends AmfMixin(Object) {
    * @param context A context to use. If not set, it looks for the context of the passed model
    * @returns Serialized Operation as a list item.
    */
-  operationListItem(object: Operation, context?: Record<string, string>): ApiOperationListItem {
-    const result: ApiOperationListItem = ({
+  operationListItem(object: IAmfOperation, context?: Record<string, string>): IApiOperationListItem {
+    const result: IApiOperationListItem = ({
       id: object['@id'],
       method: '',
     });