@api-client/core 0.7.11 → 0.8.0

package/src/amf/Utils.ts

@@ -1,11 +1,11 @@
 import { UrlEncoder } from "../lib/parsers/UrlEncoder.js";
 import { AmfNamespace } from "./definitions/Namespace.js";
-import { INodeShape, IPropertyShape, IShapeUnion, IUnionShape } from "./definitions/Shapes.js";
+import { IApiNodeShape, IApiPropertyShape, IShapeUnion, IApiUnionShape } from "./definitions/Shapes.js";
 
 /**
    * @param indent The current indent
    */
-export function toXml(obj: any, indent=0): string {
+export function toXml(obj: Record<string, unknown>, indent=0): string {
   if (typeof obj !== 'object') {
     return obj;
   }
@@ -14,7 +14,7 @@ export function toXml(obj: any, indent=0): string {
   Object.keys(obj).forEach((prop) => {
     xml += Array.isArray(obj[prop]) ? '' : `${tabs}<${prop}>`;
     if (Array.isArray(obj[prop])) {
-      (obj[prop] as any[]).forEach((item) => {
+      (obj[prop] as Record<string, unknown>[]).forEach((item) => {
         xml += `<${prop}>\n`;
         xml += tabs;
         xml += toXml({ ...item }, indent + 1);
@@ -22,7 +22,7 @@ export function toXml(obj: any, indent=0): string {
       });
     } else if (typeof obj[prop] === "object") {
       xml += `\n`;
-      xml += toXml({ ...obj[prop] }, indent + 1);
+      xml += toXml({ ...obj[prop] as Record<string, unknown> }, indent + 1);
     } else {
       xml += `${obj[prop]}`;
     }
@@ -60,7 +60,7 @@ export function wwwFormUrlEncode(str: string, replacePlus?: boolean): string {
 /**
  * Processes a value that should be a number.
  */
-export function parseNumberInput(value: any, defaultValue?: number): number | undefined {
+export function parseNumberInput(value: unknown, defaultValue?: number): number | undefined {
   if (typeof value === 'number') {
     return value;
   }
@@ -74,13 +74,13 @@ export function parseNumberInput(value: any, defaultValue?: number): number | un
 /**
  * Processes a value that should be a number.
  */
-export function parseBooleanInput(value: any, defaultValue?: boolean): boolean | undefined {
+export function parseBooleanInput(value: unknown, defaultValue?: boolean): boolean | undefined {
   const type = typeof value;
   if (type === 'boolean') {
-    return value;
+    return value as boolean;
   }
   if (type === 'string') {
-    const trimmed = value.trim();
+    const trimmed = (value as string).trim();
     if (trimmed === 'true') {
       return true;
     }
@@ -95,7 +95,7 @@ export function parseBooleanInput(value: any, defaultValue?: boolean): boolean |
  * Casts the `value` to the corresponding data type
  * @param type The w3 schema type
  */
-export function readTypedValue(value: any, type?: string): string | null | number | boolean | undefined {
+export function readTypedValue(value: unknown, type?: string): string | null | number | boolean | undefined {
   if (value === undefined || value === null) {
     return value;
   }
@@ -116,7 +116,7 @@ export function readTypedValue(value: any, type?: string): string | null | numbe
     case AmfNamespace.w3.xmlSchema.nil: 
       return null;
     default:
-      return value;
+      return value as string | null | number | boolean | undefined;
   }
 }
 
@@ -141,8 +141,8 @@ export function getUnionMember(anyOf: IShapeUnion[], selectedUnions: string[] =
  * @param {string[]=} [selectedUnions=[]]
  * @returns {ApiPropertyShape[]}
  */
-export function collectNodeProperties(schema: INodeShape, selectedUnions?: string[]): IPropertyShape[] {
-  let result: IPropertyShape[] = [];
+export function collectNodeProperties(schema: IApiNodeShape, selectedUnions?: string[]): IApiPropertyShape[] {
+  let result: IApiPropertyShape[] = [];
   const { properties, inherits } = schema;
   if (properties.length) {
     result = [...properties];
@@ -151,14 +151,14 @@ export function collectNodeProperties(schema: INodeShape, selectedUnions?: strin
     inherits.forEach((s) => {
       let node = s;
       if (node.types.includes(AmfNamespace.aml.vocabularies.shapes.UnionShape)) {
-        const union = node as IUnionShape;
+        const union = node as IApiUnionShape;
         const { anyOf=[] } = union;
         node = getUnionMember(anyOf, selectedUnions);
       }
       if (!node.types.includes(AmfNamespace.w3.shacl.NodeShape)) {
         return;
       }
-      const typed = node as INodeShape;
+      const typed = node as IApiNodeShape;
       // const p = typed.properties;
       // if (Array.isArray(p) && p.length) {
       //   result = result.concat(p);
@@ -169,7 +169,7 @@ export function collectNodeProperties(schema: INodeShape, selectedUnions?: strin
       }
     });
   }
-  const merged: IPropertyShape[] = [];
+  const merged: IApiPropertyShape[] = [];
   result.forEach((item) => {
     const existing = merged.find(i => i.name === item.name);
     if (existing) {

package/src/amf/data-node/DataNodeBase.ts

@@ -1,5 +1,5 @@
 import { AmfNamespace as ns } from "../definitions/Namespace.js";
-import { IArrayNode, IDataNode, IObjectNode, IScalarNode } from "../definitions/Shapes.js";
+import { IApiArrayNode, IApiDataNode, IApiObjectNode, IApiScalarNode } from "../definitions/Shapes.js";
 import { readTypedValue } from '../Utils.js';
 
 /**
@@ -10,16 +10,16 @@ export class DataNodeBase {
    * @param node The AMF data node to turn into a schema.
    * @returns Undefined when passed non-DataNode domain element.
    */
-  processNode(node: IDataNode): any | undefined {
+  processNode(node: IApiDataNode): any | undefined {
     const { types } = node;
     if (types.includes(ns.aml.vocabularies.data.Scalar)) {
-      return this.processScalarNode(node as IScalarNode);
+      return this.processScalarNode(node as IApiScalarNode);
     }
     if (types.includes(ns.aml.vocabularies.data.Array)) {
-      return this.processArrayNode(node as IArrayNode);
+      return this.processArrayNode(node as IApiArrayNode);
     }
     if (types.includes(ns.aml.vocabularies.data.Object)) {
-      return this.processObjectNode(node as IObjectNode);
+      return this.processObjectNode(node as IApiObjectNode);
     }
     return undefined;
   }
@@ -28,7 +28,7 @@ export class DataNodeBase {
    * @param scalar The scalar node to process.
    * @returns The scalar value.
    */
-  processScalarNode(scalar: IScalarNode): any {
+  processScalarNode(scalar: IApiScalarNode): any {
     return readTypedValue(scalar.value, scalar.dataType);
   }
 
@@ -36,7 +36,7 @@ export class DataNodeBase {
    * @param array The array node to process.
    * @returns Array value.
    */
-  processArrayNode(array: IArrayNode): any[] {
+  processArrayNode(array: IApiArrayNode): any[] {
     const container: any[] = [];
     array.members.forEach((member) => {
       const result = this.processNode(member);
@@ -51,7 +51,7 @@ export class DataNodeBase {
    * @param object The object node to process.
    * @returns Object value.
    */
-  processObjectNode(object: IObjectNode): any {
+  processObjectNode(object: IApiObjectNode): any {
     const container: any = {};
     const { properties } = object;
     Object.keys(properties).forEach((key) => {

package/src/amf/data-node/JsonDataNodeGenerator.ts

@@ -1,4 +1,4 @@
-import { IDataNode } from '../definitions/Shapes.js';
+import { IApiDataNode } from '../definitions/Shapes.js';
 import { DataNodeBase } from './DataNodeBase.js';
 
 /** @typedef {import('../../helpers/api').ApiDataNode} ApiDataNode */
@@ -13,7 +13,7 @@ export class JsonDataNodeGenerator extends DataNodeBase {
    * @param node The AMF's data node to transform into a schema.
    * @returns Undefined when passed non-DataNode domain element.
    */
-  generate(node: IDataNode): string | undefined {
+  generate(node: IApiDataNode): string | undefined {
     const result = this.processNode(node);
     if (!result) {
       return result;

package/src/amf/data-node/UrlEncodedDataNodeGenerator.ts

@@ -1,5 +1,5 @@
 import { DataNodeBase } from './DataNodeBase.js';
-import { IDataNode } from '../definitions/Shapes.js';
+import { IApiDataNode } from '../definitions/Shapes.js';
 import { UrlEncoder } from "../../lib/parsers/UrlEncoder.js";
 
 /** @typedef {import('../../helpers/api').ApiDataNode} ApiDataNode */
@@ -11,7 +11,7 @@ export class UrlEncodedDataNodeGenerator extends DataNodeBase {
    * @param shapeName When provided it wraps the returned value with the shape name.
    * @returns Undefined when passed non-DataNode domain element.
    */
-  generate(node: IDataNode, shapeName?: string): string | undefined {
+  generate(node: IApiDataNode, shapeName?: string): string | undefined {
     const result = this.processNode(node);
     const isArray = Array.isArray(result);
     if (shapeName && (typeof result !== 'object' || isArray)) {

package/src/amf/data-node/XmlDataNodeGenerator.ts

@@ -1,6 +1,6 @@
 import { DataNodeBase } from './DataNodeBase.js';
 import { toXml } from '../Utils.js';
-import { IDataNode } from '../definitions/Shapes.js';
+import { IApiDataNode } from '../definitions/Shapes.js';
 
 export interface IDataGenerateOptions {
   /**
@@ -20,7 +20,7 @@ export class XmlDataNodeGenerator extends DataNodeBase {
    * @param shapeName When provided it wraps the returned value with the shape name.
    * @returns Undefined when passed non-DataNode domain element.
    */
-  generate(node: IDataNode, shapeName?: string, opts: IDataGenerateOptions = {}): string | undefined {
+  generate(node: IApiDataNode, shapeName?: string, opts: IDataGenerateOptions = {}): string | undefined {
     const result = this.processNode(node);
     if (!result) {
       return result;