@loaders.gl/core
Advanced tools
Comparing version 4.0.0-alpha.19 to 4.0.0-alpha.20
@@ -8,3 +8,3 @@ "use strict"; | ||
var _log = require("./utils/log"); | ||
var version = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : ''; | ||
var version = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : ''; | ||
if (!globalThis.loaders) { | ||
@@ -11,0 +11,0 @@ _log.log.log(1, "loaders.gl ".concat(version))(); |
@@ -12,9 +12,9 @@ "use strict"; | ||
var globalOptions = (0, _optionUtils.getGlobalLoaderOptions)(); | ||
var fetchOptions = options || globalOptions; | ||
if (typeof fetchOptions.fetch === 'function') { | ||
return fetchOptions.fetch; | ||
var loaderOptions = options || globalOptions; | ||
if (typeof loaderOptions.fetch === 'function') { | ||
return loaderOptions.fetch; | ||
} | ||
if ((0, _isType.isObject)(fetchOptions.fetch)) { | ||
if ((0, _isType.isObject)(loaderOptions.fetch)) { | ||
return function (url) { | ||
return (0, _fetchFile.fetchFile)(url, fetchOptions); | ||
return (0, _fetchFile.fetchFile)(url, loaderOptions.fetch); | ||
}; | ||
@@ -21,0 +21,0 @@ } |
@@ -14,3 +14,3 @@ "use strict"; | ||
function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function _return(value) { var ret = this.s.return; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, throw: function _throw(value) { var thr = this.s.return; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); } | ||
var VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : 'latest'; | ||
var VERSION = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : 'latest'; | ||
var NullWorkerLoader = { | ||
@@ -17,0 +17,0 @@ name: 'Null loader', |
import { log } from './utils/log'; | ||
const version = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : ''; | ||
const version = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : ''; | ||
if (!globalThis.loaders) { | ||
@@ -4,0 +4,0 @@ log.log(1, "loaders.gl ".concat(version))(); |
@@ -6,8 +6,8 @@ import { isObject } from '../../javascript-utils/is-type'; | ||
const globalOptions = getGlobalLoaderOptions(); | ||
const fetchOptions = options || globalOptions; | ||
if (typeof fetchOptions.fetch === 'function') { | ||
return fetchOptions.fetch; | ||
const loaderOptions = options || globalOptions; | ||
if (typeof loaderOptions.fetch === 'function') { | ||
return loaderOptions.fetch; | ||
} | ||
if (isObject(fetchOptions.fetch)) { | ||
return url => fetchFile(url, fetchOptions); | ||
if (isObject(loaderOptions.fetch)) { | ||
return url => fetchFile(url, loaderOptions.fetch); | ||
} | ||
@@ -14,0 +14,0 @@ if (context !== null && context !== void 0 && context.fetch) { |
@@ -1,2 +0,2 @@ | ||
const VERSION = typeof "4.0.0-alpha.19" !== 'undefined' ? "4.0.0-alpha.19" : 'latest'; | ||
const VERSION = typeof "4.0.0-alpha.20" !== 'undefined' ? "4.0.0-alpha.20" : 'latest'; | ||
export const NullWorkerLoader = { | ||
@@ -3,0 +3,0 @@ name: 'Null loader', |
@@ -15,10 +15,10 @@ "use strict"; | ||
const globalOptions = (0, option_utils_1.getGlobalLoaderOptions)(); | ||
const fetchOptions = options || globalOptions; | ||
const loaderOptions = options || globalOptions; | ||
// options.fetch can be a function | ||
if (typeof fetchOptions.fetch === 'function') { | ||
return fetchOptions.fetch; | ||
if (typeof loaderOptions.fetch === 'function') { | ||
return loaderOptions.fetch; | ||
} | ||
// options.fetch can be an options object | ||
if ((0, is_type_1.isObject)(fetchOptions.fetch)) { | ||
return (url) => (0, fetch_file_1.fetchFile)(url, fetchOptions); | ||
if ((0, is_type_1.isObject)(loaderOptions.fetch)) { | ||
return (url) => (0, fetch_file_1.fetchFile)(url, loaderOptions.fetch); | ||
} | ||
@@ -25,0 +25,0 @@ // else refer to context (from parent loader) if available |
@@ -204,3 +204,3 @@ var __defProp = Object.defineProperty; | ||
// src/null-loader.ts | ||
var VERSION = true ? "4.0.0-alpha.19" : "latest"; | ||
var VERSION = true ? "4.0.0-alpha.20" : "latest"; | ||
function parseSync(arrayBuffer, options, context) { | ||
@@ -207,0 +207,0 @@ if (!options.null.echoParameters) |
@@ -187,3 +187,3 @@ (() => { | ||
// src/null-loader.ts | ||
var VERSION = true ? "4.0.0-alpha.19" : "latest"; | ||
var VERSION = true ? "4.0.0-alpha.20" : "latest"; | ||
function parseSync(arrayBuffer, options, context) { | ||
@@ -190,0 +190,0 @@ if (!options.null.echoParameters) |
{ | ||
"name": "@loaders.gl/core", | ||
"version": "4.0.0-alpha.19", | ||
"version": "4.0.0-alpha.20", | ||
"description": "The core API for working with loaders.gl loaders and writers", | ||
@@ -50,7 +50,7 @@ "license": "MIT", | ||
"@babel/runtime": "^7.3.1", | ||
"@loaders.gl/loader-utils": "4.0.0-alpha.19", | ||
"@loaders.gl/worker-utils": "4.0.0-alpha.19", | ||
"@loaders.gl/loader-utils": "4.0.0-alpha.20", | ||
"@loaders.gl/worker-utils": "4.0.0-alpha.20", | ||
"@probe.gl/log": "^4.0.2" | ||
}, | ||
"gitHead": "2ca50ec4e1d312c124eb7c93c60ab6fd17ee833e" | ||
"gitHead": "ac122e83102657c38207d59c631a5ce4e7aa46bd" | ||
} |
@@ -19,12 +19,12 @@ // loaders.gl, MIT license | ||
const fetchOptions = options || globalOptions; | ||
const loaderOptions = options || globalOptions; | ||
// options.fetch can be a function | ||
if (typeof fetchOptions.fetch === 'function') { | ||
return fetchOptions.fetch; | ||
if (typeof loaderOptions.fetch === 'function') { | ||
return loaderOptions.fetch; | ||
} | ||
// options.fetch can be an options object | ||
if (isObject(fetchOptions.fetch)) { | ||
return (url) => fetchFile(url, fetchOptions as RequestInit); | ||
if (isObject(loaderOptions.fetch)) { | ||
return (url) => fetchFile(url, loaderOptions.fetch as RequestInit); | ||
} | ||
@@ -31,0 +31,0 @@ |
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
1114917
+ Added@loaders.gl/loader-utils@4.0.0-alpha.20(transitive)
+ Added@loaders.gl/worker-utils@4.0.0-alpha.20(transitive)
- Removed@loaders.gl/loader-utils@4.0.0-alpha.19(transitive)
- Removed@loaders.gl/worker-utils@4.0.0-alpha.19(transitive)