@canopycanopycanopy/b-ber-grammar-section 1.2.16 → 2.0.2

package/dist/index.js

@@ -1,90 +1,60 @@
 "use strict";
 
 var _Object$keys = require("@babel/runtime-corejs3/core-js-stable/object/keys");
-
 var _Object$getOwnPropertySymbols = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols");
-
 var _filterInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/filter");
-
 var _Object$getOwnPropertyDescriptor = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor");
-
 var _forEachInstanceProperty = require("@babel/runtime-corejs3/core-js-stable/instance/for-each");
-
 var _Object$getOwnPropertyDescriptors = require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors");
-
 var _Object$defineProperties = require("@babel/runtime-corejs3/core-js-stable/object/define-properties");
-
 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 _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _trim = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/trim"));
-
 var _lodash = _interopRequireDefault(require("lodash.find"));
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _bBerLib = require("@canopycanopycanopy/b-ber-lib");
-
 var _bBerShapesDirectives = require("@canopycanopycanopy/b-ber-shapes-directives");
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 var _bBerParserSection = _interopRequireDefault(require("@canopycanopycanopy/b-ber-parser-section"));
-
 var _bBerGrammarRenderer = _interopRequireDefault(require("@canopycanopycanopy/b-ber-grammar-renderer"));
-
 var _bBerGrammarAttributes = require("@canopycanopycanopy/b-ber-grammar-attributes");
-
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); if (enumerableOnly) symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context2; _forEachInstanceProperty(_context2 = ownKeys(Object(source), true)).call(_context2, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context3; _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-// this matches *all* container-type directives, and outputs the appropriate
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context2, _context3; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(source), !0)).call(_context2, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context3 = ownKeys(Object(source))).call(_context3, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
+// This matches *all* container-type directives, and outputs the appropriate
 // HTML based on user-defined attributes
-const containers = (0, _from.default)(_bBerShapesDirectives.BLOCK_DIRECTIVES).join('|'); // treat `exit` like an opening marker since we're using it as such
+const containers = (0, _from.default)(_bBerShapesDirectives.BLOCK_DIRECTIVES).join('|');
 
+// Treat `exit` like an opening marker
 const MARKER_OPEN_RE = new RegExp(`^(${containers}|exit)(?::([^\\s]+)(\\s.*)?)?$`);
-const MARKER_CLOSE_RE = /(exit)(?::([^\s]+))?/; // since `context` needs to be available in this `render` method, we curry it
-// in and pass the resulting function to the `createRenderer` below. we also
-// set a default for `context` since we'll need some of its properties during
-// testing
+const MARKER_CLOSE_RE = /(exit)(?::([^\s]+))?/;
+
+// `context` must be available in this `render` method and is passed
+// into `createRenderer` below. Default for `context` is set for use
+// during tests
 
 function isGallery(directive) {
   return directive && directive.type === 'gallery' && (_State.default.build === 'web' || _State.default.build === 'reader');
 }
-
 function isSpread(directive) {
   return directive && directive.type === 'spread' && (_State.default.build === 'web' || _State.default.build === 'reader');
 }
-
 function handleExitDirective(token) {
   const [, type, id] = token;
-
   _bBerLogger.default.debug(`exit directive [${id}]`);
-
   const comment = _bBerLib.Html.comment(`END: section:${type}#${(0, _bBerGrammarAttributes.htmlId)(id)}`);
-
   const directive = (0, _lodash.default)(_State.default.cursor, {
     id
   });
-
   _State.default.remove('cursor', {
     id
   });
-
   if (isGallery(directive)) {
     // prettier-ignore
     return `</div>
@@ -92,70 +62,67 @@ function handleExitDirective(token) {
             </div>
             </section>${comment}`;
   }
-
   if (isSpread(directive)) {
     return `</div>
-            </div>${comment}`;
-  }
+            </div>
+
+            ${_State.default.build === 'reader' ? `<!-- Empty node required for spread markers -->
+                   <div></div>` : ''}
 
+            ${comment}`;
+  }
   return `</section>${comment}`;
 }
-
 function openElement(token, fileName, lineNumber) {
-  // destructure the attributes from matches, omitting `matches[0]` since
+  // Destructure the attributes from matches, omitting `matches[0]` since
   // we're only interested in the captures
   const [, type, id, attr] = token;
-
   _bBerLogger.default.debug(`open directive [${id}]`);
-
   const comment = _bBerLib.Html.comment(`START: section:${type}#${(0, _bBerGrammarAttributes.htmlId)(id)}; ${fileName}:${lineNumber}`);
-
   const attrs = (0, _bBerGrammarAttributes.attributes)(attr, type, {
     fileName,
     lineNumber
   });
   return `${comment}<section id="${(0, _bBerGrammarAttributes.htmlId)(id)}"${attrs}>`;
 }
-
 function closeElement(marker) {
   // tokens `nesting` prop is -1. we should be closing the html element
   // here, but probably have done so above since we're treating `exit`
   // directives as openers. check to see if the element has in fact been
   // closed
+
   const token = marker.split(':');
   if (token.length < 2) return '';
   const [, id] = token;
   if (!_State.default.contains('cursor', {
     id
-  })) return ''; // its id still exists in state, so it's open. force close here
+  })) return '';
 
+  // its id still exists in state, so it's open. force close here
   const comment = _bBerLib.Html.comment(`END: section:#${(0, _bBerGrammarAttributes.htmlId)(id)}`);
+  const result = `</section>${comment}`;
 
-  const result = `</section>${comment}`; // remove the id
-
+  // remove the id
   _State.default.remove('cursor', {
     id
   });
-
   return result;
 }
-
 const render = ({
   context = {}
 }) => (tokens, index) => {
   var _context;
-
   const token = tokens[index];
   const lineNumber = (0, _map.default)(token) ? (0, _map.default)(token)[0] : null;
   const fileName = `_markdown/${context.fileName}.md`;
   const marker = (0, _trim.default)(_context = token.info).call(_context);
-  if (token.nesting !== 1) return closeElement(marker); // token open, we ignore closing tokens and let `exit` handle those
+  if (token.nesting !== 1) return closeElement(marker);
 
+  // token open, we ignore closing tokens and let `exit` handle those
   const tokenClose = marker.match(MARKER_CLOSE_RE);
   const tokenOpen = marker.match(MARKER_OPEN_RE);
   return tokenClose ? handleExitDirective(tokenClose) : openElement(tokenOpen, fileName, lineNumber);
 };
-
 var _default = {
   plugin: _bBerParserSection.default,
   name: 'section',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-grammar-section",
-  "version": "1.2.16",
+  "version": "2.0.2",
   "description": "",
   "main": "dist/index.js",
   "scripts": {
@@ -20,16 +20,17 @@
     "@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-grammar-attributes": "1.2.16",
-    "@canopycanopycanopy/b-ber-grammar-renderer": "1.2.16",
-    "@canopycanopycanopy/b-ber-lib": "1.2.16",
-    "@canopycanopycanopy/b-ber-logger": "1.2.16",
-    "@canopycanopycanopy/b-ber-parser-section": "1.2.16",
-    "@canopycanopycanopy/b-ber-shapes-directives": "1.2.16",
+    "@canopycanopycanopy/b-ber-grammar-attributes": "2.0.2",
+    "@canopycanopycanopy/b-ber-grammar-renderer": "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.find": "latest",
     "tar": "^6.1.11"
@@ -51,5 +52,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
+  "gitHead": "9b13185f21f602f8a2bf3a4cf503b1fd644d6432"
 }