@microsoft/inshellisense 0.0.1-rc.2 → 0.0.1-rc.4

package/build/commands/root.js

@@ -1,19 +1,20 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import { initRender } from "../ui/ui-init.js";
 import { render } from "../ui/ui-root.js";
 import { executeShellCommandTTY } from "../runtime/utils.js";
 import { saveCommand, loadCommand } from "../utils/cache.js";
 import { supportedShells as shells } from "../utils/bindings.js";
+import { inferShell } from "../utils/shell.js";
 export const supportedShells = shells.join(", ");
-export const action = async (options) => {
+export const action = (program) => async (options) => {
     if (options.history) {
         process.stdout.write(await loadCommand());
         process.exit(0);
     }
-    const shell = options.shell ?? "";
+    const shell = options.shell ?? (await inferShell()) ?? (await initRender()) ?? "";
     if (!shells.map((s) => s.valueOf()).includes(shell)) {
-        console.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`);
-        process.exit(1);
+        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
     }
     let executed = false;
     const commands = [];

package/build/index.js

@@ -16,7 +16,8 @@ program
     .option("-c, --command <commmand>", "command to use as initial input")
     .option("--history", "get the last command execute")
     .option("-d, --duration <duration>", "duration of the autocomplete session, supported durations: single, session", "session")
-    .action(action);
+    .action(action(program))
+    .showHelpAfterError("(add --help for additional information)");
 program.addCommand(bind);
 program.addCommand(uninstall);
 program.parse();

package/build/ui/ui-init.js

@@ -0,0 +1,44 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import React, { useState } from "react";
+import { Box, Text, render, useApp, useInput } from "ink";
+import { supportedShells } from "../utils/bindings.js";
+let uiResult = undefined;
+function UI() {
+    const { exit } = useApp();
+    const [selectionIdx, setSelectionIdx] = useState(0);
+    const [exited, setExited] = useState(false);
+    useInput(async (_, key) => {
+        if (key.upArrow) {
+            setSelectionIdx(Math.max(0, selectionIdx - 1));
+        }
+        else if (key.downArrow) {
+            setSelectionIdx(Math.min(supportedShells.length - 1, selectionIdx + 1));
+        }
+        else if (key.return) {
+            uiResult = supportedShells[selectionIdx];
+            setExited(true);
+            setTimeout(exit, 0);
+        }
+    });
+    return (React.createElement(React.Fragment, null, exited ? null : (React.createElement(Box, { flexDirection: "column" },
+        React.createElement(Box, null,
+            React.createElement(Text, { bold: true }, "Select your desired shell")),
+        React.createElement(Box, { flexDirection: "column" }, supportedShells.map((shell, idx) => {
+            if (idx == selectionIdx) {
+                return (React.createElement(Text, { color: "cyan", underline: true, key: idx },
+                    ">",
+                    " ",
+                    shell));
+            }
+            return (React.createElement(Text, { key: idx },
+                "  ",
+                shell));
+        }))))));
+}
+export const initRender = async () => {
+    uiResult = undefined;
+    const { waitUntilExit } = render(React.createElement(UI, null));
+    await waitUntilExit();
+    return uiResult;
+};

package/build/utils/bindings.js

@@ -39,12 +39,32 @@ const pwshScriptCommand = () => {
     return `if(Test-Path '${bindingsPath}' -PathType Leaf){. ${bindingsPath}}`;
 };
 const pwshConfigPath = async () => {
-    const { stdout } = await execAsync("echo $profile", { shell: "pwsh" });
-    return stdout.trim();
+    try {
+        const { stdout } = await execAsync("echo $profile", { shell: "pwsh" });
+        return stdout.trim();
+    }
+    catch {
+        /* empty */
+    }
+    switch (process.platform) {
+        case "win32":
+            return path.join(os.homedir(), "Documents", "Powershell", "Microsoft.PowerShell_profile.ps1");
+        case "linux":
+        case "darwin":
+            return path.join(os.homedir(), ".config", "powershell", "Microsoft.PowerShell_profile.ps1");
+        default:
+            throw new Error("Unsupported platform");
+    }
 };
 const powershellConfigPath = async () => {
-    const { stdout } = await execAsync("echo $profile", { shell: "powershell" });
-    return stdout.trim();
+    try {
+        const { stdout } = await execAsync("echo $profile", { shell: "powershell" });
+        return stdout.trim();
+    }
+    catch {
+        /* empty */
+    }
+    return path.join(os.homedir(), "Documents", "WindowsPowershell", "Microsoft.PowerShell_profile.ps1");
 };
 export const availableBindings = async () => {
     const cliConfigPath = path.join(os.homedir(), cacheFolder);
@@ -82,8 +102,8 @@ export const availableBindings = async () => {
             bindings.push(Shell.Fish);
         }
     }
-    const powershellResolvedConfigPath = await powershellConfigPath();
     if (process.platform == "win32") {
+        const powershellResolvedConfigPath = await powershellConfigPath();
         if (!fs.existsSync(powershellResolvedConfigPath)) {
             bindings.push(Shell.Powershell);
         }

package/build/utils/shell.js

@@ -0,0 +1,10 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import process from "node:process";
+import find from "find-process";
+import { supportedShells } from "./bindings.js";
+export const inferShell = async () => {
+    const processResult = (await find("pid", process.ppid)).at(0);
+    const name = processResult?.name;
+    return name != null ? supportedShells.find((shell) => name.includes(shell)) : undefined;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.2",
+  "version": "0.0.1-rc.4",
   "description": "IDE style command line auto complete",
   "type": "module",
   "bin": {
@@ -36,6 +36,7 @@
     "@withfig/autocomplete": "^2.633.0",
     "chalk": "^5.3.0",
     "commander": "^11.0.0",
+    "find-process": "^1.4.7",
     "ink": "^4.4.1",
     "react": "^18.2.0",
     "wrap-ansi": "^8.1.0"