@form8ion/javascript 13.0.0-alpha.2 → 13.0.0-alpha.4

package/README.md

@@ -78,9 +78,9 @@ const {
       unitTestFrameworks: {},
       applicationTypes: {},
       packageTypes: {},
-      packageBundlers: {}
+      packageBundlers: {},
+      ciServices: {}
     },
-    ciServices: {},
     decisions: {
       [questionNames.DIALECT]: dialects.BABEL,
       [questionNames.NODE_VERSION_CATEGORY]: 'LTS',

package/example.js

@@ -46,9 +46,9 @@ const {
       unitTestFrameworks: {},
       applicationTypes: {},
       packageTypes: {},
-      packageBundlers: {}
+      packageBundlers: {},
+      ciServices: {}
     },
-    ciServices: {},
     decisions: {
       [questionNames.DIALECT]: dialects.BABEL,
       [questionNames.NODE_VERSION_CATEGORY]: 'LTS',

package/lib/index.js

@@ -6,8 +6,8 @@ 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 joi = require('joi');
 var codecov = require('@form8ion/codecov');
 var configFile = require('@form8ion/config-file');
 var cliMessages = require('@travi/cli-messages');
@@ -163,8 +163,6 @@ var coveragePlugin = /*#__PURE__*/Object.freeze({
   test: tester$4
 });
 
-const unitTestFrameworksSchema = joi__default["default"].object().pattern(/^/, core.optionsSchemas.form8ionPlugin).default({});
-
 async function chooseFramework ({frameworks, decisions}) {
   if (!Object.keys(frameworks).length) return 'Other';
 
@@ -178,8 +176,10 @@ async function chooseFramework ({frameworks, decisions}) {
   return answers[questionNames$1.UNIT_TEST_FRAMEWORK];
 }
 
+const pluginsSchema = joi__default["default"].object().pattern(/^/, core.optionsSchemas.form8ionPlugin).default({});
+
 async function scaffoldUnitTesting ({projectRoot, frameworks, decisions, visibility, vcs, pathWithinParent, dialect}) {
-  const validatedFrameworks = core.validateOptions(unitTestFrameworksSchema, frameworks);
+  const validatedFrameworks = core.validateOptions(pluginsSchema, frameworks);
   const [framework, coverage] = await Promise.all([
     chooseFramework({frameworks: validatedFrameworks, decisions})
       .then(chosenFramework => javascriptCore.scaffoldChoice(validatedFrameworks, chosenFramework, {projectRoot, dialect})),
@@ -1198,16 +1198,6 @@ async function lift ({projectRoot, vcs, results, pathWithinParent, enhancers = {
   return enhancerResults;
 }
 
-const pluginMapSchema = joi__default["default"].object().pattern(joi__default["default"].string(), core.optionsSchemas.form8ionPlugin);
-
-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()
     .keys({
@@ -1241,26 +1231,15 @@ function validate(options) {
         remark: joi__default["default"].string()
       }).default({})
     })
-    .keys({
-      ciServices: joi__default["default"].object().pattern(/^/, joi__default["default"].object({
-        scaffolder: joi__default["default"].func().arity(1).required(),
-        public: joi__default["default"].boolean(),
-        private: joi__default["default"].boolean()
-      })).default({})
-    })
-    .keys({
-      hosts: joi__default["default"].object().pattern(/^/, joi__default["default"].object({
-        scaffolder: joi__default["default"].func().arity(1).required(),
-        projectTypes: joi__default["default"].array().items(joi__default["default"].string().valid('static', 'node')).default([])
-      })).default({})
-    })
     .keys({
       plugins: {
-        unitTestFrameworks: unitTestFrameworksSchema,
-        packageBundlers: packageBundlersSchema,
-        applicationTypes: applicationTypesSchema,
-        packageTypes: packageTypesSchema,
-        monorepoTypes: monorepoTypesSchema
+        unitTestFrameworks: pluginsSchema,
+        packageBundlers: pluginsSchema,
+        applicationTypes: pluginsSchema,
+        packageTypes: pluginsSchema,
+        monorepoTypes: pluginsSchema,
+        hosts: pluginsSchema,
+        ciServices: pluginsSchema
       }
     })
     .keys({
@@ -1695,8 +1674,6 @@ async function scaffolder (options) {
     vcs,
     description,
     configs,
-    ciServices,
-    hosts,
     decisions,
     pathWithinParent,
     registries,
@@ -1705,7 +1682,9 @@ async function scaffolder (options) {
       packageTypes,
       monorepoTypes,
       packageBundlers,
-      unitTestFrameworks
+      unitTestFrameworks,
+      hosts,
+      ciServices
     }
   } = validate(options);