@canopycanopycanopy/b-ber-lib 1.2.13-react-reader.5 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-lib",
-  "version": "1.2.13-react-reader.5+f56709c6",
+  "version": "1.2.16",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -27,11 +27,11 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-logger": "1.2.13-react-reader.5+f56709c6",
-    "@canopycanopycanopy/b-ber-shapes-dublin-core": "1.2.13-react-reader.5+f56709c6",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.13-react-reader.5+f56709c6",
-    "@canopycanopycanopy/b-ber-theme-sans": "1.2.13-react-reader.5+f56709c6",
-    "@canopycanopycanopy/b-ber-theme-serif": "1.2.13-react-reader.5+f56709c6",
+    "@canopycanopycanopy/b-ber-logger": "1.2.16",
+    "@canopycanopycanopy/b-ber-shapes-dublin-core": "1.2.16",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.16",
+    "@canopycanopycanopy/b-ber-theme-sans": "1.2.16",
+    "@canopycanopycanopy/b-ber-theme-serif": "1.2.16",
     "command-exists": "^1.2.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
@@ -76,5 +76,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "f56709c6bbaa455c0a1f704cf7de19b924ba5b99"
+  "gitHead": "b4d9c563beb349a32c19e0f65447f7c7dbc8ea52"
 }

package/utils/index.js

@@ -13,7 +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;
+exports.validatePosterImage = exports.safeWrite = exports.resolveIntersectingUrl = 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"));
 
@@ -29,6 +29,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"));
@@ -163,24 +169,91 @@ const ensure = ({
 
 exports.ensure = ensure;
 
-const generateWebpubManifest = files => {
+const trimLeadingSlash = s => s.replace(/^\//, '');
+
+const resolveIntersectingUrl = (u, p) => {
   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}/`, ''),
+  let url = '';
+
+  try {
+    url = new _url.default(u);
+  } catch (err) {
+    _bBerLogger.default.warn(err);
+
+    return url;
+  }
+
+  const {
+    pathname
+  } = url;
+  let urlParts = (0, _filter.default)(_context7 = pathname.split('/')).call(_context7, Boolean);
+  let pathParts = (0, _filter.default)(_context8 = p.split('/')).call(_context8, 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 _context9, _context10;
+
+  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)(_context9 = _.State.spine.flattened).call(_context9, (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)(_context10 = (0, _filter.default)(files).call(files, file => _path.default.basename(file).charAt(0) !== '.')).call(_context10, webpubManifestResource(remoteURL));
   const manifest = {
     '@context': 'https://readium.org/webpub-manifest/context.jsonld',
     metadata: {
@@ -194,7 +267,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 },