Skip to content

Commit 7ec2312

Browse files
a-tarasyuka-tarasyuk
committed
feat(7411): add JSXNamespacedName
1 parent c5f493e commit 7ec2312

File tree

51 files changed

+788
-373
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

+788
-373
lines changed

‎src/compiler/checker.ts

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11928,7 +11928,7 @@ namespace ts {
1192811928
function isTypeInvalidDueToUnionDiscriminant(contextualType: Type, obj: ObjectLiteralExpression | JsxAttributes): boolean {
1192911929
const list = obj.properties as NodeArray<ObjectLiteralElementLike | JsxAttributeLike>;
1193011930
return list.some(property => {
11931-
const nameType = property.name && getLiteralTypeFromPropertyName(property.name);
11931+
const nameType = property.name && (isJsxNamespacedName(property.name) ? getStringLiteralType(getTextOfJsxAttributeName(property.name)) : getLiteralTypeFromPropertyName(property.name));
1193211932
const name = nameType && isTypeUsableAsPropertyName(nameType) ? getPropertyNameFromType(nameType) : undefined;
1193311933
const expected = name === undefined ? undefined : getTypeOfPropertyOfType(contextualType, name);
1193411934
return !!expected && isLiteralType(expected) && !isTypeAssignableTo(getTypeOfNode(property), expected);
@@ -17668,8 +17668,8 @@ namespace ts {
1766817668
function *generateJsxAttributes(node: JsxAttributes): ElaborationIterator {
1766917669
if (!length(node.properties)) return;
1767017670
for (const prop of node.properties) {
17671-
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(idText(prop.name))) continue;
17672-
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(idText(prop.name)) };
17671+
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(getTextOfJsxAttributeName(prop.name))) continue;
17672+
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(getTextOfJsxAttributeName(prop.name)) };
1767317673
}
1767417674
}
1767517675

@@ -26930,7 +26930,7 @@ namespace ts {
2693026930
if (!attributesType || isTypeAny(attributesType)) {
2693126931
return undefined;
2693226932
}
26933-
return getTypeOfPropertyOfContextualType(attributesType, attribute.name.escapedText);
26933+
return getTypeOfPropertyOfContextualType(attributesType, getEscapedTextOfJsxAttributeName(attribute.name));
2693426934
}
2693526935
else {
2693626936
return getContextualType(attribute.parent);
@@ -27984,7 +27984,7 @@ namespace ts {
2798427984
attributeSymbol.target = member;
2798527985
attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
2798627986
allAttributesTable?.set(attributeSymbol.escapedName, attributeSymbol);
27987-
if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
27987+
if (getEscapedTextOfJsxAttributeName(attributeDecl.name) === jsxChildrenPropertyName) {
2798827988
explicitlySpecifyChildrenAttribute = true;
2798927989
}
2799027990
}
@@ -44111,8 +44111,9 @@ namespace ts {
4411144111
}
4411244112

4411344113
const { name, initializer } = attr;
44114-
if (!seen.get(name.escapedText)) {
44115-
seen.set(name.escapedText, true);
44114+
const escapedText = getEscapedTextOfJsxAttributeName(name);
44115+
if (!seen.get(escapedText)) {
44116+
seen.set(escapedText, true);
4411644117
}
4411744118
else {
4411844119
return grammarErrorOnNode(name, Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
@@ -44125,25 +44126,11 @@ namespace ts {
4412544126
}
4412644127

4412744128
function checkGrammarJsxName(node: JsxTagNameExpression) {
44128-
if (isPropertyAccessExpression(node)) {
44129-
let propName: JsxTagNameExpression = node;
44130-
do {
44131-
const check = checkGrammarJsxNestedIdentifier(propName.name);
44132-
if (check) {
44133-
return check;
44134-
}
44135-
propName = propName.expression;
44136-
} while (isPropertyAccessExpression(propName));
44137-
const check = checkGrammarJsxNestedIdentifier(propName);
44138-
if (check) {
44139-
return check;
44140-
}
44129+
if (isPropertyAccessExpression(node) && isJsxNamespacedName(node.expression)) {
44130+
return grammarErrorOnNode(node.expression, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
4414144131
}
44142-
44143-
function checkGrammarJsxNestedIdentifier(name: MemberName | ThisExpression) {
44144-
if (isIdentifier(name) && idText(name).indexOf(":") !== -1) {
44145-
return grammarErrorOnNode(name, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
44146-
}
44132+
if (isJsxNamespacedName(node) && getJSXTransformEnabled(compilerOptions) && !isIntrinsicJsxName(node.namespace.escapedText)) {
44133+
return grammarErrorOnNode(node, Diagnostics.React_components_cannot_include_JSX_namespace_names);
4414744134
}
4414844135
}
4414944136

‎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
@@ -1746,6 +1746,8 @@ namespace ts {
17461746
return emitJsxSelfClosingElement(node as JsxSelfClosingElement);
17471747
case SyntaxKind.JsxFragment:
17481748
return emitJsxFragment(node as JsxFragment);
1749+
case SyntaxKind.JsxNamespacedName:
1750+
return emitJsxNamespacedName(node as JsxNamespacedName);
17491751

17501752
// Synthesized list
17511753
case SyntaxKind.SyntaxList:
@@ -3667,6 +3669,12 @@ namespace ts {
36673669
}
36683670
}
36693671

3672+
function emitJsxNamespacedName(node: JsxNamespacedName) {
3673+
emitIdentifierName(node.namespace);
3674+
writePunctuation(":");
3675+
emitIdentifierName(node.name);
3676+
}
3677+
36703678
function emitJsxTagName(node: JsxTagNameExpression) {
36713679
if (node.kind === SyntaxKind.Identifier) {
36723680
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:
@@ -5419,20 +5421,31 @@ namespace ts {
54195421

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

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

5468-
scanJsxIdentifier();
54695481
const pos = getNodePos();
54705482
return finishNode(
54715483
factory.createJsxAttribute(
5472-
parseIdentifierName(),
5484+
parseJsxAttributeName(),
54735485
token() !== SyntaxKind.EqualsToken ? undefined :
54745486
scanJsxAttributeValue() === SyntaxKind.StringLiteral ? parseLiteralNode() as StringLiteral :
54755487
parseJsxExpression(/*inExpressionContext*/ true)
@@ -5478,6 +5490,18 @@ namespace ts {
54785490
);
54795491
}
54805492

5493+
function parseJsxAttributeName() {
5494+
const pos = getNodePos();
5495+
scanJsxIdentifier();
5496+
5497+
const attrName = parseIdentifierName();
5498+
if (parseOptional(SyntaxKind.ColonToken)) {
5499+
scanJsxIdentifier();
5500+
return finishNode(factory.createJsxNamespacedName(attrName, parseIdentifierName()), pos);
5501+
}
5502+
return attrName;
5503+
}
5504+
54815505
function parseJsxSpreadAttribute(): JsxSpreadAttribute {
54825506
const pos = getNodePos();
54835507
parseExpected(SyntaxKind.OpenBraceToken);
@@ -9641,6 +9665,11 @@ namespace ts {
96419665
return true;
96429666
}
96439667

9668+
if (lhs.kind === SyntaxKind.JsxNamespacedName) {
9669+
return lhs.namespace.escapedText === (rhs as JsxNamespacedName).namespace.escapedText &&
9670+
lhs.name.escapedText === (rhs as JsxNamespacedName).name.escapedText;
9671+
}
9672+
96449673
// If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
96459674
// take forms of JsxTagNameExpression which includes an identifier, "this" expression, or another propertyAccessExpression
96469675
// 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)