screw-up 1.32.0 → 1.34.0

package/dist/main.cjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 /*!
 * name: screw-up
-* version: 1.32.0
+* version: 1.34.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: 8a0078c34fa41bdb0cbf2d23837ac5e3217cbf53
+* git.commit.hash: bcd53f2a2326d1600b105c38a496c6c9c04b6a97
 */
 //#region \0rolldown/runtime.js
 var __create = Object.create;
@@ -15,7 +15,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -31,11 +31,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_packageMetadata = require("./packageMetadata-6po5LHyH.cjs");
 let path = require("path");
 let fs = require("fs");
 let fs_promises = require("fs/promises");
-fs_promises = __toESM(fs_promises);
+fs_promises = __toESM(fs_promises, 1);
 let child_process = require("child_process");
 let os = require("os");
 let stream = require("stream");
@@ -43,7 +42,7 @@ let zlib = require("zlib");
 let stream_promises = require("stream/promises");
 let glob = require("glob");
 let isomorphic_git = require("isomorphic-git");
-isomorphic_git = __toESM(isomorphic_git);
+isomorphic_git = __toESM(isomorphic_git, 1);
 let crypto = require("crypto");
 //#region node_modules/tar-vern/dist/index.js
 /*!
@@ -2417,17 +2416,45 @@ var PACKED_OBJECT_TYPE_BY_CODE = new Map([
 	[7, "ref-delta"]
 ]);
 /**
-* Resolve the actual Git directory for repositories, worktrees, and submodules.
+* Resolve Git directory paths for repositories, worktrees, and submodules.
 * @param repoPath - Repository path
-* @returns The resolved Git directory path
+* @returns The resolved Git directory paths
 */
-var getActualGitDir = async (repoPath) => {
+var resolveGitDirectoryPaths = async (repoPath) => {
 	const gitDir = (0, path.join)(repoPath, ".git");
 	const gitStat = await (0, fs_promises.stat)(gitDir).catch(() => null);
-	if (!(gitStat === null || gitStat === void 0 ? void 0 : gitStat.isFile())) return gitDir;
-	const match = (await (0, fs_promises.readFile)(gitDir, "utf-8")).match(/^gitdir:\s*(.+)$/m);
-	if (!match) return gitDir;
-	return (0, path.isAbsolute)(match[1]) ? match[1] : (0, path.join)(repoPath, match[1]);
+	const resolvedGitDir = !(gitStat === null || gitStat === void 0 ? void 0 : gitStat.isFile()) ? gitDir : await (async () => {
+		const match = (await (0, fs_promises.readFile)(gitDir, "utf-8")).match(/^gitdir:\s*(.+)$/m);
+		if (!match) return gitDir;
+		return (0, path.isAbsolute)(match[1]) ? match[1] : (0, path.join)(repoPath, match[1]);
+	})();
+	return {
+		gitDir: resolvedGitDir,
+		commonGitDir: await (0, fs_promises.readFile)((0, path.join)(resolvedGitDir, "commondir"), "utf-8").then((content) => {
+			const commondir = content.trim();
+			if (!commondir) return resolvedGitDir;
+			return (0, path.isAbsolute)(commondir) ? commondir : (0, path.join)(resolvedGitDir, commondir);
+		}).catch((error) => {
+			if ((error === null || error === void 0 ? void 0 : error.code) !== "ENOENT") throw error;
+			return resolvedGitDir;
+		})
+	};
+};
+/**
+* Resolve the worktree-specific Git directory.
+* @param repoPath - Repository path
+* @returns The resolved worktree-specific Git directory path
+*/
+var getActualGitDir = async (repoPath) => {
+	return (await resolveGitDirectoryPaths(repoPath)).gitDir;
+};
+/**
+* Resolve the common Git directory used for refs and objects.
+* @param repoPath - Repository path
+* @returns The resolved common Git directory path
+*/
+var getCommonGitDir = async (repoPath) => {
+	return (await resolveGitDirectoryPaths(repoPath)).commonGitDir;
 };
 var readFixedRange = async (fileHandle, offset, length) => {
 	const buffer = Buffer.alloc(length);
@@ -2644,11 +2671,11 @@ var parseTreeEntries = (treeContent) => {
 	return entries;
 };
 var createGitObjectResolver = async (repoPath) => {
-	const actualGitDir = await getActualGitDir(repoPath);
+	const commonGitDir = await getCommonGitDir(repoPath);
 	const resolvedObjects = /* @__PURE__ */ new Map();
 	let packStorePromise;
 	const getPackStore = async () => {
-		if (!packStorePromise) packStorePromise = loadPackStore(actualGitDir);
+		if (!packStorePromise) packStorePromise = loadPackStore(commonGitDir);
 		return packStorePromise;
 	};
 	const readPackedObject = async (location) => {
@@ -2684,7 +2711,7 @@ var createGitObjectResolver = async (repoPath) => {
 		const cachedObject = resolvedObjects.get(oid);
 		if (cachedObject) return cachedObject;
 		const objectPromise = (async () => {
-			const looseObject = await readLooseObject(actualGitDir, oid);
+			const looseObject = await readLooseObject(commonGitDir, oid);
 			if (looseObject) return looseObject;
 			const location = (await getPackStore()).objectByOid.get(oid);
 			if (!location) throw new Error(`Git object not found: ${oid}`);
@@ -2759,14 +2786,14 @@ var collectTreeFiles = async (resolver, treeOid, prefix, files) => {
 			await collectTreeFiles(resolver, entry.oid, path$7, files);
 			continue;
 		}
-		if (entry.mode !== "160000") files.set(path$7, entry.oid);
+		files.set(path$7, entry.oid);
 	}
 };
 /**
-* Collect all tracked file blob OIDs under the specified tree.
+* Collect all tracked file and submodule OIDs under the specified tree.
 * @param repoPath - Repository path
 * @param treeOid - Tree object OID
-* @returns Map of repository-relative file path to blob OID
+* @returns Map of repository-relative file path to blob or submodule OID
 */
 var listTreeFiles = async (repoPath, treeOid) => {
 	const resolver = await createGitObjectResolver(repoPath);
@@ -2829,8 +2856,8 @@ var readLooseTags = async (refsTagsPath) => {
 * @returns Array of all tag names
 */
 var listTagsFast = async (repoPath) => {
-	const actualGitDir = await getActualGitDir(repoPath);
-	const [packedTags, looseTags] = await Promise.all([parsePackedRefs((0, path.join)(actualGitDir, "packed-refs")), readLooseTags((0, path.join)(actualGitDir, "refs", "tags"))]);
+	const commonGitDir = await getCommonGitDir(repoPath);
+	const [packedTags, looseTags] = await Promise.all([parsePackedRefs((0, path.join)(commonGitDir, "packed-refs")), readLooseTags((0, path.join)(commonGitDir, "refs", "tags"))]);
 	const allTags = new Set([...packedTags, ...looseTags]);
 	return Array.from(allTags).sort();
 };
@@ -2843,11 +2870,11 @@ var listTagsFast = async (repoPath) => {
 var resolveTagsBatchWithCommit = async (repoPath, tagNames, logger) => {
 	const startTime = Date.now();
 	const result = /* @__PURE__ */ new Map();
-	const actualGitDir = await getActualGitDir(repoPath);
+	const commonGitDir = await getCommonGitDir(repoPath);
 	const tagSet = new Set(tagNames);
 	const packedRefsStart = Date.now();
 	try {
-		const lines = (await (0, fs_promises.readFile)((0, path.join)(actualGitDir, "packed-refs"), "utf-8")).split("\n");
+		const lines = (await (0, fs_promises.readFile)((0, path.join)(commonGitDir, "packed-refs"), "utf-8")).split("\n");
 		for (let i = 0; i < lines.length; i++) {
 			const line = lines[i];
 			if (line.startsWith("#") || !line.trim()) continue;
@@ -2871,7 +2898,7 @@ var resolveTagsBatchWithCommit = async (repoPath, tagNames, logger) => {
 	if (remainingTags.length > 0) {
 		const looseRefsStart = Date.now();
 		const looseTagEntries = (await Promise.all(remainingTags.map(async (tagName) => {
-			const looseRefPath = (0, path.join)(actualGitDir, "refs", "tags", tagName);
+			const looseRefPath = (0, path.join)(commonGitDir, "refs", "tags", tagName);
 			try {
 				return {
 					tagName,
@@ -3087,16 +3114,26 @@ var formatVersion = (version) => {
 	return result;
 };
 /**
-* Get a commit by hash
+* Build a Git read context that can operate correctly inside worktrees.
 * @param repositoryPath - Local Git repository directory
+* @returns The resolved Git read context
+*/
+var createGitReadContext = async (repositoryPath) => ({
+	dir: repositoryPath,
+	gitdir: await getCommonGitDir(repositoryPath)
+});
+/**
+* Get a commit by hash
+* @param context - Git read context
 * @param hash - The hash of the commit
 * @returns The commit or undefined if the commit is not found
 */
-var getCommit = async (repositoryPath, hash) => {
+var getCommit = async (context, hash) => {
 	try {
 		const commit = await isomorphic_git.readCommit({
 			fs: fs_promises.default,
-			dir: repositoryPath,
+			dir: context.dir,
+			gitdir: context.gitdir,
 			oid: hash
 		});
 		return {
@@ -3113,19 +3150,20 @@ var getCommit = async (repositoryPath, hash) => {
 };
 /**
 * Get the current commit
-* @param repositoryPath - Local Git repository directory
+* @param context - Git read context
 * @returns The current commit or undefined if the current commit is not found
 */
-var getCurrentCommit = async (repositoryPath) => {
+var getCurrentCommit = async (context) => {
 	try {
 		const currentOid = await isomorphic_git.resolveRef({
 			fs: fs_promises.default,
-			dir: repositoryPath,
+			dir: context.dir,
 			ref: "HEAD"
 		});
 		const commit = await isomorphic_git.readCommit({
 			fs: fs_promises.default,
-			dir: repositoryPath,
+			dir: context.dir,
+			gitdir: context.gitdir,
 			oid: currentOid
 		});
 		return {
@@ -3151,21 +3189,23 @@ var getRelatedTagsFromMap = (commitToTags, commitHash) => {
 };
 /**
 * Get the commit related branch name.
-* @param repositoryPath - Local Git repository directory
+* @param context - Git read context
 * @param commitHash - The hash of the commit
 * @returns The commit related branch name or undefined if not found
 */
-var getRelatedBranches = async (repositoryPath, commitHash) => {
+var getRelatedBranches = async (context, commitHash) => {
 	try {
 		const branches = await isomorphic_git.listBranches({
 			fs: fs_promises.default,
-			dir: repositoryPath
+			dir: context.dir,
+			gitdir: context.gitdir
 		});
 		const relatedBranches = [];
 		for (const branch of branches) try {
 			if (await isomorphic_git.resolveRef({
 				fs: fs_promises.default,
-				dir: repositoryPath,
+				dir: context.dir,
+				gitdir: context.gitdir,
 				ref: branch
 			}) === commitHash) relatedBranches.push(branch);
 		} catch (_unused3) {}
@@ -3174,6 +3214,9 @@ var getRelatedBranches = async (repositoryPath, commitHash) => {
 		return [];
 	}
 };
+var GITLINK_INDEX_MODE = 57344;
+var INDEX_MODE_TYPE_MASK = 61440;
+var isGitLinkIndexEntry = (entry) => (entry.mode & INDEX_MODE_TYPE_MASK) === GITLINK_INDEX_MODE;
 var parseGitIndex = async (gitDir) => {
 	try {
 		const buffer = await fs_promises.default.readFile((0, path.join)(gitDir, "index"));
@@ -3185,6 +3228,7 @@ var parseGitIndex = async (gitDir) => {
 		const entries = /* @__PURE__ */ new Map();
 		for (let index = 0; index < entryCount; index++) {
 			const entryStart = offset;
+			const mode = buffer.readUInt32BE(entryStart + 24);
 			const size = buffer.readUInt32BE(entryStart + 36);
 			const oid = buffer.subarray(entryStart + 40, entryStart + 60).toString("hex");
 			const flags = buffer.readUInt16BE(entryStart + 60);
@@ -3199,6 +3243,7 @@ var parseGitIndex = async (gitDir) => {
 			entries.set(path$3, {
 				path: path$3,
 				oid,
+				mode,
 				size,
 				stage
 			});
@@ -3221,7 +3266,7 @@ var listTrackedDirectories = (indexEntries) => {
 	}
 	return directories;
 };
-var listWorkingDirectoryFiles = async (repositoryPath, trackedDirectories, relativePath = "") => {
+var listWorkingDirectoryFiles = async (repositoryPath, trackedDirectories, excludedDirectories, relativePath = "") => {
 	const directoryPath = relativePath ? (0, path.join)(repositoryPath, relativePath) : repositoryPath;
 	const entries = await fs_promises.default.readdir(directoryPath, { withFileTypes: true });
 	const files = [];
@@ -3229,6 +3274,7 @@ var listWorkingDirectoryFiles = async (repositoryPath, trackedDirectories, relat
 		if (entry.name === ".git") continue;
 		const entryPath = relativePath ? `${relativePath}/${entry.name}` : entry.name;
 		if (entry.isDirectory()) {
+			if (excludedDirectories.has(entryPath)) continue;
 			if (!trackedDirectories.has(entryPath)) {
 				if (await isomorphic_git.isIgnored({
 					fs: fs_promises.default,
@@ -3236,7 +3282,7 @@ var listWorkingDirectoryFiles = async (repositoryPath, trackedDirectories, relat
 					filepath: entryPath
 				})) continue;
 			}
-			files.push(...await listWorkingDirectoryFiles(repositoryPath, trackedDirectories, entryPath));
+			files.push(...await listWorkingDirectoryFiles(repositoryPath, trackedDirectories, excludedDirectories, entryPath));
 			continue;
 		}
 		if (entry.isFile() || entry.isSymbolicLink()) files.push(entryPath);
@@ -3251,7 +3297,7 @@ var getModifiedFiles = async (repositoryPath, headTreeOid) => {
 	try {
 		const gitDir = await getActualGitDir(repositoryPath);
 		const [headFiles, indexEntries] = await Promise.all([listTreeFiles(repositoryPath, headTreeOid), parseGitIndex(gitDir)]);
-		const workdirFiles = await listWorkingDirectoryFiles(repositoryPath, listTrackedDirectories(indexEntries));
+		const workdirFiles = await listWorkingDirectoryFiles(repositoryPath, listTrackedDirectories(indexEntries), new Set(Array.from(indexEntries.values()).filter(isGitLinkIndexEntry).map((entry) => entry.path)));
 		const modifiedFiles = /* @__PURE__ */ new Map();
 		const rememberModifiedFile = (path$5, reason) => {
 			if (!modifiedFiles.has(path$5)) modifiedFiles.set(path$5, {
@@ -3269,6 +3315,10 @@ var getModifiedFiles = async (repositoryPath, headTreeOid) => {
 			const absolutePath = (0, path.join)(repositoryPath, indexEntry.path);
 			try {
 				const stats = await fs_promises.default.lstat(absolutePath);
+				if (isGitLinkIndexEntry(indexEntry)) {
+					if (indexEntry.stage !== 0) rememberModifiedFile(indexEntry.path, "staged");
+					continue;
+				}
 				if (!stats.isFile() && !stats.isSymbolicLink()) {
 					rememberModifiedFile(indexEntry.path, "worktree");
 					continue;
@@ -3309,7 +3359,7 @@ var formatModifiedFile = (modifiedFile) => `'${modifiedFile.path}':${modifiedFil
 * @param commitToTags - Map of commit hash to tags for performance
 * @returns The version or undefined if no version is found
 */
-var lookupVersionLabelRecursive = async (cwd, commit, reachedCommits, commitToTags) => {
+var lookupVersionLabelRecursive = async (context, commit, reachedCommits, commitToTags) => {
 	const scheduledStack = [];
 	let version = {
 		major: 0,
@@ -3333,10 +3383,11 @@ var lookupVersionLabelRecursive = async (cwd, commit, reachedCommits, commitToTa
 		try {
 			const parentHashes = (await isomorphic_git.readCommit({
 				fs: fs_promises.default,
-				dir: cwd,
+				dir: context.dir,
+				gitdir: context.gitdir,
 				oid: currentCommit.hash
 			})).commit.parent || [];
-			parentCommits = (await Promise.all(parentHashes.map((parentHash) => getCommit(cwd, parentHash)))).filter((ci) => ci !== void 0);
+			parentCommits = (await Promise.all(parentHashes.map((parentHash) => getCommit(context, parentHash)))).filter((ci) => ci !== void 0);
 		} catch (_unused6) {}
 		if (parentCommits.length === 0) {
 			reachedCommits.set(currentCommit.hash, version);
@@ -3351,7 +3402,7 @@ var lookupVersionLabelRecursive = async (cwd, commit, reachedCommits, commitToTa
 	while (scheduledStack.length >= 1) {
 		const { commit: scheduledCommit, parents } = scheduledStack.pop();
 		if (parents.length >= 2) for (let index = 1; index < parents.length; index++) {
-			const alternateParentVersion = await lookupVersionLabelRecursive(cwd, parents[index], reachedCommits, commitToTags);
+			const alternateParentVersion = await lookupVersionLabelRecursive(context, parents[index], reachedCommits, commitToTags);
 			if (alternateParentVersion && compareVersions(alternateParentVersion, version) < 0) version = alternateParentVersion;
 		}
 		version = incrementLastVersionComponent(version);
@@ -3379,12 +3430,31 @@ var getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logger)
 		logger.debug(`[screw-up] Total getGitMetadata: ${Date.now() - startTime}ms`);
 		return metadata;
 	}
+	let gitContext;
 	try {
-		const currentCommit = await getCurrentCommit(gitRootPath);
-		if (!currentCommit) {
-			logger.debug(`[screw-up] Total getGitMetadata: ${Date.now() - startTime}ms`);
-			return metadata;
+		gitContext = await createGitReadContext(gitRootPath);
+	} catch (error) {
+		logger.warn(`Failed to resolve git metadata context: ${error}`);
+		logger.debug(`[screw-up] Total getGitMetadata: ${Date.now() - startTime}ms`);
+		return metadata;
+	}
+	const currentCommit = await getCurrentCommit(gitContext);
+	if (!currentCommit) {
+		logger.debug(`[screw-up] Total getGitMetadata: ${Date.now() - startTime}ms`);
+		return metadata;
+	}
+	const gitMetadata = {
+		tags: [],
+		branches: [],
+		commit: {
+			hash: currentCommit.hash,
+			shortHash: currentCommit.shortHash,
+			date: dayjs(currentCommit.date).format("YYYY-MM-DDTHH:mm:ssZ"),
+			message: currentCommit.message
 		}
+	};
+	metadata.git = gitMetadata;
+	try {
 		const buildStart = Date.now();
 		const commitToTags = await buildCompleteTagCache(gitRootPath, (tagName) => {
 			const version = parseVersion(tagName);
@@ -3392,12 +3462,7 @@ var getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logger)
 		}, logger);
 		logger.debug(`[screw-up] buildCompleteTagCache: ${Date.now() - buildStart}ms`);
 		logger.debug(`Built tag map with ${commitToTags.size} commits`);
-		let version = await lookupVersionLabelRecursive(gitRootPath, currentCommit, /* @__PURE__ */ new Map(), commitToTags);
-		const gitMetadata = {
-			tags: [],
-			branches: []
-		};
-		metadata.git = gitMetadata;
+		let version = await lookupVersionLabelRecursive(gitContext, currentCommit, /* @__PURE__ */ new Map(), commitToTags);
 		if (version) {
 			if (checkWorkingDirectoryStatus) {
 				const modifiedFiles = await getModifiedFiles(gitRootPath, currentCommit.tree);
@@ -3411,16 +3476,14 @@ var getGitMetadata = async (repositoryPath, checkWorkingDirectoryStatus, logger)
 			gitMetadata.version = gitVersion;
 			metadata.version = gitVersion;
 		}
-		gitMetadata.commit = {
-			hash: currentCommit.hash,
-			shortHash: currentCommit.shortHash,
-			date: dayjs(currentCommit.date).format("YYYY-MM-DDTHH:mm:ssZ"),
-			message: currentCommit.message
-		};
 		gitMetadata.tags = getRelatedTagsFromMap(commitToTags, currentCommit.hash).map((tag) => tag.name);
-		gitMetadata.branches = await getRelatedBranches(gitRootPath, currentCommit.hash);
 	} catch (error) {
-		logger.warn(`Failed to extract git metadata: ${error}`);
+		logger.warn(`Failed to resolve git versioning metadata: ${error}`);
+	}
+	try {
+		gitMetadata.branches = await getRelatedBranches(gitContext, currentCommit.hash);
+	} catch (error) {
+		logger.warn(`Failed to resolve git branch metadata: ${error}`);
 	}
 	logger.debug(`[screw-up] Total getGitMetadata: ${Date.now() - startTime}ms`);
 	return metadata;
@@ -3873,6 +3936,13 @@ var ensureMetadataGitignore = async (metadataSourcePath, logger) => {
 	}
 };
 //#endregion
+//#region src/generated/packageMetadata.ts
+var name = "screw-up";
+var version = "1.34.0";
+var author = "Kouji Matsui (@kekyo@mi.kekyo.net)";
+var repository_url = "https://github.com/kekyo/screw-up.git";
+var git_commit_hash = "bcd53f2a2326d1600b105c38a496c6c9c04b6a97";
+//#endregion
 //#region src/cli.ts
 var defaultInheritableFields = new Set([
 	"version",
@@ -4317,12 +4387,11 @@ var publishCommand = async (args, logger) => {
 	}
 };
 var showHelp = async () => {
-	const { author, license, repository_url, version, git_commit_hash } = await Promise.resolve().then(() => require("./packageMetadata-Cwh4Fqmw.cjs"));
 	console.info(`screw-up [${version}-${git_commit_hash}]
 Easy package metadata inserter CLI
 Copyright (c) ${author}
 Repository: ${repository_url}
-License: ${license}
+License: MIT
 
 Usage: screw-up <command> [options]
 
@@ -4385,7 +4454,7 @@ var cliMain = async (args, logger) => {
 };
 //#endregion
 //#region src/main.ts
-var logger = createConsoleLogger(`${require_packageMetadata.name}-cli`);
+var logger = createConsoleLogger(`${name}-cli`);
 cliMain(process.argv.slice(2), logger).then((code) => process.exit(code)).catch((error) => {
 	logger.error(`CLI error: ${error}`);
 	process.exit(1);