@form8ion/javascript 11.2.1 → 11.3.1

package/lib/index.mjs

@@ -466,7 +466,7 @@ async function scaffoldPackageType ({
   ]);
 }
 
-async function lifter$1 ({projectRoot}) {
+async function liftPublishable ({projectRoot}) {
   await mergeIntoExistingPackageJson({projectRoot, config: {publishConfig: {provenance: true}}});
 
   return {
@@ -475,15 +475,158 @@ async function lifter$1 ({projectRoot}) {
   };
 }
 
-async function tester$1 ({projectRoot}) {
+function liftPackage$1 ({projectRoot}) {
+  return liftPublishable({projectRoot});
+}
+
+async function isPackage ({projectRoot}) {
   const {exports, publishConfig, bin} = JSON.parse(await promises$1.readFile(`${projectRoot}/package.json`, 'utf-8'));
 
   return !!exports || (!!publishConfig && !bin);
 }
 
+const defaultBuildDirectory$1 = 'public';
+
+async function scaffoldApplicationType ({projectRoot}) {
+  info('Scaffolding Application Details');
+
+  await mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
+
+  const buildDirectory = defaultBuildDirectory$1;
+
+  return {
+    scripts: {
+      clean: `rimraf ./${buildDirectory}`,
+      start: `node ./${buildDirectory}/index.js`,
+      prebuild: 'run-s clean'
+    },
+    dependencies: [],
+    devDependencies: ['rimraf'],
+    vcsIgnore: {files: ['.env'], directories: [`/${buildDirectory}/`]},
+    buildDirectory,
+    nextSteps: []
+  };
+}
+
+async function scaffoldMonorepoType ({projectRoot}) {
+  info('Scaffolding Monorepo Details');
+
+  await mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
+
+  return {
+    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';
+
+async function scaffoldCliType ({packageName, visibility, projectRoot, dialect, publishRegistry}) {
+  const [rollupResults] = await Promise.all([
+    scaffold$3({projectRoot, dialect, projectType: projectTypes$1.CLI}),
+    mergeIntoExistingPackageJson({
+      projectRoot,
+      config: {
+        bin: {},
+        files: [`${defaultBuildDirectory}/`],
+        publishConfig: {
+          access: 'Public' === visibility ? 'public' : 'restricted',
+          ...publishRegistry && {registry: publishRegistry}
+        }
+      }
+    })
+  ]);
+
+  return deepmerge(
+    rollupResults,
+    {
+      scripts: {
+        clean: `rimraf ./${defaultBuildDirectory}`,
+        prebuild: 'run-s clean',
+        build: 'npm-run-all --print-label --parallel build:*',
+        prepack: 'run-s build'
+      },
+      dependencies: ['update-notifier'],
+      devDependencies: ['rimraf'],
+      vcsIgnore: {files: [], directories: [`/${defaultBuildDirectory}/`]},
+      buildDirectory: defaultBuildDirectory,
+      badges: defineBadges(packageName, visibility),
+      nextSteps: []
+    }
+  );
+}
+
+async function isCli ({projectRoot}) {
+  const {bin} = JSON.parse(await promises$1.readFile(`${projectRoot}/package.json`, 'utf-8'));
+
+  return !!bin;
+}
+
+function liftCli ({projectRoot}) {
+  return liftPublishable({projectRoot});
+}
+
+async function scaffoldProjectType ({
+  projectType,
+  projectRoot,
+  projectName,
+  packageName,
+  packageManager,
+  visibility,
+  packageBundlers,
+  scope,
+  vcs,
+  decisions,
+  dialect,
+  provideExample,
+  publishRegistry
+}) {
+  switch (projectType) {
+    case projectTypes$1.PACKAGE:
+      return scaffoldPackageType({
+        projectRoot,
+        projectName,
+        packageName,
+        packageManager,
+        visibility,
+        scope,
+        packageBundlers,
+        vcs,
+        decisions,
+        dialect,
+        provideExample,
+        publishRegistry
+      });
+    case projectTypes$1.APPLICATION:
+      return scaffoldApplicationType({projectRoot});
+    case projectTypes$1.CLI:
+      return scaffoldCliType({packageName, visibility, projectRoot, dialect, publishRegistry});
+    case projectTypes$1.MONOREPO:
+      return scaffoldMonorepoType({projectRoot});
+    case 'Other':
+      return {};
+    default:
+      throw new Error(`The project-type of ${projectType} is invalid`);
+  }
+}
+
+async function lifter$1 ({projectRoot}) {
+  if (await isPackage({projectRoot})) return liftPackage$1({projectRoot});
+  if (await isCli({projectRoot})) return liftCli({projectRoot});
+
+  return {};
+}
+
+async function tester$1 ({projectRoot}) {
+  return await isPackage({projectRoot}) || isCli({projectRoot});
+}
+
 var projectTypes = /*#__PURE__*/Object.freeze({
   __proto__: null,
-  scaffold: scaffoldPackageType,
+  scaffold: scaffoldProjectType,
   lift: lifter$1,
   test: tester$1
 });
@@ -1220,125 +1363,6 @@ function buildPackageName (projectName, scope) {
   throw new Error(`The package name ${name} is invalid:${EOL}\t* ${errors.join(`${EOL}\t* `)}`);
 }
 
-const defaultBuildDirectory$1 = 'public';
-
-async function scaffoldApplicationType ({projectRoot}) {
-  info('Scaffolding Application Details');
-
-  await mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
-
-  const buildDirectory = defaultBuildDirectory$1;
-
-  return {
-    scripts: {
-      clean: `rimraf ./${buildDirectory}`,
-      start: `node ./${buildDirectory}/index.js`,
-      prebuild: 'run-s clean'
-    },
-    dependencies: [],
-    devDependencies: ['rimraf'],
-    vcsIgnore: {files: ['.env'], directories: [`/${buildDirectory}/`]},
-    buildDirectory,
-    nextSteps: []
-  };
-}
-
-async function scaffoldMonorepoType ({projectRoot}) {
-  info('Scaffolding Monorepo Details');
-
-  await mergeIntoExistingPackageJson({projectRoot, config: {private: true}});
-
-  return {
-    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';
-
-async function scaffoldCliType ({packageName, visibility, projectRoot, dialect, publishRegistry}) {
-  const [rollupResults] = await Promise.all([
-    scaffold$3({projectRoot, dialect, projectType: projectTypes$1.CLI}),
-    mergeIntoExistingPackageJson({
-      projectRoot,
-      config: {
-        bin: {},
-        files: [`${defaultBuildDirectory}/`],
-        publishConfig: {
-          access: 'Public' === visibility ? 'public' : 'restricted',
-          provenance: true,
-          ...publishRegistry && {registry: publishRegistry}
-        }
-      }
-    })
-  ]);
-
-  return deepmerge(
-    rollupResults,
-    {
-      scripts: {
-        clean: `rimraf ./${defaultBuildDirectory}`,
-        prebuild: 'run-s clean',
-        build: 'npm-run-all --print-label --parallel build:*',
-        prepack: 'run-s build'
-      },
-      dependencies: ['update-notifier'],
-      devDependencies: ['rimraf'],
-      vcsIgnore: {files: [], directories: [`/${defaultBuildDirectory}/`]},
-      buildDirectory: defaultBuildDirectory,
-      badges: defineBadges(packageName, visibility),
-      nextSteps: []
-    }
-  );
-}
-
-async function scaffoldProjectType ({
-  projectType,
-  projectRoot,
-  projectName,
-  packageName,
-  packageManager,
-  visibility,
-  packageBundlers,
-  scope,
-  vcs,
-  decisions,
-  dialect,
-  provideExample,
-  publishRegistry
-}) {
-  switch (projectType) {
-    case projectTypes$1.PACKAGE:
-      return scaffoldPackageType({
-        projectRoot,
-        projectName,
-        packageName,
-        packageManager,
-        visibility,
-        scope,
-        packageBundlers,
-        vcs,
-        decisions,
-        dialect,
-        provideExample,
-        publishRegistry
-      });
-    case projectTypes$1.APPLICATION:
-      return scaffoldApplicationType({projectRoot});
-    case projectTypes$1.CLI:
-      return scaffoldCliType({packageName, visibility, projectRoot, dialect, publishRegistry});
-    case projectTypes$1.MONOREPO:
-      return scaffoldMonorepoType({projectRoot});
-    case 'Other':
-      return {};
-    default:
-      throw new Error(`The project-type of ${projectType} is invalid`);
-  }
-}
-
 async function chooseProjectTypePlugin ({types, projectType, decisions}) {
   if (!Object.keys(types).length) return 'Other';