@canopycanopycanopy/b-ber-grammar-pullquote 2.0.0 → 2.0.2

package/dist/index.js

@@ -1,38 +1,25 @@
 "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 _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
-
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 var _lodash = _interopRequireDefault(require("lodash.has"));
-
 var _lodash2 = _interopRequireDefault(require("lodash.isundefined"));
-
 var _bBerShapesDirectives = require("@canopycanopycanopy/b-ber-shapes-directives");
-
 var _bBerParserSection = _interopRequireDefault(require("@canopycanopycanopy/b-ber-parser-section"));
-
 var _bBerGrammarAttributes = require("@canopycanopycanopy/b-ber-grammar-attributes");
-
 // we can't use our nice factory for this because it doesn't support
 // customized closing elements (always outputs `</section>`), so we have to
 // write it long-hand. see comments below
+
 const MARKER_OPEN_RE = /^(pullquote|blockquote|exit)(?::([^\s]+)(\s.*)?)?$/;
 const MARKER_CLOSE_RE = /(exit)(?::([\s]+))?/;
 let citation = '';
@@ -40,9 +27,10 @@ const pullquoteIndices = []; // track these separately
 
 function handleOpen(token, context, fileName, lineNumber) {
   // the pullquote opens
-  const [, type, id, attrs] = token; // we could just state the id in a variable outside of `render`, but
-  // good to keep consistent with the normal handling
+  const [, type, id, attrs] = token;
 
+  // we could just state the id in a variable outside of `render`, but
+  // good to keep consistent with the normal handling
   const index = (0, _indexOf.default)(_State.default).call(_State.default, 'cursor', {
     id
   });
@@ -50,13 +38,15 @@ function handleOpen(token, context, fileName, lineNumber) {
   pullquoteIndices.push({
     id,
     type
-  }); // parse attrs as normal
+  });
 
+  // parse attrs as normal
   const attrsObject = (0, _bBerGrammarAttributes.attributesObject)(attrs, type, {
     fileName,
     lineNumber
-  }); // get citation which we'll use below
+  });
 
+  // get citation which we'll use below
   if ((0, _lodash.default)(attrsObject, 'citation')) {
     ;
     ({
@@ -64,78 +54,74 @@ function handleOpen(token, context, fileName, lineNumber) {
     } = attrsObject);
     delete attrsObject.citation;
   }
-
   const attrsString = (0, _bBerGrammarAttributes.attributesString)(attrsObject);
   const elementName = type === 'pullquote' ? 'section' : 'blockquote';
   const comment = `<!-- START: section:${type}#${id} -->`;
   return `${comment}<${elementName}${attrsString}>`;
 }
-
 function cite(text) {
   return `<footer><cite>&#8212;&#160;${text}</cite></footer>`;
 }
-
 function handleClose(token, instance) {
   // it's an exit to a pullquote. grab the id from the list of
   // indices
+
   const {
     id,
     type
   } = pullquoteIndices[pullquoteIndices.length - 1];
-  const elementName = type === 'pullquote' ? 'section' : 'blockquote'; // check that the id matches our token
+  const elementName = type === 'pullquote' ? 'section' : 'blockquote';
 
+  // check that the id matches our token
   if (!id || !token.match(new RegExp(`exit:${id}`))) return '';
-  let result = ''; // it's a match for the exit directive's `id`, output the citation
+  let result = '';
+
+  // it's a match for the exit directive's `id`, output the citation
   // with the HTML comment and reset the citation to prepare for the
   // next iteration
-
   const comment = `<!-- END: section:${type}#${id} -->`;
   result = `
         ${citation ? cite(instance.renderInline(citation)) : ''}
         </${elementName}>${comment}
     `;
-  citation = ''; // update indices
+  citation = '';
 
+  // update indices
   pullquoteIndices.pop();
   return result;
 }
-
 const validateOpen = ({
   context
 }) => (params, line) => {
   const match = (0, _trim.default)(params).call(params).match(MARKER_OPEN_RE);
   if (!match || match.length < 3) return false;
   const [,, id] = match;
-
   if ((0, _lodash2.default)(id)) {
     _bBerLogger.default.error(`Missing [id] for [${exports.default.name}:start] at ${context.fileName}.md:${line}`);
-
     return false;
   }
-
   return true;
 };
-
 const render = ({
   instance,
   context
 }) => (tokens, idx) => {
   var _context;
-
   const fileName = `_markdown/${context.fileName}.md`;
   const lineNumber = (0, _map.default)(tokens[idx]) ? (0, _map.default)(tokens[idx])[0] : null;
-  const token = (0, _trim.default)(_context = tokens[idx].info).call(_context); // we handle opening and closing render methods on element open, since
+  const token = (0, _trim.default)(_context = tokens[idx].info).call(_context);
+
+  // we handle opening and closing render methods on element open, since
   // we need to append data (citation blocks) from the directive's opening
   // attributes to the end of the element
+  if (tokens[idx].nesting !== 1) return '';
 
-  if (tokens[idx].nesting !== 1) return ''; // either a `pullquote`, `blockquote` or an `exit` directive, we
+  // either a `pullquote`, `blockquote` or an `exit` directive, we
   // keep matches for both in `open` and `close` vars below
-
   const tokenOpen = token.match(MARKER_OPEN_RE);
   const tokenClose = token.match(MARKER_CLOSE_RE);
   return tokenClose ? handleClose(token, instance) : tokenOpen ? handleOpen(tokenOpen, context, fileName, lineNumber) : '';
 };
-
 var _default = {
   plugin: _bBerParserSection.default,
   name: 'pullQuote',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-grammar-pullquote",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -25,11 +25,11 @@
     "rimraf": "^2.7.1"
   },
   "dependencies": {
-    "@canopycanopycanopy/b-ber-grammar-attributes": "2.0.0",
-    "@canopycanopycanopy/b-ber-lib": "2.0.0",
-    "@canopycanopycanopy/b-ber-logger": "2.0.0",
-    "@canopycanopycanopy/b-ber-parser-section": "2.0.0",
-    "@canopycanopycanopy/b-ber-shapes-directives": "2.0.0",
+    "@canopycanopycanopy/b-ber-grammar-attributes": "2.0.2",
+    "@canopycanopycanopy/b-ber-lib": "2.0.2",
+    "@canopycanopycanopy/b-ber-logger": "2.0.2",
+    "@canopycanopycanopy/b-ber-parser-section": "2.0.2",
+    "@canopycanopycanopy/b-ber-shapes-directives": "2.0.2",
     "lodash": "^4.17.21",
     "lodash.has": "latest",
     "lodash.isundefined": "^3.0.1",
@@ -52,5 +52,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "dbeae192709705f5bc211195ff343cbd999f9caf"
+  "gitHead": "9b13185f21f602f8a2bf3a4cf503b1fd644d6432"
 }