@form8ion/javascript 11.5.5 → 11.6.0

package/lib/index.mjs

@@ -1,15 +1,14 @@
 import { questionNames as questionNames$2, questions } from '@travi/language-scaffolder-prompts';
 import deepmerge from 'deepmerge';
-import { validateOptions, scaffoldChoice, projectTypes as projectTypes$1, packageManagers, dialects as dialects$1, mergeIntoExistingPackageJson, writePackageJson, DEV_DEPENDENCY_TYPE, PROD_DEPENDENCY_TYPE } from '@form8ion/javascript-core';
+import { fileTypes, fileExists, validateOptions, writeConfigFile, applyEnhancers } from '@form8ion/core';
+import { scaffoldChoice, projectTypes as projectTypes$1, packageManagers, dialects as dialects$1, mergeIntoExistingPackageJson, 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 { scaffold, lift as lift$3 } from '@form8ion/codecov';
 import { write as write$1 } from '@form8ion/config-file';
-import { fileTypes, fileExists, writeConfigFile, applyEnhancers } from '@form8ion/core';
 import { info, warn, error } from '@travi/cli-messages';
 import * as commitConventionPlugin from '@form8ion/commit-convention';
 import { scaffold as scaffold$5 } from '@form8ion/commit-convention';
-import * as hoek from '@hapi/hoek';
 import execa from '@form8ion/execa-wrapper';
 import npmConf from 'npm-conf';
 import { promises } from 'fs';
@@ -228,9 +227,7 @@ async function test({projectRoot}) {
   return !!engines?.node;
 }
 
-async function lift$1({projectRoot}) {
-  const {name} = JSON.parse(await promises.readFile(`${projectRoot}/package.json`, 'utf8'));
-
+async function lift$1({packageDetails: {name}}) {
   return {
     devDependencies: ['ls-engines'],
     scripts: {'lint:engines': 'ls-engines'},
@@ -617,9 +614,9 @@ async function scaffoldProjectType ({
   }
 }
 
-async function lifter$1 ({projectRoot}) {
-  if (await isPackage({projectRoot})) return liftPackage$1({projectRoot});
-  if (await isCli({projectRoot})) return liftCli({projectRoot});
+async function lifter$1 ({projectRoot, packageDetails}) {
+  if (await isPackage({projectRoot})) return liftPackage$1({projectRoot, packageDetails});
+  if (await isCli({projectRoot})) return liftCli({projectRoot, packageDetails});
 
   return {};
 }
@@ -955,7 +952,10 @@ async function lift ({projectRoot, vcs, results}) {
     packageManager: manager
   } = results;
 
-  const packageManager = await resolvePackageManager({projectRoot, packageManager: manager});
+  const [packageManager, packageContents] = await Promise.all([
+    resolvePackageManager({projectRoot, packageManager: manager}),
+    promises$1.readFile(`${projectRoot}/package.json`, 'utf8')
+  ]);
 
   const enhancerResults = await applyEnhancers({
     results,
@@ -968,7 +968,7 @@ async function lift ({projectRoot, vcs, results}) {
       codeStylePlugin,
       projectTypes
     ],
-    options: {packageManager, projectRoot, vcs}
+    options: {packageManager, projectRoot, vcs, packageDetails: JSON.parse(packageContents)}
   });
 
   await liftPackage(
@@ -981,9 +981,16 @@ async function lift ({projectRoot, vcs, results}) {
   return enhancerResults;
 }
 
-const packageBundlersSchema = joi.object().pattern(/^/, joi.object({
-  scaffolder: joi.func().arity(1).required()
-})).default({});
+const pluginSchema = joi.object({scaffolder: joi.func().arity(1).required()});
+const pluginMapSchema = joi.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.object().required()
@@ -1042,15 +1049,9 @@ function validate(options) {
       })).default({})
     })
     .keys({
-      applicationTypes: joi.object().pattern(/^/, joi.object({
-        scaffolder: joi.func().arity(1).required()
-      })).default({}),
-      packageTypes: joi.object().pattern(/^/, joi.object({
-        scaffolder: joi.func().arity(1).required()
-      })).default({}),
-      monorepoTypes: joi.object().pattern(/^/, joi.object({
-        scaffolder: joi.func().arity(1).required()
-      }))
+      applicationTypes: applicationTypesSchema,
+      packageTypes: packageTypesSchema,
+      monorepoTypes: monorepoTypesSchema
     })
     .keys({
       unitTestFrameworks: unitTestFrameworksSchema,
@@ -1060,11 +1061,8 @@ function validate(options) {
       decisions: joi.object()
     })
     .keys({registries: joi.object().pattern(joi.string(), joi.string().uri()).default({})});
-  const {error, value} = schema.validate(options);
-
-  hoek.assert(!error, error);
 
-  return value;
+  return validateOptions(schema, options);
 }
 
 function buildDialectChoices ({babelPreset, typescript}) {