diff --git a/nx-transformer.js b/nx-transformer.js deleted file mode 100644 index 5b2db77..0000000 --- a/nx-transformer.js +++ /dev/null @@ -1,6 +0,0 @@ -// Keeping register here in the root for backwards compatibiliy, TODO remove in the next major version -console.warn( - "typescript-transform-paths: Calling the top level nx-transformer file is deprecated and will be removed in the future. Use a tool that supports package.json exports", -); - -module.exports = require("./dist/plugins/nx-transfomer-plugin").default; diff --git a/package.json b/package.json index 42a1d99..75d5a46 100644 --- a/package.json +++ b/package.json @@ -3,8 +3,6 @@ "version": "3.5.5", "description": "Transforms module resolution paths using TypeScript path mapping and/or custom paths", "type": "commonjs", - "main": "./dist/index.js", - "types": "types/index.d.ts", "exports": { ".": { "types": "./dist/index.d.ts", @@ -68,8 +66,6 @@ "@types/node": "^22.5.2", "@types/ts-expose-internals": "npm:ts-expose-internals@4.9.5", "@types/ts-node": "npm:ts-node@^10.9.2", - "@types/typescript-3": "npm:typescript@3.x", - "@types/typescript-4.7": "npm:typescript@4.9.x", "changelogen": "^0.5.5", "eslint": "9.x", "globals": "^15.9.0", @@ -80,8 +76,7 @@ "typescript-eslint": "^8.3.0" }, "peerDependencies": { - "ts-node": ">=10", - "typescript": ">=3.6.5" + "typescript": ">=5" }, "peerDependenciesMeta": { "ts-node": { @@ -96,5 +91,8 @@ "prettier-plugin-jsdoc" ] }, + "engines": { + "node": ">=22" + }, "packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538" } diff --git a/register.js b/register.js deleted file mode 100644 index d0bcee8..0000000 --- a/register.js +++ /dev/null @@ -1,5 +0,0 @@ -// Keeping register here in the root for backwards compatibiliy, TODO remove in the next major version -console.warn( - "typescript-transform-paths: Calling the top level register file is deprecated and will be removed in the future. Use a tool that supports package.json exports", -); -require("./dist/register-entry"); diff --git a/src/harmony/harmony-factory.ts b/src/harmony/harmony-factory.ts deleted file mode 100644 index 1b00276..0000000 --- a/src/harmony/harmony-factory.ts +++ /dev/null @@ -1,33 +0,0 @@ -import TS from "typescript"; -import { TsTransformPathsContext } from "../types"; -import { TsFourSeven, TsThreeEight } from "./versions"; - -/* ****************************************************************************************************************** */ -// region: Types -/* ****************************************************************************************************************** */ - -export interface HarmonyFactory extends TS.NodeFactory {} - -// endregion - -/* ****************************************************************************************************************** */ -// region: Utilities -/* ****************************************************************************************************************** */ - -/** Creates a node factory compatible with TS v3+ */ -export function createHarmonyFactory(context: TsTransformPathsContext): HarmonyFactory { - return new Proxy(context.tsFactory ?? context.tsInstance, { - get(target, prop) { - if (TsThreeEight.predicate(context)) { - return TsThreeEight.handler(context, prop); - } else if (TsFourSeven.predicate(context)) { - return TsFourSeven.handler(context, prop); - } else { - // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expression of type 'string | symbol' can't be used to index type 'typeof import("typescript") | NodeFactory'. - return target[prop]; - } - }, - }) as HarmonyFactory; -} - -// endregion diff --git a/src/harmony/index.ts b/src/harmony/index.ts deleted file mode 100644 index 34eee98..0000000 --- a/src/harmony/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from "./versions"; -export * from "./harmony-factory"; diff --git a/src/harmony/utils.ts b/src/harmony/utils.ts deleted file mode 100644 index 2f0cb8e..0000000 --- a/src/harmony/utils.ts +++ /dev/null @@ -1,20 +0,0 @@ -/* ****************************************************************************************************************** */ -// region: Utility Types -/* ****************************************************************************************************************** */ -// @formatter:off - -// @prettier-ignore -export type DownSampleTsTypes = { - [i in keyof Tuple]: Tuple[i] extends unknown[] - ? DownSampleTsTypes - : DownSampleTsType; -} & { - length: Tuple["length"]; -}; - -// @prettier-ignore -type DownSampleTsType = - T extends Exclude ? Extract[1] : T; - -// @formatter:on -// endregion diff --git a/src/harmony/versions/four-seven.ts b/src/harmony/versions/four-seven.ts deleted file mode 100644 index b09638d..0000000 --- a/src/harmony/versions/four-seven.ts +++ /dev/null @@ -1,125 +0,0 @@ -/** Changes after this point: https://github.com/microsoft/TypeScript/wiki/API-Breaking-Changes#typescript-48 */ -import type { - default as TsCurrentModule, - AssertClause, - ExportDeclaration, - Expression, - ImportClause, - ImportDeclaration, - Modifier, - ModuleBody, - ModuleDeclaration, - ModuleName, - NamedExportBindings, -} from "typescript"; -import type TsFourSevenModule from "typescript-4.7"; -import type { TsTransformPathsContext } from "../../types"; -import type { DownSampleTsTypes } from "../utils"; - -/* ****************************************************************************************************************** */ -// region: Mapping -/* ****************************************************************************************************************** */ - -export type TypeMap = [ - [TsCurrentModule.ImportDeclaration, TsFourSevenModule.ImportDeclaration], - [TsCurrentModule.Modifier, TsFourSevenModule.Modifier], - [TsCurrentModule.ImportClause, TsFourSevenModule.ImportClause], - [TsCurrentModule.Expression, TsFourSevenModule.Expression], - [TsCurrentModule.AssertClause, TsFourSevenModule.AssertClause], - [TsCurrentModule.ExportDeclaration, TsFourSevenModule.ExportDeclaration], - [TsCurrentModule.NamedExportBindings, TsFourSevenModule.NamedExportBindings], - [TsCurrentModule.ModuleDeclaration, TsFourSevenModule.ModuleDeclaration], - [TsCurrentModule.ModuleName, TsFourSevenModule.ModuleName], - [TsCurrentModule.ModuleBody, TsFourSevenModule.ModuleBody], -]; - -// endregion - -/* ****************************************************************************************************************** */ -// region: Utils -/* ****************************************************************************************************************** */ - -export const predicate = ({ tsVersionMajor, tsVersionMinor }: TsTransformPathsContext) => - tsVersionMajor == 4 && tsVersionMinor < 8; - -export function handler(context: TsTransformPathsContext, prop: string | symbol) { - const factory = context.tsFactory as unknown as TsFourSevenModule.NodeFactory; - - switch (prop) { - case "updateImportDeclaration": { - return function ( - node: ImportDeclaration, - _modifiers: readonly Modifier[] | undefined, - importClause: ImportClause | undefined, - moduleSpecifier: Expression, - assertClause: AssertClause | undefined, - ) { - const [dsNode, dsImportClause, dsModuleSpecifier, dsAssertClause] = downSample( - node, - importClause, - moduleSpecifier, - assertClause, - ); - - return factory.updateImportDeclaration( - dsNode, - dsNode.decorators, - dsNode.modifiers, - dsImportClause, - dsModuleSpecifier, - dsAssertClause, - ); - }; - } - case "updateExportDeclaration": { - return function ( - node: ExportDeclaration, - _modifiers: readonly Modifier[] | undefined, - isTypeOnly: boolean, - exportClause: NamedExportBindings | undefined, - moduleSpecifier: Expression | undefined, - assertClause: AssertClause | undefined, - ) { - const [dsNode, dsExportClause, dsModuleSpecifier, dsAssertClause] = downSample( - node, - exportClause, - moduleSpecifier, - assertClause, - ); - - return factory.updateExportDeclaration( - dsNode, - dsNode.decorators, - dsNode.modifiers, - isTypeOnly, - dsExportClause, - dsModuleSpecifier, - dsAssertClause, - ); - }; - } - case "updateModuleDeclaration": { - return function ( - node: ModuleDeclaration, - _modifiers: readonly Modifier[] | undefined, - name: ModuleName, - body: ModuleBody | undefined, - ) { - const [dsNode, dsName, dsBody] = downSample(node, name, body); - - return factory.updateModuleDeclaration(dsNode, dsNode.decorators, dsNode.modifiers, dsName, dsBody); - }; - } - default: { - // @ts-expect-error TS(7019) FIXME: Rest parameter 'args' implicitly has an 'any[]' type. - return (...args) => factory[prop](...args); - } - } -} - -export function downSample(...args: T): DownSampleTsTypes { - // @ts-expect-error TS(2322) FIXME: Type 'T' is not assignable to type 'DownSampleTsTypes'. - return args; -} - -// endregion diff --git a/src/harmony/versions/index.ts b/src/harmony/versions/index.ts deleted file mode 100644 index 4fcadcd..0000000 --- a/src/harmony/versions/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * as TsThreeEight from "./three-eight"; -export * as TsFourSeven from "./four-seven"; diff --git a/src/harmony/versions/three-eight.ts b/src/harmony/versions/three-eight.ts deleted file mode 100644 index e9e615e..0000000 --- a/src/harmony/versions/three-eight.ts +++ /dev/null @@ -1,158 +0,0 @@ -/** Changes after this point: https://github.com/microsoft/TypeScript/wiki/API-Breaking-Changes#typescript-40 */ -import type { - default as TsCurrentModule, - EntityName, - ExportDeclaration, - Expression, - Identifier, - ImportClause, - ImportDeclaration, - ImportTypeAssertionContainer, - ImportTypeNode, - Modifier, - ModuleBody, - ModuleDeclaration, - ModuleName, - NamedExportBindings, - NamedImportBindings, - TypeNode, -} from "typescript"; -import type TsThreeEightModule from "typescript-3"; -import type { TsTransformPathsContext } from "../../types"; -import type { DownSampleTsTypes } from "../utils"; - -/* ****************************************************************************************************************** */ -// region: Mapping -/* ****************************************************************************************************************** */ - -export type TypeMap = [ - [TsCurrentModule.SourceFile, TsThreeEightModule.SourceFile], - [TsCurrentModule.StringLiteral, TsThreeEightModule.StringLiteral], - [TsCurrentModule.CompilerOptions, TsThreeEightModule.CompilerOptions], - // @ts-expect-error typescript 3 doesn't export EmitResolver - [TsCurrentModule.EmitResolver, TsThreeEightModule.EmitResolver], - [TsCurrentModule.CallExpression, TsThreeEightModule.CallExpression], - [TsCurrentModule.ExternalModuleReference, TsThreeEightModule.ExternalModuleReference], - [TsCurrentModule.LiteralTypeNode, TsThreeEightModule.LiteralTypeNode], - [TsCurrentModule.ExternalModuleReference, TsThreeEightModule.ExternalModuleReference], - [TsCurrentModule.ImportTypeNode, TsThreeEightModule.ImportTypeNode], - [TsCurrentModule.EntityName, TsThreeEightModule.EntityName], - [TsCurrentModule.TypeNode, TsThreeEightModule.TypeNode], - [readonly TsCurrentModule.TypeNode[], readonly TsThreeEightModule.TypeNode[]], - [TsCurrentModule.LiteralTypeNode, TsThreeEightModule.LiteralTypeNode], - [TsCurrentModule.ImportDeclaration, TsThreeEightModule.ImportDeclaration], - [TsCurrentModule.ImportClause, TsThreeEightModule.ImportClause], - [TsCurrentModule.Identifier, TsThreeEightModule.Identifier], - [TsCurrentModule.NamedImportBindings, TsThreeEightModule.NamedImportBindings], - [TsCurrentModule.ImportDeclaration, TsThreeEightModule.ImportDeclaration], - [TsCurrentModule.ExportDeclaration, TsThreeEightModule.ExportDeclaration], - [TsCurrentModule.ModuleDeclaration, TsThreeEightModule.ModuleDeclaration], - [TsCurrentModule.Expression, TsThreeEightModule.Expression], - [TsCurrentModule.ModuleBody, TsThreeEightModule.ModuleBody], - [TsCurrentModule.ModuleName, TsThreeEightModule.ModuleName], - [TsCurrentModule.ExportDeclaration["exportClause"], TsThreeEightModule.ExportDeclaration["exportClause"]], -]; - -// endregion - -/* ****************************************************************************************************************** */ -// region: Utils -/* ****************************************************************************************************************** */ - -export const predicate = (context: TsTransformPathsContext) => context.tsVersionMajor < 4; - -export function handler(context: TsTransformPathsContext, prop: string | symbol) { - const ts = context.tsInstance as unknown as typeof TsThreeEightModule; - - switch (prop) { - case "updateCallExpression": { - // @ts-expect-error TS(7019) FIXME: Rest parameter 'args' implicitly has an 'any[]' type. - return (...args) => ts.updateCall.apply(void 0, args); - } - case "updateImportClause": { - return function ( - node: ImportClause, - _isTypeOnly: boolean, - name: Identifier | undefined, - namedBindings: NamedImportBindings | undefined, - ) { - // @ts-expect-error TODO investigate type issue - return ts.updateImportClause.apply(void 0, downSample(node, name, namedBindings)); - }; - } - case "updateImportDeclaration": { - return function ( - node: ImportDeclaration, - _modifiers: readonly Modifier[] | undefined, - importClause: ImportClause | undefined, - moduleSpecifier: Expression, - ) { - const [dsNode, dsImportClause, dsModuleSpecifier] = downSample(node, importClause, moduleSpecifier); - - return ts.updateImportDeclaration( - dsNode, - dsNode.decorators, - dsNode.modifiers, - dsImportClause, - dsModuleSpecifier, - ); - }; - } - case "updateExportDeclaration": { - return function ( - node: ExportDeclaration, - _modifiers: readonly Modifier[] | undefined, - _isTypeOnly: boolean, - exportClause: NamedExportBindings | undefined, - moduleSpecifier: Expression | undefined, - ) { - const [dsNode, dsModuleSpecifier, dsExportClause] = downSample(node, moduleSpecifier, exportClause); - return ts.updateExportDeclaration( - dsNode, - dsNode.decorators, - dsNode.modifiers, - dsExportClause, - dsModuleSpecifier, - dsNode.isTypeOnly, - ); - }; - } - case "updateModuleDeclaration": { - return function ( - node: ModuleDeclaration, - _modifiers: readonly Modifier[] | undefined, - name: ModuleName, - body: ModuleBody | undefined, - ) { - const [dsNode, dsName, dsBody] = downSample(node, name, body); - - return ts.updateModuleDeclaration(dsNode, dsNode.decorators, dsNode.modifiers, dsName, dsBody); - }; - } - case "updateImportTypeNode": { - return function ( - node: ImportTypeNode, - argument: TypeNode, - _assertions: ImportTypeAssertionContainer | undefined, - qualifier: EntityName | undefined, - typeArguments: readonly TypeNode[] | undefined, - isTypeOf?: boolean, - ) { - const [dsNode, dsArgument, dsQualifier, dsTypeArguments] = downSample(node, argument, qualifier, typeArguments); - - return ts.updateImportTypeNode(dsNode, dsArgument, dsQualifier, dsTypeArguments, isTypeOf); - }; - } - default: { - // @ts-expect-error TS(7019) FIXME: Rest parameter 'args' implicitly has an 'any[]' type. - return (...args) => ts[prop](...args); - } - } -} - -export function downSample(...args: T): DownSampleTsTypes { - // @ts-expect-error TS(2322) FIXME: Type 'T' is not assignable to type 'DownSampleTsTypes'. - return args; -} - -// endregion diff --git a/src/transformer.ts b/src/transformer.ts index d2c08dd..8668a42 100755 --- a/src/transformer.ts +++ b/src/transformer.ts @@ -2,7 +2,6 @@ import path from "node:path"; import ts, { CompilerOptions } from "typescript"; import { RunMode, TsNodeState, TsTransformPathsConfig, TsTransformPathsContext, VisitorContext } from "./types"; import { nodeVisitor } from "./visitor"; -import { createHarmonyFactory } from "./harmony"; import { Minimatch } from "minimatch"; import { createSyntheticEmitHost, getTsNodeRegistrationProperties } from "./utils/ts-helpers"; import { TransformerExtras } from "ts-patch"; @@ -139,7 +138,7 @@ export default function transformer( getVisitor() { return nodeVisitor.bind(this); }, - factory: createHarmonyFactory(tsTransformPathsContext), + factory: (tsTransformPathsContext.tsFactory ?? tsTransformPathsContext.tsInstance) as ts.NodeFactory, }; return tsInstance.visitEachChild(sourceFile, visitorContext.getVisitor(), transformationContext); diff --git a/src/types.ts b/src/types.ts index a57e101..4e63dde 100755 --- a/src/types.ts +++ b/src/types.ts @@ -2,8 +2,6 @@ import ts, { CompilerOptions, EmitHost, Pattern, SourceFile } from "typescript"; import { PluginConfig } from "ts-patch"; import { Minimatch } from "minimatch"; -import { HarmonyFactory } from "./harmony"; - /* ****************************************************************************************************************** */ // region: TS Types /* ****************************************************************************************************************** */ @@ -49,7 +47,7 @@ export interface TsTransformPathsContext { } export interface VisitorContext extends TsTransformPathsContext { - readonly factory: HarmonyFactory; + readonly factory: ts.NodeFactory; readonly sourceFile: ts.SourceFile; readonly isDeclarationFile: boolean; readonly originalSourceFile: ts.SourceFile; diff --git a/test/config.ts b/test/config.ts index 5b1566e..76d32c4 100755 --- a/test/config.ts +++ b/test/config.ts @@ -1,17 +1,7 @@ import ts from "typescript"; -import tsThree from "typescript-3"; -import tsFourSeven from "typescript-4.7"; -import tsFiveFive from "typescript-5.5"; -import tsFiveSix from "typescript-5.6"; import path from "node:path"; -export const tsModules = [ - ["3.6.5", tsThree, "typescript-3"], - ["4.7.4", tsFourSeven, "typescript-4.7"], - ["5.5.4", tsFiveFive, "typescript-5.5"], - ["5.6.3", tsFiveSix, "typescript-5.6"], - ["Latest", ts, "typescript"], -]; +export const tsModules = [["Latest", ts, "typescript"]]; export const projectsPaths = path.join(__dirname, "./projects"); export const transformerPath = require.resolve("typescript-transform-paths"); diff --git a/test/package.json b/test/package.json index f634066..5ae6297 100644 --- a/test/package.json +++ b/test/package.json @@ -19,13 +19,7 @@ "ts-jest": "^29.2.4", "ts-node": "^10.9.2", "ts-patch": "^3.3.0", - "tsp1": "npm:ts-patch@1.*.*", - "tsp2": "npm:ts-patch@2.*.*", "typescript": "^5.7.2", - "typescript-3": "npm:typescript@3.6.5", - "typescript-4.7": "npm:typescript@4.7.4", - "typescript-5.5": "npm:typescript@5.5.4", - "typescript-5.6": "npm:typescript@5.6.3", "typescript-transform-paths": "portal:../" }, "workspaces": [ diff --git a/test/prepare.mjs b/test/prepare.mjs index 45e327c..730fa36 100755 --- a/test/prepare.mjs +++ b/test/prepare.mjs @@ -4,8 +4,6 @@ import { symlink } from "node:fs/promises"; import { dirname, resolve } from "node:path"; import { fileURLToPath } from "node:url"; import { patch } from "ts-patch"; -import { patch as patch1 } from "tsp1"; -import { patch as patch2 } from "tsp2"; const __dirname = dirname(fileURLToPath(import.meta.url)); // https://stackoverflow.com/questions/46745014/alternative-for-dirname-in-node-js-when-using-es6-modules @@ -28,10 +26,6 @@ function patchTsModules() { tspatch(["tsc.js", "typescript.js"], { basedir, dir: basedir }); } - patchTypescript("typescript-3", patch1); - patchTypescript("typescript-4.7", patch2); - patchTypescript("typescript-5.5", patch); - patchTypescript("typescript-5.6", patch); patchTypescript("typescript", patch); } diff --git a/test/tests/transformer/general.test.ts b/test/tests/transformer/general.test.ts index 3f98796..cbfb124 100755 --- a/test/tests/transformer/general.test.ts +++ b/test/tests/transformer/general.test.ts @@ -50,9 +50,7 @@ describe(`Transformer -> General Tests`, () => { beforeAll(() => { transformed = transformedFiles[file]; expected = { - // @ts-expect-error TS(2345) FIXME: Argument of type 'typeof ts | typeof ts | typeof import("typescript")' is not assignable to parameter of type 'typeof import("typescript")'. js: getExpected(tsInstance, file, originalFiles[file].js, projectRoot), - // @ts-expect-error TS(2345) FIXME: Argument of type 'typeof ts | typeof ts | typeof import("typescript")' is not assignable to parameter of type 'typeof import("typescript")'. dts: getExpected(tsInstance, file, originalFiles[file].dts, projectRoot), }; }); diff --git a/test/yarn.lock b/test/yarn.lock index 3100297..5fb6566 100644 --- a/test/yarn.lock +++ b/test/yarn.lock @@ -187,14 +187,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": - version: 7.22.5 - resolution: "@babel/helper-plugin-utils@npm:7.22.5" - checksum: 10c0/d2c4bfe2fa91058bcdee4f4e57a3f4933aed7af843acfd169cd6179fab8d13c1d636474ecabb2af107dc77462c7e893199aa26632bac1c6d7e025a17cbb9d20d - languageName: node - linkType: hard - -"@babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8": +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.24.7, @babel/helper-plugin-utils@npm:^7.24.8, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": version: 7.24.8 resolution: "@babel/helper-plugin-utils@npm:7.24.8" checksum: 10c0/0376037f94a3bfe6b820a39f81220ac04f243eaee7193774b983e956c1750883ff236b30785795abbcda43fac3ece74750566830c2daa4d6e3870bb0dff34c2d @@ -2760,7 +2753,7 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.11.0": +"acorn@npm:^8.11.0, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2": version: 8.12.1 resolution: "acorn@npm:8.12.1" bin: @@ -2769,15 +2762,6 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.2": - version: 8.11.3 - resolution: "acorn@npm:8.11.3" - bin: - acorn: bin/acorn - checksum: 10c0/3ff155f8812e4a746fee8ecff1f227d527c4c45655bb1fad6347c3cb58e46190598217551b1500f18542d2bbe5c87120cb6927f5a074a59166fbdd9468f0a299 - languageName: node - linkType: hard - "agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": version: 7.1.1 resolution: "agent-base@npm:7.1.1" @@ -4999,7 +4983,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.0.0, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7": +"glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -5013,30 +4997,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^8.0.3": - version: 8.1.0 - resolution: "glob@npm:8.1.0" - dependencies: - fs.realpath: "npm:^1.0.0" - inflight: "npm:^1.0.4" - inherits: "npm:2" - minimatch: "npm:^5.0.1" - once: "npm:^1.3.0" - checksum: 10c0/cb0b5cab17a59c57299376abe5646c7070f8acb89df5595b492dba3bfb43d301a46c01e5695f01154e6553168207cb60d4eaf07d3be4bc3eb9b0457c5c561d0f - languageName: node - linkType: hard - -"global-prefix@npm:^3.0.0": - version: 3.0.0 - resolution: "global-prefix@npm:3.0.0" - dependencies: - ini: "npm:^1.3.5" - kind-of: "npm:^6.0.2" - which: "npm:^1.3.1" - checksum: 10c0/510f489fb68d1cc7060f276541709a0ee6d41356ef852de48f7906c648ac223082a1cc8fce86725ca6c0e032bcdc1189ae77b4744a624b29c34a9d0ece498269 - languageName: node - linkType: hard - "global-prefix@npm:^4.0.0": version: 4.0.0 resolution: "global-prefix@npm:4.0.0" @@ -5399,13 +5359,6 @@ __metadata: languageName: node linkType: hard -"ini@npm:^1.3.5": - version: 1.3.8 - resolution: "ini@npm:1.3.8" - checksum: 10c0/ec93838d2328b619532e4f1ff05df7909760b6f66d9c9e2ded11e5c1897d6f2f9980c54dd638f88654b00919ce31e827040631eab0a3969e4d1abefa0719516a - languageName: node - linkType: hard - "ini@npm:^4.1.3": version: 4.1.3 resolution: "ini@npm:4.1.3" @@ -5413,13 +5366,6 @@ __metadata: languageName: node linkType: hard -"interpret@npm:^1.0.0": - version: 1.4.0 - resolution: "interpret@npm:1.4.0" - checksum: 10c0/08c5ad30032edeec638485bc3f6db7d0094d9b3e85e0f950866600af3c52e9fd69715416d29564731c479d9f4d43ff3e4d302a178196bdc0e6837ec147640450 - languageName: node - linkType: hard - "ip-address@npm:^9.0.5": version: 9.0.5 resolution: "ip-address@npm:9.0.5" @@ -6220,7 +6166,7 @@ __metadata: languageName: node linkType: hard -"kind-of@npm:^6.0.2, kind-of@npm:^6.0.3": +"kind-of@npm:^6.0.3": version: 6.0.3 resolution: "kind-of@npm:6.0.3" checksum: 10c0/61cdff9623dabf3568b6445e93e31376bee1cdb93f8ba7033d86022c2a9b1791a1d9510e026e6465ebd701a6dd2f7b0808483ad8838341ac52f003f512e0b4c4 @@ -6631,7 +6577,7 @@ __metadata: languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.8": +"minimist@npm:^1.2.0, minimist@npm:^1.2.6, minimist@npm:^1.2.8": version: 1.2.8 resolution: "minimist@npm:1.2.8" checksum: 10c0/19d3fcdca050087b84c2029841a093691a91259a47def2f18222f41e7645a0b7c44ef4b40e88a1e58a40c84d2ef0ee6047c55594d298146d0eb3f6b737c20ce6 @@ -7884,15 +7830,6 @@ __metadata: languageName: node linkType: hard -"rechoir@npm:^0.6.2": - version: 0.6.2 - resolution: "rechoir@npm:0.6.2" - dependencies: - resolve: "npm:^1.1.6" - checksum: 10c0/22c4bb32f4934a9468468b608417194f7e3ceba9a508512125b16082c64f161915a28467562368eeb15dc16058eb5b7c13a20b9eb29ff9927d1ebb3b5aa83e84 - languageName: node - linkType: hard - "regenerate-unicode-properties@npm:^10.1.0": version: 10.1.1 resolution: "regenerate-unicode-properties@npm:10.1.1" @@ -8008,7 +7945,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2": +"resolve@npm:^1.1.7, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.22.2": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -8021,7 +7958,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.12.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -8092,13 +8029,7 @@ __metadata: ts-jest: "npm:^29.2.4" ts-node: "npm:^10.9.2" ts-patch: "npm:^3.3.0" - tsp1: "npm:ts-patch@1.*.*" - tsp2: "npm:ts-patch@2.*.*" typescript: "npm:^5.7.2" - typescript-3: "npm:typescript@3.6.5" - typescript-4.7: "npm:typescript@4.7.4" - typescript-5.5: "npm:typescript@5.5.4" - typescript-5.6: "npm:typescript@5.6.3" typescript-transform-paths: "portal:../" languageName: unknown linkType: soft @@ -8380,19 +8311,6 @@ __metadata: languageName: node linkType: hard -"shelljs@npm:^0.8.4, shelljs@npm:^0.8.5": - version: 0.8.5 - resolution: "shelljs@npm:0.8.5" - dependencies: - glob: "npm:^7.0.0" - interpret: "npm:^1.0.0" - rechoir: "npm:^0.6.2" - bin: - shjs: bin/shjs - checksum: 10c0/feb25289a12e4bcd04c40ddfab51aff98a3729f5c2602d5b1a1b95f6819ec7804ac8147ebd8d9a85dfab69d501bcf92d7acef03247320f51c1552cec8d8e2382 - languageName: node - linkType: hard - "side-channel@npm:^1.0.6": version: 1.0.6 resolution: "side-channel@npm:1.0.6" @@ -9168,44 +9086,6 @@ __metadata: languageName: node linkType: hard -"tsp1@npm:ts-patch@1.*.*": - version: 1.4.5 - resolution: "ts-patch@npm:1.4.5" - dependencies: - chalk: "npm:^4.1.0" - glob: "npm:^7.1.7" - global-prefix: "npm:^3.0.0" - minimist: "npm:^1.2.5" - resolve: "npm:^1.20.0" - shelljs: "npm:^0.8.4" - strip-ansi: "npm:^6.0.0" - peerDependencies: - typescript: ">2.7.0" - bin: - ts-patch: bin/cli.js - checksum: 10c0/3e9b0d3838d0fc930f89000206c586485582c7f7f2746f1e4227a6777b10c06c7642395cd88cbd2950a3938da4146d4e8a1fbe0e02f46624764b9d42a01d7470 - languageName: node - linkType: hard - -"tsp2@npm:ts-patch@2.*.*": - version: 2.1.0 - resolution: "ts-patch@npm:2.1.0" - dependencies: - chalk: "npm:^4.1.2" - glob: "npm:^8.0.3" - global-prefix: "npm:^3.0.0" - minimist: "npm:^1.2.6" - resolve: "npm:^1.22.1" - shelljs: "npm:^0.8.5" - strip-ansi: "npm:^6.0.1" - peerDependencies: - typescript: ">=4.0.0" - bin: - ts-patch: bin/cli.js - checksum: 10c0/fb6888807cc7294ea24042519bb520c622ca34c5bc925f70ba35b26c8275ac26d2e78d9642c1885802d444841c9406932292b10a8f7d450ec8d457ba8569a838 - languageName: node - linkType: hard - "type-detect@npm:4.0.8": version: 4.0.8 resolution: "type-detect@npm:4.0.8" @@ -9237,54 +9117,13 @@ __metadata: languageName: node linkType: hard -"typescript-3@npm:typescript@3.6.5": - version: 3.6.5 - resolution: "typescript@npm:3.6.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/b6f0d5d2e2325b28460b8cf3a4a1237d79aec9951ad727014d4ca570327cc5947decec5d262044979cc0a9ab63746b58e6d8438d73d33ce8415e5369d0490dff - languageName: node - linkType: hard - -"typescript-4.7@npm:typescript@4.7.4": - version: 4.7.4 - resolution: "typescript@npm:4.7.4" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/8c1c4007b6ce5b24c49f0e89173ab9e82687cc6ae54418d1140bb63b82d6598d085ac0f993fe3d3d1fbf87a2c76f1f81d394dc76315bc72c7a9f8561c5d8d205 - languageName: node - linkType: hard - -"typescript-5.5@npm:typescript@5.5.4": - version: 5.5.4 - resolution: "typescript@npm:5.5.4" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/422be60f89e661eab29ac488c974b6cc0a660fb2228003b297c3d10c32c90f3bcffc1009b43876a082515a3c376b1eefcce823d6e78982e6878408b9a923199c - languageName: node - linkType: hard - -"typescript-5.6@npm:typescript@5.6.3": - version: 5.6.3 - resolution: "typescript@npm:5.6.3" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/44f61d3fb15c35359bc60399cb8127c30bae554cd555b8e2b46d68fa79d680354b83320ad419ff1b81a0bdf324197b29affe6cc28988cd6a74d4ac60c94f9799 - languageName: node - linkType: hard - "typescript-transform-paths@portal:../::locator=root-workspace-0b6124%40workspace%3A.": version: 0.0.0-use.local resolution: "typescript-transform-paths@portal:../::locator=root-workspace-0b6124%40workspace%3A." dependencies: minimatch: "npm:^9.0.5" peerDependencies: - ts-node: ">=10" - typescript: ">=3.6.5" + typescript: ">=5" peerDependenciesMeta: ts-node: optional: true @@ -9632,17 +9471,6 @@ __metadata: languageName: node linkType: hard -"which@npm:^1.3.1": - version: 1.3.1 - resolution: "which@npm:1.3.1" - dependencies: - isexe: "npm:^2.0.0" - bin: - which: ./bin/which - checksum: 10c0/e945a8b6bbf6821aaaef7f6e0c309d4b615ef35699576d5489b4261da9539f70393c6b2ce700ee4321c18f914ebe5644bc4631b15466ffbaad37d83151f6af59 - languageName: node - linkType: hard - "which@npm:^2.0.1": version: 2.0.2 resolution: "which@npm:2.0.2" diff --git a/yarn.lock b/yarn.lock index c7115a7..ea8fbb1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14,18 +14,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": - version: 4.4.0 - resolution: "@eslint-community/eslint-utils@npm:4.4.0" - dependencies: - eslint-visitor-keys: "npm:^3.3.0" - peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || >=8.0.0 - checksum: 10c0/7e559c4ce59cd3a06b1b5a517b593912e680a7f981ae7affab0d01d709e99cd5647019be8fafa38c350305bc32f1f7d42c7073edde2ab536c745e365f37b607e - languageName: node - linkType: hard - -"@eslint-community/eslint-utils@npm:^4.7.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.7.0": version: 4.7.0 resolution: "@eslint-community/eslint-utils@npm:4.7.0" dependencies: @@ -36,14 +25,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.10.0": - version: 4.11.0 - resolution: "@eslint-community/regexpp@npm:4.11.0" - checksum: 10c0/0f6328869b2741e2794da4ad80beac55cba7de2d3b44f796a60955b0586212ec75e6b0253291fd4aad2100ad471d1480d8895f2b54f1605439ba4c875e05e523 - languageName: node - linkType: hard - -"@eslint-community/regexpp@npm:^4.12.1": +"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.12.1": version: 4.12.1 resolution: "@eslint-community/regexpp@npm:4.12.1" checksum: 10c0/a03d98c246bcb9109aec2c08e4d10c8d010256538dcb3f56610191607214523d4fb1b00aa81df830b6dffb74c5fa0be03642513a289c567949d3e550ca11cdf6 @@ -336,14 +318,7 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*": - version: 1.0.5 - resolution: "@types/estree@npm:1.0.5" - checksum: 10c0/b3b0e334288ddb407c7b3357ca67dbee75ee22db242ca7c56fe27db4e1a31989cb8af48a84dd401deb787fe10cc6b2ab1ee82dc4783be87ededbe3d53c79c70d - languageName: node - linkType: hard - -"@types/estree@npm:^1.0.6": +"@types/estree@npm:*, @types/estree@npm:^1.0.6": version: 1.0.6 resolution: "@types/estree@npm:1.0.6" checksum: 10c0/cdfd751f6f9065442cd40957c07fd80361c962869aa853c1c2fd03e101af8b9389d8ff4955a43a6fcfa223dd387a089937f95be0f3eec21ca527039fd2d9859a @@ -434,26 +409,6 @@ __metadata: languageName: node linkType: hard -"@types/typescript-3@npm:typescript@3.x": - version: 3.9.10 - resolution: "typescript@npm:3.9.10" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/863cc06070fa18a0f9c6a83265fb4922a8b51bf6f2c6760fb0b73865305ce617ea4bc6477381f9f4b7c3a8cb4a455b054f5469e6e41307733fe6a2bd9aae82f8 - languageName: node - linkType: hard - -"@types/typescript-4.7@npm:typescript@4.9.x": - version: 4.9.5 - resolution: "typescript@npm:4.9.5" - bin: - tsc: bin/tsc - tsserver: bin/tsserver - checksum: 10c0/5f6cad2e728a8a063521328e612d7876e12f0d8a8390d3b3aaa452a6a65e24e9ac8ea22beb72a924fd96ea0a49ea63bb4e251fb922b12eedfb7f7a26475e5c56 - languageName: node - linkType: hard - "@types/unist@npm:*, @types/unist@npm:^3.0.0": version: 3.0.3 resolution: "@types/unist@npm:3.0.3" @@ -633,21 +588,21 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.11.0, acorn@npm:^8.11.3, acorn@npm:^8.12.0, acorn@npm:^8.4.1": - version: 8.12.1 - resolution: "acorn@npm:8.12.1" +"acorn@npm:^8.11.0, acorn@npm:^8.14.0, acorn@npm:^8.4.1": + version: 8.14.0 + resolution: "acorn@npm:8.14.0" bin: acorn: bin/acorn - checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386 + checksum: 10c0/6d4ee461a7734b2f48836ee0fbb752903606e576cc100eb49340295129ca0b452f3ba91ddd4424a1d4406a98adfb2ebb6bd0ff4c49d7a0930c10e462719bbfd7 languageName: node linkType: hard -"acorn@npm:^8.14.0": - version: 8.14.0 - resolution: "acorn@npm:8.14.0" +"acorn@npm:^8.11.3": + version: 8.12.1 + resolution: "acorn@npm:8.12.1" bin: acorn: bin/acorn - checksum: 10c0/6d4ee461a7734b2f48836ee0fbb752903606e576cc100eb49340295129ca0b452f3ba91ddd4424a1d4406a98adfb2ebb6bd0ff4c49d7a0930c10e462719bbfd7 + checksum: 10c0/51fb26cd678f914e13287e886da2d7021f8c2bc0ccc95e03d3e0447ee278dd3b40b9c57dc222acd5881adcf26f3edc40901a4953403232129e3876793cd17386 languageName: node linkType: hard @@ -1025,9 +980,9 @@ __metadata: linkType: hard "consola@npm:^3.2.3": - version: 3.2.3 - resolution: "consola@npm:3.2.3" - checksum: 10c0/c606220524ec88a05bb1baf557e9e0e04a0c08a9c35d7a08652d99de195c4ddcb6572040a7df57a18ff38bbc13ce9880ad032d56630cef27bef72768ef0ac078 + version: 3.4.2 + resolution: "consola@npm:3.4.2" + checksum: 10c0/7cebe57ecf646ba74b300bcce23bff43034ed6fbec9f7e39c27cee1dc00df8a21cd336b466ad32e304ea70fba04ec9e890c200270de9a526ce021ba8a7e4c11a languageName: node linkType: hard @@ -1096,7 +1051,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4": +"debug@npm:4": version: 4.3.6 resolution: "debug@npm:4.3.6" dependencies: @@ -1108,7 +1063,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:^4.3.5, debug@npm:^4.4.0": +"debug@npm:^4.0.0, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.4.0": version: 4.4.0 resolution: "debug@npm:4.4.0" dependencies: @@ -1327,28 +1282,14 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.3": +"eslint-visitor-keys@npm:^3.4.3": version: 3.4.3 resolution: "eslint-visitor-keys@npm:3.4.3" checksum: 10c0/92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820 languageName: node linkType: hard -"eslint-visitor-keys@npm:^4.0.0": - version: 4.0.0 - resolution: "eslint-visitor-keys@npm:4.0.0" - checksum: 10c0/76619f42cf162705a1515a6868e6fc7567e185c7063a05621a8ac4c3b850d022661262c21d9f1fc1d144ecf0d5d64d70a3f43c15c3fc969a61ace0fb25698cf5 - languageName: node - linkType: hard - -"eslint-visitor-keys@npm:^4.2.0": - version: 4.2.0 - resolution: "eslint-visitor-keys@npm:4.2.0" - checksum: 10c0/2ed81c663b147ca6f578312919483eb040295bbab759e5a371953456c636c5b49a559883e2677112453728d66293c0a4c90ab11cab3428cf02a0236d2e738269 - languageName: node - linkType: hard - -"eslint-visitor-keys@npm:^4.2.1": +"eslint-visitor-keys@npm:^4.2.0, eslint-visitor-keys@npm:^4.2.1": version: 4.2.1 resolution: "eslint-visitor-keys@npm:4.2.1" checksum: 10c0/fcd43999199d6740db26c58dbe0c2594623e31ca307e616ac05153c9272f12f1364f5a0b1917a8e962268fdecc6f3622c1c2908b4fcc2e047a106fe6de69dc43 @@ -1407,18 +1348,7 @@ __metadata: languageName: node linkType: hard -"espree@npm:^10.0.1": - version: 10.1.0 - resolution: "espree@npm:10.1.0" - dependencies: - acorn: "npm:^8.12.0" - acorn-jsx: "npm:^5.3.2" - eslint-visitor-keys: "npm:^4.0.0" - checksum: 10c0/52e6feaa77a31a6038f0c0e3fce93010a4625701925b0715cd54a2ae190b3275053a0717db698697b32653788ac04845e489d6773b508d6c2e8752f3c57470a0 - languageName: node - linkType: hard - -"espree@npm:^10.3.0": +"espree@npm:^10.0.1, espree@npm:^10.3.0": version: 10.3.0 resolution: "espree@npm:10.3.0" dependencies: @@ -2769,13 +2699,20 @@ __metadata: languageName: node linkType: hard -"node-fetch-native@npm:^1.6.3, node-fetch-native@npm:^1.6.4": +"node-fetch-native@npm:^1.6.3": version: 1.6.4 resolution: "node-fetch-native@npm:1.6.4" checksum: 10c0/78334dc6def5d1d95cfe87b33ac76c4833592c5eb84779ad2b0c23c689f9dd5d1cfc827035ada72d6b8b218f717798968c5a99aeff0a1a8bf06657e80592f9c3 languageName: node linkType: hard +"node-fetch-native@npm:^1.6.4": + version: 1.6.7 + resolution: "node-fetch-native@npm:1.6.7" + checksum: 10c0/8b748300fb053d21ca4d3db9c3ff52593d5e8f8a2d9fe90cbfad159676e324b954fdaefab46aeca007b5b9edab3d150021c4846444e4e8ab1f4e44cd3807be87 + languageName: node + linkType: hard + "node-gyp@npm:latest": version: 10.2.0 resolution: "node-gyp@npm:10.2.0" @@ -3283,7 +3220,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.5, semver@npm:^7.6.0, semver@npm:^7.6.3": +"semver@npm:^7.3.5": version: 7.6.3 resolution: "semver@npm:7.6.3" bin: @@ -3292,6 +3229,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.6.0, semver@npm:^7.6.3": + version: 7.7.2 + resolution: "semver@npm:7.7.2" + bin: + semver: bin/semver.js + checksum: 10c0/aca305edfbf2383c22571cb7714f48cadc7ac95371b4b52362fb8eeffdfbc0de0669368b82b2b15978f8848f01d7114da65697e56cd8c37b0dab8c58e543f9ea + languageName: node + linkType: hard + "send@npm:^1.1.0, send@npm:^1.2.0": version: 1.2.0 resolution: "send@npm:1.2.0" @@ -3632,8 +3578,6 @@ __metadata: "@types/node": "npm:^22.5.2" "@types/ts-expose-internals": "npm:ts-expose-internals@4.9.5" "@types/ts-node": "npm:ts-node@^10.9.2" - "@types/typescript-3": "npm:typescript@3.x" - "@types/typescript-4.7": "npm:typescript@4.9.x" changelogen: "npm:^0.5.5" eslint: "npm:9.x" globals: "npm:^15.9.0" @@ -3644,8 +3588,7 @@ __metadata: typescript: "npm:^5.5.4" typescript-eslint: "npm:^8.3.0" peerDependencies: - ts-node: ">=10" - typescript: ">=3.6.5" + typescript: ">=5" peerDependenciesMeta: ts-node: optional: true