@microsoft/inshellisense 0.0.1-rc.3 → 0.0.1-rc.31

package/LICENSE

@@ -1,21 +1,21 @@
-    MIT License
-
-    Copyright (c) Microsoft Corporation.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE
+    MIT License
+
+    Copyright (c) Microsoft Corporation.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+    of this software and associated documentation files (the "Software"), to deal
+    in the Software without restriction, including without limitation the rights
+    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+    copies of the Software, and to permit persons to whom the Software is
+    furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all
+    copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+    SOFTWARE

package/README.md

@@ -1,29 +1,84 @@
 # inshellisense
 
-`inshellisense` provides IDE style autocomplete for shells. It's a terminal native runtime for [autocomplete](https://github.com/withfig/autocomplete) which has support for 600+ command line tools. `inshellisense` supports Windows, Linux, & MacOS.
+`inshellisense` provides IDE style autocomplete for shells. It's a terminal native runtime for [autocomplete](https://github.com/withfig/autocomplete) which has support for 600+ command line tools. `inshellisense` supports Windows, Linux, & macOS.
 
-<p align="center"><img alt="demo of inshellisense working" src="/docs/demo.gif" height="450px"/></p>
+<p align="center"><img alt="demo of inshellisense working" src="/docs/demo.gif"/></p>
 
 ## Getting Started
 
-### Requirements
-- `node >= 16.x`
-
 ### Installation
 
+**npm (recommended)**
 ```shell
 npm install -g @microsoft/inshellisense
+is init
+```
+**homebrew (macOS/linux)**
+```shell
+brew tap microsoft/inshellisense https://github.com/microsoft/inshellisense
+brew install inshellisense
+is init
+```
+
+### Updating
+
+```shell
+npm install -g @microsoft/inshellisense # OR brew upgrade inshellisense
+is reinit
 ```
 
 ### Quickstart
 
-After completing the installation, you can already run `inshellisense --shell <shell>` to start the autocomplete session for your desired shell. Additionally, you can bind `inshellisense` to a keybinding of `CTRL+a` by running the below command. This brings the added advantages of automatically starting the autocomplete session with your current shell and injecting any accepted command into your shell's history.
+After completing the installation, run `is doctor` to verify your installation was successful. You can run `is` to start the autocomplete session for your desired shell. Additionally, inshellisense is also aliased under `inshellisense` after installation.
+
+### Shell Plugin
+
+If you'd like to automatically start inshellisense when you open your shell, run the respective command for your shell. After running the command, inshellisense will automatically open when you start any new shell session:
 
 ```shell
-inshellisense bind
+# bash
+is init bash >> ~/.bashrc
+
+# zsh
+is init zsh >> ~/.zshrc
+
+# fish
+is init fish >> ~/.config/fish/config.fish
+
+# pwsh
+is init pwsh | Add-Content $profile
+
+# powershell
+is init powershell | Add-Content $profile
+
+# xonsh
+is init xonsh >> ~/.xonshrc
+
+# nushell
+is init nu | save $nu.env-path --append
 ```
 
-Additionally, inshellisense is also aliased under `is` after install for convenience.
+> [!NOTE]  
+> When updating your shell configuration in the future, make sure the inshellisense plugin is the last command in the file. Including commands after it may break the configuration (ex. initializing your shell plugin manager after the inshellisense plugin)
+
+### Usage
+
+| Action                                | Command | Description                                      |
+| ------------------------------------- | ------- | ------------------------------------------------ |
+| Start                                 | `is`    | Start inshellisense session on the current shell |
+| Stop                                  | `exit`  | Stop inshellisense session on the current shell  |
+| Check If Inside Inshellisense Session | `is -c` | Check if shell inside inshellisense session      |
+
+#### Keybindings
+
+All other keys are passed through to the shell. The keybindings below are only captured when the inshellisense suggestions are visible, otherwise they are passed through to the shell as well. These can be customized in the [config](#configuration).
+
+| Action                    | Keybinding     |
+| ------------------------- | -------------- |
+| Accept Current Suggestion | <kbd>tab</kbd> |
+| View Next Suggestion      | <kbd>↓</kbd>   |
+| View Previous Suggestion  | <kbd>↑</kbd>   |
+| Dismiss Suggestions       | <kbd>esc</kbd> |
 
 ## Integrations
 
@@ -34,6 +89,56 @@ inshellisense supports the following shells:
 - [fish](https://github.com/fish-shell/fish-shell)
 - [pwsh](https://github.com/PowerShell/PowerShell)
 - [powershell](https://learn.microsoft.com/en-us/powershell/scripting/windows-powershell/starting-windows-powershell) (Windows Powershell)
+- [cmd](https://learn.microsoft.com/en-us/windows-server/administration/windows-commands/cmd) _(experimental)_
+- [xonsh](https://xon.sh/)
+- [nushell](https://www.nushell.sh/)
+
+## Configuration
+
+All configuration is done through a [toml](https://toml.io/) file. You can create this file at `~/.inshellisenserc` or, for XDG compliance, at `~/.config/inshellisense/rc.toml`. The [JSON schema](https://json-schema.org/) for the configuration file can be found [here](https://github.com/microsoft/inshellisense/blob/main/src/utils/config.ts).
+
+### Keybindings
+
+You can customize the keybindings for inshellisense by adding a `bindings` section to your config file. The following is the default configuration for the [keybindings](#keybindings):
+
+```toml
+[bindings.acceptSuggestion]
+key = "tab"
+# shift and ctrl are optional and default to false
+shift = false
+ctrl = false
+
+[bindings.nextSuggestion]
+key = "down"
+
+[bindings.previousSuggestion]
+key = "up"
+
+[bindings.dismissSuggestions]
+key = "escape"
+```
+
+Key names are matched against the Node.js [keypress](https://nodejs.org/api/readline.html#readlineemitkeypresseventsstream-interface) events.
+
+### Alias Expansion
+
+Inshellisense supports expanding aliases for bash/zsh shells. You can enable alias expansion in your config file:
+
+```toml
+useAliases = true
+```
+
+### NerdFonts
+
+If you are using a [NerdFont](https://www.nerdfonts.com/) patched font, you can enable the NerdFonts support in your config file:
+
+```toml
+useNerdFont = true
+```
+
+## Unsupported Specs
+
+Specs for the `az`, `gcloud`, & `aws` CLIs are not supported in inshellisense due to their large size.
 
 ## Contributing
 

package/SECURITY.md

@@ -1,41 +1,41 @@
-<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
-
-## Security
-
-Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
-
-If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
-
-## Reporting Security Issues
-
-**Please do not report security vulnerabilities through public GitHub issues.**
-
-Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
-
-If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
-
-You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
-
-Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
-
-  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
-  * Full paths of source file(s) related to the manifestation of the issue
-  * The location of the affected source code (tag/branch/commit or direct URL)
-  * Any special configuration required to reproduce the issue
-  * Step-by-step instructions to reproduce the issue
-  * Proof-of-concept or exploit code (if possible)
-  * Impact of the issue, including how an attacker might exploit the issue
-
-This information will help us triage your report more quickly.
-
-If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
-
-## Preferred Languages
-
-We prefer all communications to be in English.
-
-## Policy
-
-Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
-
-<!-- END MICROSOFT SECURITY.MD BLOCK -->
+<!-- BEGIN MICROSOFT SECURITY.MD V0.0.9 BLOCK -->
+
+## Security
+
+Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet) and [Xamarin](https://github.com/xamarin).
+
+If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/security.md/definition), please report it to us as described below.
+
+## Reporting Security Issues
+
+**Please do not report security vulnerabilities through public GitHub issues.**
+
+Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/security.md/msrc/create-report).
+
+If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com).  If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/security.md/msrc/pgp).
+
+You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://www.microsoft.com/msrc). 
+
+Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
+
+  * Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
+  * Full paths of source file(s) related to the manifestation of the issue
+  * The location of the affected source code (tag/branch/commit or direct URL)
+  * Any special configuration required to reproduce the issue
+  * Step-by-step instructions to reproduce the issue
+  * Proof-of-concept or exploit code (if possible)
+  * Impact of the issue, including how an attacker might exploit the issue
+
+This information will help us triage your report more quickly.
+
+If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs.
+
+## Preferred Languages
+
+We prefer all communications to be in English.
+
+## Policy
+
+Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/security.md/cvd).
+
+<!-- END MICROSOFT SECURITY.MD BLOCK -->

package/bin.js

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+const { spawnSync } = require("child_process");
+const path = require("path");
+
+const platform = process.platform;
+const arch = process.arch;
+
+const platformArch = `${platform}-${arch}`;
+const packageName = `@microsoft/inshellisense-${platformArch}`;
+const binaryName = platform === "win32" ? `inshellisense-${platformArch}.exe` : `inshellisense-${platformArch}`;
+
+try {
+  const platformPkgPath = require.resolve(`${packageName}/package.json`);
+  const platformPkgDir = path.dirname(platformPkgPath);
+  const binaryPath = path.join(platformPkgDir, binaryName);
+
+  const result = spawnSync(binaryPath, process.argv.slice(2), {
+    stdio: "inherit",
+    shell: false,
+  });
+
+  process.exit(result.status ?? 1);
+} catch (err) {
+  console.error(`inshellisense: Platform ${platformArch} is not supported.`);
+  console.error(err.message);
+  process.exit(1);
+}

package/package.json

@@ -1,25 +1,8 @@
 {
   "name": "@microsoft/inshellisense",
-  "version": "0.0.1-rc.3",
+  "version": "0.0.1-rc.31",
   "description": "IDE style command line auto complete",
-  "type": "module",
-  "bin": {
-    "inshellisense": "./build/index.js",
-    "is": "./build/index.js"
-  },
-  "files": [
-    "build/**",
-    "shell/**",
-    "*.md",
-    "LICENSE"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "start": "node ./build/index.js",
-    "test": "node --experimental-vm-modules node_modules/jest/bin/jest.js",
-    "lint": "eslint src/ --ext .ts,.tsx && prettier src/ --check",
-    "lint:fix": "eslint src/ --ext .ts,.tsx --fix && prettier src/ --write"
-  },
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/microsoft/inshellisense.git"
@@ -27,33 +10,24 @@
   "author": {
     "name": "Microsoft Corporation"
   },
-  "license": "MIT",
   "bugs": {
     "url": "https://github.com/microsoft/inshellisense/issues"
   },
-  "homepage": "https://github.com/microsoft/inshellisense#readme",
-  "dependencies": {
-    "@withfig/autocomplete": "^2.633.0",
-    "chalk": "^5.3.0",
-    "commander": "^11.0.0",
-    "ink": "^4.4.1",
-    "react": "^18.2.0",
-    "wrap-ansi": "^8.1.0"
+  "bin": {
+    "is": "bin.js",
+    "inshellisense": "bin.js"
   },
-  "devDependencies": {
-    "@tsconfig/node18": "^18.2.2",
-    "@types/jest": "^29.5.5",
-    "@types/react": "^18.2.24",
-    "@typescript-eslint/eslint-plugin": "^6.7.4",
-    "@typescript-eslint/parser": "^6.7.4",
-    "@withfig/autocomplete-types": "^1.28.0",
-    "eslint": "^8.51.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-header": "^3.1.1",
-    "eslint-plugin-react": "^7.33.2",
-    "jest": "^29.7.0",
-    "prettier": "3.0.3",
-    "ts-jest": "^29.1.1",
-    "typescript": "^5.2.2"
+  "files": [
+    "*.md",
+    "LICENSE",
+    "bin.js"
+  ],
+  "optionalDependencies": {
+    "@microsoft/inshellisense-darwin-x64": "0.0.1-rc.31",
+    "@microsoft/inshellisense-darwin-arm64": "0.0.1-rc.31",
+    "@microsoft/inshellisense-linux-x64": "0.0.1-rc.31",
+    "@microsoft/inshellisense-linux-arm64": "0.0.1-rc.31",
+    "@microsoft/inshellisense-win32-x64": "0.0.1-rc.31",
+    "@microsoft/inshellisense-win32-arm64": "0.0.1-rc.31"
   }
-}
+}

package/build/commands/bind.js

@@ -1,12 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { Command } from "commander";
-import { supportedShells } from "../utils/bindings.js";
-import { render } from "../ui/ui-bind.js";
-const action = async () => {
-    await render();
-};
-const cmd = new Command("bind");
-cmd.description(`adds keybindings to the selected shell: ${supportedShells.join(", ")}`);
-cmd.action(action);
-export default cmd;

package/build/commands/root.js

@@ -1,40 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-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";
-export const supportedShells = shells.join(", ");
-export const action = async (options) => {
-    if (options.history) {
-        process.stdout.write(await loadCommand());
-        process.exit(0);
-    }
-    const shell = options.shell ?? "";
-    if (!shells.map((s) => s.valueOf()).includes(shell)) {
-        console.error(`Unsupported shell: '${shell}', supported shells: ${supportedShells}`);
-        process.exit(1);
-    }
-    let executed = false;
-    const commands = [];
-    let result = { code: 0 };
-    let startingCommand = options.command;
-    while (options.duration === "session" || !executed) {
-        const commandToExecute = await render(startingCommand);
-        if (commandToExecute == null || commandToExecute.trim().toLowerCase() == "exit" || commandToExecute.trim().toLowerCase() == "logout") {
-            result = { code: 0 };
-            break;
-        }
-        commands.push(commandToExecute);
-        result = await executeShellCommandTTY(shell, commandToExecute);
-        executed = true;
-        startingCommand = undefined;
-    }
-    await saveCommand(commands);
-    if (result.code) {
-        process.exit(result.code);
-    }
-    else {
-        process.exit(0);
-    }
-};

package/build/commands/uninstall.js

@@ -1,11 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { Command } from "commander";
-import { render } from "../ui/ui-uninstall.js";
-const action = async () => {
-    await render();
-};
-const cmd = new Command("uninstall");
-cmd.description(`removes all bindings and configuration for inshellisense`);
-cmd.action(action);
-export default cmd;

package/build/index.js

@@ -1,22 +0,0 @@
-#!/usr/bin/env node
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-/* eslint-disable header/header */
-import { Command } from "commander";
-import bind from "./commands/bind.js";
-import uninstall from "./commands/uninstall.js";
-import { action, supportedShells } from "./commands/root.js";
-import { getVersion } from "./utils/version.js";
-const program = new Command();
-program
-    .name("inshellisense")
-    .description("IDE style command line auto complete")
-    .version(await getVersion(), "-v, --version", "output the current version")
-    .option("-s, --shell <shell>", `shell to use for command execution, supported shells: ${supportedShells}`)
-    .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);
-program.addCommand(bind);
-program.addCommand(uninstall);
-program.parse();

package/build/runtime/generator.js

@@ -1,42 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-import { runTemplates } from "./template.js";
-import { buildExecuteShellCommand } from "./utils.js";
-const getGeneratorContext = () => {
-    return {
-        environmentVariables: Object.fromEntries(Object.entries(process.env).filter((entry) => entry[1] != null)),
-        currentWorkingDirectory: process.cwd(),
-        currentProcess: "",
-        sshPrefix: "",
-        isDangerous: false,
-        searchTerm: "", // TODO: define search term
-    };
-};
-// TODO: add support for caching, trigger, & getQueryTerm
-export const runGenerator = async (generator, tokens) => {
-    const { script, postProcess, scriptTimeout, splitOn, custom, template } = generator;
-    const executeShellCommand = buildExecuteShellCommand(scriptTimeout ?? 5000);
-    const suggestions = [];
-    try {
-        if (script) {
-            const scriptOutput = typeof script === "function" ? script(tokens) : script != null ? await executeShellCommand(script) : "";
-            if (postProcess) {
-                suggestions.push(...postProcess(scriptOutput, tokens));
-            }
-            else if (splitOn) {
-                suggestions.push(...scriptOutput.split(splitOn).map((s) => ({ name: s })));
-            }
-        }
-        if (custom) {
-            suggestions.push(...(await custom(tokens, executeShellCommand, getGeneratorContext())));
-        }
-        if (template != null) {
-            suggestions.push(...(await runTemplates(template)));
-        }
-        return suggestions;
-    }
-    catch (e) {
-        /* empty */
-    }
-    return suggestions;
-};

package/build/runtime/model.js

@@ -1,3 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-export {};

package/build/runtime/parser.js

@@ -1,63 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-const cmdDelim = /(\|\|)|(&&)|(;)/;
-const spaceRegex = /\s/;
-export const parseCommand = (command) => {
-    const lastCommand = command.split(cmdDelim).at(-1)?.trimStart();
-    return lastCommand ? lex(lastCommand) : [];
-};
-const lex = (command) => {
-    const tokens = [];
-    let [readingQuotedString, readingFlag, readingCmd] = [false, false, false];
-    let readingIdx = 0;
-    let readingQuoteChar = "";
-    [...command].forEach((char, idx) => {
-        const reading = readingQuotedString || readingFlag || readingCmd;
-        if (!reading && (char === `'` || char === `"`)) {
-            [readingQuotedString, readingIdx, readingQuoteChar] = [true, idx, char];
-            return;
-        }
-        else if (!reading && char === `-`) {
-            [readingFlag, readingIdx] = [true, idx];
-            return;
-        }
-        else if (!reading && !spaceRegex.test(char)) {
-            [readingCmd, readingIdx] = [true, idx];
-            return;
-        }
-        if (readingQuotedString && char === readingQuoteChar && command.at(idx - 1) !== "\\") {
-            readingQuotedString = false;
-            const complete = idx + 1 < command.length && spaceRegex.test(command[idx + 1]);
-            tokens.push({
-                token: command.slice(readingIdx, idx + 1),
-                complete,
-                isOption: false,
-            });
-        }
-        else if ((readingFlag && spaceRegex.test(char)) || char === "=") {
-            readingFlag = false;
-            tokens.push({
-                token: command.slice(readingIdx, idx),
-                complete: true,
-                isOption: true,
-            });
-        }
-        else if (readingCmd && spaceRegex.test(char)) {
-            readingCmd = false;
-            tokens.push({
-                token: command.slice(readingIdx, idx),
-                complete: true,
-                isOption: false,
-            });
-        }
-    });
-    const reading = readingQuotedString || readingFlag || readingCmd;
-    if (reading) {
-        tokens.push({
-            token: command.slice(readingIdx),
-            complete: false,
-            isOption: false,
-        });
-    }
-    return tokens;
-};