Skip to content

Commit c8c81f8

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

File tree

51 files changed

+785
-370
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

+785
-370
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);
@@ -17667,8 +17667,8 @@ namespace ts {
1766717667
function *generateJsxAttributes(node: JsxAttributes): ElaborationIterator {
1766817668
if (!length(node.properties)) return;
1766917669
for (const prop of node.properties) {
17670-
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(idText(prop.name))) continue;
17671-
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(idText(prop.name)) };
17670+
if (isJsxSpreadAttribute(prop) || isHyphenatedJsxName(getTextOfJsxAttributeName(prop.name))) continue;
17671+
yield { errorNode: prop.name, innerExpression: prop.initializer, nameType: getStringLiteralType(getTextOfJsxAttributeName(prop.name)) };
1767217672
}
1767317673
}
1767417674

@@ -26966,7 +26966,7 @@ namespace ts {
2696626966
if (!attributesType || isTypeAny(attributesType)) {
2696726967
return undefined;
2696826968
}
26969-
return getTypeOfPropertyOfContextualType(attributesType, attribute.name.escapedText);
26969+
return getTypeOfPropertyOfContextualType(attributesType, getEscapedTextOfJsxAttributeName(attribute.name));
2697026970
}
2697126971
else {
2697226972
return getContextualType(attribute.parent);
@@ -28020,7 +28020,7 @@ namespace ts {
2802028020
attributeSymbol.target = member;
2802128021
attributesTable.set(attributeSymbol.escapedName, attributeSymbol);
2802228022
allAttributesTable?.set(attributeSymbol.escapedName, attributeSymbol);
28023-
if (attributeDecl.name.escapedText === jsxChildrenPropertyName) {
28023+
if (getEscapedTextOfJsxAttributeName(attributeDecl.name) === jsxChildrenPropertyName) {
2802428024
explicitlySpecifyChildrenAttribute = true;
2802528025
}
2802628026
}
@@ -44221,8 +44221,9 @@ namespace ts {
4422144221
}
4422244222

4422344223
const { name, initializer } = attr;
44224-
if (!seen.get(name.escapedText)) {
44225-
seen.set(name.escapedText, true);
44224+
const escapedText = getEscapedTextOfJsxAttributeName(name);
44225+
if (!seen.get(escapedText)) {
44226+
seen.set(escapedText, true);
4422644227
}
4422744228
else {
4422844229
return grammarErrorOnNode(name, Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
@@ -44235,25 +44236,11 @@ namespace ts {
4423544236
}
4423644237

4423744238
function checkGrammarJsxName(node: JsxTagNameExpression) {
44238-
if (isPropertyAccessExpression(node)) {
44239-
let propName: JsxTagNameExpression = node;
44240-
do {
44241-
const check = checkGrammarJsxNestedIdentifier(propName.name);
44242-
if (check) {
44243-
return check;
44244-
}
44245-
propName = propName.expression;
44246-
} while (isPropertyAccessExpression(propName));
44247-
const check = checkGrammarJsxNestedIdentifier(propName);
44248-
if (check) {
44249-
return check;
44250-
}
44239+
if (isPropertyAccessExpression(node) && isJsxNamespacedName(node.expression)) {
44240+
return grammarErrorOnNode(node.expression, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
4425144241
}
44252-
44253-
function checkGrammarJsxNestedIdentifier(name: MemberName | ThisExpression) {
44254-
if (isIdentifier(name) && idText(name).indexOf(":") !== -1) {
44255-
return grammarErrorOnNode(name, Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
44256-
}
44242+
if (isJsxNamespacedName(node) && getJSXTransformEnabled(compilerOptions) && !isIntrinsicJsxName(node.namespace.escapedText)) {
44243+
return grammarErrorOnNode(node, Diagnostics.React_components_cannot_include_JSX_namespace_names);
4425744244
}
4425844245
}
4425944246

‎src/compiler/diagnosticMessages.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,6 +2769,10 @@
27692769
"category": "Error",
27702770
"code": 2637
27712771
},
2772+
"React components cannot include JSX namespace names": {
2773+
"category": "Error",
2774+
"code": 2638
2775+
},
27722776

27732777
"Cannot augment module '{0}' with value exports because it resolves to a non-module entity.": {
27742778
"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:
@@ -5406,20 +5408,31 @@ namespace ts {
54065408

54075409
function parseJsxElementName(): JsxTagNameExpression {
54085410
const pos = getNodePos();
5409-
scanJsxIdentifier();
54105411
// JsxElement can have name in the form of
54115412
// propertyAccessExpression
54125413
// primaryExpression in the form of an identifier and "this" keyword
54135414
// We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
54145415
// We only want to consider "this" as a primaryExpression
5415-
let expression: JsxTagNameExpression = token() === SyntaxKind.ThisKeyword ?
5416-
parseTokenNode<ThisExpression>() : parseIdentifierName();
5416+
let expression: JsxTagNameExpression = parseJsxTagName();
54175417
while (parseOptional(SyntaxKind.DotToken)) {
54185418
expression = finishNode(factory.createPropertyAccessExpression(expression, parseRightSideOfDot(/*allowIdentifierNames*/ true, /*allowPrivateIdentifiers*/ false)), pos) as JsxTagNamePropertyAccess;
54195419
}
54205420
return expression;
54215421
}
54225422

5423+
function parseJsxTagName(): Identifier | JsxNamespacedName | ThisExpression {
5424+
const pos = getNodePos();
5425+
scanJsxIdentifier();
5426+
5427+
const isThis = token() === SyntaxKind.ThisKeyword;
5428+
const tagName = parseIdentifierName();
5429+
if (parseOptional(SyntaxKind.ColonToken)) {
5430+
scanJsxIdentifier();
5431+
return finishNode(factory.createJsxNamespacedName(tagName, parseIdentifierName()), pos);
5432+
}
5433+
return isThis ? finishNode(factory.createToken(SyntaxKind.ThisKeyword), pos) : tagName;
5434+
}
5435+
54235436
function parseJsxExpression(inExpressionContext: boolean): JsxExpression | undefined {
54245437
const pos = getNodePos();
54255438
if (!parseExpected(SyntaxKind.OpenBraceToken)) {
@@ -5452,9 +5465,8 @@ namespace ts {
54525465
return parseJsxSpreadAttribute();
54535466
}
54545467

5455-
scanJsxIdentifier();
54565468
const pos = getNodePos();
5457-
return finishNode(factory.createJsxAttribute(parseIdentifierName(), parseJsxAttributeValue()), pos);
5469+
return finishNode(factory.createJsxAttribute(parseJsxAttributeName(), parseJsxAttributeValue()), pos);
54585470
}
54595471

54605472
function parseJsxAttributeValue(): JsxAttributeValue | undefined {
@@ -5473,6 +5485,18 @@ namespace ts {
54735485
return undefined;
54745486
}
54755487

5488+
function parseJsxAttributeName() {
5489+
const pos = getNodePos();
5490+
scanJsxIdentifier();
5491+
5492+
const attrName = parseIdentifierName();
5493+
if (parseOptional(SyntaxKind.ColonToken)) {
5494+
scanJsxIdentifier();
5495+
return finishNode(factory.createJsxNamespacedName(attrName, parseIdentifierName()), pos);
5496+
}
5497+
return attrName;
5498+
}
5499+
54765500
function parseJsxSpreadAttribute(): JsxSpreadAttribute {
54775501
const pos = getNodePos();
54785502
parseExpected(SyntaxKind.OpenBraceToken);
@@ -9637,6 +9661,11 @@ namespace ts {
96379661
return true;
96389662
}
96399663

9664+
if (lhs.kind === SyntaxKind.JsxNamespacedName) {
9665+
return lhs.namespace.escapedText === (rhs as JsxNamespacedName).namespace.escapedText &&
9666+
lhs.name.escapedText === (rhs as JsxNamespacedName).name.escapedText;
9667+
}
9668+
96409669
// If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
96419670
// take forms of JsxTagNameExpression which includes an identifier, "this" expression, or another propertyAccessExpression
96429671
// 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
}
@@ -525,12 +525,15 @@ namespace ts {
525525
return getTagName(node.openingElement);
526526
}
527527
else {
528-
const name = node.tagName;
529-
if (isIdentifier(name) && isIntrinsicJsxName(name.escapedText)) {
530-
return factory.createStringLiteral(idText(name));
528+
const tagName = node.tagName;
529+
if (isIdentifier(tagName) && isIntrinsicJsxName(tagName.escapedText)) {
530+
return factory.createStringLiteral(idText(tagName));
531+
}
532+
else if (isJsxNamespacedName(tagName)) {
533+
return factory.createStringLiteral(idText(tagName.namespace) + ":" + idText(tagName.name));
531534
}
532535
else {
533-
return createExpressionFromEntityName(factory, name);
536+
return createExpressionFromEntityName(factory, tagName);
534537
}
535538
}
536539
}
@@ -542,13 +545,11 @@ namespace ts {
542545
*/
543546
function getAttributeName(node: JsxAttribute): StringLiteral | Identifier {
544547
const name = node.name;
545-
const text = idText(name);
546-
if (/^[A-Za-z_]\w*$/.test(text)) {
547-
return name;
548-
}
549-
else {
550-
return factory.createStringLiteral(text);
548+
if (isIdentifier(name)) {
549+
const text = idText(name);
550+
return (/^[A-Za-z_]\w*$/.test(text)) ? name : factory.createStringLiteral(text);
551551
}
552+
return factory.createStringLiteral(idText(name.namespace) + ":" + idText(name.name));
552553
}
553554

554555
function visitJsxExpression(node: JsxExpression) {

0 commit comments

Comments
 (0)