screw-up 1.33.0 → 1.35.0

package/dist/main.cjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 /*!
 * name: screw-up
-* version: 1.33.0
+* version: 1.35.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: be56ff1901b5073e1b0238a28b80d0c4f3c1e894
+* git.commit.hash: b059d6107487ef2a79821547868082a7b5374fd7
 */
 //#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,7 +31,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-const require_packageMetadata = require("./packageMetadata-k_QXJ2PH.cjs");
 let path = require("path");
 let fs = require("fs");
 let fs_promises = require("fs/promises");
@@ -2787,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);
@@ -3215,6 +3214,9 @@ var getRelatedBranches = async (context, 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"));
@@ -3226,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);
@@ -3240,6 +3243,7 @@ var parseGitIndex = async (gitDir) => {
 			entries.set(path$3, {
 				path: path$3,
 				oid,
+				mode,
 				size,
 				stage
 			});
@@ -3262,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 = [];
@@ -3270,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,
@@ -3277,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);
@@ -3292,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, {
@@ -3310,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;
@@ -3927,6 +3936,13 @@ var ensureMetadataGitignore = async (metadataSourcePath, logger) => {
 	}
 };
 //#endregion
+//#region src/generated/packageMetadata.ts
+var name = "screw-up";
+var version = "1.35.0";
+var author = "Kouji Matsui (@kekyo@mi.kekyo.net)";
+var repository_url = "https://github.com/kekyo/screw-up.git";
+var git_commit_hash = "b059d6107487ef2a79821547868082a7b5374fd7";
+//#endregion
 //#region src/cli.ts
 var defaultInheritableFields = new Set([
 	"version",
@@ -4005,6 +4021,7 @@ Arguments:
   output                        Optional output file path (default: stdout)
 
 Options:
+  -e, --expression <text>       Input template text directly
   -i, --input <path>            Input template file (default: stdin)
   -b, --bracket <open,close>    Placeholder brackets (default: {,})
   --inheritable-fields <list>   Comma-separated list of fields to inherit from parent
@@ -4030,18 +4047,25 @@ var parseBracketOption = (bracketOption) => {
 	};
 };
 var formatCommand = async (args, logger) => {
-	var _args$options$input, _args$options$bracket;
+	var _args$options$input, _args$options$express, _args$options$bracket;
 	if (args.options.help || args.options.h) {
 		showFormatHelp();
 		return 1;
 	}
 	const outputPath = args.positional[0];
 	const inputPathOption = (_args$options$input = args.options["input"]) !== null && _args$options$input !== void 0 ? _args$options$input : args.options["i"];
+	const expressionOption = (_args$options$express = args.options["expression"]) !== null && _args$options$express !== void 0 ? _args$options$express : args.options["e"];
 	const bracketOption = (_args$options$bracket = args.options["bracket"]) !== null && _args$options$bracket !== void 0 ? _args$options$bracket : args.options["b"];
 	const inheritableFieldsOption = args.options["inheritable-fields"];
 	const alwaysOverrideVersionFromGit = !args.options["no-git-version-override"];
 	const checkWorkingDirectoryStatus = args.options["no-wds"] ? false : true;
 	const ignorePackageJsonNotExist = args.options["force"] || args.options["f"] ? true : false;
+	const inputPath = typeof inputPathOption === "string" ? inputPathOption : void 0;
+	const expression = typeof expressionOption === "string" ? expressionOption : void 0;
+	if (inputPath !== void 0 && expression !== void 0) {
+		logger.error("format: Specify only one input source: -e/--expression or -i/--input.");
+		return 1;
+	}
 	const bracket = parseBracketOption(typeof bracketOption === "string" ? bracketOption : void 0);
 	if (!bracket) {
 		logger.error("format: Invalid bracket option, expected \"open,close\" pattern.");
@@ -4062,7 +4086,7 @@ var formatCommand = async (args, logger) => {
 			_logger.error(`format: Unable to read package.json from: ${targetDir}`);
 			return 1;
 		}
-		const formattedText = replacePlaceholders(await readInputText(typeof inputPathOption === "string" ? inputPathOption : void 0), computedPackageJson, openBracket, closeBracket);
+		const formattedText = replacePlaceholders(expression !== null && expression !== void 0 ? expression : await readInputText(inputPath), computedPackageJson, openBracket, closeBracket);
 		if (outputPath) await (0, fs_promises.writeFile)((0, path.resolve)(outputPath), formattedText);
 		process.stdout.write(formattedText);
 	} catch (error) {
@@ -4371,12 +4395,11 @@ var publishCommand = async (args, logger) => {
 	}
 };
 var showHelp = async () => {
-	const { author, license, repository_url, version, git_commit_hash } = await Promise.resolve().then(() => require("./packageMetadata-CaaD3Ehh.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]
 
@@ -4410,6 +4433,8 @@ var argOptionMap = new Map([
 		"peer-deps-prefix"
 	])],
 	["format", new Set([
+		"expression",
+		"e",
 		"input",
 		"i",
 		"bracket",
@@ -4439,7 +4464,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);