Skip to content

Commit f9e1bcd

Browse files
DanielRosenwasserDanielRosenwasser
authoredMay 12, 2020
Merge pull request #38439 from lissein/void-0-template-strings
Changed template strings to emit void 0 instead of undefined (#38430)
2 parents db0cd30 + 946abea commit f9e1bcd

4 files changed

+58
-58
lines changed
 

‎src/compiler/transformers/taggedTemplate.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ namespace ts {
6363
}
6464

6565
function createTemplateCooked(template: TemplateHead | TemplateMiddle | TemplateTail | NoSubstitutionTemplateLiteral) {
66-
return template.templateFlags ? createIdentifier("undefined") : createLiteral(template.text);
66+
return template.templateFlags ? createVoidZero() : createLiteral(template.text);
6767
}
6868

6969
/**

‎tests/baselines/reference/invalidTaggedTemplateEscapeSequences(target=es2015).js

+11-11
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,20 @@ function tag(str, ...args) {
3535
}
3636
const a = tag `123`;
3737
const b = tag `123 ${100}`;
38-
const x = tag(__makeTemplateObject([undefined, undefined, " wonderful ", undefined], ["\\u{hello} ", " \\xtraordinary ", " wonderful ", " \\uworld"]), 100, 200, 300);
38+
const x = tag(__makeTemplateObject([void 0, void 0, " wonderful ", void 0], ["\\u{hello} ", " \\xtraordinary ", " wonderful ", " \\uworld"]), 100, 200, 300);
3939
const y = `\u{hello} ${100} \xtraordinary ${200} wonderful ${300} \uworld`; // should error with NoSubstitutionTemplate
40-
const z = tag(__makeTemplateObject([undefined], ["\\u{hello} \\xtraordinary wonderful \\uworld"])); // should work with Tagged NoSubstitutionTemplate
40+
const z = tag(__makeTemplateObject([void 0], ["\\u{hello} \\xtraordinary wonderful \\uworld"])); // should work with Tagged NoSubstitutionTemplate
4141
const a1 = tag `${100}\0`; // \0
42-
const a2 = tag(__makeTemplateObject(["", undefined], ["", "\\00"]), 100); // \\00
43-
const a3 = tag(__makeTemplateObject(["", undefined], ["", "\\u"]), 100); // \\u
44-
const a4 = tag(__makeTemplateObject(["", undefined], ["", "\\u0"]), 100); // \\u0
45-
const a5 = tag(__makeTemplateObject(["", undefined], ["", "\\u00"]), 100); // \\u00
46-
const a6 = tag(__makeTemplateObject(["", undefined], ["", "\\u000"]), 100); // \\u000
42+
const a2 = tag(__makeTemplateObject(["", void 0], ["", "\\00"]), 100); // \\00
43+
const a3 = tag(__makeTemplateObject(["", void 0], ["", "\\u"]), 100); // \\u
44+
const a4 = tag(__makeTemplateObject(["", void 0], ["", "\\u0"]), 100); // \\u0
45+
const a5 = tag(__makeTemplateObject(["", void 0], ["", "\\u00"]), 100); // \\u00
46+
const a6 = tag(__makeTemplateObject(["", void 0], ["", "\\u000"]), 100); // \\u000
4747
const a7 = tag `${100}\u0000`; // \u0000
48-
const a8 = tag(__makeTemplateObject(["", undefined], ["", "\\u{"]), 100); // \\u{
48+
const a8 = tag(__makeTemplateObject(["", void 0], ["", "\\u{"]), 100); // \\u{
4949
const a9 = tag `${100}\u{10FFFF}`; // \\u{10FFFF
50-
const a10 = tag(__makeTemplateObject(["", undefined], ["", "\\u{1f622"]), 100); // \\u{1f622
50+
const a10 = tag(__makeTemplateObject(["", void 0], ["", "\\u{1f622"]), 100); // \\u{1f622
5151
const a11 = tag `${100}\u{1f622}`; // \u{1f622}
52-
const a12 = tag(__makeTemplateObject(["", undefined], ["", "\\x"]), 100); // \\x
53-
const a13 = tag(__makeTemplateObject(["", undefined], ["", "\\x0"]), 100); // \\x0
52+
const a12 = tag(__makeTemplateObject(["", void 0], ["", "\\x"]), 100); // \\x
53+
const a13 = tag(__makeTemplateObject(["", void 0], ["", "\\x0"]), 100); // \\x0
5454
const a14 = tag `${100}\x00`; // \x00

‎tests/baselines/reference/invalidTaggedTemplateEscapeSequences(target=es5).js

+11-11
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ function tag(str) {
3939
}
4040
var a = tag(__makeTemplateObject(["123"], ["123"]));
4141
var b = tag(__makeTemplateObject(["123 ", ""], ["123 ", ""]), 100);
42-
var x = tag(__makeTemplateObject([undefined, undefined, " wonderful ", undefined], ["\\u{hello} ", " \\xtraordinary ", " wonderful ", " \\uworld"]), 100, 200, 300);
42+
var x = tag(__makeTemplateObject([void 0, void 0, " wonderful ", void 0], ["\\u{hello} ", " \\xtraordinary ", " wonderful ", " \\uworld"]), 100, 200, 300);
4343
var y = "hello} " + 100 + " traordinary " + 200 + " wonderful " + 300 + " world"; // should error with NoSubstitutionTemplate
44-
var z = tag(__makeTemplateObject([undefined], ["\\u{hello} \\xtraordinary wonderful \\uworld"])); // should work with Tagged NoSubstitutionTemplate
44+
var z = tag(__makeTemplateObject([void 0], ["\\u{hello} \\xtraordinary wonderful \\uworld"])); // should work with Tagged NoSubstitutionTemplate
4545
var a1 = tag(__makeTemplateObject(["", "\0"], ["", "\\0"]), 100); // \0
46-
var a2 = tag(__makeTemplateObject(["", undefined], ["", "\\00"]), 100); // \\00
47-
var a3 = tag(__makeTemplateObject(["", undefined], ["", "\\u"]), 100); // \\u
48-
var a4 = tag(__makeTemplateObject(["", undefined], ["", "\\u0"]), 100); // \\u0
49-
var a5 = tag(__makeTemplateObject(["", undefined], ["", "\\u00"]), 100); // \\u00
50-
var a6 = tag(__makeTemplateObject(["", undefined], ["", "\\u000"]), 100); // \\u000
46+
var a2 = tag(__makeTemplateObject(["", void 0], ["", "\\00"]), 100); // \\00
47+
var a3 = tag(__makeTemplateObject(["", void 0], ["", "\\u"]), 100); // \\u
48+
var a4 = tag(__makeTemplateObject(["", void 0], ["", "\\u0"]), 100); // \\u0
49+
var a5 = tag(__makeTemplateObject(["", void 0], ["", "\\u00"]), 100); // \\u00
50+
var a6 = tag(__makeTemplateObject(["", void 0], ["", "\\u000"]), 100); // \\u000
5151
var a7 = tag(__makeTemplateObject(["", "\0"], ["", "\\u0000"]), 100); // \u0000
52-
var a8 = tag(__makeTemplateObject(["", undefined], ["", "\\u{"]), 100); // \\u{
52+
var a8 = tag(__makeTemplateObject(["", void 0], ["", "\\u{"]), 100); // \\u{
5353
var a9 = tag(__makeTemplateObject(["", "\uDBFF\uDFFF"], ["", "\\u{10FFFF}"]), 100); // \\u{10FFFF
54-
var a10 = tag(__makeTemplateObject(["", undefined], ["", "\\u{1f622"]), 100); // \\u{1f622
54+
var a10 = tag(__makeTemplateObject(["", void 0], ["", "\\u{1f622"]), 100); // \\u{1f622
5555
var a11 = tag(__makeTemplateObject(["", "\uD83D\uDE22"], ["", "\\u{1f622}"]), 100); // \u{1f622}
56-
var a12 = tag(__makeTemplateObject(["", undefined], ["", "\\x"]), 100); // \\x
57-
var a13 = tag(__makeTemplateObject(["", undefined], ["", "\\x0"]), 100); // \\x0
56+
var a12 = tag(__makeTemplateObject(["", void 0], ["", "\\x"]), 100); // \\x
57+
var a13 = tag(__makeTemplateObject(["", void 0], ["", "\\x0"]), 100); // \\x0
5858
var a14 = tag(__makeTemplateObject(["", "\0"], ["", "\\x00"]), 100); // \x00

‎tests/baselines/reference/invalidTaggedTemplateEscapeSequences.js

+35-35
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
//// [invalidTaggedTemplateEscapeSequences.ts]
2-
function tag (str: any, ...args: any[]): any {
3-
return str
4-
}
5-
6-
const a = tag`123`
7-
const b = tag`123 ${100}`
8-
const x = tag`\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`;
9-
const y = `\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`; // should error with NoSubstitutionTemplate
10-
const z = tag`\u{hello} \xtraordinary wonderful \uworld` // should work with Tagged NoSubstitutionTemplate
11-
12-
const a1 = tag`${ 100 }\0` // \0
13-
const a2 = tag`${ 100 }\00` // \\00
14-
const a3 = tag`${ 100 }\u` // \\u
15-
const a4 = tag`${ 100 }\u0` // \\u0
16-
const a5 = tag`${ 100 }\u00` // \\u00
17-
const a6 = tag`${ 100 }\u000` // \\u000
18-
const a7 = tag`${ 100 }\u0000` // \u0000
19-
const a8 = tag`${ 100 }\u{` // \\u{
20-
const a9 = tag`${ 100 }\u{10FFFF}` // \\u{10FFFF
21-
const a10 = tag`${ 100 }\u{1f622` // \\u{1f622
22-
const a11 = tag`${ 100 }\u{1f622}` // \u{1f622}
23-
const a12 = tag`${ 100 }\x` // \\x
24-
const a13 = tag`${ 100 }\x0` // \\x0
25-
const a14 = tag`${ 100 }\x00` // \x00
2+
function tag (str: any, ...args: any[]): any {
3+
return str
4+
}
5+
6+
const a = tag`123`
7+
const b = tag`123 ${100}`
8+
const x = tag`\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`;
9+
const y = `\u{hello} ${ 100 } \xtraordinary ${ 200 } wonderful ${ 300 } \uworld`; // should error with NoSubstitutionTemplate
10+
const z = tag`\u{hello} \xtraordinary wonderful \uworld` // should work with Tagged NoSubstitutionTemplate
11+
12+
const a1 = tag`${ 100 }\0` // \0
13+
const a2 = tag`${ 100 }\00` // \\00
14+
const a3 = tag`${ 100 }\u` // \\u
15+
const a4 = tag`${ 100 }\u0` // \\u0
16+
const a5 = tag`${ 100 }\u00` // \\u00
17+
const a6 = tag`${ 100 }\u000` // \\u000
18+
const a7 = tag`${ 100 }\u0000` // \u0000
19+
const a8 = tag`${ 100 }\u{` // \\u{
20+
const a9 = tag`${ 100 }\u{10FFFF}` // \\u{10FFFF
21+
const a10 = tag`${ 100 }\u{1f622` // \\u{1f622
22+
const a11 = tag`${ 100 }\u{1f622}` // \u{1f622}
23+
const a12 = tag`${ 100 }\x` // \\x
24+
const a13 = tag`${ 100 }\x0` // \\x0
25+
const a14 = tag`${ 100 }\x00` // \x00
2626

2727

2828
//// [invalidTaggedTemplateEscapeSequences.js]
@@ -39,20 +39,20 @@ function tag(str) {
3939
}
4040
var a = tag(__makeTemplateObject(["123"], ["123"]));
4141
var b = tag(__makeTemplateObject(["123 ", ""], ["123 ", ""]), 100);
42-
var x = tag(__makeTemplateObject([undefined, undefined, " wonderful ", undefined], ["\\u{hello} ", " \\xtraordinary ", " wonderful ", " \\uworld"]), 100, 200, 300);
42+
var x = tag(__makeTemplateObject([void 0, void 0, " wonderful ", void 0], ["\\u{hello} ", " \\xtraordinary ", " wonderful ", " \\uworld"]), 100, 200, 300);
4343
var y = "hello} " + 100 + " traordinary " + 200 + " wonderful " + 300 + " world"; // should error with NoSubstitutionTemplate
44-
var z = tag(__makeTemplateObject([undefined], ["\\u{hello} \\xtraordinary wonderful \\uworld"])); // should work with Tagged NoSubstitutionTemplate
44+
var z = tag(__makeTemplateObject([void 0], ["\\u{hello} \\xtraordinary wonderful \\uworld"])); // should work with Tagged NoSubstitutionTemplate
4545
var a1 = tag(__makeTemplateObject(["", "\0"], ["", "\\0"]), 100); // \0
46-
var a2 = tag(__makeTemplateObject(["", undefined], ["", "\\00"]), 100); // \\00
47-
var a3 = tag(__makeTemplateObject(["", undefined], ["", "\\u"]), 100); // \\u
48-
var a4 = tag(__makeTemplateObject(["", undefined], ["", "\\u0"]), 100); // \\u0
49-
var a5 = tag(__makeTemplateObject(["", undefined], ["", "\\u00"]), 100); // \\u00
50-
var a6 = tag(__makeTemplateObject(["", undefined], ["", "\\u000"]), 100); // \\u000
46+
var a2 = tag(__makeTemplateObject(["", void 0], ["", "\\00"]), 100); // \\00
47+
var a3 = tag(__makeTemplateObject(["", void 0], ["", "\\u"]), 100); // \\u
48+
var a4 = tag(__makeTemplateObject(["", void 0], ["", "\\u0"]), 100); // \\u0
49+
var a5 = tag(__makeTemplateObject(["", void 0], ["", "\\u00"]), 100); // \\u00
50+
var a6 = tag(__makeTemplateObject(["", void 0], ["", "\\u000"]), 100); // \\u000
5151
var a7 = tag(__makeTemplateObject(["", "\0"], ["", "\\u0000"]), 100); // \u0000
52-
var a8 = tag(__makeTemplateObject(["", undefined], ["", "\\u{"]), 100); // \\u{
52+
var a8 = tag(__makeTemplateObject(["", void 0], ["", "\\u{"]), 100); // \\u{
5353
var a9 = tag(__makeTemplateObject(["", "\uDBFF\uDFFF"], ["", "\\u{10FFFF}"]), 100); // \\u{10FFFF
54-
var a10 = tag(__makeTemplateObject(["", undefined], ["", "\\u{1f622"]), 100); // \\u{1f622
54+
var a10 = tag(__makeTemplateObject(["", void 0], ["", "\\u{1f622"]), 100); // \\u{1f622
5555
var a11 = tag(__makeTemplateObject(["", "\uD83D\uDE22"], ["", "\\u{1f622}"]), 100); // \u{1f622}
56-
var a12 = tag(__makeTemplateObject(["", undefined], ["", "\\x"]), 100); // \\x
57-
var a13 = tag(__makeTemplateObject(["", undefined], ["", "\\x0"]), 100); // \\x0
56+
var a12 = tag(__makeTemplateObject(["", void 0], ["", "\\x"]), 100); // \\x
57+
var a13 = tag(__makeTemplateObject(["", void 0], ["", "\\x0"]), 100); // \\x0
5858
var a14 = tag(__makeTemplateObject(["", "\0"], ["", "\\x00"]), 100); // \x00

0 commit comments

Comments
 (0)