Skip to content

Commit 1ee401a

Browse files
a-tarasyuka-tarasyuk
committed
feat(7411): add JSXNamespacedName
1 parent 3f63804 commit 1ee401a

File tree

50 files changed

+777
-368
lines changed

Some content is hidden

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

50 files changed

+777
-368
lines changed

‎src/compiler/checker.ts‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11866,7 +11866,7 @@ namespace ts {
1186611866
function isTypeInvalidDueToUnionDiscriminant(contextualType: Type, obj: ObjectLiteralExpression | JsxAttributes): boolean {
1186711867
const list = obj.properties as NodeArray<ObjectLiteralElementLike | JsxAttributeLike>;
1186811868
return list.some(property => {
11869-
const nameType = property.name && getLiteralTypeFromPropertyName(property.name);
11869+
const nameType = property.name && (isJsxNamespacedName(property.name) ? getStringLiteralType(getTextOfJsxAttributeName(property.name)) : getLiteralTypeFromPropertyName(property.name));
1187011870
const name = nameType && isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
1187111871
const expected = name === undefined ? undefined : getTypeOfPropertyOfType(contextualType, name);
1187211872
return !!expected && isLiteralType(expected) && !isTypeAssignableTo(getTypeOfNode(property), expected);
@@ -17562,8 +17562,8 @@ namespace ts {
1756217562
function *generateJsxAttributes(node: JsxAttributes): ElaborationIterator {
1756317563
if (!length(node.properties)) return;
1756417564
for (const prop of node.properties) {
17565-
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(idText(prop.name))) continue;
17566-
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(idText(prop.name)) };
17565+
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(getTextOfJsxAttributeName(prop.name))) continue;
17566+
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(getTextOfJsxAttributeName(prop.name)) };
1756717567
}
1756817568
}
1756917569

@@ -26767,7 +26767,7 @@ namespace ts {
2676726767
if (!attributesType || isTypeAny(attributesType)) {
2676826768
return undefined;
2676926769
}
26770-
return getTypeOfPropertyOfContextualType(attributesType, attribute.name.escapedText);
26770+
return getTypeOfPropertyOfContextualType(attributesType, getEscapedTextOfJsxAttributeName(attribute.name));
2677126771
}
2677226772
else {
2677326773
return getContextualType(attribute.parent);
@@ -27820,7 +27820,7 @@ namespace ts {
2782027820
attributeSymbol.target = member;
2782127821
attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
2782227822
allAttributesTable?.set(attributeSymbol.escapedName, attributeSymbol);
27823-
if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
27823+
if (getEscapedTextOfJsxAttributeName(attributeDecl.name) === jsxChildrenPropertyName) {
2782427824
explicitlySpecifyChildrenAttribute = true;
2782527825
}
2782627826
}
@@ -43775,8 +43775,9 @@ namespace ts {
4377543775
}
4377643776

4377743777
const { name, initializer } = attr;
43778-
if (!seen.get(name.escapedText)) {
43779-
seen.set(name.escapedText, true);
43778+
const escapedText = getEscapedTextOfJsxAttributeName(name);
43779+
if (!seen.get(escapedText)) {
43780+
seen.set(escapedText, true);
4378043781
}
4378143782
else {
4378243783
return grammarErrorOnNode(name, Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
@@ -43789,25 +43790,11 @@ namespace ts {
4378943790
}
4379043791

4379143792
function checkGrammarJsxName(node: JsxTagNameExpression) {
43792-
if (isPropertyAccessExpression(node)) {
43793-
let propName: JsxTagNameExpression = node;
43794-
do {
43795-
const check = checkGrammarJsxNestedIdentifier(propName.name);
43796-
if (check) {
43797-
return check;
43798-
}
43799-
propName = propName.expression;
43800-
} while (isPropertyAccessExpression(propName));
43801-
const check = checkGrammarJsxNestedIdentifier(propName);
43802-
if (check) {
43803-
return check;
43804-
}
43793+
if (isPropertyAccessExpression(node) && isJsxNamespacedName(node.expression)) {
43794+
return grammarErrorOnNode(node.expression, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
4380543795
}
43806-
43807-
function checkGrammarJsxNestedIdentifier(name: MemberName | ThisExpression) {
43808-
if (isIdentifier(name) && idText(name).indexOf(":") !== -1) {
43809-
return grammarErrorOnNode(name, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
43810-
}
43796+
if (isJsxNamespacedName(node) && getJSXTransformEnabled(compilerOptions) && !isIntrinsicJsxName(node.namespace.escapedText)) {
43797+
return grammarErrorOnNode(node, Diagnostics.React_components_cannot_include_JSX_namespace_names);
4381143798
}
4381243799
}
4381343800

‎src/compiler/diagnosticMessages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2715,6 +2715,10 @@
27152715
"category": "Error",
27162716
"code": 2635
27172717
},
2718+
"React components cannot include JSX namespace names": {
2719+
"category": "Error",
2720+
"code": 2636
2721+
},
27182722

27192723
"Cannot augment module '{0}' with value exports because it resolves to a non-module entity.": {
27202724
"category": "Error",

‎src/compiler/emitter.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1741,6 +1741,8 @@ namespace ts {
17411741
return emitJsxSelfClosingElement(node as JsxSelfClosingElement);
17421742
case SyntaxKind.JsxFragment:
17431743
return emitJsxFragment(node as JsxFragment);
1744+
case SyntaxKind.JsxNamespacedName:
1745+
return emitJsxNamespacedName(node as JsxNamespacedName);
17441746

17451747
// Synthesized list
17461748
case SyntaxKind.SyntaxList:
@@ -3661,6 +3663,12 @@ namespace ts {
36613663
}
36623664
}
36633665

3666+
function emitJsxNamespacedName(node: JsxNamespacedName) {
3667+
emitIdentifierName(node.namespace);
3668+
writePunctuation(":");
3669+
emitIdentifierName(node.name);
3670+
}
3671+
36643672
function emitJsxTagName(node: JsxTagNameExpression) {
36653673
if (node.kind === SyntaxKind.Identifier) {
36663674
emitExpression(node);

‎src/compiler/factory/nodeFactory.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,9 @@ namespace ts {
414414
updateJsxSpreadAttribute,
415415
createJsxExpression,
416416
updateJsxExpression,
417+
createJsxNamespacedName,
418+
updateJsxNamespacedName,
419+
417420
createCaseClause,
418421
updateCaseClause,
419422
createDefaultClause,
@@ -4977,6 +4980,26 @@ namespace ts {
49774980
: node;
49784981
}
49794982

4983+
// @api
4984+
function createJsxNamespacedName(namespace: Identifier, name: Identifier) {
4985+
const node = createBaseNode<JsxNamespacedName>(SyntaxKind.JsxNamespacedName);
4986+
node.namespace = namespace;
4987+
node.name = name;
4988+
node.transformFlags |=
4989+
propagateChildFlags(node.namespace) |
4990+
propagateChildFlags(node.name) |
4991+
TransformFlags.ContainsJsx;
4992+
return node;
4993+
}
4994+
4995+
// @api
4996+
function updateJsxNamespacedName(node: JsxNamespacedName, namespace: Identifier, name: Identifier) {
4997+
return node.namespace !== namespace
4998+
|| node.name !== name
4999+
? update(createJsxNamespacedName(namespace, name), node)
5000+
: node;
5001+
}
5002+
49805003
//
49815004
// Clauses
49825005
//

‎src/compiler/factory/nodeTests.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -712,6 +712,10 @@ namespace ts {
712712
return node.kind === SyntaxKind.JsxExpression;
713713
}
714714

715+
export function isJsxNamespacedName(node: Node): node is JsxNamespacedName {
716+
return node.kind === SyntaxKind.JsxNamespacedName;
717+
}
718+
715719
// Clauses
716720

717721
export function isCaseClause(node: Node): node is CaseClause {

‎src/compiler/parser.ts‎

Lines changed: 35 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,9 @@ namespace ts {
483483
visitNode(cbNode, (node as JsxExpression).expression);
484484
case SyntaxKind.JsxClosingElement:
485485
return visitNode(cbNode, (node as JsxClosingElement).tagName);
486-
486+
case SyntaxKind.JsxNamespacedName:
487+
return visitNode(cbNode, (node as JsxNamespacedName).namespace) ||
488+
visitNode(cbNode, (node as JsxNamespacedName).name);
487489
case SyntaxKind.OptionalType:
488490
case SyntaxKind.RestType:
489491
case SyntaxKind.JSDocTypeExpression:
@@ -5270,20 +5272,31 @@ namespace ts {
52705272

52715273
function parseJsxElementName(): JsxTagNameExpression {
52725274
const pos = getNodePos();
5273-
scanJsxIdentifier();
52745275
// JsxElement can have name in the form of
52755276
// propertyAccessExpression
52765277
// primaryExpression in the form of an identifier and "this" keyword
52775278
// We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
52785279
// We only want to consider "this" as a primaryExpression
5279-
let expression: JsxTagNameExpression = token() === SyntaxKind.ThisKeyword ?
5280-
parseTokenNode<ThisExpression>() : parseIdentifierName();
5280+
let expression: JsxTagNameExpression = parseJsxTagName();
52815281
while (parseOptional(SyntaxKind.DotToken)) {
52825282
expression = finishNode(factory.createPropertyAccessExpression(expression, parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ false)), pos) as JsxTagNamePropertyAccess;
52835283
}
52845284
return expression;
52855285
}
52865286

5287+
function parseJsxTagName(): Identifier | JsxNamespacedName | ThisExpression {
5288+
const pos = getNodePos();
5289+
scanJsxIdentifier();
5290+
5291+
const isThis = token() === SyntaxKind.ThisKeyword;
5292+
const tagName = parseIdentifierName();
5293+
if (parseOptional(SyntaxKind.ColonToken)) {
5294+
scanJsxIdentifier();
5295+
return finishNode(factory.createJsxNamespacedName(tagName, parseIdentifierName()), pos);
5296+
}
5297+
return isThis ? finishNode(factory.createToken(SyntaxKind.ThisKeyword), pos) : tagName;
5298+
}
5299+
52875300
function parseJsxExpression(inExpressionContext: boolean): JsxExpression | undefined {
52885301
const pos = getNodePos();
52895302
if (!parseExpected(SyntaxKind.OpenBraceToken)) {
@@ -5316,11 +5329,10 @@ namespace ts {
53165329
return parseJsxSpreadAttribute();
53175330
}
53185331

5319-
scanJsxIdentifier();
53205332
const pos = getNodePos();
53215333
return finishNode(
53225334
factory.createJsxAttribute(
5323-
parseIdentifierName(),
5335+
parseJsxAttributeName(),
53245336
token() !== SyntaxKind.EqualsToken ? undefined :
53255337
scanJsxAttributeValue() === SyntaxKind.StringLiteral ? parseLiteralNode() as StringLiteral :
53265338
parseJsxExpression(/*inExpressionContext*/ true)
@@ -5329,6 +5341,18 @@ namespace ts {
53295341
);
53305342
}
53315343

5344+
function parseJsxAttributeName() {
5345+
const pos = getNodePos();
5346+
scanJsxIdentifier();
5347+
5348+
const attrName = parseIdentifierName();
5349+
if (parseOptional(SyntaxKind.ColonToken)) {
5350+
scanJsxIdentifier();
5351+
return finishNode(factory.createJsxNamespacedName(attrName, parseIdentifierName()), pos);
5352+
}
5353+
return attrName;
5354+
}
5355+
53325356
function parseJsxSpreadAttribute(): JsxSpreadAttribute {
53335357
const pos = getNodePos();
53345358
parseExpected(SyntaxKind.OpenBraceToken);
@@ -9565,6 +9589,11 @@ namespace ts {
95659589
return true;
95669590
}
95679591

9592+
if (lhs.kind === SyntaxKind.JsxNamespacedName) {
9593+
return lhs.namespace.escapedText === (rhs as JsxNamespacedName).namespace.escapedText &&
9594+
lhs.name.escapedText === (rhs as JsxNamespacedName).name.escapedText;
9595+
}
9596+
95689597
// If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
95699598
// take forms of JsxTagNameExpression which includes an identifier, "this" expression, or another propertyAccessExpression
95709599
// it is safe to case the expression property as such. See parseJsxElementName for how we parse tag name in Jsx element

‎src/compiler/scanner.ts‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2348,32 +2348,19 @@ namespace ts {
23482348
// everything after it to the token
23492349
// Do note that this means that `scanJsxIdentifier` effectively _mutates_ the visible token without advancing to a new token
23502350
// Any caller should be expecting this behavior and should only read the pos or token value after calling it.
2351-
let namespaceSeparator = false;
23522351
while (pos < end) {
23532352
const ch = text.charCodeAt(pos);
23542353
if (ch === CharacterCodes.minus) {
23552354
tokenValue += "-";
23562355
pos++;
23572356
continue;
23582357
}
2359-
else if (ch === CharacterCodes.colon && !namespaceSeparator) {
2360-
tokenValue += ":";
2361-
pos++;
2362-
namespaceSeparator = true;
2363-
token = SyntaxKind.Identifier; // swap from keyword kind to identifier kind
2364-
continue;
2365-
}
23662358
const oldPos = pos;
23672359
tokenValue += scanIdentifierParts(); // reuse `scanIdentifierParts` so unicode escapes are handled
23682360
if (pos === oldPos) {
23692361
break;
23702362
}
23712363
}
2372-
// Do not include a trailing namespace separator in the token, since this is against the spec.
2373-
if (tokenValue.slice(-1) === ":") {
2374-
tokenValue = tokenValue.slice(0, -1);
2375-
pos--;
2376-
}
23772364
return getIdentifierToken();
23782365
}
23792366
return token;

‎src/compiler/transformers/jsx.ts‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ namespace ts {
173173
if (isJsxSpreadAttribute(elem)) {
174174
spread = true;
175175
}
176-
else if (spread && isJsxAttribute(elem) && elem.name.escapedText === "key") {
176+
else if (spread && isJsxAttribute(elem) && isIdentifier(elem.name) && elem.name.escapedText === "key") {
177177
return true;
178178
}
179179
}
@@ -518,12 +518,15 @@ namespace ts {
518518
return getTagName(node.openingElement);
519519
}
520520
else {
521-
const name = node.tagName;
522-
if (isIdentifier(name) && isIntrinsicJsxName(name.escapedText)) {
523-
return factory.createStringLiteral(idText(name));
521+
const tagName = node.tagName;
522+
if (isIdentifier(tagName) && isIntrinsicJsxName(tagName.escapedText)) {
523+
return factory.createStringLiteral(idText(tagName));
524+
}
525+
else if (isJsxNamespacedName(tagName)) {
526+
return factory.createStringLiteral(idText(tagName.namespace) + ":" + idText(tagName.name));
524527
}
525528
else {
526-
return createExpressionFromEntityName(factory, name);
529+
return createExpressionFromEntityName(factory, tagName);
527530
}
528531
}
529532
}
@@ -535,13 +538,11 @@ namespace ts {
535538
*/
536539
function getAttributeName(node: JsxAttribute): StringLiteral | Identifier {
537540
const name = node.name;
538-
const text = idText(name);
539-
if (/^[A-Za-z_]\w*$/.test(text)) {
540-
return name;
541-
}
542-
else {
543-
return factory.createStringLiteral(text);
541+
if (isIdentifier(name)) {
542+
const text = idText(name);
543+
return (/^[A-Za-z_]\w*$/.test(text)) ? name : factory.createStringLiteral(text);
544544
}
545+
return factory.createStringLiteral(idText(name.namespace) + ":" + idText(name.name));
545546
}
546547

547548
function visitJsxExpression(node: JsxExpression) {

0 commit comments

Comments
 (0)