@form8ion/javascript 7.0.3 → 7.1.1

package/lib/index.js

@@ -829,19 +829,6 @@ function buildPackageName (projectName, scope) {
   throw new Error(`The package name ${name} is invalid:${os.EOL}\t* ${errors.join(`${os.EOL}\t* `)}`);
 }
 
-async function chooseApplicationType ({types, projectType, decisions}) {
-  if (!Object.keys(types).length) return 'Other';
-
-  const answers = await overridablePrompts.prompt([{
-    name: questionNames$1.PROJECT_TYPE_CHOICE,
-    type: 'list',
-    message: `What type of ${projectType} is this?`,
-    choices: [...Object.keys(types), new overridablePrompts.Separator(), 'Other']
-  }], decisions);
-
-  return answers[questionNames$1.PROJECT_TYPE_CHOICE];
-}
-
 function getInstallationCommand(packageManager) {
   if (javascriptCore.packageManagers.NPM === packageManager) return 'npm install';
   if (javascriptCore.packageManagers.YARN === packageManager) return 'yarn add';
@@ -979,9 +966,7 @@ async function scaffoldPackageType ({
   packageManager,
   visibility,
   scope,
-  packageTypes,
   packageBundlers,
-  tests,
   decisions,
   dialect,
   publishRegistry
@@ -1026,13 +1011,6 @@ async function scaffoldPackageType ({
     })
   ]);
 
-  const chosenType = await chooseApplicationType({types: packageTypes, projectType: 'package', decisions});
-  const results = await javascriptCore.scaffoldChoice(
-    packageTypes,
-    chosenType,
-    {projectRoot, projectName, packageName, tests, scope}
-  );
-
   return deepmerge__default["default"].all([
     {
       documentation: scaffoldPackageDocumentation({packageName, visibility, scope, packageManager}),
@@ -1044,73 +1022,47 @@ async function scaffoldPackageType ({
       scripts: {},
       badges: defineBadges(packageName, visibility)
     },
-    detailsForBuild,
-    results
+    detailsForBuild
   ]);
 }
 
-const defaultBuildDirectory$1 = 'lib';
+const defaultBuildDirectory$1 = 'public';
 
-async function scaffoldApplicationType ({
-  applicationTypes,
-  projectRoot,
-  projectName,
-  packageName,
-  packageManager,
-  tests,
-  decisions
-}) {
+async function scaffoldApplicationType ({projectRoot}) {
   cliMessages.info('Scaffolding Application Details');
 
-  const [chosenType] = await Promise.all([
-    chooseApplicationType({types: applicationTypes, projectType: 'application', decisions}),
-    javascriptCore.mergeIntoExistingPackageJson({projectRoot, config: {private: true}})
-  ]);
-
-  const results = await javascriptCore.scaffoldChoice(
-    applicationTypes,
-    chosenType,
-    {projectRoot, projectName, packageName, packageManager, tests}
-  );
+  await javascriptCore.mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
 
-  const buildDirectory = results.buildDirectory || defaultBuildDirectory$1;
+  const buildDirectory = defaultBuildDirectory$1;
 
-  return deepmerge__default["default"](
-    {
-      scripts: {
-        clean: `rimraf ./${buildDirectory}`,
-        start: `node ./${buildDirectory}/index.js`,
-        prebuild: 'run-s clean'
-      },
-      dependencies: [],
-      devDependencies: ['rimraf'],
-      vcsIgnore: {files: ['.env'], directories: [`/${buildDirectory}/`]},
-      buildDirectory,
-      eslintConfigs: [],
-      nextSteps: []
+  return {
+    scripts: {
+      clean: `rimraf ./${buildDirectory}`,
+      start: `node ./${buildDirectory}/index.js`,
+      prebuild: 'run-s clean'
     },
-    results
-  );
+    dependencies: [],
+    devDependencies: ['rimraf'],
+    vcsIgnore: {files: ['.env'], directories: [`/${buildDirectory}/`]},
+    buildDirectory,
+    eslintConfigs: [],
+    nextSteps: []
+  };
 }
 
-async function scaffoldMonorepoType ({monorepoTypes, projectRoot, packageManager, decisions}) {
+async function scaffoldMonorepoType ({projectRoot}) {
   cliMessages.info('Scaffolding Monorepo Details');
 
-  const chosenType = await chooseApplicationType({types: monorepoTypes, projectType: javascriptCore.projectTypes.MONOREPO, decisions});
-  const results = await javascriptCore.scaffoldChoice(monorepoTypes, chosenType, {projectRoot, packageManager});
+  await javascriptCore.mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
 
-  return deepmerge__default["default"](
-    {
-      eslintConfigs: [],
-      packageProperties: {private: true},
-      nextSteps: [{
-        summary: 'Add packages to your new monorepo',
-        description: 'Leverage [@form8ion/add-package-to-monorepo](https://npm.im/@form8ion/add-package-to-monorepo)'
-          + ' to scaffold new packages into your new monorepo'
-      }]
-    },
-    results
-  );
+  return {
+    eslintConfigs: [],
+    nextSteps: [{
+      summary: 'Add packages to your new monorepo',
+      description: 'Leverage [@form8ion/add-package-to-monorepo](https://npm.im/@form8ion/add-package-to-monorepo)'
+        + ' to scaffold new packages into your new monorepo'
+    }]
+  };
 }
 
 const defaultBuildDirectory = 'bin';
@@ -1158,12 +1110,8 @@ async function scaffoldProjectType ({
   packageName,
   packageManager,
   visibility,
-  applicationTypes,
-  packageTypes,
   packageBundlers,
-  monorepoTypes,
   scope,
-  tests,
   vcs,
   decisions,
   dialect,
@@ -1178,28 +1126,18 @@ async function scaffoldProjectType ({
         packageManager,
         visibility,
         scope,
-        packageTypes,
         packageBundlers,
-        tests,
         vcs,
         decisions,
         dialect,
         publishRegistry
       });
     case javascriptCore.projectTypes.APPLICATION:
-      return scaffoldApplicationType({
-        projectRoot,
-        projectName,
-        packageName,
-        packageManager,
-        applicationTypes,
-        tests,
-        decisions
-      });
+      return scaffoldApplicationType({projectRoot});
     case javascriptCore.projectTypes.CLI:
       return scaffoldCliType({packageName, visibility, projectRoot, dialect, publishRegistry});
     case javascriptCore.projectTypes.MONOREPO:
-      return scaffoldMonorepoType({monorepoTypes, projectRoot, packageManager, decisions});
+      return scaffoldMonorepoType({projectRoot});
     case 'Other':
       return {
         eslintConfigs: []
@@ -1209,6 +1147,43 @@ async function scaffoldProjectType ({
   }
 }
 
+async function chooseProjectTypePlugin ({types, projectType, decisions}) {
+  if (!Object.keys(types).length) return 'Other';
+
+  const answers = await overridablePrompts.prompt([{
+    name: questionNames$1.PROJECT_TYPE_CHOICE,
+    type: 'list',
+    message: `What type of ${projectType} is this?`,
+    choices: [...Object.keys(types), new overridablePrompts.Separator(), 'Other']
+  }], decisions);
+
+  return answers[questionNames$1.PROJECT_TYPE_CHOICE];
+}
+
+async function scaffoldProjectTypePlugin ({
+  projectRoot,
+  projectType,
+  projectName,
+  packageName,
+  packageManager,
+  scope,
+  tests,
+  decisions,
+  plugins
+}) {
+  const pluginsForProjectType = plugins[projectType];
+
+  if (!pluginsForProjectType) return {};
+
+  const chosenType = await chooseProjectTypePlugin({types: pluginsForProjectType, decisions, projectType});
+
+  return javascriptCore.scaffoldChoice(
+    pluginsForProjectType,
+    chosenType,
+    {projectRoot, projectName, packageName, packageManager, scope, tests}
+  );
+}
+
 async function scaffoldTesting ({
   projectRoot,
   visibility,
@@ -1482,7 +1457,7 @@ async function scaffolder (options) {
       pathWithinParent
     })
   ]);
-  const [nodeVersion, npmResults, dialectResults, codeStyleResults] = await Promise.all([
+  const [nodeVersion, npmResults, dialectResults, codeStyleResults, projectTypePluginResults] = await Promise.all([
     scaffoldNodeVersion({projectRoot, nodeVersionCategory}),
     scaffoldNpmConfig({projectType, projectRoot, registries}),
     scaffoldDialect({
@@ -1502,6 +1477,21 @@ async function scaffolder (options) {
       configureLinting,
       buildDirectory: projectTypeResults.buildDirectory,
       eslint: verificationResults.eslint
+    }),
+    scaffoldProjectTypePlugin({
+      projectRoot,
+      projectType,
+      projectName,
+      packageName,
+      packageManager,
+      scope,
+      tests,
+      decisions,
+      plugins: {
+        [javascriptCore.projectTypes.PACKAGE]: packageTypes,
+        [javascriptCore.projectTypes.APPLICATION]: applicationTypes,
+        [javascriptCore.projectTypes.MONOREPO]: monorepoTypes
+      }
     })
   ]);
   const mergedContributions = deepmerge__default["default"].all([
@@ -1514,6 +1504,7 @@ async function scaffolder (options) {
       javascriptCore.scaffoldChoice(ciServices, ci, {projectRoot, vcs, visibility, projectType, projectName, nodeVersion, tests}),
       commitConventionPlugin.scaffold({projectRoot, projectType, configs, pathWithinParent})
     ])),
+    projectTypePluginResults,
     projectTypeResults,
     verificationResults,
     codeStyleResults,