vite-plus 0.3.0 → 0.3.1

package/dist/staged/bin.js

@@ -1,18 +1,18 @@
 import { r as __toESM, t as __commonJSMin } from "../rolldown-runtime-CMFfr-1z.js";
-import { t as renderCliDoc } from "../help-BmKpeOP9.js";
 import { i as log, n as errorMsg, o as printHeader } from "../terminal-MKGAuy-p.js";
-import { a as resolveViteConfig } from "../resolve-vite-config-ipGb39Jo.js";
-import { t as lib_default } from "../lib-L3DWSRQp.js";
+import { o as resolveViteConfig } from "../resolve-vite-config-CGks1xR7.js";
+import { t as unwrapCliParseOutcome } from "../cli-parse-DHE8NrBU.js";
 import { createRequire } from "node:module";
 import path, { basename, delimiter, dirname, normalize, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { parseStagedArgs } from "../../binding/index.js";
 import { formatWithOptions, inspect, promisify } from "node:util";
 import { closeSync, constants, openSync, readSync, statSync } from "node:fs";
+import { EOL } from "node:os";
 import { cwd } from "node:process";
 import l__default from "node:readline";
 import nodeTty from "node:tty";
 import crypto from "node:crypto";
-import { EOL } from "node:os";
 import fsPromises, { constants as constants$2 } from "node:fs/promises";
 import { PassThrough, Writable } from "node:stream";
 import { exec, spawn } from "node:child_process";
@@ -118,7 +118,7 @@ const createDebug = (name) => {
 	};
 };
 //#endregion
-//#region ../../node_modules/.pnpm/tinyexec@1.3.0/node_modules/tinyexec/dist/main.mjs
+//#region ../../node_modules/.pnpm/tinyexec@1.3.1/node_modules/tinyexec/dist/main.mjs
 const isPathLikePattern = /^path$/i;
 const defaultEnvPathInfo = {
 	key: "PATH",
@@ -139,7 +139,7 @@ function getPathFromEnv(env) {
 function addNodeBinToPath(cwd, path) {
 	const parts = path.value.split(delimiter);
 	const nodeBinPaths = [];
-	let currentPath = cwd;
+	let currentPath = typeof cwd === "string" ? cwd : fileURLToPath(cwd, { windows: false });
 	let lastPath;
 	do {
 		nodeBinPaths.push(resolve(currentPath, "node_modules", ".bin"));
@@ -265,7 +265,8 @@ function resolveCommand(command, options) {
 	let pathExt = env.PATHEXT ? env.PATHEXT.split(delimiter) : defaultPathExt;
 	if (command.includes(".") && pathExt[0] !== "") pathExt = ["", ...pathExt];
 	for (const extensions of [pathExt, noPathExt]) for (const path of pathEnv) {
-		const dest = resolve(cwd$3, path.startsWith("\"") && path.endsWith("\"") && path.length > 1 ? path.slice(1, -1) : path, command);
+		const unquoted = path.startsWith("\"") && path.endsWith("\"") && path.length > 1 ? path.slice(1, -1) : path;
+		const dest = resolve(cwd$3, unquoted, command);
 		for (const ext of extensions) {
 			const destWithExt = dest + ext;
 			try {
@@ -407,12 +408,12 @@ var ExecProcess = class {
 	_streamOut;
 	_streamErr;
 	spawn() {
-		const cwd$1 = cwd();
 		const options = this._options;
 		const nodeOptions = {
 			...defaultNodeOptions,
 			...options.nodeOptions
 		};
+		const cwd$1 = nodeOptions?.cwd ?? cwd();
 		const signals = [];
 		this._resetState();
 		if (options.timeout !== void 0) signals.push(AbortSignal.timeout(options.timeout));
@@ -1559,7 +1560,7 @@ var DefaultRenderer = class DefaultRenderer {
 		this.logger.options.color = this.options.color;
 	}
 	async render() {
-		const { createLogUpdate } = await import("../log-update-DHZRyJ2m.js");
+		const { createLogUpdate } = await import("../log-update-CoW8Z4Dl.js");
 		const { default: truncate } = await import("../cli-truncate-Bg3RDXpi.js");
 		const { default: wrap } = await import("../wrap-ansi-DUi52C6W.js");
 		this.updater = createLogUpdate(this.logger.process.stdout);
@@ -1795,9 +1796,7 @@ var DefaultRenderer = class DefaultRenderer {
 			case ListrLogLevels.SKIPPED:
 				data = task.message.skip;
 				break;
-			case ListrLogLevels.FAILED:
-				data = task.message.error;
-				break;
+			case ListrLogLevels.FAILED: data = task.message.error;
 		}
 		if (task.hasTitle() && source === ListrLogLevels.FAILED && data === task.title || typeof data !== "string") return [];
 		if (source === ListrLogLevels.OUTPUT) data = cleanseAnsi(data);
@@ -2967,7 +2966,7 @@ const chunkFiles = ({ files, baseDir, maxArgLength = null, relative = false }) =
 	return chunkArray(normalizedFiles, chunkCount);
 };
 //#endregion
-//#region ../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/constants.js
+//#region ../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/constants.js
 var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const WIN_SLASH = "\\\\/";
 	const WIN_NO_SLASH = `[^${WIN_SLASH}]`;
@@ -3136,7 +3135,7 @@ var require_constants = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/utils.js
+//#region ../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/utils.js
 var require_utils = /* @__PURE__ */ __commonJSMin(((exports) => {
 	const { REGEX_BACKSLASH, REGEX_REMOVE_BACKSLASH, REGEX_SPECIAL_CHARS, REGEX_SPECIAL_CHARS_GLOBAL } = require_constants();
 	exports.isObject = (val) => val !== null && typeof val === "object" && !Array.isArray(val);
@@ -3184,7 +3183,7 @@ var require_utils = /* @__PURE__ */ __commonJSMin(((exports) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/scan.js
+//#region ../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/scan.js
 var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const utils = require_utils();
 	const { CHAR_ASTERISK, CHAR_AT, CHAR_BACKWARD_SLASH, CHAR_COMMA, CHAR_DOT, CHAR_EXCLAMATION_MARK, CHAR_FORWARD_SLASH, CHAR_LEFT_CURLY_BRACE, CHAR_LEFT_PARENTHESES, CHAR_LEFT_SQUARE_BRACKET, CHAR_PLUS, CHAR_QUESTION_MARK, CHAR_RIGHT_CURLY_BRACE, CHAR_RIGHT_PARENTHESES, CHAR_RIGHT_SQUARE_BRACKET } = require_constants();
@@ -3213,7 +3212,7 @@ var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const scan = (input, options) => {
 		const opts = options || {};
 		const length = input.length - 1;
-		const scanToEnd = opts.parts === true || opts.scanToEnd === true;
+		const scanToEnd = opts.parts === true || opts.tokens === true || opts.scanToEnd === true;
 		const slashes = [];
 		const tokens = [];
 		const parts = [];
@@ -3316,14 +3315,18 @@ var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					finished = true;
 					if (code === CHAR_EXCLAMATION_MARK && index === start) negatedExtglob = true;
 					if (scanToEnd === true) {
+						let parens = 0;
 						while (eos() !== true && (code = advance())) {
 							if (code === CHAR_BACKWARD_SLASH) {
 								backslashes = token.backslashes = true;
-								code = advance();
+								advance();
+								continue;
+							}
+							if (code === CHAR_LEFT_PARENTHESES) {
+								parens++;
 								continue;
 							}
-							if (code === CHAR_RIGHT_PARENTHESES) {
-								isGlob = token.isGlob = true;
+							if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
 								finished = true;
 								break;
 							}
@@ -3371,13 +3374,18 @@ var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			if (opts.noparen !== true && code === CHAR_LEFT_PARENTHESES) {
 				isGlob = token.isGlob = true;
 				if (scanToEnd === true) {
+					let parens = 1;
 					while (eos() !== true && (code = advance())) {
-						if (code === CHAR_LEFT_PARENTHESES) {
+						if (code === CHAR_BACKWARD_SLASH) {
 							backslashes = token.backslashes = true;
-							code = advance();
+							advance();
+							continue;
+						}
+						if (code === CHAR_LEFT_PARENTHESES) {
+							parens++;
 							continue;
 						}
-						if (code === CHAR_RIGHT_PARENTHESES) {
+						if (code === CHAR_RIGHT_PARENTHESES && --parens === 0) {
 							finished = true;
 							break;
 						}
@@ -3440,7 +3448,7 @@ var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (opts.parts === true || opts.tokens === true) {
 			let prevIndex;
 			for (let idx = 0; idx < slashes.length; idx++) {
-				const n = prevIndex ? prevIndex + 1 : start;
+				const n = prevIndex !== void 0 ? prevIndex + 1 : start;
 				const i = slashes[idx];
 				const value = input.slice(n, i);
 				if (opts.tokens) {
@@ -3451,18 +3459,19 @@ var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					depth(tokens[idx]);
 					state.maxDepth += tokens[idx].depth;
 				}
-				if (idx !== 0 || value !== "") parts.push(value);
-				prevIndex = i;
-			}
-			if (prevIndex && prevIndex + 1 < input.length) {
-				const value = input.slice(prevIndex + 1);
-				parts.push(value);
-				if (opts.tokens) {
-					tokens[tokens.length - 1].value = value;
-					depth(tokens[tokens.length - 1]);
-					state.maxDepth += tokens[tokens.length - 1].depth;
+				if (i >= start) {
+					parts.push(value);
+					prevIndex = i;
 				}
 			}
+			const n = prevIndex !== void 0 ? prevIndex + 1 : start;
+			const value = input.slice(n);
+			parts.push(value);
+			if (opts.tokens && prevIndex && prevIndex + 1 < input.length) {
+				tokens[tokens.length - 1].value = value;
+				depth(tokens[tokens.length - 1]);
+				state.maxDepth += tokens[tokens.length - 1].depth;
+			}
 			state.slashes = slashes;
 			state.parts = parts;
 		}
@@ -3471,7 +3480,7 @@ var require_scan = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = scan;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/parse.js
+//#region ../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/parse.js
 var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const constants = require_constants();
 	const utils = require_utils();
@@ -4373,6 +4382,7 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					rest = rest.slice(3);
 					consume("/**", 3);
 				}
+				const isEnd = eos() || state.parens > 0 && rest === ")".repeat(state.parens) && !extglobs.some((extglob) => extglob.type === "negate");
 				if (prior.type === "bos" && eos()) {
 					prev.type = "globstar";
 					prev.value += value;
@@ -4382,7 +4392,7 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 					consume(value);
 					continue;
 				}
-				if (prior.type === "slash" && prior.prev.type !== "bos" && !afterStar && eos()) {
+				if (prior.type === "slash" && prior.prev.type !== "bos" && !afterStar && isEnd) {
 					state.output = state.output.slice(0, -(prior.output + prev.output).length);
 					prior.output = `(?:${prior.output}`;
 					prev.type = "globstar";
@@ -4547,7 +4557,7 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = parse;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/picomatch@4.0.5/node_modules/picomatch/lib/picomatch.js
+//#region ../../node_modules/.pnpm/picomatch@4.0.7/node_modules/picomatch/lib/picomatch.js
 var require_picomatch$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const scan = require_scan();
 	const parse = require_parse();
@@ -6642,189 +6652,44 @@ const lintStaged = async ({ allowEmpty = false, color = SUPPORTS_COLOR, concurre
 	}
 };
 //#endregion
-//#region src/staged/args.ts
-function parseStagedArgs(argv) {
-	return lib_default(argv, {
-		alias: {
-			h: "help",
-			p: "concurrent",
-			d: "debug",
-			q: "quiet",
-			r: "relative",
-			v: "verbose"
-		},
-		boolean: [
-			"help",
-			"allow-empty",
-			"debug",
-			"continue-on-error",
-			"fail-on-changes",
-			"hide-partially-staged",
-			"hide-unstaged",
-			"quiet",
-			"relative",
-			"revert",
-			"stash",
-			"verbose"
-		],
-		string: [
-			"concurrent",
-			"cwd",
-			"diff",
-			"diff-filter"
-		]
-	});
-}
-function normalizeStagedArgs(args) {
-	return {
-		concurrent: normalizeConcurrent(args.concurrent),
-		cwd: normalizeStringOption(args.cwd, "cwd", "path"),
-		diff: normalizeStringOption(args.diff, "diff", "string"),
-		diffFilter: normalizeStringOption(args["diff-filter"], "diff-filter", "string")
-	};
-}
-function normalizeConcurrent(value) {
-	if (value == null) return;
-	if (value === true || value === false) return value;
-	if (value === "") return true;
-	if (value === "true") return true;
-	if (value === "false") return false;
-	const number = Number(value);
-	if (Number.isFinite(number) && number > 0) return number;
-	throw new Error("Option \"--concurrent\" must be true, false, or a number greater than 0.");
-}
-function normalizeStringOption(value, option, valueName) {
-	if (value == null) return;
-	if (value === false) throw new Error(`Option "--no-${option}" is not supported. Use "--${option} <${valueName}>".`);
-	if (typeof value !== "string" || value === "") throw new Error(`Option "--${option}" requires a value.`);
-	return value;
-}
-//#endregion
 //#region src/staged/bin.ts
-const args = parseStagedArgs(process.argv.slice(3));
-if (args.help) {
-	const helpMessage = renderCliDoc({
-		usage: "vp staged [options]",
-		summary: "Run linters on staged files using staged config from vite.config.ts.",
-		documentationUrl: "https://viteplus.dev/guide/commit-hooks",
-		sections: [{
-			title: "Options",
-			rows: [
-				{
-					label: "--allow-empty",
-					description: "Allow empty commits when tasks revert all staged changes"
-				},
-				{
-					label: "-p, --concurrent <number|boolean>",
-					description: "Number of tasks to run concurrently, or false for serial"
-				},
-				{
-					label: "--continue-on-error",
-					description: "Run all tasks to completion even if one fails"
-				},
-				{
-					label: "--cwd <path>",
-					description: "Working directory to run all tasks in"
-				},
-				{
-					label: "-d, --debug",
-					description: "Enable debug output"
-				},
-				{
-					label: "--diff <string>",
-					description: "Override the default --staged flag of git diff"
-				},
-				{
-					label: "--diff-filter <string>",
-					description: "Override the default --diff-filter=ACMR flag of git diff"
-				},
-				{
-					label: "--fail-on-changes",
-					description: "Fail with exit code 1 when tasks modify tracked files"
-				},
-				{
-					label: "--hide-partially-staged",
-					description: "Hide unstaged changes from partially staged files"
-				},
-				{
-					label: "--hide-unstaged",
-					description: "Hide all unstaged changes before running tasks"
-				},
-				{
-					label: "--no-stash",
-					description: "Disable the backup stash"
-				},
-				{
-					label: "-q, --quiet",
-					description: "Disable console output"
-				},
-				{
-					label: "-r, --relative",
-					description: "Pass filepaths relative to cwd to tasks"
-				},
-				{
-					label: "--revert",
-					description: "Revert to original state in case of errors"
-				},
-				{
-					label: "-v, --verbose",
-					description: "Show task output even when tasks succeed"
-				},
-				{
-					label: "-h, --help",
-					description: "Show this help message"
-				}
-			]
-		}]
-	});
+const args = unwrapCliParseOutcome(parseStagedArgs(process.argv.slice(3)));
+const options = {};
+if (args.allowEmpty != null) options.allowEmpty = args.allowEmpty;
+if (args.debug != null) options.debug = args.debug;
+if (args.continueOnError != null) options.continueOnError = args.continueOnError;
+if (args.failOnChanges != null) options.failOnChanges = args.failOnChanges;
+if (args.hidePartiallyStaged != null) options.hidePartiallyStaged = args.hidePartiallyStaged;
+if (args.hideUnstaged != null) options.hideUnstaged = args.hideUnstaged;
+if (args.quiet != null) options.quiet = args.quiet;
+if (args.relative != null) options.relative = args.relative;
+if (args.revert != null) options.revert = args.revert;
+if (args.stash != null) options.stash = args.stash;
+if (args.verbose != null) options.verbose = args.verbose;
+let stagedConfig;
+try {
+	stagedConfig = (await resolveViteConfig(args.cwd ?? process.cwd())).staged;
+} catch (err) {
+	const message = err instanceof Error ? err.message : String(err);
+	log(`Failed to load vite.config: ${message}`);
+	process.exit(1);
+}
+if (stagedConfig) options.config = stagedConfig;
+else {
 	printHeader();
-	log(helpMessage);
-} else {
-	let normalizedArgs;
-	try {
-		normalizedArgs = normalizeStagedArgs(args);
-	} catch (err) {
-		printHeader();
-		errorMsg(err instanceof Error ? err.message : String(err));
-		process.exit(1);
-	}
-	const options = {};
-	if (args["allow-empty"] != null) options.allowEmpty = args["allow-empty"];
-	if (args.debug != null) options.debug = args.debug;
-	if (args["continue-on-error"] != null) options.continueOnError = args["continue-on-error"];
-	if (args["fail-on-changes"] != null) options.failOnChanges = args["fail-on-changes"];
-	if (args["hide-partially-staged"] != null) options.hidePartiallyStaged = args["hide-partially-staged"];
-	if (args["hide-unstaged"] != null) options.hideUnstaged = args["hide-unstaged"];
-	if (args.quiet != null) options.quiet = args.quiet;
-	if (args.relative != null) options.relative = args.relative;
-	if (args.revert != null) options.revert = args.revert;
-	if (args.stash != null) options.stash = args.stash;
-	if (args.verbose != null) options.verbose = args.verbose;
-	let stagedConfig;
-	try {
-		stagedConfig = (await resolveViteConfig(normalizedArgs.cwd ?? process.cwd())).staged;
-	} catch (err) {
-		const message = err instanceof Error ? err.message : String(err);
-		log(`Failed to load vite.config: ${message}`);
-		process.exit(1);
-	}
-	if (stagedConfig) options.config = stagedConfig;
-	else {
-		printHeader();
-		errorMsg("No \"staged\" config found in vite.config.ts. Please add a staged config:");
-		log("");
-		log("  // vite.config.ts");
-		log("  export default defineConfig({");
-		log("    staged: { '*': 'vp check --fix' },");
-		log("  });");
-		process.exit(1);
-	}
-	if (normalizedArgs.cwd != null) options.cwd = normalizedArgs.cwd;
-	if (normalizedArgs.diff != null) options.diff = normalizedArgs.diff;
-	if (normalizedArgs.diffFilter != null) options.diffFilter = normalizedArgs.diffFilter;
-	if (normalizedArgs.concurrent != null) options.concurrent = normalizedArgs.concurrent;
-	const success = await lintStaged(options);
-	process.exit(success ? 0 : 1);
+	errorMsg("No \"staged\" config found in vite.config.ts. Please add a staged config:");
+	log("");
+	log("  // vite.config.ts");
+	log("  export default defineConfig({");
+	log("    staged: { '*': 'vp check --fix' },");
+	log("  });");
+	process.exit(1);
 }
+if (args.cwd != null) options.cwd = args.cwd;
+if (args.diff != null) options.diff = args.diff;
+if (args.diffFilter != null) options.diffFilter = args.diffFilter;
+if (args.concurrent != null) options.concurrent = args.concurrent;
+const success = await lintStaged(options);
+process.exit(success ? 0 : 1);
 //#endregion
 export {};

package/dist/sync-versions/bin.d.ts

@@ -0,0 +1 @@
+export {}