@loaders.gl/core 4.4.0-alpha.2 → 4.4.0

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {isResponse, isBlob} from '../../javascript-utils/is-type';
+import {isResponse, isBlob} from '@loaders.gl/loader-utils';
 import {parseMIMEType, parseMIMETypeFromURL} from './mime-type-utils';
 import {stripQueryString} from './url-utils';
 
@@ -22,16 +22,15 @@ export type Resource = Response | Blob | string;
 export function getResourceUrl(resource: unknown): string {
   // If resource is a `Response`, it contains the information directly as a field
   if (isResponse(resource)) {
-    const response = resource as Response;
-    return response.url;
+    return resource.url;
   }
 
   // If the resource is a Blob or a File (subclass of Blob)
   if (isBlob(resource)) {
-    const blob = resource as Blob;
     // File objects have a "name" property. Blob objects don't have any
     // url (name) information
-    return (blob as any).name || '';
+    const fileName = 'name' in resource ? (resource as File).name : '';
+    return fileName || '';
   }
 
   if (typeof resource === 'string') {
@@ -52,16 +51,14 @@ export function getResourceUrl(resource: unknown): string {
 export function getResourceMIMEType(resource: unknown): string {
   // If resource is a response, it contains the information directly
   if (isResponse(resource)) {
-    const response = resource as Response;
-    const contentTypeHeader = response.headers.get('content-type') || '';
-    const noQueryUrl = stripQueryString(response.url);
+    const contentTypeHeader = resource.headers.get('content-type') || '';
+    const noQueryUrl = stripQueryString(resource.url);
     return parseMIMEType(contentTypeHeader) || parseMIMETypeFromURL(noQueryUrl);
   }
 
   // If the resource is a Blob or a File (subclass of Blob)
   if (isBlob(resource)) {
-    const blob = resource as Blob;
-    return blob.type || '';
+    return resource.type || '';
   }
 
   if (typeof resource === 'string') {
@@ -81,11 +78,11 @@ export function getResourceMIMEType(resource: unknown): string {
   */
 export function getResourceContentLength(resource: unknown): number {
   if (isResponse(resource)) {
-    const response = resource as Response;
+    const response = resource;
     return response.headers['content-length'] || -1;
   }
   if (isBlob(resource)) {
-    const blob = resource as Blob;
+    const blob = resource;
     return blob.size;
   }
   if (typeof resource === 'string') {

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

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
 
-import {isResponse} from '../../javascript-utils/is-type';
+import {isResponse} from '@loaders.gl/loader-utils';
 import {FetchError} from '../fetch/fetch-error';
 import {getResourceContentLength, getResourceUrl, getResourceMIMEType} from './resource-utils';
 import {shortenUrlForDisplay} from './url-utils';
@@ -15,7 +15,7 @@ import {shortenUrlForDisplay} from './url-utils';
  */
 export async function makeResponse(resource: unknown): Promise<Response> {
   if (isResponse(resource)) {
-    return resource as Response;
+    return resource;
   }
 
   // Add content-length header if possible

package/src/null-loader.ts

@@ -45,8 +45,11 @@ export const NullLoader = {
   version: VERSION,
   mimeTypes: ['application/x.empty'],
   extensions: ['null'],
-  parse: async (arrayBuffer: ArrayBuffer, options?: NullLoaderOptions, context?: LoaderContext) =>
-    parseSync(arrayBuffer, options || {}, context),
+  parse: async (
+    arrayBuffer: ArrayBufferLike | ArrayBufferView,
+    options?: NullLoaderOptions,
+    context?: LoaderContext
+  ) => parseSync(arrayBuffer, options || {}, context),
   parseSync,
   parseInBatches: async function* generator(asyncIterator, options, context) {
     for await (const batch of asyncIterator) {
@@ -64,7 +67,7 @@ export const NullLoader = {
  * web worker. The `context` parameter is stripped using JSON.stringify & parse.
  */
 function parseSync(
-  arrayBuffer: ArrayBuffer,
+  arrayBuffer: ArrayBufferLike | ArrayBufferView,
   options?: NullLoaderOptions,
   context?: LoaderContext
 ): null {

package/dist/javascript-utils/is-type.d.ts

@@ -1,21 +0,0 @@
-import type { Readable } from 'stream';
-/** A DOM or Node readable stream */
-export type ReadableStreamType = ReadableStream | Readable;
-export declare const isObject: (x: unknown) => boolean;
-export declare const isPureObject: (x: any) => boolean;
-export declare const isPromise: (x: any) => boolean;
-export declare const isIterable: (x: any) => boolean;
-export declare const isAsyncIterable: (x: any) => boolean;
-export declare const isIterator: (x: any) => boolean;
-export declare const isResponse: (x: any) => boolean;
-export declare const isFile: (x: unknown) => boolean;
-export declare const isBlob: (x: unknown) => boolean;
-/** Check for Node.js `Buffer` without triggering bundler to include buffer polyfill */
-export declare const isBuffer: (x: any) => boolean;
-export declare const isWritableDOMStream: (x: any) => boolean;
-export declare const isReadableDOMStream: (x: any) => boolean;
-export declare const isWritableNodeStream: (x: any) => boolean;
-export declare const isReadableNodeStream: (x: any) => boolean;
-export declare const isReadableStream: (x: unknown) => boolean;
-export declare const isWritableStream: (x: unknown) => boolean;
-//# sourceMappingURL=is-type.d.ts.map

package/dist/javascript-utils/is-type.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"is-type.d.ts","sourceRoot":"","sources":["../../src/javascript-utils/is-type.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,QAAQ,CAAC;AAErC,oCAAoC;AACpC,MAAM,MAAM,kBAAkB,GAAG,cAAc,GAAG,QAAQ,CAAC;AAK3D,eAAO,MAAM,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAoD,CAAC;AAC5F,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OACU,CAAC;AAClD,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OAAkD,CAAC;AAEvF,eAAO,MAAM,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OACmB,CAAC;AACzD,eAAO,MAAM,eAAe,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OACU,CAAC;AACrD,eAAO,MAAM,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OAAwC,CAAC;AAE9E,eAAO,MAAM,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OAEK,CAAC;AAE3C,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OACa,CAAC;AACnD,eAAO,MAAM,MAAM,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OACa,CAAC;AAEnD,uFAAuF;AACvF,eAAO,MAAM,QAAQ,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OAAyD,CAAC;AAE7F,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OACiB,CAAC;AAEhE,eAAO,MAAM,mBAAmB,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OAEyC,CAAC;AAGxF,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OACmC,CAAC;AACnF,eAAO,MAAM,oBAAoB,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,OACmC,CAAC;AACnF,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OACI,CAAC;AACpD,eAAO,MAAM,gBAAgB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OACI,CAAC"}

package/dist/javascript-utils/is-type.js

@@ -1,25 +0,0 @@
-// loaders.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-const isBoolean = (x) => typeof x === 'boolean';
-const isFunction = (x) => typeof x === 'function';
-export const isObject = (x) => x !== null && typeof x === 'object';
-export const isPureObject = (x) => isObject(x) && x.constructor === {}.constructor;
-export const isPromise = (x) => isObject(x) && isFunction(x.then);
-export const isIterable = (x) => Boolean(x) && typeof x[Symbol.iterator] === 'function';
-export const isAsyncIterable = (x) => x && typeof x[Symbol.asyncIterator] === 'function';
-export const isIterator = (x) => x && isFunction(x.next);
-export const isResponse = (x) => (typeof Response !== 'undefined' && x instanceof Response) ||
-    (x && x.arrayBuffer && x.text && x.json);
-export const isFile = (x) => typeof File !== 'undefined' && x instanceof File;
-export const isBlob = (x) => typeof Blob !== 'undefined' && x instanceof Blob;
-/** Check for Node.js `Buffer` without triggering bundler to include buffer polyfill */
-export const isBuffer = (x) => x && typeof x === 'object' && x.isBuffer;
-export const isWritableDOMStream = (x) => isObject(x) && isFunction(x.abort) && isFunction(x.getWriter);
-export const isReadableDOMStream = (x) => (typeof ReadableStream !== 'undefined' && x instanceof ReadableStream) ||
-    (isObject(x) && isFunction(x.tee) && isFunction(x.cancel) && isFunction(x.getReader));
-// Not implemented in Firefox: && isFunction(x.pipeTo)
-export const isWritableNodeStream = (x) => isObject(x) && isFunction(x.end) && isFunction(x.write) && isBoolean(x.writable);
-export const isReadableNodeStream = (x) => isObject(x) && isFunction(x.read) && isFunction(x.pipe) && isBoolean(x.readable);
-export const isReadableStream = (x) => isReadableDOMStream(x) || isReadableNodeStream(x);
-export const isWritableStream = (x) => isWritableDOMStream(x) || isWritableNodeStream(x);

package/src/javascript-utils/is-type.ts

@@ -1,51 +0,0 @@
-// loaders.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-
-import type {Readable} from 'stream';
-
-/** A DOM or Node readable stream */
-export type ReadableStreamType = ReadableStream | Readable;
-
-const isBoolean: (x: unknown) => boolean = (x) => typeof x === 'boolean';
-const isFunction: (x: unknown) => boolean = (x) => typeof x === 'function';
-
-export const isObject: (x: unknown) => boolean = (x) => x !== null && typeof x === 'object';
-export const isPureObject: (x: any) => boolean = (x) =>
-  isObject(x) && x.constructor === {}.constructor;
-export const isPromise: (x: any) => boolean = (x) => isObject(x) && isFunction(x.then);
-
-export const isIterable: (x: any) => boolean = (x) =>
-  Boolean(x) && typeof x[Symbol.iterator] === 'function';
-export const isAsyncIterable: (x: any) => boolean = (x) =>
-  x && typeof x[Symbol.asyncIterator] === 'function';
-export const isIterator: (x: any) => boolean = (x) => x && isFunction(x.next);
-
-export const isResponse: (x: any) => boolean = (x) =>
-  (typeof Response !== 'undefined' && x instanceof Response) ||
-  (x && x.arrayBuffer && x.text && x.json);
-
-export const isFile: (x: unknown) => boolean = (x) =>
-  typeof File !== 'undefined' && x instanceof File;
-export const isBlob: (x: unknown) => boolean = (x) =>
-  typeof Blob !== 'undefined' && x instanceof Blob;
-
-/** Check for Node.js `Buffer` without triggering bundler to include buffer polyfill */
-export const isBuffer: (x: any) => boolean = (x) => x && typeof x === 'object' && x.isBuffer;
-
-export const isWritableDOMStream: (x: any) => boolean = (x) =>
-  isObject(x) && isFunction(x.abort) && isFunction(x.getWriter);
-
-export const isReadableDOMStream: (x: any) => boolean = (x) =>
-  (typeof ReadableStream !== 'undefined' && x instanceof ReadableStream) ||
-  (isObject(x) && isFunction(x.tee) && isFunction(x.cancel) && isFunction(x.getReader));
-// Not implemented in Firefox: && isFunction(x.pipeTo)
-
-export const isWritableNodeStream: (x: any) => boolean = (x) =>
-  isObject(x) && isFunction(x.end) && isFunction(x.write) && isBoolean(x.writable);
-export const isReadableNodeStream: (x: any) => boolean = (x) =>
-  isObject(x) && isFunction(x.read) && isFunction(x.pipe) && isBoolean(x.readable);
-export const isReadableStream: (x: unknown) => boolean = (x) =>
-  isReadableDOMStream(x) || isReadableNodeStream(x);
-export const isWritableStream: (x: unknown) => boolean = (x) =>
-  isWritableDOMStream(x) || isWritableNodeStream(x);