@canopycanopycanopy/b-ber-lib 2.0.0 → 2.0.3

package/Theme.js

@@ -1,105 +1,75 @@
 "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 _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
-
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
-
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
-
 var _slice = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/slice"));
-
 var _indexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/index-of"));
-
 var _lastIndexOf = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/last-index-of"));
-
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
-
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 var _path = _interopRequireDefault(require("path"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _lodash = require("lodash");
-
 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 _YamlAdaptor = _interopRequireDefault(require("./YamlAdaptor"));
-
 var _State = _interopRequireDefault(require("./State"));
-
 var _utils = require("./utils");
-
+/* eslint-disable no-continue */
 /* eslint-disable global-require, import/no-dynamic-require */
+
 const defaultThemes = {
   'b-ber-theme-serif': _bBerThemeSerif.default,
   'b-ber-theme-sans': _bBerThemeSans.default
-}; // get any themes installed via npm.
+};
 
+// get any themes installed via npm.
 const getVendorThemes = () => {
   const packageJSON = _path.default.resolve('package.json');
-
   if (!_fsExtra.default.existsSync(packageJSON)) return [];
   let themes = [];
-
   let {
     dependencies,
     devDependencies
   } = _fsExtra.default.readJSONSync(packageJSON);
-
   dependencies = dependencies ? (0, _keys.default)(dependencies) : [];
   devDependencies = devDependencies ? (0, _keys.default)(devDependencies) : [];
   themes = (0, _concat.default)(themes).call(themes, dependencies, devDependencies);
   themes = (0, _filter.default)(themes).call(themes, name => /^b-ber-theme/.test(name));
   return themes;
-}; // gets themes from the project/themes dir
-
+};
 
+// gets themes from the project/themes dir
 const getUserThemes = () => {
   var _context;
-
   const dir = _path.default.resolve(_State.default.config.themes_directory);
-
   if (!_fsExtra.default.existsSync(dir)) {
     _bBerLogger.default.warn(`Themes directory [${_path.default.basename(dir)}] does not exist`);
-
     return [];
   }
-
   return (0, _reduce.default)(_context = _fsExtra.default.readdirSync(dir)).call(_context, (acc, curr) => _fsExtra.default.lstatSync(_path.default.resolve(dir, curr)).isDirectory() ? (0, _concat.default)(acc).call(acc, curr) : acc, []);
 };
-
 const getThemeList = (themes, current = '') => {
   var _context2;
-
   const themes_ = (0, _lodash.uniq)(themes);
   const duplicates = [];
   const text = (0, _slice.default)(_context2 = (0, _reduce.default)(themes_).call(themes_, (acc, curr) => {
     let curr_ = `${current === curr ? '✓' : '○'} ${curr}`;
-
     if ((0, _indexOf.default)(themes).call(themes, curr) !== (0, _lastIndexOf.default)(themes).call(themes, curr)) {
       duplicates.push(curr);
       curr_ += ' [(duplicate)]';
     }
-
     curr_ += '\n';
     return (0, _concat.default)(acc).call(acc, curr_);
   }, '')).call(_context2, 0, -1); // remove trailing newline
@@ -109,7 +79,6 @@ const getThemeList = (themes, current = '') => {
     duplicates
   };
 };
-
 const getThemes = () => {
   const current = _State.default.config.theme ? _State.default.config.theme : '';
   const userThemes = getUserThemes();
@@ -120,31 +89,21 @@ const getThemes = () => {
     themes
   };
 };
-
 const createProjectThemeDirectory = name => _fsExtra.default.mkdirp(_path.default.resolve(_State.default.config.src, '_stylesheets', name)).catch(_bBerLogger.default.error);
-
 const copyThemeAssets = theme => {
   const themePath = _path.default.dirname(theme.entry);
-
   const themeSettings = _path.default.join(themePath, '_settings.scss');
-
   const settingsPath = _path.default.resolve(_State.default.src.stylesheets(theme.name, '_settings.scss'));
-
   const overridesPath = _path.default.resolve(_State.default.src.stylesheets(theme.name, '_overrides.scss'));
-
   const fontsPath = _path.default.resolve(_State.default.src.fonts());
-
   const imagesPath = _path.default.resolve(_State.default.src.images());
-
   return _fsExtra.default.copy(themeSettings, settingsPath, {
     overwrite: false
   }).then((0, _utils.safeWrite)(overridesPath, '')).then(() => {
     var _context3;
-
     if (!theme.fonts.length) return;
     const promises = (0, _map.default)(_context3 = theme.fonts).call(_context3, font => {
       const fontPath = _path.default.join(themePath, 'fonts', font);
-
       return _fsExtra.default.copy(fontPath, _path.default.join(fontsPath, font), {
         overwrite: false
       });
@@ -152,11 +111,9 @@ const copyThemeAssets = theme => {
     return _promise.default.all(promises);
   }).then(() => {
     var _context4;
-
     if (!theme.images.length) return;
     const promises = (0, _map.default)(_context4 = theme.images).call(_context4, image => {
       const imagePath = _path.default.join(themePath, 'images', image);
-
       return _fsExtra.default.copy(imagePath, _path.default.join(imagesPath, image), {
         overwrite: false
       });
@@ -164,21 +121,14 @@ const copyThemeAssets = theme => {
     return _promise.default.all(promises);
   });
 };
-
 const updateConfig = name => {
   const configPath = _path.default.resolve('config.yml');
-
   const config = _YamlAdaptor.default.load(configPath);
-
   config.theme = name;
-
   const config_ = _YamlAdaptor.default.dump(config);
-
   return _fsExtra.default.writeFile(configPath, config_);
 };
-
 class Theme {}
-
 (0, _defineProperty2.default)(Theme, "list", () => {
   const {
     current,
@@ -188,41 +138,35 @@ class Theme {}
     text,
     duplicates
   } = getThemeList(themes, current);
-
   _bBerLogger.default.notice('The following themes are available:', '\n', text);
-
   if (duplicates.length) {
     _bBerLogger.default.notice('Duplicate themes have been found in both the [node_modules] and [themes] directory');
-
     _bBerLogger.default.notice('Resolve this issue by either removing the duplicate directory from [themes] or by running [npm rm <location> <package>]');
   }
 });
 (0, _defineProperty2.default)(Theme, "set", (name, force = false) => {
-  const {
-    themes
-  } = getThemes();
   let theme;
-
+  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());
   if (defaultThemes[name]) {
     theme = defaultThemes[name];
   } else {
-    // check for both vendor and user paths
-    const userPath = _path.default.resolve(_State.default.config.themes_directory, name);
-
-    const vendorPath = _path.default.resolve('node_modules', name); // prefer the user path if both exist, since a user might've
-    // copied over the vendor theme and is changing it
-
-
-    const themePath = _fsExtra.default.existsSync(userPath) ? userPath : _fsExtra.default.existsSync(vendorPath) ? vendorPath : null;
-
-    if ((0, _indexOf.default)(themes).call(themes, name) < 0 || !themePath) {
-      _bBerLogger.default.error(`Theme [${name}] is not installed`);
+    try {
+      theme = require(name);
+    } catch (err) {
+      _bBerLogger.default.error(`Could not load theme [${name}]`);
     }
-
-    theme = require(themePath);
   }
-
-  return createProjectThemeDirectory(name).then(() => copyThemeAssets(theme)).then(() => updateConfig(name)).then(() => !force && _bBerLogger.default.notice('Updated theme to', name)).catch(_bBerLogger.default.error);
+  return createProjectThemeDirectory(name).then(() => copyThemeAssets(theme)).then(() => updateConfig(name)).then(() => !force && _bBerLogger.default.notice(`Updated theme [${name}]`)).catch(_bBerLogger.default.error);
 });
 var _default = Theme;
 exports.default = _default;

package/Url.js

@@ -1,32 +1,23 @@
 "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"));
-
 class Url {
   static trimSlashes(url) {
     return url.replace(/(^\/+|\/+$)/, '');
   }
-
   static ensureDecoded(str) {
     let str_ = str;
-
     while (decodeURIComponent(str_) !== str_) {
       str_ = decodeURIComponent(str_);
     }
-
     return str_;
   }
-
   static encodeQueryString(url) {
     let url_ = url.split('?');
     const loc = url_[0];
@@ -37,9 +28,7 @@ class Url {
     url_ = `${loc}?${qs}`;
     return url_;
   }
-
 }
-
 (0, _defineProperty2.default)(Url, "removeTrailingSlash", str => {
   if (typeof str !== 'string') return '';
   return str.replace(/\/+$/, '');

package/Yaml.js

@@ -1,54 +1,32 @@
 "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 _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 _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 _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 _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _find = _interopRequireDefault(require("lodash/find"));
-
 var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
-
 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); 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 _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');
 
-const YAWN = require('yawn-yaml/cjs'); // TODO set up decoder
-
-
+// TODO set up decoder
 const interfaces = {
   metadata: {
     term: {
@@ -136,40 +114,33 @@ const interfaces = {
     group_footnotes: {
       type: 'boolean',
       required: false
-    } // TODO: fill this in with missing options
-
+    }
+    // TODO: fill this in with missing options
   },
+
   media: {}
 };
-
 function YawnAPI() {
   this.yaml = () => '';
-
   this.json = () => {};
 }
-
 const typeCheck = (schema, data = {}) => {
   var _context;
-
   const errors = [];
   if (!interfaces[schema]) errors.push(new Error(`Invalid schema: ${schema}`));
-
   if (!(0, _isPlainObject.default)(data)) {
     errors.push(new Error(`Invalid entry: ${typeof data}`));
   }
-
   (0, _forEach.default)(_context = (0, _entries.default)(data)).call(_context, ([key, val]) => {
     if (!interfaces[schema][key]) {
       errors.push(new Error(`Schema "${schema}" does not support property "${key}"`));
     }
-
     if (interfaces[schema][key] && interfaces[schema][key].required === true && (0, _isUndefined.default)(val)) {
       errors.push(new Error(`Schema "${schema}" requires value for"${key}"`));
     }
   });
   if (errors.length) _bBerLogger.default.error(errors);
 };
-
 class Yaml {
   constructor(schema, strict) {
     (0, _defineProperty2.default)(this, "data", new YawnAPI());
@@ -177,7 +148,6 @@ class Yaml {
     (0, _defineProperty2.default)(this, "strict", true);
     (0, _defineProperty2.default)(this, "load", file => {
       const data = _fsExtra.default.readFileSync(file, 'utf8');
-
       this.data = new YAWN(data);
     });
     (0, _defineProperty2.default)(this, "add", entry => {
@@ -186,7 +156,6 @@ class Yaml {
     });
     (0, _defineProperty2.default)(this, "remove", (key, value) => {
       var _context2;
-
       this.data.json = (0, _filter.default)(_context2 = this.data.json).call(_context2, a => a[key] === value);
     });
     (0, _defineProperty2.default)(this, "update", (key, current, object) => {
@@ -202,8 +171,6 @@ class Yaml {
     if (this.strict) typeCheck(schema);
     this.schema = schema;
   }
-
 }
-
 var _default = Yaml;
 exports.default = _default;

package/YamlAdaptor.js

@@ -1,61 +1,42 @@
 "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 _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
-
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
 var _isPlainObject = _interopRequireDefault(require("lodash/isPlainObject"));
-
 var _isArray = _interopRequireDefault(require("lodash/isArray"));
-
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
-
 class YamlAdaptor {
   static toYaml(input) {
     if (typeof input === 'string') return _jsYaml.default.safeDump(input);
-
     if ((0, _isPlainObject.default)(input) || (0, _isArray.default)(input)) {
       return _jsYaml.default.safeDump((0, _stringify.default)(input));
     }
-
     throw new TypeError(`Invalid type: [${typeof input}]`);
   }
-
   static load(file) {
     let data;
-
     try {
       data = _fsExtra.default.readFileSync(file, 'utf-8');
     } catch (err) {
       _bBerLogger.default.error(err);
     }
-
     return data ? _jsYaml.default.safeLoad(data) : [];
   }
-
   static dump(str) {
     return _jsYaml.default.safeDump(str, {
       indent: 2
     });
   }
-
   static parse(str) {
     return _jsYaml.default.safeLoad(str);
   }
-
 }
-
 var _default = YamlAdaptor;
 exports.default = _default;

package/index.js

@@ -1,126 +1,98 @@
 "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
 });
-
 _Object$defineProperty(exports, "EbookConvert", {
   enumerable: true,
   get: function () {
     return _EbookConvert.default;
   }
 });
-
 _Object$defineProperty(exports, "GuideItem", {
   enumerable: true,
   get: function () {
     return _GuideItem.default;
   }
 });
-
 _Object$defineProperty(exports, "Html", {
   enumerable: true,
   get: function () {
     return _Html.default;
   }
 });
-
 _Object$defineProperty(exports, "HtmlToXml", {
   enumerable: true,
   get: function () {
     return _HtmlToXml.default;
   }
 });
-
 _Object$defineProperty(exports, "ManifestItemProperties", {
   enumerable: true,
   get: function () {
     return _ManifestItemProperties.default;
   }
 });
-
 _Object$defineProperty(exports, "Spine", {
   enumerable: true,
   get: function () {
     return _Spine.default;
   }
 });
-
 _Object$defineProperty(exports, "SpineItem", {
   enumerable: true,
   get: function () {
     return _SpineItem.default;
   }
 });
-
 _Object$defineProperty(exports, "State", {
   enumerable: true,
   get: function () {
     return _State.default;
   }
 });
-
 _Object$defineProperty(exports, "Template", {
   enumerable: true,
   get: function () {
     return _Template.default;
   }
 });
-
 _Object$defineProperty(exports, "Theme", {
   enumerable: true,
   get: function () {
     return _Theme.default;
   }
 });
-
 _Object$defineProperty(exports, "Url", {
   enumerable: true,
   get: function () {
     return _Url.default;
   }
 });
-
 _Object$defineProperty(exports, "YamlAdaptor", {
   enumerable: true,
   get: function () {
     return _YamlAdaptor.default;
   }
 });
-
 _Object$defineProperty(exports, "utils", {
   enumerable: true,
   get: function () {
     return _utils.default;
   }
 });
-
 var _EbookConvert = _interopRequireDefault(require("./EbookConvert"));
-
 var _HtmlToXml = _interopRequireDefault(require("./HtmlToXml"));
-
 var _ManifestItemProperties = _interopRequireDefault(require("./ManifestItemProperties"));
-
 var _State = _interopRequireDefault(require("./State"));
-
 var _YamlAdaptor = _interopRequireDefault(require("./YamlAdaptor"));
-
 var _Theme = _interopRequireDefault(require("./Theme"));
-
 var _utils = _interopRequireDefault(require("./utils"));
-
 var _Url = _interopRequireDefault(require("./Url"));
-
 var _Html = _interopRequireDefault(require("./Html"));
-
 var _SpineItem = _interopRequireDefault(require("./SpineItem"));
-
 var _GuideItem = _interopRequireDefault(require("./GuideItem"));
-
 var _Spine = _interopRequireDefault(require("./Spine"));
-
 var _Template = _interopRequireDefault(require("./Template"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-lib",
-  "version": "2.0.0",
+  "version": "2.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -28,11 +28,11 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-logger": "2.0.0",
-    "@canopycanopycanopy/b-ber-shapes-dublin-core": "2.0.0",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "2.0.0",
-    "@canopycanopycanopy/b-ber-theme-sans": "2.0.0",
-    "@canopycanopycanopy/b-ber-theme-serif": "2.0.0",
+    "@canopycanopycanopy/b-ber-logger": "2.0.3",
+    "@canopycanopycanopy/b-ber-shapes-dublin-core": "2.0.3",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "2.0.3",
+    "@canopycanopycanopy/b-ber-theme-sans": "2.0.3",
+    "@canopycanopycanopy/b-ber-theme-serif": "2.0.3",
     "command-exists": "^1.2.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.4",
@@ -77,5 +77,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "dbeae192709705f5bc211195ff343cbd999f9caf"
+  "gitHead": "f5e6f419af00c5d0c28e7ee202b8184273ca81e3"
 }