@canopycanopycanopy/b-ber-parser-footnotes 1.2.16 → 2.0.2

package/dist/counter.js

@@ -1,26 +1,19 @@
 "use strict";
 
 var _Object$defineProperty = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 _Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.default = void 0;
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
-
 // Keep track of footnotes that have been rendered to start new ordered lists at
 // proper count
 class Counter {
   constructor() {
     (0, _defineProperty2.default)(this, "setRef", label => {
       const hash = _crypto.default.randomBytes(8).toString('hex');
-
       const idRef = `-${label}-${hash}`;
       this.refs.push(idRef);
       return idRef;
@@ -31,7 +24,6 @@ class Counter {
     this.item = 1;
     this.refs = [];
   }
-
   listCounter(grouped, page) {
     // Reset all counters if the footnotes list is empty. This occurs when
     // running `bber serve`
@@ -40,38 +32,30 @@ class Counter {
       this.item = 1;
       this.list = 1;
     }
-
     if (!grouped) {
       return this.item;
     }
-
     if (page !== this.page) {
       this.list = 1;
     } else {
       this.list += 1;
     }
-
     return this.list;
   }
-
   listItemCounter(grouped, page) {
     if (!grouped) {
       const n = this.item;
       this.item += 1;
       return n;
     }
-
     if (page !== this.page) {
       this.page = page;
       this.item = 1;
     } else {
       this.item += 1;
     }
-
     return this.item;
   }
-
 }
-
 var _default = Counter;
 exports.default = _default;

package/dist/index.js

@@ -1,23 +1,14 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
 var _isArray = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/is-array"));
-
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _lodash = _interopRequireDefault(require("lodash.isundefined"));
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _counter = _interopRequireDefault(require("./counter"));
-
 /* eslint-disable camelcase */
-
 /* eslint-disable no-param-reassign,no-plusplus */
 
 /*
@@ -25,51 +16,43 @@ Modified version of markdown-it-footnote@3.0.1
 https://github.com//markdown-it/markdown-it-footnote
 MIT license
 */
-const counter = new _counter.default();
 
+const counter = new _counter.default();
 function renderFootnoteAnchorName(tokens, idx, _options, env, _slf) {
   const n = Number(tokens[idx].meta.id + 1).toString();
   return typeof env.docId === 'string' ? `-${env.docId}-${n}` : '';
 }
-
 function renderFootnoteCaption(tokens, idx, _options, _env, _slf) {
   let n;
-
   if (!_State.default.config.group_footnotes) {
     n = counter.listItemCounter(_State.default.config.group_footnotes, _State.default.footnotes.length);
   } else {
     n = Number(tokens[idx].meta.id + 1);
   }
-
   return tokens[idx].meta.subId > 0 ? `${n}:${tokens[idx].meta.subId}` : n;
 }
-
 function renderFootnoteRef(tokens, idx, options, env, slf) {
   const caption = slf.rules.footnote_caption(tokens, idx, options, env, slf);
   const ref = counter.getRef();
   return `<a epub:type="noteref" class="footnote-ref" href="notes.xhtml#fn${ref}" id="fnref${ref}">${caption}</a>`;
 }
-
-function renderFootnoteBlockOpen()
-/* tokens, idx, options */
-{
+function /* tokens, idx, options */
+renderFootnoteBlockOpen() {
   const start = counter.listCounter(_State.default.config.group_footnotes, _State.default.footnotes.length);
   return `<ol class="footnotes" start="${start}">`;
 }
-
 function renderFootnoteBlockClose() {
   return '</ol>';
 }
-
 function renderFootnoteOpen(tokens, idx, _options, env, _self) {
   const ref = counter.setRef(tokens[idx].meta.label);
-  const childIndex = idx + 2; // push the backlink into the parent paragraph
+  const childIndex = idx + 2;
 
+  // push the backlink into the parent paragraph
   if (tokens[childIndex]) {
     if (!(0, _isArray.default)(tokens[childIndex].children)) {
       tokens[childIndex].children = [];
     }
-
     tokens[childIndex].children.push({
       type: 'inline',
       attrs: [['hidden', 'hidden'], ['class', 'hidden-backlink']],
@@ -95,22 +78,17 @@ function renderFootnoteOpen(tokens, idx, _options, env, _self) {
       nesting: -1
     });
   }
-
   return `<li class="footnote" epub:type="footnote" id="fn${ref}">`;
 }
-
 function renderFootnoteClose() {
   return '</li>';
 }
-
-function renderFootnoteAnchor()
-/*tokens, idx, options,env, slf */
-{
+function /*tokens, idx, options,env, slf */
+renderFootnoteAnchor() {
   /* ↩ with escape code to prevent display as Apple Emoji on iOS */
   // return ' <a href="#fnref' + id + '">\u21a9\uFE0E</a>';
   return '';
 }
-
 module.exports = function footnotePlugin(md, callback) {
   const {
     parseLinkLabel
@@ -123,49 +101,40 @@ module.exports = function footnotePlugin(md, callback) {
   md.renderer.rules.footnote_block_close = renderFootnoteBlockClose;
   md.renderer.rules.footnote_open = renderFootnoteOpen;
   md.renderer.rules.footnote_close = renderFootnoteClose;
-  md.renderer.rules.footnote_anchor = renderFootnoteAnchor; // helpers (only used in other rules, no tokens are attached to those)
+  md.renderer.rules.footnote_anchor = renderFootnoteAnchor;
 
+  // helpers (only used in other rules, no tokens are attached to those)
   md.renderer.rules.footnote_caption = renderFootnoteCaption;
-  md.renderer.rules.footnoteAnchorName = renderFootnoteAnchorName; // Process footnote block definition
+  md.renderer.rules.footnoteAnchorName = renderFootnoteAnchorName;
 
+  // Process footnote block definition
   function footnoteDef(state, startLine, endLine, silent) {
     var _context;
-
     const start = state.bMarks[startLine] + state.tShift[startLine];
     const max = state.eMarks[startLine];
     let pos;
     let token;
     let offset;
-    let ch; // line should be at least 5 chars - "[^x]:"
+    let ch;
 
+    // line should be at least 5 chars - "[^x]:"
     if (start + 4 > max) return false;
-    if (state.src.charCodeAt(start) !== 0x5b
-    /* [ */
-    ) return false;
-    if (state.src.charCodeAt(start + 1) !== 0x5e
-    /* ^ */
-    ) return false;
-
+    if (state.src.charCodeAt(start) !== 0x5b /* [ */) return false;
+    if (state.src.charCodeAt(start + 1) !== 0x5e /* ^ */) return false;
     for (pos = start + 2; pos < max; pos++) {
       if (state.src.charCodeAt(pos) === 0x20) return false;
-
-      if (state.src.charCodeAt(pos) === 0x5d
-      /* ] */
-      ) {
-          break;
-        }
+      if (state.src.charCodeAt(pos) === 0x5d /* ] */) {
+        break;
+      }
     }
-
     if (pos === start + 2) return false; // no empty footnote labels
-
-    if (pos + 1 >= max || state.src.charCodeAt(++pos) !== 0x3a
-    /* : */
-    ) {
-        return false;
-      }
-
+    if (pos + 1 >= max || state.src.charCodeAt(++pos) !== 0x3a /* : */) {
+      return false;
+    }
     if (silent) return true;
-    pos++; // Footnote is found, start parsing footnote body here
+    pos++;
+
+    // Footnote is found, start parsing footnote body here
 
     if (!state.env.footnotes) state.env.footnotes = {};
     if (!state.env.footnotes.refs) state.env.footnotes.refs = {};
@@ -181,13 +150,12 @@ module.exports = function footnotePlugin(md, callback) {
     const oldTShift = state.tShift[startLine];
     const oldSCount = state.sCount[startLine];
     const oldParentType = state.parentType;
-    const posAfterColon = pos; // eslint-disable-next-line no-multi-assign
+    const posAfterColon = pos;
 
+    // eslint-disable-next-line no-multi-assign
     const initial = offset = state.sCount[startLine] + pos - (state.bMarks[startLine] + state.tShift[startLine]);
-
     while (pos < max) {
       ch = state.src.charCodeAt(pos);
-
       if (isSpace(ch)) {
         if (ch === 0x09) {
           offset += 4 - offset % 4;
@@ -197,20 +165,16 @@ module.exports = function footnotePlugin(md, callback) {
       } else {
         break;
       }
-
       pos++;
     }
-
     state.tShift[startLine] = pos - posAfterColon;
     state.sCount[startLine] = offset - initial;
     state.bMarks[startLine] = posAfterColon;
     state.blkIndent += 4;
     state.parentType = 'footnote';
-
     if (state.sCount[startLine] < state.blkIndent) {
       state.sCount[startLine] += state.blkIndent;
     }
-
     state.md.block.tokenize(state, startLine, endLine, true);
     state.parentType = oldParentType;
     state.blkIndent -= 4;
@@ -221,9 +185,9 @@ module.exports = function footnotePlugin(md, callback) {
     token.level = --state.level;
     state.tokens.push(token);
     return true;
-  } // Process inline footnotes (^[...])
-
+  }
 
+  // Process inline footnotes (^[...])
   function footnoteInline(state, silent) {
     const max = state.posMax;
     const start = state.pos;
@@ -231,21 +195,18 @@ module.exports = function footnotePlugin(md, callback) {
     let token;
     let tokens;
     if (start + 2 >= max) return false;
-    if (state.src.charCodeAt(start) !== 0x5e
-    /* ^ */
-    ) return false;
-    if (state.src.charCodeAt(start + 1) !== 0x5b
-    /* [ */
-    ) return false;
+    if (state.src.charCodeAt(start) !== 0x5e /* ^ */) return false;
+    if (state.src.charCodeAt(start + 1) !== 0x5b /* [ */) return false;
     const labelStart = start + 2;
-    const labelEnd = parseLinkLabel(state, start + 1); // Failed to find ']', so it's not a valid note
+    const labelEnd = parseLinkLabel(state, start + 1);
 
-    if (labelEnd < 0) return false; // Found the end of the link, and know for a fact it's a valid link; so
-    // all that's left to do is to call tokenizer.
+    // Failed to find ']', so it's not a valid note
+    if (labelEnd < 0) return false;
 
+    // Found the end of the link, and know for a fact it's a valid link; so
+    // all that's left to do is to call tokenizer.
     if (!silent) {
       var _context2;
-
       if (!state.env.footnotes) state.env.footnotes = {};
       if (!state.env.footnotes.list) state.env.footnotes.list = [];
       footnoteId = state.env.footnotes.list.length;
@@ -258,50 +219,38 @@ module.exports = function footnotePlugin(md, callback) {
         tokens
       };
     }
-
     state.pos = labelEnd + 1;
     state.posMax = max;
     return true;
-  } // Process footnote references ([^...])
-
+  }
 
+  // Process footnote references ([^...])
   function footnoteRef(state, silent) {
     var _context3;
-
     const max = state.posMax;
     const start = state.pos;
     let pos;
     let footnoteId;
     let footnoteSubId;
-    let token; // should be at least 4 chars - "[^x]"
+    let token;
 
+    // should be at least 4 chars - "[^x]"
     if (start + 3 > max) return false;
     if (!state.env.footnotes || !state.env.footnotes.refs) return false;
-    if (state.src.charCodeAt(start) !== 0x5b
-    /* [ */
-    ) return false;
-    if (state.src.charCodeAt(start + 1) !== 0x5e
-    /* ^ */
-    ) return false;
-
+    if (state.src.charCodeAt(start) !== 0x5b /* [ */) return false;
+    if (state.src.charCodeAt(start + 1) !== 0x5e /* ^ */) return false;
     for (pos = start + 2; pos < max; pos++) {
       if (state.src.charCodeAt(pos) === 0x20) return false;
       if (state.src.charCodeAt(pos) === 0x0a) return false;
-      if (state.src.charCodeAt(pos) === 0x5d
-      /* ] */
-      ) break;
+      if (state.src.charCodeAt(pos) === 0x5d /* ] */) break;
     }
-
     if (pos === start + 2) return false; // no empty footnote labels
-
     if (pos >= max) return false;
     pos++;
     const label = (0, _slice.default)(_context3 = state.src).call(_context3, start + 2, pos - 1);
     if ((0, _lodash.default)(state.env.footnotes.refs[`:${label}`])) return false;
-
     if (!silent) {
       if (!state.env.footnotes.list) state.env.footnotes.list = [];
-
       if (state.env.footnotes.refs[`:${label}`] < 0) {
         footnoteId = state.env.footnotes.list.length;
         state.env.footnotes.list[footnoteId] = {
@@ -312,7 +261,6 @@ module.exports = function footnotePlugin(md, callback) {
       } else {
         footnoteId = state.env.footnotes.refs[`:${label}`];
       }
-
       footnoteSubId = state.env.footnotes.list[footnoteId].count;
       state.env.footnotes.list[footnoteId].count++;
       token = state.push('footnote_ref', '', 0);
@@ -322,16 +270,14 @@ module.exports = function footnotePlugin(md, callback) {
         label
       };
     }
-
     state.pos = pos;
     state.posMax = max;
     return true;
-  } // Glue footnote tokens to end of token stream
-
+  }
 
+  // Glue footnote tokens to end of token stream
   function footnoteTail(state) {
     var _context4, _context6, _context7;
-
     const refTokens = {};
     let i;
     let l;
@@ -352,14 +298,12 @@ module.exports = function footnotePlugin(md, callback) {
         currentLabel = tok.meta.label;
         return false;
       }
-
       if (tok.type === 'footnote_reference_close') {
-        insideRef = false; // prepend ':' to avoid conflict with Object.prototype members
-
+        insideRef = false;
+        // prepend ':' to avoid conflict with Object.prototype members
         refTokens[`:${currentLabel}`] = current;
         return false;
       }
-
       if (insideRef) current.push(tok);
       return !insideRef;
     });
@@ -369,17 +313,14 @@ module.exports = function footnotePlugin(md, callback) {
     } = state.env.footnotes;
     token = new state.Token('footnote_block_open', '', 1);
     state.tokens.push(token);
-
     for (i = 0, l = list.length; i < l; i++) {
       var _context5;
-
       token = new state.Token('footnote_open', '', 1);
       token.meta = {
         id: i,
         label: list[i].label
       };
       state.tokens.push(token);
-
       if (list[i].tokens) {
         tokens = [];
         token = new state.Token('paragraph_open', 'p', 1);
@@ -395,17 +336,13 @@ module.exports = function footnotePlugin(md, callback) {
       } else if (list[i].label) {
         tokens = refTokens[`:${list[i].label}`];
       }
-
       state.tokens = (0, _concat.default)(_context5 = state.tokens).call(_context5, tokens);
-
       if (state.tokens[state.tokens.length - 1].type === 'paragraph_close') {
         lastParagraph = state.tokens.pop();
       } else {
         lastParagraph = null;
       }
-
       t = list[i].count > 0 ? list[i].count : 1;
-
       for (j = 0; j < t; j++) {
         token = new state.Token('footnote_anchor', '', 0);
         token.meta = {
@@ -415,51 +352,46 @@ module.exports = function footnotePlugin(md, callback) {
         };
         state.tokens.push(token);
       }
-
       if (lastParagraph) {
         state.tokens.push(lastParagraph);
       }
-
       token = new state.Token('footnote_close', '', -1);
       state.tokens.push(token);
     }
-
     token = new state.Token('footnote_block_close', '', -1);
-    state.tokens.push(token); // create return value for callback
+    state.tokens.push(token);
 
+    // create return value for callback
     insideRef = false;
     footnoteTokens = (0, _filter.default)(_context6 = [...state.tokens]).call(_context6, a => {
       if (a.type === 'footnote_block_open') {
         insideRef = true;
         return true;
       }
-
       if (a.type === 'footnote_block_close') {
         insideRef = false;
         return true;
       }
-
       return insideRef;
-    }); // remove footnotes from `state.tokens`
+    });
 
+    // remove footnotes from `state.tokens`
     insideRef = false;
     state.tokens = (0, _filter.default)(_context7 = state.tokens).call(_context7, _ => {
       if (_.type === 'footnote_block_open') {
         insideRef = true;
         return false;
       }
-
       if (_.type === 'footnote_block_close') {
         insideRef = false;
         return false;
       }
-
       return !insideRef;
-    }); // return to MarkdownRenderer class
+    });
 
+    // return to MarkdownRenderer class
     callback(footnoteTokens);
   }
-
   md.block.ruler.before('reference', 'footnote_def', footnoteDef, {
     alt: ['paragraph', 'reference']
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-parser-footnotes",
-  "version": "1.2.16",
+  "version": "2.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -20,14 +20,15 @@
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
+    "browserslist": "^4.17.4",
     "jest": "^26.6.3",
-    "rimraf": "^2.6.3"
+    "rimraf": "^2.7.1"
   },
   "dependencies": {
-    "@canopycanopycanopy/b-ber-lib": "1.2.16",
-    "@canopycanopycanopy/b-ber-logger": "1.2.16",
-    "@canopycanopycanopy/b-ber-shapes-directives": "1.2.16",
-    "@canopycanopycanopy/b-ber-templates": "1.2.16",
+    "@canopycanopycanopy/b-ber-lib": "2.0.2",
+    "@canopycanopycanopy/b-ber-logger": "2.0.2",
+    "@canopycanopycanopy/b-ber-shapes-directives": "2.0.2",
+    "@canopycanopycanopy/b-ber-templates": "2.0.2",
     "lodash": "^4.17.21",
     "lodash.isundefined": "^3.0.1",
     "tar": "^6.1.11"
@@ -49,5 +50,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
+  "gitHead": "9b13185f21f602f8a2bf3a4cf503b1fd644d6432"
 }