@canopycanopycanopy/b-ber-lib 1.2.16 → 2.0.2

package/State.js

@@ -1,104 +1,68 @@
 "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 _filterInstanceProperty2 = 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 _forEachInstanceProperty2 = 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 _Symbol$toPrimitive = require("@babel/runtime-corejs3/core-js-stable/symbol/to-primitive");
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
-
-_Object$defineProperty2(exports, "__esModule", {
+_Object$defineProperty(exports, "__esModule", {
   value: true
 });
-
 exports.default = void 0;
-
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
-
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
-
 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"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
-
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
-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 _getOwnPropertyDescriptor = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-descriptor"));
-
-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 _defineProperty3 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/define-property"));
-
-var _toPrimitive2 = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/symbol/to-primitive"));
-
 var _crypto = _interopRequireDefault(require("crypto"));
-
 var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
-
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
-
 var _find = _interopRequireDefault(require("lodash/find"));
-
 var _findIndex = _interopRequireDefault(require("lodash/findIndex"));
-
-var _set = _interopRequireDefault(require("lodash/set"));
-
+var _set2 = _interopRequireDefault(require("lodash/set"));
 var _get = _interopRequireDefault(require("lodash/get"));
-
+var _has = _interopRequireDefault(require("lodash/has"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
-
 var _remove = _interopRequireDefault(require("lodash/remove"));
-
 var _path = _interopRequireDefault(require("path"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _mimeTypes = _interopRequireDefault(require("mime-types"));
-
 var _bBerThemeSerif = _interopRequireDefault(require("@canopycanopycanopy/b-ber-theme-serif"));
-
 var _bBerThemeSans = _interopRequireDefault(require("@canopycanopycanopy/b-ber-theme-sans"));
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 var _Yaml = _interopRequireDefault(require("./Yaml"));
-
 var _Config = _interopRequireDefault(require("./Config"));
-
 var _Spine = _interopRequireDefault(require("./Spine"));
-
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[_toPrimitive2.default]; 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 = (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 _context4; (0, _forEach.default)(_context4 = ownKeys(Object(source), true)).call(_context4, function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (_getOwnPropertyDescriptors.default) { (0, _defineProperties.default)(target, (0, _getOwnPropertyDescriptors.default)(source)); } else { var _context5; (0, _forEach.default)(_context5 = ownKeys(Object(source))).call(_context5, function (key) { (0, _defineProperty3.default)(target, key, (0, _getOwnPropertyDescriptor.default)(source, key)); }); } } return target; }
-
+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); 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 _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,
   'b-ber-theme-sans': _bBerThemeSans.default
 };
-
 const randomHash = () => _crypto.default.randomBytes(20).toString('hex');
-
 const skipInitialization = () => {
   const {
     argv
-  } = process; // prettier-ignore
-
-  return (0, _includes.default)(argv).call(argv, '--help') || // if a help flag is set
-  (0, _includes.default)(argv).call(argv, '-h') || // if a help alias is set
-  argv.length < 3 || // if there are insufficient arguments
+  } = process;
+
+  // prettier-ignore
+  return (0, _includes.default)(argv).call(argv, '--help') ||
+  // if a help flag is set
+  (0, _includes.default)(argv).call(argv, '-h') ||
+  // if a help alias is set
+  argv.length < 3 ||
+  // if there are insufficient arguments
   (0, _includes.default)(argv).call(argv, 'new') // if it's a new project
   ;
 };
@@ -116,7 +80,6 @@ const DIST_DIR_STYLESHEETS = 'stylesheets';
 const DIST_DIR_JAVASCRIPTS = 'javascripts';
 const DIST_DIR_FONTS = 'fonts';
 const DIST_DIR_MEDIA = 'media';
-
 class State {
   static get defaults() {
     return {
@@ -125,100 +88,77 @@ class State {
       hash: randomHash()
     };
   }
-
   get spine() {
     return this.builds[this.build].spine;
   }
-
   set spine(val) {
     this.builds[this.build].spine = val;
   }
-
   get guide() {
     return this.builds[this.build].guide;
   }
-
   set guide(val) {
     this.builds[this.build].guide = val;
   }
-
   get figures() {
     return this.builds[this.build].figures;
   }
-
   set figures(val) {
     this.builds[this.build].figures = val;
   }
-
   get footnotes() {
     return this.builds[this.build].footnotes;
   }
-
   set footnotes(val) {
     this.builds[this.build].footnotes = val;
   }
-
   get cursor() {
     return this.builds[this.build].cursor;
   }
-
   set cursor(val) {
     this.builds[this.build].cursor = val;
   }
-
   get toc() {
     return this.builds[this.build].toc;
   }
-
   set toc(val) {
     this.builds[this.build].toc = val;
   }
-
   get remoteAssets() {
     return this.builds[this.build].remoteAssets;
   }
-
   set remoteAssets(val) {
     this.builds[this.build].remoteAssets = val;
   }
-
   get loi() {
     return this.builds[this.build].loi;
   }
-
   set loi(val) {
     this.builds[this.build].loi = val;
   }
-
   get srcDir() {
     return this.config.src;
   }
-
   set srcDir(val) {
     this.config.src = val;
   }
-
   get distDir() {
     if (this.build && this.builds && this.builds[this.build]) {
       return this.builds[this.build].dist;
     }
-
     return this.config.dist;
   }
-
   set distDir(val) {
     this.config.dist = val;
-  } // eslint-disable-next-line class-methods-use-this
-
+  }
 
+  // eslint-disable-next-line class-methods-use-this
   get env() {
     return process.env.NODE_ENV || 'development';
   }
-
   set env(val) {
     this.config.env = val;
   }
-
   constructor() {
     (0, _defineProperty2.default)(this, "metadata", {
       json: () => [{}]
@@ -259,55 +199,52 @@ class State {
     });
     (0, _defineProperty2.default)(this, "reset", () => {
       var _context;
-
-      (0, _forEach.default)(_context = (0, _entries.default)(State.defaults)).call(_context, ([key, val]) => (0, _set.default)(this, key, val));
+      (0, _forEach.default)(_context = (0, _entries.default)(State.defaults)).call(_context, ([key, val]) => (0, _set2.default)(this, key, val));
       this.loadConfig();
     });
     (0, _defineProperty2.default)(this, "add", (prop, value) => {
       const prevValue = (0, _get.default)(this, prop);
-
       if ((0, _isArray.default)(prevValue)) {
-        (0, _set.default)(this, prop, [...prevValue, value]);
+        (0, _set2.default)(this, prop, [...prevValue, value]);
       } else if ((0, _isPlainObject.default)(prevValue)) {
-        (0, _set.default)(this, prop, _objectSpread(_objectSpread({}, prevValue), {}, {
+        (0, _set2.default)(this, prop, _objectSpread(_objectSpread({}, prevValue), {}, {
           value
         }));
       } else if (typeof prevValue === 'string') {
-        (0, _set.default)(this, prop, `${prevValue}${value}`);
+        (0, _set2.default)(this, prop, `${prevValue}${value}`);
       } else {
         _bBerLogger.default.error(`Cannot add [${value}] to [state.${prop}]`);
       }
     });
     (0, _defineProperty2.default)(this, "remove", (prop, value) => {
       const prevValue = (0, _get.default)(this, prop);
-
       if ((0, _isArray.default)(prevValue)) {
         const arr = [...prevValue];
         (0, _remove.default)(arr, value);
-        (0, _set.default)(this, prop, arr);
+        (0, _set2.default)(this, prop, arr);
       } else if ((0, _isPlainObject.default)(prevValue)) {
         var _context2;
-
         const {
-          [value]: _
-        } = prevValue,
-              rest = (0, _objectWithoutProperties2.default)(prevValue, (0, _map.default)(_context2 = [value]).call(_context2, _toPropertyKey)); // eslint-disable-line no-unused-vars
-
-        (0, _set.default)(this, prop, rest);
+            [value]: _
+          } = prevValue,
+          rest = (0, _objectWithoutProperties2.default)(prevValue, (0, _map.default)(_context2 = [value]).call(_context2, _toPropertyKey)); // eslint-disable-line no-unused-vars
+        (0, _set2.default)(this, prop, rest);
       } else {
         _bBerLogger.default.error(`Cannot remove [${value}] from [state.${prop}]`);
       }
     });
     (0, _defineProperty2.default)(this, "merge", (prop, value) => {
       const oldValue = (0, _get.default)(this, prop);
-      (0, _set.default)(this, prop, (0, _merge.default)(oldValue, value));
+      (0, _set2.default)(this, prop, (0, _merge.default)(oldValue, value));
     });
     (0, _defineProperty2.default)(this, "update", (prop, val) => {
-      (0, _set.default)(this, prop, val);
+      (0, _set2.default)(this, prop, val);
+    });
+    (0, _defineProperty2.default)(this, "has", prop => {
+      return (0, _has.default)(this, prop);
     });
     (0, _defineProperty2.default)(this, "contains", (coll, value) => {
       var _context3;
-
       return (0, _indexOf.default)(_context3 = this).call(_context3, coll, value) > -1;
     });
     (0, _defineProperty2.default)(this, "find", (coll, pred) => {
@@ -321,83 +258,77 @@ class State {
     (0, _defineProperty2.default)(this, "loadConfig", () => {
       if (!_fsExtra.default.existsSync(_path.default.resolve('config.yml'))) return;
       const config = new _Yaml.default('config');
-      config.load(_path.default.resolve('config.yml')); // not necessary right now to pass around a YAWN instance since we'er
-      // not writing back to config.yml, but may be necessary at some point
+      config.load(_path.default.resolve('config.yml'));
 
-      (0, _set.default)(this, 'config', new _Config.default(config.json()));
+      // not necessary right now to pass around a YAWN instance since we'er
+      // not writing back to config.yml, but may be necessary at some point
+      (0, _set2.default)(this, 'config', new _Config.default(config.json()));
     });
     (0, _defineProperty2.default)(this, "loadMetadata", () => {
       const fpath = _path.default.resolve(this.config.src, 'metadata.yml');
-
       if (!_fsExtra.default.existsSync(fpath)) return;
-      (0, _set.default)(this, 'metadata', new _Yaml.default('metadata'));
+      (0, _set2.default)(this, 'metadata', new _Yaml.default('metadata'));
       this.metadata.load(fpath);
     });
     (0, _defineProperty2.default)(this, "loadMedia", () => {
       const fpath = _path.default.resolve(this.config.src, 'media.yml');
-
       if (!_fsExtra.default.existsSync(fpath)) return;
       let media = new _Yaml.default('media');
       media.load(fpath);
       media = media.json();
-      (0, _set.default)(this, 'media', media);
+      (0, _set2.default)(this, 'media', media);
     });
     (0, _defineProperty2.default)(this, "loadTheme", () => {
-      // ensure themes dir exists unless running `new` command, as it's the
+      // Ensure themes dir exists unless running `new` command, as it's the
       // only command that's run outside of a project directory
       if (skipInitialization()) return;
-
       const userThemesPath = _path.default.resolve(this.config.themes_directory);
-
-      _fsExtra.default.ensureDirSync(userThemesPath); // theme is set, using a built-in theme
-
-
+      _fsExtra.default.ensureDirSync(userThemesPath);
+
+      // Add modules path that references the current b-ber project's theme dir
+      module.paths.push(userThemesPath);
+      const cwd = process.cwd();
+      const cwdArr = cwd.split('/');
+      const modulePaths = new _set.default([...module.paths]);
+      let cwdPath;
+
+      // Add modules paths that reference the current b-ber project
+      do {
+        cwdPath = `${cwdArr.join('/')}/node_modules`;
+        if (modulePaths.has(cwdPath)) continue;
+        module.paths.push(cwdPath);
+      } while (cwdArr.pop());
+
+      // Theme is set, using a built-in theme
       if (themes[this.config.theme]) {
+        (0, _set2.default)(this, 'theme', themes[this.config.theme]);
         _bBerLogger.default.info(`Loaded theme [${this.config.theme}]`);
-
-        (0, _set.default)(this, 'theme', themes[this.config.theme]);
         return;
-      } // possibly a user defined theme, check if the directory exists
-
-
-      try {
-        if (this.theme = require(_path.default.resolve(userThemesPath, this.config.theme))) // eslint-disable-line global-require, import/no-dynamic-require
-          {
-            _bBerLogger.default.info(`Loaded theme [${this.config.theme}]`);
-
-            return;
-          }
-      } catch (_) {// noop
-      } // possibly a theme installed with npm, test the project root
-
+      }
 
+      // Possibly a user defined theme, or one installed with npm
       try {
-        (0, _set.default)(this, 'theme', require(_path.default.resolve('node_modules', this.config.theme)) // eslint-disable-line global-require, import/no-dynamic-require
-        ); // require.resolve?
+        // eslint-disable-next-line global-require, import/no-dynamic-require
+        (0, _set2.default)(this, 'theme', require(this.config.theme));
+        _bBerLogger.default.info(`Loaded theme [${this.config.theme}]`);
       } catch (err) {
         _bBerLogger.default.warn(`There was an error during require [${this.config.theme}]`);
-
         _bBerLogger.default.warn('Using default theme [b-ber-theme-serif]');
+        _bBerLogger.default.warn(err.message);
 
-        _bBerLogger.default.warn(err.message); // error loading theme, set to default
-
-
-        (0, _set.default)(this, 'theme', themes['b-ber-theme-serif']);
+        // Error loading theme, set to default
+        (0, _set2.default)(this, 'theme', themes['b-ber-theme-serif']);
       }
     });
     (0, _defineProperty2.default)(this, "loadAudioVideo", () => {
       if (skipInitialization()) return;
-
       const mediaPath = _path.default.resolve(this.config.src, '_media');
-
       _fsExtra.default.ensureDirSync(mediaPath);
-
       const media = _fsExtra.default.readdirSync(mediaPath);
-
       const video = (0, _filter.default)(media).call(media, a => /^video/.test(_mimeTypes.default.lookup(a)));
       const audio = (0, _filter.default)(media).call(media, a => /^audio/.test(_mimeTypes.default.lookup(a)));
-      (0, _set.default)(this, 'video', video);
-      (0, _set.default)(this, 'audio', audio);
+      (0, _set2.default)(this, 'video', video);
+      (0, _set2.default)(this, 'audio', audio);
     });
     (0, _defineProperty2.default)(this, "loadBuildSettings", type => {
       if (skipInitialization()) return;
@@ -405,24 +336,22 @@ class State {
         src,
         dist
       } = this.config;
-
       const projectDir = _path.default.resolve(src);
+      if (!_fsExtra.default.existsSync(projectDir)) _bBerLogger.default.error(`Project directory [${projectDir}] does not exist`);
 
-      if (!_fsExtra.default.existsSync(projectDir)) _bBerLogger.default.error(`Project directory [${projectDir}] does not exist`); // One TOC to rule them all (toc.yml). A user can override the TOC for a
+      // One TOC to rule them all (toc.yml). A user can override the TOC for a
       // specific build by including a <type>.yml file, which will be loaded
       // instead of toc.yml below.
-
       const navigationConfigFileDefaultPath = _path.default.resolve(src, 'toc.yml');
-
       const navigationConfigFilePath = _path.default.resolve(src, `${type}.yml`);
-
       const navigationConfigFile = _fsExtra.default.existsSync(navigationConfigFilePath) ? navigationConfigFilePath : navigationConfigFileDefaultPath;
       const spine = new _Spine.default({
         src,
         buildType: type,
         navigationConfigFile
-      }); // Build-specific config. gets merged into base config during build step
+      });
 
+      // Build-specific config. gets merged into base config during build step
       const config = this.config[type] ? _objectSpread({}, this.config[type]) : {};
       return {
         src,
@@ -440,10 +369,11 @@ class State {
     });
     (0, _defineProperty2.default)(this, "loadBuilds", () => {
       const builds = ['sample', 'epub', 'mobi', 'pdf', 'web', 'reader', 'xml'];
-      (0, _forEach.default)(builds).call(builds, build => (0, _set.default)(this.builds, build, this.loadBuildSettings(build)));
+      (0, _forEach.default)(builds).call(builds, build => (0, _set2.default)(this.builds, build, this.loadBuildSettings(build)));
     });
-    let version; // for testing, since our directory structure is different in dist
+    let version;
 
+    // for testing, since our directory structure is different in dist
     try {
       ;
       ({
@@ -455,9 +385,8 @@ class State {
         version
       } = _fsExtra.default.readJSONSync(require.resolve('../package.json')));
     }
-
-    (0, _set.default)(this, 'version', version);
-    (0, _set.default)(this, 'config', new _Config.default());
+    (0, _set2.default)(this, 'version', version);
+    (0, _set2.default)(this, 'config', new _Config.default());
     this.reset();
     this.loadMetadata();
     this.loadAudioVideo();
@@ -465,9 +394,6 @@ class State {
     this.loadBuilds();
     this.loadTheme();
   }
-
 }
-
 var _default = new State();
-
 exports.default = _default;

package/Template.js

@@ -1,23 +1,15 @@
 "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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
-
 var _vinyl = _interopRequireDefault(require("vinyl"));
-
 var _layouts = _interopRequireDefault(require("layouts"));
-
 class Template {}
-
 (0, _defineProperty2.default)(Template, "render", (contents, template) => (0, _layouts.default)(new _vinyl.default({
   path: '.Template',
   layout: 'template',