@api-client/core 0.11.0 → 0.11.2

package/tests/unit/amf/AmfLoader.ts

@@ -1,6 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-// @ts-expect-error Used in testing
-import { AmfModelExpander } from 'amf-json-ld-lib'
 import { readFile } from 'fs/promises'
 import { AmfMixin } from '../../../src/amf/AmfMixin.js'
 import { AmfSerializer } from '../../../src/amf/AmfSerializer.js'
@@ -56,23 +53,15 @@ export class AmfLoader extends AmfMixin(Object) {
     if (opts.noExpand) {
       return result
     }
-    let amf = this.getExpandedModel(result)
+    let amf = this._expand(result)
     if (Array.isArray(amf)) {
       ;[amf] = amf
     }
     return amf
   }
 
-  getExpandedModel(model: any): IAmfDocument {
-    let amf = model
-    if (!AmfModelExpander.isInExpandedForm(amf)) {
-      amf = this._expand(amf)
-    }
-    return amf
-  }
-
   lookupEndpoint(model: IAmfDocument, path: string): IAmfEndPoint {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     this.amf = amf
     const webApi = this._computeApi(amf)
     if (!webApi) {
@@ -92,7 +81,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getEndpoint(model: IAmfDocument, path: string): IApiEndPoint {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const op = this.lookupEndpoint(amf, path)
     if (!op) {
       throw new Error(`Unknown endpoint for path ${path}`)
@@ -102,7 +91,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   lookupOperation(model: IAmfDocument, endpoint: string, operation: string): IAmfOperation {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const endPoint = this.lookupEndpoint(amf, endpoint)
     const opKey = this._getAmfKey(ns.aml.vocabularies.apiContract.supportedOperation)
     // @ts-expect-error Used in testing
@@ -117,7 +106,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getOperation(model: IAmfDocument, endpoint: string, operation: string): IApiOperation {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const op = this.lookupOperation(amf, endpoint, operation)
     if (!op) {
       throw new Error(`Unknown operation for path ${endpoint} and method ${operation}`)
@@ -168,7 +157,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getPayloads(model: IAmfDocument, endpoint: string, operation: string): IApiPayload[] {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
 
     const payloads = this.lookupPayloads(amf, endpoint, operation)
     if (!payloads) {
@@ -179,7 +168,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   lookupSecurity(model: IAmfDocument, name: string): IAmfSecurityScheme | undefined {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
 
     this.amf = amf
     const declares = this._computeDeclares(amf) || []
@@ -214,7 +203,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getSecurity(model: IAmfDocument, name: string): IApiSecurityScheme {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const security = this.lookupSecurity(amf, name)
     if (!security) {
       throw new Error(`No security named ${name}`)
@@ -224,7 +213,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   lookupShape(model: IAmfDocument, name: string): IAmfShape | undefined {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     this.amf = amf
     const declares = this._computeDeclares(amf) || []
     let shape = declares.find((item) => {
@@ -252,7 +241,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getShape(model: IAmfDocument, name: string): IShapeUnion {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const shape = this.lookupShape(amf, name)
     if (!shape) {
       throw new Error(`No API shape named ${name}`)
@@ -262,7 +251,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   lookupDocumentation(model: IAmfDocument, name: string): IAmfCreativeWork | undefined {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     this.amf = amf
     const webApi = this._computeApi(amf)
     if (!webApi) {
@@ -280,7 +269,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getDocumentation(model: IAmfDocument, name: string): IApiDocumentation {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const shape = this.lookupDocumentation(amf, name)
     if (!shape) {
       throw new Error(`No documentation named ${name}`)
@@ -290,7 +279,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   lookupEncodes(model: IAmfDocument): IAmfWebApi {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     this.amf = amf
     const key = this._getAmfKey(ns.aml.vocabularies.document.encodes) as string
     // @ts-expect-error Used in testing
@@ -308,7 +297,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getResponses(model: IAmfDocument, endpoint: string, operation: string): IApiResponse[] {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const responses = this.lookupResponses(amf, endpoint, operation)
     const serializer = new AmfSerializer(amf)
     return responses.map((i) => serializer.response(i))
@@ -335,7 +324,7 @@ export class AmfLoader extends AmfMixin(Object) {
    * @param code The response's status code
    */
   getResponse(model: IAmfDocument, endpoint: string, operation: string, code: string): IApiResponse {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const response = this.lookupResponse(amf, endpoint, operation, code)
     const serializer = new AmfSerializer(amf)
     return serializer.response(response)
@@ -355,7 +344,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getRequest(model: IAmfDocument, endpoint: string, operation: string): IApiRequest {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const request = this.lookupRequest(amf, endpoint, operation)
     if (!request) {
       throw new Error(`No request found in operation ${operation} and path ${endpoint}`)
@@ -383,14 +372,14 @@ export class AmfLoader extends AmfMixin(Object) {
    * @param code The response's status code
    */
   getResponsePayloads(model: IAmfDocument, path: string, operation: string, code: string): IApiPayload[] {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const payloads = this.lookupResponsePayloads(amf, path, operation, code)
     const serializer = new AmfSerializer(amf)
     return payloads.map((p) => serializer.payload(p))
   }
 
   lookupServers(model: IAmfDocument): IAmfServer[] | undefined {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     this.amf = amf
     const webApi = this._computeApi(amf)
     if (!webApi) {
@@ -406,7 +395,7 @@ export class AmfLoader extends AmfMixin(Object) {
   }
 
   getServers(model: IAmfDocument): IApiServer[] | undefined {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const servers = this.lookupServers(amf)
     if (servers) {
       const serializer = new AmfSerializer(amf)
@@ -494,7 +483,7 @@ export class AmfLoader extends AmfMixin(Object) {
    * @param param The param name
    */
   getParameter(model: IAmfDocument, endpoint: string, operation: string, param: string): IApiParameter {
-    const amf = this.getExpandedModel(model)
+    const amf = this._expand(model)
     const expects = this.lookupExpects(amf, endpoint, operation)
     if (!expects) {
       throw new Error(`The operation ${operation} of endpoint ${endpoint} has no request.`)