@canopycanopycanopy/b-ber-lib 1.2.10 → 1.2.13-media-queries.53

package/EbookConvert.js

@@ -40,9 +40,9 @@ var _commandExists = _interopRequireDefault(require("command-exists"));
 
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
 
-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 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 source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { var _context; _forEachInstanceProperty2(_context = ownKeys(Object(source), true)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context2; _forEachInstanceProperty2(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context, _context2; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty2(_context = ownKeys(Object(source), !0)).call(_context, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty2(_context2 = ownKeys(Object(source))).call(_context2, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const command = 'ebook-convert';
 const defaults = {

package/Spine.js

@@ -60,9 +60,9 @@ var _SpineItem = _interopRequireDefault(require("./SpineItem"));
 
 const _excluded = ["nodes"];
 
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys2(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 ownKeys(object, enumerableOnly) { var keys = _Object$keys2(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 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; }
+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; }
 
 class Spine {
   constructor({

package/State.js

@@ -82,9 +82,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[_Symbol$toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); if (enumerableOnly) { symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(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 _context4; _forEachInstanceProperty2(_context4 = ownKeys(Object(source), true)).call(_context4, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context5; _forEachInstanceProperty2(_context5 = ownKeys(Object(source))).call(_context5, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context4, _context5; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty2(_context4 = ownKeys(Object(source), !0)).call(_context4, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty2(_context5 = ownKeys(Object(source))).call(_context5, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const themes = {
   'b-ber-theme-serif': _bBerThemeSerif.default,

package/Yaml.js

@@ -42,9 +42,9 @@ var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
 
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
 
-function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); if (enumerableOnly) { symbols = _filterInstanceProperty2(symbols).call(symbols, function (sym) { return _Object$getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = _Object$keys(object); if (_Object$getOwnPropertySymbols) { var symbols = _Object$getOwnPropertySymbols(object); enumerableOnly && (symbols = _filterInstanceProperty2(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 _context3; _forEachInstanceProperty2(_context3 = ownKeys(Object(source), true)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_Object$getOwnPropertyDescriptors) { _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)); } else { var _context4; _forEachInstanceProperty2(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var _context3, _context4; var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? _forEachInstanceProperty2(_context3 = ownKeys(Object(source), !0)).call(_context3, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(target, _Object$getOwnPropertyDescriptors(source)) : _forEachInstanceProperty2(_context4 = ownKeys(Object(source))).call(_context4, function (key) { _Object$defineProperty(target, key, _Object$getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 const YAWN = require('yawn-yaml/cjs'); // TODO set up decoder
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-lib",
-  "version": "1.2.10",
+  "version": "1.2.13-media-queries.53+0adf1f4b",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,25 +21,27 @@
     "@babel/cli": "^7.10.5",
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
+    "browserslist": "^4.17.4",
     "jest": "^26.6.3",
     "mock-fs": "^4.4.2",
-    "rimraf": "^2.6.3"
+    "rimraf": "^2.7.1"
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-logger": "1.2.10",
-    "@canopycanopycanopy/b-ber-shapes-dublin-core": "1.2.2",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.2",
-    "@canopycanopycanopy/b-ber-theme-sans": "1.2.2",
-    "@canopycanopycanopy/b-ber-theme-serif": "1.2.2",
+    "@canopycanopycanopy/b-ber-logger": "1.2.12",
+    "@canopycanopycanopy/b-ber-shapes-dublin-core": "1.2.12",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.12",
+    "@canopycanopycanopy/b-ber-theme-sans": "1.2.12",
+    "@canopycanopycanopy/b-ber-theme-serif": "1.2.12",
     "command-exists": "^1.2.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
     "htmlparser2": "^3.9.2",
     "js-yaml": "^3.12.0",
     "layouts": "^3.0.2",
-    "lodash": "^4.17.19",
+    "lodash": "^4.17.21",
     "mime-types": "^2.1.24",
+    "tar": "^6.1.11",
     "vinyl": "^2.2.0",
     "yargs": "^13.3.0",
     "yawn-yaml": "^1.3.4"
@@ -75,5 +77,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "2851c865a57746417975cedb733f79b42d3f0084"
+  "gitHead": "0adf1f4b0e33baf15ffc1292782f115b55eb1c06"
 }

package/utils/index.js

@@ -13,11 +13,7 @@ exports.ensure = void 0;
 exports.ensurePoster = ensurePoster;
 exports.ensureSource = ensureSource;
 exports.ensureSupportedClassNames = ensureSupportedClassNames;
-exports.validatePosterImage = exports.safeWrite = exports.renderPosterImage = exports.renderCaption = exports.opsPath = exports.getTitle = exports.getMediaType = exports.getImageOrientation = exports.getBookMetadata = exports.generateWebpubManifest = exports.forOf = exports.fileId = exports.fail = void 0;
-
-var _forEach = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/for-each"));
-
-var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/entries"));
+exports.validatePosterImage = exports.safeWrite = exports.resolveIntersectingUrl = exports.renderPosterImage = exports.renderCaption = exports.opsPath = exports.getTitle = exports.getMediaType = exports.getImageOrientation = exports.getBookMetadata = exports.generateWebpubManifest = exports.fileId = exports.fail = void 0;
 
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 
@@ -29,6 +25,12 @@ var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-sta
 
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 
+var _url = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/url"));
+
+var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
+
+var _map2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/map"));
+
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
 
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
@@ -78,16 +80,7 @@ const getImageOrientation = (w, h) => {
 //     const { display_aspect_ratio: aspectRatio } = streams
 //     return getAspectRatioClassName(aspectRatio)
 // }
-// Create an iterator from object's key/value pairs
-
-
-exports.getImageOrientation = getImageOrientation;
-
-const forOf = (collection, iterator) => {
-  var _context;
-
-  return (0, _forEach.default)(_context = (0, _entries.default)(collection)).call(_context, ([key, val]) => iterator(key, val));
-}; // TODO: the whole figures/generated pages/user-configurable YAML thing should
+// TODO: the whole figures/generated pages/user-configurable YAML thing should
 // be worked out better. one reason is below, where we need the title of a
 // generated page, but since metadata is attached in the frontmatter YAML of an
 // MD file, there is no reference for the metadata.
@@ -96,7 +89,7 @@ const forOf = (collection, iterator) => {
 // this is provisional, will just cause more confusion in the future
 
 
-exports.forOf = forOf;
+exports.getImageOrientation = getImageOrientation;
 
 const getTitle = page => {
   if (page.name === 'figures-titlepage') return 'Figures';
@@ -133,24 +126,24 @@ const fail = (_msg, _err, yargs) => {
 exports.fail = fail;
 
 const ensureDirs = (dirs, prefix) => {
-  var _context2, _context3;
+  var _context, _context2;
 
   const cwd = process.cwd();
-  const dirs_ = (0, _map.default)(_context2 = (0, _uniq.default)((0, _concat.default)(_context3 = [`${prefix}/_project`, `${prefix}/_project/_fonts`, `${prefix}/_project/_images`, `${prefix}/_project/_javascripts`, `${prefix}/_project/_markdown`, `${prefix}/_project/_media`, `${prefix}/_project/_stylesheets`, `${prefix}/themes`]).call(_context3, dirs))).call(_context2, a => _fsExtra.default.ensureDir(_path.default.join(cwd, a)));
+  const dirs_ = (0, _map.default)(_context = (0, _uniq.default)((0, _concat.default)(_context2 = [`${prefix}/_project`, `${prefix}/_project/_fonts`, `${prefix}/_project/_images`, `${prefix}/_project/_javascripts`, `${prefix}/_project/_markdown`, `${prefix}/_project/_media`, `${prefix}/_project/_stylesheets`, `${prefix}/themes`]).call(_context2, dirs))).call(_context, a => _fsExtra.default.ensureDir(_path.default.join(cwd, a)));
   return _promise.default.all(dirs_);
 };
 
 const ensureFiles = (files, prefix) => {
-  var _context4, _context5, _context6;
+  var _context3, _context4, _context5;
 
-  const files_ = (0, _reduce.default)(_context4 = (0, _concat.default)(_context5 = (0, _filter.default)(_context6 = [{
+  const files_ = (0, _reduce.default)(_context3 = (0, _concat.default)(_context4 = (0, _filter.default)(_context5 = [{
     absolutePath: _path.default.resolve(prefix, '_project', 'toc.yml'),
     content: ''
-  }]).call(_context6, ({
+  }]).call(_context5, ({
     absolutePath
   }) => (0, _findIndex.default)(files, {
     absolutePath
-  }) < 0)).call(_context5, files)).call(_context4, (acc, curr) => _fsExtra.default.existsSync(curr.absolutePath) ? acc : (0, _concat.default)(acc).call(acc, _fsExtra.default.writeFile(curr.absolutePath, curr.content)), []);
+  }) < 0)).call(_context4, files)).call(_context3, (acc, curr) => _fsExtra.default.existsSync(curr.absolutePath) ? acc : (0, _concat.default)(acc).call(acc, _fsExtra.default.writeFile(curr.absolutePath, curr.content)), []);
   return _promise.default.all(files_);
 }; // make sure all necessary files and directories exist
 
@@ -163,24 +156,82 @@ const ensure = ({
 
 exports.ensure = ensure;
 
-const generateWebpubManifest = files => {
-  var _context7, _context8;
-
-  const remoteURL = _.Url.trimSlashes(_.State.config.remote_url);
-
-  const readingOrder = (0, _map.default)(_context7 = _.State.spine.flattened).call(_context7, ({
-    name,
-    title
-  }) => ({
-    href: `${remoteURL}/text/${name}.xhtml`,
-    type: 'text/xhtml',
-    title
-  }));
-  const resources = (0, _map.default)(_context8 = (0, _filter.default)(files).call(files, file => _path.default.basename(file).charAt(0) !== '.')).call(_context8, file => ({
-    // rel: ...
-    href: file.replace(`${_.State.distDir}/`, ''),
+const trimLeadingSlash = s => s.replace(/^\//, '');
+
+const resolveIntersectingUrl = (u, p) => {
+  var _context6, _context7;
+
+  const url = new _url.default(u);
+  const {
+    pathname
+  } = url;
+  let urlParts = (0, _filter.default)(_context6 = pathname.split('/')).call(_context6, Boolean);
+  let pathParts = (0, _filter.default)(_context7 = p.split('/')).call(_context7, Boolean); // Remove filename if there is one
+
+  if (/\./.test(urlParts[urlParts.length - 1])) {
+    urlParts.pop();
+  } // Find indices where to slice arrays
+
+
+  let intersectionIndices = [];
+
+  for (let i = 0; i < urlParts.length; i++) {
+    for (let j = 0; j < pathParts.length; j++) {
+      if (urlParts[i] === pathParts[j]) {
+        intersectionIndices = [i, j];
+        break;
+      }
+    }
+  }
+
+  const [uIdx, pIdx] = intersectionIndices;
+  urlParts = (0, _slice.default)(urlParts).call(urlParts, 0, uIdx);
+  pathParts = (0, _slice.default)(pathParts).call(pathParts, pIdx);
+  const intersection = (0, _concat.default)(urlParts).call(urlParts, pathParts);
+  url.pathname = intersection.join('/');
+  return url.href;
+};
+
+exports.resolveIntersectingUrl = resolveIntersectingUrl;
+
+const webpubManifestResource = base => file => {
+  const href = resolveIntersectingUrl(base, file);
+  return {
+    href,
     type: _mimeTypes.default.lookup(file)
-  }));
+  };
+};
+
+const webpubManifestReadingOrderItem = base => ({
+  title,
+  file
+}) => {
+  const href = resolveIntersectingUrl(base, file);
+  return {
+    href,
+    title,
+    type: 'text/xhtml'
+  };
+}; // https://github.com/readium/webpub-manifest
+
+
+const generateWebpubManifest = files => {
+  var _context8, _context9;
+
+  const remoteURL = _.Url.trimSlashes(_.State.config.remote_url); // Build a map to sort the files according to the position in the spine
+
+
+  const fileMap = new _map2.default((0, _map.default)(files).call(files, f => [_path.default.basename(f), f])); // Create the items for the manifest's reading order
+
+  const readingOrderItems = (0, _reduce.default)(_context8 = _.State.spine.flattened).call(_context8, (acc, curr) => {
+    const file = fileMap.get(`${curr.fileName}.xhtml`);
+    return !file ? acc : (0, _concat.default)(acc).call(acc, {
+      file,
+      title: curr.title
+    });
+  }, []);
+  const readingOrder = (0, _map.default)(readingOrderItems).call(readingOrderItems, webpubManifestReadingOrderItem(remoteURL));
+  const resources = (0, _map.default)(_context9 = (0, _filter.default)(files).call(files, file => _path.default.basename(file).charAt(0) !== '.')).call(_context9, webpubManifestResource(remoteURL));
   const manifest = {
     '@context': 'https://readium.org/webpub-manifest/context.jsonld',
     metadata: {
@@ -194,7 +245,7 @@ const generateWebpubManifest = files => {
     },
     links: [{
       rel: 'self',
-      href: `${remoteURL}/manifest.json`,
+      href: `${remoteURL}/${trimLeadingSlash(_.State.distDir)}/manifest.json`,
       type: 'application/webpub+json'
     } // { rel: 'alternate', href: `${remoteURL}/publication.epub`, type: 'application/epub+zip' },
     // { rel: 'search', href: `${remoteURL}/search{?query}`, type: 'text/html', templated: true },