Merge pull request #36 from zumba/ci-work

Updated dev dependencies and updated node list

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [14.x, 16.x, 18.x]
         # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
 
     steps:
@@ -27,3 +27,4 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm test
+      timeout-minutes: 5

.github/workflows/npm-publish.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 14.x, 15.x]
+        node-version: [14.x, 16.x, 18.x]
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js ${{ matrix.node-version }}
@@ -29,7 +29,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm publish
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://npm.pkg.github.com/
       - run: npm ci
       - run: npm publish

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "swiveljs",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Strategy driven, segmented feature toggles",
   "main": "dist/swivel.js",
   "license": "MIT",

dist/swivel.js

@@ -1,49 +1,46 @@
 ;(function SwivelJS(undefined) {
     'use strict';
     /**
-     * SwivelJS v2.1.0 - 2018-05-29
+     * SwivelJS v2.1.1 - 2022-07-24
      * Strategy driven, segmented feature toggles
      *
-     * Copyright (c) 2018 Zumba®
+     * Copyright (c) 2022 Zumba®
      * Licensed MIT
      */
-    /* jshint freeze: false */
-    /* jshint maxcomplexity: 9 */
-
     // Production steps of ECMA-262, Edition 5, 15.4.4.21
     // Reference: http://es5.github.io/#x15.4.4.21
     if (!Array.prototype.reduce) {
-      Array.prototype.reduce = function(callback /*, initialValue*/) {
-        if (this === null || this === undefined) {
-          throw new TypeError('Array.prototype.reduce called on null or undefined');
-        }
-        if (typeof callback !== 'function') {
-          throw new TypeError(callback + ' is not a function');
-        }
-        var t = Object(this), len = t.length >>> 0, k = 0, value;
-        if (arguments.length === 2) {
-          value = arguments[1];
-        } else {
-          while (k < len && !(k in t)) {
-            k++;
+      Object.defineProperty(Array.prototype, 'reduce', {
+        value: function(callback /*, initialValue*/) {
+          /* jshint maxcomplexity: 10 */
+          if (this === null || this === undefined) {
+            throw new TypeError('Array.prototype.reduce called on null or undefined');
           }
-          if (k >= len) {
-            throw new TypeError('Reduce of empty array with no initial value');
+          if (typeof callback !== 'function') {
+            throw new TypeError(callback + ' is not a function');
           }
-          value = t[k++];
-        }
-        for (; k < len; k++) {
-          if (k in t) {
-            value = callback(value, t[k], k, t);
+          var t = Object(this), len = t.length >>> 0, k = 0, value;
+          if (arguments.length === 2) {
+            value = arguments[1];
+          } else {
+            while (k < len && !(k in t)) {
+              k++;
+            }
+            if (k >= len) {
+              throw new TypeError('Reduce of empty array with no initial value');
+            }
+            value = t[k++];
           }
+          for (; k < len; k++) {
+            if (k in t) {
+              value = callback(value, t[k], k, t);
+            }
+          }
+          return value;
         }
-        return value;
-      };
+      });
     }
 
-    /* jshint freeze: true */
-    /* jshint maxcomplexity: 6 */
-
     /**
      * Delimiter
      *
@@ -274,13 +271,16 @@
     };
 
     /**
-     * Used by reduceToBitmask
+     * Used by parse reducer
      *
      * @param Number mask
      * @param Number index
      * @return Number
      */
     var bitmaskIterator = function bitmaskIterator(mask, index) {
+        if (!index || parseInt(index, 10) === 0) {
+            return mask;
+        }
         return mask | 1 << --index;
     };
 
@@ -335,6 +335,25 @@
         return data;
     };
 
+    /**
+     * Return the existent fields in base that are missing in compared
+     *
+     * @param Object base
+     * @param Object compared
+     * @returns Object
+     */
+    var diffMissing = function(base, compared) {
+        var data = {};
+        var key;
+
+        for (key in base) {
+          if (base.hasOwnProperty(key) && compared[key] === undefined) {
+            data[key] = base[key];
+          }
+        }
+        return data;
+    };
+
     /**
      * Merge this map with another map and return a new one.
      *
@@ -361,7 +380,7 @@
     FeatureMapPrototype.diff = function diff(featureMap) {
         var base = this.map;
         var compared = featureMap.map;
-        var data = {};
+        var data = Object.assign(diffMissing(compared, base), diffMissing(base, compared));
         var key;
 
         for (key in compared) {
@@ -370,12 +389,6 @@
             }
         }
 
-        for (key in base) {
-            if (base.hasOwnProperty(key) && compared[key] === undefined) {
-                data[key] = base[key];
-            }
-        }
-
         return new FeatureMap(data);
     };
 
@@ -401,7 +414,7 @@
             key += key ? DELIMITER + child : child;
 
             var isMissing = !this.slugExists(key);
-            var isDisabled = isMissing || !(map[key] & index);
+            var isDisabled = isMissing || !(parseInt(map[key], 10) & index);
 
             if (isMissing || isDisabled) {
                 return false;
@@ -575,6 +588,7 @@
     };
 
     (function exportSwivel(root) {
+        /* jshint maxcomplexity: false */
 
         /**
          * Free variable exports