@form8ion/javascript 12.1.0 → 12.2.0

package/lib/index.js

@@ -428,14 +428,18 @@ async function liftProvenance ({projectRoot, packageDetails}) {
 }
 
 async function liftPublishable ({projectRoot, packageDetails}) {
-  const {name: packageName, publishConfig: {access: pacakgeAccessLevel}} = packageDetails;
+  const {name: packageName, publishConfig: {access: packageAccessLevel}} = packageDetails;
+  const homepage = `https://npm.im/${packageName}`;
+
+  await javascriptCore.mergeIntoExistingPackageJson({projectRoot, config: {homepage}});
 
   return deepmerge__default["default"](
     await liftProvenance({packageDetails, projectRoot}),
     {
+      homepage,
       devDependencies: ['publint'],
       scripts: {'lint:publish': 'publint --strict'},
-      badges: defineBadges(packageName, pacakgeAccessLevel)
+      badges: defineBadges(packageName, packageAccessLevel)
     }
   );
 }
@@ -650,6 +654,10 @@ async function scaffoldApplicationType ({projectRoot}) {
   };
 }
 
+function isApplication ({packageDetails}) {
+  return !!packageDetails.private;
+}
+
 async function scaffoldMonorepoType ({projectRoot}) {
   cliMessages.info('Scaffolding Monorepo Details');
 
@@ -728,7 +736,6 @@ async function scaffoldProjectType ({
   visibility,
   packageBundlers,
   scope,
-  vcs,
   decisions,
   dialect,
   provideExample,
@@ -744,7 +751,6 @@ async function scaffoldProjectType ({
         visibility,
         scope,
         packageBundlers,
-        vcs,
         decisions,
         dialect,
         provideExample,
@@ -772,14 +778,28 @@ async function scaffoldProjectType ({
 }
 
 async function tester$1 ({projectRoot, packageDetails}) {
-  return await isPackage({projectRoot, packageDetails}) || isCli({projectRoot, packageDetails});
+  return await isPackage({projectRoot, packageDetails})
+    || await isCli({projectRoot, packageDetails})
+    || isApplication({projectRoot, packageDetails});
 }
 
-async function lifter$1 ({projectRoot, packageDetails}) {
+function vcsRepositoryHostedOnGithub(vcs) {
+  return vcs && 'github' === vcs.host;
+}
+
+async function lifter$1 ({projectRoot, packageDetails, vcs}) {
   if (await isPackage({projectRoot, packageDetails})) return liftPackage$1({projectRoot, packageDetails});
   if (await isCli({projectRoot, packageDetails})) return liftCli({projectRoot, packageDetails});
 
-  return {};
+  let homepage;
+
+  if (vcsRepositoryHostedOnGithub(vcs)) {
+    homepage = `https://github.com/${vcs.owner}/${vcs.name}#readme`;
+
+    await javascriptCore.mergeIntoExistingPackageJson({projectRoot, config: {homepage}});
+  }
+
+  return {homepage};
 }
 
 var projectTypes = /*#__PURE__*/Object.freeze({
@@ -795,7 +815,7 @@ function write ({projectRoot, config}) {
 
 async function addIgnore ({projectRoot, ignore}) {
   if (ignore) {
-    const existingConfig = JSON.parse(await fs.promises.readFile(`${projectRoot}/.babelrc.json`, 'utf-8'));
+    const existingConfig = JSON.parse(await node_fs.promises.readFile(`${projectRoot}/.babelrc.json`, 'utf-8'));
 
     await write({projectRoot, config: {...existingConfig, ignore: [`./${ignore}/`]}});
   }
@@ -871,97 +891,44 @@ var dialects = /*#__PURE__*/Object.freeze({
   lift: lifter
 });
 
-function scaffoldScripts () {
-  return {};
-}
-
-function projectWillBeTested(scripts) {
-  return Object.keys(scripts).find(scriptName => scriptName.startsWith('test:'));
-}
-
-function projectShouldBeBuiltForVerification(scripts) {
-  return 'run-s build' === scripts['pregenerate:md'];
-}
-
-function updateTestScript (scripts) {
-  return {
-    ...scripts,
-    test: `npm-run-all --print-label${
-      projectShouldBeBuiltForVerification(scripts) ? ' build' : ''
-    } --parallel lint:*${
-      projectWillBeTested(scripts) ? ' --parallel test:*' : ''
-    }`
-  };
-}
-
-function liftScripts ({existingScripts, scripts}) {
-  return updateTestScript({...existingScripts, ...scripts});
-}
-
-function defineVcsHostDetails(vcs, packageType, packageName, pathWithinParent) {
-  return vcs && 'github' === vcs.host && {
-    repository: pathWithinParent
-      ? {
-        type: 'git',
-        url: `https://github.com/${vcs.owner}/${vcs.name}.git`,
-        directory: pathWithinParent
-      }
-      : `${vcs.owner}/${vcs.name}`,
-    bugs: `https://github.com/${vcs.owner}/${vcs.name}/issues`,
-    homepage: (javascriptCore.projectTypes.PACKAGE === packageType)
-      ? `https://npm.im/${packageName}`
-      : `https://github.com/${vcs.owner}/${vcs.name}#readme`
-  };
-}
-
 function buildPackageDetails ({
   packageName,
-  projectType,
   dialect,
   license,
-  vcs,
   author,
-  description,
-  pathWithinParent
+  description
 }) {
   return {
     name: packageName,
     description,
     license,
     type: javascriptCore.dialects.ESM === dialect ? 'module' : 'commonjs',
-    ...defineVcsHostDetails(vcs, projectType, packageName, pathWithinParent),
     author: `${author.name}${author.email ? ` <${author.email}>` : ''}${author.url ? ` (${author.url})` : ''}`,
-    scripts: scaffoldScripts()
+    scripts: {}
   };
 }
 
 async function scaffoldPackage ({
   projectRoot,
-  projectType,
   dialect,
   packageName,
   license,
-  vcs,
   author,
-  description,
-  pathWithinParent
+  description
 }) {
   cliMessages.info('Configuring package.json');
 
   const packageData = await buildPackageDetails({
     packageName,
-    projectType,
     dialect,
     license,
-    vcs,
     author,
-    description,
-    pathWithinParent
+    description
   });
 
   await javascriptCore.writePackageJson({projectRoot, config: packageData});
 
-  return {homepage: packageData.homepage};
+  return {};
 }
 
 function sortPackageProperties (packageContents) {
@@ -1000,6 +967,19 @@ function sortPackageProperties (packageContents) {
   );
 }
 
+function defineVcsHostDetails (vcs, pathWithinParent) {
+  return vcs && 'github' === vcs.host && {
+    repository: pathWithinParent
+      ? {
+        type: 'git',
+        url: `https://github.com/${vcs.owner}/${vcs.name}.git`,
+        directory: pathWithinParent
+      }
+      : `${vcs.owner}/${vcs.name}`,
+    bugs: `https://github.com/${vcs.owner}/${vcs.name}/issues`
+  };
+}
+
 const details = {
   [javascriptCore.packageManagers.NPM]: {
     installationCommand: 'install',
@@ -1046,13 +1026,38 @@ async function install$1 (dependencies, dependenciesType, projectRoot, packageMa
   } else cliMessages.warn(`No ${dependenciesType} dependencies to install`);
 }
 
+function projectWillBeTested(scripts) {
+  return Object.keys(scripts).find(scriptName => scriptName.startsWith('test:'));
+}
+
+function projectShouldBeBuiltForVerification(scripts) {
+  return 'run-s build' === scripts['pregenerate:md'];
+}
+
+function updateTestScript (scripts) {
+  return {
+    ...scripts,
+    test: `npm-run-all --print-label${
+      projectShouldBeBuiltForVerification(scripts) ? ' build' : ''
+    } --parallel lint:*${
+      projectWillBeTested(scripts) ? ' --parallel test:*' : ''
+    }`
+  };
+}
+
+function liftScripts ({existingScripts, scripts}) {
+  return updateTestScript({...existingScripts, ...scripts});
+}
+
 async function liftPackage ({
   projectRoot,
   scripts,
   tags,
   dependencies,
   devDependencies,
-  packageManager
+  packageManager,
+  vcs,
+  pathWithinParent
 }) {
   if (scripts || tags) {
     cliMessages.info('Updating `package.json`', {level: 'secondary'});
@@ -1065,7 +1070,11 @@ async function liftPackage ({
       projectRoot,
       config: sortPackageProperties({
         ...existingPackageJsonContents,
-        scripts: liftScripts({existingScripts: existingPackageJsonContents.scripts, scripts}),
+        ...defineVcsHostDetails(vcs, pathWithinParent),
+        scripts: liftScripts({
+          existingScripts: existingPackageJsonContents.scripts,
+          scripts
+        }),
         ...tags && {
           keywords: existingPackageJsonContents.keywords ? [...existingPackageJsonContents.keywords, ...tags] : tags
         }
@@ -1098,7 +1107,7 @@ async function resolvePackageManager ({projectRoot, packageManager}) {
   throw new Error('Package-manager could not be determined');
 }
 
-async function lift ({projectRoot, vcs, results}) {
+async function lift ({projectRoot, vcs, results, pathWithinParent}) {
   cliMessages.info('Lifting JavaScript-specific details');
 
   const {
@@ -1131,7 +1140,7 @@ async function lift ({projectRoot, vcs, results}) {
 
   await liftPackage(
     deepmerge__default["default"].all([
-      {projectRoot, scripts, tags, dependencies, devDependencies, packageManager},
+      {projectRoot, scripts, tags, dependencies, devDependencies, packageManager, vcs, pathWithinParent},
       enhancerResults
     ])
   );
@@ -1683,16 +1692,13 @@ async function scaffolder (options) {
   cliMessages.info('Writing project files', {level: 'secondary'});
 
   const packageName = buildPackageName(projectName, scope);
-  const {homepage: projectHomepage} = await scaffoldPackage({
+  await scaffoldPackage({
     projectRoot,
-    projectType,
     dialect,
     packageName,
     license,
-    vcs,
     author,
-    description,
-    pathWithinParent
+    description
   });
   const projectTypeResults = await scaffoldProjectType({
     projectType,
@@ -1775,7 +1781,8 @@ async function scaffolder (options) {
     results: deepmerge__default["default"]({devDependencies: ['npm-run-all2'], packageManager}, mergedContributions),
     projectRoot,
     configs,
-    vcs
+    vcs,
+    pathWithinParent
   });
 
   return {
@@ -1784,7 +1791,7 @@ async function scaffolder (options) {
     tags: projectTypeResults.tags,
     vcsIgnore: buildVcsIgnoreLists(mergedContributions.vcsIgnore),
     verificationCommand: `${buildDocumentationCommand(packageManager)} && ${packageManager} test`,
-    projectDetails: {...projectHomepage && {homepage: projectHomepage}},
+    projectDetails: {...liftResults.homepage && {homepage: liftResults.homepage}},
     nextSteps: mergedContributions.nextSteps
   };
 }