screw-up 1.1.0 → 1.3.0

package/dist/main.cjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 /*!
  * name: screw-up
- * version: 1.1.0
+ * version: 1.3.0
  * description: Simply package metadata inserter on Vite plugin
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/screw-up.git
- * git.commit.hash: 379e392faba0e8bd008ed386eb113cdee3c79de9
+ * git.commit.hash: eaf2f91941a8c1d085b1c493a55e0041b39f0cb3
  */
 "use strict";
 const path = require("path");
@@ -17,15 +17,15 @@ const os = require("os");
 const stream = require("stream");
 const zlib = require("zlib");
 const promises = require("stream/promises");
-const analyzer = require("./analyzer-DtoN0my1.cjs");
+const packageMetadata = require("./packageMetadata-C9hcegXk.cjs");
 /*!
  * name: tar-vern
- * version: 1.2.0
+ * version: 1.3.0
  * description: Tape archiver library for Typescript
  * author: Kouji Matsui (@kekyo@mi.kekyo.net)
  * license: MIT
  * repository.url: https://github.com/kekyo/tar-vern.git
- * git.commit.hash: 26ff2d96bfbd226ff79106604ff5f9e5193f91bc
+ * git.commit.hash: 7ac8b1f258e17c93767650ef047a2db9f0ffd417
  */
 const MAX_NAME = 100;
 const MAX_PREFIX = 155;
@@ -693,12 +693,12 @@ const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alw
   if (readmeReplacementCandidatePath && !fs$1.existsSync(readmeReplacementCandidatePath)) {
     throw new Error(`README replacement file is not found: ${readmeReplacementCandidatePath}`);
   }
-  const fetchGitMetadata = analyzer.getFetchGitMetadata(
+  const fetchGitMetadata = packageMetadata.getFetchGitMetadata(
     targetDir,
     checkWorkingDirectoryStatus,
     logger2
   );
-  const result = await analyzer.resolveRawPackageJsonObject(
+  const result = await packageMetadata.resolveRawPackageJsonObject(
     targetDir,
     fetchGitMetadata,
     alwaysOverrideVersionFromGit,
@@ -722,9 +722,9 @@ const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alw
     delete resolvedPackageJson.readme;
   }
   if (replacePeerDepsWildcards) {
-    const workspaceRoot = await analyzer.findWorkspaceRoot(targetDir, logger2);
+    const workspaceRoot = await packageMetadata.findWorkspaceRoot(targetDir, logger2);
     if (workspaceRoot) {
-      const siblings = await analyzer.collectWorkspaceSiblings(
+      const siblings = await packageMetadata.collectWorkspaceSiblings(
         workspaceRoot,
         fetchGitMetadata,
         alwaysOverrideVersionFromGit,
@@ -732,7 +732,7 @@ const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alw
         logger2
       );
       if (siblings.size > 0) {
-        resolvedPackageJson = analyzer.replacePeerDependenciesWildcards(
+        resolvedPackageJson = packageMetadata.replacePeerDependenciesWildcards(
           resolvedPackageJson,
           siblings,
           peerDepsVersionPrefix
@@ -774,7 +774,7 @@ const getComputedPackageJsonObject = async (targetDir, fetchGitMetadata, alwaysO
   if (!fs$1.existsSync(targetDir)) {
     return void 0;
   }
-  const result = await analyzer.resolveRawPackageJsonObject(
+  const result = await packageMetadata.resolveRawPackageJsonObject(
     targetDir,
     fetchGitMetadata,
     alwaysOverrideVersionFromGit,
@@ -837,8 +837,8 @@ const parseInheritableFields = (inheritableFieldsOption) => {
   }
   return new Set(inheritableFieldsOption.split(",").map((field) => field.trim()).filter((field) => field.length > 0));
 };
-const showDumpHelp = (logger2) => {
-  logger2.info(`Usage: screw-up dump [options] [directory]
+const showDumpHelp = () => {
+  console.info(`Usage: screw-up dump [options] [directory]
 
 Dump computed package.json as JSON
 
@@ -854,7 +854,7 @@ Options:
 };
 const dumpCommand = async (args, logger2) => {
   if (args.options.help || args.options.h) {
-    showDumpHelp(logger2);
+    showDumpHelp();
     return 1;
   }
   const directory = args.positional[0];
@@ -863,33 +863,42 @@ const dumpCommand = async (args, logger2) => {
   const checkWorkingDirectoryStatus = args.options["no-wds"] ? false : true;
   const inheritableFields = parseInheritableFields(inheritableFieldsOption);
   const targetDir = path.resolve(directory != null ? directory : process.cwd());
+  const _logger = {
+    debug: (msg) => {
+    },
+    info: (msg) => {
+    },
+    warn: (msg) => {
+    },
+    error: logger2.error
+  };
   try {
-    const fetchGitMetadata = analyzer.getFetchGitMetadata(
+    const fetchGitMetadata = packageMetadata.getFetchGitMetadata(
       targetDir,
       checkWorkingDirectoryStatus,
-      logger2
+      _logger
     );
     const computedPackageJson = await getComputedPackageJsonObject(
       targetDir,
       fetchGitMetadata,
       alwaysOverrideVersionFromGit,
       inheritableFields,
-      logger2
+      _logger
     );
     if (computedPackageJson) {
-      logger2.info(JSON.stringify(computedPackageJson, null, 2));
+      console.info(JSON.stringify(computedPackageJson, null, 2));
     } else {
-      logger2.error(`[screw-up:cli]: dump: Unable to read package.json from: ${targetDir}`);
+      _logger.error(`dump: Unable to read package.json from: ${targetDir}`);
       return 1;
     }
   } catch (error) {
-    logger2.error(`[screw-up:cli]: dump: Failed to dump package.json: ${error}`);
+    _logger.error(`dump: Failed to dump package.json: ${error}`);
     return 1;
   }
   return 0;
 };
-const showPackHelp = (logger2) => {
-  logger2.info(`Usage: screw-up pack [options] [directory]
+const showPackHelp = () => {
+  console.info(`Usage: screw-up pack [options] [directory]
 
 Pack the project into a tar archive
 
@@ -911,7 +920,7 @@ Options:
 const packCommand = async (args, logger2) => {
   var _a;
   if (args.options.help || args.options.h) {
-    showPackHelp(logger2);
+    showPackHelp();
     return 1;
   }
   const directory = args.positional[0];
@@ -928,7 +937,7 @@ const packCommand = async (args, logger2) => {
   const readmeReplacementPath = readmeOption ? path.resolve(readmeOption) : void 0;
   const inheritableFields = parseInheritableFields(inheritableFieldsOption);
   if (verbose) {
-    logger2.info(`[screw-up:cli]: pack: Creating archive of ${targetDir}...`);
+    logger2.info(`pack: Creating archive of ${targetDir}...`);
   }
   try {
     const result = await packAssets(
@@ -944,22 +953,22 @@ const packCommand = async (args, logger2) => {
     );
     if (result) {
       if (verbose) {
-        logger2.info(`[screw-up:cli]: pack: Archive created successfully: ${result.packageFileName}`);
+        logger2.info(`pack: Archive created successfully: ${result.packageFileName}`);
       } else {
         logger2.info(result.packageFileName);
       }
     } else {
-      logger2.error(`[screw-up:cli]: pack: Unable to find any files to pack: ${targetDir}`);
+      logger2.error(`pack: Unable to find any files to pack: ${targetDir}`);
       return 1;
     }
   } catch (error) {
-    logger2.error(`[screw-up:cli]: pack: Failed to create archive: ${error}`);
+    logger2.error(`pack: Failed to create archive: ${error}`);
     return 1;
   }
   return 0;
 };
-const showPublishHelp = (logger2) => {
-  logger2.info(`Usage: screw-up publish [options] [directory|package.tgz]
+const showPublishHelp = () => {
+  console.info(`Usage: screw-up publish [options] [directory|package.tgz]
 
 Publish the project
 
@@ -983,14 +992,14 @@ Examples:
 };
 const runNpmPublish = async (tarballPath, npmOptions, verbose, logger2) => {
   if (verbose) {
-    logger2.info(`[screw-up:cli]: publish: Publishing ${tarballPath} to npm...`);
+    logger2.info(`publish: Publishing ${tarballPath} to npm...`);
   }
   const publishArgs = ["publish", tarballPath, ...npmOptions];
   if (process.env.SCREW_UP_TEST_MODE === "true") {
-    logger2.info(`[screw-up:cli]: TEST_MODE: Would execute: npm ${publishArgs.join(" ")}`);
-    logger2.info(`[screw-up:cli]: TEST_MODE: Tarball path: ${tarballPath}`);
-    logger2.info(`[screw-up:cli]: TEST_MODE: Options: ${npmOptions.join(" ")}`);
-    logger2.info(`[screw-up:cli]: publish: Successfully published ${tarballPath}`);
+    logger2.info(`TEST_MODE: Would execute: npm ${publishArgs.join(" ")}`);
+    logger2.info(`TEST_MODE: Tarball path: ${tarballPath}`);
+    logger2.info(`TEST_MODE: Options: ${npmOptions.join(" ")}`);
+    logger2.info(`publish: Successfully published ${tarballPath}`);
     return 0;
   }
   const npmProcess = child_process.spawn("npm", publishArgs, { stdio: "inherit" });
@@ -998,11 +1007,11 @@ const runNpmPublish = async (tarballPath, npmOptions, verbose, logger2) => {
     npmProcess.on("close", (code) => {
       if (code === 0) {
         if (verbose) {
-          logger2.info(`[screw-up:cli]: publish: Successfully published ${tarballPath}`);
+          logger2.info(`publish: Successfully published ${tarballPath}`);
         }
         resolve2(code);
       } else {
-        logger2.error(`[screw-up:cli]: publish: npm publish failed: ${tarballPath}`);
+        logger2.error(`publish: npm publish failed: ${tarballPath}`);
         resolve2(code);
       }
     });
@@ -1012,7 +1021,7 @@ const runNpmPublish = async (tarballPath, npmOptions, verbose, logger2) => {
 const publishCommand = async (args, logger2) => {
   var _a;
   if (args.options.help || args.options.h) {
-    showPublishHelp(logger2);
+    showPublishHelp();
     return 1;
   }
   const path$1 = args.positional[0];
@@ -1041,7 +1050,7 @@ const publishCommand = async (args, logger2) => {
       const targetDir = process.cwd();
       const outputDir = await fs.mkdtemp(path.join(os.tmpdir(), "screw-up-publish-"));
       if (verbose) {
-        logger2.info(`[screw-up:cli]: publish: Creating archive of ${targetDir}...`);
+        logger2.info(`publish: Creating archive of ${targetDir}...`);
       }
       try {
         const result = await packAssets(
@@ -1057,12 +1066,12 @@ const publishCommand = async (args, logger2) => {
         );
         if (result == null ? void 0 : result.metadata) {
           if (verbose) {
-            logger2.info(`[screw-up:cli]: publish: Archive created successfully: ${result.packageFileName}`);
+            logger2.info(`publish: Archive created successfully: ${result.packageFileName}`);
           }
           const archivePath = path.join(outputDir, result.packageFileName);
           return await runNpmPublish(archivePath, npmOptions, verbose, logger2);
         } else {
-          logger2.error(`[screw-up:cli]: publish: Unable to find any files to pack: ${targetDir}`);
+          logger2.error(`publish: Unable to find any files to pack: ${targetDir}`);
           return 1;
         }
       } finally {
@@ -1076,7 +1085,7 @@ const publishCommand = async (args, logger2) => {
         const targetDir = path.resolve(path$1);
         const outputDir = await fs.mkdtemp(path.join(os.tmpdir(), "screw-up-publish-"));
         if (verbose) {
-          logger2.info(`[screw-up:cli]: publish: Creating archive of ${targetDir}...`);
+          logger2.info(`publish: Creating archive of ${targetDir}...`);
         }
         try {
           const result = await packAssets(
@@ -1092,33 +1101,34 @@ const publishCommand = async (args, logger2) => {
           );
           if (result == null ? void 0 : result.metadata) {
             if (verbose) {
-              logger2.info(`[screw-up:cli]: publish: Archive created successfully: ${result.packageFileName}`);
+              logger2.info(`publish: Archive created successfully: ${result.packageFileName}`);
             }
             const archivePath = path.join(outputDir, result.packageFileName);
             return await runNpmPublish(archivePath, npmOptions, verbose, logger2);
           } else {
-            logger2.error(`[screw-up:cli]: publish: Unable to find any files to pack: ${targetDir}`);
+            logger2.error(`publish: Unable to find any files to pack: ${targetDir}`);
             return 1;
           }
         } finally {
           await fs.rm(outputDir, { recursive: true, force: true });
         }
       } else {
-        logger2.error(`[screw-up:cli]: publish: Invalid path - must be a directory or .tgz/.tar.gz file: ${path$1}`);
+        logger2.error(`publish: Invalid path - must be a directory or .tgz/.tar.gz file: ${path$1}`);
         return 1;
       }
     } else {
-      logger2.error(`[screw-up:cli]: publish: Path does not exist: ${path$1}`);
+      logger2.error(`publish: Path does not exist: ${path$1}`);
       return 1;
     }
   } catch (error) {
-    logger2.error(`[screw-up:cli]: publish: Failed to publish: ${error}`);
+    logger2.error(`publish: Failed to publish: ${error}`);
     return 1;
   }
 };
-const showHelp = async (logger2) => {
-  const { author, license, repository_url, version } = await Promise.resolve().then(() => require("./packageMetadata-Hteuv2eS.cjs"));
-  logger2.info(`screw-up - Easy package metadata inserter CLI [${version}]
+const showHelp = async () => {
+  const { author, license, repository_url, version, git_commit_hash } = await Promise.resolve().then(() => require("./packageMetadata-C9hcegXk.cjs")).then((n) => n.packageMetadata);
+  console.info(`screw-up [${version}-${git_commit_hash}]
+Easy package metadata inserter CLI
 Copyright (c) ${author}
 Repository: ${repository_url}
 License: ${license}
@@ -1149,7 +1159,7 @@ const argOptionMap = /* @__PURE__ */ new Map([
 const cliMain = async (args, logger2) => {
   const parsedArgs = parseArgs(args, argOptionMap);
   if (!parsedArgs.command && (parsedArgs.options.help || parsedArgs.options.h)) {
-    await showHelp(logger2);
+    await showHelp();
     return 1;
   }
   switch (parsedArgs.command) {
@@ -1169,7 +1179,8 @@ const cliMain = async (args, logger2) => {
       return 1;
   }
 };
-const logger = analyzer.createConsoleLogger();
+const loggerPrefix = `${packageMetadata.name}-cli`;
+const logger = packageMetadata.createConsoleLogger(loggerPrefix);
 cliMain(
   process.argv.slice(2),
   // Remove 'node' and script path