Skip to content

Commit

Permalink
Cherry-pick #51704 to release 4.9 (#51712)
Browse files Browse the repository at this point in the history
* Manual port of #51704

* Add a testcase
  • Loading branch information
RyanCavanaugh authored Dec 5, 2022
1 parent b4d382b commit eb5419f
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32707,13 +32707,13 @@ namespace ts {

function checkSatisfiesExpression(node: SatisfiesExpression) {
checkSourceElement(node.type);
const exprType = checkExpression(node.expression);

const targetType = getTypeFromTypeNode(node.type);
if (isErrorType(targetType)) {
return targetType;
}

const exprType = checkExpression(node.expression);
checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);

return exprType;
Expand Down
13 changes: 13 additions & 0 deletions tests/baselines/reference/satisfiesEmit.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
tests/cases/compiler/satisfiesEmit.ts(2,20): error TS2307: Cannot find module 'foo' or its corresponding type declarations.
tests/cases/compiler/satisfiesEmit.ts(3,23): error TS2304: Cannot find name 'bleh'.


==== tests/cases/compiler/satisfiesEmit.ts (2 errors) ====
// This import should not be elided in the emitted JS
import a = require("foo");
~~~~~
!!! error TS2307: Cannot find module 'foo' or its corresponding type declarations.
const p = a satisfies bleh;
~~~~
!!! error TS2304: Cannot find name 'bleh'.

12 changes: 12 additions & 0 deletions tests/baselines/reference/satisfiesEmit.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
//// [satisfiesEmit.ts]
// This import should not be elided in the emitted JS
import a = require("foo");
const p = a satisfies bleh;


//// [satisfiesEmit.js]
"use strict";
exports.__esModule = true;
// This import should not be elided in the emitted JS
var a = require("foo");
var p = a;
10 changes: 10 additions & 0 deletions tests/baselines/reference/satisfiesEmit.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
=== tests/cases/compiler/satisfiesEmit.ts ===
// This import should not be elided in the emitted JS
import a = require("foo");
>a : Symbol(a, Decl(satisfiesEmit.ts, 0, 0))

const p = a satisfies bleh;
>p : Symbol(p, Decl(satisfiesEmit.ts, 2, 5))
>a : Symbol(a, Decl(satisfiesEmit.ts, 0, 0))
>bleh : Symbol(bleh)

10 changes: 10 additions & 0 deletions tests/baselines/reference/satisfiesEmit.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
=== tests/cases/compiler/satisfiesEmit.ts ===
// This import should not be elided in the emitted JS
import a = require("foo");
>a : any

const p = a satisfies bleh;
>p : bleh
>a satisfies bleh : bleh
>a : any

3 changes: 3 additions & 0 deletions tests/cases/compiler/satisfiesEmit.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// This import should not be elided in the emitted JS
import a = require("foo");
const p = a satisfies bleh;

0 comments on commit eb5419f

Please sign in to comment.