@retorquere/bibtex-parser 6.4.4 → 6.4.6

package/grammar.js

@@ -1544,7 +1544,7 @@ function peg$parse(input, options) {
   }
 
   function peg$parseField() {
-    var s0, s1, s2, s3, s4, s5, s6, s7, s8;
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
     s0 = peg$currPos;
     s1 = peg$parseFieldName();
@@ -1594,7 +1594,12 @@ function peg$parse(input, options) {
                   if (peg$silentFails === 0) { peg$fail(peg$e7); }
                 }
                 if (s7 !== peg$FAILED) {
-                  s8 = peg$parseFieldTerminator();
+                  s8 = [];
+                  s9 = peg$parseFieldTerminator();
+                  while (s9 !== peg$FAILED) {
+                    s8.push(s9);
+                    s9 = peg$parseFieldTerminator();
+                  }
                   peg$savedPos = s0;
                   s0 = peg$f11(s1, s6);
                 } else {
@@ -1641,7 +1646,12 @@ function peg$parse(input, options) {
           if (s3 !== peg$FAILED) {
             s4 = peg$parseVerbatimFieldValue();
             if (s4 !== peg$FAILED) {
-              s5 = peg$parseFieldTerminator();
+              s5 = [];
+              s6 = peg$parseFieldTerminator();
+              while (s6 !== peg$FAILED) {
+                s5.push(s6);
+                s6 = peg$parseFieldTerminator();
+              }
               peg$savedPos = s0;
               s0 = peg$f13(s1, s4);
             } else {
@@ -1668,7 +1678,12 @@ function peg$parse(input, options) {
           if (s2 !== peg$FAILED) {
             s3 = peg$parseFieldValue();
             if (s3 !== peg$FAILED) {
-              s4 = peg$parseFieldTerminator();
+              s4 = [];
+              s5 = peg$parseFieldTerminator();
+              while (s5 !== peg$FAILED) {
+                s4.push(s5);
+                s5 = peg$parseFieldTerminator();
+              }
               peg$savedPos = s0;
               s0 = peg$f14(s1, s3);
             } else {
@@ -4240,35 +4255,21 @@ function peg$parse(input, options) {
   }
 
   function peg$parseFieldTerminator() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0;
 
-    s0 = peg$currPos;
-    s1 = peg$parse__();
-    if (input.charCodeAt(peg$currPos) === 44) {
-      s2 = peg$c6;
-      peg$currPos++;
-    } else {
-      s2 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e14); }
-    }
-    if (s2 === peg$FAILED) {
-      s2 = null;
-    }
-    s3 = peg$parse__h();
-    s4 = [];
-    s5 = peg$parseLineComment();
-    if (s5 === peg$FAILED) {
-      s5 = peg$parseEOL();
-    }
-    while (s5 !== peg$FAILED) {
-      s4.push(s5);
-      s5 = peg$parseLineComment();
-      if (s5 === peg$FAILED) {
-        s5 = peg$parseEOL();
+    s0 = peg$parse_();
+    if (s0 === peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 44) {
+        s0 = peg$c6;
+        peg$currPos++;
+      } else {
+        s0 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$e14); }
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$parseLineComment();
       }
     }
-    s1 = [s1, s2, s3, s4];
-    s0 = s1;
 
     return s0;
   }

package/index.d.ts

@@ -63,6 +63,13 @@ export interface Entry {
      * will be set to `true` if sentence casing was applied to the entry
      */
     sentenceCased?: boolean;
+    /**
+     * list of fields that have been inherited/donated using crossref/xdata
+     */
+    crossref: {
+        donated: string[];
+        inherited: string[];
+    };
 }
 /**
  * Markup mapping. As the bibtex file is parsed, markup will be transformed according to this table

package/index.js

@@ -387,12 +387,16 @@ class Parser {
         }
         return this.parsed();
     }
-    applyField(parent, parentfield, child, childfield) {
+    applyCrossrefField(parent, parentfield, child, childfield) {
         let applied = false;
         for (const field of ['fields', 'creators']) {
             if (!child[field][childfield] && parent[field][parentfield]) {
                 child[field][childfield] = parent[field][parentfield];
                 applied = true;
+                if (!child.crossref.inherited.includes(childfield))
+                    child.crossref.inherited.push(childfield);
+                if (!parent.crossref.donated.includes(parentfield))
+                    parent.crossref.donated.push(parentfield);
             }
         }
         return applied;
@@ -408,11 +412,11 @@ class Parser {
                     for (const mappings of [crossref_json_1.default[entry.type], crossref_json_1.default['*']].filter(m => m)) {
                         for (const mapping of [mappings[parent.type], mappings['*']].filter(m => m)) {
                             for (const [target, source] of Object.entries(mapping)) {
-                                if (this.applyField(parent, source, entry, target))
+                                if (this.applyCrossrefField(parent, source, entry, target))
                                     applied = true;
                             }
                             for (const field of (fields_json_1.default[entry.type] || [])) {
-                                if (this.applyField(parent, field, entry, field))
+                                if (this.applyCrossrefField(parent, field, entry, field))
                                     applied = true;
                             }
                         }
@@ -1297,6 +1301,10 @@ class Parser {
             type: node.type,
             fields: {},
             creators: {},
+            crossref: {
+                inherited: [],
+                donated: [],
+            },
         };
         this.entries.push(this.entry);
         // order these first for language-dependent sentence casing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retorquere/bibtex-parser",
-  "version": "6.4.4",
+  "version": "6.4.6",
   "description": "BibTeX parser",
   "main": "index.js",
   "typings": "./index.d.ts",