@form8ion/javascript 7.1.1 → 7.2.2

package/lib/index.js

@@ -213,6 +213,90 @@ var enginesEnhancer = /*#__PURE__*/Object.freeze({
   lift: lift$1
 });
 
+function write ({projectRoot, config}) {
+  return configFile.write({path: projectRoot, name: 'babel', format: core.fileTypes.JSON, config});
+}
+
+async function addIgnore ({projectRoot, ignore}) {
+  if (ignore) {
+    const existingConfig = JSON.parse(await fs.promises.readFile(`${projectRoot}/.babelrc.json`, 'utf-8'));
+
+    await write({projectRoot, config: {...existingConfig, ignore: [`./${ignore}/`]}});
+  }
+}
+
+async function scaffoldBabel ({projectRoot, preset}) {
+  if (!preset) {
+    throw new Error('No babel preset provided. Cannot configure babel transpilation');
+  }
+
+  await write({projectRoot, config: {presets: [preset.name]}});
+
+  return {
+    devDependencies: ['@babel/register', preset.packageName],
+    eslint: {}
+  };
+}
+
+async function lifter ({buildDirectory, projectRoot}) {
+  await addIgnore({ignore: buildDirectory, projectRoot});
+
+  return {};
+}
+
+function predicate ({projectRoot}) {
+  return core.fileExists(`${projectRoot}/.babelrc.json`);
+}
+
+async function scaffoldTypescript ({config, projectType, projectRoot, testFilenamePattern}) {
+  const eslintConfigs = ['typescript'];
+  const shareableTsConfigPackage = `${config.scope}/tsconfig`;
+
+  await core.writeConfigFile({
+    path: projectRoot,
+    name: 'tsconfig',
+    format: core.fileTypes.JSON,
+    config: {
+      $schema: 'https://json.schemastore.org/tsconfig',
+      extends: shareableTsConfigPackage,
+      compilerOptions: {
+        rootDir: 'src',
+        ...javascriptCore.projectTypes.PACKAGE === projectType && {
+          outDir: 'lib',
+          declaration: true
+        }
+      },
+      include: ['src/**/*.ts'],
+      ...testFilenamePattern && {exclude: [testFilenamePattern]}
+    }
+  });
+
+  return {
+    eslint: {configs: eslintConfigs},
+    eslintConfigs,
+    devDependencies: ['typescript', shareableTsConfigPackage],
+    vcsIgnore: {files: ['tsconfig.tsbuildinfo']}
+  };
+}
+
+function scaffoldDialect ({dialect, projectType, projectRoot, configs, testFilenamePattern}) {
+  switch (dialect) {
+    case javascriptCore.dialects.BABEL:
+      return scaffoldBabel({preset: configs.babelPreset, projectRoot});
+    case javascriptCore.dialects.TYPESCRIPT:
+      return scaffoldTypescript({config: configs.typescript, projectType, projectRoot, testFilenamePattern});
+    default:
+      return {};
+  }
+}
+
+var dialects = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  scaffold: scaffoldDialect,
+  test: predicate,
+  lift: lifter
+});
+
 function scaffoldScripts () {
   return {};
 }
@@ -360,15 +444,24 @@ async function resolvePackageManager ({projectRoot, packageManager}) {
 async function lift ({projectRoot, vcs, results}) {
   cliMessages.info('Lifting JavaScript-specific details');
 
-  const {scripts, tags, eslintConfigs, eslint: eslint$1, dependencies, devDependencies, packageManager: manager} = results;
+  const {
+    scripts,
+    tags,
+    eslintConfigs,
+    eslint: eslint$1,
+    dependencies,
+    devDependencies,
+    packageManager: manager,
+    buildDirectory
+  } = results;
 
   const packageManager = await resolvePackageManager({projectRoot, packageManager: manager});
 
   const eslintResults = await eslint.lift({projectRoot, configs: [...eslintConfigs || [], ...eslint$1?.configs || []]});
   const enhancerResults = await core.applyEnhancers({
     results,
-    enhancers: [huskyPlugin__namespace, enginesEnhancer, coveragePlugin, commitConventionPlugin__namespace],
-    options: {packageManager, projectRoot, vcs}
+    enhancers: [huskyPlugin__namespace, enginesEnhancer, coveragePlugin, commitConventionPlugin__namespace, dialects],
+    options: {packageManager, projectRoot, vcs, buildDirectory}
   });
 
   await liftPackage(
@@ -656,64 +749,6 @@ async function prompt(
   };
 }
 
-async function scaffoldBabel ({projectRoot, preset, buildDirectory}) {
-  if (!preset) {
-    throw new Error('No babel preset provided. Cannot configure babel transpilation');
-  }
-
-  await configFile.write({
-    path: projectRoot,
-    name: 'babel',
-    format: core.fileTypes.JSON,
-    config: {presets: [preset.name], ignore: [`./${buildDirectory}/`]}
-  });
-
-  return {
-    devDependencies: ['@babel/register', preset.packageName],
-    eslint: {}
-  };
-}
-
-async function scaffoldTypescript ({config, projectType, projectRoot, testFilenamePattern}) {
-  const eslintConfigs = ['typescript'];
-  const shareableTsConfigPackage = `${config.scope}/tsconfig`;
-
-  await fs.promises.writeFile(
-    `${projectRoot}/tsconfig.json`,
-    JSON.stringify({
-      $schema: 'https://json.schemastore.org/tsconfig',
-      extends: shareableTsConfigPackage,
-      compilerOptions: {
-        rootDir: 'src',
-        ...javascriptCore.projectTypes.PACKAGE === projectType && {
-          outDir: 'lib',
-          declaration: true
-        }
-      },
-      include: ['src/**/*.ts'],
-      ...testFilenamePattern && {exclude: [testFilenamePattern]}
-    })
-  );
-
-  return {
-    eslint: {configs: eslintConfigs},
-    eslintConfigs,
-    devDependencies: ['typescript', shareableTsConfigPackage],
-    vcsIgnore: {files: ['tsconfig.tsbuildinfo']}
-  };
-}
-
-function scaffoldDialect ({dialect, projectType, projectRoot, configs, buildDirectory, testFilenamePattern}) {
-  switch (dialect) {
-    case javascriptCore.dialects.BABEL:
-      return scaffoldBabel({preset: configs.babelPreset, projectRoot, buildDirectory});
-    case javascriptCore.dialects.TYPESCRIPT:
-      return scaffoldTypescript({config: configs.typescript, projectType, projectRoot, testFilenamePattern});
-    default:
-      return {};
-  }
-}
-
 function projectWillNotBeConsumed(projectType) {
   return javascriptCore.projectTypes.APPLICATION === projectType || javascriptCore.projectTypes.CLI === projectType;
 }
@@ -1167,6 +1202,7 @@ async function scaffoldProjectTypePlugin ({
   packageName,
   packageManager,
   scope,
+  dialect,
   tests,
   decisions,
   plugins
@@ -1180,7 +1216,7 @@ async function scaffoldProjectTypePlugin ({
   return javascriptCore.scaffoldChoice(
     pluginsForProjectType,
     chosenType,
-    {projectRoot, projectName, packageName, packageManager, scope, tests}
+    {projectRoot, projectName, packageName, packageManager, scope, tests, dialect}
   );
 }
 
@@ -1465,7 +1501,6 @@ async function scaffolder (options) {
       configs,
       projectRoot,
       projectType,
-      buildDirectory: projectTypeResults.buildDirectory,
       testFilenamePattern: verificationResults.testFilenamePattern
     }),
     scaffoldCodeStyle({
@@ -1485,6 +1520,7 @@ async function scaffolder (options) {
       packageName,
       packageManager,
       scope,
+      dialect,
       tests,
       decisions,
       plugins: {
@@ -1504,8 +1540,8 @@ async function scaffolder (options) {
       javascriptCore.scaffoldChoice(ciServices, ci, {projectRoot, vcs, visibility, projectType, projectName, nodeVersion, tests}),
       commitConventionPlugin.scaffold({projectRoot, projectType, configs, pathWithinParent})
     ])),
-    projectTypePluginResults,
     projectTypeResults,
+    projectTypePluginResults,
     verificationResults,
     codeStyleResults,
     npmResults,