Fixed the babel to ES5 transpiling.

Main problem encountered: pdfkit (version 0.8.0 and above) was not ES5 compliant
FlorianCassayre · Sep 7, 2019 · 0680bd4 · 0680bd4
1 parent d605d03
commit 0680bd4
Show file tree

Hide file tree

Showing 6 changed files with 437 additions and 76 deletions.
diff --git a/.babelrc b/.babelrc
diff --git a/assets/scripts/main.js b/assets/scripts/main.js
@@ -11,5 +11,4 @@ import './vendor/panzoom'
 import './vendor/seedrandom'
 import './vendor/parse-gedcom'
 
-import './fan'
 import './ui'
diff --git a/assets/scripts/parse.js b/assets/scripts/parse.js
@@ -265,8 +265,9 @@ function buildHierarchy(json, config) {
 }
 
 function toJson(data) {
-    const decoder = new TextDecoder("utf-8");
-    const text = decoder.decode(data);
+
+    const view = new Uint8Array(data);
+    const text = Utf8ArrayToStr(view);
     const parsed = parseGedcom.parse(text);
 
     const isAnsi = getFirst(parsed.filter(byTag(TAG_HEAD)).flatMap(a => a.tree.filter(byTag(TAG_ENCODING)).map(a => a.data)), null) === TAG_ANSI;
@@ -277,7 +278,6 @@ function toJson(data) {
         const builder = [];
         const mask = 0x80;
 
-        const view = new Uint8Array(data);
         for(let i = 0; i < view.length; i++) {
             const charCode = view[i];
             builder.push((charCode & mask) === 0 ? String.fromCharCode(charCode) : extendedAsciiTable.charAt(charCode ^ mask));
@@ -296,6 +296,40 @@ function getIndividualsList(json) {
     );
 }
 
+// http://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt
+function Utf8ArrayToStr(array) {
+    let out, i, len, c;
+    let char2, char3;
+
+    out = "";
+    len = array.length;
+    i = 0;
+    while (i < len) {
+        c = array[i++];
+        switch (c >> 4)
+        {
+            case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
+            // 0xxxxxxx
+            out += String.fromCharCode(c);
+            break;
+            case 12: case 13:
+            // 110x xxxx   10xx xxxx
+            char2 = array[i++];
+            out += String.fromCharCode(((c & 0x1F) << 6) | (char2 & 0x3F));
+            break;
+            case 14:
+                // 1110 xxxx  10xx xxxx  10xx xxxx
+                char2 = array[i++];
+                char3 = array[i++];
+                out += String.fromCharCode(((c & 0x0F) << 12) |
+                    ((char2 & 0x3F) << 6) |
+                    ((char3 & 0x3F) << 0));
+                break;
+        }
+    }
+    return out;
+}
+
 module.exports = {
     buildIndividual: buildIndividual,
     toJson: toJson,