devframe 1.2.1 → 1.2.2

package/dist/utils/launch-editor.mjs

@@ -408,7 +408,7 @@ var require_shell_quote = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.parse = require_parse();
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/macos.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/editor-info/macos.js
 var require_macos = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		"/Applications/Atom.app/Contents/MacOS/Atom": "atom",
@@ -443,7 +443,7 @@ var require_macos = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/linux.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/editor-info/linux.js
 var require_linux = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		atom: "atom",
@@ -477,7 +477,7 @@ var require_linux = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/windows.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/editor-info/windows.js
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = [
 		"Brackets.exe",
@@ -510,9 +510,9 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	];
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/guess.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/guess.js
 var require_guess = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$2 = __require("path");
+	const path$3 = __require("path");
 	const shellQuote = require_shell_quote();
 	const childProcess$1 = __require("child_process");
 	const COMMON_EDITORS_MACOS = require_macos();
@@ -536,7 +536,7 @@ var require_guess = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const runningProcesses = output.split("\r\n");
 		for (let i = 0; i < runningProcesses.length; i++) {
 			const fullProcessPath = runningProcesses[i].trim();
-			const shortProcessName = path$2.win32.basename(fullProcessPath);
+			const shortProcessName = path$3.win32.basename(fullProcessPath);
 			if (COMMON_EDITORS_WIN.indexOf(shortProcessName) !== -1) return fullProcessPath;
 		}
 	}
@@ -585,11 +585,15 @@ var require_guess = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports.getEditorFromLinuxProcesses = getEditorFromLinuxProcesses;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/get-args.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/get-args.js
 var require_get_args = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$1 = __require("path");
-	module.exports = function getArgumentsForPosition(editor, fileName, lineNumber, columnNumber = 1) {
-		switch (path$1.basename(editor).replace(/\.(exe|cmd|bat)$/i, "")) {
+	const os = __require("os");
+	const path$2 = __require("path");
+	module.exports = function getArgumentsForFile(editor, fileName, lineNumber, columnNumber = 1) {
+		fileName = path$2.resolve(fileName);
+		if (process.platform === "linux" && fileName.startsWith("/mnt/") && /Microsoft/i.test(os.release())) fileName = `./${path$2.relative("", fileName)}`;
+		if (!lineNumber) return [fileName];
+		switch (path$2.basename(editor).replace(/\.(exe|cmd|bat)$/i, "")) {
 			case "atom":
 			case "Atom":
 			case "Atom Beta":
@@ -664,6 +668,41 @@ var require_get_args = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/construct-windows-launch-command.js
+var require_construct_windows_launch_command = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	function escapeCmdArgs(cmdArgs) {
+		return cmdArgs.replace(/([&|<>,;=^])/g, "^$1");
+	}
+	function doubleQuoteIfNeeded(str) {
+		if (str.includes("^")) return `^"${str}^"`;
+		else if (str.includes(" ")) return `"${str}"`;
+		return str;
+	}
+	function constructWindowsLaunchCommand(editor, args) {
+		if (args.some((arg) => /[\r\n]/.test(arg))) throw new Error("Cannot launch an editor with an argument containing a line break");
+		if (args.some((arg) => arg.includes("%"))) throw new Error("Cannot launch an editor with an argument containing \"%\"");
+		return [editor, ...args.map(escapeCmdArgs)].map(doubleQuoteIfNeeded).join(" ");
+	}
+	module.exports = constructWindowsLaunchCommand;
+}));
+//#endregion
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/parse-file.js
+var require_parse_file = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	const path$1 = __require("path");
+	const positionRE = /:(\d+)(:(\d+))?$/;
+	module.exports = function parseFile(file) {
+		if (file.startsWith("file://")) file = __require("url").fileURLToPath(file);
+		const unresolvedFileName = file.replace(positionRE, "");
+		const fileName = unresolvedFileName ? path$1.resolve(unresolvedFileName) : "";
+		const match = file.match(positionRE);
+		return {
+			fileName,
+			lineNumber: match && match[1],
+			columnNumber: match && match[3]
+		};
+	};
+}));
+//#endregion
 //#region src/utils/launch-editor.ts
 var import_launch_editor = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
 	/**
@@ -676,12 +715,13 @@ var import_launch_editor = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMi
 	* Modified by Yuxi Evan You
 	*/
 	const fs = __require("fs");
-	const os = __require("os");
 	const path = __require("path");
 	const colors = require_picocolors();
 	const childProcess = __require("child_process");
 	const guessEditor = require_guess();
-	const getArgumentsForPosition = require_get_args();
+	const getArgumentsForFile = require_get_args();
+	const constructWindowsLaunchCommand = require_construct_windows_launch_command();
+	const parseFile = require_parse_file();
 	function wrapErrorCallback(cb) {
 		return (fileName, errorMessage) => {
 			console.log();
@@ -702,55 +742,36 @@ var import_launch_editor = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMi
 		}
 		return false;
 	}
-	const positionRE = /:(\d+)(:(\d+))?$/;
-	function parseFile(file) {
-		if (file.startsWith("file://")) file = __require("url").fileURLToPath(file);
-		const fileName = file.replace(positionRE, "");
-		const match = file.match(positionRE);
-		return {
-			fileName,
-			lineNumber: match && match[1],
-			columnNumber: match && match[3]
-		};
-	}
 	let currentChildProcess = null;
 	function launchEditor(file, specifiedEditor, onErrorCallback) {
-		const parsed = parseFile(file);
-		let { fileName } = parsed;
-		const { lineNumber, columnNumber } = parsed;
-		if (process.platform === "win32" && path.resolve(fileName).startsWith("\\\\")) return onErrorCallback(fileName, "UNC paths are not supported on Windows to avoid security issues. See https://github.com/vitejs/launch-editor/tree/main/packages/launch-editor#unc-paths-on-windows for details.");
-		if (!fs.existsSync(fileName)) return;
+		const { fileName, lineNumber, columnNumber } = parseFile(file);
 		if (typeof specifiedEditor === "function") {
 			onErrorCallback = specifiedEditor;
 			specifiedEditor = void 0;
 		}
 		onErrorCallback = wrapErrorCallback(onErrorCallback);
+		if (process.platform === "win32" && fileName.startsWith("\\\\")) return onErrorCallback(fileName, "UNC paths are not supported on Windows to avoid security issues. See https://github.com/vitejs/launch-editor/tree/main/packages/launch-editor#unc-paths-on-windows for details.");
+		if (!fs.existsSync(fileName)) return;
 		const [editor, ...args] = guessEditor(specifiedEditor);
 		if (!editor) {
 			onErrorCallback(fileName, null);
 			return;
 		}
-		if (process.platform === "linux" && fileName.startsWith("/mnt/") && /Microsoft/i.test(os.release())) fileName = path.relative("", fileName);
-		if (lineNumber) {
-			const extraArgs = getArgumentsForPosition(editor, fileName, lineNumber, columnNumber);
-			args.push.apply(args, extraArgs);
-		} else args.push(fileName);
+		const extraArgs = getArgumentsForFile(editor, fileName, lineNumber, columnNumber);
+		args.push.apply(args, extraArgs);
+		let launchCommand;
+		if (process.platform === "win32") try {
+			launchCommand = constructWindowsLaunchCommand(editor, args);
+		} catch (error) {
+			onErrorCallback(fileName, error.message);
+			return;
+		}
 		if (currentChildProcess && isTerminalEditor(editor)) currentChildProcess.kill("SIGKILL");
-		if (process.platform === "win32") {
-			function escapeCmdArgs(cmdArgs) {
-				return cmdArgs.replace(/([&|<>,;=^])/g, "^$1");
-			}
-			function doubleQuoteIfNeeded(str) {
-				if (str.includes("^")) return `^"${str}^"`;
-				else if (str.includes(" ")) return `"${str}"`;
-				return str;
-			}
-			const launchCommand = [editor, ...args.map(escapeCmdArgs)].map(doubleQuoteIfNeeded).join(" ");
-			currentChildProcess = childProcess.exec(launchCommand, {
-				stdio: "inherit",
-				shell: true
-			});
-		} else currentChildProcess = childProcess.spawn(editor, args, { stdio: "inherit" });
+		if (process.platform === "win32") currentChildProcess = childProcess.exec(launchCommand, {
+			stdio: "inherit",
+			shell: true
+		});
+		else currentChildProcess = childProcess.spawn(editor, args, { stdio: "inherit" });
 		currentChildProcess.on("exit", function(errorCode) {
 			currentChildProcess = null;
 			if (errorCode) onErrorCallback(fileName, "(code " + errorCode + ")");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "devframe",
   "type": "module",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Framework for building one portable devtool integration that runs in any viewer.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -77,7 +77,7 @@
     "skills"
   ],
   "peerDependencies": {
-    "@devframes/agentic": "1.2.1",
+    "@devframes/agentic": "1.2.2",
     "cac": "^7.0.0"
   },
   "peerDependenciesMeta": {
@@ -95,13 +95,13 @@
     "pathe": "^2.0.3"
   },
   "devDependencies": {
-    "@devframes/agentic": "1.2.1",
+    "@devframes/agentic": "1.2.2",
     "@standard-schema/spec": "^1.1.0",
     "birpc": "^4.2.0",
     "cac": "^7.0.0",
     "get-port-please": "^3.2.0",
     "immer": "^11.1.21",
-    "launch-editor": "^2.14.1",
+    "launch-editor": "^2.14.2",
     "mlly": "^1.8.2",
     "mrmime": "^2.0.1",
     "obug": "^3.0.0",