Update parser 'return_type'; Update ver0.0.6

Author: nmd2k

src/codetext/parser/c_sharp_parser.py

@@ -12,7 +12,7 @@ class CsharpParser(LanguageParser):
     BLACKLISTED_FUNCTION_NAMES = []
 
     @staticmethod
-    def get_docstring(node, blob):
+    def get_docstring(node, blob=None):
         """
         Get docstring description for node
         
@@ -22,7 +22,8 @@ def get_docstring(node, blob):
         Returns:
             str: docstring
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         docstring_node = CsharpParser.get_docstring_node(node)
         docstring = '\n'.join(get_node_text(s) for s in docstring_node)
         return docstring
@@ -104,14 +105,15 @@ def get_class_list(node):
         return res
 
     @staticmethod
-    def get_function_metadata(function_node, blob: str) -> Dict[str, Any]:
+    def get_function_metadata(function_node, blob: str=None) -> Dict[str, Any]:
         """
         Function metadata contains:
             - identifier (str): function name
             - parameters (Dict[str, str]): parameter's name and their type (e.g: {'param_a': 'int'})
             - type (str): type
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': {},
@@ -121,7 +123,7 @@ def get_function_metadata(function_node, blob: str) -> Dict[str, Any]:
 
         for child in function_node.children:
             if child.type == 'predefined_type':
-                metadata['type'] = get_node_text(child)
+                metadata['return_type'] = get_node_text(child)
             elif child.type == 'identifier':
                 metadata['identifier'] = get_node_text(child)
             elif child.type == 'parameter_list':
@@ -135,13 +137,14 @@ def get_function_metadata(function_node, blob: str) -> Dict[str, Any]:
         return metadata
 
     @staticmethod
-    def get_class_metadata(class_node, blob: str) -> Dict[str, str]:
+    def get_class_metadata(class_node, blob: str=None) -> Dict[str, str]:
         """
         Class metadata contains:
             - identifier (str): class's name
             - parameters (List[str]): inheritance class
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': '',

src/codetext/parser/cpp_parser.py

@@ -13,7 +13,7 @@ class CppParser(LanguageParser):
     BLACKLISTED_FUNCTION_NAMES = ['main', 'constructor']
 
     @staticmethod
-    def get_docstring(node, blob):
+    def get_docstring(node, blob=None):
         """
         Get docstring description for node
         
@@ -23,7 +23,8 @@ def get_docstring(node, blob):
         Returns:
             str: docstring
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         docstring_node = CppParser.get_docstring_node(node)
         docstring = '\n'.join(get_node_text(s) for s in docstring_node)
         return docstring
@@ -99,14 +100,15 @@ def get_comment_node(node):
         return comment_node
 
     @staticmethod
-    def get_function_metadata(function_node, blob: str) -> Dict[str, Any]:
+    def get_function_metadata(function_node, blob: str=None) -> Dict[str, Any]:
         """
         Function metadata contains:
             - identifier (str): function name
             - parameters (Dict[str, str]): parameter's name and their type (e.g: {'param_a': 'int'})
             - return_type (str or NoneType): function's return type
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': {},
@@ -118,29 +120,41 @@ def get_function_metadata(function_node, blob: str) -> Dict[str, Any]:
             if child.type in ['primitive_type', 'type_identifier']:
                 metadata['return_type'] = get_node_text(child)
                 # search for "function_declarator"
-            elif child.type == 'function_declarator':
+            elif child.type == 'pointer_declarator':
+                for subchild in child.children:
+                    if subchild.type == 'function_declarator':
+                        child = subchild
+            if child.type == 'function_declarator':
                 for subchild in child.children:
                     if subchild.type in ['qualified_identifier', 'identifier']:
                         metadata['identifier'] = get_node_text(subchild)
                     elif subchild.type == 'parameter_list':
                         param_nodes = get_node_by_kind(subchild, ['parameter_declaration'])
                         for param in param_nodes:
-                            for item in param.children:
-                                if item.type in ['type_identifier', 'primitive_type']:
-                                    param_type = get_node_text(item)
-                                elif item.type == 'identifier':
-                                    param_identifier = get_node_text(item)
-                            metadata['parameters'][param_identifier] = param_type
+                            param_type = param.child_by_field_name('type')
+                            param_type = get_node_text(param_type)
+                            list_name = get_node_by_kind(param, ['identifier'])
+                            assert len(list_name) == 1
+                            param_name = get_node_text(list_name[0])
+                            metadata['parameters'][param_name] = param_type
+                            # for item in param.children:
+                                
+                            #     if item.type in ['type_identifier', 'primitive_type']:
+                            #         param_type = get_node_text(item)
+                            #     elif item.type == 'identifier':
+                            #         param_identifier = get_node_text(item)
 
         return metadata
 
     @staticmethod
-    def get_class_metadata(class_node, blob: str) -> Dict[str, str]:
+    def get_class_metadata(class_node, blob: str=None) -> Dict[str, str]:
         """
         Class metadata contains:
             - identifier (str): class's name
             - parameters (List[str]): inheritance class
         """
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': '',

src/codetext/parser/go_parser.py

@@ -71,7 +71,7 @@ def get_docstring_node(node):
         return docstring_node
 
     @staticmethod
-    def get_docstring(node, blob:str):
+    def get_docstring(node, blob:str=None):
         """
         Get docstring description for node
         
@@ -81,7 +81,8 @@ def get_docstring(node, blob:str):
         Returns:
             str: docstring
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         docstring_node = GoParser.get_docstring_node(node)
         docstring = '\n'.join(get_node_text(s) for s in docstring_node)
         return docstring
@@ -92,8 +93,9 @@ def get_function_list(node):
         return res
 
     @staticmethod
-    def get_function_metadata(function_node, blob: str) -> Dict[str, str]:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_function_metadata(function_node, blob: str=None) -> Dict[str, str]:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': {},
@@ -104,16 +106,16 @@ def get_function_metadata(function_node, blob: str) -> Dict[str, str]:
             if child.type in ['field_identifier', 'identifier']:
                 metadata['identifier'] = get_node_text(child)
             elif child.type == 'type_identifier':
-                metadata['type'] = get_node_text(child)
+                metadata['return_type'] = get_node_text(child)
             elif child.type == 'parameter_list':
                 for subchild in child.children:
                     if subchild.type in ['parameter_declaration', 'variadic_parameter_declaration']:
                         identifier_node = subchild.child_by_field_name('name')
-                        param_type = get_node_text(subchild.child_by_field_name('type'))
 
                         if not identifier_node:
                             continue
 
+                        param_type = get_node_text(subchild.child_by_field_name('type'))
                         identifier = get_node_text(identifier_node)
                         if identifier and param_type:
                             metadata['parameters'][identifier] = param_type
@@ -125,6 +127,7 @@ def get_class_list(node):
         pass
 
     @staticmethod
-    def get_class_metadata(class_node, blob) -> Dict[str, str]:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_class_metadata(class_node, blob=None) -> Dict[str, str]:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         pass

src/codetext/parser/java_parser.py

@@ -34,7 +34,7 @@ def get_docstring_node(node):
         return docstring_node
 
     @staticmethod
-    def get_docstring(node, blob):
+    def get_docstring(node, blob=None):
         """
         Get docstring description for node
         
@@ -44,7 +44,8 @@ def get_docstring(node, blob):
         Returns:
             str: docstring
         """
-        logger.info('From version `0.0.6` this function will update argument in the API')
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         docstring_node = JavaParser.get_docstring_node(node)
 
         docstring = ''
@@ -82,8 +83,9 @@ def is_method_body_empty(node):
                     return True
 
     @staticmethod
-    def get_class_metadata(class_node, blob: str) -> Dict[str, str]:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_class_metadata(class_node, blob: str=None) -> Dict[str, str]:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': '',
@@ -101,26 +103,25 @@ def get_class_metadata(class_node, blob: str) -> Dict[str, str]:
         return metadata
 
     @staticmethod
-    def get_function_metadata(function_node, blob: str) -> Dict[str, str]:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_function_metadata(function_node, blob: str=None) -> Dict[str, str]:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
-            'parameters': '',
+            'parameters': {},
             'return_type': None
         }
 
-        params = {}
         for child in function_node.children:
             if child.type == 'identifier':
                 metadata['identifier'] = get_node_text(child)
             elif child.type == 'type_identifier':
-                metadata['type'] = get_node_text(child)
+                metadata['return_type'] = get_node_text(child)
             elif child.type == 'formal_parameters':
-                param_list = get_node_by_kind(child, ['formal_parameter'])
+                param_list = get_node_by_kind(child, ['formal_parameter'])  # speed_parameter
                 for param in param_list:
                     param_type = get_node_text(param.child_by_field_name('type'))
                     identifier = get_node_text(param.child_by_field_name('name'))
-                    params[identifier] = param_type
+                    metadata['parameters'][identifier] = param_type
 
-        metadata['parameters'] = params
         return metadata

src/codetext/parser/javascript_parser.py

@@ -31,8 +31,9 @@ def get_docstring_node(node):
         return docstring_node
 
     @staticmethod
-    def get_docstring(node, blob):
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_docstring(node, blob=None):
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         docstring_node = JavascriptParser.get_docstring_node(node)
 
         docstring = ''
@@ -65,8 +66,9 @@ def get_class_list(node):
         return res
 
     @staticmethod
-    def get_function_metadata(function_node, blob: str) -> Dict[str, str]:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_function_metadata(function_node, blob: str=None) -> Dict[str, str]:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': {},
@@ -77,16 +79,20 @@ def get_function_metadata(function_node, blob: str) -> Dict[str, str]:
             if child.type in ['identifier', 'property_identifier']:
                 metadata['identifier'] = get_node_text(child)
             elif child.type == 'formal_parameters':
-                for subchild in child.children:
-                    if subchild.type == 'identifier':
-                        param.append(get_node_text(subchild))
-
-        metadata['parameters'] = param
+                params = get_node_by_kind(child, ['identifier'])
+                for param in params:
+                    identifier = get_node_text(param)
+                    metadata['parameters'][identifier] = None  # JS not have type define
+        
+        return_statement = get_node_by_kind(function_node, ['return_statement'])
+        if len(return_statement) > 0:
+            metadata['return_type'] = '<not_specific>'
         return metadata
 
     @staticmethod
-    def get_class_metadata(class_node, blob):
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_class_metadata(class_node, blob=None):
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': '',

src/codetext/parser/php_parser.py

@@ -20,8 +20,9 @@ class PhpParser(LanguageParser):
                                   '__unserialize']
 
     @staticmethod
-    def get_docstring(node, blob: str) -> str:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_docstring(node, blob: str=None) -> str:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         docstring_node = PhpParser.get_docstring_node(node)
 
         docstring = ''
@@ -57,34 +58,45 @@ def get_function_list(node):
         return res
 
     @staticmethod
-    def get_function_metadata(function_node, blob: str) -> Dict[str, str]:
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_function_metadata(function_node, blob: str=None) -> Dict[str, str]:
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
-            'parameters': '',
+            'parameters': {},
             'return_type': None,
         }
 
-        params = []
         for n in function_node.children:
             if n.type == 'name':
                 metadata['identifier'] = get_node_text(n)
-            if n.type == 'union_type':
-                metadata['type'] = get_node_text(n)
+            if n.type in ['union_type', 'intersection_type']:
+                metadata['return_type'] = get_node_text(n)
             elif n.type == 'formal_parameters':
                 for param_node in n.children:
                     if param_node.type in ['simple_parameter', 'variadic_parameter', 'property_promotion_parameter']:
-                        identifier = param_node.child_by_field_name('name')
-                        name = get_node_text(identifier)
-                        params.append(name)
+                        identifier = get_node_text(param_node.child_by_field_name('name'))
+                        param_type = param_node.child_by_field_name('type')
+                        if param_type:
+                            param_type = get_node_text(param_type)
+                            metadata['parameters'][identifier] = param_type
+                        else:
+                            metadata['parameters'][identifier] = None
 
-        metadata['parameters'] = params
+        if not metadata['return_type']:
+            return_statement = get_node_by_kind(function_node, ['return_statement'])
+            if len(return_statement) > 0:
+                metadata['return_type'] = '<not_specific>'
+            else:
+                metadata['return_type'] = None
+
         return metadata
 
 
     @staticmethod
-    def get_class_metadata(class_node, blob):
-        logger.info('From version `0.0.6` this function will update argument in the API')
+    def get_class_metadata(class_node, blob: str=None):
+        if blob:
+            logger.info('From version `0.0.6` this function will update argument in the API')
         metadata = {
             'identifier': '',
             'parameters': '',