create-video 3.1.0 → 3.1.3

package/dist/open-in-editor-flow.js

@@ -10,28 +10,28 @@ const open_in_editor_1 = require("./open-in-editor");
 const yesno_1 = require("./yesno");
 const openInEditorFlow = async (projectRoot) => {
     const editors = await (0, open_in_editor_1.guessEditor)();
-    const [guiEditor] = editors.filter((e) => !(0, open_in_editor_1.isTerminalEditor)(e));
+    const [guiEditor] = editors.filter((e) => !(0, open_in_editor_1.isTerminalEditor)(e.command));
     if (!guiEditor) {
         return;
     }
-    const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(guiEditor);
+    const displayName = (0, open_in_editor_1.getDisplayNameForEditor)(guiEditor.command);
     const should = await (0, yesno_1.yesOrNo)({
         defaultValue: true,
         question: `💻 Do you want to open the project in ${displayName}? (Y/n):`,
     });
     if (should) {
-        (0, open_in_editor_1.launchEditor)({
+        await (0, open_in_editor_1.launchEditor)({
             colNumber: 1,
             editor: guiEditor,
             fileName: projectRoot,
             vsCodeNewWindow: true,
             lineNumber: 1,
         });
-        if ((0, open_in_editor_1.isVsCodeDerivative)(guiEditor)) {
+        if ((0, open_in_editor_1.isVsCodeDerivative)(guiEditor.command)) {
             await new Promise((resolve) => {
                 setTimeout(resolve, 1000);
             });
-            (0, open_in_editor_1.launchEditor)({
+            await (0, open_in_editor_1.launchEditor)({
                 colNumber: 1,
                 editor: guiEditor,
                 fileName: path_1.default.join(projectRoot, 'README.md'),

package/dist/open-in-editor.d.ts

@@ -3,12 +3,16 @@ export declare function isTerminalEditor(editor: Editor): boolean;
 declare const editorNames: readonly ["atom", "/Applications/Atom Beta.app/Contents/MacOS/Atom Beta", "brackets", "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl", "/Applications/Sublime Text Dev.app/Contents/SharedSupport/bin/subl", "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl", "code", "code-insiders", "vscodium", "/Applications/AppCode.app/Contents/MacOS/appcode", "/Applications/CLion.app/Contents/MacOS/clion", "/Applications/IntelliJ IDEA.app/Contents/MacOS/idea", "/Applications/PhpStorm.app/Contents/MacOS/phpstorm", "/Applications/PyCharm.app/Contents/MacOS/pycharm", "/Applications/PyCharm CE.app/Contents/MacOS/pycharm", "/Applications/RubyMine.app/Contents/MacOS/rubymine", "/Applications/WebStorm.app/Contents/MacOS/webstorm", "/Applications/GoLand.app/Contents/MacOS/goland", "/Applications/Rider.app/Contents/MacOS/rider", "mvim", "emacs", "gvim", "idea", "phpstorm", "pycharm", "rubymine", "sublime_text", "vim", "webstorm", "goland", "rider", "Brackets.exe", "Code.exe", "Code - Insiders.exe", "VSCodium.exe", "atom.exe", "sublime_text.exe", "notepad++.exe", "clion.exe", "clion64.exe", "idea.exe", "idea64.exe", "phpstorm.exe", "phpstorm64.exe", "pycharm.exe", "pycharm64.exe", "rubymine.exe", "rubymine64.exe", "webstorm.exe", "webstorm64.exe", "goland.exe", "goland64.exe", "rider.exe", "rider64.exe", "nano"];
 export declare const getDisplayNameForEditor: (editor: Editor | undefined) => string | null;
 declare type Editor = typeof editorNames[number];
-export declare function guessEditor(): Promise<Editor[]>;
+declare type ProcessAndCommand = {
+    process: string;
+    command: Editor;
+};
+export declare function guessEditor(): Promise<ProcessAndCommand[]>;
 export declare function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow, }: {
     fileName: string;
     lineNumber: number;
     colNumber: number;
-    editor: Editor;
+    editor: ProcessAndCommand;
     vsCodeNewWindow: boolean;
-}): boolean;
+}): Promise<boolean>;
 export {};

package/dist/open-in-editor.js

@@ -322,7 +322,10 @@ async function guessEditor() {
             for (let i = 0; i < processNames.length; i++) {
                 const processName = processNames[i];
                 if (output.indexOf(processName) !== -1) {
-                    availableEditors.push(COMMON_EDITORS_OSX[processName]);
+                    availableEditors.push({
+                        process: processName,
+                        command: COMMON_EDITORS_OSX[processName],
+                    });
                 }
             }
             return availableEditors;
@@ -336,7 +339,10 @@ async function guessEditor() {
                 const processPath = runningProcesses[i].trim();
                 const processName = path_1.default.basename(processPath);
                 if (COMMON_EDITORS_WIN.indexOf(processName) !== -1) {
-                    availableEditors.push(processPath);
+                    availableEditors.push({
+                        process: processPath,
+                        command: processPath,
+                    });
                 }
             }
             return availableEditors;
@@ -350,7 +356,10 @@ async function guessEditor() {
             for (let i = 0; i < processNames.length; i++) {
                 const processName = processNames[i];
                 if (output.indexOf(processName) !== -1) {
-                    availableEditors.push(COMMON_EDITORS_LINUX[processName]);
+                    availableEditors.push({
+                        process: processName,
+                        command: COMMON_EDITORS_LINUX[processName],
+                    });
                 }
             }
             return availableEditors;
@@ -361,16 +370,26 @@ async function guessEditor() {
     }
     // Last resort, use old skool env vars
     if (process.env.VISUAL) {
-        return [process.env.VISUAL];
+        return [
+            {
+                process: process.env.VISUAL,
+                command: process.env.VISUAL,
+            },
+        ];
     }
     if (process.env.EDITOR) {
-        return [process.env.EDITOR];
+        return [
+            {
+                process: process.env.EDITOR,
+                command: process.env.EDITOR,
+            },
+        ];
     }
     return [];
 }
 exports.guessEditor = guessEditor;
 let _childProcess = null;
-function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow, }) {
+async function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow, }) {
     if (!fs_1.default.existsSync(fileName)) {
         return false;
     }
@@ -385,7 +404,7 @@ function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow
     if (!(Number.isInteger(colNumber) && colNumber > 0)) {
         colNumber = 1;
     }
-    if (editor.toLowerCase() === 'none') {
+    if (editor.command.toLowerCase() === 'none') {
         return false;
     }
     if (process.platform === 'linux' &&
@@ -415,25 +434,41 @@ function launchEditor({ colNumber, editor, fileName, lineNumber, vsCodeNewWindow
         console.log();
         return false;
     }
-    const shouldOpenVsCodeNewWindow = (0, exports.isVsCodeDerivative)(editor) && vsCodeNewWindow;
+    const shouldOpenVsCodeNewWindow = (0, exports.isVsCodeDerivative)(editor.command) && vsCodeNewWindow;
     const args = shouldOpenVsCodeNewWindow
         ? ['--new-window', fileName]
         : lineNumber
-            ? getArgumentsForLineNumber(editor, fileName, String(lineNumber), colNumber)
+            ? getArgumentsForLineNumber(editor.command, fileName, String(lineNumber), colNumber)
             : [fileName];
-    if (_childProcess && isTerminalEditor(editor)) {
+    if (_childProcess && isTerminalEditor(editor.command)) {
         // There's an existing editor process already and it's attached
         // to the terminal, so go kill it. Otherwise two separate editor
         // instances attach to the stdin/stdout which gets confusing.
         _childProcess.kill('SIGKILL');
     }
+    const isWin = os_1.default.platform() === 'win32';
+    const where = isWin ? 'where' : 'which';
+    const binaryToUse = await new Promise((resolve) => {
+        if (editor.command === editor.process) {
+            resolve(editor.command);
+            return;
+        }
+        child_process_1.default.exec(`${where} "${editor.command}"`, (err) => {
+            if (err) {
+                resolve(editor.process);
+            }
+            else {
+                resolve(editor.command);
+            }
+        });
+    });
     if (process.platform === 'win32') {
         // On Windows, launch the editor in a shell because spawn can only
         // launch .exe files.
-        _childProcess = child_process_1.default.spawn('cmd.exe', ['/C', editor].concat(args), { stdio: 'inherit', detached: true });
+        _childProcess = child_process_1.default.spawn('cmd.exe', ['/C', binaryToUse].concat(args), { stdio: 'inherit', detached: true });
     }
     else {
-        _childProcess = child_process_1.default.spawn(editor, args, { stdio: 'inherit' });
+        _childProcess = child_process_1.default.spawn(binaryToUse, args, { stdio: 'inherit' });
     }
     _childProcess.on('exit', (errorCode) => {
         _childProcess = null;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-video",
-	"version": "3.1.0",
+	"version": "3.1.3",
 	"description": "",
 	"main": "dist/index.js",
 	"bin": {
@@ -35,5 +35,5 @@
 		"prettier-plugin-organize-imports": "^2.3.4",
 		"typescript": "^4.7.0"
 	},
-	"gitHead": "482c66127662171577aa427f10fe265fa1bc933b"
+	"gitHead": "d57ec16eaf33280c89b0974997946ab9ea155372"
 }