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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.15",
+  "version": "0.0.1-rc.18",
   "description": "IDE style command line auto complete",
   "type": "module",
   "engines": {
@@ -13,18 +13,20 @@
   "files": [
     "build/**",
     "shell/**",
+    "scripts/**",
     "*.md",
     "LICENSE"
   ],
   "scripts": {
     "build": "tsc",
-    "dev": "node --loader ts-node/esm src/index.ts -V",
+    "dev": "node --import=tsx src/index.ts -V",
     "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
     "test:e2e": "tui-test",
     "lint": "eslint src/ --ext .ts,.tsx && prettier src/ --check",
     "lint:fix": "eslint src/ --ext .ts,.tsx --fix && prettier src/ --write",
-    "debug": "node --inspect --loader ts-node/esm src/index.ts -V",
-    "pre-commit": "lint-staged"
+    "debug": "node --inspect --import=tsx src/index.ts -V",
+    "pre-commit": "lint-staged",
+    "postinstall": "node ./scripts/postinstall.js"
   },
   "repository": {
     "type": "git",
@@ -40,7 +42,8 @@
   "homepage": "https://github.com/microsoft/inshellisense#readme",
   "dependencies": {
     "@homebridge/node-pty-prebuilt-multiarch": "^0.11.12",
-    "@withfig/autocomplete": "2.651.0",
+    "@withfig/autocomplete": "2.675.0",
+    "@xterm/addon-unicode11": "^0.8.0",
     "@xterm/headless": "^5.5.0",
     "ajv": "^8.12.0",
     "ansi-escapes": "^6.2.0",
@@ -76,7 +79,7 @@
     "lint-staged": "^15.2.2",
     "prettier": "3.0.3",
     "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.2",
+    "tsx": "^4.19.1",
     "typescript": "^5.2.2"
   },
   "lint-staged": {

package/scripts/postinstall.js

@@ -0,0 +1,9 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+import fs from "node:fs";
+
+if (fs.existsSync("./build/commands/init.js")) {
+  const init = (await import("../build/commands/init.js")).default;
+  init.parse(["--generate-full-configs"], { from: "user" });
+}

package/shell/shellIntegration-env.zsh

@@ -1,9 +1,12 @@
 if [[ -f $USER_ZDOTDIR/.zshenv ]]; then
+	IS_ZDOTDIR=$ZDOTDIR
 	ZDOTDIR=$USER_ZDOTDIR
 
 	# prevent recursion
-	if [[ $USER_ZDOTDIR != $ZDOTDIR ]]; then
-		ZDOTDIR=$USER_ZDOTDIR
+	if [[ $USER_ZDOTDIR != $IS_ZDOTDIR ]]; then
 		. $USER_ZDOTDIR/.zshenv
 	fi
+
+	USER_ZDOTDIR=$ZDOTDIR
+	ZDOTDIR=$IS_ZDOTDIR
 fi

package/shell/shellIntegration-login.zsh

@@ -1,4 +1,9 @@
 if [[ -f $USER_ZDOTDIR/.zlogin ]]; then
+	IS_ZDOTDIR=$ZDOTDIR
 	ZDOTDIR=$USER_ZDOTDIR
+
 	. $ZDOTDIR/.zlogin
-fi
+
+	USER_ZDOTDIR=$ZDOTDIR
+	ZDOTDIR=$IS_ZDOTDIR
+fi

package/shell/shellIntegration-profile.zsh

@@ -1,4 +1,9 @@
 if [[ -f $USER_ZDOTDIR/.zprofile ]]; then
+	IS_ZDOTDIR=$ZDOTDIR
 	ZDOTDIR=$USER_ZDOTDIR
+
 	. $USER_ZDOTDIR/.zprofile
-fi
+
+	USER_ZDOTDIR=$ZDOTDIR
+	ZDOTDIR=$IS_ZDOTDIR
+fi

package/shell/shellIntegration-rc.zsh

@@ -1,3 +1,5 @@
+autoload -U add-zsh-hook
+
 if [[ -f $USER_ZDOTDIR/.zshrc ]]; then
 	ZDOTDIR=$USER_ZDOTDIR
 	. $USER_ZDOTDIR/.zshrc
@@ -25,6 +27,12 @@ __is_escape_value() {
 			token="\\\\"
 		elif [ "$byte" = ";" ]; then
 			token="\\x3b"
+		elif [ "$byte" = $'\n' ]; then
+			token="\x0a"
+		elif [ "$byte" = $'\e' ]; then
+			token="\\x1b"
+		elif [ "$byte" = $'\a' ]; then
+			token="\\x07"
 		else
 			token="$byte"
 		fi

package/shell/shellIntegration.bash

@@ -44,6 +44,8 @@ __is_escape_value() {
 			token="\x0a"
 		elif [ "$byte" = $'\e' ]; then
 			token="\\x1b"
+		elif [ "$byte" = $'\a' ]; then
+			token="\\x07"
 		else
 			token="$byte"
 		fi

package/shell/shellIntegration.fish

@@ -9,6 +9,7 @@ function __is_escape_value
 	| string replace -a '\\' '\\\\' \
 	| string replace -a ';' '\\x3b' \
 	| string replace -a \e '\\x1b' \
+	| string replace -a \a '\\x07' \
 	| string split \n | string join '\x0a' \
 	;
 end
@@ -19,4 +20,4 @@ if [ "$ISTERM_TESTING" = "1" ]
 	function is_user_prompt; printf '> '; end
 end
 
-function fish_prompt; printf (__is_prompt_start); printf (is_user_prompt); printf (__is_prompt_end); end
+function fish_prompt; __is_prompt_start; is_user_prompt; __is_prompt_end; end

package/shell/shellIntegration.nu

@@ -1,4 +1,4 @@
-let __is_escape_value = {|x| $x | str replace --all "\\" "\\\\" | str replace --all ";" "\\x3b" | str replace --all "\n" '\x0a' | str replace --all "\e" "\\x1b" }
+let __is_escape_value = {|x| $x | str replace --all "\\" "\\\\" | str replace --all ";" "\\x3b" | str replace --all "\n" '\x0a' | str replace --all "\e" "\\x1b" | str replace --all "\a" "\\x07" }
 let __is_original_PROMPT_COMMAND = if 'PROMPT_COMMAND' in $env { $env.PROMPT_COMMAND } else { "" }
 let __is_original_PROMPT_INDICATOR = if 'PROMPT_INDICATOR' in $env { $env.PROMPT_INDICATOR } else { "" }
 

package/shell/shellIntegration.ps1

@@ -8,7 +8,7 @@ if ($env:ISTERM_TESTING -eq "1") {
 }
 
 function Global:__IS-Escape-Value([string]$value) {
-    [regex]::Replace($value, "[$([char]0x1b)\\\n;]", { param($match)
+    [regex]::Replace($value, "[$([char]0x1b)$([char]0x07)\\\n;]", { param($match)
             -Join (
                 [System.Text.Encoding]::UTF8.GetBytes($match.Value) | ForEach-Object { '\x{0:x2}' -f $_ }
             )

package/shell/shellIntegration.xsh

@@ -12,7 +12,7 @@ def __is_escape_value(value: str) -> str:
     byte_list = [bytes([byte]).decode("utf-8") for byte in list(value.encode("utf-8"))]
     return "".join(
         [
-            "\\x3b" if byte == ";" else "\\\\" if byte == "\\" else "\\x1b" if byte == "\x1b" else "\x0a" if byte == "\n" else byte
+            "\\x3b" if byte == ";" else "\\\\" if byte == "\\" else "\\x1b" if byte == "\x1b" else "\x0a" if byte == "\n"else "\\x07" if byte == "\x07" else byte
             for byte in byte_list
         ]
     )