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

package/dist/image.js

@@ -1,53 +1,30 @@
 "use strict";
 
-var _Object$defineProperty2 = require("@babel/runtime-corejs3/core-js-stable/object/define-property");
-
+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$defineProperty2(exports, "__esModule", {
+_Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.createFigure = createFigure;
 exports.createFigureInline = createFigureInline;
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
-
-var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
-
-var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
-var _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
-
-var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
-
-var _getOwnPropertyDescriptors = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptors"));
-
-var _defineProperties = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-properties"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
-
-var _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _figures = _interopRequireDefault(require("@canopycanopycanopy/b-ber-templates/figures"));
-
 var _utils = require("@canopycanopycanopy/b-ber-lib/utils");
-
 const _excluded = ["classes"],
-      _excluded2 = ["classes"];
-
-function ownKeys(object, enumerableOnly) { var keys = (0, _keys.default)(object); if (_getOwnPropertySymbols.default) { var symbols = (0, _getOwnPropertySymbols.default)(object); if (enumerableOnly) symbols = (0, _filter.default)(symbols).call(symbols, function (sym) { return (0, _getOwnPropertyDescriptor.default)(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 _context; (0, _forEach.default)(_context = ownKeys(Object(source), true)).call(_context, function (key) { (0, _defineProperty3.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context2; (0, _forEach.default)(_context2 = ownKeys(Object(source))).call(_context2, function (key) { (0, _defineProperty2.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
-
+  _excluded2 = ["classes"];
+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 _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty(_context = ownKeys(Object(source), !0)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 function createFigure({
   context,
   width,
@@ -60,18 +37,15 @@ function createFigure({
 }) {
   const classNames = `figure__small figure__small--${(0, _utils.getImageOrientation)(width, height)}`;
   const ref = context.fileName;
-
   const mime = _mimeTypes.default.lookup(attrsObject.source);
-
   const pageOrder = _State.default.figures.length;
   const {
-    classes
-  } = attrsObject,
-        rest = (0, _objectWithoutProperties2.default)(attrsObject, _excluded);
+      classes
+    } = attrsObject,
+    rest = (0, _objectWithoutProperties2.default)(attrsObject, _excluded);
   const classes_ = classes ? (0, _concat.default)(classes).call(classes, ` ${classNames}`) : classNames;
   const page = `figure${id}.xhtml`;
   const href = _State.default.build === 'reader' ? 'figures-titlepage.xhtml' : page;
-
   _State.default.add('figures', _objectSpread(_objectSpread({}, rest), {}, {
     classes: classes_,
     id,
@@ -84,7 +58,6 @@ function createFigure({
     pageOrder,
     mime
   }));
-
   const result = `
         ${comment}
         <div class="${classes_}">
@@ -96,7 +69,6 @@ function createFigure({
         </div>`;
   return result;
 }
-
 function createFigureInline({
   attrsObject,
   id,
@@ -105,12 +77,10 @@ function createFigureInline({
   caption
 }) {
   const {
-    classes
-  } = attrsObject,
-        rest = (0, _objectWithoutProperties2.default)(attrsObject, _excluded2);
-
+      classes
+    } = attrsObject,
+    rest = (0, _objectWithoutProperties2.default)(attrsObject, _excluded2);
   const mime = _mimeTypes.default.lookup(attrsObject.source);
-
   const inline = true;
   return (0, _figures.default)(_objectSpread(_objectSpread({}, rest), {}, {
     classes: classes || '',

package/dist/index.js

@@ -1,43 +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 _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _imageSize = _interopRequireDefault(require("image-size"));
-
 var _lodash = _interopRequireDefault(require("lodash.isundefined"));
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 var _bBerLib = require("@canopycanopycanopy/b-ber-lib");
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
-
 var _bBerShapesDirectives = require("@canopycanopycanopy/b-ber-shapes-directives");
-
 var _bBerGrammarAttributes = require("@canopycanopycanopy/b-ber-grammar-attributes");
-
 var _bBerParserFigure = _interopRequireDefault(require("@canopycanopycanopy/b-ber-parser-figure"));
-
 var _image = require("./image");
-
 const MARKER_OPEN_RE = /(figure(?:-inline)?)(?::([^\s]+)(\s?.*)?)?$/;
-
 function prepare({
   token,
   match,
@@ -49,20 +31,18 @@ function prepare({
   const [, type, id, attrs] = match;
   const figureId = (0, _bBerGrammarAttributes.htmlId)(id);
   const caption = token.children ? instance.renderInline(token.children) : '';
-
   const comment = _bBerLib.Html.comment(`START: figure:${type}#${figureId}; ${fileName}:${lineNumber}`);
-
   const attrsObject = (0, _bBerGrammarAttributes.attributesObject)(attrs, type, {
     fileName,
     lineNumber
   });
-
   const asset = _State.default.src.images(attrsObject.source);
+  const mediaType = (0, _indexOf.default)(type).call(type, '-') && type.substring(0, (0, _indexOf.default)(type).call(type, '-')) || type;
 
-  const mediaType = (0, _indexOf.default)(type).call(type, '-') && type.substring(0, (0, _indexOf.default)(type).call(type, '-')) || type; // Make sure image exists
-
-  if (!_fsExtra.default.existsSync(asset)) _bBerLogger.default.error(`Image not found [${asset}]`); // Get the image dimensions
+  // Make sure image exists
+  if (!_fsExtra.default.existsSync(asset)) _bBerLogger.default.error(`Image not found [${asset}]`);
 
+  // Get the image dimensions
   const {
     width,
     height
@@ -79,7 +59,6 @@ function prepare({
     id: figureId
   };
 }
-
 const validate = ({
   context = {
     fileName: ''
@@ -88,23 +67,18 @@ const validate = ({
   const match = (0, _trim.default)(params).call(params).match(MARKER_OPEN_RE);
   if (!match) return false;
   const [,, id, source] = match;
-
   if ((0, _lodash.default)(id) || (0, _lodash.default)(source)) {
     // Images require `id` and `source`
     _bBerLogger.default.error(`Missing [id] or [source] attribute for [figure] directive${context.fileName}.md:${line}`);
-
     return false;
   }
-
   return true;
 };
-
 const render = ({
   instance,
   context
 }) => (tokens, index) => {
   var _context;
-
   const token = tokens[index];
   if (token.type === 'container_figure_close') return '';
   const fileName = `_markdown/${context.fileName}.md`;
@@ -121,7 +95,6 @@ const render = ({
   });
   return type === 'figure' ? (0, _image.createFigure)(args) : type === 'figure-inline' ? (0, _image.createFigureInline)(args) : '';
 };
-
 var _default = {
   plugin: _bBerParserFigure.default,
   name: 'figure',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-grammar-image",
-  "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-lib": "1.2.16",
-    "@canopycanopycanopy/b-ber-logger": "1.2.16",
-    "@canopycanopycanopy/b-ber-parser-figure": "1.2.16",
-    "@canopycanopycanopy/b-ber-shapes-directives": "1.2.16",
-    "@canopycanopycanopy/b-ber-templates": "1.2.16",
+    "@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-figure": "2.0.2",
+    "@canopycanopycanopy/b-ber-shapes-directives": "2.0.2",
+    "@canopycanopycanopy/b-ber-templates": "2.0.2",
     "fs-extra": "^8.1.0",
     "image-size": "^0.8.3",
     "lodash": "^4.17.21",
@@ -54,5 +55,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
+  "gitHead": "9b13185f21f602f8a2bf3a4cf503b1fd644d6432"
 }