screw-up 1.27.0 → 1.29.0

package/dist/index.mjs

@@ -1,14 +1,14 @@
 /*!
 * name: screw-up
-* version: 1.27.0
+* version: 1.29.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: eb1634007fc12b0ddd13928d7688758bdfe32624
+* git.commit.hash: 3833f6ef842d9e5a0b4f7277ca3b118f26fd4a6b
 */
-import { i as getFetchGitMetadata, l as resolvePackageMetadata, n as generateMetadataFileContent, o as createConsoleLogger, r as writeFileIfChanged, t as ensureMetadataGitignore } from "./metadata-file-Djz8vanJ.js";
-import { i as version, n as name, t as git_commit_hash } from "./packageMetadata-B3dAY9Pw.js";
+import { i as getFetchGitMetadata, l as resolvePackageMetadata, n as generateMetadataFileContent, o as createConsoleLogger, r as writeFileIfChanged, t as ensureMetadataGitignore } from "./metadata-file-CyQ2yue9.js";
+import { i as version, n as name, t as git_commit_hash } from "./packageMetadata-DnXbVLQ5.js";
 import { readFile, readdir, writeFile } from "fs/promises";
 import { existsSync } from "fs";
 import { dirname, extname, join } from "path";

package/dist/main.cjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 /*!
 * name: screw-up
-* version: 1.27.0
+* version: 1.29.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: eb1634007fc12b0ddd13928d7688758bdfe32624
+* git.commit.hash: 3833f6ef842d9e5a0b4f7277ca3b118f26fd4a6b
 */
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -31,7 +31,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_packageMetadata = require("./packageMetadata-BwJnVnNu.cjs");
+const require_packageMetadata = require("./packageMetadata-K_w0Knb7.cjs");
 let path = require("path");
 let fs = require("fs");
 let fs_promises = require("fs/promises");
@@ -2815,12 +2815,81 @@ var getRelatedBranches = async (repositoryPath, commitHash) => {
 * @param repositoryPath - Local Git repository directory
 * @returns Modified files
 */
+var isModifiedFile = ([, head, workdir, stage]) => {
+	return workdir === 2 || stage === 2 || stage === 3 || head === 1 && workdir === 0 || head === 0 && workdir === 1;
+};
+var getStatusRow = async (filepath, entries) => {
+	const [head, workdir, stage] = entries;
+	const [headType, workdirType, stageType] = await Promise.all([
+		head ? head.type() : void 0,
+		workdir ? workdir.type() : void 0,
+		stage ? stage.type() : void 0
+	]);
+	const isBlob = [
+		headType,
+		workdirType,
+		stageType
+	].includes("blob");
+	if ((headType === "tree" || headType === "special") && !isBlob) return;
+	if (headType === "commit") return;
+	if ((workdirType === "tree" || workdirType === "special") && !isBlob) return;
+	if (stageType === "commit") return;
+	if ((stageType === "tree" || stageType === "special") && !isBlob) return;
+	const headOid = headType === "blob" ? await head.oid() : void 0;
+	const stageOid = stageType === "blob" ? await stage.oid() : void 0;
+	let workdirOid;
+	if (headType !== "blob" && workdirType === "blob" && stageType !== "blob") workdirOid = "42";
+	else if (workdirType === "blob") workdirOid = await workdir.oid();
+	const entry = [
+		void 0,
+		headOid,
+		workdirOid,
+		stageOid
+	];
+	const statusValues = entry.map((value) => entry.indexOf(value));
+	return [
+		filepath,
+		statusValues[1],
+		statusValues[2],
+		statusValues[3]
+	];
+};
+var reduceModifiedFiles = async (parent, children) => {
+	const modifiedFiles = parent ? [parent] : [];
+	for (const child of children) modifiedFiles.push(...child);
+	return modifiedFiles;
+};
+var iterateSequentially = async (walk, children) => {
+	const results = [];
+	for (const child of children) results.push(await walk(child));
+	return results;
+};
 var getModifiedFiles = async (repositoryPath) => {
 	try {
-		return (await isomorphic_git.statusMatrix({
+		return await isomorphic_git.walk({
 			fs: fs_promises.default,
-			dir: repositoryPath
-		})).filter(([, head, workdir, stage]) => workdir === 2 || stage === 2 || stage === 3 || head === 1 && workdir === 0 || head === 0 && workdir === 1);
+			dir: repositoryPath,
+			trees: [
+				isomorphic_git.TREE({ ref: "HEAD" }),
+				isomorphic_git.WORKDIR(),
+				isomorphic_git.STAGE()
+			],
+			map: async (filepath, entries) => {
+				const [head, workdir, stage] = entries;
+				if (!head && !stage && workdir) {
+					if (await isomorphic_git.isIgnored({
+						fs: fs_promises.default,
+						dir: repositoryPath,
+						filepath
+					})) return null;
+				}
+				const statusRow = await getStatusRow(filepath, entries);
+				if (!statusRow || !isModifiedFile(statusRow)) return;
+				return statusRow;
+			},
+			reduce: reduceModifiedFiles,
+			iterate: iterateSequentially
+		});
 	} catch (_unused5) {
 		return [];
 	}
@@ -3007,6 +3076,62 @@ var mergeResolvedPackageJson = (packedPackageJson, resolvedPackageJson) => {
 	}
 	return mergedPackageJson;
 };
+var workspaceProtocolPrefix = "workspace:";
+var inferVersionPrefix = (dependencySpec) => {
+	if (dependencySpec.startsWith("^")) return "^";
+	if (dependencySpec.startsWith("~")) return "~";
+	return "";
+};
+var looksLikeWorkspaceProtocolAlias = (rawSpecifier) => {
+	if (!rawSpecifier) return false;
+	if (rawSpecifier === "*" || rawSpecifier === "^" || rawSpecifier === "~" || rawSpecifier.startsWith("^") || rawSpecifier.startsWith("~") || /^[0-9]/.test(rawSpecifier)) return false;
+	return true;
+};
+var parseWorkspaceProtocolDependencyReference = (dependencyName, workspaceProtocolSpecifier) => {
+	if (!workspaceProtocolSpecifier.startsWith(workspaceProtocolPrefix)) return;
+	const rawSpecifier = workspaceProtocolSpecifier.slice(10).trim();
+	if (!looksLikeWorkspaceProtocolAlias(rawSpecifier)) return {
+		targetPackageName: dependencyName,
+		alias: false
+	};
+	if (rawSpecifier.startsWith("@")) {
+		const secondAt = rawSpecifier.indexOf("@", 1);
+		const targetPackageName = secondAt >= 0 ? rawSpecifier.slice(0, secondAt) : rawSpecifier;
+		return {
+			targetPackageName,
+			alias: targetPackageName !== dependencyName
+		};
+	}
+	const atIndex = rawSpecifier.indexOf("@");
+	const targetPackageName = atIndex >= 0 ? rawSpecifier.slice(0, atIndex) : rawSpecifier;
+	return {
+		targetPackageName,
+		alias: targetPackageName !== dependencyName
+	};
+};
+var formatResolvedWorkspaceDependency = (packedDependencySpecifier, reference, sibling) => {
+	const aliasPrefix = `npm:${reference.targetPackageName}@`;
+	if (packedDependencySpecifier.startsWith(aliasPrefix)) return `${aliasPrefix}${inferVersionPrefix(packedDependencySpecifier.slice(aliasPrefix.length))}${sibling.version}`;
+	return `${inferVersionPrefix(packedDependencySpecifier)}${sibling.version}`;
+};
+var replaceWorkspaceProtocolDependencies = (packageJson, resolvedPackageJson, siblings) => {
+	const modifiedPackageJson = clonePackageJson(packageJson);
+	for (const sectionKey of dependencySectionKeys) {
+		const modifiedSection = modifiedPackageJson[sectionKey];
+		const resolvedSection = resolvedPackageJson === null || resolvedPackageJson === void 0 ? void 0 : resolvedPackageJson[sectionKey];
+		if (!modifiedSection || typeof modifiedSection !== "object" || !resolvedSection || typeof resolvedSection !== "object") continue;
+		for (const [dependencyName, dependencySpecifier] of Object.entries(resolvedSection)) {
+			if (typeof dependencySpecifier !== "string") continue;
+			const reference = parseWorkspaceProtocolDependencyReference(dependencyName, dependencySpecifier);
+			if (!reference) continue;
+			const sibling = siblings.get(reference.targetPackageName);
+			const packedDependencySpecifier = modifiedSection[dependencyName];
+			if (!sibling || typeof packedDependencySpecifier !== "string") continue;
+			modifiedSection[dependencyName] = formatResolvedWorkspaceDependency(packedDependencySpecifier, reference, sibling);
+		}
+	}
+	return modifiedPackageJson;
+};
 var getFilesArray = (packageJson) => {
 	if (!packageJson || !Array.isArray(packageJson.files)) return;
 	const entries = packageJson.files.filter((entry) => typeof entry === "string");
@@ -3179,7 +3304,7 @@ var packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alway
 		}
 		delete resolvedPackageJson.readme;
 	}
-	const workspaceRoot = replacePeerDepsWildcards ? await findWorkspaceRoot(targetDir, logger) : void 0;
+	const workspaceRoot = replacePeerDepsWildcards || packageManager === "pnpm" ? await findWorkspaceRoot(targetDir, logger) : void 0;
 	const workspaceSiblings = workspaceRoot ? await collectWorkspaceSiblings(workspaceRoot, fetchGitMetadata, alwaysOverrideVersionFromGit, inheritableFields, logger) : void 0;
 	const filesMergeEnabled = mergeFiles && inheritableFields.has("files");
 	const workspaceFilesMerge = filesMergeEnabled ? await resolveWorkspaceFilesMerge(targetDir, logger) : void 0;
@@ -3206,6 +3331,7 @@ var packAssets = async (targetDir, outputDir, checkWorkingDirectoryStatus, alway
 		let finalPackageJson = resolvedPackageJson;
 		if ((0, fs.existsSync)(packageJsonPath)) {
 			finalPackageJson = mergeResolvedPackageJson(await readPackageJsonFile(packageJsonPath), resolvedPackageJson);
+			if (packageManager === "pnpm" && (workspaceSiblings === null || workspaceSiblings === void 0 ? void 0 : workspaceSiblings.size)) finalPackageJson = replaceWorkspaceProtocolDependencies(finalPackageJson, resolvedPackageJson, workspaceSiblings);
 			if (workspaceSiblings && workspaceSiblings.size > 0) finalPackageJson = replacePeerDependenciesWildcards(finalPackageJson, workspaceSiblings, peerDepsVersionPrefix);
 			if (packageJsonReadme) delete finalPackageJson.readme;
 			await (0, fs_promises.writeFile)(packageJsonPath, JSON.stringify(finalPackageJson, null, 2));
@@ -3787,7 +3913,7 @@ var publishCommand = async (args, logger) => {
 	}
 };
 var showHelp = async () => {
-	const { author, license, repository_url, version, git_commit_hash } = await Promise.resolve().then(() => require("./packageMetadata-BZlXZqjz.cjs"));
+	const { author, license, repository_url, version, git_commit_hash } = await Promise.resolve().then(() => require("./packageMetadata-CpakAG0S.cjs"));
 	console.info(`screw-up [${version}-${git_commit_hash}]
 Easy package metadata inserter CLI
 Copyright (c) ${author}