@ts-dev-tools/core 1.12.1 → 1.12.2

package/dist/services/package-manager/YarnPackageManagerAdapter.js

@@ -1,199 +1,90 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YarnPackageManagerAdapter = void 0;
-var path_1 = require("path");
-var AbstractPackageManagerAdapter_1 = require("./AbstractPackageManagerAdapter");
-var PackageManagerType_1 = require("./PackageManagerType");
-var YarnPackageManagerAdapter = /** @class */ (function (_super) {
-    __extends(YarnPackageManagerAdapter, _super);
-    function YarnPackageManagerAdapter() {
-        return _super !== null && _super.apply(this, arguments) || this;
+const path_1 = require("path");
+const AbstractPackageManagerAdapter_1 = require("./AbstractPackageManagerAdapter");
+const PackageManagerType_1 = require("./PackageManagerType");
+class YarnPackageManagerAdapter extends AbstractPackageManagerAdapter_1.AbstractPackageManagerAdapter {
+    async addDevPackage(packageName, dirPath) {
+        const isMonorepo = await this.isMonorepo(dirPath);
+        const { major } = await this.getVersion(PackageManagerType_1.PackageManagerType.yarn, dirPath);
+        const args = ["yarn", "add", "--dev"];
+        if (isMonorepo) {
+            args.push(major >= 2 ? "-W" : "--ignore-workspace-root-check");
+        }
+        args.push(packageName);
+        try {
+            await this.execCommand(args, dirPath, true);
+        }
+        catch (error) {
+            if (isMonorepo && typeof error === "string" && error.includes("Unsupported option name")) {
+                const retryArgs = args
+                    .filter((arg) => arg !== "--ignore-workspace-root-check" && arg !== "-W")
+                    .concat(major >= 2 ? "--ignore-workspace-root-check" : "-W");
+                await this.execCommand(retryArgs, dirPath, true);
+                return;
+            }
+            throw error;
+        }
     }
-    YarnPackageManagerAdapter.prototype.addDevPackage = function (packageName, dirPath) {
-        return __awaiter(this, void 0, void 0, function () {
-            var isMonorepo, major, args, error_1, retryArgs;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.isMonorepo(dirPath)];
-                    case 1:
-                        isMonorepo = _a.sent();
-                        return [4 /*yield*/, this.getVersion(PackageManagerType_1.PackageManagerType.yarn, dirPath)];
-                    case 2:
-                        major = (_a.sent()).major;
-                        args = ["yarn", "add", "--dev"];
-                        if (isMonorepo) {
-                            args.push(major >= 2 ? "-W" : "--ignore-workspace-root-check");
-                        }
-                        args.push(packageName);
-                        _a.label = 3;
-                    case 3:
-                        _a.trys.push([3, 5, , 8]);
-                        return [4 /*yield*/, this.execCommand(args, dirPath, true)];
-                    case 4:
-                        _a.sent();
-                        return [3 /*break*/, 8];
-                    case 5:
-                        error_1 = _a.sent();
-                        if (!(isMonorepo && typeof error_1 === "string" && error_1.includes("Unsupported option name"))) return [3 /*break*/, 7];
-                        retryArgs = args
-                            .filter(function (arg) { return arg !== "--ignore-workspace-root-check" && arg !== "-W"; })
-                            .concat(major >= 2 ? "--ignore-workspace-root-check" : "-W");
-                        return [4 /*yield*/, this.execCommand(retryArgs, dirPath, true)];
-                    case 6:
-                        _a.sent();
-                        return [2 /*return*/];
-                    case 7: throw error_1;
-                    case 8: return [2 /*return*/];
+    async isMonorepo(dirPath) {
+        const { major } = await this.getVersion(PackageManagerType_1.PackageManagerType.yarn, dirPath);
+        const primary = major >= 2 ? "list" : "info";
+        const fallback = primary === "list" ? "info" : "list";
+        const yarnCommands = [
+            ["yarn", "workspaces", primary, "--json"],
+            ["yarn", "workspaces", fallback, "--json"],
+        ];
+        let lastOutput;
+        let hasRecognizedOutput = false;
+        let hasSuccessfulCommand = false;
+        for (const args of yarnCommands) {
+            try {
+                const output = await this.execCommand(args, dirPath, true);
+                hasSuccessfulCommand = true;
+                lastOutput = output;
+                const analysis = this.analyzeYarnWorkspacesOutput(output);
+                if (analysis.hasEntries) {
+                    return true;
                 }
-            });
-        });
-    };
-    YarnPackageManagerAdapter.prototype.isMonorepo = function (dirPath) {
-        return __awaiter(this, void 0, void 0, function () {
-            var major, primary, fallback, yarnCommands, lastOutput, hasRecognizedOutput, hasSuccessfulCommand, _i, yarnCommands_1, args, output, analysis, _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.getVersion(PackageManagerType_1.PackageManagerType.yarn, dirPath)];
-                    case 1:
-                        major = (_b.sent()).major;
-                        primary = major >= 2 ? "list" : "info";
-                        fallback = primary === "list" ? "info" : "list";
-                        yarnCommands = [
-                            ["yarn", "workspaces", primary, "--json"],
-                            ["yarn", "workspaces", fallback, "--json"],
-                        ];
-                        hasRecognizedOutput = false;
-                        hasSuccessfulCommand = false;
-                        _i = 0, yarnCommands_1 = yarnCommands;
-                        _b.label = 2;
-                    case 2:
-                        if (!(_i < yarnCommands_1.length)) return [3 /*break*/, 7];
-                        args = yarnCommands_1[_i];
-                        _b.label = 3;
-                    case 3:
-                        _b.trys.push([3, 5, , 6]);
-                        return [4 /*yield*/, this.execCommand(args, dirPath, true)];
-                    case 4:
-                        output = _b.sent();
-                        hasSuccessfulCommand = true;
-                        lastOutput = output;
-                        analysis = this.analyzeYarnWorkspacesOutput(output);
-                        if (analysis.hasEntries) {
-                            return [2 /*return*/, true];
-                        }
-                        if (analysis.hasRecognizedData) {
-                            hasRecognizedOutput = true;
-                        }
-                        return [3 /*break*/, 6];
-                    case 5:
-                        _a = _b.sent();
-                        return [3 /*break*/, 6];
-                    case 6:
-                        _i++;
-                        return [3 /*break*/, 2];
-                    case 7:
-                        if (hasSuccessfulCommand && !hasRecognizedOutput) {
-                            throw new Error("Unexpected output from \"yarn workspaces\": ".concat(lastOutput !== null && lastOutput !== void 0 ? lastOutput : "<empty>"));
-                        }
-                        return [2 /*return*/, false];
-                }
-            });
-        });
-    };
-    YarnPackageManagerAdapter.prototype.isPackageInstalled = function (packageName, dirPath) {
-        return __awaiter(this, void 0, void 0, function () {
-            var output, _a, output, _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _c.trys.push([0, 2, , 3]);
-                        return [4 /*yield*/, this.execCommand(["yarn", "list", "--depth=1", "--json", "--pattern", packageName], dirPath, true)];
-                    case 1:
-                        output = _c.sent();
-                        if (this.yarnListOutputHasPackage(output, packageName)) {
-                            return [2 /*return*/, true];
-                        }
-                        return [3 /*break*/, 3];
-                    case 2:
-                        _a = _c.sent();
-                        return [3 /*break*/, 3];
-                    case 3:
-                        _c.trys.push([3, 5, , 6]);
-                        return [4 /*yield*/, this.execCommand(["yarn", "why", "--json", packageName], dirPath, true)];
-                    case 4:
-                        output = _c.sent();
-                        return [2 /*return*/, this.yarnListOutputHasPackage(output, packageName)];
-                    case 5:
-                        _b = _c.sent();
-                        return [2 /*return*/, false];
-                    case 6: return [2 /*return*/];
+                if (analysis.hasRecognizedData) {
+                    hasRecognizedOutput = true;
                 }
-            });
-        });
-    };
-    YarnPackageManagerAdapter.prototype.getNodeModulesPath = function (dirPath) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, (0, path_1.join)(dirPath, "node_modules")];
-            });
-        });
-    };
-    YarnPackageManagerAdapter.prototype.analyzeYarnWorkspacesOutput = function (output) {
-        var _a;
-        var entries = this.parseJsonLines(output);
+            }
+            catch {
+                // Try next command
+            }
+        }
+        if (hasSuccessfulCommand && !hasRecognizedOutput) {
+            throw new Error(`Unexpected output from "yarn workspaces": ${lastOutput ?? "<empty>"}`);
+        }
+        return false;
+    }
+    async isPackageInstalled(packageName, dirPath) {
+        try {
+            const output = await this.execCommand(["yarn", "list", "--depth=1", "--json", "--pattern", packageName], dirPath, true);
+            if (this.yarnListOutputHasPackage(output, packageName)) {
+                return true;
+            }
+        }
+        catch {
+            // Fallback for Yarn versions that don't support `yarn list`
+        }
+        try {
+            const output = await this.execCommand(["yarn", "why", "--json", packageName], dirPath, true);
+            return this.yarnListOutputHasPackage(output, packageName);
+        }
+        catch {
+            return false;
+        }
+    }
+    async getNodeModulesPath(dirPath) {
+        return (0, path_1.join)(dirPath, "node_modules");
+    }
+    analyzeYarnWorkspacesOutput(output) {
+        let entries = this.parseJsonLines(output);
         if (entries.length === 0) {
-            var jsonBlock = this.extractJsonBlock(output);
+            const jsonBlock = this.extractJsonBlock(output);
             if (jsonBlock && typeof jsonBlock === "object") {
                 entries = [jsonBlock];
             }
@@ -201,26 +92,25 @@ var YarnPackageManagerAdapter = /** @class */ (function (_super) {
         if (entries.length === 0) {
             return { hasEntries: false, hasRecognizedData: false };
         }
-        var workspaceListCount = 0;
-        var hasRecognizedData = false;
-        for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
-            var entry = entries_1[_i];
+        let workspaceListCount = 0;
+        let hasRecognizedData = false;
+        for (const entry of entries) {
             if (!entry || typeof entry !== "object") {
                 continue;
             }
-            var type = entry.type;
+            const type = entry.type;
             if (type === "error" || type === "warning") {
                 continue;
             }
-            var data = (_a = entry.data) !== null && _a !== void 0 ? _a : entry;
-            var parsedData = this.parseMaybeJsonString(data);
+            const data = entry.data ?? entry;
+            const parsedData = this.parseMaybeJsonString(data);
             if (parsedData && typeof parsedData === "object") {
                 hasRecognizedData = true;
                 if (this.hasWorkspaceMap(parsedData)) {
-                    return { hasEntries: true, hasRecognizedData: hasRecognizedData };
+                    return { hasEntries: true, hasRecognizedData };
                 }
                 if (this.isWorkspaceInfoMap(parsedData)) {
-                    return { hasEntries: true, hasRecognizedData: hasRecognizedData };
+                    return { hasEntries: true, hasRecognizedData };
                 }
                 if (this.isWorkspaceListEntry(parsedData)) {
                     workspaceListCount += 1;
@@ -228,94 +118,91 @@ var YarnPackageManagerAdapter = /** @class */ (function (_super) {
             }
         }
         if (workspaceListCount > 0) {
-            return { hasEntries: true, hasRecognizedData: hasRecognizedData };
+            return { hasEntries: true, hasRecognizedData };
         }
-        return { hasEntries: false, hasRecognizedData: hasRecognizedData };
-    };
-    YarnPackageManagerAdapter.prototype.parseMaybeJsonString = function (value) {
+        return { hasEntries: false, hasRecognizedData };
+    }
+    parseMaybeJsonString(value) {
         if (typeof value !== "string") {
             return value;
         }
         try {
             return JSON.parse(value);
         }
-        catch (_a) {
+        catch {
             return undefined;
         }
-    };
-    YarnPackageManagerAdapter.prototype.extractJsonBlock = function (output) {
-        var start = output.indexOf("{");
-        var end = output.lastIndexOf("}");
+    }
+    extractJsonBlock(output) {
+        const start = output.indexOf("{");
+        const end = output.lastIndexOf("}");
         if (start === -1 || end === -1 || end <= start) {
             return undefined;
         }
-        var candidate = output.slice(start, end + 1).trim();
+        const candidate = output.slice(start, end + 1).trim();
         if (candidate.length === 0) {
             return undefined;
         }
         try {
             return JSON.parse(candidate);
         }
-        catch (_a) {
+        catch {
             return undefined;
         }
-    };
-    YarnPackageManagerAdapter.prototype.hasWorkspaceMap = function (value) {
+    }
+    hasWorkspaceMap(value) {
         if (!value || typeof value !== "object") {
             return false;
         }
-        var workspaces = value.workspaces;
+        const workspaces = value.workspaces;
         return !!workspaces && Object.keys(workspaces).length > 0;
-    };
-    YarnPackageManagerAdapter.prototype.isWorkspaceListEntry = function (value) {
+    }
+    isWorkspaceListEntry(value) {
         if (!value || typeof value !== "object") {
             return false;
         }
-        var entry = value;
+        const entry = value;
         return typeof entry.name === "string" && typeof entry.location === "string" && entry.location !== ".";
-    };
-    YarnPackageManagerAdapter.prototype.isWorkspaceInfoMap = function (value) {
+    }
+    isWorkspaceInfoMap(value) {
         if (!value || typeof value !== "object") {
             return false;
         }
-        var entries = Object.values(value);
+        const entries = Object.values(value);
         if (entries.length === 0) {
             return false;
         }
-        return entries.some(function (entry) {
+        return entries.some((entry) => {
             if (!entry || typeof entry !== "object") {
                 return false;
             }
-            var location = entry.location;
+            const location = entry.location;
             return typeof location === "string" && location.length > 0 && location !== ".";
         });
-    };
-    YarnPackageManagerAdapter.prototype.yarnListOutputHasPackage = function (output, packageName) {
-        var _a;
-        var entries = this.parseJsonLines(output);
-        for (var _i = 0, entries_2 = entries; _i < entries_2.length; _i++) {
-            var entry = entries_2[_i];
+    }
+    yarnListOutputHasPackage(output, packageName) {
+        const entries = this.parseJsonLines(output);
+        for (const entry of entries) {
             if (!entry || typeof entry !== "object") {
                 continue;
             }
-            var data = entry.data;
-            var trees = (_a = data === null || data === void 0 ? void 0 : data.trees) !== null && _a !== void 0 ? _a : entry.trees;
+            const data = entry.data;
+            const trees = data?.trees ?? entry.trees;
             if (!trees) {
-                var children = entry.children;
+                const children = entry.children;
                 if (children) {
-                    var childKeys = Object.keys(children);
-                    if (childKeys.some(function (key) { return key.startsWith(packageName + "@"); })) {
+                    const childKeys = Object.keys(children);
+                    if (childKeys.some((key) => key.startsWith(packageName + "@"))) {
                         return true;
                     }
                 }
                 continue;
             }
-            if (trees.some(function (tree) { return tree.name.startsWith(packageName + "@"); })) {
+            if (trees.some((tree) => tree.name.startsWith(packageName + "@"))) {
                 return true;
             }
         }
         return false;
-    };
-    return YarnPackageManagerAdapter;
-}(AbstractPackageManagerAdapter_1.AbstractPackageManagerAdapter));
+    }
+}
 exports.YarnPackageManagerAdapter = YarnPackageManagerAdapter;

package/dist/tests/cli.js

@@ -1,70 +1,25 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exec = exec;
 exports.safeExec = safeExec;
-var child_process_1 = require("child_process");
+const child_process_1 = require("child_process");
 function exec(cwd, cmd) {
-    return new Promise(function (resolve) {
-        (0, child_process_1.exec)(cmd, { cwd: cwd }, function (error, stdout, stderr) {
+    return new Promise((resolve) => {
+        (0, child_process_1.exec)(cmd, { cwd }, (error, stdout, stderr) => {
             resolve({
                 code: error && error.code ? error.code : 0,
-                error: error,
+                error,
                 stdout: stdout.trim(),
-                stderr: stderr,
+                stderr,
             });
         });
     });
 }
-function safeExec(cwd, cmd) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, code, stderr, stdout, error;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, exec(cwd, cmd)];
-                case 1:
-                    _a = _b.sent(), code = _a.code, stderr = _a.stderr, stdout = _a.stdout;
-                    if (code !== 0) {
-                        error = [stderr, stdout].filter(function (error) { return !!error; }).join("\n");
-                        throw new Error("An error occured while executing command \"".concat(cmd, "\": ").concat(error));
-                    }
-                    return [2 /*return*/, stdout];
-            }
-        });
-    });
+async function safeExec(cwd, cmd) {
+    const { code, stderr, stdout } = await exec(cwd, cmd);
+    if (code !== 0) {
+        const error = [stderr, stdout].filter((error) => !!error).join("\n");
+        throw new Error(`An error occured while executing command "${cmd}": ${error}`);
+    }
+    return stdout;
 }

package/dist/tests/console.js

@@ -4,7 +4,7 @@ exports.mockConsoleInfo = mockConsoleInfo;
 exports.resetMockedConsoleInfo = resetMockedConsoleInfo;
 exports.getConsoleInfoContent = getConsoleInfoContent;
 exports.stripAnsi = stripAnsi;
-var info = console.info;
+const info = console.info;
 function mockConsoleInfo() {
     console.info = jest.fn();
 }
@@ -12,15 +12,14 @@ function resetMockedConsoleInfo() {
     console.info = info;
 }
 function getConsoleInfoContent() {
-    var _a;
-    var calls = (_a = console.info) === null || _a === void 0 ? void 0 : _a.mock.calls;
+    const calls = console.info?.mock.calls;
     return calls.flat().join("\n");
 }
 function stripAnsi(input) {
     // Valid string terminator sequences are BEL, ESC\, and 0x9c
-    var ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
-    var pattern = [
-        "[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?".concat(ST, ")"),
+    const ST = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
+    const pattern = [
+        `[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?${ST})`,
         "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))",
     ].join("|");
     return input.replace(new RegExp(pattern, "g"), "");