@loaders.gl/core 4.0.0-alpha.5 → 4.0.0-alpha.7

package/dist/lib/utils/resource-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAKA;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,GAAG,GAAG;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAC,CAmChF;AAED;;;;;;IAMI;AACJ,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,GAAG,GAAG,MAAM,CAkB9D"}
+{"version":3,"file":"resource-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/resource-utils.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG,QAAQ,GAAG,IAAI,GAAG,MAAM,CAAC;AAEhD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAqBxD;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAqB7D;AAED;;;;;;IAMI;AACJ,wBAAgB,wBAAwB,CAAC,QAAQ,EAAE,OAAO,GAAG,MAAM,CAoBlE"}

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

@@ -1,60 +1,90 @@
-import { isResponse, isBlob } from '../../javascript-utils/is-type';
-import { parseMIMEType, parseMIMETypeFromURL } from './mime-type-utils';
-const QUERY_STRING_PATTERN = /\?.*/;
-export function getResourceUrlAndType(resource) {
-  if (isResponse(resource)) {
-    const url = stripQueryString(resource.url || '');
-    const contentTypeHeader = resource.headers.get('content-type') || '';
-    return {
-      url,
-      type: parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(url)
-    };
-  }
-
-  if (isBlob(resource)) {
-    return {
-      url: stripQueryString(resource.name || ''),
-      type: resource.type || ''
-    };
-  }
-
-  if (typeof resource === 'string') {
-    return {
-      url: stripQueryString(resource),
-      type: parseMIMETypeFromURL(resource)
-    };
-  }
-
-  return {
-    url: '',
-    type: ''
-  };
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getResourceContentLength = exports.getResourceMIMEType = exports.getResourceUrl = void 0;
+const is_type_1 = require("../../javascript-utils/is-type");
+const mime_type_utils_1 = require("./mime-type-utils");
+const url_utils_1 = require("./url-utils");
+/**
+ * Returns the URL associated with this resource.
+ * The returned value may include a query string and need further processing.
+ * If it cannot determine url, the corresponding value will be an empty string
+ *
+ * @todo string parameters are assumed to be URLs
+ */
+function getResourceUrl(resource) {
+    // If resource is a `Response`, it contains the information directly as a field
+    if ((0, is_type_1.isResponse)(resource)) {
+        const response = resource;
+        return response.url;
+    }
+    // If the resource is a Blob or a File (subclass of Blob)
+    if ((0, is_type_1.isBlob)(resource)) {
+        const blob = resource;
+        // File objects have a "name" property. Blob objects don't have any
+        // url (name) information
+        return blob.name || '';
+    }
+    if (typeof resource === 'string') {
+        return resource;
+    }
+    // Unknown
+    return '';
 }
-export function getResourceContentLength(resource) {
-  if (isResponse(resource)) {
-    return resource.headers['content-length'] || -1;
-  }
-
-  if (isBlob(resource)) {
-    return resource.size;
-  }
-
-  if (typeof resource === 'string') {
-    return resource.length;
-  }
-
-  if (resource instanceof ArrayBuffer) {
-    return resource.byteLength;
-  }
-
-  if (ArrayBuffer.isView(resource)) {
-    return resource.byteLength;
-  }
-
-  return -1;
+exports.getResourceUrl = getResourceUrl;
+/**
+ * Returns the URL associated with this resource.
+ * The returned value may include a query string and need further processing.
+ * If it cannot determine url, the corresponding value will be an empty string
+ *
+ * @todo string parameters are assumed to be URLs
+ */
+function getResourceMIMEType(resource) {
+    // If resource is a response, it contains the information directly
+    if ((0, is_type_1.isResponse)(resource)) {
+        const response = resource;
+        const contentTypeHeader = response.headers.get('content-type') || '';
+        const noQueryUrl = (0, url_utils_1.stripQueryString)(response.url);
+        return (0, mime_type_utils_1.parseMIMEType)(contentTypeHeader) || (0, mime_type_utils_1.parseMIMETypeFromURL)(noQueryUrl);
+    }
+    // If the resource is a Blob or a File (subclass of Blob)
+    if ((0, is_type_1.isBlob)(resource)) {
+        const blob = resource;
+        return blob.type || '';
+    }
+    if (typeof resource === 'string') {
+        return (0, mime_type_utils_1.parseMIMETypeFromURL)(resource);
+    }
+    // Unknown
+    return '';
 }
+exports.getResourceMIMEType = getResourceMIMEType;
+/**
+  * Returns (approximate) content length for a resource if it can be determined.
+  * Returns -1 if content length cannot be determined.
+  * @param resource
 
-function stripQueryString(url) {
-  return url.replace(QUERY_STRING_PATTERN, '');
+  * @note string parameters are NOT assumed to be URLs
+  */
+function getResourceContentLength(resource) {
+    if ((0, is_type_1.isResponse)(resource)) {
+        const response = resource;
+        return response.headers['content-length'] || -1;
+    }
+    if ((0, is_type_1.isBlob)(resource)) {
+        const blob = resource;
+        return blob.size;
+    }
+    if (typeof resource === 'string') {
+        // TODO - handle data URL?
+        return resource.length;
+    }
+    if (resource instanceof ArrayBuffer) {
+        return resource.byteLength;
+    }
+    if (ArrayBuffer.isView(resource)) {
+        return resource.byteLength;
+    }
+    return -1;
 }
-//# sourceMappingURL=resource-utils.js.map
+exports.getResourceContentLength = getResourceContentLength;

package/dist/lib/utils/response-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsCnE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM1D"}
+{"version":3,"file":"response-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/response-utils.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAuCnE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,CAKrE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAM1D"}

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

@@ -1,115 +1,115 @@
-import { isResponse } from '../../javascript-utils/is-type';
-import { getResourceContentLength, getResourceUrlAndType } from './resource-utils';
-export async function makeResponse(resource) {
-  if (isResponse(resource)) {
-    return resource;
-  }
-
-  const headers = {};
-  const contentLength = getResourceContentLength(resource);
-
-  if (contentLength >= 0) {
-    headers['content-length'] = String(contentLength);
-  }
-
-  const {
-    url,
-    type
-  } = getResourceUrlAndType(resource);
-
-  if (type) {
-    headers['content-type'] = type;
-  }
-
-  const initialDataUrl = await getInitialDataUrl(resource);
-
-  if (initialDataUrl) {
-    headers['x-first-bytes'] = initialDataUrl;
-  }
-
-  if (typeof resource === 'string') {
-    resource = new TextEncoder().encode(resource);
-  }
-
-  const response = new Response(resource, {
-    headers
-  });
-  Object.defineProperty(response, 'url', {
-    value: url
-  });
-  return response;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkResponseSync = exports.checkResponse = exports.makeResponse = void 0;
+const is_type_1 = require("../../javascript-utils/is-type");
+const resource_utils_1 = require("./resource-utils");
+/**
+ * Returns a Response object
+ * Adds content-length header when possible
+ *
+ * @param resource
+ */
+async function makeResponse(resource) {
+    if ((0, is_type_1.isResponse)(resource)) {
+        return resource;
+    }
+    // Add content-length header if possible
+    const headers = {};
+    const contentLength = (0, resource_utils_1.getResourceContentLength)(resource);
+    if (contentLength >= 0) {
+        headers['content-length'] = String(contentLength);
+    }
+    // `new Response(File)` does not preserve content-type and URL
+    // so we add them here
+    const url = (0, resource_utils_1.getResourceUrl)(resource);
+    const type = (0, resource_utils_1.getResourceMIMEType)(resource);
+    if (type) {
+        headers['content-type'] = type;
+    }
+    // Add a custom header with initial bytes if available
+    const initialDataUrl = await getInitialDataUrl(resource);
+    if (initialDataUrl) {
+        headers['x-first-bytes'] = initialDataUrl;
+    }
+    // TODO - is this the best way of handling strings?
+    // Maybe package as data URL instead?
+    if (typeof resource === 'string') {
+        // Convert to ArrayBuffer to avoid Response treating it as a URL
+        resource = new TextEncoder().encode(resource);
+    }
+    // Attempt to create a Response from the resource, adding headers and setting url
+    const response = new Response(resource, { headers });
+    // We can't control `Response.url` via constructor, use a property override to record URL.
+    Object.defineProperty(response, 'url', { value: url });
+    return response;
 }
-export async function checkResponse(response) {
-  if (!response.ok) {
-    const message = await getResponseError(response);
-    throw new Error(message);
-  }
+exports.makeResponse = makeResponse;
+/**
+ * Checks response status (async) and throws a helpful error message if status is not OK.
+ * @param response
+ */
+async function checkResponse(response) {
+    if (!response.ok) {
+        const message = await getResponseError(response);
+        throw new Error(message);
+    }
 }
-export function checkResponseSync(response) {
-  if (!response.ok) {
-    let message = "".concat(response.status, " ").concat(response.statusText);
-    message = message.length > 60 ? "".concat(message.slice(60), "...") : message;
-    throw new Error(message);
-  }
+exports.checkResponse = checkResponse;
+/**
+ * Checks response status (sync) and throws a helpful error message if status is not OK.
+ * @param response
+ */
+function checkResponseSync(response) {
+    if (!response.ok) {
+        let message = `${response.status} ${response.statusText}`;
+        message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
+        throw new Error(message);
+    }
 }
-
+exports.checkResponseSync = checkResponseSync;
+// HELPERS
 async function getResponseError(response) {
-  let message = "Failed to fetch resource ".concat(response.url, " (").concat(response.status, "): ");
-
-  try {
-    const contentType = response.headers.get('Content-Type');
-    let text = response.statusText;
-
-    if (contentType.includes('application/json')) {
-      text += " ".concat(await response.text());
+    let message = `Failed to fetch resource ${response.url} (${response.status}): `;
+    try {
+        const contentType = response.headers.get('Content-Type');
+        let text = response.statusText;
+        if (contentType.includes('application/json')) {
+            text += ` ${await response.text()}`;
+        }
+        message += text;
+        message = message.length > 60 ? `${message.slice(0, 60)}...` : message;
+    }
+    catch (error) {
+        // eslint forbids return in a finally statement, so we just catch here
     }
-
-    message += text;
-    message = message.length > 60 ? "".concat(message.slice(60), "...") : message;
-  } catch (error) {}
-
-  return message;
+    return message;
 }
-
 async function getInitialDataUrl(resource) {
-  const INITIAL_DATA_LENGTH = 5;
-
-  if (typeof resource === 'string') {
-    return "data:,".concat(resource.slice(0, INITIAL_DATA_LENGTH));
-  }
-
-  if (resource instanceof Blob) {
-    const blobSlice = resource.slice(0, 5);
-    return await new Promise(resolve => {
-      const reader = new FileReader();
-
-      reader.onload = event => {
-        var _event$target;
-
-        return resolve(event === null || event === void 0 ? void 0 : (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.result);
-      };
-
-      reader.readAsDataURL(blobSlice);
-    });
-  }
-
-  if (resource instanceof ArrayBuffer) {
-    const slice = resource.slice(0, INITIAL_DATA_LENGTH);
-    const base64 = arrayBufferToBase64(slice);
-    return "data:base64,".concat(base64);
-  }
-
-  return null;
+    const INITIAL_DATA_LENGTH = 5;
+    if (typeof resource === 'string') {
+        return `data:,${resource.slice(0, INITIAL_DATA_LENGTH)}`;
+    }
+    if (resource instanceof Blob) {
+        const blobSlice = resource.slice(0, 5);
+        return await new Promise((resolve) => {
+            const reader = new FileReader();
+            reader.onload = (event) => resolve(event?.target?.result);
+            reader.readAsDataURL(blobSlice);
+        });
+    }
+    if (resource instanceof ArrayBuffer) {
+        const slice = resource.slice(0, INITIAL_DATA_LENGTH);
+        const base64 = arrayBufferToBase64(slice);
+        return `data:base64,${base64}`;
+    }
+    return null;
 }
-
+// https://stackoverflow.com/questions/9267899/arraybuffer-to-base64-encoded-string
 function arrayBufferToBase64(buffer) {
-  let binary = '';
-  const bytes = new Uint8Array(buffer);
-
-  for (let i = 0; i < bytes.byteLength; i++) {
-    binary += String.fromCharCode(bytes[i]);
-  }
-
-  return btoa(binary);
+    let binary = '';
+    const bytes = new Uint8Array(buffer);
+    for (let i = 0; i < bytes.byteLength; i++) {
+        binary += String.fromCharCode(bytes[i]);
+    }
+    return btoa(binary);
 }
-//# sourceMappingURL=response-utils.js.map

package/dist/lib/utils/url-utils.d.ts

@@ -0,0 +1,3 @@
+export declare function extractQueryString(url: any): string;
+export declare function stripQueryString(url: any): string;
+//# sourceMappingURL=url-utils.d.ts.map

package/dist/lib/utils/url-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"url-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/utils/url-utils.ts"],"names":[],"mappings":"AAIA,wBAAgB,kBAAkB,CAAC,GAAG,KAAA,GAAG,MAAM,CAG9C;AAED,wBAAgB,gBAAgB,CAAC,GAAG,KAAA,GAAG,MAAM,CAE5C"}

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

@@ -0,0 +1,14 @@
+"use strict";
+// loaders.gl, MIT license
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.stripQueryString = exports.extractQueryString = void 0;
+const QUERY_STRING_PATTERN = /\?.*/;
+function extractQueryString(url) {
+    const matches = url.match(QUERY_STRING_PATTERN);
+    return matches && matches[0];
+}
+exports.extractQueryString = extractQueryString;
+function stripQueryString(url) {
+    return url.replace(QUERY_STRING_PATTERN, '');
+}
+exports.stripQueryString = stripQueryString;

package/dist/null-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAY9B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAkBxB,CAAC"}
+{"version":3,"file":"null-loader.d.ts","sourceRoot":"","sources":["../src/null-loader.ts"],"names":[],"mappings":"AAIA,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,0BAA0B,CAAC;AAElE;;GAEG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAY9B,CAAC;AAYF;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,gBAoBxB,CAAC"}

package/dist/null-loader.js

@@ -1,34 +1,56 @@
-const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : 'latest';
-export const NullWorkerLoader = {
-  name: 'Null loader',
-  id: 'null',
-  module: 'core',
-  version: VERSION,
-  worker: true,
-  mimeTypes: ['application/x.empty'],
-  extensions: ['null'],
-  tests: [() => false],
-  options: {
-    null: {}
-  }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NullLoader = exports.NullWorkerLoader = void 0;
+// __VERSION__ is injected by babel-plugin-version-inline
+// @ts-ignore TS2304: Cannot find name '__VERSION__'.
+const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : 'latest';
+/**
+ * Loads any data and returns null (or optionally passes through data unparsed)
+ */
+exports.NullWorkerLoader = {
+    name: 'Null loader',
+    id: 'null',
+    module: 'core',
+    version: VERSION,
+    worker: true,
+    mimeTypes: ['application/x.empty'],
+    extensions: ['null'],
+    tests: [() => false],
+    options: {
+        null: {}
+    }
 };
-export const NullLoader = {
-  name: 'Null loader',
-  id: 'null',
-  module: 'core',
-  version: VERSION,
-  mimeTypes: ['application/x.empty'],
-  extensions: ['null'],
-  parse: async arrayBuffer => arrayBuffer,
-  parseSync: arrayBuffer => arrayBuffer,
-  parseInBatches: async function* generator(asyncIterator) {
-    for await (const batch of asyncIterator) {
-      yield batch;
+/**
+ * Returns arguments passed to the parse API in a format that can be transfered to a
+ * web worker. The `context` parameter is stripped using JSON.stringify & parse.
+ */
+function parseSync(arrayBuffer, options, context) {
+    if (!options.null.echoParameters)
+        return null;
+    context = context && JSON.parse(JSON.stringify(context));
+    return { arrayBuffer, options, context };
+}
+/**
+ * Loads any data and returns null (or optionally passes through data unparsed)
+ */
+exports.NullLoader = {
+    name: 'Null loader',
+    id: 'null',
+    module: 'core',
+    version: VERSION,
+    mimeTypes: ['application/x.empty'],
+    extensions: ['null'],
+    parse: async (arrayBuffer, options, context) => parseSync(arrayBuffer, options, context),
+    parseSync,
+    parseInBatches: async function* generator(asyncIterator, options, context) {
+        for await (const batch of asyncIterator) {
+            yield parseSync(batch, options, context);
+        }
+    },
+    tests: [() => false],
+    options: {
+        null: {
+            echoParameters: false
+        }
     }
-  },
-  tests: [() => false],
-  options: {
-    null: {}
-  }
 };
-//# sourceMappingURL=null-loader.js.map