diff --git a/.gitignore b/.gitignore index c73d68f2..d8ecee8e 100644 --- a/.gitignore +++ b/.gitignore @@ -40,7 +40,11 @@ node_modules # This is the Yarn install state cache, it can be rebuilt anytime /.yarn/install-state.gz -# IDE dir +# Editor files .idea +.run/ +.vim/ +*.iml +/.yarn/sdks/ dist diff --git a/.run/test-unit.run.xml b/.run/test-unit.run.xml deleted file mode 100644 index fcd84730..00000000 --- a/.run/test-unit.run.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json deleted file mode 100644 index 28b790db..00000000 --- a/.vim/coc-settings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "eslint.packageManager": "yarn", - "eslint.nodePath": ".yarn/sdks", - "workspace.workspaceFolderCheckCwd": false, - "tsserver.tsdk": ".yarn/sdks/typescript/lib" -} diff --git a/.yarn/sdks/eslint/bin/eslint.js b/.yarn/sdks/eslint/bin/eslint.js deleted file mode 100755 index e6604ff5..00000000 --- a/.yarn/sdks/eslint/bin/eslint.js +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint/bin/eslint.js - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint/bin/eslint.js your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint/bin/eslint.js`)); diff --git a/.yarn/sdks/eslint/lib/api.js b/.yarn/sdks/eslint/lib/api.js deleted file mode 100644 index 8addf97f..00000000 --- a/.yarn/sdks/eslint/lib/api.js +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint`)); diff --git a/.yarn/sdks/eslint/lib/types/index.d.ts b/.yarn/sdks/eslint/lib/types/index.d.ts deleted file mode 100644 index 19293d02..00000000 --- a/.yarn/sdks/eslint/lib/types/index.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint`)); diff --git a/.yarn/sdks/eslint/lib/types/rules/index.d.ts b/.yarn/sdks/eslint/lib/types/rules/index.d.ts deleted file mode 100644 index a4ae666c..00000000 --- a/.yarn/sdks/eslint/lib/types/rules/index.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint/rules - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint/rules your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint/rules`)); diff --git a/.yarn/sdks/eslint/lib/types/universal.d.ts b/.yarn/sdks/eslint/lib/types/universal.d.ts deleted file mode 100644 index 662b3f4f..00000000 --- a/.yarn/sdks/eslint/lib/types/universal.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint/universal - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint/universal your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint/universal`)); diff --git a/.yarn/sdks/eslint/lib/types/use-at-your-own-risk.d.ts b/.yarn/sdks/eslint/lib/types/use-at-your-own-risk.d.ts deleted file mode 100644 index 2e2ccca2..00000000 --- a/.yarn/sdks/eslint/lib/types/use-at-your-own-risk.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint/use-at-your-own-risk - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint/use-at-your-own-risk your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint/use-at-your-own-risk`)); diff --git a/.yarn/sdks/eslint/lib/universal.js b/.yarn/sdks/eslint/lib/universal.js deleted file mode 100644 index 85a8ccbc..00000000 --- a/.yarn/sdks/eslint/lib/universal.js +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint/universal - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint/universal your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint/universal`)); diff --git a/.yarn/sdks/eslint/lib/unsupported-api.js b/.yarn/sdks/eslint/lib/unsupported-api.js deleted file mode 100644 index c2b464ce..00000000 --- a/.yarn/sdks/eslint/lib/unsupported-api.js +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require eslint/use-at-your-own-risk - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real eslint/use-at-your-own-risk your application uses -module.exports = wrapWithUserWrapper(absRequire(`eslint/use-at-your-own-risk`)); diff --git a/.yarn/sdks/eslint/package.json b/.yarn/sdks/eslint/package.json deleted file mode 100644 index d52b60ae..00000000 --- a/.yarn/sdks/eslint/package.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "name": "eslint", - "version": "9.16.0-sdk", - "main": "./lib/api.js", - "type": "commonjs", - "bin": { - "eslint": "./bin/eslint.js" - }, - "exports": { - ".": { - "types": "./lib/types/index.d.ts", - "default": "./lib/api.js" - }, - "./package.json": "./package.json", - "./use-at-your-own-risk": { - "types": "./lib/types/use-at-your-own-risk.d.ts", - "default": "./lib/unsupported-api.js" - }, - "./rules": { - "types": "./lib/types/rules/index.d.ts" - }, - "./universal": { - "types": "./lib/types/universal.d.ts", - "default": "./lib/universal.js" - } - } -} diff --git a/.yarn/sdks/integrations.yml b/.yarn/sdks/integrations.yml deleted file mode 100644 index 7e42d188..00000000 --- a/.yarn/sdks/integrations.yml +++ /dev/null @@ -1,6 +0,0 @@ -# This file is automatically generated by @yarnpkg/sdks. -# Manual changes might be lost! - -integrations: - - vscode - - vim diff --git a/.yarn/sdks/typescript/bin/tsc b/.yarn/sdks/typescript/bin/tsc deleted file mode 100755 index 867a7bdf..00000000 --- a/.yarn/sdks/typescript/bin/tsc +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/bin/tsc - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real typescript/bin/tsc your application uses -module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsc`)); diff --git a/.yarn/sdks/typescript/bin/tsserver b/.yarn/sdks/typescript/bin/tsserver deleted file mode 100755 index 3fc5aa31..00000000 --- a/.yarn/sdks/typescript/bin/tsserver +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/bin/tsserver - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real typescript/bin/tsserver your application uses -module.exports = wrapWithUserWrapper(absRequire(`typescript/bin/tsserver`)); diff --git a/.yarn/sdks/typescript/lib/tsc.js b/.yarn/sdks/typescript/lib/tsc.js deleted file mode 100644 index da411bdb..00000000 --- a/.yarn/sdks/typescript/lib/tsc.js +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/lib/tsc.js - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real typescript/lib/tsc.js your application uses -module.exports = wrapWithUserWrapper(absRequire(`typescript/lib/tsc.js`)); diff --git a/.yarn/sdks/typescript/lib/tsserver.js b/.yarn/sdks/typescript/lib/tsserver.js deleted file mode 100644 index 6249c467..00000000 --- a/.yarn/sdks/typescript/lib/tsserver.js +++ /dev/null @@ -1,248 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/lib/tsserver.js - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -const moduleWrapper = exports => { - return wrapWithUserWrapper(moduleWrapperFn(exports)); -}; - -const moduleWrapperFn = tsserver => { - if (!process.versions.pnp) { - return tsserver; - } - - const {isAbsolute} = require(`path`); - const pnpApi = require(`pnpapi`); - - const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//); - const isPortal = str => str.startsWith("portal:/"); - const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`); - - const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => { - return `${locator.name}@${locator.reference}`; - })); - - // VSCode sends the zip paths to TS using the "zip://" prefix, that TS - // doesn't understand. This layer makes sure to remove the protocol - // before forwarding it to TS, and to add it back on all returned paths. - - function toEditorPath(str) { - // We add the `zip:` prefix to both `.zip/` paths and virtual paths - if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) { - // We also take the opportunity to turn virtual paths into physical ones; - // this makes it much easier to work with workspaces that list peer - // dependencies, since otherwise Ctrl+Click would bring us to the virtual - // file instances instead of the real ones. - // - // We only do this to modules owned by the the dependency tree roots. - // This avoids breaking the resolution when jumping inside a vendor - // with peer dep (otherwise jumping into react-dom would show resolution - // errors on react). - // - const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str; - if (resolved) { - const locator = pnpApi.findPackageLocator(resolved); - if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) { - str = resolved; - } - } - - str = normalize(str); - - if (str.match(/\.zip\//)) { - switch (hostInfo) { - // Absolute VSCode `Uri.fsPath`s need to start with a slash. - // VSCode only adds it automatically for supported schemes, - // so we have to do it manually for the `zip` scheme. - // The path needs to start with a caret otherwise VSCode doesn't handle the protocol - // - // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910 - // - // 2021-10-08: VSCode changed the format in 1.61. - // Before | ^zip:/c:/foo/bar.zip/package.json - // After | ^/zip//c:/foo/bar.zip/package.json - // - // 2022-04-06: VSCode changed the format in 1.66. - // Before | ^/zip//c:/foo/bar.zip/package.json - // After | ^/zip/c:/foo/bar.zip/package.json - // - // 2022-05-06: VSCode changed the format in 1.68 - // Before | ^/zip/c:/foo/bar.zip/package.json - // After | ^/zip//c:/foo/bar.zip/package.json - // - case `vscode <1.61`: { - str = `^zip:${str}`; - } break; - - case `vscode <1.66`: { - str = `^/zip/${str}`; - } break; - - case `vscode <1.68`: { - str = `^/zip${str}`; - } break; - - case `vscode`: { - str = `^/zip/${str}`; - } break; - - // To make "go to definition" work, - // We have to resolve the actual file system path from virtual path - // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip) - case `coc-nvim`: { - str = normalize(resolved).replace(/\.zip\//, `.zip::`); - str = resolve(`zipfile:${str}`); - } break; - - // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server) - // We have to resolve the actual file system path from virtual path, - // everything else is up to neovim - case `neovim`: { - str = normalize(resolved).replace(/\.zip\//, `.zip::`); - str = `zipfile://${str}`; - } break; - - default: { - str = `zip:${str}`; - } break; - } - } else { - str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`); - } - } - - return str; - } - - function fromEditorPath(str) { - switch (hostInfo) { - case `coc-nvim`: { - str = str.replace(/\.zip::/, `.zip/`); - // The path for coc-nvim is in format of //zipfile://.yarn/... - // So in order to convert it back, we use .* to match all the thing - // before `zipfile:` - return process.platform === `win32` - ? str.replace(/^.*zipfile:\//, ``) - : str.replace(/^.*zipfile:/, ``); - } break; - - case `neovim`: { - str = str.replace(/\.zip::/, `.zip/`); - // The path for neovim is in format of zipfile:////.yarn/... - return str.replace(/^zipfile:\/\//, ``); - } break; - - case `vscode`: - default: { - return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`) - } break; - } - } - - // Force enable 'allowLocalPluginLoads' - // TypeScript tries to resolve plugins using a path relative to itself - // which doesn't work when using the global cache - // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238 - // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but - // TypeScript already does local loads and if this code is running the user trusts the workspace - // https://github.com/microsoft/vscode/issues/45856 - const ConfiguredProject = tsserver.server.ConfiguredProject; - const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype; - ConfiguredProject.prototype.enablePluginsWithOptions = function() { - this.projectService.allowLocalPluginLoads = true; - return originalEnablePluginsWithOptions.apply(this, arguments); - }; - - // And here is the point where we hijack the VSCode <-> TS communications - // by adding ourselves in the middle. We locate everything that looks - // like an absolute path of ours and normalize it. - - const Session = tsserver.server.Session; - const {onMessage: originalOnMessage, send: originalSend} = Session.prototype; - let hostInfo = `unknown`; - - Object.assign(Session.prototype, { - onMessage(/** @type {string | object} */ message) { - const isStringMessage = typeof message === 'string'; - const parsedMessage = isStringMessage ? JSON.parse(message) : message; - - if ( - parsedMessage != null && - typeof parsedMessage === `object` && - parsedMessage.arguments && - typeof parsedMessage.arguments.hostInfo === `string` - ) { - hostInfo = parsedMessage.arguments.hostInfo; - if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) { - const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match( - // The RegExp from https://semver.org/ but without the caret at the start - /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/ - ) ?? []).map(Number) - - if (major === 1) { - if (minor < 61) { - hostInfo += ` <1.61`; - } else if (minor < 66) { - hostInfo += ` <1.66`; - } else if (minor < 68) { - hostInfo += ` <1.68`; - } - } - } - } - - const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => { - return typeof value === 'string' ? fromEditorPath(value) : value; - }); - - return originalOnMessage.call( - this, - isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON) - ); - }, - - send(/** @type {any} */ msg) { - return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => { - return typeof value === `string` ? toEditorPath(value) : value; - }))); - } - }); - - return tsserver; -}; - -const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10)); -// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well. -// Ref https://github.com/microsoft/TypeScript/pull/55326 -if (major > 5 || (major === 5 && minor >= 5)) { - moduleWrapper(absRequire(`typescript`)); -} - -// Defer to the real typescript/lib/tsserver.js your application uses -module.exports = moduleWrapper(absRequire(`typescript/lib/tsserver.js`)); diff --git a/.yarn/sdks/typescript/lib/tsserverlibrary.js b/.yarn/sdks/typescript/lib/tsserverlibrary.js deleted file mode 100644 index 0e50e0a2..00000000 --- a/.yarn/sdks/typescript/lib/tsserverlibrary.js +++ /dev/null @@ -1,248 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript/lib/tsserverlibrary.js - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -const moduleWrapper = exports => { - return wrapWithUserWrapper(moduleWrapperFn(exports)); -}; - -const moduleWrapperFn = tsserver => { - if (!process.versions.pnp) { - return tsserver; - } - - const {isAbsolute} = require(`path`); - const pnpApi = require(`pnpapi`); - - const isVirtual = str => str.match(/\/(\$\$virtual|__virtual__)\//); - const isPortal = str => str.startsWith("portal:/"); - const normalize = str => str.replace(/\\/g, `/`).replace(/^\/?/, `/`); - - const dependencyTreeRoots = new Set(pnpApi.getDependencyTreeRoots().map(locator => { - return `${locator.name}@${locator.reference}`; - })); - - // VSCode sends the zip paths to TS using the "zip://" prefix, that TS - // doesn't understand. This layer makes sure to remove the protocol - // before forwarding it to TS, and to add it back on all returned paths. - - function toEditorPath(str) { - // We add the `zip:` prefix to both `.zip/` paths and virtual paths - if (isAbsolute(str) && !str.match(/^\^?(zip:|\/zip\/)/) && (str.match(/\.zip\//) || isVirtual(str))) { - // We also take the opportunity to turn virtual paths into physical ones; - // this makes it much easier to work with workspaces that list peer - // dependencies, since otherwise Ctrl+Click would bring us to the virtual - // file instances instead of the real ones. - // - // We only do this to modules owned by the the dependency tree roots. - // This avoids breaking the resolution when jumping inside a vendor - // with peer dep (otherwise jumping into react-dom would show resolution - // errors on react). - // - const resolved = isVirtual(str) ? pnpApi.resolveVirtual(str) : str; - if (resolved) { - const locator = pnpApi.findPackageLocator(resolved); - if (locator && (dependencyTreeRoots.has(`${locator.name}@${locator.reference}`) || isPortal(locator.reference))) { - str = resolved; - } - } - - str = normalize(str); - - if (str.match(/\.zip\//)) { - switch (hostInfo) { - // Absolute VSCode `Uri.fsPath`s need to start with a slash. - // VSCode only adds it automatically for supported schemes, - // so we have to do it manually for the `zip` scheme. - // The path needs to start with a caret otherwise VSCode doesn't handle the protocol - // - // Ref: https://github.com/microsoft/vscode/issues/105014#issuecomment-686760910 - // - // 2021-10-08: VSCode changed the format in 1.61. - // Before | ^zip:/c:/foo/bar.zip/package.json - // After | ^/zip//c:/foo/bar.zip/package.json - // - // 2022-04-06: VSCode changed the format in 1.66. - // Before | ^/zip//c:/foo/bar.zip/package.json - // After | ^/zip/c:/foo/bar.zip/package.json - // - // 2022-05-06: VSCode changed the format in 1.68 - // Before | ^/zip/c:/foo/bar.zip/package.json - // After | ^/zip//c:/foo/bar.zip/package.json - // - case `vscode <1.61`: { - str = `^zip:${str}`; - } break; - - case `vscode <1.66`: { - str = `^/zip/${str}`; - } break; - - case `vscode <1.68`: { - str = `^/zip${str}`; - } break; - - case `vscode`: { - str = `^/zip/${str}`; - } break; - - // To make "go to definition" work, - // We have to resolve the actual file system path from virtual path - // and convert scheme to supported by [vim-rzip](https://github.com/lbrayner/vim-rzip) - case `coc-nvim`: { - str = normalize(resolved).replace(/\.zip\//, `.zip::`); - str = resolve(`zipfile:${str}`); - } break; - - // Support neovim native LSP and [typescript-language-server](https://github.com/theia-ide/typescript-language-server) - // We have to resolve the actual file system path from virtual path, - // everything else is up to neovim - case `neovim`: { - str = normalize(resolved).replace(/\.zip\//, `.zip::`); - str = `zipfile://${str}`; - } break; - - default: { - str = `zip:${str}`; - } break; - } - } else { - str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`); - } - } - - return str; - } - - function fromEditorPath(str) { - switch (hostInfo) { - case `coc-nvim`: { - str = str.replace(/\.zip::/, `.zip/`); - // The path for coc-nvim is in format of //zipfile://.yarn/... - // So in order to convert it back, we use .* to match all the thing - // before `zipfile:` - return process.platform === `win32` - ? str.replace(/^.*zipfile:\//, ``) - : str.replace(/^.*zipfile:/, ``); - } break; - - case `neovim`: { - str = str.replace(/\.zip::/, `.zip/`); - // The path for neovim is in format of zipfile:////.yarn/... - return str.replace(/^zipfile:\/\//, ``); - } break; - - case `vscode`: - default: { - return str.replace(/^\^?(zip:|\/zip(\/ts-nul-authority)?)\/+/, process.platform === `win32` ? `` : `/`) - } break; - } - } - - // Force enable 'allowLocalPluginLoads' - // TypeScript tries to resolve plugins using a path relative to itself - // which doesn't work when using the global cache - // https://github.com/microsoft/TypeScript/blob/1b57a0395e0bff191581c9606aab92832001de62/src/server/project.ts#L2238 - // VSCode doesn't want to enable 'allowLocalPluginLoads' due to security concerns but - // TypeScript already does local loads and if this code is running the user trusts the workspace - // https://github.com/microsoft/vscode/issues/45856 - const ConfiguredProject = tsserver.server.ConfiguredProject; - const {enablePluginsWithOptions: originalEnablePluginsWithOptions} = ConfiguredProject.prototype; - ConfiguredProject.prototype.enablePluginsWithOptions = function() { - this.projectService.allowLocalPluginLoads = true; - return originalEnablePluginsWithOptions.apply(this, arguments); - }; - - // And here is the point where we hijack the VSCode <-> TS communications - // by adding ourselves in the middle. We locate everything that looks - // like an absolute path of ours and normalize it. - - const Session = tsserver.server.Session; - const {onMessage: originalOnMessage, send: originalSend} = Session.prototype; - let hostInfo = `unknown`; - - Object.assign(Session.prototype, { - onMessage(/** @type {string | object} */ message) { - const isStringMessage = typeof message === 'string'; - const parsedMessage = isStringMessage ? JSON.parse(message) : message; - - if ( - parsedMessage != null && - typeof parsedMessage === `object` && - parsedMessage.arguments && - typeof parsedMessage.arguments.hostInfo === `string` - ) { - hostInfo = parsedMessage.arguments.hostInfo; - if (hostInfo === `vscode` && process.env.VSCODE_IPC_HOOK) { - const [, major, minor] = (process.env.VSCODE_IPC_HOOK.match( - // The RegExp from https://semver.org/ but without the caret at the start - /(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/ - ) ?? []).map(Number) - - if (major === 1) { - if (minor < 61) { - hostInfo += ` <1.61`; - } else if (minor < 66) { - hostInfo += ` <1.66`; - } else if (minor < 68) { - hostInfo += ` <1.68`; - } - } - } - } - - const processedMessageJSON = JSON.stringify(parsedMessage, (key, value) => { - return typeof value === 'string' ? fromEditorPath(value) : value; - }); - - return originalOnMessage.call( - this, - isStringMessage ? processedMessageJSON : JSON.parse(processedMessageJSON) - ); - }, - - send(/** @type {any} */ msg) { - return originalSend.call(this, JSON.parse(JSON.stringify(msg, (key, value) => { - return typeof value === `string` ? toEditorPath(value) : value; - }))); - } - }); - - return tsserver; -}; - -const [major, minor] = absRequire(`typescript/package.json`).version.split(`.`, 2).map(value => parseInt(value, 10)); -// In TypeScript@>=5.5 the tsserver uses the public TypeScript API so that needs to be patched as well. -// Ref https://github.com/microsoft/TypeScript/pull/55326 -if (major > 5 || (major === 5 && minor >= 5)) { - moduleWrapper(absRequire(`typescript`)); -} - -// Defer to the real typescript/lib/tsserverlibrary.js your application uses -module.exports = moduleWrapper(absRequire(`typescript/lib/tsserverlibrary.js`)); diff --git a/.yarn/sdks/typescript/lib/typescript.js b/.yarn/sdks/typescript/lib/typescript.js deleted file mode 100644 index 7b6cc220..00000000 --- a/.yarn/sdks/typescript/lib/typescript.js +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env node - -const {existsSync} = require(`fs`); -const {createRequire, register} = require(`module`); -const {resolve} = require(`path`); -const {pathToFileURL} = require(`url`); - -const relPnpApiPath = "../../../../.pnp.cjs"; - -const absPnpApiPath = resolve(__dirname, relPnpApiPath); -const absUserWrapperPath = resolve(__dirname, `./sdk.user.cjs`); -const absRequire = createRequire(absPnpApiPath); - -const absPnpLoaderPath = resolve(absPnpApiPath, `../.pnp.loader.mjs`); -const isPnpLoaderEnabled = existsSync(absPnpLoaderPath); - -if (existsSync(absPnpApiPath)) { - if (!process.versions.pnp) { - // Setup the environment to be able to require typescript - require(absPnpApiPath).setup(); - if (isPnpLoaderEnabled && register) { - register(pathToFileURL(absPnpLoaderPath)); - } - } -} - -const wrapWithUserWrapper = existsSync(absUserWrapperPath) - ? exports => absRequire(absUserWrapperPath)(exports) - : exports => exports; - -// Defer to the real typescript your application uses -module.exports = wrapWithUserWrapper(absRequire(`typescript`)); diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json deleted file mode 100644 index 1399ec48..00000000 --- a/.yarn/sdks/typescript/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "name": "typescript", - "version": "5.5.4-sdk", - "main": "./lib/typescript.js", - "type": "commonjs", - "bin": { - "tsc": "./bin/tsc", - "tsserver": "./bin/tsserver" - } -}