@retorquere/bibtex-parser 6.1.2 → 6.1.4

package/grammar.js

@@ -407,7 +407,7 @@ function peg$parse(input, options) {
         kind: 'Text',
         loc: location(),
         source: text(),
-        value: (v || '').trim(),
+        value: normalizeWhitespace((v || '').trim()),
         mode: 'verbatim',
       })
     };
@@ -416,7 +416,7 @@ function peg$parse(input, options) {
         kind: 'Text',
         loc: location(),
         source: text(),
-        value: v.join('').trim(),
+        value: normalizeWhitespace(v.join('').trim()),
         mode: 'verbatim',
       })
     };
@@ -428,6 +428,15 @@ function peg$parse(input, options) {
     };
   var peg$f22 = function(v) { return v; };
   var peg$f23 = function(v) {
+      return basicTextConversions({
+        kind: 'Text',
+        loc: location(),
+        source: text(),
+        value: v.join('').trim(),
+        mode: 'verbatim',
+      })
+    };
+  var peg$f24 = function(v) {
       return basicTextConversions({
         kind: 'Text',
         loc: location(),
@@ -436,7 +445,7 @@ function peg$parse(input, options) {
         mode: math.on ? 'math' : 'text',
       })
     };
-  var peg$f24 = function(v) {
+  var peg$f25 = function(v) {
       return {
         kind: 'Number',
         loc: location(),
@@ -444,7 +453,7 @@ function peg$parse(input, options) {
         value: parseInt(v, 10),
       }
     };
-  var peg$f25 = function(v) {
+  var peg$f26 = function(v) {
       return {
         kind: 'StringReference',
         loc: location(),
@@ -452,8 +461,8 @@ function peg$parse(input, options) {
         name: v,
       }
     };
-  var peg$f26 = function(env, v, cenv) { return env === cenv };
-  var peg$f27 = function(env, v, cenv) {
+  var peg$f27 = function(env, v, cenv) { return env === cenv };
+  var peg$f28 = function(env, v, cenv) {
       if (markup[env]) {
         return {
           kind: 'Block',
@@ -472,7 +481,7 @@ function peg$parse(input, options) {
         }
       }
     };
-  var peg$f28 = function(mark, char) {
+  var peg$f29 = function(mark, char) {
       return {
         kind: 'DiacriticCommand',
         loc: location(),
@@ -482,7 +491,7 @@ function peg$parse(input, options) {
         character: char[1] || char[0],
       }
     };
-  var peg$f29 = function(v) {
+  var peg$f30 = function(v) {
         return basicTextConversions({
           kind: 'Text',
           loc: location(),
@@ -491,7 +500,7 @@ function peg$parse(input, options) {
           mode: 'verbatim',
         })
     };
-  var peg$f30 = function(v) {
+  var peg$f31 = function(v) {
       const block = {
         kind: 'Block',
         loc: location(),
@@ -525,10 +534,10 @@ function peg$parse(input, options) {
 
       return handle_markup_switches(block)
     };
-  var peg$f31 = function() { return !math.on };
-  var peg$f32 = function(mode) { return math.set(true) };
-  var peg$f33 = function(mode, v) { return math.set(false) };
-  var peg$f34 = function(mode, v) {
+  var peg$f32 = function() { return !math.on };
+  var peg$f33 = function(mode) { return math.set(true) };
+  var peg$f34 = function(mode, v) { return math.set(false) };
+  var peg$f35 = function(mode, v) {
       return {
         kind: mode == '$$' ? 'DisplayMath' : 'InlineMath',
         loc: location(),
@@ -538,7 +547,7 @@ function peg$parse(input, options) {
         markup: {},
       }
     };
-  var peg$f35 = function(v) {
+  var peg$f36 = function(v) {
       return {
         kind: 'LineComment',
         loc: location(),
@@ -546,7 +555,7 @@ function peg$parse(input, options) {
         value: v,
       }
     };
-  var peg$f36 = function(mode, v) {
+  var peg$f37 = function(mode, v) {
       if (v.kind === 'Block') v = v.value
 
       return {
@@ -556,7 +565,7 @@ function peg$parse(input, options) {
         value: v,
       }
     };
-  var peg$f37 = function(mark, v) {
+  var peg$f38 = function(mark, v) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -568,7 +577,7 @@ function peg$parse(input, options) {
         },
       }
     };
-  var peg$f38 = function(v) {
+  var peg$f39 = function(v) {
       return {
         kind: 'SymbolCommand',
         loc: location(),
@@ -576,8 +585,8 @@ function peg$parse(input, options) {
         command: v,
       }
     };
-  var peg$f39 = function(cmd, name) { return name.value.length == 1 && name.value[0].kind === 'RegularCommand' };
-  var peg$f40 = function(cmd, name, optional, def) {
+  var peg$f40 = function(cmd, name) { return name.value.length == 1 && name.value[0].kind === 'RegularCommand' };
+  var peg$f41 = function(cmd, name, optional, def) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -589,7 +598,7 @@ function peg$parse(input, options) {
         },
       }
     };
-  var peg$f41 = function(cmd, url, label) {
+  var peg$f42 = function(cmd, url, label) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -601,8 +610,8 @@ function peg$parse(input, options) {
         },
       }
     };
-  var peg$f42 = function(cmd) { return verbatimCommands.includes(cmd) && (has_arguments[cmd] === 2) };
-  var peg$f43 = function(cmd, optional, req1, req2) {
+  var peg$f43 = function(cmd) { return verbatimCommands.includes(cmd) && (has_arguments[cmd] === 2) };
+  var peg$f44 = function(cmd, optional, req1, req2) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -614,8 +623,8 @@ function peg$parse(input, options) {
         },
       }
     };
-  var peg$f44 = function(cmd) { return verbatimCommands.includes(cmd) && (has_arguments[cmd] === 1) };
-  var peg$f45 = function(cmd, optional, req) {
+  var peg$f45 = function(cmd) { return verbatimCommands.includes(cmd) && (has_arguments[cmd] === 1) };
+  var peg$f46 = function(cmd, optional, req) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -627,8 +636,8 @@ function peg$parse(input, options) {
         },
       }
     };
-  var peg$f46 = function(cmd) { return (has_arguments[cmd] === 2) };
-  var peg$f47 = function(cmd, optional, req1, req2) {
+  var peg$f47 = function(cmd) { return (has_arguments[cmd] === 2) };
+  var peg$f48 = function(cmd, optional, req1, req2) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -640,8 +649,8 @@ function peg$parse(input, options) {
         },
       }
     };
-  var peg$f48 = function(cmd) { return (has_arguments[cmd] === 1) };
-  var peg$f49 = function(cmd, optional, req) {
+  var peg$f49 = function(cmd) { return (has_arguments[cmd] === 1) };
+  var peg$f50 = function(cmd, optional, req) {
       let m
       if (req.kind === 'Block') {
         switch (cmd) {
@@ -691,7 +700,7 @@ function peg$parse(input, options) {
         }
       }
     };
-  var peg$f50 = function(cmd, optional) {
+  var peg$f51 = function(cmd, optional) {
       return {
         kind: 'RegularCommand',
         loc: location(),
@@ -703,7 +712,7 @@ function peg$parse(input, options) {
         }
       }
     };
-  var peg$f51 = function(v) {
+  var peg$f52 = function(v) {
       return basicTextConversions({
         kind: 'Text', // this isn't really correct but I don't need these right now
         loc: location(),
@@ -712,7 +721,7 @@ function peg$parse(input, options) {
         mode: math.on ? 'math' : 'text',
       })
     };
-  var peg$f52 = function(v) {
+  var peg$f53 = function(v) {
       return basicTextConversions({
         kind: 'Text',
         loc: location(),
@@ -2034,7 +2043,7 @@ function peg$parse(input, options) {
               s5 = null;
             }
             peg$savedPos = s0;
-            s0 = peg$f17(s3);
+            s0 = peg$f23(s3);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2178,7 +2187,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23(s1);
+      s1 = peg$f24(s1);
     }
     s0 = s1;
 
@@ -2213,7 +2222,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f23(s1);
+      s1 = peg$f24(s1);
     }
     s0 = s1;
 
@@ -2254,7 +2263,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f24(s1);
+      s1 = peg$f25(s1);
     }
     s0 = s1;
 
@@ -2268,7 +2277,7 @@ function peg$parse(input, options) {
     s1 = peg$parseVariableName();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f25(s1);
+      s1 = peg$f26(s1);
     }
     s0 = s1;
 
@@ -2400,7 +2409,7 @@ function peg$parse(input, options) {
               }
               if (s7 !== peg$FAILED) {
                 peg$savedPos = peg$currPos;
-                s8 = peg$f26(s2, s4, s6);
+                s8 = peg$f27(s2, s4, s6);
                 if (s8) {
                   s8 = undefined;
                 } else {
@@ -2408,7 +2417,7 @@ function peg$parse(input, options) {
                 }
                 if (s8 !== peg$FAILED) {
                   peg$savedPos = s0;
-                  s0 = peg$f27(s2, s4, s6);
+                  s0 = peg$f28(s2, s4, s6);
                 } else {
                   peg$currPos = s0;
                   s0 = peg$FAILED;
@@ -2502,7 +2511,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f28(s2, s4);
+            s0 = peg$f29(s2, s4);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2561,7 +2570,7 @@ function peg$parse(input, options) {
           }
           if (s4 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f29(s3);
+            s0 = peg$f30(s3);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2623,7 +2632,7 @@ function peg$parse(input, options) {
           }
           if (s3 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f30(s2);
+            s0 = peg$f31(s2);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2643,7 +2652,7 @@ function peg$parse(input, options) {
 
     s0 = peg$currPos;
     peg$savedPos = peg$currPos;
-    s1 = peg$f31();
+    s1 = peg$f32();
     if (s1) {
       s1 = undefined;
     } else {
@@ -2677,7 +2686,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = peg$currPos;
-        s3 = peg$f32(s2);
+        s3 = peg$f33(s2);
         if (s3) {
           s3 = undefined;
         } else {
@@ -2729,7 +2738,7 @@ function peg$parse(input, options) {
           }
           if (s5 !== peg$FAILED) {
             peg$savedPos = peg$currPos;
-            s6 = peg$f33(s2, s4);
+            s6 = peg$f34(s2, s4);
             if (s6) {
               s6 = undefined;
             } else {
@@ -2737,7 +2746,7 @@ function peg$parse(input, options) {
             }
             if (s6 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f34(s2, s4);
+              s0 = peg$f35(s2, s4);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -2816,7 +2825,7 @@ function peg$parse(input, options) {
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f35(s3);
+          s0 = peg$f36(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -2866,7 +2875,7 @@ function peg$parse(input, options) {
       s3 = peg$parseArgument();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s1, s3);
+        s0 = peg$f37(s1, s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2932,7 +2941,7 @@ function peg$parse(input, options) {
         }
         if (s4 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f28(s2, s4);
+          s0 = peg$f29(s2, s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3011,7 +3020,7 @@ function peg$parse(input, options) {
               }
               if (s5 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f28(s2, s4);
+                s0 = peg$f29(s2, s4);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -3064,7 +3073,7 @@ function peg$parse(input, options) {
               s4 = peg$parseRegularValue();
               if (s4 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f37(s2, s4);
+                s0 = peg$f38(s2, s4);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -3114,7 +3123,7 @@ function peg$parse(input, options) {
       }
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f38(s2);
+        s0 = peg$f39(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -3150,7 +3159,7 @@ function peg$parse(input, options) {
         s3 = peg$parseBlock();
         if (s3 !== peg$FAILED) {
           peg$savedPos = peg$currPos;
-          s4 = peg$f39(s2, s3);
+          s4 = peg$f40(s2, s3);
           if (s4) {
             s4 = undefined;
           } else {
@@ -3166,7 +3175,7 @@ function peg$parse(input, options) {
             s6 = peg$parseArgument();
             if (s6 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f40(s2, s3, s5, s6);
+              s0 = peg$f41(s2, s3, s5, s6);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -3228,7 +3237,7 @@ function peg$parse(input, options) {
               s6 = peg$parseArgument();
               if (s6 !== peg$FAILED) {
                 peg$savedPos = s0;
-                s0 = peg$f41(s2, s5, s6);
+                s0 = peg$f42(s2, s5, s6);
               } else {
                 peg$currPos = s0;
                 s0 = peg$FAILED;
@@ -3323,7 +3332,7 @@ function peg$parse(input, options) {
               }
               if (s4 !== peg$FAILED) {
                 peg$savedPos = peg$currPos;
-                s5 = peg$f42(s4);
+                s5 = peg$f43(s4);
                 if (s5) {
                   s5 = undefined;
                 } else {
@@ -3359,7 +3368,7 @@ function peg$parse(input, options) {
                       s10 = peg$parseVerbatimFieldValue();
                       if (s10 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f43(s4, s6, s9, s10);
+                        s0 = peg$f44(s4, s6, s9, s10);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -3466,7 +3475,7 @@ function peg$parse(input, options) {
                 }
                 if (s4 !== peg$FAILED) {
                   peg$savedPos = peg$currPos;
-                  s5 = peg$f44(s4);
+                  s5 = peg$f45(s4);
                   if (s5) {
                     s5 = undefined;
                   } else {
@@ -3500,7 +3509,7 @@ function peg$parse(input, options) {
                       s9 = peg$parseVerbatimFieldValue();
                       if (s9 !== peg$FAILED) {
                         peg$savedPos = s0;
-                        s0 = peg$f45(s4, s6, s9);
+                        s0 = peg$f46(s4, s6, s9);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -3603,7 +3612,7 @@ function peg$parse(input, options) {
                   }
                   if (s4 !== peg$FAILED) {
                     peg$savedPos = peg$currPos;
-                    s5 = peg$f46(s4);
+                    s5 = peg$f47(s4);
                     if (s5) {
                       s5 = undefined;
                     } else {
@@ -3622,7 +3631,7 @@ function peg$parse(input, options) {
                         s9 = peg$parseArgument();
                         if (s9 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s0 = peg$f47(s4, s6, s8, s9);
+                          s0 = peg$f48(s4, s6, s8, s9);
                         } else {
                           peg$currPos = s0;
                           s0 = peg$FAILED;
@@ -3725,7 +3734,7 @@ function peg$parse(input, options) {
                     }
                     if (s4 !== peg$FAILED) {
                       peg$savedPos = peg$currPos;
-                      s5 = peg$f48(s4);
+                      s5 = peg$f49(s4);
                       if (s5) {
                         s5 = undefined;
                       } else {
@@ -3742,7 +3751,7 @@ function peg$parse(input, options) {
                         s8 = peg$parseArgument();
                         if (s8 !== peg$FAILED) {
                           peg$savedPos = s0;
-                          s0 = peg$f49(s4, s6, s8);
+                          s0 = peg$f50(s4, s6, s8);
                         } else {
                           peg$currPos = s0;
                           s0 = peg$FAILED;
@@ -3848,7 +3857,7 @@ function peg$parse(input, options) {
                         }
                         s6 = peg$parse__();
                         peg$savedPos = s0;
-                        s0 = peg$f50(s4, s5);
+                        s0 = peg$f51(s4, s5);
                       } else {
                         peg$currPos = s0;
                         s0 = peg$FAILED;
@@ -3927,7 +3936,7 @@ function peg$parse(input, options) {
         }
         if (s5 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f51(s3);
+          s0 = peg$f52(s3);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -3958,7 +3967,7 @@ function peg$parse(input, options) {
     }
     if (s2 !== peg$FAILED) {
       peg$savedPos = s0;
-      s0 = peg$f52(s2);
+      s0 = peg$f53(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -4394,6 +4403,8 @@ function peg$parse(input, options) {
     }
 
     function normalizeWhitespace(textArr) {
+      if (typeof textArr === 'string') textArr = Array.from(textArr)
+
       return textArr.reduce((prev, curr) => {
         if (/\s/.test(curr)) {
           if (/\s/.test(prev[prev.length - 1])) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retorquere/bibtex-parser",
-  "version": "6.1.2",
+  "version": "6.1.4",
   "description": "BibTeX parser",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "start": "tsc -d",
     "poststart": "npm run docs",
     "pretest": "npm start",
-    "test": "./test/tap",
+    "test": "tap test/tap --no-timeout --no-coverage",
     "snap": "npm test --snapshot",
     "snap:big": "npm test --snapshot --big",
     "minitest": "peggy grammar.peggy && tsc -d && node i.js",