Merge pull request #2118 from floryst/improve-esm-and-ci

Improve esm and ci

Author: floryst

Sources/Common/Core/Base64/index.d.ts

@@ -4,7 +4,19 @@
 
 /**
  * Convert a Base64 string to an ArrayBuffer.
- * @param {string} b64Str 
+ * @param {string} b64Str
  * @return An ArrayBuffer object.
  */
-export default function toArrayBuffer(b64Str: string): ArrayBuffer;
+export function toArrayBuffer(b64Str: string): ArrayBuffer;
+
+/**
+ * Convert a Base64 string to an ArrayBuffer.
+ * @param {string} b64Str
+ * @return An ArrayBuffer object.
+ */
+export function fromArrayBuffer(ab: ArrayBuffer): string;
+
+export default {
+  toArrayBuffer,
+  fromArrayBuffer,
+};

Sources/Common/Core/Base64/index.js

@@ -119,7 +119,7 @@ function writeChunk(b64Str, chunk, dstOffset, uint8) {
   return offset;
 }
 
-function toArrayBuffer(b64Str) {
+export function toArrayBuffer(b64Str) {
   const chunks = extractChunks(b64Str);
   const totalEncodedLength = chunks[chunks.length - 1].end + 1;
   const padding = (4 - (totalEncodedLength % 4)) % 4; // -length mod 4
@@ -138,6 +138,45 @@ function toArrayBuffer(b64Str) {
   return arrayBuffer;
 }
 
+function encodeTriplet(v1, v2, v3) {
+  const triplet = (v1 << 16) + (v2 << 8) + v3;
+  return (
+    BASE64_CODE[triplet >> 18] +
+    BASE64_CODE[(triplet >> 12) & 0x3f] +
+    BASE64_CODE[(triplet >> 6) & 0x3f] +
+    BASE64_CODE[triplet & 0x3f]
+  );
+}
+
+export function fromArrayBuffer(ab) {
+  const uint8 = new Uint8Array(ab);
+  const leftoverLength = ab.byteLength % 3;
+  const maxTripletIndex = ab.byteLength - leftoverLength;
+  const segments = Array(maxTripletIndex / 3);
+  for (let i = 0; i < segments.length; i++) {
+    const bufOffset = i * 3;
+    segments[i] = encodeTriplet(
+      uint8[bufOffset],
+      uint8[bufOffset + 1],
+      uint8[bufOffset + 2]
+    );
+  }
+  if (leftoverLength > 0) {
+    const segment = encodeTriplet(
+      uint8[maxTripletIndex],
+      uint8[maxTripletIndex + 1] || 0,
+      uint8[maxTripletIndex + 2] || 0
+    );
+    if (leftoverLength === 1) {
+      segments.push(`${segment.substr(0, 2)}==`);
+    } else if (leftoverLength === 2) {
+      segments.push(`${segment.substr(0, 3)}=`);
+    }
+  }
+  return segments.join('');
+}
+
 export default {
   toArrayBuffer,
+  fromArrayBuffer,
 };

Sources/IO/Core/BinaryHelper/index.js

@@ -5,17 +5,8 @@
  * expect proper Unicode or any other encoding.
  */
 function arrayBufferToString(arrayBuffer) {
-  if (typeof 'TextDecoder' !== 'undefined') {
-    const decoder = new TextDecoder('latin1');
-    return decoder.decode(arrayBuffer);
-  }
-  // fallback on platforms w/o TextDecoder
-  const byteArray = new Uint8Array(arrayBuffer);
-  const strArr = [];
-  for (let i = 0; i < byteArray.length; ++i) {
-    strArr[i] = String.fromCharCode(byteArray[i]);
-  }
-  return strArr.join('');
+  const decoder = new TextDecoder('latin1');
+  return decoder.decode(arrayBuffer);
 }
 
 /**

Sources/IO/XML/XMLWriter/index.js

@@ -1,8 +1,8 @@
 import { create } from 'xmlbuilder2';
-import { fromByteArray } from 'base64-js';
 import pako from 'pako';
 
 import macro from 'vtk.js/Sources/macros';
+import { fromArrayBuffer } from 'vtk.js/Sources/Common/Core/Base64';
 import {
   FormatTypes,
   TYPED_ARRAY,
@@ -75,7 +75,9 @@ function processDataArray(
         uint8.set(blocks[blockId], uint8Offset);
         uint8Offset += header[3 + blockId];
       }
-      return fromByteArray(headerUint8) + fromByteArray(uint8);
+      return (
+        fromArrayBuffer(headerUint8.buffer) + fromArrayBuffer(uint8.buffer)
+      );
     }
     throw new Error('Only vtkZLibDataCompressor is supported');
   }

package-lock.json

@@ -104,11 +104,11 @@
     "prettier": "2.4.0",
     "process": "0.11.10",
     "rollup": "2.56.3",
+    "rollup-plugin-auto-external": "2.0.0",
     "rollup-plugin-copy": "3.4.0",
     "rollup-plugin-ignore": "1.0.10",
     "rollup-plugin-polyfill-node": "0.7.0",
     "rollup-plugin-postcss": "4.0.1",
-    "rollup-plugin-re": "1.0.7",
     "rollup-plugin-string": "3.0.0",
     "rollup-plugin-svgo": "1.1.0",
     "rollup-plugin-web-worker-loader": "1.6.1",

package.json

@@ -12,11 +12,13 @@ import json from '@rollup/plugin-json';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 import { nodeResolve } from '@rollup/plugin-node-resolve';
 import postcss from 'rollup-plugin-postcss';
-import replace from 'rollup-plugin-re';
 import { string } from 'rollup-plugin-string';
 import svgo from 'rollup-plugin-svgo';
 import webworkerLoader from 'rollup-plugin-web-worker-loader';
 import copy from 'rollup-plugin-copy';
+import autoExternal from 'rollup-plugin-auto-external';
+
+import packageJSON from './package.json';
 
 import { rewriteFilenames } from './Utilities/rollup/plugin-rewrite-filenames';
 
@@ -95,39 +97,9 @@ export default {
       return name.replace(/^Sources[/\\]/, '');
     },
   },
-  external: [/@babel\/runtime/],
+  external: Object.keys(packageJSON.dependencies).map((name) => new RegExp(`^${name}`)),
   plugins: [
-    // should be before commonjs
-    replace({
-      patterns: [
-        {
-          // match against jszip/lib/load.js
-          // Workaround until https://github.com/Stuk/jszip/pull/731 is merged
-          include: path.resolve(
-            __dirname,
-            'node_modules',
-            'jszip',
-            'lib',
-            'load.js'
-          ),
-          test: /'use strict';\nvar utils = require\('.\/utils'\);/m,
-          replace: "'use strict'",
-        },
-        {
-          // match against jszip/lib/compressedObject.js
-          // Workaround until https://github.com/Stuk/jszip/pull/731 is merged
-          include: path.resolve(
-            __dirname,
-            'node_modules',
-            'jszip',
-            'lib',
-            'compressedObject.js'
-          ),
-          test: /Crc32Probe'\);\nvar DataLengthProbe = require\('.\/stream\/DataLengthProbe'\);/m,
-          replace: "Crc32Probe');\n",
-        },
-      ],
-    }),
+    autoExternal(),
     alias({
       entries: [
         { find: 'vtk.js', replacement: path.resolve(__dirname) },