screw-up 1.18.0 → 1.19.0

package/dist/main.js

@@ -1,22 +1,23 @@
 #!/usr/bin/env node
 /*!
  * name: screw-up
- * version: 1.18.0
+ * version: 1.19.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: 104b6e6ab47e8c328ae5d6883f7931b0eea4f5cd
+ * git.commit.hash: b86321865390ff8dc11c118f46a8e0ba8b67aa9c
  */
-import { join, dirname, resolve } from "path";
-import { createWriteStream, createReadStream, existsSync } from "fs";
+import { join, dirname, resolve, isAbsolute } from "path";
+import { createWriteStream, createReadStream, existsSync, statSync } from "fs";
 import { mkdir, writeFile, stat, readdir, mkdtemp, copyFile, rm, readFile } from "fs/promises";
 import { spawn } from "child_process";
 import { tmpdir } from "os";
 import { Readable } from "stream";
 import { createGunzip, createGzip } from "zlib";
 import { pipeline } from "stream/promises";
-import { d as resolveRawPackageJsonObject, f as findWorkspaceRoot, h as collectWorkspaceSiblings, i as replacePeerDependenciesWildcards, g as getFetchGitMetadata, r as resolvePackageMetadata, b as generateMetadataFileContent, w as writeFileIfChanged, e as ensureMetadataGitignore, c as createConsoleLogger, n as name } from "./packageMetadata-BtM7pxOK.js";
+import { glob } from "glob";
+import { d as resolveRawPackageJsonObject, f as findWorkspaceRoot, h as collectWorkspaceSiblings, i as replacePeerDependenciesWildcards, g as getFetchGitMetadata, l as lib, r as resolvePackageMetadata, b as generateMetadataFileContent, w as writeFileIfChanged, e as ensureMetadataGitignore, c as createConsoleLogger, n as name } from "./packageMetadata-DlkAQe0j.js";
 /*!
  * name: tar-vern
  * version: 1.3.0
@@ -642,6 +643,118 @@ const createTarExtractor = async function* (readable, compressionType, signal) {
     }
   }
 };
+const readPackageJsonFile = async (packageJsonPath) => {
+  const content = await readFile(packageJsonPath, "utf-8");
+  return lib.parse(content);
+};
+const getFilesArray = (packageJson) => {
+  if (!packageJson || !Array.isArray(packageJson.files)) {
+    return void 0;
+  }
+  const entries = packageJson.files.filter(
+    (entry) => typeof entry === "string"
+  );
+  return entries.length > 0 ? entries : void 0;
+};
+const isGlobPattern = (pattern) => /[*?[\]{}()]/.test(pattern);
+const normalizeFilesPattern = (pattern, cwd) => {
+  const trimmed = pattern.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  const isNegated = trimmed.startsWith("!");
+  const raw = isNegated ? trimmed.slice(1) : trimmed;
+  if (!raw) {
+    return void 0;
+  }
+  if (isGlobPattern(raw)) {
+    return trimmed;
+  }
+  const fullPath = join(cwd, raw);
+  if (existsSync(fullPath) && statSync(fullPath).isDirectory()) {
+    const dirPattern = `${raw.replace(/\/+$/, "")}/**`;
+    return isNegated ? `!${dirPattern}` : dirPattern;
+  }
+  return trimmed;
+};
+const isSafeRelativePath = (value) => {
+  if (isAbsolute(value)) {
+    return false;
+  }
+  const segments = value.split(/[\\/]+/);
+  if (segments.some((segment) => segment === "..")) {
+    return false;
+  }
+  return true;
+};
+const expandFilesPatterns = async (patterns, cwd) => {
+  const includePatterns = [];
+  const excludePatterns = [];
+  for (const pattern of patterns) {
+    const normalized = normalizeFilesPattern(pattern, cwd);
+    if (!normalized) {
+      continue;
+    }
+    if (normalized.startsWith("!")) {
+      excludePatterns.push(normalized.slice(1));
+    } else {
+      includePatterns.push(normalized);
+    }
+  }
+  const result = /* @__PURE__ */ new Set();
+  for (const pattern of includePatterns) {
+    const matches = await glob(pattern, { cwd, nodir: true });
+    for (const match of matches) {
+      if (isSafeRelativePath(match)) {
+        result.add(match);
+      }
+    }
+  }
+  for (const pattern of excludePatterns) {
+    const matches = await glob(pattern, { cwd, nodir: true });
+    for (const match of matches) {
+      result.delete(match);
+    }
+  }
+  return result;
+};
+const mergeFilesPatterns = (parentFiles, childFiles) => {
+  const merged = [];
+  if (parentFiles == null ? void 0 : parentFiles.length) {
+    merged.push(...parentFiles);
+  }
+  if (childFiles == null ? void 0 : childFiles.length) {
+    merged.push(...childFiles);
+  }
+  return merged.length > 0 ? merged : void 0;
+};
+const resolveWorkspaceFilesMerge = async (targetDir, logger2) => {
+  const workspaceRoot = await findWorkspaceRoot(targetDir, logger2);
+  if (!workspaceRoot) {
+    return void 0;
+  }
+  const rootPackagePath = join(workspaceRoot, "package.json");
+  const targetPackagePath = join(targetDir, "package.json");
+  if (resolve(rootPackagePath) === resolve(targetPackagePath)) {
+    return void 0;
+  }
+  const [rootPackageJson, childPackageJson] = await Promise.all([
+    readPackageJsonFile(rootPackagePath),
+    readPackageJsonFile(targetPackagePath)
+  ]);
+  const parentFiles = getFilesArray(rootPackageJson);
+  const childFiles = getFilesArray(childPackageJson);
+  const mergedFiles = mergeFilesPatterns(parentFiles, childFiles);
+  if (!parentFiles && !childFiles) {
+    return void 0;
+  }
+  return {
+    workspaceRoot,
+    parentFiles,
+    childFiles,
+    mergedFiles
+  };
+};
 const runNpmPack = async (targetDir, packDestDir) => {
   return new Promise((res, rej) => {
     const npmProcess = spawn(
@@ -687,8 +800,8 @@ stdout: ${stdout}`));
     });
   });
 };
-const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, inheritableFields, readmeReplacementPath, replacePeerDepsWildcards, peerDepsVersionPrefix, logger2) => {
-  var _a, _b, _c;
+const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alwaysOverrideVersionFromGit, inheritableFields, readmeReplacementPath, replacePeerDepsWildcards, peerDepsVersionPrefix, logger2, mergeFiles = true) => {
+  var _a, _b, _c, _d;
   if (!existsSync(targetDir)) {
     throw new Error(`Target directory is not found: ${targetDir}`);
   }
@@ -750,6 +863,11 @@ const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alw
       }
     }
   }
+  const filesMergeEnabled = mergeFiles && inheritableFields.has("files");
+  const workspaceFilesMerge = filesMergeEnabled ? await resolveWorkspaceFilesMerge(targetDir, logger2) : void 0;
+  if (filesMergeEnabled && (workspaceFilesMerge == null ? void 0 : workspaceFilesMerge.mergedFiles)) {
+    resolvedPackageJson.files = workspaceFilesMerge.mergedFiles;
+  }
   const baseTempDir = await mkdtemp(join(tmpdir(), "screw-up-npm-pack-"));
   await mkdir(baseTempDir, { recursive: true });
   try {
@@ -758,7 +876,25 @@ const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alw
     await mkdir(stagingDir, { recursive: true });
     const stream = createReadStream(npmTarballPath);
     await extractTo(createTarExtractor(stream, "gzip"), stagingDir);
-    const packageJsonPath = join(stagingDir, "package", "package.json");
+    const packageRoot = join(stagingDir, "package");
+    if (filesMergeEnabled && ((_a = workspaceFilesMerge == null ? void 0 : workspaceFilesMerge.parentFiles) == null ? void 0 : _a.length)) {
+      const parentFiles = await expandFilesPatterns(
+        workspaceFilesMerge.parentFiles,
+        workspaceFilesMerge.workspaceRoot
+      );
+      for (const parentFile of parentFiles) {
+        const destPath = join(packageRoot, parentFile);
+        if (existsSync(destPath)) {
+          continue;
+        }
+        await mkdir(dirname(destPath), { recursive: true });
+        await copyFile(
+          join(workspaceFilesMerge.workspaceRoot, parentFile),
+          destPath
+        );
+      }
+    }
+    const packageJsonPath = join(packageRoot, "package.json");
     if (existsSync(packageJsonPath)) {
       await writeFile(
         packageJsonPath,
@@ -766,10 +902,10 @@ const packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alw
       );
     }
     if (readmeReplacementCandidatePath) {
-      const readmeDestPath = join(stagingDir, "package", "README.md");
+      const readmeDestPath = join(packageRoot, "README.md");
       await copyFile(readmeReplacementCandidatePath, readmeDestPath);
     }
-    const outputFileName = `${(_b = (_a = resolvedPackageJson == null ? void 0 : resolvedPackageJson.name) == null ? void 0 : _a.replace("/", "-")) != null ? _b : "package"}-${(_c = resolvedPackageJson == null ? void 0 : resolvedPackageJson.version) != null ? _c : "0.0.0"}.tgz`;
+    const outputFileName = `${(_c = (_b = resolvedPackageJson == null ? void 0 : resolvedPackageJson.name) == null ? void 0 : _b.replace("/", "-")) != null ? _c : "package"}-${(_d = resolvedPackageJson == null ? void 0 : resolvedPackageJson.version) != null ? _d : "0.0.0"}.tgz`;
     await mkdir(outputDir, { recursive: true });
     const outputFile = join(outputDir, outputFileName);
     const itemGenerator = createEntryItemGenerator(stagingDir);
@@ -846,7 +982,8 @@ const defaultInheritableFields = /* @__PURE__ */ new Set([
   "keywords",
   "homepage",
   "bugs",
-  "readme"
+  "readme",
+  "files"
 ]);
 const defaultOutputMetadataKeys = [
   "name",
@@ -1048,6 +1185,7 @@ Options:
   --inheritable-fields <list>   Comma-separated list of fields to inherit from parent
   --no-wds                      Do not check working directory status to increase version
   --no-git-version-override     Do not override version from Git (use package.json version)
+  --no-merge-files              Do not merge files from parent package.json
   -f, --force                   Allow dumping even if package.json does not exist
   -h, --help                    Show help for dump command
 `);
@@ -1061,6 +1199,7 @@ const dumpCommand = async (args, logger2) => {
   const inheritableFieldsOption = args.options["inheritable-fields"];
   const alwaysOverrideVersionFromGit = !args.options["no-git-version-override"];
   const checkWorkingDirectoryStatus = args.options["no-wds"] ? false : true;
+  const mergeFiles = !args.options["no-merge-files"];
   const ignorePackageJsonNotExist = args.options["force"] || args.options["f"] ? true : false;
   const inheritableFields = parseInheritableFields(inheritableFieldsOption);
   const targetDir = resolve(directory != null ? directory : process.cwd());
@@ -1088,6 +1227,15 @@ const dumpCommand = async (args, logger2) => {
       ignorePackageJsonNotExist
     );
     if (computedPackageJson) {
+      if (mergeFiles && inheritableFields.has("files") && existsSync(join(targetDir, "package.json"))) {
+        const workspaceFilesMerge = await resolveWorkspaceFilesMerge(
+          targetDir,
+          _logger
+        );
+        if (workspaceFilesMerge == null ? void 0 : workspaceFilesMerge.mergedFiles) {
+          computedPackageJson.files = workspaceFilesMerge.mergedFiles;
+        }
+      }
       console.info(JSON.stringify(computedPackageJson, null, 2));
     } else {
       _logger.error(`dump: Unable to read package.json from: ${targetDir}`);
@@ -1199,6 +1347,7 @@ Options:
   --inheritable-fields <list>   Comma-separated list of fields to inherit from parent
   --no-wds                      Do not check working directory status to increase version
   --no-git-version-override     Do not override version from Git (use package.json version)
+  --no-merge-files              Do not merge files from parent package.json
   --no-replace-peer-deps        Disable replacing "*" in peerDependencies with actual versions
   --peer-deps-prefix <prefix>   Version prefix for replaced peerDependencies (default: "^")
   --verbose                     Print verbose log
@@ -1217,6 +1366,7 @@ const packCommand = async (args, logger2) => {
   const inheritableFieldsOption = args.options["inheritable-fields"];
   const checkWorkingDirectoryStatus = args.options["no-wds"] ? false : true;
   const alwaysOverrideVersionFromGit = !args.options["no-git-version-override"];
+  const mergeFiles = !args.options["no-merge-files"];
   const replacePeerDepsWildcards = !args.options["no-replace-peer-deps"];
   const peerDepsVersionPrefix = (_a = args.options["peer-deps-prefix"]) != null ? _a : "^";
   const verbose = args.options["verbose"] ? true : false;
@@ -1237,7 +1387,8 @@ const packCommand = async (args, logger2) => {
       readmeReplacementPath,
       replacePeerDepsWildcards,
       peerDepsVersionPrefix,
-      logger2
+      logger2,
+      mergeFiles
     );
     if (result) {
       if (verbose) {
@@ -1319,6 +1470,7 @@ const publishCommand = async (args, logger2) => {
   const inheritableFieldsOption = args.options["inheritable-fields"];
   const checkWorkingDirectoryStatus = args.options["no-wds"] ? false : true;
   const alwaysOverrideVersionFromGit = !args.options["no-git-version-override"];
+  const mergeFiles = !args.options["no-merge-files"];
   const replacePeerDepsWildcards = !args.options["no-replace-peer-deps"];
   const peerDepsVersionPrefix = (_a = args.options["peer-deps-prefix"]) != null ? _a : "^";
   const verbose = args.options["verbose"] ? true : false;
@@ -1328,7 +1480,7 @@ const publishCommand = async (args, logger2) => {
   for (let i = 0; i < args.argv.length; i++) {
     const arg = args.argv[i];
     if (arg === "publish") ;
-    else if (arg === "--help" || arg === "--verbose" || arg === "-h" || arg === "--no-wds" || arg === "--no-git-version-override" || arg === "--no-replace-peer-deps") ;
+    else if (arg === "--help" || arg === "--verbose" || arg === "-h" || arg === "--no-wds" || arg === "--no-git-version-override" || arg === "--no-merge-files" || arg === "--no-replace-peer-deps") ;
     else if (arg === "--readme" || arg === "--inheritable-fields" || arg === "--peer-deps-prefix") {
       i++;
     } else {
@@ -1352,7 +1504,8 @@ const publishCommand = async (args, logger2) => {
           readmeReplacementPath,
           replacePeerDepsWildcards,
           peerDepsVersionPrefix,
-          logger2
+          logger2,
+          mergeFiles
         );
         if (result == null ? void 0 : result.metadata) {
           if (verbose) {
@@ -1391,7 +1544,8 @@ const publishCommand = async (args, logger2) => {
             readmeReplacementPath,
             replacePeerDepsWildcards,
             peerDepsVersionPrefix,
-            logger2
+            logger2,
+            mergeFiles
           );
           if (result == null ? void 0 : result.metadata) {
             if (verbose) {
@@ -1431,7 +1585,7 @@ const publishCommand = async (args, logger2) => {
   }
 };
 const showHelp = async () => {
-  const { author, license, repository_url, version, git_commit_hash } = await import("./packageMetadata-BtM7pxOK.js").then((n) => n.p);
+  const { author, license, repository_url, version, git_commit_hash } = await import("./packageMetadata-DlkAQe0j.js").then((n) => n.p);
   console.info(`screw-up [${version}-${git_commit_hash}]
 Easy package metadata inserter CLI
 Copyright (c) ${author}