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

package/build/runtime/generator.js

@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import log from "../utils/log.js";
 import { runTemplates } from "./template.js";
 import { buildExecuteShellCommand } from "./utils.js";
-const getGeneratorContext = () => {
+const getGeneratorContext = (cwd) => {
     return {
         environmentVariables: Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] != null)),
-        currentWorkingDirectory: process.cwd(),
+        currentWorkingDirectory: cwd,
         currentProcess: "",
         sshPrefix: "",
         isDangerous: false,
@@ -13,30 +14,40 @@ const getGeneratorContext = () => {
     };
 };
 // TODO: add support for caching, trigger, & getQueryTerm
-export const runGenerator = async (generator, tokens) => {
-    const { script, postProcess, scriptTimeout, splitOn, custom, template } = generator;
+export const runGenerator = async (generator, tokens, cwd) => {
+    // TODO: support trigger
+    const { script, postProcess, scriptTimeout, splitOn, custom, template, filterTemplateSuggestions } = generator;
     const executeShellCommand = buildExecuteShellCommand(scriptTimeout ?? 5000);
     const suggestions = [];
     try {
         if (script) {
-            const scriptOutput = typeof script === "function" ? script(tokens) : script != null ? await executeShellCommand(script) : "";
+            const shellInput = typeof script === "function" ? script(tokens) : script;
+            const scriptOutput = Array.isArray(shellInput)
+                ? await executeShellCommand({ command: shellInput.at(0) ?? "", args: shellInput.slice(1) })
+                : await executeShellCommand(shellInput);
             if (postProcess) {
-                suggestions.push(...postProcess(scriptOutput, tokens));
+                suggestions.push(...postProcess(scriptOutput.stdout, tokens));
             }
             else if (splitOn) {
-                suggestions.push(...scriptOutput.split(splitOn).map((s) => ({ name: s })));
+                suggestions.push(...scriptOutput.stdout.split(splitOn).map((s) => ({ name: s })));
             }
         }
         if (custom) {
-            suggestions.push(...(await custom(tokens, executeShellCommand, getGeneratorContext())));
+            suggestions.push(...(await custom(tokens, executeShellCommand, getGeneratorContext(cwd))));
         }
         if (template != null) {
-            suggestions.push(...(await runTemplates(template)));
+            const templateSuggestions = await runTemplates(template, cwd);
+            if (filterTemplateSuggestions) {
+                suggestions.push(...filterTemplateSuggestions(templateSuggestions));
+            }
+            else {
+                suggestions.push(...templateSuggestions);
+            }
         }
         return suggestions;
     }
     catch (e) {
-        /* empty */
+        log.debug({ msg: "generator failed", e, script, splitOn, template });
     }
     return suggestions;
 };

package/build/runtime/parser.js

@@ -1,6 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-const cmdDelim = /(\|\|)|(&&)|(;)/;
+const cmdDelim = /(\|\|)|(&&)|(;)|(\|)/;
 const spaceRegex = /\s/;
 export const parseCommand = (command) => {
     const lastCommand = command.split(cmdDelim).at(-1)?.trimStart();
@@ -56,7 +56,7 @@ const lex = (command) => {
         tokens.push({
             token: command.slice(readingIdx),
             complete: false,
-            isOption: false,
+            isOption: readingFlag,
         });
     }
     return tokens;

package/build/runtime/runtime.js

@@ -4,9 +4,10 @@ import speclist, { diffVersionedCompletions as versionedSpeclist,
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
  } from "@withfig/autocomplete/build/index.js";
+import path from "node:path";
 import { parseCommand } from "./parser.js";
 import { getArgDrivenRecommendation, getSubcommandDrivenRecommendation } from "./suggestion.js";
-import { buildExecuteShellCommand } from "./utils.js";
+import { buildExecuteShellCommand, resolveCwd } from "./utils.js";
 // eslint-disable-next-line @typescript-eslint/no-explicit-any -- recursive type, setting as any
 const specSet = {};
 speclist.forEach((s) => {
@@ -46,7 +47,7 @@ const lazyLoadSpec = async (key) => {
 const lazyLoadSpecLocation = async (location) => {
     return; //TODO: implement spec location loading
 };
-export const getSuggestions = async (cmd) => {
+export const getSuggestions = async (cmd, cwd, shell) => {
     const activeCmd = parseCommand(cmd);
     const rootToken = activeCmd.at(0);
     if (activeCmd.length === 0 || !rootToken?.complete) {
@@ -58,11 +59,19 @@ export const getSuggestions = async (cmd) => {
     const subcommand = getSubcommand(spec);
     if (subcommand == null)
         return;
-    const result = await runSubcommand(activeCmd.slice(1), subcommand);
+    const lastCommand = activeCmd.at(-1);
+    const { cwd: resolvedCwd, pathy, complete: pathyComplete } = await resolveCwd(lastCommand, cwd, shell);
+    if (pathy && lastCommand) {
+        lastCommand.isPath = true;
+        lastCommand.isPathComplete = pathyComplete;
+    }
+    const result = await runSubcommand(activeCmd.slice(1), subcommand, resolvedCwd);
     if (result == null)
         return;
-    const lastCommand = activeCmd.at(-1);
-    const charactersToDrop = lastCommand?.complete ? 0 : lastCommand?.token.length ?? 0;
+    let charactersToDrop = lastCommand?.complete ? 0 : lastCommand?.token.length ?? 0;
+    if (pathy) {
+        charactersToDrop = pathyComplete ? 0 : path.basename(lastCommand?.token ?? "").length;
+    }
     return { ...result, charactersToDrop };
 };
 const getPersistentOptions = (persistentOptions, options) => {
@@ -142,7 +151,7 @@ const getPersistentTokens = (tokens) => {
 const getArgs = (args) => {
     return args instanceof Array ? args : args != null ? [args] : [];
 };
-const runOption = async (tokens, option, subcommand, persistentOptions, acceptedTokens) => {
+const runOption = async (tokens, option, subcommand, cwd, persistentOptions, acceptedTokens) => {
     if (tokens.length === 0) {
         throw new Error("invalid state reached, option expected but no tokens found");
     }
@@ -150,37 +159,37 @@ const runOption = async (tokens, option, subcommand, persistentOptions, accepted
     const isPersistent = persistentOptions.some((o) => (typeof o.name === "string" ? o.name === activeToken.token : o.name.includes(activeToken.token)));
     if ((option.args instanceof Array && option.args.length > 0) || option.args != null) {
         const args = option.args instanceof Array ? option.args : [option.args];
-        return runArg(tokens.slice(1), args, subcommand, persistentOptions, acceptedTokens.concat(activeToken), true, false);
+        return runArg(tokens.slice(1), args, subcommand, cwd, persistentOptions, acceptedTokens.concat(activeToken), true, false);
     }
-    return runSubcommand(tokens.slice(1), subcommand, persistentOptions, acceptedTokens.concat({ ...activeToken, isPersistent }));
+    return runSubcommand(tokens.slice(1), subcommand, cwd, persistentOptions, acceptedTokens.concat({ ...activeToken, isPersistent }));
 };
-const runArg = async (tokens, args, subcommand, persistentOptions, acceptedTokens, fromOption, fromVariadic) => {
+const runArg = async (tokens, args, subcommand, cwd, persistentOptions, acceptedTokens, fromOption, fromVariadic) => {
     if (args.length === 0) {
-        return runSubcommand(tokens, subcommand, persistentOptions, acceptedTokens, true, !fromOption);
+        return runSubcommand(tokens, subcommand, cwd, persistentOptions, acceptedTokens, true, !fromOption);
     }
     else if (tokens.length === 0) {
-        return await getArgDrivenRecommendation(args, subcommand, persistentOptions, undefined, acceptedTokens, fromVariadic);
+        return await getArgDrivenRecommendation(args, subcommand, persistentOptions, undefined, acceptedTokens, fromVariadic, cwd);
     }
     else if (!tokens.at(0)?.complete) {
-        return await getArgDrivenRecommendation(args, subcommand, persistentOptions, tokens[0].token, acceptedTokens, fromVariadic);
+        return await getArgDrivenRecommendation(args, subcommand, persistentOptions, tokens[0], acceptedTokens, fromVariadic, cwd);
     }
     const activeToken = tokens[0];
     if (args.every((a) => a.isOptional)) {
         if (activeToken.isOption) {
             const option = getOption(activeToken, persistentOptions.concat(subcommand.options ?? []));
             if (option != null) {
-                return runOption(tokens, option, subcommand, persistentOptions, acceptedTokens);
+                return runOption(tokens, option, subcommand, cwd, persistentOptions, acceptedTokens);
             }
             return;
         }
         const nextSubcommand = await genSubcommand(activeToken.token, subcommand);
         if (nextSubcommand != null) {
-            return runSubcommand(tokens.slice(1), nextSubcommand, persistentOptions, getPersistentTokens(acceptedTokens.concat(activeToken)));
+            return runSubcommand(tokens.slice(1), nextSubcommand, cwd, persistentOptions, getPersistentTokens(acceptedTokens.concat(activeToken)));
         }
     }
     const activeArg = args[0];
     if (activeArg.isVariadic) {
-        return runArg(tokens.slice(1), args, subcommand, persistentOptions, acceptedTokens.concat(activeToken), fromOption, true);
+        return runArg(tokens.slice(1), args, subcommand, cwd, persistentOptions, acceptedTokens.concat(activeToken), fromOption, true);
     }
     else if (activeArg.isCommand) {
         if (tokens.length <= 0) {
@@ -192,16 +201,16 @@ const runArg = async (tokens, args, subcommand, persistentOptions, acceptedToken
         const subcommand = getSubcommand(spec);
         if (subcommand == null)
             return;
-        return runSubcommand(tokens.slice(1), subcommand);
+        return runSubcommand(tokens.slice(1), subcommand, cwd);
     }
-    return runArg(tokens.slice(1), args.slice(1), subcommand, persistentOptions, acceptedTokens.concat(activeToken), fromOption, false);
+    return runArg(tokens.slice(1), args.slice(1), subcommand, cwd, persistentOptions, acceptedTokens.concat(activeToken), fromOption, false);
 };
-const runSubcommand = async (tokens, subcommand, persistentOptions = [], acceptedTokens = [], argsDepleted = false, argsUsed = false) => {
+const runSubcommand = async (tokens, subcommand, cwd, persistentOptions = [], acceptedTokens = [], argsDepleted = false, argsUsed = false) => {
     if (tokens.length === 0) {
-        return getSubcommandDrivenRecommendation(subcommand, persistentOptions, undefined, argsDepleted, argsUsed, acceptedTokens);
+        return getSubcommandDrivenRecommendation(subcommand, persistentOptions, undefined, argsDepleted, argsUsed, acceptedTokens, cwd);
     }
     else if (!tokens.at(0)?.complete) {
-        return getSubcommandDrivenRecommendation(subcommand, persistentOptions, tokens[0].token, argsDepleted, argsUsed, acceptedTokens);
+        return getSubcommandDrivenRecommendation(subcommand, persistentOptions, tokens[0], argsDepleted, argsUsed, acceptedTokens, cwd);
     }
     const activeToken = tokens[0];
     const activeArgsLength = subcommand.args instanceof Array ? subcommand.args.length : 1;
@@ -209,16 +218,21 @@ const runSubcommand = async (tokens, subcommand, persistentOptions = [], accepte
     if (activeToken.isOption) {
         const option = getOption(activeToken, allOptions);
         if (option != null) {
-            return runOption(tokens, option, subcommand, persistentOptions, acceptedTokens);
+            return runOption(tokens, option, subcommand, cwd, persistentOptions, acceptedTokens);
         }
         return;
     }
     const nextSubcommand = await genSubcommand(activeToken.token, subcommand);
     if (nextSubcommand != null) {
-        return runSubcommand(tokens.slice(1), nextSubcommand, getPersistentOptions(persistentOptions, subcommand.options), getPersistentTokens(acceptedTokens.concat(activeToken)));
+        return runSubcommand(tokens.slice(1), nextSubcommand, cwd, getPersistentOptions(persistentOptions, subcommand.options), getPersistentTokens(acceptedTokens.concat(activeToken)));
     }
     if (activeArgsLength <= 0) {
         return; // not subcommand or option & no args exist
     }
-    return runArg(tokens, getArgs(subcommand.args), subcommand, allOptions, acceptedTokens, false, false);
+    const args = getArgs(subcommand.args);
+    if (args.length != 0) {
+        return runArg(tokens, args, subcommand, cwd, allOptions, acceptedTokens, false, false);
+    }
+    // if the subcommand has no args specified, fallback to the subcommand and ignore this item
+    return runSubcommand(tokens.slice(1), subcommand, cwd, persistentOptions, acceptedTokens.concat(activeToken));
 };

package/build/runtime/suggestion.js

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
+import path from "node:path";
 import { runGenerator } from "./generator.js";
 import { runTemplates } from "./template.js";
 var SuggestionIcons;
@@ -116,14 +117,14 @@ function filter(suggestions, filterStrategy, partialCmd, suggestionType) {
                 .filter((s) => s != null);
     }
 }
-const generatorSuggestions = async (generator, acceptedTokens, filterStrategy, partialCmd) => {
+const generatorSuggestions = async (generator, acceptedTokens, filterStrategy, partialCmd, cwd) => {
     const generators = generator instanceof Array ? generator : generator ? [generator] : [];
     const tokens = acceptedTokens.map((t) => t.token);
-    const suggestions = (await Promise.all(generators.map((gen) => runGenerator(gen, tokens)))).flat();
+    const suggestions = (await Promise.all(generators.map((gen) => runGenerator(gen, tokens, cwd)))).flat();
     return filter(suggestions, filterStrategy, partialCmd, undefined);
 };
-const templateSuggestions = async (templates, filterStrategy, partialCmd) => {
-    return filter(await runTemplates(templates ?? []), filterStrategy, partialCmd, undefined);
+const templateSuggestions = async (templates, filterStrategy, partialCmd, cwd) => {
+    return filter(await runTemplates(templates ?? [], cwd), filterStrategy, partialCmd, undefined);
 };
 const suggestionSuggestions = (suggestions, filterStrategy, partialCmd) => {
     const cleanedSuggestions = suggestions?.map((s) => (typeof s === "string" ? { name: s } : s)) ?? [];
@@ -137,17 +138,32 @@ const optionSuggestions = (options, acceptedTokens, filterStrategy, partialCmd)
     const validOptions = options?.filter((o) => o.exclusiveOn?.every((exclusiveOption) => !usedOptions.has(exclusiveOption)) ?? true);
     return filter(validOptions ?? [], filterStrategy, partialCmd, "option");
 };
-const removeDuplicateSuggestions = (suggestions, acceptedTokens) => {
+const removeAcceptedSuggestions = (suggestions, acceptedTokens) => {
     const seen = new Set(acceptedTokens.map((t) => t.token));
     return suggestions.filter((s) => s.allNames.every((n) => !seen.has(n)));
 };
+const removeDuplicateSuggestion = (suggestions) => {
+    const seen = new Set();
+    return suggestions
+        .map((s) => {
+        if (seen.has(s.name))
+            return null;
+        seen.add(s.name);
+        return s;
+    })
+        .filter((s) => s != null);
+};
 const removeEmptySuggestion = (suggestions) => {
     return suggestions.filter((s) => s.name.length > 0);
 };
-export const getSubcommandDrivenRecommendation = async (subcommand, persistentOptions, partialCmd, argsDepleted, argsFromSubcommand, acceptedTokens) => {
+export const getSubcommandDrivenRecommendation = async (subcommand, persistentOptions, partialToken, argsDepleted, argsFromSubcommand, acceptedTokens, cwd) => {
     if (argsDepleted && argsFromSubcommand) {
         return;
     }
+    let partialCmd = partialToken?.token;
+    if (partialToken?.isPath) {
+        partialCmd = partialToken.isPathComplete ? "" : path.basename(partialCmd ?? "");
+    }
     const suggestions = [];
     const argLength = subcommand.args instanceof Array ? subcommand.args.length : subcommand.args ? 1 : 0;
     const allOptions = persistentOptions.concat(subcommand.options ?? []);
@@ -157,28 +173,32 @@ export const getSubcommandDrivenRecommendation = async (subcommand, persistentOp
     }
     if (argLength != 0) {
         const activeArg = subcommand.args instanceof Array ? subcommand.args[0] : subcommand.args;
-        suggestions.push(...(await generatorSuggestions(activeArg?.generators, acceptedTokens, activeArg?.filterStrategy, partialCmd)));
+        suggestions.push(...(await generatorSuggestions(activeArg?.generators, acceptedTokens, activeArg?.filterStrategy, partialCmd, cwd)));
         suggestions.push(...suggestionSuggestions(activeArg?.suggestions, activeArg?.filterStrategy, partialCmd));
-        suggestions.push(...(await templateSuggestions(activeArg?.template, activeArg?.filterStrategy, partialCmd)));
+        suggestions.push(...(await templateSuggestions(activeArg?.template, activeArg?.filterStrategy, partialCmd, cwd)));
     }
     return {
-        suggestions: removeEmptySuggestion(removeDuplicateSuggestions(suggestions.sort((a, b) => b.priority - a.priority), acceptedTokens)),
+        suggestions: removeDuplicateSuggestion(removeEmptySuggestion(removeAcceptedSuggestions(suggestions.sort((a, b) => b.priority - a.priority), acceptedTokens))),
     };
 };
-export const getArgDrivenRecommendation = async (args, subcommand, persistentOptions, partialCmd, acceptedTokens, variadicArgBound) => {
+export const getArgDrivenRecommendation = async (args, subcommand, persistentOptions, partialToken, acceptedTokens, variadicArgBound, cwd) => {
+    let partialCmd = partialToken?.token;
+    if (partialToken?.isPath) {
+        partialCmd = partialToken.isPathComplete ? "" : path.basename(partialCmd ?? "");
+    }
     const activeArg = args[0];
     const allOptions = persistentOptions.concat(subcommand.options ?? []);
     const suggestions = [
-        ...(await generatorSuggestions(args[0].generators, acceptedTokens, activeArg?.filterStrategy, partialCmd)),
+        ...(await generatorSuggestions(args[0].generators, acceptedTokens, activeArg?.filterStrategy, partialCmd, cwd)),
         ...suggestionSuggestions(args[0].suggestions, activeArg?.filterStrategy, partialCmd),
-        ...(await templateSuggestions(args[0].template, activeArg?.filterStrategy, partialCmd)),
+        ...(await templateSuggestions(args[0].template, activeArg?.filterStrategy, partialCmd, cwd)),
     ];
-    if ((activeArg.isOptional && !activeArg.isVariadic) || (activeArg.isVariadic && activeArg.isOptional && !variadicArgBound)) {
+    if (activeArg.isOptional || (activeArg.isVariadic && variadicArgBound)) {
         suggestions.push(...subcommandSuggestions(subcommand.subcommands, activeArg?.filterStrategy, partialCmd));
         suggestions.push(...optionSuggestions(allOptions, acceptedTokens, activeArg?.filterStrategy, partialCmd));
     }
     return {
-        suggestions: removeEmptySuggestion(removeDuplicateSuggestions(suggestions.sort((a, b) => b.priority - a.priority), acceptedTokens)),
+        suggestions: removeDuplicateSuggestion(removeEmptySuggestion(removeAcceptedSuggestions(suggestions.sort((a, b) => b.priority - a.priority), acceptedTokens))),
         argumentDescription: activeArg.description ?? activeArg.name,
     };
 };

package/build/runtime/template.js

@@ -1,14 +1,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import fsAsync from "fs/promises";
-import process from "node:process";
-const filepathsTemplate = async () => {
-    const files = await fsAsync.readdir(process.cwd(), { withFileTypes: true });
-    return files.filter((f) => f.isFile() || f.isDirectory()).map((f) => ({ name: f.name, priority: 90 }));
+import fsAsync from "node:fs/promises";
+import log from "../utils/log.js";
+const filepathsTemplate = async (cwd) => {
+    const files = await fsAsync.readdir(cwd, { withFileTypes: true });
+    return files.filter((f) => f.isFile() || f.isDirectory()).map((f) => ({ name: f.name, priority: 90, context: { templateType: "filepaths" } }));
 };
-const foldersTemplate = async () => {
-    const files = await fsAsync.readdir(process.cwd(), { withFileTypes: true });
-    return files.filter((f) => f.isDirectory()).map((f) => ({ name: f.name, priority: 90 }));
+const foldersTemplate = async (cwd) => {
+    const files = await fsAsync.readdir(cwd, { withFileTypes: true });
+    return files.filter((f) => f.isDirectory()).map((f) => ({ name: f.name, priority: 90, context: { templateType: "folders" } }));
 };
 // TODO: implement history template
 const historyTemplate = () => {
@@ -18,18 +18,24 @@ const historyTemplate = () => {
 const helpTemplate = () => {
     return [];
 };
-export const runTemplates = async (template) => {
+export const runTemplates = async (template, cwd) => {
     const templates = template instanceof Array ? template : [template];
     return (await Promise.all(templates.map(async (t) => {
-        switch (t) {
-            case "filepaths":
-                return await filepathsTemplate();
-            case "folders":
-                return await foldersTemplate();
-            case "history":
-                return historyTemplate();
-            case "help":
-                return helpTemplate();
+        try {
+            switch (t) {
+                case "filepaths":
+                    return await filepathsTemplate(cwd);
+                case "folders":
+                    return await foldersTemplate(cwd);
+                case "history":
+                    return historyTemplate();
+                case "help":
+                    return helpTemplate();
+            }
+        }
+        catch (e) {
+            log.debug({ msg: "template failed", e, template: t, cwd });
+            return [];
         }
     }))).flat();
 };

package/build/runtime/utils.js

@@ -1,22 +1,52 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import { exec, spawn } from "node:child_process";
-export const buildExecuteShellCommand = (timeout) => 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars -- TODO: use cwd in the future
-async (command, cwd) => {
-    return new Promise((resolve) => {
-        exec(command, { timeout }, (_, stdout, stderr) => {
-            resolve(stdout || stderr);
-        });
+import path from "node:path";
+import { spawn } from "node:child_process";
+import fsAsync from "node:fs/promises";
+import { Shell } from "../utils/shell.js";
+import log from "../utils/log.js";
+export const buildExecuteShellCommand = (timeout) => async ({ command, env, args, cwd }) => {
+    const child = spawn(command, args, { cwd, env });
+    setTimeout(() => child.kill("SIGKILL"), timeout);
+    let stdout = "";
+    let stderr = "";
+    child.stdout.on("data", (data) => (stdout += data));
+    child.stderr.on("data", (data) => (stderr += data));
+    child.on("error", (err) => {
+        log.debug({ msg: "shell command failed", e: err.message });
     });
-};
-export const executeShellCommandTTY = async (shell, command) => {
-    const child = spawn(shell, ["-c", command.trim()], { stdio: "inherit" });
     return new Promise((resolve) => {
         child.on("close", (code) => {
             resolve({
-                code,
+                status: code ?? 0,
+                stderr,
+                stdout,
             });
         });
     });
 };
+export const resolveCwd = async (cmdToken, cwd, shell) => {
+    if (cmdToken == null)
+        return { cwd, pathy: false, complete: false };
+    const { token } = cmdToken;
+    const sep = shell == Shell.Bash ? "/" : path.sep;
+    if (!token.includes(sep))
+        return { cwd, pathy: false, complete: false };
+    const resolvedCwd = path.isAbsolute(token) ? token : path.join(cwd, token);
+    try {
+        await fsAsync.access(resolvedCwd, fsAsync.constants.R_OK);
+        return { cwd: resolvedCwd, pathy: true, complete: token.endsWith(sep) };
+    }
+    catch {
+        // fallback to the parent folder if possible
+        const baselessCwd = resolvedCwd.substring(0, resolvedCwd.length - path.basename(resolvedCwd).length);
+        try {
+            await fsAsync.access(baselessCwd, fsAsync.constants.R_OK);
+            return { cwd: baselessCwd, pathy: true, complete: token.endsWith(sep) };
+        }
+        catch {
+            /*empty*/
+        }
+        return { cwd, pathy: false, complete: false };
+    }
+};

package/build/ui/input.js

@@ -1,55 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
-import React, { useState, useEffect } from "react";
-import { useInput, Text } from "ink";
-import chalk from "chalk";
-const BlinkSpeed = 530;
-const CursorColor = "#FFFFFF";
-export default function Input({ value, setValue, prompt, activeSuggestion, tabCompletionDropSize, }) {
-    const [cursorLocation, setCursorLocation] = useState(value.length);
-    const [cursorBlink, setCursorBlink] = useState(true);
-    useEffect(() => {
-        setTimeout(() => {
-            setCursorBlink(!cursorBlink);
-        }, BlinkSpeed);
-    }, [cursorBlink]);
-    // TODO: arrow key navigation shortcuts (emacs & vim modes)
-    useInput((input, key) => {
-        // TODO: handle delete better on unix systems: https://github.com/vadimdemedes/ink/issues/634
-        const windows = process.platform === "win32";
-        const backspaceKey = windows ? key.backspace : key.backspace || key.delete;
-        const deleteKey = windows ? key.delete : false;
-        if (backspaceKey) {
-            setValue([...value].slice(0, Math.max(cursorLocation - 1, 0)).join("") + [...value].slice(cursorLocation).join(""));
-            setCursorLocation(Math.max(cursorLocation - 1, 0));
-        }
-        else if (deleteKey) {
-            setValue([...value].slice(0, cursorLocation).join("") + [...value].slice(Math.min(value.length, cursorLocation + 1)).join(""));
-        }
-        else if (key.leftArrow) {
-            setCursorLocation(Math.max(cursorLocation - 1, 0));
-        }
-        else if (key.rightArrow) {
-            setCursorLocation(Math.min(cursorLocation + 1, value.length));
-        }
-        else if (key.tab) {
-            if (activeSuggestion) {
-                // TOOD: support insertValue
-                const newValue = [...value].slice(0, cursorLocation - tabCompletionDropSize).join("") + activeSuggestion.name + " ";
-                setValue(newValue);
-                setCursorLocation(newValue.length);
-            }
-        }
-        else if (input) {
-            setValue([...value].slice(0, cursorLocation).join("") + input + [...value].slice(cursorLocation).join(""));
-            setCursorLocation(cursorLocation + input.length);
-        }
-    });
-    const cursoredCommand = value + " ";
-    const cursoredText = [...cursoredCommand].slice(0, cursorLocation).join("") +
-        (cursorBlink ? chalk.bgHex(CursorColor).inverse([...cursoredCommand].at(cursorLocation)) : [...cursoredCommand].at(cursorLocation)) +
-        [...cursoredCommand].slice(cursorLocation + 1).join("");
-    return (React.createElement(Text, null,
-        prompt,
-        cursoredText));
-}
+export const inputModifier = (input) => {
+    switch (input.toString()) {
+        case "\b":
+            return "\u007F"; // DEL
+    }
+    return input.toString();
+};