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

package/lib/index.mjs

@@ -2,8 +2,8 @@ import { questionNames as questionNames$2, questions } from '@travi/language-sca
 import deepmerge from 'deepmerge';
 import { fileTypes, fileExists, optionsSchemas, validateOptions, applyEnhancers, writeConfigFile } from '@form8ion/core';
 import { scaffoldChoice, projectTypes as projectTypes$1, packageManagers as packageManagers$1, mergeIntoExistingPackageJson, dialects as dialects$1, writePackageJson, DEV_DEPENDENCY_TYPE, PROD_DEPENDENCY_TYPE } from '@form8ion/javascript-core';
-import joi from 'joi';
 import { prompt as prompt$1, Separator } from '@form8ion/overridable-prompts';
+import joi from 'joi';
 import { scaffold, lift as lift$3 } from '@form8ion/codecov';
 import { write as write$2 } from '@form8ion/config-file';
 import { info, warn, error } from '@travi/cli-messages';
@@ -127,8 +127,6 @@ var coveragePlugin = /*#__PURE__*/Object.freeze({
   test: tester$4
 });
 
-const unitTestFrameworksSchema = joi.object().pattern(/^/, optionsSchemas.form8ionPlugin).default({});
-
 async function chooseFramework ({frameworks, decisions}) {
   if (!Object.keys(frameworks).length) return 'Other';
 
@@ -142,8 +140,10 @@ async function chooseFramework ({frameworks, decisions}) {
   return answers[questionNames$1.UNIT_TEST_FRAMEWORK];
 }
 
+const pluginsSchema = joi.object().pattern(/^/, optionsSchemas.form8ionPlugin).default({});
+
 async function scaffoldUnitTesting ({projectRoot, frameworks, decisions, visibility, vcs, pathWithinParent, dialect}) {
-  const validatedFrameworks = validateOptions(unitTestFrameworksSchema, frameworks);
+  const validatedFrameworks = validateOptions(pluginsSchema, frameworks);
   const [framework, coverage] = await Promise.all([
     chooseFramework({frameworks: validatedFrameworks, decisions})
       .then(chosenFramework => scaffoldChoice(validatedFrameworks, chosenFramework, {projectRoot, dialect})),
@@ -1162,16 +1162,6 @@ async function lift ({projectRoot, vcs, results, pathWithinParent, enhancers = {
   return enhancerResults;
 }
 
-const pluginMapSchema = joi.object().pattern(joi.string(), optionsSchemas.form8ionPlugin);
-
-const packageBundlersSchema = pluginMapSchema.default({});
-
-const applicationTypesSchema = pluginMapSchema.default({});
-
-const packageTypesSchema = pluginMapSchema.default({});
-
-const monorepoTypesSchema = pluginMapSchema.default({});
-
 function validate(options) {
   const schema = joi.object().required()
     .keys({
@@ -1205,26 +1195,15 @@ function validate(options) {
         remark: joi.string()
       }).default({})
     })
-    .keys({
-      ciServices: joi.object().pattern(/^/, joi.object({
-        scaffolder: joi.func().arity(1).required(),
-        public: joi.boolean(),
-        private: joi.boolean()
-      })).default({})
-    })
-    .keys({
-      hosts: joi.object().pattern(/^/, joi.object({
-        scaffolder: joi.func().arity(1).required(),
-        projectTypes: joi.array().items(joi.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({
@@ -1659,8 +1638,6 @@ async function scaffolder (options) {
     vcs,
     description,
     configs,
-    ciServices,
-    hosts,
     decisions,
     pathWithinParent,
     registries,
@@ -1669,7 +1646,9 @@ async function scaffolder (options) {
       packageTypes,
       monorepoTypes,
       packageBundlers,
-      unitTestFrameworks
+      unitTestFrameworks,
+      hosts,
+      ciServices
     }
   } = validate(options);