@loaders.gl/core 3.2.0-alpha.1 → 3.2.0-alpha.2

package/dist/lib/api/encode.js

@@ -2,13 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.encodeURLtoURL = exports.encodeInBatches = exports.encodeText = exports.encodeSync = exports.encode = void 0;
 const loader_utils_1 = require("@loaders.gl/loader-utils");
+const worker_utils_1 = require("@loaders.gl/worker-utils");
 const loader_utils_2 = require("@loaders.gl/loader-utils");
+const loader_utils_3 = require("@loaders.gl/loader-utils");
 const write_file_1 = require("../fetch/write-file");
 const fetch_file_1 = require("../fetch/fetch-file");
+const loader_options_1 = require("./loader-options");
 /**
  * Encode loaded data into a binary ArrayBuffer using the specified Writer.
  */
 async function encode(data, writer, options) {
+    const globalOptions = (0, loader_options_1.getLoaderOptions)();
+    options = { ...globalOptions, ...options };
+    if ((0, loader_utils_1.canEncodeWithWorker)(writer, options)) {
+        return await (0, worker_utils_1.processOnWorker)(writer, data, options);
+    }
     // TODO Merge default writer options with options argument like it is done in load module.
     if (writer.encode) {
         return await writer.encode(data, options);
@@ -29,9 +37,9 @@ async function encode(data, writer, options) {
             chunks.push(batch);
         }
         // @ts-ignore
-        return (0, loader_utils_1.concatenateArrayBuffers)(...chunks);
+        return (0, loader_utils_2.concatenateArrayBuffers)(...chunks);
     }
-    if (!loader_utils_2.isBrowser && writer.encodeURLtoURL) {
+    if (!loader_utils_3.isBrowser && writer.encodeURLtoURL) {
         // TODO - how to generate filenames with correct extensions?
         const tmpInputFilename = getTemporaryFilename('input');
         await (0, write_file_1.writeFile)(tmpInputFilename, data);
@@ -87,9 +95,9 @@ exports.encodeInBatches = encodeInBatches;
  * @note Node.js only. This function enables using command-line converters as "writers".
  */
 async function encodeURLtoURL(inputUrl, outputUrl, writer, options) {
-    inputUrl = (0, loader_utils_1.resolvePath)(inputUrl);
-    outputUrl = (0, loader_utils_1.resolvePath)(outputUrl);
-    if (loader_utils_2.isBrowser || !writer.encodeURLtoURL) {
+    inputUrl = (0, loader_utils_2.resolvePath)(inputUrl);
+    outputUrl = (0, loader_utils_2.resolvePath)(outputUrl);
+    if (loader_utils_3.isBrowser || !writer.encodeURLtoURL) {
         throw new Error();
     }
     const outputFilename = await writer.encodeURLtoURL(inputUrl, outputUrl, options);

package/dist/lib/api/loader-options.d.ts

@@ -0,0 +1,3 @@
+export { setGlobalOptions as setLoaderOptions } from '../loader-utils/option-utils';
+export { getGlobalLoaderOptions as getLoaderOptions } from '../loader-utils/option-utils';
+//# sourceMappingURL=loader-options.d.ts.map

package/dist/lib/api/loader-options.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loader-options.d.ts","sourceRoot":"","sources":["../../../src/lib/api/loader-options.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,IAAI,gBAAgB,EAAC,MAAM,8BAA8B,CAAC;AAClF,OAAO,EAAC,sBAAsB,IAAI,gBAAgB,EAAC,MAAM,8BAA8B,CAAC"}

package/dist/lib/api/loader-options.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getLoaderOptions = exports.setLoaderOptions = void 0;
+var option_utils_1 = require("../loader-utils/option-utils");
+Object.defineProperty(exports, "setLoaderOptions", { enumerable: true, get: function () { return option_utils_1.setGlobalOptions; } });
+var option_utils_2 = require("../loader-utils/option-utils");
+Object.defineProperty(exports, "getLoaderOptions", { enumerable: true, get: function () { return option_utils_2.getGlobalLoaderOptions; } });

package/dist/lib/loader-utils/option-utils.d.ts

@@ -13,6 +13,14 @@ declare type GlobalLoaderState = {
  * Wraps initialization of global variable in function to defeat overly aggressive tree-shakers
  */
 export declare function getGlobalLoaderState(): GlobalLoaderState;
+/**
+ * Store global loader options on the global object to increase chances of cross loaders-version interoperability
+ * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
+ * @returns global loader options merged with default loader options
+ */
+export declare const getGlobalLoaderOptions: () => {
+    [key: string]: any;
+};
 /**
  * Set global loader options
  * @param options

package/dist/lib/loader-utils/option-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;GAEG;AACH,aAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAWD;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAItD;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,OAuB/E"}
+{"version":3,"file":"option-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/loader-utils/option-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAE,aAAa,EAAE,aAAa,EAAC,MAAM,0BAA0B,CAAC;AAKnF;;GAEG;AACH,aAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,EAAE,CAAC;IACzB,aAAa,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;CACrC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,iBAAiB,CASxD;AAED;;;;GAIG;AACH,eAAO,MAAM,sBAAsB;;CAKlC,CAAC;AAEF;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAItD;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,MAAM,EAAE,EAClB,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,CAMR;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,CAAC,EAAE,aAAa,EACvB,OAAO,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,OAuB/E"}

package/dist/lib/loader-utils/option-utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFetchFunction = exports.normalizeOptions = exports.setGlobalOptions = exports.getGlobalLoaderState = void 0;
+exports.getFetchFunction = exports.normalizeOptions = exports.setGlobalOptions = exports.getGlobalLoaderOptions = exports.getGlobalLoaderState = void 0;
 const is_type_1 = require("../../javascript-utils/is-type");
 const fetch_file_1 = require("../fetch/fetch-file");
 const loggers_1 = require("./loggers");
@@ -19,21 +19,25 @@ function getGlobalLoaderState() {
     return loaders._state;
 }
 exports.getGlobalLoaderState = getGlobalLoaderState;
-// Store global loader options on the global object to increase chances of cross loaders-version interoperability
-// NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
+/**
+ * Store global loader options on the global object to increase chances of cross loaders-version interoperability
+ * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
+ * @returns global loader options merged with default loader options
+ */
 const getGlobalLoaderOptions = () => {
     const state = getGlobalLoaderState();
     // Ensure all default loader options from this library are mentioned
     state.globalOptions = state.globalOptions || { ...option_defaults_1.DEFAULT_LOADER_OPTIONS };
     return state.globalOptions;
 };
+exports.getGlobalLoaderOptions = getGlobalLoaderOptions;
 /**
  * Set global loader options
  * @param options
  */
 function setGlobalOptions(options) {
     const state = getGlobalLoaderState();
-    const globalOptions = getGlobalLoaderOptions();
+    const globalOptions = (0, exports.getGlobalLoaderOptions)();
     state.globalOptions = normalizeOptionsInternal(globalOptions, options);
 }
 exports.setGlobalOptions = setGlobalOptions;
@@ -57,7 +61,7 @@ exports.normalizeOptions = normalizeOptions;
  * @param context
  */
 function getFetchFunction(options, context) {
-    const globalOptions = getGlobalLoaderOptions();
+    const globalOptions = (0, exports.getGlobalLoaderOptions)();
     const fetchOptions = options || globalOptions;
     // options.fetch can be a function
     if (typeof fetchOptions.fetch === 'function') {
@@ -141,7 +145,7 @@ function normalizeOptionsInternal(loader, options, url) {
     if (mergedOptions.log === null) {
         mergedOptions.log = new loggers_1.NullLog();
     }
-    mergeNestedFields(mergedOptions, getGlobalLoaderOptions());
+    mergeNestedFields(mergedOptions, (0, exports.getGlobalLoaderOptions)());
     mergeNestedFields(mergedOptions, options);
     return mergedOptions;
 }

package/dist/lib/utils/response-utils.js

@@ -61,7 +61,7 @@ exports.checkResponse = checkResponse;
 function checkResponseSync(response) {
     if (!response.ok) {
         let message = `${response.status} ${response.statusText}`;
-        message = message.length > 60 ? `${message.slice(60)}...` : message;
+        message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
         throw new Error(message);
     }
 }
@@ -76,7 +76,7 @@ async function getResponseError(response) {
             text += ` ${await response.text()}`;
         }
         message += text;
-        message = message.length > 60 ? `${message.slice(60)}...` : message;
+        message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
     }
     catch (error) {
         // eslint forbids return in a finally statement, so we just catch here

package/dist/null-worker.js

@@ -183,7 +183,7 @@
   }
 
   // src/null-loader.ts
-  var VERSION = true ? "3.2.0-alpha.1" : "latest";
+  var VERSION = true ? "3.2.0-alpha.2" : "latest";
   var NullLoader = {
     name: "Null loader",
     id: "null",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/core",
-  "version": "3.2.0-alpha.1",
+  "version": "3.2.0-alpha.2",
   "description": "Framework-independent loaders for 3D graphics formats",
   "license": "MIT",
   "publishConfig": {
@@ -42,10 +42,10 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
-    "@loaders.gl/loader-utils": "3.2.0-alpha.1",
-    "@loaders.gl/worker-utils": "3.2.0-alpha.1",
+    "@loaders.gl/loader-utils": "3.2.0-alpha.2",
+    "@loaders.gl/worker-utils": "3.2.0-alpha.2",
     "@probe.gl/log": "^3.5.0",
     "probe.gl": "^3.4.0"
   },
-  "gitHead": "423a2815092b08dcf93ad5b7dc2940b167305afe"
+  "gitHead": "52a602739cbfce60fc314f474efc984d199dff78"
 }

package/src/index.ts

@@ -6,7 +6,7 @@ export {readFileSync} from './lib/fetch/read-file';
 export {writeFile, writeFileSync} from './lib/fetch/write-file';
 
 // CONFIGURATION
-export {setLoaderOptions} from './lib/api/set-loader-options';
+export {setLoaderOptions, getLoaderOptions} from './lib/api/loader-options';
 export {registerLoaders} from './lib/api/register-loaders';
 export {selectLoader, selectLoaderSync} from './lib/api/select-loader';
 

package/src/lib/api/encode.ts

@@ -1,8 +1,10 @@
-import type {Writer, LoaderOptions} from '@loaders.gl/loader-utils';
+import {Writer, LoaderOptions, canEncodeWithWorker} from '@loaders.gl/loader-utils';
+import {processOnWorker} from '@loaders.gl/worker-utils';
 import {concatenateArrayBuffers, resolvePath} from '@loaders.gl/loader-utils';
 import {isBrowser} from '@loaders.gl/loader-utils';
 import {writeFile} from '../fetch/write-file';
 import {fetchFile} from '../fetch/fetch-file';
+import {getLoaderOptions} from './loader-options';
 
 /**
  * Encode loaded data into a binary ArrayBuffer using the specified Writer.
@@ -12,6 +14,12 @@ export async function encode(
   writer: Writer,
   options?: LoaderOptions
 ): Promise<ArrayBuffer> {
+  const globalOptions = getLoaderOptions();
+  options = {...globalOptions, ...options};
+  if (canEncodeWithWorker(writer, options)) {
+    return await processOnWorker(writer, data, options);
+  }
+
   // TODO Merge default writer options with options argument like it is done in load module.
   if (writer.encode) {
     return await writer.encode(data, options);

package/src/lib/api/loader-options.ts

@@ -0,0 +1,2 @@
+export {setGlobalOptions as setLoaderOptions} from '../loader-utils/option-utils';
+export {getGlobalLoaderOptions as getLoaderOptions} from '../loader-utils/option-utils';

package/src/lib/loader-utils/option-utils.ts

@@ -26,9 +26,12 @@ export function getGlobalLoaderState(): GlobalLoaderState {
   return loaders._state;
 }
 
-// Store global loader options on the global object to increase chances of cross loaders-version interoperability
-// NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
-const getGlobalLoaderOptions = () => {
+/**
+ * Store global loader options on the global object to increase chances of cross loaders-version interoperability
+ * NOTE: This use case is not reliable but can help when testing new versions of loaders.gl with existing frameworks
+ * @returns global loader options merged with default loader options
+ */
+export const getGlobalLoaderOptions = () => {
   const state = getGlobalLoaderState();
   // Ensure all default loader options from this library are mentioned
   state.globalOptions = state.globalOptions || {...DEFAULT_LOADER_OPTIONS};

package/src/lib/utils/response-utils.ts

@@ -65,7 +65,7 @@ export async function checkResponse(response: Response): Promise<void> {
 export function checkResponseSync(response: Response): void {
   if (!response.ok) {
     let message = `${response.status} ${response.statusText}`;
-    message = message.length > 60 ? `${message.slice(60)}...` : message;
+    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
     throw new Error(message);
   }
 }
@@ -81,7 +81,7 @@ async function getResponseError(response): Promise<string> {
       text += ` ${await response.text()}`;
     }
     message += text;
-    message = message.length > 60 ? `${message.slice(60)}...` : message;
+    message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
   } catch (error) {
     // eslint forbids return in a finally statement, so we just catch here
   }

package/dist/es5/lib/api/set-loader-options.js

@@ -1,13 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.setLoaderOptions = setLoaderOptions;
-
-var _optionUtils = require("../loader-utils/option-utils");
-
-function setLoaderOptions(options) {
-  (0, _optionUtils.setGlobalOptions)(options);
-}
-//# sourceMappingURL=set-loader-options.js.map

package/dist/es5/lib/api/set-loader-options.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/lib/api/set-loader-options.ts"],"names":["setLoaderOptions","options"],"mappings":";;;;;;;AAAA;;AAMO,SAASA,gBAAT,CAA0BC,OAA1B,EAAiD;AACtD,qCAAiBA,OAAjB;AACD","sourcesContent":["import {setGlobalOptions} from '../loader-utils/option-utils';\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setLoaderOptions(options: object): void {\n  setGlobalOptions(options);\n}\n"],"file":"set-loader-options.js"}

package/dist/esm/lib/api/set-loader-options.js

@@ -1,5 +0,0 @@
-import { setGlobalOptions } from '../loader-utils/option-utils';
-export function setLoaderOptions(options) {
-  setGlobalOptions(options);
-}
-//# sourceMappingURL=set-loader-options.js.map

package/dist/esm/lib/api/set-loader-options.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../../../src/lib/api/set-loader-options.ts"],"names":["setGlobalOptions","setLoaderOptions","options"],"mappings":"AAAA,SAAQA,gBAAR,QAA+B,8BAA/B;AAMA,OAAO,SAASC,gBAAT,CAA0BC,OAA1B,EAAiD;AACtDF,EAAAA,gBAAgB,CAACE,OAAD,CAAhB;AACD","sourcesContent":["import {setGlobalOptions} from '../loader-utils/option-utils';\n\n/**\n * Set global loader options\n * @param options\n */\nexport function setLoaderOptions(options: object): void {\n  setGlobalOptions(options);\n}\n"],"file":"set-loader-options.js"}

package/dist/lib/api/set-loader-options.d.ts

@@ -1,6 +0,0 @@
-/**
- * Set global loader options
- * @param options
- */
-export declare function setLoaderOptions(options: object): void;
-//# sourceMappingURL=set-loader-options.d.ts.map

package/dist/lib/api/set-loader-options.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"set-loader-options.d.ts","sourceRoot":"","sources":["../../../src/lib/api/set-loader-options.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAEtD"}

package/dist/lib/api/set-loader-options.js

@@ -1,12 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setLoaderOptions = void 0;
-const option_utils_1 = require("../loader-utils/option-utils");
-/**
- * Set global loader options
- * @param options
- */
-function setLoaderOptions(options) {
-    (0, option_utils_1.setGlobalOptions)(options);
-}
-exports.setLoaderOptions = setLoaderOptions;

package/src/lib/api/set-loader-options.ts

@@ -1,9 +0,0 @@
-import {setGlobalOptions} from '../loader-utils/option-utils';
-
-/**
- * Set global loader options
- * @param options
- */
-export function setLoaderOptions(options: object): void {
-  setGlobalOptions(options);
-}