fix(jio): support requirejs

.gitignore

@@ -7,4 +7,3 @@
 
 node_modules/*
 lint
-package-lock.json

.npmignore

 *
 !dist/jio-latest-node.js
+!dist/jio-latest.js
 !README.md
 !COPYING
 !package.json

Makefile

@@ -151,7 +151,8 @@ ${JIOVERSION}: ${EXTERNALDIR}/URI.js \
 	${SRCDIR}/jio.storage/indexeddbstorage.js \
 	${SRCDIR}/jio.storage/cryptstorage.js \
 	${SRCDIR}/jio.storage/fbstorage.js \
-	${SRCDIR}/jio.storage/cloudooostorage.js
+	${SRCDIR}/jio.storage/cloudooostorage.js \
+	${SRCDIR}/jio.storage/mappingstorage.js
 	@mkdir -p $(@D)
 	cat $^ > $@
 
@@ -163,13 +164,7 @@ ${JIONODELATEST}: ${JIONODEVERSION}
 	cp $< $@
 
 ${JIONODEVERSION}: ${SRCDIR}/node/jio-start.js \
-	${EXTERNALDIR}/rsvp-2.0.4.js \
-	${EXTERNALDIR}/moment.js \
-	${EXTERNALDIR}/URI.js \
-	${EXTERNALDIR}/uritemplate.js \
-	${EXTERNALDIR}/rusha.js \
 	${SRCDIR}/node/jio-external.js \
-	${EXTERNALDIR}/xhr2.js \
 	${SRCDIR}/queries/parser-begin.js \
 	${SRCDIR}/queries/build/parser.js \
 	${SRCDIR}/queries/parser-end.js \
@@ -190,6 +185,7 @@ ${JIONODEVERSION}: ${SRCDIR}/node/jio-start.js \
 	${SRCDIR}/jio.storage/drivetojiomapping.js \
 	${SRCDIR}/jio.storage/documentstorage.js \
 	${SRCDIR}/jio.storage/fbstorage.js \
+	${SRCDIR}/jio.storage/mappingstorage.js \
 	${SRCDIR}/node/jio-end.js
 	@mkdir -p $(@D)
 	cat $^ > $@

package-lock.json

+{
+  "name": "jio",
+  "version": "v3.37.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "requires": {
+        "delayed-stream": "~1.0.0"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "requires": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "^2.1.12"
+      }
+    },
+    "mime-db": {
+      "version": "1.35.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.35.0.tgz",
+      "integrity": "sha512-JWT/IcCTsB0Io3AhWUMjRqucrHSPsSf2xKLaRldJVULioggvkJvggZ3VXNNSRkCddE6D+BUI4HEIZIA2OjwIvg=="
+    },
+    "mime-types": {
+      "version": "2.1.19",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
+      "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
+      "requires": {
+        "mime-db": "~1.35.0"
+      }
+    },
+    "moment": {
+      "version": "2.21.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz",
+      "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ=="
+    },
+    "rsvp": {
+      "version": "git+https://lab.nexedi.com/nexedi/rsvp.js.git#cde40f5c0eab3167964423cc6030fac080ea46c4",
+      "from": "git+https://lab.nexedi.com/nexedi/rsvp.js.git"
+    },
+    "rusha": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/rusha/-/rusha-0.8.2.tgz",
+      "integrity": "sha1-BfMZbfN7FmvAgNsbvWnITWT6HB8="
+    },
+    "urijs": {
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/urijs/-/urijs-1.19.1.tgz",
+      "integrity": "sha512-xVrGVi94ueCJNrBSTjWqjvtgvl3cyOTThp2zaMaFNGp3F542TR6sM3f2o8RqZl+AwteClSVmoCyt0ka4RjQOQg=="
+    },
+    "uritemplate": {
+      "version": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git#69c0af3da5299ac216a0d437fac6dd621ccf9af8",
+      "from": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git"
+    },
+    "xhr2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/xhr2/-/xhr2-0.1.4.tgz",
+      "integrity": "sha1-f4dliEdxbbUCYyOBL4GMras4el8="
+    }
+  }
+}

package.json

@@ -20,6 +20,14 @@
     "output",
     "cloud"
   ],
+  "dependencies": {
+    "moment": "^2.21.0",
+    "rsvp": "git+https://lab.nexedi.com/nexedi/rsvp.js.git",
+    "rusha": "0.8.2",
+    "urijs": "^1.19.1",
+    "uritemplate": "git+https://lab.nexedi.com/nexedi/uritemplate-js.git",
+    "xhr2": "^0.1.4"
+  },
   "engines": {
     "npm": ">=1.3"
   }

src/node/jio-compat.js

@@ -128,7 +128,7 @@
     });
   };
 
-  window.Blob = Blob;//window.Blob || Blob;
+  window.Blob = window.Blob || Blob;
 
   function FileReader() {
     EventTarget.call(this);

src/node/jio-end.js

-
-  module = node_module;
-
   jIO.node_env = window;
-  module.exports = jIO;
-
-} ({}));
\ No newline at end of file
+  module.exports = window;
+}({}));

src/node/jio-external.js

-  var RSVP = window.RSVP,
-    moment = global.moment,
-    UriTemplate = window.UriTemplate,
-    Rusha = window.Rusha;
+  var RSVP = require('rsvp'),
+    moment = require('moment'),
+    Rusha = require('rusha'),
+    XMLHttpRequest = require('xhr2'),
+    URI = require('urijs'),
+    UriTemplate = require('uritemplate'),
+    process = require('process');
 
-  // Allow xhr2 to export XMLHttpRequest
-  module = {};
+  window.RSVP = window.RSVP || RSVP;
+  window.moment = moment;
+  window.XMLHttpRequest = window.XMLHttpRequest || XMLHttpRequest;

src/node/jio-start.js

-(function (define, exports) {
-  var navigator = null,
-    window = {},
-    node_module = module;
-
-  module = undefined;
+(function (window) {
+  var navigator = {};