@loaders.gl/polyfills 3.1.0-beta.6 → 3.1.2

package/dist/node/fetch/utils/stream-utils.node.js

@@ -3,13 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.concatenateReadStream = exports.decompressReadStream = exports.createReadStream = void 0;
+exports.concatenateArrayBuffers = exports.concatenateReadStream = exports.decompressReadStream = exports.createReadStream = void 0;
 const fs_1 = __importDefault(require("fs")); // `fs` will be empty object in browsers (see package.json "browser" field).
 const http_1 = __importDefault(require("http"));
 const https_1 = __importDefault(require("https"));
 const zlib_1 = __importDefault(require("zlib"));
 const decode_data_uri_node_1 = require("./decode-data-uri.node");
-const isRequestURL = (url) => url.startsWith('http:') || url.startsWith('https:');
+function isRequestURL(url) {
+    return url.startsWith('http:') || url.startsWith('https:');
+}
 // Returns a promise that resolves to a readable stream
 async function createReadStream(url, options) {
     // Handle file streams in node
@@ -49,7 +51,7 @@ function decompressReadStream(readStream, headers) {
 }
 exports.decompressReadStream = decompressReadStream;
 async function concatenateReadStream(readStream) {
-    let arrayBuffer = new ArrayBuffer(0);
+    const arrayBufferChunks = [];
     return await new Promise((resolve, reject) => {
         readStream.on('error', (error) => reject(error));
         // Once the readable callback has been added, stream switches to "flowing mode"
@@ -59,10 +61,12 @@ async function concatenateReadStream(readStream) {
             if (typeof chunk === 'string') {
                 reject(new Error('Read stream not binary'));
             }
-            const chunkAsArrayBuffer = (0, decode_data_uri_node_1.toArrayBuffer)(chunk);
-            arrayBuffer = concatenateArrayBuffers(arrayBuffer, chunkAsArrayBuffer);
+            arrayBufferChunks.push((0, decode_data_uri_node_1.toArrayBuffer)(chunk));
+        });
+        readStream.on('end', () => {
+            const arrayBuffer = concatenateArrayBuffers(arrayBufferChunks);
+            resolve(arrayBuffer);
         });
-        readStream.on('end', () => resolve(arrayBuffer));
     });
 }
 exports.concatenateReadStream = concatenateReadStream;
@@ -88,11 +92,25 @@ function getRequestOptions(url, options) {
         headers
     };
 }
-function concatenateArrayBuffers(source1, source2) {
-    const sourceArray1 = source1 instanceof ArrayBuffer ? new Uint8Array(source1) : source1;
-    const sourceArray2 = source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2;
-    const temp = new Uint8Array(sourceArray1.byteLength + sourceArray2.byteLength);
-    temp.set(sourceArray1, 0);
-    temp.set(sourceArray2, sourceArray1.byteLength);
-    return temp.buffer;
+/**
+ * Concatenate a sequence of ArrayBuffers
+ * @return A concatenated ArrayBuffer
+ * @note duplicates loader-utils since polyfills should be independent
+ */
+function concatenateArrayBuffers(sources) {
+    // Make sure all inputs are wrapped in typed arrays
+    const sourceArrays = sources.map((source2) => source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2);
+    // Get length of all inputs
+    const byteLength = sourceArrays.reduce((length, typedArray) => length + typedArray.byteLength, 0);
+    // Allocate array with space for all inputs
+    const result = new Uint8Array(byteLength);
+    // Copy the subarrays
+    let offset = 0;
+    for (const sourceArray of sourceArrays) {
+        result.set(sourceArray, offset);
+        offset += sourceArray.byteLength;
+    }
+    // We work with ArrayBuffers, discard the typed array wrapper
+    return result.buffer;
 }
+exports.concatenateArrayBuffers = concatenateArrayBuffers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loaders.gl/polyfills",
-  "version": "3.1.0-beta.6",
+  "version": "3.1.2",
   "description": "Polyfills for TextEncoder/TextDecoder",
   "license": "MIT",
   "publishConfig": {
@@ -93,7 +93,7 @@
   },
   "scripts": {
     "pre-build": "npm run build-bundle",
-    "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/bundle.js"
+    "build-bundle": "esbuild src/bundle.ts --bundle --outfile=dist/dist.min.js"
   },
   "dependencies": {
     "@babel/runtime": "^7.3.1",
@@ -105,5 +105,5 @@
     "through": "^2.3.8",
     "web-streams-polyfill": "^3.0.0"
   },
-  "gitHead": "e6fce1907a689f9199922e84bd493adacfefbbf6"
+  "gitHead": "5c25bb71a2ac8558ecedf2256cc925427b2a0506"
 }

package/src/node/fetch/utils/decode-data-uri.node.ts

@@ -1,7 +1,5 @@
 // Based on binary-gltf-utils under MIT license: Copyright (c) 2016-17 Karl Cheng
 
-import {assert} from '../../../utils/assert';
-
 const isArrayBuffer = (x) => x && x instanceof ArrayBuffer;
 const isBuffer = (x) => x && x instanceof Buffer;
 
@@ -11,7 +9,7 @@ const isBuffer = (x) => x && x instanceof Buffer;
  * @param {string} uri - a data URI (assumed to be valid)
  * @returns {Object} { buffer, mimeType }
  */
-export function decodeDataUri(uri) {
+export function decodeDataUri(uri: string): {arrayBuffer: ArrayBuffer; mimeType: string} {
   const dataIndex = uri.indexOf(',');
 
   let buffer;
@@ -37,13 +35,14 @@ export function decodeDataUri(uri) {
  * @param data
  * @todo Duplicate of core
  */
-export function toArrayBuffer(data) {
+export function toArrayBuffer(data: unknown): ArrayBuffer {
   if (isArrayBuffer(data)) {
-    return data;
+    return data as ArrayBuffer;
   }
 
   // TODO - per docs we should just be able to call buffer.buffer, but there are issues
   if (isBuffer(data)) {
+    // @ts-expect-error
     const typedArray = new Uint8Array(data);
     return typedArray.buffer;
   }
@@ -60,9 +59,11 @@ export function toArrayBuffer(data) {
   }
 
   // HACK to support Blob polyfill
+  // @ts-expect-error
   if (data && typeof data === 'object' && data._toArrayBuffer) {
+    // @ts-expect-error
     return data._toArrayBuffer();
   }
 
-  return assert(false, `toArrayBuffer(${JSON.stringify(data, null, 2).slice(10)})`);
+  throw new Error(`toArrayBuffer(${JSON.stringify(data, null, 2).slice(10)})`);
 }

package/src/node/fetch/utils/stream-utils.node.ts

@@ -5,10 +5,12 @@ import zlib from 'zlib';
 
 import {toArrayBuffer} from './decode-data-uri.node';
 
-const isRequestURL = (url) => url.startsWith('http:') || url.startsWith('https:');
+function isRequestURL(url: string): boolean {
+  return url.startsWith('http:') || url.startsWith('https:');
+}
 
 // Returns a promise that resolves to a readable stream
-export async function createReadStream(url, options) {
+export async function createReadStream(url, options): Promise<any> {
   // Handle file streams in node
   if (!isRequestURL(url)) {
     const noqueryUrl = url.split('?')[0];
@@ -46,8 +48,8 @@ export function decompressReadStream(readStream, headers) {
   }
 }
 
-export async function concatenateReadStream(readStream) {
-  let arrayBuffer = new ArrayBuffer(0);
+export async function concatenateReadStream(readStream): Promise<ArrayBuffer> {
+  const arrayBufferChunks: ArrayBuffer[] = [];
 
   return await new Promise((resolve, reject) => {
     readStream.on('error', (error) => reject(error));
@@ -60,17 +62,19 @@ export async function concatenateReadStream(readStream) {
       if (typeof chunk === 'string') {
         reject(new Error('Read stream not binary'));
       }
-      const chunkAsArrayBuffer = toArrayBuffer(chunk);
-      arrayBuffer = concatenateArrayBuffers(arrayBuffer, chunkAsArrayBuffer);
+      arrayBufferChunks.push(toArrayBuffer(chunk));
     });
 
-    readStream.on('end', () => resolve(arrayBuffer));
+    readStream.on('end', () => {
+      const arrayBuffer = concatenateArrayBuffers(arrayBufferChunks);
+      resolve(arrayBuffer);
+    });
   });
 }
 
 // HELPERS
 
-function getRequestOptions(url, options?: {fetch?: typeof fetch; headers?}) {
+function getRequestOptions(url: string, options?: {fetch?: typeof fetch; headers?}) {
   // Ensure header keys are lower case so that we can merge without duplicates
   const originalHeaders = options?.headers || {};
   const headers = {};
@@ -94,11 +98,30 @@ function getRequestOptions(url, options?: {fetch?: typeof fetch; headers?}) {
   };
 }
 
-function concatenateArrayBuffers(source1, source2) {
-  const sourceArray1 = source1 instanceof ArrayBuffer ? new Uint8Array(source1) : source1;
-  const sourceArray2 = source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2;
-  const temp = new Uint8Array(sourceArray1.byteLength + sourceArray2.byteLength);
-  temp.set(sourceArray1, 0);
-  temp.set(sourceArray2, sourceArray1.byteLength);
-  return temp.buffer;
+/**
+ * Concatenate a sequence of ArrayBuffers
+ * @return A concatenated ArrayBuffer
+ * @note duplicates loader-utils since polyfills should be independent
+ */
+export function concatenateArrayBuffers(sources: (ArrayBuffer | Uint8Array)[]): ArrayBuffer {
+  // Make sure all inputs are wrapped in typed arrays
+  const sourceArrays = sources.map((source2) =>
+    source2 instanceof ArrayBuffer ? new Uint8Array(source2) : source2
+  );
+
+  // Get length of all inputs
+  const byteLength = sourceArrays.reduce((length, typedArray) => length + typedArray.byteLength, 0);
+
+  // Allocate array with space for all inputs
+  const result = new Uint8Array(byteLength);
+
+  // Copy the subarrays
+  let offset = 0;
+  for (const sourceArray of sourceArrays) {
+    result.set(sourceArray, offset);
+    offset += sourceArray.byteLength;
+  }
+
+  // We work with ArrayBuffers, discard the typed array wrapper
+  return result.buffer;
 }