@adobe/acc-js-sdk 1.1.42 → 1.1.43

package/docs/changeLog.html

@@ -2,6 +2,15 @@
 layout: page
 title: Change Log
 ---
+<section class="changelog"><h1>Version 1.1.43</h1>
+  <h2>2023/12/21</h2>
+  <li>
+    Do not throw an error in case of duplicate enumeration value. Use the last one instead. This introduces a small behavior change
+    because this was causing an exception before.
+  </li>
+</section>
+
+
 <section class="changelog"><h1>Version 1.1.42</h1>
   <h2>2023/12/20</h2>
   <li>

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.42",
+  "version": "1.1.43",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.42",
+      "version": "1.1.43",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.2.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.42",
+  "version": "1.1.43",
   "description": "ACC Javascript SDK",
   "main": "src/index.js",
   "homepage": "https://github.com/adobe/acc-js-sdk#readme",

package/src/util.js

@@ -196,13 +196,17 @@ class ArrayMap {
 
   _push(key, value, withoutIndexing) {
       let isNumKey = false;
+      let updateIndex = -1;
+
       if (key) {
         // reserved keyworkds
         const isReserved = key === "_items" || key === "length" || key === "_push" || key === "forEach" || key === "map" || key === "_map" || key === "get" || key === "find" || key === "flatMap" || key === "filter";
 
         // already a child with the name => there's a problem with the schema
-        if (!isReserved && this[key]) 
-          throw new Error(`Failed to add element '${key}' to ArrayMap. There's already an item with the same name`);
+        // it seems the current behavior is to replace the existing item with the new one
+        if (!isReserved && this[key]) {
+          updateIndex = this._items.indexOf(this[key]);
+        }
 
         // Set key as a enumerable property, so that elements can be accessed by key, 
         // but also iterated on with a for ... in loop
@@ -222,14 +226,19 @@ class ArrayMap {
       if (!withoutIndexing && !isNumKey) {
         // Set the index property so that items can be accessed by array index.
         // However, make it non-enumerable to make sure indexes do not show up in a for .. in loop
-        Object.defineProperty(this, this._items.length, {
+        const numKey = updateIndex == -1 ? this._items.length : updateIndex;
+        Object.defineProperty(this, numKey, {
           value: value,
           writable: false,
           enumerable: false,
+          configurable: true, // Allow to redefine the property later in case there's a duplicate key
         });
       }
       // Add to array and set length
-      this._items.push(value);
+      if (updateIndex == -1)
+        this._items.push(value);
+      else
+        this._items[updateIndex] = value;
       this.length = this._items.length;
   }
 

package/test/application.test.js

@@ -45,13 +45,37 @@ describe('Application', () => {
             });
 
             it("Duplicate root nodes", () => {
-                expect(() => {
-                    var xml = DomUtil.parse(`<schema namespace='nms' name='recipient'>
-                                                <element name='recipient' label='Recipients'/>
-                                                <element name='recipient' label='Recipients2'/>
-                                            </schema>`);
-                    newSchema(xml);    
-                }).toThrow("Failed to add element 'recipient' to ArrayMap. There's already an item with the same name");
+                var xml = DomUtil.parse(`<schema namespace='nms' name='recipient'>
+                                            <element name='recipient' label='Recipients'/>
+                                            <element name='recipient' label='Recipients2'/>
+                                        </schema>`);
+                var schema = newSchema(xml);
+                var root = schema.root;
+                expect(root).toBeTruthy();
+                expect(root.name).toBe("recipient");
+                expect(root.label).toBe("Recipients2");
+            });
+
+            it("Duplicate enumeration value", () => {
+                const xml = DomUtil.parse(`<schema namespace='nms' name='recipient'>
+                                            <enumeration basetype="string" name="AKA">
+                                                <value name="PC" value="1"/>
+                                                <value name="CL2" value="2"/>
+                                                <value name="CL3" value="3"/>
+                                                <value name="Null" value="4"/>
+                                                <value name="Null" value="NULL"/>
+                                            </enumeration>
+                                            <element name='recipient' label='Recipients'/>
+                                        </schema>`);
+                const schema = newSchema(xml);
+                const enumerations = schema.enumerations;
+                const enumeration = enumerations.AKA.values;
+                expect(enumeration.length).toBe(4);
+                expect(enumeration[0].name).toBe("PC");
+                expect(enumeration[1].name).toBe("CL2");
+                expect(enumeration[2].name).toBe("CL3");
+                expect(enumeration[3].name).toBe("Null");
+                expect(enumeration[3].value).toBe("NULL");
             });
 
             it("Should find root node", () => {

package/test/util.test.js

@@ -371,10 +371,26 @@ describe('Util', function() {
             expect(cat).toBe("012");
         });
 
-        it("Should not support adding the same key twice", () => {
+        it("Should support adding the same key twice. The last value overwrites", () => {
             const am = new ArrayMap();
             am._push("hello", "Hello");
-            expect(() => { am._push("hello", "World"); }).toThrow("Failed to add element 'hello' to ArrayMap. There's already an item with the same name");
+            expect(am.length).toBe(1);
+            am._push("hello", "World");
+            expect(am.length).toBe(1);
+            expect(am.get(0)).toBe("World");
+        });
+
+        it("Should support adding the same key twice. The last value overwrites in the middle of the array", () => {
+            const am = new ArrayMap();
+            am._push("hello", "Hello");
+            am._push("cruel", "Cruel");
+            am._push("world", "World");
+            expect(am.length).toBe(3);
+            am._push("cruel", "*cruel*");
+            expect(am.length).toBe(3);
+            expect(am.get(0)).toBe("Hello");
+            expect(am.get(1)).toBe("*cruel*");
+            expect(am.get(2)).toBe("World");
         });
 
         it("Should support missing names", () => {