@api-client/core 0.7.12 → 0.8.1

package/src/amf/shape/ShapeJsonSchemaGenerator.ts

@@ -1,7 +1,7 @@
 import { AmfNamespace as ns } from "../definitions/Namespace.js";
 import { ShapeBase } from './ShapeBase.js';
 import { JsonDataNodeGenerator } from '../data-node/JsonDataNodeGenerator.js';
-import { IAnyShape, IArrayShape, IDataExample, IDataNodeUnion, INodeShape, IPropertyShape, IScalarShape, IShapeUnion, ITupleShape, IUnionShape } from "../definitions/Shapes.js";
+import { IApiAnyShape, IApiArrayShape, IApiDataExample, IApiDataNodeUnion, IApiNodeShape, IApiPropertyShape, IApiScalarShape, IShapeUnion, IApiTupleShape, IApiUnionShape } from "../definitions/Shapes.js";
 
 export class ShapeJsonSchemaGenerator extends ShapeBase {
   /**
@@ -23,13 +23,13 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
   toObject(schema: IShapeUnion): any {
     const { types } = schema;
     if (types.includes(ns.aml.vocabularies.shapes.ScalarShape)) {
-      return this._scalarShapeObject(schema as IScalarShape);
+      return this._scalarShapeObject(schema as IApiScalarShape);
     }
     if (types.includes(ns.w3.shacl.NodeShape)) {
-      return this._nodeShapeObject(schema as INodeShape);
+      return this._nodeShapeObject(schema as IApiNodeShape);
     }
     if (types.includes(ns.aml.vocabularies.shapes.UnionShape)) {
-      return this._unionShapeObject(schema as IUnionShape);
+      return this._unionShapeObject(schema as IApiUnionShape);
     }
     if (types.includes(ns.aml.vocabularies.shapes.FileShape)) {
       return this._fileShapeObject();
@@ -38,12 +38,12 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
       return this._schemaShapeObject();
     }
     if (types.includes(ns.aml.vocabularies.shapes.TupleShape)) {
-      return this._tupleShapeObject(schema as ITupleShape);
+      return this._tupleShapeObject(schema as IApiTupleShape);
     }
     if (types.includes(ns.aml.vocabularies.shapes.ArrayShape) || types.includes(ns.aml.vocabularies.shapes.MatrixShape)) {
-      return this._arrayShapeObject(schema as IArrayShape);
+      return this._arrayShapeObject(schema as IApiArrayShape);
     }
-    return this._anyShapeObject(schema as IAnyShape);
+    return this._anyShapeObject(schema as IApiAnyShape);
   }
 
   /**
@@ -53,7 +53,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return JSON.stringify(value, null, 2);
   }
 
-  protected _scalarShapeObject(schema: IScalarShape): any|undefined {
+  protected _scalarShapeObject(schema: IApiScalarShape): any|undefined {
     return this._scalarValue(schema);
   }
 
@@ -61,12 +61,12 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return undefined;
   }
 
-  protected _nodeShapeObject(schema: INodeShape): any {
+  protected _nodeShapeObject(schema: IApiNodeShape): any {
     const { inherits } = schema;
     let { examples=[] } = schema;
     if (Array.isArray(inherits) && inherits.length) {
       inherits.forEach((parent) => {
-        const anyParent = parent as IAnyShape;
+        const anyParent = parent as IApiAnyShape;
         if (Array.isArray(anyParent.examples) && anyParent.examples.length) {
           examples = examples.concat(anyParent.examples);
         }
@@ -99,7 +99,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return result;
   }
 
-  protected _unionShapeObject(schema: IUnionShape): any {
+  protected _unionShapeObject(schema: IApiUnionShape): any {
     if (schema.and && schema.and.length) {
       return this._allOfUnion(schema);
     }
@@ -110,15 +110,15 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return this._anyOfUnion(schema);
   }
 
-  protected _anyOfUnion(schema: IUnionShape): any {
+  protected _anyOfUnion(schema: IApiUnionShape): any {
     let { anyOf=[], examples=[] } = schema;
     if (Array.isArray(schema.inherits) && schema.inherits) {
       schema.inherits.forEach((parent) => {
-        const anyParent = parent as IAnyShape;
+        const anyParent = parent as IApiAnyShape;
         if (Array.isArray(anyParent.examples) && anyParent.examples.length) {
           examples = examples.concat(anyParent.examples);
         }
-        const typed = parent as IUnionShape;
+        const typed = parent as IApiUnionShape;
         if (Array.isArray(typed.anyOf) && typed.anyOf.length) {
           anyOf = anyOf.concat(typed.anyOf);
         }
@@ -154,11 +154,11 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return undefined;
   }
 
-  protected _oneOfUnion(schema: IUnionShape): any {
+  protected _oneOfUnion(schema: IApiUnionShape): any {
     let { xone=[], examples=[] } = schema;
     if (Array.isArray(schema.inherits) && schema.inherits) {
       schema.inherits.forEach((parent) => {
-        const anyParent = parent as IAnyShape;
+        const anyParent = parent as IApiAnyShape;
         if (Array.isArray(anyParent.examples) && anyParent.examples.length) {
           examples = examples.concat(anyParent.examples);
         }
@@ -191,11 +191,11 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
   /**
    * Combines all properties from both all shapes in the union
    */
-  protected _allOfUnion(schema: IUnionShape): any {
+  protected _allOfUnion(schema: IApiUnionShape): any {
     let { examples=[], and=[] } = schema;
     if (Array.isArray(schema.inherits) && schema.inherits) {
       schema.inherits.forEach((parent) => {
-        const anyParent = parent as IAnyShape;
+        const anyParent = parent as IApiAnyShape;
         if (Array.isArray(anyParent.examples) && anyParent.examples.length) {
           examples = examples.concat(anyParent.examples);
         }
@@ -222,7 +222,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
    * @param union The list of unions in the shape
    * @param defaultValue The definition of a default value.
    */
-  protected _unionDefaultValue(union: IShapeUnion[], defaultValue: IDataNodeUnion): any | undefined {
+  protected _unionDefaultValue(union: IShapeUnion[], defaultValue: IApiDataNodeUnion): any | undefined {
     const gen = new JsonDataNodeGenerator();
     const result = gen.generate(defaultValue);
     let hasNumber = false;
@@ -235,7 +235,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
       if (!i.types.includes(ns.aml.vocabularies.shapes.ScalarShape)) {
         return;
       }
-      const scalar = i as IScalarShape;
+      const scalar = i as IApiScalarShape;
       if (!hasBoolean) {
         hasBoolean = scalar.dataType === ns.w3.xmlSchema.boolean;
       }
@@ -277,12 +277,12 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return result;
   }
 
-  protected _arrayShapeObject(schema: IArrayShape): any[] {
+  protected _arrayShapeObject(schema: IApiArrayShape): any[] {
     const { items } = schema;
     const defaultValue = schema.defaultValue || items && items.defaultValue;
     
     let { examples=[] } = schema;
-    const anyItems = items as IAnyShape;
+    const anyItems = items as IApiAnyShape;
     if (Array.isArray(anyItems.examples)) {
       examples = examples.concat(anyItems.examples);
     }
@@ -314,7 +314,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return [];
   }
 
-  protected _tupleShapeObject(schema: ITupleShape): any {
+  protected _tupleShapeObject(schema: IApiTupleShape): any {
     const { items, examples } = schema;
     if (this.opts.renderExamples && examples && examples.length) {
       const example = examples.find((item) => !!item.structuredValue);
@@ -343,7 +343,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
     return [];
   }
 
-  protected _anyShapeObject(schema: IAnyShape): any {
+  protected _anyShapeObject(schema: IApiAnyShape): any {
     const { and=[], xone=[], or=[] } = schema;
     if (and.length) {
       let result: any = {};
@@ -379,7 +379,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
   /**
    * @returns The value for the property or undefined when cannot generate the value.
    */
-  protected _propertyShapeObject(schema: IPropertyShape): any | undefined {
+  protected _propertyShapeObject(schema: IApiPropertyShape): any | undefined {
     const { minCount=0 } = schema;
     if (minCount === 0 && !this.opts.renderOptional) {
       return undefined;
@@ -398,7 +398,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
       //     return ApiSchemaValues.readTypedValue(value, /** @type IScalarShape */ (range).dataType);
       //   }
       // }
-      const anyRange = range as IAnyShape;
+      const anyRange = range as IApiAnyShape;
       return this._scalarShapeObject(anyRange);
     }
     return this.toObject(range);
@@ -407,7 +407,7 @@ export class ShapeJsonSchemaGenerator extends ShapeBase {
   /**
    * @param example The example to turn into a JS object
    */
-  protected _exampleToObject(example?: IDataExample): any {
+  protected _exampleToObject(example?: IApiDataExample): any {
     if (example && example.structuredValue) {
       const jsonGenerator = new JsonDataNodeGenerator();
       return jsonGenerator.processNode(example.structuredValue);

package/src/amf/shape/ShapeXmlSchemaGenerator.ts

@@ -3,7 +3,7 @@ import { AmfNamespace as ns } from "../definitions/Namespace.js";
 import { ShapeBase } from './ShapeBase.js';
 import { XmlDataNodeGenerator } from '../data-node/XmlDataNodeGenerator.js';
 import { collectNodeProperties, formatXmlValue, getUnionMember } from '../Utils.js';
-import { IAnyShape, IArrayShape, IDataExample, IDataNodeUnion, INodeShape, IPropertyShape, IScalarShape, IShapeUnion, IUnionShape } from "../definitions/Shapes.js";
+import { IApiAnyShape, IApiArrayShape, IApiDataExample, IApiDataNodeUnion, IApiNodeShape, IApiPropertyShape, IApiScalarShape, IShapeUnion, IApiUnionShape } from "../definitions/Shapes.js";
 
 interface IProcessNodeOptions {
   forceName?: string;
@@ -27,7 +27,7 @@ interface ICollectExamplesOptions {
 export const normalizeXmlTagName = (name: string): string => name.replace(/[^a-zA-Z0-9-_.]/g, '');
 const UNKNOWN_TYPE = 'unknown-type';
 
-export function shapeToXmlTagName(shape: IAnyShape): string {
+export function shapeToXmlTagName(shape: IApiAnyShape): string {
   const { name, inherits=[], xmlSerialization } = shape;
   let label: string | undefined = xmlSerialization && xmlSerialization.name ? xmlSerialization.name : name || UNKNOWN_TYPE;
   if (label === 'schema' && inherits.length) {
@@ -56,13 +56,13 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
   processNode(schema: IShapeUnion, options: IProcessNodeOptions = {}): string {
     const { types } = schema;
     if (types.includes(ns.aml.vocabularies.shapes.ScalarShape)) {
-      return this._scalarShapeObject(schema as IScalarShape, options);
+      return this._scalarShapeObject(schema as IApiScalarShape, options);
     }
     if (types.includes(ns.w3.shacl.NodeShape)) {
-      return this._nodeShapeObject(schema as INodeShape, options);
+      return this._nodeShapeObject(schema as IApiNodeShape, options);
     }
     if (types.includes(ns.aml.vocabularies.shapes.UnionShape)) {
-      return this._unionShapeObject(schema as IUnionShape);
+      return this._unionShapeObject(schema as IApiUnionShape);
     }
     if (types.includes(ns.aml.vocabularies.shapes.FileShape)) {
       return this._fileShapeObject();
@@ -74,9 +74,9 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
       return this._tupleShapeObject();
     }
     if (types.includes(ns.aml.vocabularies.shapes.ArrayShape) || types.includes(ns.aml.vocabularies.shapes.MatrixShape)) {
-      return this._arrayShapeObject(schema as IArrayShape, options);
+      return this._arrayShapeObject(schema as IApiArrayShape, options);
     }
-    return this._anyShapeObject(schema as IAnyShape);
+    return this._anyShapeObject(schema as IApiAnyShape);
   }
 
   /**
@@ -94,12 +94,12 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return getUnionMember(anyOf, selectedUnions);
   }
 
-  protected _collectProperties(schema: INodeShape): IPropertyShape[] {
+  protected _collectProperties(schema: IApiNodeShape): IApiPropertyShape[] {
     const { selectedUnions } = this.opts;
     return collectNodeProperties(schema, selectedUnions);
   }
 
-  protected _nodeShapeObject(schema: INodeShape, options: IProcessNodeOptions={}): string {
+  protected _nodeShapeObject(schema: IApiNodeShape, options: IProcessNodeOptions={}): string {
     const label = options.forceName || shapeToXmlTagName(schema);
     const parts = [];
     const currentIndent = (options.indent || 0);
@@ -118,7 +118,7 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
       if (minCount === 0 && !this.opts.renderOptional || !range) {
         return;
       }
-      const anyRange = range as IAnyShape;
+      const anyRange = range as IApiAnyShape;
       if (anyRange.xmlSerialization) {
         // Adds to the parent attributes list.
         // When a non-scalar shape has `attribute` serialization this is an API spec error.
@@ -151,7 +151,7 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return parts.join('\n');
   }
 
-  protected _scalarShapeObject(schema: IScalarShape, options: IProcessNodeOptions={}): any {
+  protected _scalarShapeObject(schema: IApiScalarShape, options: IProcessNodeOptions={}): any {
     const { xmlSerialization, defaultValue } = schema;
     let content;
     if (defaultValue) {
@@ -186,7 +186,7 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return parts.join('');
   }
 
-  protected _nilShapeObject(schema: IScalarShape, options: IProcessNodeOptions={}): any|undefined {
+  protected _nilShapeObject(schema: IApiScalarShape, options: IProcessNodeOptions={}): any|undefined {
     const { xmlSerialization } = schema;
     const content = '';
     let label = options.forceName || shapeToXmlTagName(schema);
@@ -218,27 +218,27 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
   /**
    * @returns The value for the property or undefined when cannot generate the value.
    */
-  protected _propertyShapeObject(schema: IPropertyShape, options: IProcessNodeOptions = {}): string|undefined {
+  protected _propertyShapeObject(schema: IApiPropertyShape, options: IProcessNodeOptions = {}): string|undefined {
     const { range, minCount=0 } = schema;
     if (minCount === 0 && !this.opts.renderOptional || !range) {
       return undefined;
     }
     const { types } = range;
-    const name = shapeToXmlTagName(schema as IAnyShape);
+    const name = shapeToXmlTagName(schema as IApiAnyShape);
     if (types.includes(ns.aml.vocabularies.shapes.ScalarShape)) {
-      return this._scalarShapeObject(range as IScalarShape, { ...options });
+      return this._scalarShapeObject(range as IApiScalarShape, { ...options });
     } 
     if (types.includes(ns.aml.vocabularies.shapes.NilShape)) {
-      return this._nilShapeObject(range as IScalarShape, { ...options, forceName: name });
+      return this._nilShapeObject(range as IApiScalarShape, { ...options, forceName: name });
     }
     if (types.includes(ns.aml.vocabularies.shapes.RecursiveShape)) {
       return undefined;
     }
     if (types.includes(ns.w3.shacl.NodeShape)) {
-      return this._nodePropertyObject(schema as IPropertyShape<INodeShape>, options);
+      return this._nodePropertyObject(schema as IApiPropertyShape<IApiNodeShape>, options);
     }
     if (types.includes(ns.aml.vocabularies.shapes.ArrayShape) || types.includes(ns.aml.vocabularies.shapes.MatrixShape)) {
-      return this._nodePropertyArray(schema as IPropertyShape<IArrayShape>, options);
+      return this._nodePropertyArray(schema as IApiPropertyShape<IApiArrayShape>, options);
     }
     return this.processNode(range, { ...options, forceName: name });
   }
@@ -248,17 +248,17 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
       return undefined;
     }
     const { isWrapped, nodeName, tagFill='', indent = 0  } = opts;
-    let { examples=[] } = (schema as IAnyShape);
+    let { examples=[] } = (schema as IApiAnyShape);
     const { inherits } = schema;
     if (Array.isArray(inherits) && inherits.length) {
       inherits.forEach((parent) => {
         let node = parent;
         if (node.types.includes(ns.aml.vocabularies.shapes.UnionShape)) {
-          const union = node as IUnionShape;
+          const union = node as IApiUnionShape;
           const { anyOf=[] } = union;
           node = this._readCurrentUnion(anyOf);
         }
-        const anyShape = node as IAnyShape;
+        const anyShape = node as IApiAnyShape;
         if (Array.isArray(anyShape.examples) && anyShape.examples.length) {
           examples = examples.concat(anyShape.examples);
         }
@@ -292,13 +292,13 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return new Array(indent * 2 + offset).fill(' ').join('');
   }
 
-  protected _nodePropertyObject(schema: IPropertyShape<INodeShape>, options: IProcessNodeOptions = {}): string {
+  protected _nodePropertyObject(schema: IApiPropertyShape<IApiNodeShape>, options: IProcessNodeOptions = {}): string {
     const parts: string[] = [];
     const name = normalizeXmlTagName(String(schema.name));
     const { indent=0 } = options;
     const baseTabs = this._createTabs(indent);
     let value: string;
-    const range = schema.range as INodeShape;
+    const range = schema.range as IApiNodeShape;
     const exampleValue = this._collectExamples(range, {
       tagFill: baseTabs,
       indent: indent + 1,
@@ -316,7 +316,7 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
         if (minCount === 0 && !this.opts.renderOptional) {
           return;
         }
-        const anyRange = range as IAnyShape;
+        const anyRange = range as IApiAnyShape;
         
         if (anyRange.xmlSerialization) {
           const { prefix, attribute } = anyRange.xmlSerialization;
@@ -350,8 +350,8 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return parts.join('\n');
   }
 
-  protected _nodePropertyArray(schema: IPropertyShape<IArrayShape>, options: IProcessNodeOptions = {}): string {
-    const range = schema.range as IArrayShape;    
+  protected _nodePropertyArray(schema: IApiPropertyShape<IApiArrayShape>, options: IProcessNodeOptions = {}): string {
+    const range = schema.range as IApiArrayShape;    
     const parts: string[] = [];
     let name: string;
     if (range.xmlSerialization && range.xmlSerialization.name) {
@@ -375,7 +375,7 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return parts.join('\n');
   }
 
-  protected _arrayShapeObject(schema: IArrayShape, options: IProcessNodeOptions={}): string {
+  protected _arrayShapeObject(schema: IApiArrayShape, options: IProcessNodeOptions={}): string {
     const { items } = schema;
     const isScalarItems = !!items && items.types.includes(ns.aml.vocabularies.shapes.ScalarShape);
     // the name is either from the XML serialization info, or the parent property.
@@ -605,8 +605,8 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
    * @param schema The array schema
    * @param options Processing options.
    */
-  protected _scalarItems(schema: IArrayShape<IScalarShape>, options: IProcessNodeOptions={}): string {
-    const items = schema.items as IScalarShape;
+  protected _scalarItems(schema: IApiArrayShape<IApiScalarShape>, options: IProcessNodeOptions={}): string {
+    const items = schema.items as IApiScalarShape;
     const currentIndent = (options.indent || 0);
     const tagFill = new Array(currentIndent * 2).fill(' ').join('');
 
@@ -661,8 +661,8 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
    * @param schema The array shape with item that is NodeShape.
    * @param options Rendering options.
    */
-  protected _nodeItems(schema: IArrayShape<INodeShape>, options: IProcessNodeOptions={}): string {
-    const items = schema.items as INodeShape;
+  protected _nodeItems(schema: IApiArrayShape<IApiNodeShape>, options: IProcessNodeOptions={}): string {
+    const items = schema.items as IApiNodeShape;
     const currentIndent = (options.indent || 0);
     const tagFill = new Array(currentIndent * 2).fill(' ').join('');
     const isWrapped = schema.xmlSerialization && !!schema.xmlSerialization.wrapped;
@@ -729,7 +729,7 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
   /**
    * @param example The example to turn into a JS object
    */
-  protected _exampleToObject(example?: IDataExample): any {
+  protected _exampleToObject(example?: IApiDataExample): any {
     if (example && example.structuredValue) {
       const generator = new XmlDataNodeGenerator();
       return generator.generate(example.structuredValue);
@@ -737,15 +737,15 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return undefined;
   }
 
-  protected _unionShapeObject(schema: IUnionShape, options: IProcessNodeOptions={}): any {
+  protected _unionShapeObject(schema: IApiUnionShape, options: IProcessNodeOptions={}): any {
     let { anyOf=[], examples=[] } = schema;
     if (Array.isArray(schema.inherits) && schema.inherits) {
       schema.inherits.forEach((parent) => {
-        const anyParent = parent as IAnyShape;
+        const anyParent = parent as IApiAnyShape;
         if (Array.isArray(anyParent.examples) && anyParent.examples.length) {
           examples = examples.concat(anyParent.examples);
         }
-        const typed = parent as IUnionShape;
+        const typed = parent as IApiUnionShape;
         if (Array.isArray(typed.anyOf) && typed.anyOf.length) {
           anyOf = anyOf.concat(typed.anyOf);
         }
@@ -787,10 +787,10 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
    * @param schema The schema with unions
    * @param defaultValue The definition of a default value.
    */
-  protected _unionDefaultValue(schema: IShapeUnion, defaultValue: IDataNodeUnion, options: IProcessNodeOptions = {}): any|undefined {
+  protected _unionDefaultValue(schema: IShapeUnion, defaultValue: IApiDataNodeUnion, options: IProcessNodeOptions = {}): any|undefined {
     const gen = new XmlDataNodeGenerator();
     const value = gen.generate(defaultValue);
-    const anySchema = schema as IAnyShape;
+    const anySchema = schema as IApiAnyShape;
     const label = shapeToXmlTagName(anySchema);
     const currentIndent = (options.indent || 0);
     const rootFill = new Array(currentIndent*2).fill(' ').join('');
@@ -815,23 +815,23 @@ export class ShapeXmlSchemaGenerator extends ShapeBase {
     return undefined;
   }
 
-   protected _anyShapeObject(schema: IAnyShape): string {
+   protected _anyShapeObject(schema: IApiAnyShape): string {
     const { and=[], xone=[], or=[] } = schema;
     if (and.length) {
       // we combine all properties together under `schema` with changed properties
-      const copy = JsonCore.clone(schema) as INodeShape;
+      const copy = JsonCore.clone(schema) as IApiNodeShape;
       copy.and = [];
       copy.properties = [];
       and.forEach((item) => {
         const { types } = item;
         if (types.includes(ns.aml.vocabularies.shapes.ScalarShape)) {
-          const typed = item as IScalarShape;
+          const typed = item as IApiScalarShape;
           copy.properties.push(typed);
         } else if (types.includes(ns.w3.shacl.NodeShape)) {
-          const typed = item as INodeShape;
+          const typed = item as IApiNodeShape;
           typed.properties.forEach(i => copy.properties.push(i));
         } else if (types.includes(ns.aml.vocabularies.shapes.ArrayShape) || types.includes(ns.aml.vocabularies.shapes.MatrixShape)) {
-          const typed = item as IArrayShape;
+          const typed = item as IApiArrayShape;
           if (typed.items) {
             copy.properties.push(typed.items)
           }

package/src/events/amf/AmfEvents.ts

@@ -1,4 +1,4 @@
-import { ApiParseResult, AmfServiceProcessingOptions } from "../../amf/Parsing.js";
+import { IApiParseResult, IAmfServiceProcessingOptions } from "../../amf/Parsing.js";
 import { ContextEvent } from "../BaseEvents.js";
 import { AmfEventTypes } from './AmfEventTypes.js'
 
@@ -12,12 +12,12 @@ export class AmfEvents {
    * @param packaging Default to `zip`.
    * @returns Promise resolved to the AMF json-ld model.
    */
-  static async processApiLink(url: string, mainFile?: string, md5?: string, packaging?: string, target: EventTarget = window): Promise<ApiParseResult> {
+  static async processApiLink(url: string, mainFile?: string, md5?: string, packaging?: string, target: EventTarget = window): Promise<IApiParseResult> {
     const e = new ContextEvent(AmfEventTypes.processApiLink, {
       url, mainFile, md5, packaging,
     });
     target.dispatchEvent(e);
-    return (e.detail.result as unknown) as Promise<ApiParseResult>;
+    return (e.detail.result as unknown) as Promise<IApiParseResult>;
   }
 
   /**
@@ -26,12 +26,12 @@ export class AmfEvents {
    * @param opts Processing options
    * @returns Promise resolved to the AMF json-ld model
    */
-  static async processBuffer(buffer: Buffer, opts?: AmfServiceProcessingOptions, target: EventTarget = window): Promise<ApiParseResult> {
+  static async processBuffer(buffer: Buffer, opts?: IAmfServiceProcessingOptions, target: EventTarget = window): Promise<IApiParseResult> {
     const e = new ContextEvent(AmfEventTypes.processBuffer, {
       buffer, opts,
     });
     target.dispatchEvent(e);
-    return (e.detail.result as unknown) as Promise<ApiParseResult>;
+    return (e.detail.result as unknown) as Promise<IApiParseResult>;
   }
 
   /**
@@ -42,12 +42,12 @@ export class AmfEvents {
    * @param file File to process.
    * @returns Promise resolved to the AMF json-ld model
    */
-  static async processApiFile(file: File | Blob, target: EventTarget = window): Promise<ApiParseResult> {
+  static async processApiFile(file: File | Blob, target: EventTarget = window): Promise<IApiParseResult> {
     const e = new ContextEvent(AmfEventTypes.processApiFile, {
       file,
     });
     target.dispatchEvent(e);
-    return (e.detail.result as unknown) as Promise<ApiParseResult>;
+    return (e.detail.result as unknown) as Promise<IApiParseResult>;
   }
 
   /**

package/src/lib/timers/Timers.ts

@@ -7,3 +7,17 @@ export function sleep(timeout = 0): Promise<void> {
     setTimeout(() => resolve(), timeout);
   });
 }
+
+/**
+ * Resolves after requestAnimationFrame.
+ *
+ * @example
+ * await nextFrame();
+ *
+ * @returns Promise that resolved after requestAnimationFrame
+ */
+export function nextFrame(): Promise<void> {
+  return new Promise(resolve => {
+    requestAnimationFrame(() => resolve());
+  });
+}

package/src/models/data/Bindings.ts

@@ -1,5 +1,5 @@
 /* eslint-disable import/export */
-import { IXmlSerializer } from "../../amf/definitions/Shapes.js";
+import { IApiXmlSerializer } from "../../amf/definitions/Shapes.js";
 
 /**
  * A general schema definition for a property. This is propagated to all bindings (when they support these properties).
@@ -76,7 +76,7 @@ export interface IPropertyWebBindings {
   /**
    * The XML encoding instructions.
    */
-  xml?: IXmlSerializer;
+  xml?: IApiXmlSerializer;
   /**
    * Only valid for the `file` property type.
    * The list of file mime types.

package/src/models/data/DataAssociation.ts

@@ -1,6 +1,6 @@
 import { Core as JsonCore } from '@api-client/json';
 import { AmfShapeGenerator } from '../../amf/AmfShapeGenerator.js';
-import { IAssociationShape, IPropertyShape } from '../../amf/definitions/Shapes.js';
+import { IApiAssociationShape, IApiPropertyShape } from '../../amf/definitions/Shapes.js';
 import v4 from '../../lib/uuid.js';
 import { IThing, Thing } from "../Thing.js";
 import { DataEntity, IDataEntity } from './DataEntity.js';
@@ -57,7 +57,7 @@ export interface IDataAssociation {
    * Note, schema can only occur on an adapted property. Has no effect on the "main"
    * property.
    */
-  schema?: IAssociationShape;
+  schema?: IApiAssociationShape;
   /**
    * The key of the association that is adapted by this association.
    * Adapted associations can manipulate the shape of the schema for the association.
@@ -121,7 +121,7 @@ export class DataAssociation {
    * Note, schema can only occur on an adapted property. Has no effect on the "main"
    * property.
    */
-  schema?: IAssociationShape;
+  schema?: IApiAssociationShape;
 
   /**
    * The key of the association that is adapted by this association.
@@ -355,7 +355,7 @@ export class DataAssociation {
    * 
    * @returns AMF property shape definition.
    */
-  toApiShape(): IPropertyShape {
+  toApiShape(): IApiPropertyShape {
     const serializer = new AmfShapeGenerator();
     return serializer.associationProperty(this);
   }

package/src/models/data/DataEntity.ts

@@ -5,7 +5,7 @@ import { DataProperty, DataPropertyType } from "./DataProperty.js";
 import { DataAssociation } from "./DataAssociation.js";
 import { IBreadcrumb } from "../store/Breadcrumb.js";
 import { DataModel } from "./DataModel.js";
-import { INodeShape, IShapeUnion } from "../../amf/definitions/Shapes.js";
+import { IApiNodeShape, IShapeUnion } from "../../amf/definitions/Shapes.js";
 import { AmfShapeGenerator } from "../../amf/AmfShapeGenerator.js";
 import { ApiSchemaGenerator } from "../../amf/ApiSchemaGenerator.js";
 import { IShapeRenderOptions } from "../../amf/shape/ShapeBase.js";
@@ -72,7 +72,7 @@ export interface IDataEntity {
    * 
    * - can only occur on an adapted property. Has no effect on the "main" property. 
    */
-  schema?: INodeShape;
+  schema?: IApiNodeShape;
 
   /**
    * The key of the entity that is adapted by this entity.

package/src/models/data/DataProperty.ts

@@ -2,7 +2,7 @@ import { Core as JsonCore } from '@api-client/json';
 import { IThing, Thing } from "../Thing.js";
 import v4 from '../../lib/uuid.js';
 import { DataNamespace } from "./DataNamespace.js";
-import { IPropertyShape } from "../../amf/definitions/Shapes.js";
+import { IApiPropertyShape } from "../../amf/definitions/Shapes.js";
 import { AmfShapeGenerator } from '../../amf/AmfShapeGenerator.js';
 import { IPropertyBindings, IPropertySchema } from './Bindings.js';
 
@@ -478,7 +478,7 @@ export class DataProperty {
    * 
    * @returns AMF property shape definition.
    */
-  toApiShape(): IPropertyShape {
+  toApiShape(): IApiPropertyShape {
     const serializer = new AmfShapeGenerator();
     return serializer.property(this);
   }