Skip to content

Commit ac4bedd

Browse files
JoshuaKGoldbergJoshuaKGoldberg
committed
[email protected], and aliased interfaces
1 parent d487f52 commit ac4bedd

File tree

6 files changed

+26
-21
lines changed

6 files changed

+26
-21
lines changed

Diff for: ‎.yarn/patches/typescript-npm-5.3.0-beta-33b1e90865.patch renamed to ‎.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/lib/typescript.d.ts b/lib/typescript.d.ts
2-
index d785077fd9e4eb5959c0badb857358fad09d4d3f..54f71344b098e8d46acd8dd77638c60d505bb996 100644
2+
index 5ee1d5258cb019bddb259c7d31b1ae0156a98f0c..fc5f4d2a757a9fef92b2135148c22bb0cc81b2c1 100644
33
--- a/lib/typescript.d.ts
44
+++ b/lib/typescript.d.ts
55
@@ -4491,8 +4491,8 @@ declare namespace ts {
@@ -54,7 +54,7 @@ index d785077fd9e4eb5959c0badb857358fad09d4d3f..54f71344b098e8d46acd8dd77638c60d
5454
}
5555
interface ConstructorTypeNode extends FunctionOrConstructorTypeNodeBase, LocalsContainer {
5656
readonly kind: SyntaxKind.ConstructorType;
57-
@@ -8978,7 +8992,13 @@ declare namespace ts {
57+
@@ -8991,7 +9005,13 @@ declare namespace ts {
5858
function symbolName(symbol: Symbol): string;
5959
function getNameOfJSDocTypedef(declaration: JSDocTypedefTag): Identifier | PrivateIdentifier | undefined;
6060
function getNameOfDeclaration(declaration: Declaration | Expression | undefined): DeclarationName | undefined;
@@ -68,7 +68,7 @@ index d785077fd9e4eb5959c0badb857358fad09d4d3f..54f71344b098e8d46acd8dd77638c60d
6868
function getModifiers(node: HasModifiers): readonly Modifier[] | undefined;
6969
/**
7070
* Gets the JSDoc parameter tags for the node if present.
71-
@@ -9508,7 +9528,13 @@ declare namespace ts {
71+
@@ -9521,7 +9541,13 @@ declare namespace ts {
7272
function isModuleName(node: Node): node is ModuleName;
7373
function isBinaryOperatorToken(node: Node): node is BinaryOperatorToken;
7474
function setTextRange<T extends TextRange>(range: T, location: TextRange | undefined): T;

Diff for: ‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
"pretty-format": "^29",
142142
"react-split-pane@^0.1.92": "patch:react-split-pane@npm%3A0.1.92#./.yarn/patches/react-split-pane-npm-0.1.92-93dbf51dff.patch",
143143
"tsx": "^3.12.7",
144-
"typescript": "patch:typescript@npm%3A5.3.0-beta#./.yarn/patches/typescript-npm-5.3.0-beta-33b1e90865.patch"
144+
"typescript": "patch:typescript@npm%3A5.3.1-rc#./.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch"
145145
},
146146
"packageManager": "[email protected]"
147147
}

Diff for: ‎packages/typescript-estree/src/create-program/createIsolatedProgram.ts

+1-3
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,7 @@ function createIsolatedProgram(
6565
const program = ts.createProgram(
6666
[parseSettings.filePath],
6767
{
68-
...(ts.JSDocParsingMode && {
69-
jsDocParsingMode: ts.JSDocParsingMode.ParseForTypeInfo,
70-
}),
68+
jsDocParsingMode: ts.JSDocParsingMode?.ParseForTypeInfo,
7169
noResolve: true,
7270
target: ts.ScriptTarget.Latest,
7371
jsx: parseSettings.jsx ? ts.JsxEmit.Preserve : undefined,

Diff for: ‎packages/typescript-estree/src/ts-estree/estree-to-ts-node-types.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,11 @@ export interface EstreeToTsNodeTypes {
7777
| ts.Token<ts.SyntaxKind.ImportKeyword | ts.SyntaxKind.NewKeyword>;
7878
[AST_NODE_TYPES.PrivateIdentifier]: ts.PrivateIdentifier;
7979
[AST_NODE_TYPES.IfStatement]: ts.IfStatement;
80-
[AST_NODE_TYPES.ImportAttribute]: ts.ImportAttribute;
80+
// eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
81+
[AST_NODE_TYPES.ImportAttribute]: 'ImportAttribute' extends keyof typeof ts
82+
? ts.ImportAttribute
83+
: // eslint-disable-next-line deprecation/deprecation
84+
ts.AssertEntry;
8185
[AST_NODE_TYPES.ImportDeclaration]: ts.ImportDeclaration;
8286
[AST_NODE_TYPES.ImportDefaultSpecifier]: ts.ImportClause;
8387
[AST_NODE_TYPES.ImportExpression]: ts.CallExpression;

Diff for: ‎packages/typescript-estree/src/ts-estree/ts-nodes.ts

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ declare module 'typescript' {
1212
export interface SatisfiesExpression extends ts.Node {}
1313
// added in TS 5.1
1414
export interface JsxNamespacedName extends ts.Node {}
15+
// added in TS 5.3
16+
export interface ImportAttribute extends ts.Node {}
17+
export interface ImportAttributes extends ts.Node {}
1518
}
1619
/* eslint-enable @typescript-eslint/ban-ts-comment, @typescript-eslint/prefer-ts-expect-error, @typescript-eslint/no-empty-interface */
1720

Diff for: ‎yarn.lock

+13-13
Original file line numberDiff line numberDiff line change
@@ -6109,7 +6109,7 @@ __metadata:
61096109
ts-node: 10.7.0
61106110
tslint: ^6.1.3
61116111
tsx: ^3.12.7
6112-
typescript: ">=4.3.5 <5.4.0"
6112+
typescript: rc
61136113
languageName: unknown
61146114
linkType: soft
61156115

@@ -20233,33 +20233,33 @@ __metadata:
2023320233
languageName: node
2023420234
linkType: hard
2023520235

20236-
"typescript@npm:5.3.0-beta":
20237-
version: 5.3.0-beta
20238-
resolution: "typescript@npm:5.3.0-beta"
20236+
"typescript@npm:5.3.1-rc":
20237+
version: 5.3.1-rc
20238+
resolution: "typescript@npm:5.3.1-rc"
2023920239
bin:
2024020240
tsc: bin/tsc
2024120241
tsserver: bin/tsserver
20242-
checksum: 12c5b05df8be536c3f5789323ca2e2f21ab6b7571bd21407b152c080be1dc8628c3cd9fb5fa342a304a266f5ad22827f3a27b7961da1600d27890be93f3e2d73
20242+
checksum: a144fdc3edea2230f947716f9983d5d1c4d0d2a3a4007121d69b70e92b28aef65f7974fe11a10ad91b836e9c6522888e204952904b804cd85af6bf5689f36705
2024320243
languageName: node
2024420244
linkType: hard
2024520245

20246-
"typescript@patch:typescript@npm%3A5.3.0-beta#./.yarn/patches/typescript-npm-5.3.0-beta-33b1e90865.patch::locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A.":
20247-
version: 5.3.0-beta
20248-
resolution: "typescript@patch:typescript@npm%3A5.3.0-beta#./.yarn/patches/typescript-npm-5.3.0-beta-33b1e90865.patch::version=5.3.0-beta&hash=aba397&locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A."
20246+
"typescript@patch:typescript@npm%3A5.3.1-rc#./.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch::locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A.":
20247+
version: 5.3.1-rc
20248+
resolution: "typescript@patch:typescript@npm%3A5.3.1-rc#./.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch::version=5.3.1-rc&hash=7df256&locator=%40typescript-eslint%2Ftypescript-eslint%40workspace%3A."
2024920249
bin:
2025020250
tsc: bin/tsc
2025120251
tsserver: bin/tsserver
20252-
checksum: 85a8cc0ce7b9d4243db899dbf77632d63cf32818cfc076f27e929f1b89c062c2a94f5fa2f0a72e9fc315164532aac1580c9cad5b453f4a4aed464557593c8168
20252+
checksum: 2ed8bccd7f16441a04e25d252315b0280b4ba4de8ad7b2a9a8f0c8ad0eb01c4238628ba27e1f83f927b8ee56c447fc80286f9e5c30395c5ba5708ffb069f1f2f
2025320253
languageName: node
2025420254
linkType: hard
2025520255

20256-
"typescript@patch:typescript@patch%3Atypescript@npm%253A5.3.0-beta%23./.yarn/patches/typescript-npm-5.3.0-beta-33b1e90865.patch%3A%3Alocator=%2540typescript-eslint%252Ftypescript-eslint%2540workspace%253A.#~builtin<compat/typescript>":
20257-
version: 5.3.0-beta
20258-
resolution: "typescript@patch:typescript@patch%3Atypescript@npm%253A5.3.0-beta%23./.yarn/patches/typescript-npm-5.3.0-beta-33b1e90865.patch%3A%3Aversion=5.3.0-beta&hash=aba397&locator=%2540typescript-eslint%252Ftypescript-eslint%2540workspace%253A.#~builtin<compat/typescript>::version=5.3.0-beta&hash=29ae49"
20256+
"typescript@patch:typescript@patch%3Atypescript@npm%253A5.3.1-rc%23./.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch%3A%3Alocator=%2540typescript-eslint%252Ftypescript-eslint%2540workspace%253A.#~builtin<compat/typescript>":
20257+
version: 5.3.1-rc
20258+
resolution: "typescript@patch:typescript@patch%3Atypescript@npm%253A5.3.1-rc%23./.yarn/patches/typescript-npm-5.3.1-rc-6c4278ffd3.patch%3A%3Aversion=5.3.1-rc&hash=7df256&locator=%2540typescript-eslint%252Ftypescript-eslint%2540workspace%253A.#~builtin<compat/typescript>::version=5.3.1-rc&hash=29ae49"
2025920259
bin:
2026020260
tsc: bin/tsc
2026120261
tsserver: bin/tsserver
20262-
checksum: d1ed47d2a7f35e4692c439bca41f0622be732f33927e59afe4af9c6640219a2f1cc7c4622852787a96c5300f2b88fb06bb46b5125ae8db2c080b0fad2f12ae98
20262+
checksum: 2ed8bccd7f16441a04e25d252315b0280b4ba4de8ad7b2a9a8f0c8ad0eb01c4238628ba27e1f83f927b8ee56c447fc80286f9e5c30395c5ba5708ffb069f1f2f
2026320263
languageName: node
2026420264
linkType: hard
2026520265

0 commit comments

Comments
 (0)