fixed flow type interfaces

oyilmaztekin · Nov 7, 2018 · 250822a · 250822a
1 parent 62e42fd
commit 250822a
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 54 deletions.
diff --git a/lib/astStages.js b/lib/astStages.js
@@ -100,51 +100,10 @@ AstStages.prototype.transformToAst = function(ast){
                     "flow":true
                 }
 
-                for(let p of props) {
-                    if ( p.value.hasOwnProperty("id") ) {
-                        if ( p.value.id.hasOwnProperty('id') ) {
-                            fn.params.push(
-                                {
-                                    "name": p.key.name,
-                                    "type": p.value.id.id.name || "type"
-                                }
-                            )
-                        }
-                        else {
-                            fn.params.push(
-                                {
-                                    "name": p.key.name,
-                                    "type": p.value.id.name || "type"
-                                }
-                            )
-                        }
+                const newFn = AstStages.prototype.checkTypeInterfacesFlow(props, fn)
 
-                    }
 
-                    if ( p.value.hasOwnProperty('types') ) {
-                        // FIXME: fix multiple propname : type problem
-                        for (let t of p.value.types) {
-                            if ( t.hasOwnProperty('id') ) {
-                                fn.params.push(
-                                    {
-                                        "name": p.key.name,
-                                        "type": t.id.id.name
-                                    }
-                                )
-                            }
-                            else {
-                                fn.params.push(
-                                    {
-                                        "name": p.key.name,
-                                        "type": t.type
-                                    }
-                                )
-                            }
-                        }
-                    }
-                }
-
-                let processedTemplate = AstStages.prototype.createDocTemplate(fn)
+                let processedTemplate = AstStages.prototype.createDocTemplate(newFn)
 
                 let leadComment = [
                     {

diff --git a/lib/astTransformMethods.js b/lib/astTransformMethods.js
@@ -2,22 +2,22 @@ function AstTransformMethods() {}
 
 AstTransformMethods.prototype.checkParameterTypeForFlow = function( params, fn ) {
     let variableType
-    
+
     for ( let p of params ) {
         if(p.hasOwnProperty('typeAnnotation')){
-            p.typeAnnotation.typeAnnotation.hasOwnProperty("id") 
-            ? variableType = p.typeAnnotation.typeAnnotation.id.name 
+            p.typeAnnotation.typeAnnotation.hasOwnProperty("id")
+            ? variableType = p.typeAnnotation.typeAnnotation.id.name
             : variableType = p.typeAnnotation.typeAnnotation.type
         }
-        
+
         fn.params.push(
             {
                 "name": p.name,
                 "type": variableType || "type"
             }
             )
-        }   
-        
+        }
+
     return variableType
 }
 
@@ -27,16 +27,16 @@ AstTransformMethods.prototype.checkReturnedTypeForFlow = function ( node, fn ) {
         node.returnType.typeAnnotation.hasOwnProperty("id")
         ? fn.returnedValue = node.returnType.typeAnnotation.id.name
         : fn.returnedValue = node.returnType.typeAnnotation.type
-        
+
         fn.flow = true
     }
-    return returnedValue 
+    return returnedValue
 }
 
 AstTransformMethods.prototype.checkReturnedStatementsForJSFiles = function ( activeScope, fn ) {
     if ( activeScope.type === "ReturnStatement" ) {
-        activeScope.argument.name 
-        ? fn.returnedValue = activeScope.argument.name  
+        activeScope.argument.name
+        ? fn.returnedValue = activeScope.argument.name
         : fn.returnedValue = activeScope.argument.value || activeScope.argument.type
         fn.returnedValue = fn.returnedValue.toString()
     }
@@ -57,4 +57,50 @@ AstTransformMethods.prototype.checkStatesForJSFiles = function ( isMemberAssignm
     }
 }
 
-exports.AstTransformer = AstTransformMethods
+AstTransformMethods.prototype.checkTypeInterfacesFlow = function( props, fn ) {
+    for(let p of props) {
+        if ( p.value.hasOwnProperty("type") ) {
+            if(p.value.hasOwnProperty('id')) {
+                    fn.params.push(
+                        {
+                            "name": p.key.name,
+                            "type": p.value.id.name || p.value.id.type
+                        }
+                    )
+            }
+            else {
+                fn.params.push(
+                    {
+                        "name": p.key.name,
+                        "type": p.value.type || "type"
+                    }
+                )
+            }
+       }
+
+        if ( p.value.hasOwnProperty('types') ) {
+            // FIXME: fix multiple propname : type problem
+            for (let t of p.value.types) {
+                if ( t.hasOwnProperty('id') ) {
+                    fn.params.push(
+                        {
+                            "name": p.key.name,
+                            "type": t.id.id.name
+                        }
+                    )
+                }
+                else {
+                    fn.params.push(
+                        {
+                            "name": p.key.name,
+                            "type": t.type
+                        }
+                    )
+                }
+            }
+        }
+    }
+    return fn
+}
+
+exports.AstTransformer = AstTransformMethods