Refactor factory:jsxFactory to create granular nodes for entity name.

microsoft · bradleyayers · Sep 29, 2016 · Sep 30, 2016 · Sep 30, 2016 · Sep 30, 2016
commit 49ee64d9c6230968b0a7b16fd9f2633511b5078b
diff --git a/src/compiler/factory.ts b/src/compiler/factory.ts
@@ -1618,10 +1618,25 @@ namespace ts {
        );
    }

+    export function createEntityName(entityName: string) {
+        const { entityName: node } = parseIsolatedEntityName(entityName);
+
+        // Parsing occurred in an isolated context, so nodes need to be synthesized
+        // and positions erased for correct positioning in emit.
+        const synthesize = (node: Node) => {
+            node.pos = -1;
+            node.end = -1;
+            node.flags |= NodeFlags.Synthesized;
+            forEachChild(node, synthesize);
+        };
+        synthesize(node);
+
+        return node;
+    }
+
    export function createJsxFactory(jsxFactory: string) {
-        // No explicit validation of this parameter is required. Users are
-        // assumed to have provided a correct string.
-        return createIdentifier(jsxFactory);
+        const entityName = createEntityName(jsxFactory);
+        return createExpressionFromEntityName(entityName);
    }

    export function createReactCreateElement(reactNamespace: string | undefined, parentElement: JsxOpeningLikeElement) {
@@ -1634,7 +1649,7 @@ namespace ts {
        return createPropertyAccess(react, "createElement");
    }

-    export function createJsxFactoryCall(jsxFactory: Identifier | PropertyAccessExpression, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
+    export function createJsxFactoryCall(jsxFactory: Expression, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
        const argumentsList = [tagName];
        if (props) {
            argumentsList.push(props);
-Original file line number
+Diff line change
@@ -1618,10 +1618,25 @@ namespace ts {
             );
         }
+        export function createEntityName(entityName: string) {
             Copy link

  
      
    
  

  
      



      

  Author


  

  
    
      

      
            bradleyayers
  

      

      

      


        Oct 2, 2016


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      I'm skeptical the implementation of this is ideal, open to suggestions.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
  Member


      

  

  
    
      

      
            RyanCavanaugh
  

      

      

      


        Oct 3, 2016


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      @ahejlsberg thoughts?
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
  


          
          
        
      
    

    



    
        
  
    
        
    
  


      
          
  
      
            Copy link

  
      
    
  

  
      

  
    Contributor


      

  

  
    
      

      
            rbuckton
  

      

      

      


        Oct 4, 2016


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Perhaps a parseIsolatedEntityName could set a flag in the parser to have it treat the source as synthetic.
    
  
  


    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
      
  
    
    
      
        
            
    All reactions
+            const { entityName: node } = parseIsolatedEntityName(entityName);
+            // Parsing occurred in an isolated context, so nodes need to be synthesized
+            // and positions erased for correct positioning in emit.
+            const synthesize = (node: Node) => {
+                node.pos = -1;
+                node.end = -1;
+                node.flags |= NodeFlags.Synthesized;
+                forEachChild(node, synthesize);
+            };
+            synthesize(node);
+            return node;
+        }
         export function createJsxFactory(jsxFactory: string) {
-            // No explicit validation of this parameter is required. Users are
-            // assumed to have provided a correct string.
-            return createIdentifier(jsxFactory);
+            const entityName = createEntityName(jsxFactory);
+            return createExpressionFromEntityName(entityName);
         }
         export function createReactCreateElement(reactNamespace: string | undefined, parentElement: JsxOpeningLikeElement) {
@@ -1634,7 +1649,7 @@ namespace ts {
             return createPropertyAccess(react, "createElement");
         }
-        export function createJsxFactoryCall(jsxFactory: Identifier | PropertyAccessExpression, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
+        export function createJsxFactoryCall(jsxFactory: Expression, tagName: Expression, props: Expression, children: Expression[], parentElement: JsxOpeningLikeElement, location: TextRange): LeftHandSideExpression {
             const argumentsList = [tagName];
             if (props) {
                 argumentsList.push(props);
-          Expand Down