Skip to content

Commit eac179e

Browse files
a-tarasyuka-tarasyuk
committed
feat(7411): add JSXNamespacedName
1 parent a1e77ed commit eac179e

File tree

51 files changed

+778
-369
lines changed

Some content is hidden

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

51 files changed

+778
-369
lines changed

‎src/compiler/checker.ts‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11927,7 +11927,7 @@ namespace ts {
1192711927
function isTypeInvalidDueToUnionDiscriminant(contextualType: Type, obj: ObjectLiteralExpression | JsxAttributes): boolean {
1192811928
const list = obj.properties as NodeArray<ObjectLiteralElementLike | JsxAttributeLike>;
1192911929
return list.some(property => {
11930-
const nameType = property.name && getLiteralTypeFromPropertyName(property.name);
11930+
const nameType = property.name && (isJsxNamespacedName(property.name) ? getStringLiteralType(getTextOfJsxAttributeName(property.name)) : getLiteralTypeFromPropertyName(property.name));
1193111931
const name = nameType && isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
1193211932
const expected = name === undefined ? undefined : getTypeOfPropertyOfType(contextualType, name);
1193311933
return !!expected && isLiteralType(expected) && !isTypeAssignableTo(getTypeOfNode(property), expected);
@@ -17650,8 +17650,8 @@ namespace ts {
1765017650
function *generateJsxAttributes(node: JsxAttributes): ElaborationIterator {
1765117651
if (!length(node.properties)) return;
1765217652
for (const prop of node.properties) {
17653-
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(idText(prop.name))) continue;
17654-
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(idText(prop.name)) };
17653+
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(getTextOfJsxAttributeName(prop.name))) continue;
17654+
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(getTextOfJsxAttributeName(prop.name)) };
1765517655
}
1765617656
}
1765717657

@@ -26908,7 +26908,7 @@ namespace ts {
2690826908
if (!attributesType || isTypeAny(attributesType)) {
2690926909
return undefined;
2691026910
}
26911-
return getTypeOfPropertyOfContextualType(attributesType, attribute.name.escapedText);
26911+
return getTypeOfPropertyOfContextualType(attributesType, getEscapedTextOfJsxAttributeName(attribute.name));
2691226912
}
2691326913
else {
2691426914
return getContextualType(attribute.parent);
@@ -27962,7 +27962,7 @@ namespace ts {
2796227962
attributeSymbol.target = member;
2796327963
attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
2796427964
allAttributesTable?.set(attributeSymbol.escapedName, attributeSymbol);
27965-
if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
27965+
if (getEscapedTextOfJsxAttributeName(attributeDecl.name) === jsxChildrenPropertyName) {
2796627966
explicitlySpecifyChildrenAttribute = true;
2796727967
}
2796827968
}
@@ -44068,8 +44068,9 @@ namespace ts {
4406844068
}
4406944069

4407044070
const { name, initializer } = attr;
44071-
if (!seen.get(name.escapedText)) {
44072-
seen.set(name.escapedText, true);
44071+
const escapedText = getEscapedTextOfJsxAttributeName(name);
44072+
if (!seen.get(escapedText)) {
44073+
seen.set(escapedText, true);
4407344074
}
4407444075
else {
4407544076
return grammarErrorOnNode(name, Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
@@ -44082,25 +44083,11 @@ namespace ts {
4408244083
}
4408344084

4408444085
function checkGrammarJsxName(node: JsxTagNameExpression) {
44085-
if (isPropertyAccessExpression(node)) {
44086-
let propName: JsxTagNameExpression = node;
44087-
do {
44088-
const check = checkGrammarJsxNestedIdentifier(propName.name);
44089-
if (check) {
44090-
return check;
44091-
}
44092-
propName = propName.expression;
44093-
} while (isPropertyAccessExpression(propName));
44094-
const check = checkGrammarJsxNestedIdentifier(propName);
44095-
if (check) {
44096-
return check;
44097-
}
44086+
if (isPropertyAccessExpression(node) && isJsxNamespacedName(node.expression)) {
44087+
return grammarErrorOnNode(node.expression, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
4409844088
}
44099-
44100-
function checkGrammarJsxNestedIdentifier(name: MemberName | ThisExpression) {
44101-
if (isIdentifier(name) && idText(name).indexOf(":") !== -1) {
44102-
return grammarErrorOnNode(name, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
44103-
}
44089+
if (isJsxNamespacedName(node) && getJSXTransformEnabled(compilerOptions) && !isIntrinsicJsxName(node.namespace.escapedText)) {
44090+
return grammarErrorOnNode(node, Diagnostics.React_components_cannot_include_JSX_namespace_names);
4410444091
}
4410544092
}
4410644093

‎src/compiler/diagnosticMessages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2747,6 +2747,10 @@
27472747
"category": "Error",
27482748
"code": 2637
27492749
},
2750+
"React components cannot include JSX namespace names": {
2751+
"category": "Error",
2752+
"code": 2638
2753+
},
27502754

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

‎src/compiler/emitter.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,6 +1744,8 @@ namespace ts {
17441744
return emitJsxSelfClosingElement(node as JsxSelfClosingElement);
17451745
case SyntaxKind.JsxFragment:
17461746
return emitJsxFragment(node as JsxFragment);
1747+
case SyntaxKind.JsxNamespacedName:
1748+
return emitJsxNamespacedName(node as JsxNamespacedName);
17471749

17481750
// Synthesized list
17491751
case SyntaxKind.SyntaxList:
@@ -3670,6 +3672,12 @@ namespace ts {
36703672
}
36713673
}
36723674

3675+
function emitJsxNamespacedName(node: JsxNamespacedName) {
3676+
emitIdentifierName(node.namespace);
3677+
writePunctuation(":");
3678+
emitIdentifierName(node.name);
3679+
}
3680+
36733681
function emitJsxTagName(node: JsxTagNameExpression) {
36743682
if (node.kind === SyntaxKind.Identifier) {
36753683
emitExpression(node);

‎src/compiler/factory/nodeFactory.ts‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -418,6 +418,9 @@ namespace ts {
418418
updateJsxSpreadAttribute,
419419
createJsxExpression,
420420
updateJsxExpression,
421+
createJsxNamespacedName,
422+
updateJsxNamespacedName,
423+
421424
createCaseClause,
422425
updateCaseClause,
423426
createDefaultClause,
@@ -5036,6 +5039,26 @@ namespace ts {
50365039
: node;
50375040
}
50385041

5042+
// @api
5043+
function createJsxNamespacedName(namespace: Identifier, name: Identifier) {
5044+
const node = createBaseNode<JsxNamespacedName>(SyntaxKind.JsxNamespacedName);
5045+
node.namespace = namespace;
5046+
node.name = name;
5047+
node.transformFlags |=
5048+
propagateChildFlags(node.namespace) |
5049+
propagateChildFlags(node.name) |
5050+
TransformFlags.ContainsJsx;
5051+
return node;
5052+
}
5053+
5054+
// @api
5055+
function updateJsxNamespacedName(node: JsxNamespacedName, namespace: Identifier, name: Identifier) {
5056+
return node.namespace !== namespace
5057+
|| node.name !== name
5058+
? update(createJsxNamespacedName(namespace, name), node)
5059+
: node;
5060+
}
5061+
50395062
//
50405063
// Clauses
50415064
//

‎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
@@ -519,7 +519,9 @@ namespace ts {
519519
visitNode(cbNode, (node as JsxExpression).expression);
520520
case SyntaxKind.JsxClosingElement:
521521
return visitNode(cbNode, (node as JsxClosingElement).tagName);
522-
522+
case SyntaxKind.JsxNamespacedName:
523+
return visitNode(cbNode, (node as JsxNamespacedName).namespace) ||
524+
visitNode(cbNode, (node as JsxNamespacedName).name);
523525
case SyntaxKind.OptionalType:
524526
case SyntaxKind.RestType:
525527
case SyntaxKind.JSDocTypeExpression:
@@ -5418,20 +5420,31 @@ namespace ts {
54185420

54195421
function parseJsxElementName(): JsxTagNameExpression {
54205422
const pos = getNodePos();
5421-
scanJsxIdentifier();
54225423
// JsxElement can have name in the form of
54235424
// propertyAccessExpression
54245425
// primaryExpression in the form of an identifier and "this" keyword
54255426
// We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
54265427
// We only want to consider "this" as a primaryExpression
5427-
let expression: JsxTagNameExpression = token() === SyntaxKind.ThisKeyword ?
5428-
parseTokenNode<ThisExpression>() : parseIdentifierName();
5428+
let expression: JsxTagNameExpression = parseJsxTagName();
54295429
while (parseOptional(SyntaxKind.DotToken)) {
54305430
expression = finishNode(factory.createPropertyAccessExpression(expression, parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ false)), pos) as JsxTagNamePropertyAccess;
54315431
}
54325432
return expression;
54335433
}
54345434

5435+
function parseJsxTagName(): Identifier | JsxNamespacedName | ThisExpression {
5436+
const pos = getNodePos();
5437+
scanJsxIdentifier();
5438+
5439+
const isThis = token() === SyntaxKind.ThisKeyword;
5440+
const tagName = parseIdentifierName();
5441+
if (parseOptional(SyntaxKind.ColonToken)) {
5442+
scanJsxIdentifier();
5443+
return finishNode(factory.createJsxNamespacedName(tagName, parseIdentifierName()), pos);
5444+
}
5445+
return isThis ? finishNode(factory.createToken(SyntaxKind.ThisKeyword), pos) : tagName;
5446+
}
5447+
54355448
function parseJsxExpression(inExpressionContext: boolean): JsxExpression | undefined {
54365449
const pos = getNodePos();
54375450
if (!parseExpected(SyntaxKind.OpenBraceToken)) {
@@ -5464,11 +5477,10 @@ namespace ts {
54645477
return parseJsxSpreadAttribute();
54655478
}
54665479

5467-
scanJsxIdentifier();
54685480
const pos = getNodePos();
54695481
return finishNode(
54705482
factory.createJsxAttribute(
5471-
parseIdentifierName(),
5483+
parseJsxAttributeName(),
54725484
token() !== SyntaxKind.EqualsToken ? undefined :
54735485
scanJsxAttributeValue() === SyntaxKind.StringLiteral ? parseLiteralNode() as StringLiteral :
54745486
parseJsxExpression(/*inExpressionContext*/ true)
@@ -5477,6 +5489,18 @@ namespace ts {
54775489
);
54785490
}
54795491

5492+
function parseJsxAttributeName() {
5493+
const pos = getNodePos();
5494+
scanJsxIdentifier();
5495+
5496+
const attrName = parseIdentifierName();
5497+
if (parseOptional(SyntaxKind.ColonToken)) {
5498+
scanJsxIdentifier();
5499+
return finishNode(factory.createJsxNamespacedName(attrName, parseIdentifierName()), pos);
5500+
}
5501+
return attrName;
5502+
}
5503+
54805504
function parseJsxSpreadAttribute(): JsxSpreadAttribute {
54815505
const pos = getNodePos();
54825506
parseExpected(SyntaxKind.OpenBraceToken);
@@ -9664,6 +9688,11 @@ namespace ts {
96649688
return true;
96659689
}
96669690

9691+
if (lhs.kind === SyntaxKind.JsxNamespacedName) {
9692+
return lhs.namespace.escapedText === (rhs as JsxNamespacedName).namespace.escapedText &&
9693+
lhs.name.escapedText === (rhs as JsxNamespacedName).name.escapedText;
9694+
}
9695+
96679696
// If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
96689697
// take forms of JsxTagNameExpression which includes an identifier, "this" expression, or another propertyAccessExpression
96699698
// 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
@@ -2349,32 +2349,19 @@ namespace ts {
23492349
// everything after it to the token
23502350
// Do note that this means that `scanJsxIdentifier` effectively _mutates_ the visible token without advancing to a new token
23512351
// Any caller should be expecting this behavior and should only read the pos or token value after calling it.
2352-
let namespaceSeparator = false;
23532352
while (pos < end) {
23542353
const ch = text.charCodeAt(pos);
23552354
if (ch === CharacterCodes.minus) {
23562355
tokenValue += "-";
23572356
pos++;
23582357
continue;
23592358
}
2360-
else if (ch === CharacterCodes.colon && !namespaceSeparator) {
2361-
tokenValue += ":";
2362-
pos++;
2363-
namespaceSeparator = true;
2364-
token = SyntaxKind.Identifier; // swap from keyword kind to identifier kind
2365-
continue;
2366-
}
23672359
const oldPos = pos;
23682360
tokenValue += scanIdentifierParts(); // reuse `scanIdentifierParts` so unicode escapes are handled
23692361
if (pos === oldPos) {
23702362
break;
23712363
}
23722364
}
2373-
// Do not include a trailing namespace separator in the token, since this is against the spec.
2374-
if (tokenValue.slice(-1) === ":") {
2375-
tokenValue = tokenValue.slice(0, -1);
2376-
pos--;
2377-
}
23782365
return getIdentifierToken();
23792366
}
23802367
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)