@kitware/vtk.js 28.10.2 → 28.11.1

package/IO/Core/DataAccessHelper/HtmlDataAccessHelper.js

@@ -1,75 +1,66 @@
 import { strFromU8, decompressSync } from 'fflate';
-import macro from '../../../macros.js';
+import { m as macro } from '../../../macros2.js';
 import Base64 from '../../../Common/Core/Base64.js';
 import Endian from '../../../Common/Core/Endian.js';
 import { DataTypeByteSize } from '../../../Common/Core/DataArray/Constants.js';
 import { registerType } from '../DataAccessHelper.js';
 
-var vtkErrorMacro = macro.vtkErrorMacro,
-    vtkDebugMacro = macro.vtkDebugMacro;
-var requestCount = 0;
-
+const {
+  vtkErrorMacro,
+  vtkDebugMacro
+} = macro;
+let requestCount = 0;
 function getContent(url) {
-  var el = document.querySelector(".webResource[data-url=\"".concat(url, "\"]"));
+  const el = document.querySelector(`.webResource[data-url="${url}"]`);
   return el ? el.innerHTML : null;
 }
-
 function getElement(url) {
-  return document.querySelector(".webResource[data-url=\"".concat(url, "\"]"));
+  return document.querySelector(`.webResource[data-url="${url}"]`);
 }
-
 function removeLeadingSlash(str) {
   return str[0] === '/' ? str.substr(1) : str;
 }
-
 function fetchText(instance, url) {
-  return new Promise(function (resolve, reject) {
-    var txt = getContent(url);
-
+  return new Promise((resolve, reject) => {
+    const txt = getContent(url);
     if (txt === null) {
-      reject(new Error("No such text ".concat(url)));
+      reject(new Error(`No such text ${url}`));
     } else {
       resolve(txt);
     }
   });
 }
-
 function fetchJSON(instance, url) {
-  return new Promise(function (resolve, reject) {
-    var txt = getContent(removeLeadingSlash(url));
-
+  return new Promise((resolve, reject) => {
+    const txt = getContent(removeLeadingSlash(url));
     if (txt === null) {
-      reject(new Error("No such JSON ".concat(url)));
+      reject(new Error(`No such JSON ${url}`));
     } else {
       resolve(JSON.parse(txt));
     }
   });
 }
-
 function fetchArray(instance, baseURL, array) {
-  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  return new Promise(function (resolve, reject) {
-    var url = removeLeadingSlash([baseURL, array.ref.basepath, options.compression ? "".concat(array.ref.id, ".gz") : array.ref.id].join('/'));
-    var txt = getContent(url);
-
+  let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  return new Promise((resolve, reject) => {
+    const url = removeLeadingSlash([baseURL, array.ref.basepath, options.compression ? `${array.ref.id}.gz` : array.ref.id].join('/'));
+    const txt = getContent(url);
     if (txt === null) {
-      reject(new Error("No such array ".concat(url)));
+      reject(new Error(`No such array ${url}`));
     } else {
       if (array.dataType === 'string') {
-        var bText = atob(txt);
-
+        let bText = atob(txt);
         if (options.compression) {
           bText = strFromU8(decompressSync(bText));
         }
-
         array.values = JSON.parse(bText);
       } else {
-        var uint8array = new Uint8Array(Base64.toArrayBuffer(txt));
-        array.buffer = new ArrayBuffer(uint8array.length); // copy uint8array to buffer
+        const uint8array = new Uint8Array(Base64.toArrayBuffer(txt));
+        array.buffer = new ArrayBuffer(uint8array.length);
 
-        var view = new Uint8Array(array.buffer);
+        // copy uint8array to buffer
+        const view = new Uint8Array(array.buffer);
         view.set(uint8array);
-
         if (options.compression) {
           if (array.dataType === 'string' || array.dataType === 'JSON') {
             array.buffer = strFromU8(decompressSync(new Uint8Array(array.buffer)));
@@ -77,62 +68,55 @@ function fetchArray(instance, baseURL, array) {
             array.buffer = decompressSync(new Uint8Array(array.buffer)).buffer;
           }
         }
-
         if (array.ref.encode === 'JSON') {
           array.values = JSON.parse(array.buffer);
         } else {
           if (Endian.ENDIANNESS !== array.ref.encode && Endian.ENDIANNESS) {
             // Need to swap bytes
-            vtkDebugMacro("Swap bytes of ".concat(array.name));
+            vtkDebugMacro(`Swap bytes of ${array.name}`);
             Endian.swapBytes(array.buffer, DataTypeByteSize[array.dataType]);
           }
-
           array.values = macro.newTypedArray(array.dataType, array.buffer);
         }
-
         if (array.values.length !== array.size) {
-          vtkErrorMacro("Error in FetchArray: ".concat(array.name, " does not have the proper array size. Got ").concat(array.values.length, ", instead of ").concat(array.size));
+          vtkErrorMacro(`Error in FetchArray: ${array.name} does not have the proper array size. Got ${array.values.length}, instead of ${array.size}`);
         }
-      } // Done with the ref and work
-
+      }
 
+      // Done with the ref and work
       delete array.ref;
-
-      if (--requestCount === 0 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+      if (--requestCount === 0 && instance?.invokeBusy) {
         instance.invokeBusy(false);
       }
-
-      if (instance !== null && instance !== void 0 && instance.modified) {
+      if (instance?.modified) {
         instance.modified();
       }
-
       resolve(array);
     }
   });
-} // ----------------------------------------------------------------------------
+}
 
+// ----------------------------------------------------------------------------
 
 function fetchImage(instance, url) {
-  return new Promise(function (resolve, reject) {
-    var img = getElement(url);
-
+  return new Promise((resolve, reject) => {
+    const img = getElement(url);
     if (img) {
       resolve(img);
     } else {
-      reject(new Error("No such image ".concat(url)));
+      reject(new Error(`No such image ${url}`));
     }
   });
-} // ----------------------------------------------------------------------------
+}
 
+// ----------------------------------------------------------------------------
 
-var HtmlDataAccessHelper = {
-  fetchJSON: fetchJSON,
-  fetchText: fetchText,
-  fetchArray: fetchArray,
-  fetchImage: fetchImage
+const HtmlDataAccessHelper = {
+  fetchJSON,
+  fetchText,
+  fetchArray,
+  fetchImage
 };
-registerType('html', function (options) {
-  return HtmlDataAccessHelper;
-}); // Export fetch methods
+registerType('html', options => HtmlDataAccessHelper);
 
 export { HtmlDataAccessHelper as default };

package/IO/Core/DataAccessHelper/HttpDataAccessHelper.js

@@ -1,50 +1,41 @@
-import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { decompressSync, strFromU8 } from 'fflate';
-import macro from '../../../macros.js';
+import { m as macro } from '../../../macros2.js';
 import Endian from '../../../Common/Core/Endian.js';
 import { DataTypeByteSize } from '../../../Common/Core/DataArray/Constants.js';
 import { registerType } from '../DataAccessHelper.js';
 
-var vtkErrorMacro = macro.vtkErrorMacro,
-    vtkDebugMacro = macro.vtkDebugMacro;
-/* eslint-disable prefer-promise-reject-errors */
+const {
+  vtkErrorMacro,
+  vtkDebugMacro
+} = macro;
 
-var requestCount = 0;
+/* eslint-disable prefer-promise-reject-errors */
 
+let requestCount = 0;
 function openAsyncXHR(method, url) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  var xhr = new XMLHttpRequest();
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  const xhr = new XMLHttpRequest();
   xhr.open(method, url, true);
-
   if (options.headers) {
-    Object.entries(options.headers).forEach(function (_ref) {
-      var _ref2 = _slicedToArray(_ref, 2),
-          key = _ref2[0],
-          value = _ref2[1];
-
+    Object.entries(options.headers).forEach(_ref => {
+      let [key, value] = _ref;
       return xhr.setRequestHeader(key, value);
     });
   }
-
   if (options.progressCallback) {
     xhr.addEventListener('progress', options.progressCallback);
   }
-
   return xhr;
 }
-
 function fetchBinary(url) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (options && options.compression && options.compression !== 'gz') {
     vtkErrorMacro('Supported algorithms are: [gz]');
-    vtkErrorMacro("Unkown compression algorithm: ".concat(options.compression));
+    vtkErrorMacro(`Unkown compression algorithm: ${options.compression}`);
   }
-
-  return new Promise(function (resolve, reject) {
-    var xhr = openAsyncXHR('GET', url, options);
-
-    xhr.onreadystatechange = function (e) {
+  return new Promise((resolve, reject) => {
+    const xhr = openAsyncXHR('GET', url, options);
+    xhr.onreadystatechange = e => {
       if (xhr.readyState === 4) {
         if (xhr.status === 200 || xhr.status === 0) {
           if (options.compression) {
@@ -54,49 +45,40 @@ function fetchBinary(url) {
           }
         } else {
           reject({
-            xhr: xhr,
-            e: e
+            xhr,
+            e
           });
         }
       }
-    }; // Make request
-
+    };
 
+    // Make request
     xhr.responseType = 'arraybuffer';
     xhr.send();
   });
 }
-
 function fetchArray(instance, baseURL, array) {
-  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-
+  let options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
   if (array.ref && !array.ref.pending) {
-    return new Promise(function (resolve, reject) {
-      var url = null;
-
+    return new Promise((resolve, reject) => {
+      let url = null;
       if (array.ref.url) {
         url = array.ref.url;
       } else {
-        url = [baseURL, array.ref.basepath, options.compression ? "".concat(array.ref.id, ".gz") : array.ref.id].join('/');
+        url = [baseURL, array.ref.basepath, options.compression ? `${array.ref.id}.gz` : array.ref.id].join('/');
       }
-
-      var xhr = openAsyncXHR('GET', url, options);
-
-      xhr.onreadystatechange = function (e) {
+      const xhr = openAsyncXHR('GET', url, options);
+      xhr.onreadystatechange = e => {
         if (xhr.readyState === 1) {
           array.ref.pending = true;
-
-          if (++requestCount === 1 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+          if (++requestCount === 1 && instance?.invokeBusy) {
             instance.invokeBusy(true);
           }
         }
-
         if (xhr.readyState === 4) {
           array.ref.pending = false;
-
           if (xhr.status === 200 || xhr.status === 0) {
             array.buffer = xhr.response;
-
             if (options.compression) {
               if (array.dataType === 'string' || array.dataType === 'JSON') {
                 array.buffer = strFromU8(decompressSync(new Uint8Array(array.buffer)));
@@ -104,71 +86,62 @@ function fetchArray(instance, baseURL, array) {
                 array.buffer = decompressSync(new Uint8Array(array.buffer)).buffer;
               }
             }
-
             if (array.ref.encode === 'JSON') {
               array.values = JSON.parse(array.buffer);
             } else {
               if (Endian.ENDIANNESS !== array.ref.encode && Endian.ENDIANNESS) {
                 // Need to swap bytes
-                vtkDebugMacro("Swap bytes of ".concat(array.name));
+                vtkDebugMacro(`Swap bytes of ${array.name}`);
                 Endian.swapBytes(array.buffer, DataTypeByteSize[array.dataType]);
               }
-
               array.values = macro.newTypedArray(array.dataType, array.buffer);
             }
-
             if (array.values.length !== array.size) {
-              vtkErrorMacro("Error in FetchArray: ".concat(array.name, ", does not have the proper array size. Got ").concat(array.values.length, ", instead of ").concat(array.size));
-            } // Done with the ref and work
-
+              vtkErrorMacro(`Error in FetchArray: ${array.name}, does not have the proper array size. Got ${array.values.length}, instead of ${array.size}`);
+            }
 
+            // Done with the ref and work
             delete array.ref;
-
-            if (--requestCount === 0 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+            if (--requestCount === 0 && instance?.invokeBusy) {
               instance.invokeBusy(false);
             }
-
-            if (instance !== null && instance !== void 0 && instance.modified) {
+            if (instance?.modified) {
               instance.modified();
             }
-
             resolve(array);
           } else {
             reject({
-              xhr: xhr,
-              e: e
+              xhr,
+              e
             });
           }
         }
-      }; // Make request
-
+      };
 
+      // Make request
       xhr.responseType = options.compression || array.dataType !== 'string' ? 'arraybuffer' : 'text';
       xhr.send();
     });
   }
-
   return Promise.resolve(array);
-} // ----------------------------------------------------------------------------
+}
 
+// ----------------------------------------------------------------------------
 
 function fetchJSON(instance, url) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return new Promise(function (resolve, reject) {
-    var xhr = openAsyncXHR('GET', url, options);
-
-    xhr.onreadystatechange = function (e) {
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  return new Promise((resolve, reject) => {
+    const xhr = openAsyncXHR('GET', url, options);
+    xhr.onreadystatechange = e => {
       if (xhr.readyState === 1) {
-        if (++requestCount === 1 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+        if (++requestCount === 1 && instance?.invokeBusy) {
           instance.invokeBusy(true);
         }
       }
-
       if (xhr.readyState === 4) {
-        if (--requestCount === 0 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+        if (--requestCount === 0 && instance?.invokeBusy) {
           instance.invokeBusy(false);
         }
-
         if (xhr.status === 200 || xhr.status === 0) {
           if (options.compression) {
             resolve(JSON.parse(strFromU8(decompressSync(new Uint8Array(xhr.response)))));
@@ -177,43 +150,39 @@ function fetchJSON(instance, url) {
           }
         } else {
           reject({
-            xhr: xhr,
-            e: e
+            xhr,
+            e
           });
         }
       }
-    }; // Make request
-
+    };
 
+    // Make request
     xhr.responseType = options.compression ? 'arraybuffer' : 'text';
     xhr.send();
   });
-} // ----------------------------------------------------------------------------
+}
 
+// ----------------------------------------------------------------------------
 
 function fetchText(instance, url) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   if (options && options.compression && options.compression !== 'gz') {
     vtkErrorMacro('Supported algorithms are: [gz]');
-    vtkErrorMacro("Unkown compression algorithm: ".concat(options.compression));
+    vtkErrorMacro(`Unkown compression algorithm: ${options.compression}`);
   }
-
-  return new Promise(function (resolve, reject) {
-    var xhr = openAsyncXHR('GET', url, options);
-
-    xhr.onreadystatechange = function (e) {
+  return new Promise((resolve, reject) => {
+    const xhr = openAsyncXHR('GET', url, options);
+    xhr.onreadystatechange = e => {
       if (xhr.readyState === 1) {
-        if (++requestCount === 1 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+        if (++requestCount === 1 && instance?.invokeBusy) {
           instance.invokeBusy(true);
         }
       }
-
       if (xhr.readyState === 4) {
-        if (--requestCount === 0 && instance !== null && instance !== void 0 && instance.invokeBusy) {
+        if (--requestCount === 0 && instance?.invokeBusy) {
           instance.invokeBusy(false);
         }
-
         if (xhr.status === 200 || xhr.status === 0) {
           if (options.compression) {
             resolve(strFromU8(decompressSync(new Uint8Array(xhr.response))));
@@ -222,51 +191,45 @@ function fetchText(instance, url) {
           }
         } else {
           reject({
-            xhr: xhr,
-            e: e
+            xhr,
+            e
           });
         }
       }
-    }; // Make request
-
+    };
 
+    // Make request
     xhr.responseType = options.compression ? 'arraybuffer' : 'text';
     xhr.send();
   });
-} // ----------------------------------------------------------------------------
+}
 
+// ----------------------------------------------------------------------------
 
 function fetchImage(instance, url) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return new Promise(function (resolve, reject) {
-    var img = new Image();
-
+  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  return new Promise((resolve, reject) => {
+    const img = new Image();
     if (options.crossOrigin) {
       img.crossOrigin = options.crossOrigin;
     }
-
-    img.onload = function () {
-      return resolve(img);
-    };
-
+    img.onload = () => resolve(img);
     img.onerror = reject;
     img.src = url;
   });
 }
 /* eslint-enable prefer-promise-reject-errors */
-// ----------------------------------------------------------------------------
 
+// ----------------------------------------------------------------------------
 
-var HttpDataAccessHelper = {
-  fetchArray: fetchArray,
-  fetchJSON: fetchJSON,
-  fetchText: fetchText,
-  fetchBinary: fetchBinary,
+const HttpDataAccessHelper = {
+  fetchArray,
+  fetchJSON,
+  fetchText,
+  fetchBinary,
   // Only for HTTP
-  fetchImage: fetchImage
+  fetchImage
 };
-registerType('http', function (options) {
-  return HttpDataAccessHelper;
-});
+registerType('http', options => HttpDataAccessHelper);
 
 export { HttpDataAccessHelper as default };