@microsoft/inshellisense 0.0.1-rc.18 → 0.0.1-rc.19

package/README.md

@@ -8,7 +8,7 @@
 
 ### Requirements
 
-- Node.js 20.X, 18.X, 16.X (16.6.0 >=)
+- Node.js 22.X, 20.X, 18.X, 16.X (16.6.0 >=)
 
 ### Installation
 

package/build/isterm/pty.js

@@ -257,7 +257,9 @@ export class ISTerm {
                 if (!sameAccents) {
                     ansiLine.push(this._getAnsiAccents(cell));
                 }
-                ansiLine.push(chars == "" ? ansi.cursorForward() : chars);
+                const isWide = prevCell?.getWidth() == 2 && cell?.getWidth() == 0;
+                const cursorForward = isWide ? "" : ansi.cursorForward();
+                ansiLine.push(chars == "" ? cursorForward : chars);
                 prevCell = cell;
             }
             return ansiLine.join("");

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.18",
+  "version": "0.0.1-rc.19",
   "description": "IDE style command line auto complete",
   "type": "module",
   "engines": {
-    "node": ">=16.6.0 <21.0.0"
+    "node": ">=16.6.0 <23.0.0"
   },
   "bin": {
     "inshellisense": "./build/index.js",
@@ -25,6 +25,7 @@
     "lint": "eslint src/ --ext .ts,.tsx && prettier src/ --check",
     "lint:fix": "eslint src/ --ext .ts,.tsx --fix && prettier src/ --write",
     "debug": "node --inspect --import=tsx src/index.ts -V",
+    "reinstall": "rm -rf node_modules && npm install",
     "pre-commit": "lint-staged",
     "postinstall": "node ./scripts/postinstall.js"
   },
@@ -41,7 +42,7 @@
   },
   "homepage": "https://github.com/microsoft/inshellisense#readme",
   "dependencies": {
-    "@homebridge/node-pty-prebuilt-multiarch": "^0.11.12",
+    "@homebridge/node-pty-prebuilt-multiarch": "^0.11.14",
     "@withfig/autocomplete": "2.675.0",
     "@xterm/addon-unicode11": "^0.8.0",
     "@xterm/headless": "^5.5.0",

package/shell/shellIntegration.fish

@@ -20,4 +20,9 @@ if [ "$ISTERM_TESTING" = "1" ]
 	function is_user_prompt; printf '> '; end
 end
 
-function fish_prompt; __is_prompt_start; is_user_prompt; __is_prompt_end; end
+function fish_prompt;
+    set --local __user_prompt_lines (is_user_prompt)
+    set --local __user_prompt (string join '\n' $__user_prompt_lines)
+	set --local __prompt (string join '' (__is_prompt_start) $__user_prompt (__is_prompt_end))
+    printf $__prompt
+end

package/build/commands/complete-action.js

@@ -1,10 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import os from "node:os";
-import { getSuggestions } from "../runtime/runtime.js";
-import { Shell } from "../utils/shell.js";
-export const action = async (input) => {
-    const suggestions = await getSuggestions(input, process.cwd(), os.platform() === "win32" ? Shell.Cmd : Shell.Bash);
-    process.stdout.write(JSON.stringify(suggestions));
-    process.exit(0);
-};

package/build/commands/root-action.js

@@ -1,38 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { render, renderConfirmation } from "../ui/ui-root.js";
-import { Shell, supportedShells as shells, setupZshDotfiles, setupBashPreExec } from "../utils/shell.js";
-import { inferShell } from "../utils/shell.js";
-import { loadConfig } from "../utils/config.js";
-import log from "../utils/log.js";
-import { loadAliases } from "../runtime/alias.js";
-import { loadLocalSpecsSet } from "../runtime/runtime.js";
-import { program } from "./root.js";
-export const supportedShells = shells.join(", ");
-export const action = async (options) => {
-    const inISTerm = process.env.ISTERM === "1";
-    if (options.check || inISTerm) {
-        process.stdout.write(renderConfirmation(inISTerm));
-        process.exit(0);
-    }
-    if (options.verbose)
-        await log.enable();
-    await loadConfig(program);
-    await loadLocalSpecsSet();
-    const shell = options.shell ?? (await inferShell());
-    if (shell == null) {
-        program.error(`Unable to identify shell, use the -s/--shell option to provide your shell`, { exitCode: 1 });
-        return;
-    }
-    if (!shells.map((s) => s.valueOf()).includes(shell)) {
-        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
-    }
-    if (shell == Shell.Zsh) {
-        await setupZshDotfiles();
-    }
-    else if (shell == Shell.Bash) {
-        await setupBashPreExec();
-    }
-    await loadAliases(shell);
-    await render(shell, options.test ?? false, options.login ?? false);
-};

package/build/commands/shellenv.js

@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { Command } from "commander";
-import { shellEnvSupportedShells as shells, getShellConfig } from "../utils/shell.js";
-const supportedShells = shells.join(", ");
-const action = (program) => async (shell) => {
-    if (!shells.map((s) => s.valueOf()).includes(shell)) {
-        program.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`, { exitCode: 1 });
-    }
-    const config = getShellConfig(shell);
-    process.stdout.write(`\n\n# ---------------- inshellisense shell plugin ----------------\n${config}`);
-    process.exit(0);
-};
-const cmd = new Command("shellenv");
-cmd.description(`generates shell configurations for the provided shell`);
-cmd.argument("<shell>", `shell to generate configuration for, supported shells: ${supportedShells}`);
-cmd.action(action(cmd));
-export default cmd;