@canopycanopycanopy/b-ber-cli 1.2.13-react-reader.67 → 1.2.13-react-reader.68

package/dist/commands/build.js

@@ -1,5 +1,19 @@
 "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 _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");
@@ -10,12 +24,14 @@ _Object$defineProperty(exports, "__esModule", {
 
 exports.default = void 0;
 
-var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/entries"));
-
 var _reduce = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/reduce"));
 
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 
+var _entries = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/entries"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
+
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
 
 var _path = _interopRequireDefault(require("path"));
@@ -36,23 +52,33 @@ var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logg
 
 var _configOptions = require("../lib/config-options");
 
-const _excluded = ["_", "$0"];
+const _excluded = ["_", "$0", "config"];
+
+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; }
+
 // Leading pipe ensures that the `all` command can be run without arguments
 const command = 'build [|epub|mobi|pdf|reader|sample|web]';
 const describe = 'Build a project';
 
 const noop = () => {};
 
-const handler = argv => {
+const handler = async argv => {
   process.env.NODE_ENV = process.env.NODE_ENV || 'development';
   const {
     _: desiredSequences,
-    $0
+    $0,
+    config
   } = argv,
         configOptions = (0, _objectWithoutProperties2.default)(argv, _excluded);
-  const configEntries = (0, _entries.default)(configOptions);
   const sequence = (0, _createBuildSequence.default)(desiredSequences);
-  const subSequence = (0, _reduce.default)(sequence).call(sequence, (a, c) => (0, _concat.default)(a).call(a, ..._sequences.default[c]), []);
+  const subSequence = (0, _reduce.default)(sequence).call(sequence, (a, c) => (0, _concat.default)(a).call(a, ..._sequences.default[c]), []); // Set up the config object that's going to be passed into the `init` function
+
+  let projectConfig = {}; // Check if a config files has been specified
+
+  if (config) projectConfig = await (0, _configOptions.parseConfigFile)(config);
+  projectConfig = _objectSpread(_objectSpread({}, projectConfig), configOptions);
 
   _State.default.update('sequence', subSequence);
 
@@ -66,7 +92,7 @@ const handler = argv => {
     _State.default.update('build', build); // Apply the config options that may have been passed in via CLI flags
 
 
-    for (const [key, val] of configEntries) {
+    for (const [key, val] of (0, _entries.default)(projectConfig)) {
       if (!_State.default.has(`config.${key}`)) {
         _bBerLogger.default.warn('Invalid configuration option [%s]', key);
 

package/dist/commands/new.js

@@ -30,18 +30,12 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/he
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/objectWithoutProperties"));
 
-var _fsExtra = _interopRequireDefault(require("fs-extra"));
-
-var _path = _interopRequireDefault(require("path"));
-
 var _State = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/State"));
 
 var _bBerTasks = require("@canopycanopycanopy/b-ber-tasks");
 
 var _utils = require("@canopycanopycanopy/b-ber-lib/utils");
 
-var _YamlAdaptor = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/YamlAdaptor"));
-
 var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
 
 var _configOptions = require("../lib/config-options");
@@ -68,39 +62,18 @@ const handler = async argv => {
     name,
     config
   } = argv,
-        rest = (0, _objectWithoutProperties2.default)(argv, _excluded); // Set up the config object that's going to be passed into the `init` function
+        configOptions = (0, _objectWithoutProperties2.default)(argv, _excluded); // Set up the config object that's going to be passed into the `init` function
 
   let projectConfig = {}; // Check if a config files has been specified
 
-  if (config) {
-    const ext = _path.default.extname(config);
-
-    const configPath = _path.default.resolve(process.cwd(), config);
-
-    if (!(await _fsExtra.default.pathExists(config))) {
-      _bBerLogger.default.error('Could not find config at %s', configPath);
-    }
-
-    if (/^\.(?:ya?ml|json)/i.test(ext) === false) {
-      _bBerLogger.default.error('Config file must have a .json or .yaml/.yml file extension');
-    }
-
-    const contents = await _fsExtra.default.readFile(config);
-
-    if (/^\.ya?ml/i.test(ext)) {
-      projectConfig = _YamlAdaptor.default.parse(contents);
-    } else {
-      projectConfig = JSON.parse(contents);
-    }
-  } // Override the values specified in the config file with values
+  if (config) projectConfig = await (0, _configOptions.parseConfigFile)(config); // Override the values specified in the config file with values
   // that have been explicitly provided on the CLI. Allows using the
   // config file as a template that can be overridden, e.g.,
   // bber new foo --config my-generic-conf.yaml --base_path /foo
 
+  projectConfig = _objectSpread(_objectSpread({}, projectConfig), configOptions); // Remove blacklisted and unsupported config options
 
-  projectConfig = _objectSpread(_objectSpread({}, projectConfig), rest); // Remove blacklisted and unsupported config options
-
-  for (const [key, val] of (0, _entries.default)(projectConfig)) {
+  for (const [key] of (0, _entries.default)(projectConfig)) {
     if (!_State.default.has(`config.${key}`)) {
       _bBerLogger.default.warn('Invalid configuration option [%s]', key);
 

package/dist/lib/config-options.js

@@ -8,11 +8,19 @@ _Object$defineProperty(exports, "__esModule", {
   value: true
 });
 
-exports.blacklistedConfigOptions = void 0;
+exports.parseConfigFile = exports.blacklistedConfigOptions = void 0;
 exports.withConfigOptions = withConfigOptions;
 
 var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 
+var _fsExtra = _interopRequireDefault(require("fs-extra"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _YamlAdaptor = _interopRequireDefault(require("@canopycanopycanopy/b-ber-lib/YamlAdaptor"));
+
+var _bBerLogger = _interopRequireDefault(require("@canopycanopycanopy/b-ber-logger"));
+
 // Attributes not currently configurable via the CLI:
 // ibooks_specified_fonts   always set to `true`
 // autoprefixer_options     no JSON support
@@ -87,4 +95,24 @@ function withConfigOptions(yargs) {
 }
 
 const blacklistedConfigOptions = new _set.default(['ibooks_specified_fonts', 'autoprefixer_options', 'downloads', 'ui_options']);
-exports.blacklistedConfigOptions = blacklistedConfigOptions;
+exports.blacklistedConfigOptions = blacklistedConfigOptions;
+
+const parseConfigFile = async configFile => {
+  const ext = _path.default.extname(configFile);
+
+  const configPath = _path.default.resolve(process.cwd(), configFile);
+
+  if (!(await _fsExtra.default.pathExists(configPath))) {
+    _bBerLogger.default.error(`Could not find config at [${configPath}]`);
+  }
+
+  if (/^\.(?:ya?ml|json)/i.test(ext) === false) {
+    _bBerLogger.default.error('Config file must have a .json or .yaml/.yml file extension');
+  }
+
+  const contents = await _fsExtra.default.readFile(configPath);
+  if (/^\.ya?ml/i.test(ext)) return _YamlAdaptor.default.parse(contents);
+  return JSON.parse(contents);
+};
+
+exports.parseConfigFile = parseConfigFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopycanopycanopy/b-ber-cli",
-  "version": "1.2.13-react-reader.67+b2fdc973",
+  "version": "1.2.13-react-reader.68+e7d3e3df",
   "description": "",
   "main": "dist/index.js",
   "bin": {
@@ -22,11 +22,11 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.10.5",
-    "@canopycanopycanopy/b-ber-lib": "1.2.13-react-reader.67+b2fdc973",
+    "@canopycanopycanopy/b-ber-lib": "1.2.15",
     "@canopycanopycanopy/b-ber-logger": "1.2.12",
-    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.13-react-reader.67+b2fdc973",
-    "@canopycanopycanopy/b-ber-tasks": "1.2.13-react-reader.67+b2fdc973",
-    "@canopycanopycanopy/b-ber-templates": "1.2.13-react-reader.67+b2fdc973",
+    "@canopycanopycanopy/b-ber-shapes-sequences": "1.2.12",
+    "@canopycanopycanopy/b-ber-tasks": "1.2.15",
+    "@canopycanopycanopy/b-ber-templates": "1.2.15",
     "fs-extra": "^8.1.0",
     "lodash": "^4.17.21",
     "lodash.has": "latest",
@@ -59,5 +59,5 @@
       "url": "https://maxwellsimmer.com"
     }
   ],
-  "gitHead": "b2fdc9731696088030fca0cb8e6ceaa69338ed14"
+  "gitHead": "e7d3e3df3e8791944b2be202edd928217793c1d8"
 }