Skip to content

Commit

Permalink
Fixed syntactic nullisness semantics for tagged template expressions (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Andarist authored Nov 26, 2024
1 parent 96410eb commit 9fe6c36
Show file tree
Hide file tree
Showing 6 changed files with 117 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39927,6 +39927,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
switch (node.kind) {
case SyntaxKind.AwaitExpression:
case SyntaxKind.CallExpression:
case SyntaxKind.TaggedTemplateExpression:
case SyntaxKind.ElementAccessExpression:
case SyntaxKind.MetaProperty:
case SyntaxKind.NewExpression:
Expand Down
19 changes: 18 additions & 1 deletion tests/baselines/reference/predicateSemantics.errors.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ predicateSemantics.ts(36,8): error TS2872: This kind of expression is always tru
predicateSemantics.ts(51,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
predicateSemantics.ts(52,14): error TS2695: Left side of comma operator is unused and has no side effects.
predicateSemantics.ts(52,14): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
predicateSemantics.ts(70,1): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
predicateSemantics.ts(71,1): error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.


==== predicateSemantics.ts (14 errors) ====
==== predicateSemantics.ts (16 errors) ====
declare let cond: any;

// OK: One or other operand is possibly nullish
Expand Down Expand Up @@ -103,4 +105,19 @@ predicateSemantics.ts(52,14): error TS2869: Right operand of ?? is unreachable b
const p = new.target ?? 32;
}
}

// https://github.com/microsoft/TypeScript/issues/60614
declare function tag<T>(
strings: TemplateStringsArray,
...values: number[]
): T | null;

tag`foo${1}` ?? 32; // ok

`foo${1}` ?? 32; // error
~~~~~~~~~
!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.
`foo` ?? 32; // error
~~~~~
!!! error TS2869: Right operand of ?? is unreachable because the left operand is never nullish.

20 changes: 19 additions & 1 deletion tests/baselines/reference/predicateSemantics.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,25 @@ class X {
const p = new.target ?? 32;
}
}

// https://github.com/microsoft/TypeScript/issues/60614
declare function tag<T>(
strings: TemplateStringsArray,
...values: number[]
): T | null;

tag`foo${1}` ?? 32; // ok

`foo${1}` ?? 32; // error
`foo` ?? 32; // error


//// [predicateSemantics.js]
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
return cooked;
};
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
// OK: One or other operand is possibly nullish
var test1 = (_a = (cond ? undefined : 32)) !== null && _a !== void 0 ? _a : "possibly reached";
// Not OK: Both operands nullish
Expand Down Expand Up @@ -122,3 +137,6 @@ var X = /** @class */ (function () {
}
return X;
}());
(_k = tag(__makeTemplateObject(["foo", ""], ["foo", ""]), 1)) !== null && _k !== void 0 ? _k : 32; // ok
(_l = "foo".concat(1)) !== null && _l !== void 0 ? _l : 32; // error
"foo" !== null && "foo" !== void 0 ? "foo" : 32; // error
21 changes: 21 additions & 0 deletions tests/baselines/reference/predicateSemantics.symbols
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,24 @@ class X {
}
}

// https://github.com/microsoft/TypeScript/issues/60614
declare function tag<T>(
>tag : Symbol(tag, Decl(predicateSemantics.ts, 59, 1))
>T : Symbol(T, Decl(predicateSemantics.ts, 62, 21))

strings: TemplateStringsArray,
>strings : Symbol(strings, Decl(predicateSemantics.ts, 62, 24))
>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.es5.d.ts, --, --))

...values: number[]
>values : Symbol(values, Decl(predicateSemantics.ts, 63, 32))

): T | null;
>T : Symbol(T, Decl(predicateSemantics.ts, 62, 21))

tag`foo${1}` ?? 32; // ok
>tag : Symbol(tag, Decl(predicateSemantics.ts, 59, 1))

`foo${1}` ?? 32; // error
`foo` ?? 32; // error

47 changes: 47 additions & 0 deletions tests/baselines/reference/predicateSemantics.types
Original file line number Diff line number Diff line change
Expand Up @@ -328,3 +328,50 @@ class X {
}
}

// https://github.com/microsoft/TypeScript/issues/60614
declare function tag<T>(
>tag : <T>(strings: TemplateStringsArray, ...values: number[]) => T | null
> : ^ ^^ ^^ ^^^^^ ^^ ^^^^^

strings: TemplateStringsArray,
>strings : TemplateStringsArray
> : ^^^^^^^^^^^^^^^^^^^^

...values: number[]
>values : number[]
> : ^^^^^^^^

): T | null;

tag`foo${1}` ?? 32; // ok
>tag`foo${1}` ?? 32 : unknown
> : ^^^^^^^
>tag`foo${1}` : unknown
> : ^^^^^^^
>tag : <T>(strings: TemplateStringsArray, ...values: number[]) => T | null
> : ^ ^^ ^^ ^^^^^ ^^ ^^^^^
>`foo${1}` : string
> : ^^^^^^
>1 : 1
> : ^
>32 : 32
> : ^^

`foo${1}` ?? 32; // error
>`foo${1}` ?? 32 : 32 | "foo1"
> : ^^^^^^^^^^^
>`foo${1}` : "foo1"
> : ^^^^^^
>1 : 1
> : ^
>32 : 32
> : ^^

`foo` ?? 32; // error
>`foo` ?? 32 : 32 | "foo"
> : ^^^^^^^^^^
>`foo` : "foo"
> : ^^^^^
>32 : 32
> : ^^

11 changes: 11 additions & 0 deletions tests/cases/compiler/predicateSemantics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,3 +58,14 @@ class X {
const p = new.target ?? 32;
}
}

// https://github.com/microsoft/TypeScript/issues/60614
declare function tag<T>(
strings: TemplateStringsArray,
...values: number[]
): T | null;

tag`foo${1}` ?? 32; // ok

`foo${1}` ?? 32; // error
`foo` ?? 32; // error

0 comments on commit 9fe6c36

Please sign in to comment.