@form8ion/javascript 11.5.4 → 11.5.6

package/lib/index.js

@@ -4,15 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var languageScaffolderPrompts = require('@travi/language-scaffolder-prompts');
 var deepmerge = require('deepmerge');
+var core = require('@form8ion/core');
 var javascriptCore = require('@form8ion/javascript-core');
 var joi = require('joi');
 var overridablePrompts = require('@form8ion/overridable-prompts');
 var codecov = require('@form8ion/codecov');
 var configFile = require('@form8ion/config-file');
-var core = require('@form8ion/core');
 var cliMessages = require('@travi/cli-messages');
 var commitConventionPlugin = require('@form8ion/commit-convention');
-var hoek = require('@hapi/hoek');
 var execa = require('@form8ion/execa-wrapper');
 var npmConf = require('npm-conf');
 var fs = require('fs');
@@ -55,7 +54,6 @@ function _interopNamespace(e) {
 var deepmerge__default = /*#__PURE__*/_interopDefaultLegacy(deepmerge);
 var joi__default = /*#__PURE__*/_interopDefaultLegacy(joi);
 var commitConventionPlugin__namespace = /*#__PURE__*/_interopNamespace(commitConventionPlugin);
-var hoek__namespace = /*#__PURE__*/_interopNamespace(hoek);
 var execa__default = /*#__PURE__*/_interopDefaultLegacy(execa);
 var npmConf__default = /*#__PURE__*/_interopDefaultLegacy(npmConf);
 var validatePackageName__default = /*#__PURE__*/_interopDefaultLegacy(validatePackageName);
@@ -183,7 +181,7 @@ async function chooseFramework ({frameworks, decisions}) {
 }
 
 async function scaffoldUnitTesting ({projectRoot, frameworks, decisions, visibility, vcs, pathWithinParent, dialect}) {
-  const validatedFrameworks = javascriptCore.validateOptions(unitTestFrameworksSchema, frameworks);
+  const validatedFrameworks = core.validateOptions(unitTestFrameworksSchema, frameworks);
   const [framework, coverage] = await Promise.all([
     chooseFramework({frameworks: validatedFrameworks, decisions})
       .then(chosenFramework => javascriptCore.scaffoldChoice(validatedFrameworks, chosenFramework, {projectRoot, dialect})),
@@ -1018,9 +1016,16 @@ async function lift ({projectRoot, vcs, results}) {
   return enhancerResults;
 }
 
-const packageBundlersSchema = joi__default["default"].object().pattern(/^/, joi__default["default"].object({
-  scaffolder: joi__default["default"].func().arity(1).required()
-})).default({});
+const pluginSchema = joi__default["default"].object({scaffolder: joi__default["default"].func().arity(1).required()});
+const pluginMapSchema = joi__default["default"].object().pattern(/^/, pluginSchema);
+
+const packageBundlersSchema = pluginMapSchema.default({});
+
+const applicationTypesSchema = pluginMapSchema.default({});
+
+const packageTypesSchema = pluginMapSchema.default({});
+
+const monorepoTypesSchema = pluginMapSchema.default({});
 
 function validate(options) {
   const schema = joi__default["default"].object().required()
@@ -1079,15 +1084,9 @@ function validate(options) {
       })).default({})
     })
     .keys({
-      applicationTypes: joi__default["default"].object().pattern(/^/, joi__default["default"].object({
-        scaffolder: joi__default["default"].func().arity(1).required()
-      })).default({}),
-      packageTypes: joi__default["default"].object().pattern(/^/, joi__default["default"].object({
-        scaffolder: joi__default["default"].func().arity(1).required()
-      })).default({}),
-      monorepoTypes: joi__default["default"].object().pattern(/^/, joi__default["default"].object({
-        scaffolder: joi__default["default"].func().arity(1).required()
-      }))
+      applicationTypes: applicationTypesSchema,
+      packageTypes: packageTypesSchema,
+      monorepoTypes: monorepoTypesSchema
     })
     .keys({
       unitTestFrameworks: unitTestFrameworksSchema,
@@ -1097,11 +1096,8 @@ function validate(options) {
       decisions: joi__default["default"].object()
     })
     .keys({registries: joi__default["default"].object().pattern(joi__default["default"].string(), joi__default["default"].string().uri()).default({})});
-  const {error, value} = schema.validate(options);
-
-  hoek__namespace.assert(!error, error);
 
-  return value;
+  return core.validateOptions(schema, options);
 }
 
 function buildDialectChoices ({babelPreset, typescript}) {