Refactoring out most common dependencies

Author: Andrea Giammarchi

cjs/utils.js

@@ -1,4 +1,6 @@
 'use strict';
+const Map = (require('@ungap/essential-map'));
+
 const append = (get, parent, children, start, end, before) => {
   if ((end - start) < 2)
     parent.insertBefore(get(children[start], 1), before);
@@ -98,22 +100,6 @@ const INSERTION = 1;
 const SKIP = 0;
 const SKIP_OND = 50;
 
-/* istanbul ignore next */
-const Rel = typeof Map === 'undefined' ?
-  function () {
-    const k = [], v = [];
-    return {
-      has: key => -1 < k.indexOf(key),
-      get: key => v[k.indexOf(key)],
-      set: (key, value) => {
-        const i = k.indexOf(key);
-        v[i < 0 ? (k.push(key) - 1) : i] = value;
-      }
-    };
-  } :
-  Map
-;
-
 const HS = (
   futureNodes,
   futureStart,
@@ -135,7 +121,7 @@ const HS = (
   for (let i = 1; i < minLen; i++)
     tresh[i] = currentEnd;
 
-  const keymap = new Rel;
+  const keymap = new Map;
   for (let i = currentStart; i < currentEnd; i++)
     keymap.set(currentNodes[i], i);
 
@@ -282,7 +268,7 @@ const applyDiff = (
   currentLength,
   before
 ) => {
-  const live = new Rel;
+  const live = new Map;
   const length = diff.length;
   let currentIndex = currentStart;
   let i = 0;

esm/utils.js

@@ -1,3 +1,5 @@
+import Map from '@ungap/essential-map';
+
 export const append = (get, parent, children, start, end, before) => {
   if ((end - start) < 2)
     parent.insertBefore(get(children[start], 1), before);
@@ -90,22 +92,6 @@ const INSERTION = 1;
 const SKIP = 0;
 const SKIP_OND = 50;
 
-/* istanbul ignore next */
-const Rel = typeof Map === 'undefined' ?
-  function () {
-    const k = [], v = [];
-    return {
-      has: key => -1 < k.indexOf(key),
-      get: key => v[k.indexOf(key)],
-      set: (key, value) => {
-        const i = k.indexOf(key);
-        v[i < 0 ? (k.push(key) - 1) : i] = value;
-      }
-    };
-  } :
-  Map
-;
-
 const HS = (
   futureNodes,
   futureStart,
@@ -127,7 +113,7 @@ const HS = (
   for (let i = 1; i < minLen; i++)
     tresh[i] = currentEnd;
 
-  const keymap = new Rel;
+  const keymap = new Map;
   for (let i = currentStart; i < currentEnd; i++)
     keymap.set(currentNodes[i], i);
 
@@ -274,7 +260,7 @@ const applyDiff = (
   currentLength,
   before
 ) => {
-  const live = new Rel;
+  const live = new Map;
   const length = diff.length;
   let currentIndex = currentStart;
   let i = 0;

index.js

@@ -1,6 +1,43 @@
 var domdiff = (function () {
 'use strict';
 
+/*! (c) Andrea Giammarchi - ISC */
+var window = null || /* istanbul ignore next */{};
+try {
+  window.Map = Map;
+} catch (Map) {
+  window.Map = function Map() {
+    var i = 0;
+    var k = [];
+    var v = [];
+    return {
+      delete: function _delete(key) {
+        var had = contains(key);
+        if (had) {
+          k.splice(i, 1);
+          v.splice(i, 1);
+        }
+        return had;
+      },
+      get: function get(key) {
+        return contains(key) ? v[i] : void 0;
+      },
+      has: function has(key) {
+        return contains(key);
+      },
+      set: function set(key, value) {
+        v[contains(key) ? i : k.push(key) - 1] = value;
+        return this;
+      }
+    };
+    function contains(v) {
+      i = k.indexOf(v);
+      return -1 < i;
+    }
+  };
+}
+var Map$1 = window.Map;
+
 var append = function append(get, parent, children, start, end, before) {
   if (end - start < 2) parent.insertBefore(get(children[start], 1), before);else {
     var fragment = parent.ownerDocument.createDocumentFragment();
@@ -65,24 +102,6 @@ var INSERTION = 1;
 var SKIP = 0;
 var SKIP_OND = 50;
 
-/* istanbul ignore next */
-var Rel = typeof Map === 'undefined' ? function () {
-  var k = [],
-      v = [];
-  return {
-    has: function has(key) {
-      return -1 < k.indexOf(key);
-    },
-    get: function get(key) {
-      return v[k.indexOf(key)];
-    },
-    set: function set(key, value) {
-      var i = k.indexOf(key);
-      v[i < 0 ? k.push(key) - 1 : i] = value;
-    }
-  };
-} : Map;
-
 var HS = function HS(futureNodes, futureStart, futureEnd, futureChanges, currentNodes, currentStart, currentEnd, currentChanges) {
 
   var k = 0;
@@ -94,7 +113,7 @@ var HS = function HS(futureNodes, futureStart, futureEnd, futureChanges, current
 
   for (var i = 1; i < minLen; i++) {
     tresh[i] = currentEnd;
-  }var keymap = new Rel();
+  }var keymap = new Map$1();
   for (var _i = currentStart; _i < currentEnd; _i++) {
     keymap.set(currentNodes[_i], _i);
   }for (var _i2 = futureStart; _i2 < futureEnd; _i2++) {
@@ -215,7 +234,7 @@ var OND = function OND(futureNodes, futureStart, rows, currentNodes, currentStar
 };
 
 var applyDiff = function applyDiff(diff, get, parentNode, futureNodes, futureStart, currentNodes, currentStart, currentLength, before) {
-  var live = new Rel();
+  var live = new Map$1();
   var length = diff.length;
   var currentIndex = currentStart;
   var i = 0;

min.js

@@ -9,7 +9,7 @@
     "build": "npm run cjs && npm run bundle && npm run min && npm run test && npm run size",
     "bundle": "rollup --config rollup.config.js && npm run cleanup",
     "cleanup": "echo \"$(cat index.js | sed 's/return exports;/return domdiff;/' | sed -e 's/exports.*;//g' | sed 's/exports//' | sed 's/}({}));/}());/')\" > index.js",
-    "cjs": "ascjs ./esm ./cjs",
+    "cjs": "ascjs ./esm ./cjs && sed -i.bck 's/(m => m.__esModule ? m.default : m)//' cjs/utils.js && rm cjs/utils.js.bck",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
     "min": "uglifyjs index.js --support-ie8 --comments=/^!/ -cmo min.js",
     "size": "echo \"gzip: $(cat min.js | gzip -c9 | wc -c)\" && echo \"brotli: $(cat min.js | brotli | wc -c)\" && echo ''",
@@ -41,13 +41,16 @@
     "istanbul": "^0.4.5",
     "rollup": "^0.52.0",
     "rollup-plugin-babel": "^3.0.7",
+    "rollup-plugin-node-resolve": "^3.4.0",
     "tressa": "^0.3.1",
     "uglify-js": "^2.8.29"
   },
   "directories": {
     "test": "test"
   },
-  "dependencies": {},
+  "dependencies": {
+    "@ungap/essential-map": "^0.1.5"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WebReflection/domdiff.git"

package-lock.json

@@ -1,12 +1,18 @@
 import babel from 'rollup-plugin-babel';
+import resolve from 'rollup-plugin-node-resolve';
 
 export default {
   input: 'esm/index.js',
   plugins: [
+    resolve({
+      module: true
+    }),
     babel({
       plugins: require('./babel-plugins.json')
     })
   ],
+  context: 'null',
+  moduleContext: 'null',
   output: {
     exports: 'named',
     file: 'index.js',