When emitting use jsx factory entity expression if provided

sheetalkamat · sheetalkamat · commit 3d6950d023b8 · 2016-11-09T16:40:11.000-08:00
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -1628,7 +1628,34 @@ namespace ts {
         return react;
     }
 
-    export function createReactCreateElement(reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
+    function createJsxFactoryExpressionFromEntityName(jsxFactory: EntityName, parent: JsxOpeningLikeElement): Expression {
+        if (isQualifiedName(jsxFactory)) {
+            return createPropertyAccess(
+                createJsxFactoryExpressionFromEntityName(
+                    jsxFactory.left,
+                    parent
+                ),
+                setEmitFlags(
+                    getMutableClone(jsxFactory.right),
+                    EmitFlags.NoSourceMap
+                )
+            );
+        }
+        else {
+            return createReactNamespace(jsxFactory.text, parent);
+        }
+    }
+
+    function createJsxFactoryExpression(jsxFactoryEntity: EntityName, reactNamespace: string, parent: JsxOpeningLikeElement): Expression {
+        return jsxFactoryEntity ?
+            createJsxFactoryExpressionFromEntityName(jsxFactoryEntity, parent) :
+            createPropertyAccess(
+                createReactNamespace(reactNamespace, parent),
+                "createElement"
+            );
+    }
+
+    export function createExpressionForJsxElement(jsxFactoryEntity: EntityName, reactNamespace: string, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
         const argumentsList = [tagName];
         if (props) {
             argumentsList.push(props);
@@ -1651,10 +1678,7 @@ namespace ts {
         }
 
         return createCall(
-            createPropertyAccess(
-                createReactNamespace(reactNamespace, parentElement),
-                "createElement"
-            ),
+            createJsxFactoryExpression(jsxFactoryEntity, reactNamespace, parentElement),
             /*typeArguments*/ undefined,
             argumentsList,
             location
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -731,6 +731,7 @@ namespace ts {
                 writeFile: writeFileCallback || (
                     (fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),
                 isEmitBlocked,
+                getJsxFactoryEntity: program.getJsxFactoryEntity,
             };
         }
 
diff --git a/src/compiler/transformers/jsx.ts b/src/compiler/transformers/jsx.ts
@@ -113,7 +113,8 @@ namespace ts {
                     || createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);
             }
 
-            const element = createReactCreateElement(
+            const element = createExpressionForJsxElement(
+                context.getEmitHost().getJsxFactoryEntity(),
                 compilerOptions.reactNamespace,
                 tagName,
                 objectProperties,
diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -34,6 +34,8 @@ namespace ts {
         /* @internal */
         isSourceFileFromExternalLibrary(file: SourceFile): boolean;
 
+        /* @internal */
+        getJsxFactoryEntity(): EntityName;
         getCommonSourceDirectory(): string;
         getCanonicalFileName(fileName: string): string;
         getNewLine(): string;
diff --git a/tests/baselines/reference/jsxFactoryIdentifier.js b/tests/baselines/reference/jsxFactoryIdentifier.js
@@ -75,8 +75,8 @@ let c;
 class A {
     view() {
         return [
-            React.createElement("meta", { content: "helloworld" }),
-            React.createElement("meta", { content: c.a.b })
+            createElement("meta", { content: "helloworld" }),
+            createElement("meta", { content: c.a.b })
         ];
     }
 }
diff --git a/tests/baselines/reference/jsxFactoryQualifiedName.js b/tests/baselines/reference/jsxFactoryQualifiedName.js
@@ -74,8 +74,8 @@ let c;
 class A {
     view() {
         return [
-            React.createElement("meta", { content: "helloworld" }),
-            React.createElement("meta", { content: c.a.b })
+            Element_1.Element.createElement("meta", { content: "helloworld" }),
+            Element_1.Element.createElement("meta", { content: c.a.b })
         ];
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -731,6 +731,7 @@ namespace ts {`
`731`	`731`	`writeFile: writeFileCallback \|\| (`
`732`	`732`	`(fileName, data, writeByteOrderMark, onError, sourceFiles) => host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles)),`
`733`	`733`	`isEmitBlocked,`
	`734`	`+ getJsxFactoryEntity: program.getJsxFactoryEntity,`
`734`	`735`	`};`
`735`	`736`	`}`
`736`	`737`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ namespace ts {`
`113`	`113`	`\|\| createAssignHelper(currentSourceFile.externalHelpersModuleName, segments);`
`114`	`114`	`}`
`115`	`115`
`116`		`- const element = createReactCreateElement(`
	`116`	`+ const element = createExpressionForJsxElement(`
	`117`	`+ context.getEmitHost().getJsxFactoryEntity(),`
`117`	`118`	`compilerOptions.reactNamespace,`
`118`	`119`	`tagName,`
`119`	`120`	`objectProperties,`
Original file line number	Diff line number	Diff line change
`@@ -75,8 +75,8 @@ let c;`
`75`	`75`	`class A {`
`76`	`76`	`view() {`
`77`	`77`	`return [`
`78`		`- React.createElement("meta", { content: "helloworld" }),`
`79`		`- React.createElement("meta", { content: c.a.b })`
	`78`	`+ createElement("meta", { content: "helloworld" }),`
	`79`	`+ createElement("meta", { content: c.a.b })`
`80`	`80`	`];`
`81`	`81`	`}`
`82`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,8 +74,8 @@ let c;`
`74`	`74`	`class A {`
`75`	`75`	`view() {`
`76`	`76`	`return [`
`77`		`- React.createElement("meta", { content: "helloworld" }),`
`78`		`- React.createElement("meta", { content: c.a.b })`
	`77`	`+ Element_1.Element.createElement("meta", { content: "helloworld" }),`
	`78`	`+ Element_1.Element.createElement("meta", { content: c.a.b })`
`79`	`79`	`];`
`80`	`80`	`}`
`81`	`81`	`}`