@loaders.gl/core - npm Package Compare versions

Comparing version 0.4.3 to 0.4.5

dist/es5/common/file-utils/loader.js

@@ -7,62 +7,26 @@ "use strict";
 exports.loadFile = loadFile;
-exports.loadBinary = loadBinary;
 
-var _d3Request = require("d3-request");
-
+/* global fetch */
 function loadFile(url, loader) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  // TODO: support progress and abort
+  var dataType;
+  var parser;
 
   if (loader.parseBinary) {
-    return loadBinary(url).then(function (data) {
-      return loader.parseBinary(data, options);
-    });
+    dataType = 'arrayBuffer';
+    parser = loader.parseBinary;
+  } else if (loader.parseText) {
+    dataType = 'text';
+    parser = loader.parseText;
+  } else {
+    return Promise.reject(new Error("Could not load ".concat(url, " using ").concat(loader.name, " loader")));
   }
 
-  if (loader.parseText) {
-    return (0, _d3Request.request)(url).then(function (text) {
-      return loader.parseText(text, options);
-    });
-  }
-
-  return Promise.reject(new Error("Could not load ".concat(url, " using ").concat(loader.name, " loader")));
+  return fetch(url, options).then(function (res) {
+    return res[dataType]();
+  }).then(function (data) {
+    return parser(data, options);
+  });
 }
-/**
- * loads binary data
- * @param {string} url
- * @return {Promise} promise that resolves to the binary data
- */
-
-/* global XMLHttpRequest */
-
-
-function loadBinary(url) {
-  var request = null;
-  var promise = new Promise(function (resolve, reject) {
-    request = new XMLHttpRequest();
-
-    try {
-      request.open('GET', url, true);
-      request.responseType = 'arraybuffer';
-
-      request.onload = function () {
-        if (request.status === 200) {
-          resolve(request.response);
-        }
-
-        reject(new Error('Could not get binary data'));
-      };
-
-      request.onerror = function (error) {
-        return reject(error);
-      };
-
-      request.send();
-    } catch (error) {
-      reject(error);
-    }
-  }); // Make abort() available
-
-  promise.abort = request.abort.bind(request);
-  return promise;
-}
 //# sourceMappingURL=loader.js.map

dist/es5/common/file-utils/smart-fetch.js

@@ -9,6 +9,2 @@ "use strict";
 
-var _path = _interopRequireDefault(require("path"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function smartFetch(url, loaders, options) {
@@ -32,8 +28,9 @@ /* global fetch */
   return loader.parseText(text, options);
-} // Search the loaders array argument for a loader that matches extension or text
+}
 
+var EXT_PATTERN = /[^\.]+$/; // Search the loaders array argument for a loader that matches extension or text
 
 function getLoader(url, text, loaders) {
   // Get extension without
-  var extension = _path.default.extname(url) || url;
+  var extension = url.match(EXT_PATTERN) || url;
 
@@ -40,0 +37,0 @@ if (extension.length && extension[0] === '.') {

dist/es5/index.js

@@ -144,20 +144,2 @@ "use strict";
 });
-Object.defineProperty(exports, "JSONLoader", {
-  enumerable: true,
-  get: function get() {
-    return _jsonLoader.default;
-  }
-});
-Object.defineProperty(exports, "CSVLoader", {
-  enumerable: true,
-  get: function get() {
-    return _csvLoader.default;
-  }
-});
-Object.defineProperty(exports, "XMLLoader", {
-  enumerable: true,
-  get: function get() {
-    return _xmlLoader.default;
-  }
-});
 
@@ -192,9 +174,3 @@ var _loader = require("./common/file-utils/loader");
 
-var _jsonLoader = _interopRequireDefault(require("./formats/json-loader/json-loader"));
-
-var _csvLoader = _interopRequireDefault(require("./formats/csv-loader/csv-loader"));
-
-var _xmlLoader = _interopRequireDefault(require("./formats/xml-loader/xml-loader"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 //# sourceMappingURL=index.js.map

dist/es6/common/file-utils/loader.js

@@ -1,49 +0,19 @@
-import { request as d3request } from 'd3-request';
+/* global fetch */
 export function loadFile(url, loader, options = {}) {
+  // TODO: support progress and abort
+  let dataType;
+  let parser;
+
   if (loader.parseBinary) {
-    return loadBinary(url).then(data => loader.parseBinary(data, options));
+    dataType = 'arrayBuffer';
+    parser = loader.parseBinary;
+  } else if (loader.parseText) {
+    dataType = 'text';
+    parser = loader.parseText;
+  } else {
+    return Promise.reject(new Error(`Could not load ${url} using ${loader.name} loader`));
   }
 
-  if (loader.parseText) {
-    return d3request(url).then(text => loader.parseText(text, options));
-  }
-
-  return Promise.reject(new Error(`Could not load ${url} using ${loader.name} loader`));
+  return fetch(url, options).then(res => res[dataType]()).then(data => parser(data, options));
 }
-/**
- * loads binary data
- * @param {string} url
- * @return {Promise} promise that resolves to the binary data
- */
-
-/* global XMLHttpRequest */
-
-export function loadBinary(url) {
-  let request = null;
-  const promise = new Promise((resolve, reject) => {
-    request = new XMLHttpRequest();
-
-    try {
-      request.open('GET', url, true);
-      request.responseType = 'arraybuffer';
-
-      request.onload = () => {
-        if (request.status === 200) {
-          resolve(request.response);
-        }
-
-        reject(new Error('Could not get binary data'));
-      };
-
-      request.onerror = error => reject(error);
-
-      request.send();
-    } catch (error) {
-      reject(error);
-    }
-  }); // Make abort() available
-
-  promise.abort = request.abort.bind(request);
-  return promise;
-}
 //# sourceMappingURL=loader.js.map

dist/es6/common/file-utils/smart-fetch.js

@@ -1,2 +0,1 @@
-import path from 'path';
 export function smartFetch(url, loaders, options) {
@@ -15,7 +14,8 @@ /* global fetch */
   return loader.parseText(text, options);
-} // Search the loaders array argument for a loader that matches extension or text
+}
+const EXT_PATTERN = /[^\.]+$/; // Search the loaders array argument for a loader that matches extension or text
 
 function getLoader(url, text, loaders) {
   // Get extension without
-  let extension = path.extname(url) || url;
+  let extension = url.match(EXT_PATTERN) || url;
 
@@ -22,0 +22,0 @@ if (extension.length && extension[0] === '.') {

dist/es6/index.js

@@ -17,7 +17,3 @@ // LOADING FUNCTIONS
 export { getGLTFAccessors, getGLTFIndices, getGLTFAttributeMap } from './common/mesh-utils/gltf-attribute-utils';
-export { getMeshSize as _getMeshSize } from './common/mesh-utils/mesh-utils'; // GENERAL FORMAT LOADERS
-
-export { default as JSONLoader } from './formats/json-loader/json-loader';
-export { default as CSVLoader } from './formats/csv-loader/csv-loader';
-export { default as XMLLoader } from './formats/xml-loader/xml-loader';
+export { getMeshSize as _getMeshSize } from './common/mesh-utils/mesh-utils';
 //# sourceMappingURL=index.js.map

dist/esm/common/file-utils/loader.js

@@ -1,57 +0,24 @@
-import { request as d3request } from 'd3-request';
+/* global fetch */
 export function loadFile(url, loader) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  // TODO: support progress and abort
+  var dataType;
+  var parser;
 
   if (loader.parseBinary) {
-    return loadBinary(url).then(function (data) {
-      return loader.parseBinary(data, options);
-    });
+    dataType = 'arrayBuffer';
+    parser = loader.parseBinary;
+  } else if (loader.parseText) {
+    dataType = 'text';
+    parser = loader.parseText;
+  } else {
+    return Promise.reject(new Error("Could not load ".concat(url, " using ").concat(loader.name, " loader")));
   }
 
-  if (loader.parseText) {
-    return d3request(url).then(function (text) {
-      return loader.parseText(text, options);
-    });
-  }
-
-  return Promise.reject(new Error("Could not load ".concat(url, " using ").concat(loader.name, " loader")));
+  return fetch(url, options).then(function (res) {
+    return res[dataType]();
+  }).then(function (data) {
+    return parser(data, options);
+  });
 }
-/**
- * loads binary data
- * @param {string} url
- * @return {Promise} promise that resolves to the binary data
- */
-
-/* global XMLHttpRequest */
-
-export function loadBinary(url) {
-  var request = null;
-  var promise = new Promise(function (resolve, reject) {
-    request = new XMLHttpRequest();
-
-    try {
-      request.open('GET', url, true);
-      request.responseType = 'arraybuffer';
-
-      request.onload = function () {
-        if (request.status === 200) {
-          resolve(request.response);
-        }
-
-        reject(new Error('Could not get binary data'));
-      };
-
-      request.onerror = function (error) {
-        return reject(error);
-      };
-
-      request.send();
-    } catch (error) {
-      reject(error);
-    }
-  }); // Make abort() available
-
-  promise.abort = request.abort.bind(request);
-  return promise;
-}
 //# sourceMappingURL=loader.js.map

dist/esm/common/file-utils/smart-fetch.js

@@ -1,2 +0,1 @@
-import path from 'path';
 export function smartFetch(url, loaders, options) {
@@ -19,7 +18,8 @@ /* global fetch */
   return loader.parseText(text, options);
-} // Search the loaders array argument for a loader that matches extension or text
+}
+var EXT_PATTERN = /[^\.]+$/; // Search the loaders array argument for a loader that matches extension or text
 
 function getLoader(url, text, loaders) {
   // Get extension without
-  var extension = path.extname(url) || url;
+  var extension = url.match(EXT_PATTERN) || url;
 
@@ -26,0 +26,0 @@ if (extension.length && extension[0] === '.') {

dist/esm/index.js

@@ -17,7 +17,3 @@ // LOADING FUNCTIONS
 export { getGLTFAccessors, getGLTFIndices, getGLTFAttributeMap } from './common/mesh-utils/gltf-attribute-utils';
-export { getMeshSize as _getMeshSize } from './common/mesh-utils/mesh-utils'; // GENERAL FORMAT LOADERS
-
-export { default as JSONLoader } from './formats/json-loader/json-loader';
-export { default as CSVLoader } from './formats/csv-loader/csv-loader';
-export { default as XMLLoader } from './formats/xml-loader/xml-loader';
+export { getMeshSize as _getMeshSize } from './common/mesh-utils/mesh-utils';
 //# sourceMappingURL=index.js.map

package.json

 {
   "name": "@loaders.gl/core",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Framework-independent loaders for 3D graphics formats",
@@ -37,9 +37,7 @@ "license": "MIT",
   "browser": {
-    "fs": false,
     "text-encoding": false
   },
   "dependencies": {
-    "d3-request": "^1.0.6",
     "text-encoding": "^0.6.4"
   }
 }

src/common/file-utils/loader.js

@@ -1,43 +0,18 @@
-import {request as d3request} from 'd3-request';
+/* global fetch */
+export function loadFile(url, loader, options = {}) {
+  // TODO: support progress and abort
+  let dataType;
+  let parser;
 
-export function loadFile(url, loader, options = {}) {
   if (loader.parseBinary) {
-    return loadBinary(url).then(data => loader.parseBinary(data, options));
+    dataType = 'arrayBuffer';
+    parser = loader.parseBinary;
+  } else if (loader.parseText) {
+    dataType = 'text';
+    parser = loader.parseText;
+  } else {
+    return Promise.reject(new Error(`Could not load ${url} using ${loader.name} loader`));
   }
-  if (loader.parseText) {
-    return d3request(url).then(text => loader.parseText(text, options));
-  }
-  return Promise.reject(new Error(`Could not load ${url} using ${loader.name} loader`));
-}
 
-/**
- * loads binary data
- * @param {string} url
- * @return {Promise} promise that resolves to the binary data
- */
-/* global XMLHttpRequest */
-export function loadBinary(url) {
-  let request = null;
-  const promise = new Promise((resolve, reject) => {
-    request = new XMLHttpRequest();
-    try {
-      request.open('GET', url, true);
-      request.responseType = 'arraybuffer';
-
-      request.onload = () => {
-        if (request.status === 200) {
-          resolve(request.response);
-        }
-        reject(new Error('Could not get binary data'));
-      };
-      request.onerror = error => reject(error);
-
-      request.send();
-    } catch (error) {
-      reject(error);
-    }
-  });
-  // Make abort() available
-  promise.abort = request.abort.bind(request);
-  return promise;
+  return fetch(url, options).then(res => res[dataType]()).then(data => parser(data, options));
 }

src/common/file-utils/smart-fetch.js

@@ -1,3 +0,1 @@
-import path from 'path';
-
 export function smartFetch(url, loaders, options) {
@@ -20,6 +18,8 @@ /* global fetch */
 
+const EXT_PATTERN = /[^\.]+$/;
+
 // Search the loaders array argument for a loader that matches extension or text
 function getLoader(url, text, loaders) {
   // Get extension without
-  let extension = path.extname(url) || url;
+  let extension = url.match(EXT_PATTERN) || url;
   if (extension.length && extension[0] === '.') {
@@ -26,0 +26,0 @@ extension = extension.substr(1).toLowerCase();

src/index.js

@@ -50,6 +50,1 @@ // LOADING FUNCTIONS
 export {getMeshSize as _getMeshSize} from './common/mesh-utils/mesh-utils';
-
-// GENERAL FORMAT LOADERS
-export {default as JSONLoader} from './formats/json-loader/json-loader';
-export {default as CSVLoader} from './formats/csv-loader/csv-loader';
-export {default as XMLLoader} from './formats/xml-loader/xml-loader';

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Dependency count

1

decreased by-50%

Worsened metrics

Total package byte prevSize

260119

decreased by-12.29%

Number of package files

114

decreased by-19.72%

Lines of code

3082

decreased by-12.69%

Number of medium supply chain risk alerts

8

increased by100%

Dependency changes

• - Removedd3-request@^1.0.6

• - Removedcommander@2.20.3(transitive)

• - Removedd3-collection@1.0.7(transitive)

• - Removedd3-dispatch@1.0.6(transitive)

• - Removedd3-dsv@1.2.0(transitive)

• - Removedd3-request@1.0.6(transitive)

• - Removediconv-lite@0.4.24(transitive)

• - Removedrw@1.3.3(transitive)

• - Removedsafer-buffer@2.1.2(transitive)

• - Removedxmlhttprequest@1.8.0(transitive)