@d3plus/data 3.0.12 → 3.0.13

package/es/src/addToQueue.js

@@ -14,17 +14,17 @@ import load from "./load.js";
   @param {Function} [data] An optional data formatter/callback
   @param {String} data The internal Viz method to be modified
 */ export default function(_, f, key) {
-    if (!_instanceof(_, Array)) _ = [
+    var paths = _instanceof(_, Array) ? _ : [
         _
     ];
-    var needToLoad = _.find(isData);
+    var needToLoad = paths.find(isData);
     if (needToLoad) {
         var prev = this._queue.find(function(q) {
             return q[3] === key;
         });
         var d = [
             load.bind(this),
-            _,
+            paths,
             f,
             key
         ];

package/es/src/isData.js

@@ -7,5 +7,5 @@
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
 export default function(dataItem) {
-    return typeof dataItem === "string" || (typeof dataItem === "undefined" ? "undefined" : _type_of(dataItem)) === "object" && dataItem.url && dataItem.headers;
+    return typeof dataItem === "string" || (typeof dataItem === "undefined" ? "undefined" : _type_of(dataItem)) === "object" && dataItem.url;
 };

package/es/src/load.js

@@ -9,7 +9,7 @@ function _type_of(obj) {
     "@swc/helpers - typeof";
     return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
 }
-import { csv, json, text, tsv } from "d3-request";
+import { csv, json, text, tsv } from "d3-fetch";
 import { isObject } from "@d3plus/dom";
 import fold from "./fold.js";
 import concat from "./concat.js";
@@ -23,22 +23,22 @@ import isData from "./isData.js";
   @param {Function} [callback] A function that is called when the final data is loaded. It is passed 2 variables, any error present and the data loaded.
 */ export default function(path, formatter, key, callback) {
     var _this = this;
-    var parser;
-    var getParser = function(path) {
+    var fetchData = function(path) {
+        var init = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {};
         var ext = path.slice(path.length - 4);
         switch(ext){
             case ".csv":
-                return csv;
+                return csv(path, init);
             case ".tsv":
-                return tsv;
+                return tsv(path, init);
             case ".txt":
-                return text;
+                return text(path, init);
             default:
-                return json;
+                return json(path, init);
         }
     };
-    var validateData = function(err, parser, data) {
-        if (parser !== json && !err && data && _instanceof(data, Array)) {
+    var validateData = function(data) {
+        if (data && _instanceof(data, Array)) {
             data.forEach(function(d) {
                 for(var k in d){
                     if (!isNaN(d[k])) d[k] = parseFloat(d[k]);
@@ -56,9 +56,6 @@ import isData from "./isData.js";
             return current ? prev + 1 : prev;
         }, 0);
     };
-    var getPathIndex = function(url, array) {
-        return array.indexOf(url);
-    };
     // If path param is a not an Array then convert path to a 1 element Array to re-use logic
     if (!_instanceof(path, Array)) path = [
         path
@@ -78,23 +75,18 @@ import isData from "./isData.js";
     // Load all urls an combine them with data arrays
     var alreadyLoaded = loadedLength(loaded);
     toLoad.forEach(function(dataItem) {
-        var headers = {}, url = dataItem;
-        if ((typeof dataItem === "undefined" ? "undefined" : _type_of(dataItem)) === "object") {
+        var url = dataItem, init = {};
+        if ((typeof dataItem === "undefined" ? "undefined" : _type_of(dataItem)) === "object" && dataItem.url) {
             url = dataItem.url;
-            headers = dataItem.headers;
-        }
-        parser = getParser(url);
-        var request = parser(url);
-        for(var _$key in headers){
-            if (({}).hasOwnProperty.call(headers, _$key)) {
-                request.header(_$key, headers[_$key]);
-            }
+            init = dataItem;
         }
-        request.get(function(err, data) {
-            data = err ? [] : data;
-            if (data && !_instanceof(data, Array) && data.data && data.headers) data = fold(data);
-            data = validateData(err, parser, data);
-            loaded[getPathIndex(url, path)] = data;
+        fetchData(url, init).then(function(data) {
+            if (!_instanceof(data, Array) && data.data && data.headers) data = fold(data);
+            data = validateData(data);
+            loaded[path.findIndex(function(d) {
+                return JSON.stringify(d) == JSON.stringify(dataItem);
+            })] = data;
+            // All urls loaded
             if (loadedLength(loaded) - alreadyLoaded === toLoad.length) {
                 // Format data
                 data = loadedLength(loaded) === 1 ? loaded[0] : loaded;
@@ -110,8 +102,11 @@ import isData from "./isData.js";
                     data = concat(loaded, "data");
                 }
                 if (key && "_".concat(key) in _this) _this["_".concat(key)] = data;
-                if (callback) callback(err, data);
+                if (callback) callback(undefined, data);
             }
+        }).catch(function(err) {
+            console.log(err);
+            if (callback) callback(err, undefined);
         });
     });
     // If there is no data to Load response is immediately

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@d3plus/data",
-  "version": "3.0.12",
+  "version": "3.0.13",
   "description": "JavaScript data loading, manipulation, and analysis functions.",
   "license": "MIT",
   "type": "module",
@@ -34,9 +34,9 @@
     "test": "eslint index.js src/**/*.js && eslint --global=it test && mocha 'test/**/*-test.js'"
   },
   "dependencies": {
-    "@d3plus/dom": "3.0.12",
+    "@d3plus/dom": "3.0.13",
     "d3-array": "^3.2.4",
     "d3-collection": "^1.0.7",
-    "d3-request": "^1.0.6"
+    "d3-fetch": "^3.0.1"
   }
 }