Skip to content

Commit b65f9bc

Browse files
rbucktonrbuckton
committed
Merge branch 'main' into instanceof-Symbol.hasInstance
2 parents 1d90af1 + db4c27f commit b65f9bc

229 files changed

Lines changed: 36600 additions & 688 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/new-release-branch.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ jobs:
2121
contents: write
2222

2323
steps:
24+
- uses: actions/checkout@v3
25+
with:
26+
fetch-depth: 5
2427
- uses: actions/setup-node@v3
2528
- run: |
2629
npm --version
2730
# corepack enable npm
2831
npm install -g $(jq -r '.packageManager' < package.json)
2932
npm --version
30-
- uses: actions/checkout@v3
31-
with:
32-
fetch-depth: 5
3333
- run: |
3434
git checkout -b ${{ github.event.client_payload.branch_name }}
3535
sed -i -e 's/"version": ".*"/"version": "${{ github.event.client_payload.package_version }}"/g' package.json

‎.github/workflows/set-version.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121
contents: write
2222

2323
steps:
24-
- uses: actions/setup-node@v3
2524
- uses: actions/checkout@v3
2625
with:
2726
ref: ${{ github.event.client_payload.branch_name }}
27+
- uses: actions/setup-node@v3
2828
- run: |
2929
npm --version
3030
# corepack enable npm

‎package-lock.json‎

Lines changed: 114 additions & 114 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/compiler/checker.ts‎

Lines changed: 141 additions & 107 deletions
Large diffs are not rendered by default.

‎src/compiler/diagnosticMessages.json‎

Lines changed: 37 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1472,18 +1472,14 @@
14721472
"category": "Message",
14731473
"code": 1449
14741474
},
1475-
"Dynamic imports can only accept a module specifier and an optional assertion as arguments": {
1475+
"Dynamic imports can only accept a module specifier and an optional set of attributes as arguments": {
14761476
"category": "Message",
14771477
"code": 1450
14781478
},
14791479
"Private identifiers are only allowed in class bodies and may only be used as part of a class member declaration, property access, or on the left-hand-side of an 'in' expression": {
14801480
"category": "Error",
14811481
"code": 1451
14821482
},
1483-
"'resolution-mode' assertions are only supported when `moduleResolution` is `node16` or `nodenext`.": {
1484-
"category": "Error",
1485-
"code": 1452
1486-
},
14871483
"`resolution-mode` should be either `require` or `import`.": {
14881484
"category": "Error",
14891485
"code": 1453
@@ -1520,6 +1516,14 @@
15201516
"category": "Message",
15211517
"code": 1461
15221518
},
1519+
"'resolution-mode' is the only valid key for type import attributes.": {
1520+
"category": "Error",
1521+
"code": 1463
1522+
},
1523+
"Type import attributes should have exactly one key - 'resolution-mode' - with value 'import' or 'require'.": {
1524+
"category": "Error",
1525+
"code": 1464
1526+
},
15231527

15241528
"The 'import.meta' meta-property is not allowed in files which will build into CommonJS output.": {
15251529
"category": "Error",
@@ -1625,6 +1629,10 @@
16251629
"category": "Error",
16261630
"code": 1495
16271631
},
1632+
"Identifier, string literal, or number literal expected.": {
1633+
"category": "Error",
1634+
"code": 1496
1635+
},
16281636

16291637
"The types of '{0}' are incompatible between these types.": {
16301638
"category": "Error",
@@ -3579,6 +3587,10 @@
35793587
"category": "Error",
35803588
"code": 2822
35813589
},
3590+
"Import attributes are only supported when the '--module' option is set to 'esnext' or 'nodenext'.": {
3591+
"category": "Error",
3592+
"code": 2823
3593+
},
35823594
"Cannot find namespace '{0}'. Did you mean '{1}'?": {
35833595
"category": "Error",
35843596
"code": 2833
@@ -3591,7 +3603,7 @@
35913603
"category": "Error",
35923604
"code": 2835
35933605
},
3594-
"Import assertions are not allowed on statements that transpile to CommonJS 'require' calls.": {
3606+
"Import assertions are not allowed on statements that compile to CommonJS 'require' calls.": {
35953607
"category": "Error",
35963608
"code": 2836
35973609
},
@@ -3611,10 +3623,6 @@
36113623
"category": "Error",
36123624
"code": 2840
36133625
},
3614-
"The type of this expression cannot be named without a 'resolution-mode' assertion, which is an unstable feature. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
3615-
"category": "Error",
3616-
"code": 2841
3617-
},
36183626
"'{0}' is an unused renaming of '{1}'. Did you intend to use it as a type annotation?": {
36193627
"category": "Error",
36203628
"code": 2842
@@ -3667,18 +3675,34 @@
36673675
"category": "Error",
36683676
"code": 2855
36693677
},
3670-
"The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method.": {
3678+
"Import attributes are not allowed on statements that compile to CommonJS 'require' calls.": {
36713679
"category": "Error",
36723680
"code": 2856
36733681
},
3674-
"An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression.": {
3682+
"Import attributes cannot be used with type-only imports or exports.": {
36753683
"category": "Error",
36763684
"code": 2857
36773685
},
3678-
"The right-hand side of an 'instanceof' expression must be either of type 'any', a class, function, or other type assignable to the 'Function' interface type, or an object type with a 'Symbol.hasInstance' method.": {
3686+
"Import attribute values must be string literal expressions.": {
36793687
"category": "Error",
36803688
"code": 2858
36813689
},
3690+
"Excessive complexity comparing types '{0}' and '{1}'.": {
3691+
"category": "Error",
3692+
"code": 2859
3693+
},
3694+
"The left-hand side of an 'instanceof' expression must be assignable to the first argument of the right-hand side's '[Symbol.hasInstance]' method.": {
3695+
"category": "Error",
3696+
"code": 2860
3697+
},
3698+
"An object's '[Symbol.hasInstance]' method must return a boolean value for it to be used on the right-hand side of an 'instanceof' expression.": {
3699+
"category": "Error",
3700+
"code": 2861
3701+
},
3702+
"The right-hand side of an 'instanceof' expression must be either of type 'any', a class, function, or other type assignable to the 'Function' interface type, or an object type with a 'Symbol.hasInstance' method.": {
3703+
"category": "Error",
3704+
"code": 2862
3705+
},
36823706

36833707
"Import declaration '{0}' is using private name '{1}'.": {
36843708
"category": "Error",
@@ -4112,10 +4136,6 @@
41124136
"category": "Error",
41134137
"code": 4124
41144138
},
4115-
"'resolution-mode' assertions are unstable. Use nightly TypeScript to silence this error. Try updating with 'npm install -D typescript@next'.": {
4116-
"category": "Error",
4117-
"code": 4125
4118-
},
41194139

41204140
"The current host does not support the '{0}' option.": {
41214141
"category": "Error",

‎src/compiler/emitter.ts‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import {
77
ArrayTypeNode,
88
ArrowFunction,
99
AsExpression,
10-
AssertClause,
11-
AssertEntry,
1210
AwaitExpression,
1311
base64encode,
1412
BigIntLiteral,
@@ -191,6 +189,8 @@ import {
191189
Identifier,
192190
idText,
193191
IfStatement,
192+
ImportAttribute,
193+
ImportAttributes,
194194
ImportClause,
195195
ImportDeclaration,
196196
ImportEqualsDeclaration,
@@ -2055,10 +2055,10 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
20552055
return emitNamedExports(node as NamedExports);
20562056
case SyntaxKind.ExportSpecifier:
20572057
return emitExportSpecifier(node as ExportSpecifier);
2058-
case SyntaxKind.AssertClause:
2059-
return emitAssertClause(node as AssertClause);
2060-
case SyntaxKind.AssertEntry:
2061-
return emitAssertEntry(node as AssertEntry);
2058+
case SyntaxKind.ImportAttributes:
2059+
return emitImportAttributes(node as ImportAttributes);
2060+
case SyntaxKind.ImportAttribute:
2061+
return emitImportAttribute(node as ImportAttribute);
20622062
case SyntaxKind.MissingDeclaration:
20632063
return;
20642064

@@ -2948,16 +2948,16 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
29482948
writeKeyword("import");
29492949
writePunctuation("(");
29502950
emit(node.argument);
2951-
if (node.assertions) {
2951+
if (node.attributes) {
29522952
writePunctuation(",");
29532953
writeSpace();
29542954
writePunctuation("{");
29552955
writeSpace();
2956-
writeKeyword("assert");
2956+
writeKeyword(node.attributes.token === SyntaxKind.AssertKeyword ? "assert" : "with");
29572957
writePunctuation(":");
29582958
writeSpace();
2959-
const elements = node.assertions.assertClause.elements;
2960-
emitList(node.assertions.assertClause, elements, ListFormat.ImportClauseEntries);
2959+
const elements = node.attributes.elements;
2960+
emitList(node.attributes, elements, ListFormat.ImportAttributes);
29612961
writeSpace();
29622962
writePunctuation("}");
29632963
}
@@ -4003,8 +4003,8 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
40034003
writeSpace();
40044004
}
40054005
emitExpression(node.moduleSpecifier);
4006-
if (node.assertClause) {
4007-
emitWithLeadingSpace(node.assertClause);
4006+
if (node.attributes) {
4007+
emitWithLeadingSpace(node.attributes);
40084008
}
40094009
writeTrailingSemicolon();
40104010
}
@@ -4078,20 +4078,20 @@ export function createPrinter(printerOptions: PrinterOptions = {}, handlers: Pri
40784078
writeSpace();
40794079
emitExpression(node.moduleSpecifier);
40804080
}
4081-
if (node.assertClause) {
4082-
emitWithLeadingSpace(node.assertClause);
4081+
if (node.attributes) {
4082+
emitWithLeadingSpace(node.attributes);
40834083
}
40844084
writeTrailingSemicolon();
40854085
}
40864086

4087-
function emitAssertClause(node: AssertClause) {
4088-
emitTokenWithComment(SyntaxKind.AssertKeyword, node.pos, writeKeyword, node);
4087+
function emitImportAttributes(node: ImportAttributes) {
4088+
emitTokenWithComment(node.token, node.pos, writeKeyword, node);
40894089
writeSpace();
40904090
const elements = node.elements;
4091-
emitList(node, elements, ListFormat.ImportClauseEntries);
4091+
emitList(node, elements, ListFormat.ImportAttributes);
40924092
}
40934093

4094-
function emitAssertEntry(node: AssertEntry) {
4094+
function emitImportAttribute(node: ImportAttribute) {
40954095
emit(node.name);
40964096
writePunctuation(":");
40974097
writeSpace();

0 commit comments

Comments
 (0)