@microsoft/inshellisense 0.0.1-rc.13 → 0.0.1-rc.14

package/build/commands/root.js

@@ -12,7 +12,7 @@ export const action = (program) => async (options) => {
     const inISTerm = process.env.ISTERM === "1";
     if (options.check || inISTerm) {
         process.stdout.write(renderConfirmation(inISTerm));
-        return;
+        process.exit(0);
     }
     if (options.verbose)
         await log.enable();
@@ -32,5 +32,5 @@ export const action = (program) => async (options) => {
         await setupBashPreExec();
     }
     await loadAliases(shell);
-    await render(shell, options.test ?? false);
+    await render(shell, options.test ?? false, options.login ?? false);
 };

package/build/commands/specs/list.js

@@ -0,0 +1,26 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { Command } from "commander";
+import { loadConfig } from "../../utils/config.js";
+import { getSpecNames, loadLocalSpecsSet } from "../../runtime/runtime.js";
+import { getAliasNames, loadAliases } from "../../runtime/alias.js";
+import { aliasSupportedShells } from "../../utils/shell.js";
+const supportedShells = aliasSupportedShells.join(", ");
+const action = (program) => async (options) => {
+    await loadConfig(program);
+    await loadLocalSpecsSet();
+    const { shell } = options;
+    if (shell && !aliasSupportedShells.map((s) => s.valueOf()).includes(shell)) {
+        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
+    }
+    if (shell) {
+        await loadAliases(shell);
+    }
+    process.stdout.write(JSON.stringify([...getAliasNames(), ...getSpecNames()]));
+    process.exit(0);
+};
+const cmd = new Command("list");
+cmd.description(`list the names of all available specs`);
+cmd.option("-s, --shell <shell>", `shell to use alias specs, supported shells: ${supportedShells}`);
+cmd.action(action(cmd));
+export default cmd;

package/build/commands/specs/root.js

@@ -0,0 +1,8 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+import { Command } from "commander";
+import list from "./list.js";
+const cmd = new Command("specs");
+cmd.description(`manage specs`);
+cmd.addCommand(list);
+export default cmd;

package/build/index.js

@@ -6,6 +6,7 @@ import { Command, Option } from "commander";
 import complete from "./commands/complete.js";
 import uninstall from "./commands/uninstall.js";
 import init from "./commands/init.js";
+import specs from "./commands/specs/root.js";
 import { action, supportedShells } from "./commands/root.js";
 import { getVersion } from "./utils/version.js";
 const program = new Command();
@@ -19,12 +20,15 @@ program
     .description("IDE style command line auto complete")
     .version(await getVersion(), "-v, --version", "output the current version")
     .action(action(program))
+    .option("-l, --login", `start shell as a login shell`)
     .option("-s, --shell <shell>", `shell to use for command execution, supported shells: ${supportedShells}`)
     .option("-c, --check", `check if shell is in an inshellisense session`)
     .addOption(hiddenOption("-T, --test", "used to make e2e tests reproducible across machines"))
     .option("-V, --verbose", `enable verbose logging`)
-    .showHelpAfterError("(add --help for additional information)");
+    .showHelpAfterError("(add --help for additional information)")
+    .passThroughOptions();
 program.addCommand(complete);
 program.addCommand(uninstall);
 program.addCommand(init);
+program.addCommand(specs);
 program.parse();

package/build/isterm/commandManager.js

@@ -188,6 +188,9 @@ export class CommandManager {
             cursorTerminated: this.#activeCommand.cursorTerminated,
         };
     }
+    clearActiveCommand() {
+        this.#activeCommand = {};
+    }
     termSync() {
         if (this.#activeCommand.promptEndMarker == null || this.#activeCommand.promptStartMarker == null) {
             return;
@@ -197,6 +200,7 @@ export class CommandManager {
         if (globalCursorPosition < this.#activeCommand.promptStartMarker.line) {
             this.handleClear();
             this.#activeCommand.promptEndMarker = this.#terminal.registerMarker(0);
+            return;
         }
         if (this.#activeCommand.promptEndMarker == null)
             return;

package/build/isterm/pty.js

@@ -31,13 +31,13 @@ export class ISTerm {
     #term;
     #commandManager;
     #shell;
-    constructor({ shell, cols, rows, env, shellTarget, shellArgs, underTest }) {
+    constructor({ shell, cols, rows, env, shellTarget, shellArgs, underTest, login }) {
         this.#pty = pty.spawn(shellTarget, shellArgs ?? [], {
             name: "xterm-256color",
             cols,
             rows,
             cwd: process.cwd(),
-            env: { ...convertToPtyEnv(shell, underTest), ...env },
+            env: { ...convertToPtyEnv(shell, underTest, login), ...env },
         });
         this.pid = this.#pty.pid;
         this.cols = this.#pty.cols;
@@ -144,24 +144,37 @@ export class ISTerm {
         };
     }
     _sameAccent(baseCell, targetCell) {
-        return baseCell?.isBold() == targetCell?.isBold() && baseCell?.isItalic() == targetCell?.isItalic() && baseCell?.isUnderline() == targetCell?.isUnderline();
+        return (baseCell?.isBold() == targetCell?.isBold() &&
+            baseCell?.isItalic() == targetCell?.isItalic() &&
+            baseCell?.isUnderline() == targetCell?.isUnderline() &&
+            baseCell?.extended.underlineStyle == targetCell?.extended.underlineStyle &&
+            baseCell?.hasExtendedAttrs() == targetCell?.hasExtendedAttrs() &&
+            baseCell?.isInverse() == targetCell?.isInverse() &&
+            baseCell?.isBlink() == targetCell?.isBlink() &&
+            baseCell?.isInvisible() == targetCell?.isInvisible() &&
+            baseCell?.isDim() == targetCell?.isDim() &&
+            baseCell?.isStrikethrough() == targetCell?.isStrikethrough());
     }
     _getAnsiAccents(cell) {
         if (cell == null)
             return "";
-        let boldAnsi = "";
-        if (cell.isBold()) {
-            boldAnsi = "\x1b[1m";
-        }
-        let italicAnsi = "";
-        if (cell.isItalic()) {
-            italicAnsi = "\x1b[3m";
-        }
         let underlineAnsi = "";
         if (cell.isUnderline()) {
-            underlineAnsi = "\x1b[4m";
+            if (cell.hasExtendedAttrs() && cell.extended.underlineStyle) {
+                underlineAnsi = `\x1b[4:${cell.extended.underlineStyle}m`;
+            }
+            else {
+                underlineAnsi = "\x1b[4m";
+            }
         }
-        return boldAnsi + italicAnsi + underlineAnsi;
+        const boldAnsi = cell.isBold() ? "\x1b[1m" : "";
+        const dimAnsi = cell.isDim() ? "\x1b[2m" : "";
+        const italicAnsi = cell.isItalic() ? "\x1b[3m" : "";
+        const blinkAnsi = cell.isBlink() ? "\x1b[5m" : "";
+        const inverseAnsi = cell.isInverse() ? "\x1b[7m" : "";
+        const invisibleAnsi = cell.isInvisible() ? "\x1b[8m" : "";
+        const strikethroughAnsi = cell.isStrikethrough() ? "\x1b[9m" : "";
+        return boldAnsi + italicAnsi + underlineAnsi + inverseAnsi + dimAnsi + blinkAnsi + invisibleAnsi + strikethroughAnsi;
     }
     _sameColor(baseCell, targetCell) {
         return (baseCell?.getBgColorMode() == targetCell?.getBgColorMode() &&
@@ -196,6 +209,9 @@ export class ISTerm {
         }
         return bgAnsi + fgAnsi;
     }
+    clearCommand() {
+        this.#commandManager.clearActiveCommand();
+    }
     getCells(height, direction) {
         const currentCursorPosition = this.#term.buffer.active.cursorY + this.#term.buffer.active.baseY;
         const writeLine = (y) => {
@@ -207,10 +223,15 @@ export class ISTerm {
             for (let x = 0; x < line.length; x++) {
                 const cell = line.getCell(x);
                 const chars = cell?.getChars() ?? "";
-                if (!this._sameColor(prevCell, cell)) {
+                const sameColor = this._sameColor(prevCell, cell);
+                const sameAccents = this._sameAccent(prevCell, cell);
+                if (!sameColor || !sameAccents) {
+                    ansiLine.push("\x1b[0m");
+                }
+                if (!sameColor) {
                     ansiLine.push(this._getAnsiColors(cell));
                 }
-                if (!this._sameAccent(prevCell, cell)) {
+                if (!sameAccents) {
                     ansiLine.push(this._getAnsiAccents(cell));
                 }
                 ansiLine.push(chars == "" ? " " : chars);
@@ -237,10 +258,10 @@ export class ISTerm {
     }
 }
 export const spawn = async (options) => {
-    const { shellTarget, shellArgs } = await convertToPtyTarget(options.shell, options.underTest);
+    const { shellTarget, shellArgs } = await convertToPtyTarget(options.shell, options.underTest, options.login);
     return new ISTerm({ ...options, shellTarget, shellArgs });
 };
-const convertToPtyTarget = async (shell, underTest) => {
+const convertToPtyTarget = async (shell, underTest, login) => {
     const platform = os.platform();
     const shellTarget = shell == Shell.Bash && platform == "win32" ? await gitBashPath() : platform == "win32" ? `${shell}.exe` : shell;
     const shellFolderPath = path.join(path.dirname(url.fileURLToPath(import.meta.url)), "..", "..", "shell");
@@ -273,15 +294,31 @@ const convertToPtyTarget = async (shell, underTest) => {
                 shellArgs.push("-n");
             break;
     }
+    if (login) {
+        switch (shell) {
+            case Shell.Powershell:
+            case Shell.Pwsh:
+                shellArgs.unshift("-login");
+                break;
+            case Shell.Zsh:
+            case Shell.Fish:
+            case Shell.Xonsh:
+            case Shell.Nushell:
+                shellArgs.unshift("--login");
+                break;
+        }
+    }
     return { shellTarget, shellArgs };
 };
-const convertToPtyEnv = (shell, underTest) => {
+const convertToPtyEnv = (shell, underTest, login) => {
     const env = {
         ...process.env,
         ISTERM: "1",
     };
     if (underTest)
         env.ISTERM_TESTING = "1";
+    if (login)
+        env.ISTERM_LOGIN = "1";
     switch (shell) {
         case Shell.Cmd: {
             if (underTest) {

package/build/runtime/alias.js

@@ -48,6 +48,7 @@ export const loadAliases = async (shell) => {
     }
     return [];
 };
+export const getAliasNames = () => Object.keys(loadedAliases);
 export const aliasExpand = (command) => {
     if (!command.at(0)?.complete)
         return command;

package/build/runtime/runtime.js

@@ -103,6 +103,9 @@ export const getSuggestions = async (cmd, cwd, shell) => {
     }
     return { ...result, charactersToDrop };
 };
+export const getSpecNames = () => {
+    return Object.keys(specSet).filter((spec) => !spec.startsWith("@") && spec != "-");
+};
 const getPersistentOptions = (persistentOptions, options) => {
     const persistentOptionNames = new Set(persistentOptions.map((o) => (typeof o.name === "string" ? [o.name] : o.name)).flat());
     return persistentOptions.concat((options ?? []).filter((o) => (typeof o.name == "string" ? !persistentOptionNames.has(o.name) : o.name.some((n) => !persistentOptionNames.has(n))) && o.isPersistent === true));

package/build/ui/suggestionManager.js

@@ -122,6 +122,9 @@ export class SuggestionManager {
     }
     update(keyPress) {
         const { name, shift, ctrl } = keyPress;
+        if (name == "return") {
+            this.#term.clearCommand(); // clear the current command on enter
+        }
         if (!this.#suggestBlob) {
             return false;
         }

package/build/ui/ui-root.js

@@ -12,8 +12,8 @@ export const renderConfirmation = (live) => {
     const statusMessage = live ? chalk.green("live") : chalk.red("not found");
     return `inshellisense session [${statusMessage}]\n`;
 };
-export const render = async (shell, underTest) => {
-    const term = await isterm.spawn({ shell, rows: process.stdout.rows, cols: process.stdout.columns, underTest });
+export const render = async (shell, underTest, login) => {
+    const term = await isterm.spawn({ shell, rows: process.stdout.rows, cols: process.stdout.columns, underTest, login });
     const suggestionManager = new SuggestionManager(term, shell);
     let hasActiveSuggestions = false;
     let previousSuggestionsRows = 0;

package/build/utils/shell.js

@@ -30,6 +30,7 @@ export const supportedShells = [
     Shell.Nushell,
 ].filter((shell) => shell != null);
 export const initSupportedShells = supportedShells.filter((shell) => shell != Shell.Cmd);
+export const aliasSupportedShells = [Shell.Bash, Shell.Zsh];
 export const userZdotdir = process.env?.ZDOTDIR ?? os.homedir() ?? `~`;
 export const zdotdir = path.join(os.tmpdir(), `is-zsh`);
 const configFolder = ".inshellisense";
@@ -103,9 +104,22 @@ export const getShellPromptRewrites = (shell) => shell == Shell.Nushell;
 export const getShellConfig = (shell) => {
     switch (shell) {
         case Shell.Zsh:
+            return `if [[ -z "\${ISTERM}" && $- = *i* && $- != *c* ]]; then
+  if [[ -o login ]]; then
+    is -s zsh --login ; exit
+  else
+    is -s zsh ; exit
+  fi
+fi`;
         case Shell.Bash:
             return `if [[ -z "\${ISTERM}" && $- = *i* && $- != *c* ]]; then
-  is -s ${shell} ; exit
+  shopt -q login_shell
+  login_shell=$?
+  if [ $login_shell -eq 0 ]; then
+    is -s bash --login ; exit
+  else
+    is -s bash ; exit
+  fi 
 fi`;
         case Shell.Powershell:
         case Shell.Pwsh:
@@ -118,14 +132,21 @@ if ([string]::IsNullOrEmpty($env:ISTERM) -and [Environment]::UserInteractive -an
 }`;
         case Shell.Fish:
             return `if test -z "$ISTERM" && status --is-interactive
-  is -s fish ; kill %self
+  if status --is-login
+    is -s fish --login ; kill %self
+  else
+    is -s fish ; kill %self
+  end 
 end`;
         case Shell.Xonsh:
             return `if 'ISTERM' not in \${...} and $XONSH_INTERACTIVE:
-    is -s xonsh ; exit`;
+    if $XONSH_LOGIN:
+        is -s xonsh --login ; exit
+    else:
+        is -s xonsh ; exit`;
         case Shell.Nushell:
             return `if "ISTERM" not-in $env and $nu.is-interactive {
-    is -s nu ; exit
+    if $nu.is-login { is -s nu --login ; exit } else { is -s nu ; exit }
 }`;
     }
     return "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.13",
+  "version": "0.0.1-rc.14",
   "description": "IDE style command line auto complete",
   "type": "module",
   "engines": {
@@ -41,6 +41,7 @@
   "dependencies": {
     "@homebridge/node-pty-prebuilt-multiarch": "^0.11.12",
     "@withfig/autocomplete": "2.651.0",
+    "@xterm/headless": "^5.5.0",
     "ajv": "^8.12.0",
     "ansi-escapes": "^6.2.0",
     "ansi-styles": "^6.2.1",
@@ -51,8 +52,7 @@
     "toml": "^3.0.0",
     "wcwidth": "^1.0.1",
     "which": "^4.0.0",
-    "wrap-ansi": "^8.1.0",
-    "@xterm/headless": "^5.3.0"
+    "wrap-ansi": "^8.1.0"
   },
   "devDependencies": {
     "@microsoft/tui-test": "^0.0.1-rc.3",
@@ -65,6 +65,7 @@
     "@typescript-eslint/eslint-plugin": "^6.7.4",
     "@typescript-eslint/parser": "^6.7.4",
     "@withfig/autocomplete-types": "^1.28.0",
+    "@xterm/xterm": "^5.5.0",
     "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-header": "^3.1.1",

package/shell/shellIntegration.bash

@@ -1,5 +1,19 @@
-if [ -r ~/.bashrc ]; then
-    . ~/.bashrc
+if [ -z "$ISTERM_LOGIN" ]; then
+	if [ -r ~/.bashrc ]; then
+		. ~/.bashrc
+	fi
+else
+	if [ -r /etc/profile ]; then
+		. /etc/profile
+	fi
+	# execute the first that exists
+	if [ -r ~/.bash_profile ]; then
+		. ~/.bash_profile
+	elif [ -r ~/.bash_login ]; then
+		. ~/.bash_login
+	elif [ -r ~/.profile ]; then
+		. ~/.profile
+	fi
 fi
 
 if [ -r ~/.inshellisense/bash-preexec.sh ]; then