fix: fixing mapping type

Signed-off-by: Pawel Psztyc <[email protected]>

Author: jarrodek

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-components/amf-helper-mixin",
   "description": "A mixin with common functions user by most AMF components to compute AMF values",
-  "version": "4.5.7",
+  "version": "4.5.8",
   "license": "Apache-2.0",
   "main": "index.js",
   "module": "index.js",

package.json

@@ -1363,6 +1363,7 @@ export class AmfSerializer extends AmfHelperMixin(Object) {
       types: object['@type'].map(this[expandKey].bind(this)),
       customDomainProperties: this.customDomainProperties(object),
       sourceMaps: this.sourceMap(object),
+      mapping: [],
     });
     const { ns } = this;
     const name = this._getValue(object, ns.aml.vocabularies.core.name);
@@ -1384,12 +1385,14 @@ export class AmfSerializer extends AmfHelperMixin(Object) {
       }
       result.server = this.server(server);
     }
-    let mapping = object[this._getAmfKey(ns.aml.vocabularies.apiContract.mapping)];
+    let mapping = /** @type IriTemplateMapping[] */ (object[this._getAmfKey(ns.aml.vocabularies.apiContract.mapping)]);
     if (mapping) {
-      if (Array.isArray(mapping)) {
-        [mapping] = mapping;
+      if (mapping && !Array.isArray(mapping)) {
+        mapping = [mapping];
+      }
+      if (mapping) {
+        result.mapping = mapping.map(item => this.iriTemplateMapping(item));
       }
-      result.mapping = this.iriTemplateMapping(mapping);
     }
     // if (!template.isNullOrEmpty) {
     //   result.template = template.value();

src/AmfSerializer.js

@@ -168,7 +168,7 @@ export interface ApiTemplatedLink extends ApiDomainProperty {
   template?: string;
   operationId?: string;
   requestBody?: string;
-  mapping?: ApiIriTemplateMapping;
+  mapping: ApiIriTemplateMapping[];
   server?: ApiServer;
   sourceMaps?: ApiDocumentSourceMaps;
 }

src/types.d.ts

@@ -123,12 +123,13 @@ describe('AmfSerializer', () => {
       assert.equal(l1.operationId, 'getUserByName', 'l1 has the name');
       assert.typeOf(l1.description, 'string', 'l1 has the description');
       assert.typeOf(l2.description, 'string', 'l2 has the description');
-      assert.typeOf(l1.mapping, 'object', 'l1 has the mapping');
-      assert.typeOf(l2.mapping, 'object', 'l2 has the mapping');
+      assert.typeOf(l1.mapping, 'array', 'l1 has the mapping');
+      assert.typeOf(l2.mapping, 'array', 'l2 has the mapping');
       const { mapping } = l1;
-      assert.include(mapping.types, serializer.ns.aml.vocabularies.apiContract.IriTemplateMapping, 'mapping has the type');
-      assert.equal(mapping.templateVariable, 'username', 'mapping has the templateVariable');
-      assert.equal(mapping.linkExpression, '$request.body#/username', 'mapping has the linkExpression');
+      const [mappingItem] = mapping;
+      assert.include(mappingItem.types, serializer.ns.aml.vocabularies.apiContract.IriTemplateMapping, 'mapping has the type');
+      assert.equal(mappingItem.templateVariable, 'username', 'mapping has the templateVariable');
+      assert.equal(mappingItem.linkExpression, '$request.body#/username', 'mapping has the linkExpression');
     });