python-oracle-apex 0.0.1__tar.gz → 0.0.2__tar.gz

{python_oracle_apex-0.0.1 → python_oracle_apex-0.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-oracle-apex
-Version: 0.0.1
+Version: 0.0.2
 Summary: Parsing files exported from Oracle APEX
 Author: Maurice Koster
 Author-email: Maurice Koster <maurice@mauricekoster.com>
@@ -20,6 +20,28 @@ Parsing an APEX lang export file into Objects
 page = parse_apex("examples/login.apx")
 ```
 
+Better:
+```python
+parser = ApexParser()
+page = parser.parse_file("examples/login.apx")
+
+```
+
+Or from a string:
+```python
+parser = ApexParser()
+content = """page A (
+    page: 1000
+    name: Hello
+    alias: HOME
+    title: How the West was won
+)
+"""
+page = parser.parse(content)
+assert page.name == "Hello"
+
+```
+
 ## Reading yaml files, pre APEX 26.1
 
 ```python

python_oracle_apex-0.0.2/README.md

@@ -0,0 +1,38 @@
+# python-oracle-apex
+Parsing an APEX lang export file into Objects
+
+## Oracle APEX
+
+## APEXLang - reading .apx files
+
+```python
+page = parse_apex("examples/login.apx")
+```
+
+Better:
+```python
+parser = ApexParser()
+page = parser.parse_file("examples/login.apx")
+
+```
+
+Or from a string:
+```python
+parser = ApexParser()
+content = """page A (
+    page: 1000
+    name: Hello
+    alias: HOME
+    title: How the West was won
+)
+"""
+page = parser.parse(content)
+assert page.name == "Hello"
+
+```
+
+## Reading yaml files, pre APEX 26.1
+
+```python
+page = parse_yaml("examples/login.yaml")
+```

{python_oracle_apex-0.0.1 → python_oracle_apex-0.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-oracle-apex"
-version = "0.0.1"
+version = "0.0.2"
 description = "Parsing files exported from Oracle APEX"
 readme = "README.md"
 requires-python = ">=3.13"
@@ -21,4 +21,8 @@ requires = ["uv_build>=0.12.7,<0.13.0"]
 build-backend = "uv_build"
 
 [dependency-groups]
-dev = ["pytest>=9.1.1"]
+dev = [
+    "coverage>=7.16.0",
+    "pytest>=9.1.1",
+    "pytest-cov>=7.1.0",
+]

{python_oracle_apex-0.0.1 → python_oracle_apex-0.0.2}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "python-oracle-apex"
-version = "0.0.1"
+version = "0.0.2"
 description = "Parsing files exported from Oracle APEX"
 readme = "README.md"
 authors = [
@@ -21,5 +21,7 @@ build-backend = "uv_build"
 
 [dependency-groups]
 dev = [
+    "coverage>=7.16.0",
     "pytest>=9.1.1",
+    "pytest-cov>=7.1.0",
 ]

python_oracle_apex-0.0.2/src/python_oracle_apex/__init__.py

@@ -0,0 +1,4 @@
+from .parser import parse_apex_file, parse_apex
+from .reader import parse_yaml_file
+from .objects import *
+

{python_oracle_apex-0.0.1 → python_oracle_apex-0.0.2}/src/python_oracle_apex/apexlang-26.1.peg

@@ -1,3 +1,9 @@
+component                           = page_object blank_lines
+                                    / region blank_lines
+                                    / process blank_lines
+
+
+
 page_object                         = indent "page" (required_ws component_id)? ws "(" page_body_line* indent ")" line_end
 page_body_line                      = page_direct_property_line
                                     / page_group_block
@@ -15,6 +21,7 @@ page_group_block                    = page_appearance
                                     / page_css
                                     / page_security
                                     / page_advanced
+                                    / page_help
 
 page_appearance                     = indent "appearance" ws "{" line_end page_appearance_property_line* indent "}" line_end
 page_appearance_property_line       = indent page_appearance_property line_end
@@ -53,6 +60,12 @@ page_advanced_property              = "enableMetaTags" ":" ws boolean
                                     / "duplicateSubmissionUrl" ":" ws string_like_value
 
 
+page_help                           = indent "help" ws "{" line_end page_help_property_line* indent "}" line_end
+page_help_property_line             = indent page_help_property line_end
+page_help_property                  = "helpText" ":" ws code_block
+
+
+
 page_child_component                = region
                                     / page_item
                                     / button
@@ -270,9 +283,27 @@ process_group_block                 = process_execution
                                     / process_source
                                     / process_advanced
 
-process_source                      = "ERROR"
-process_execution                   = "ERROR"
-process_advanced                    = "ERROR"
+process_source                      = indent "source" ws "{" line_end process_source_property_line* indent "}" line_end
+process_source_property_line        = indent process_source_property line_end
+process_source_property             = "location" ":" ws ( "localDatabase" / "restEnabledSql" )
+                                    / "language" ":" ws ( "plsql" / "javaScript-mle" )
+                                    / "plsqlCode" ":" ws code_block
+                                    / "javaScriptCode" ":" ws code_block
+                                    / "remoteServer" ":" ws reference
+
+
+process_execution                   = indent "execution" ws "{" line_end process_execution_property_line* indent "}" line_end
+process_execution_property_line     = indent process_execution_property line_end
+process_execution_property          = "sequence" ":" ws number
+                                    / "point" ":" ws string_like_value
+                                    / "runProcess" ":" ws ( "oncePerSessionOrWhenReset" / "oncePerPageVisitDefault" )
+
+
+process_advanced                    = indent "advanced" ws "{" line_end process_advanced_property_line* indent "}" line_end
+process_advanced_property_line      = indent process_advanced_property line_end
+process_advanced_property           = "staticId" ":" ws string_like_value
+                                    / "executionMappingIdentifier" ":" ws string_like_value
+
 
 
 dynamic_action                      = indent "dynamicAction" (required_ws component_id)? ws "(" line_end dynamic_action_body_line* indent ")" line_end
@@ -361,7 +392,7 @@ action_c_execution_property         = "sequence" ":" ws number
 
 reference                       = "@" reference_character*
 component_id                    = string / identifier / number
-code_block                      = multiline_string
+code_block                      = nl? ws multiline_string
                                 / string_like_value
 multiline_string                = "```" ( any_character / nl )* "```"
 blank_lines                     = (ws nl)*

{python_oracle_apex-0.0.1 → python_oracle_apex-0.0.2}/src/python_oracle_apex/objects.py

@@ -227,10 +227,90 @@ class ActionExecution(ApexGroup):
 class Action(ApexObject):
     pass
 
+
+class ProcessExecution(ApexGroup):
+    @property
+    def sequence(self):
+        return self['sequence']
+
+    @property
+    def point(self):
+        return self['point']
+
+    @property
+    def runProcess(self):
+        return self['runProcess']
+
+
+class ProcessAdvanced(ApexGroup):
+    @property
+    def staticId(self):
+        return self['staticId']
+
+    @property
+    def executionMappingIdentifier(self):
+        return self['executionMappingIdentifier']
+
+class ProcessSource(ApexGroup):
+    @property
+    def location(self):
+        return self['location']
+
+    @property
+    def language(self):
+        return self['language']
+
+    @property
+    def remoteServer(self):
+        return self['remoteServer']
+    
+    @property
+    def plsqlCode(self):
+        return self['plsqlCode']
+
 class Process(ApexObject):
     def __init__(self, component_id=None, initial_data={}):
         super().__init__(component_id, initial_data)
 
+    @property
+    def name(self):
+        return self['name']
+
+    @property
+    def type(self):
+        return self['type']
+
+    @property
+    def source(self) -> ProcessSource:
+        return self['source']
+
+
+    @property
+    def execution(self):
+        return self['execution']
+
+    @property
+    def advanced(self):
+        return self['advanced']
+
+
+class PageAppearance(ApexGroup):
+    pass
+
+class PageNavigation(ApexGroup):
+    pass
+
+class PageCss(ApexGroup):
+    pass
+
+class PageSecurity(ApexGroup):
+    pass
+
+class PageAdvanced(ApexGroup):
+    pass
+
+class PageHelp(ApexGroup):
+    pass
 
 class Page(ApexObject):
     def __init__(self, component_id=None, initial_data={}):

python_oracle_apex-0.0.2/src/python_oracle_apex/parser.py

@@ -0,0 +1,47 @@
+from parsimonious import Grammar
+from python_oracle_apex.objects import *
+from importlib import resources as impresources
+from pathlib import Path
+
+
+import python_oracle_apex
+from .visitor import ApxNodeVisitor
+
+
+class ApexParser:
+    def __init__(self, apex_version : str ="26.1"):
+        inp_file = impresources.files(python_oracle_apex) / f'apexlang-{apex_version}.peg'
+        with inp_file.open("rt") as f:
+            template = f.read()
+    
+        self.grammar = Grammar(template)
+        self.visitor = ApxNodeVisitor()
+
+    def parse(self, data):
+        nodes = self.grammar.parse(data)
+        output = self.visitor.visit(nodes)
+        return output
+
+    def parse_file(self, apex_file: str | Path):
+        if type(apex_file) is str:
+            fn = Path(apex_file)
+        else:
+            fn = apex_file
+        with fn.open('r') as f:
+            data = f.read()
+
+        return self.parse(data)
+
+
+def parse_apex_file(apex_file: str | Path, apex_version : str = "26.1") -> ApexObject:
+    return ApexParser(apex_version).parse_file(apex_file)
+
+def parse_apex(data: str, apex_version : str = "26.1") -> ApexObject:
+    return ApexParser(apex_version).parse(data)
+
+    
+
+if __name__ == '__main__':    # pragma: no cover
+    apex_object = parse_apex_file("examples/test.apx")
+    
+    print(apex_object)

python_oracle_apex-0.0.1/src/python_oracle_apex/grammar.py → python_oracle_apex-0.0.2/src/python_oracle_apex/visitor.py

@@ -9,6 +9,10 @@ class RuleNotImplemented(BaseException):
 
 
 class ApxNodeVisitor(NodeVisitor):
+
+    def visit_component(self, node, visited_children):
+        return visited_children[0][0]
+
     def visit_page_object(self, node, visited_children):
         """ Gets the section name. """
         component_id = visited_children[2]
@@ -23,6 +27,8 @@ class ApxNodeVisitor(NodeVisitor):
             if type(item) is tuple:
                 if type(item[1]) is dict:
                     page.add_group(item[0], item[1])
+                elif isinstance(item[1], ApexGroup):
+                    page.add_group(item[0], item[1])
                 else:
                     page.add_property(item[0], item[1])
             elif isinstance(item, ApexObject):
@@ -63,7 +69,7 @@ class ApxNodeVisitor(NodeVisitor):
                 d[item[0]] = item[1]
             else:
                 raise RuleNotImplemented()
-        return ('appearance', d)
+        return ('appearance', PageAppearance(d))
 
     def visit_page_appearance_property_line(self, node, visited_children):
         return visited_children[1]
@@ -81,7 +87,7 @@ class ApxNodeVisitor(NodeVisitor):
                 d[item[0]] = item[1]
             else:
                 raise RuleNotImplemented()
-        return ('navigation', d)
+        return ('navigation', PageNavigation(d))
     
     def visit_page_navigation_property_line(self, node, visited_children):
         return visited_children[1]
@@ -103,7 +109,7 @@ class ApxNodeVisitor(NodeVisitor):
                 d[item[0]] = item[1]
             else:
                 raise RuleNotImplemented()
-        return ('css', d)
+        return ('css', PageCss(d))
 
     def visit_page_css_property_line(self, node, visited_children):
         return visited_children[1]
@@ -125,7 +131,7 @@ class ApxNodeVisitor(NodeVisitor):
                 d[item[0]] = item[1]
             else:
                 raise RuleNotImplemented()
-        return ('security', d)
+        return ('security', PageSecurity(d))
 
     def visit_page_security_property_line(self, node, visited_children):
         return visited_children[1]
@@ -149,7 +155,7 @@ class ApxNodeVisitor(NodeVisitor):
                 d[item[0]] = item[1]
             else:
                 raise RuleNotImplemented()
-        return ('advanced', d)
+        return ('advanced', PageAdvanced(d))
 
     def visit_page_advanced_property_line(self, node, visited_children):
         return visited_children[1]
@@ -165,6 +171,23 @@ class ApxNodeVisitor(NodeVisitor):
             case _:
                 raise RuleNotImplemented()
 
+    def visit_page_help(self, node, visited_children):
+        parts = visited_children[5]
+        d = {}
+        for item in parts:
+            if type(item) is tuple:
+                d[item[0]] = item[1]
+            else:
+                raise RuleNotImplemented()
+        return ('help', PageHelp(d))
+    
+    def visit_page_help_property_line(self, node, visited_children):
+        return visited_children[1]
+
+    def visit_page_help_property(self, node, visited_children):
+        v = visited_children[0]
+        return (v.text, visited_children[3])
+
 
     def visit_region(self, node, visited_children):
         component_id = visited_children[2]
@@ -881,12 +904,89 @@ class ApxNodeVisitor(NodeVisitor):
         return visited_children[0]
 
 
+    def visit_process_source(self, node, visited_children):
+        parts = visited_children[5]
+        d = {}
+        for item in parts:
+            if type(item) is tuple:
+                d[item[0]] = item[1]
+            else:
+                raise RuleNotImplemented()
+        return ('source', ProcessSource(d) )
+
+    def visit_process_source_property_line(self, node, visited_children):
+        return visited_children[1]
+
+    def visit_process_source_property(self, node, visited_children):
+        v = visited_children[0]
+        
+        title, _, _, value = v
+        match title.text:
+            case 'location' | 'language':
+                value = value[0].text
+        return (title.text, value)
+
+
+
+    def visit_process_execution(self, node, visited_children):
+        parts = visited_children[5]
+        d = {}
+        for item in parts:
+            if type(item) is tuple:
+                d[item[0]] = item[1]
+            else:
+                raise RuleNotImplemented()
+        return ('execution', ProcessExecution(d) )
+
+    def visit_process_execution_property_line(self, node, visited_children):
+        return visited_children[1]
+
+    def visit_process_execution_property(self, node, visited_children):
+        v = visited_children[0]
+        
+        title, _, _, value = v
+        if title.text == 'runProcess':
+            value = value[0].text
+        return (title.text, value)
+
+
+    def visit_process_advanced(self, node, visited_children):
+        parts = visited_children[5]
+        d = {}
+        for item in parts:
+            if type(item) is tuple:
+                d[item[0]] = item[1]
+            else:
+                raise RuleNotImplemented()
+        return ('advanced', ProcessAdvanced(d) )
+
+    def visit_process_advanced_property_line(self, node, visited_children):
+        return visited_children[1]
+
+    def visit_process_advanced_property(self, node, visited_children):
+        v = visited_children[0]
+        
+        title, _, _, value = v
+        return (title.text, value)
+
+
+
     def visit_reference(self, node, visited_children):
         return node.text
 
 
     def visit_code_block(self, node, visited_children):
-        return node.text
+        if type(visited_children[0]) is str:
+            return visited_children[0]
+
+        indent_len = len(visited_children[0][1])
+        lines = visited_children[0][2].split("\n")
+        if indent_len == 0:
+            indent_len = lines[-1].find('```')
+        code = [lines[0]]
+        for line in lines[1:]:
+            code.append(line[indent_len:])
+        return "\n".join(code)
 
     def visit_multiline_string(self, node, visited_children):
         return node.text
@@ -925,7 +1025,7 @@ class ApxNodeVisitor(NodeVisitor):
         return None
 
     def visit_ws(self, node, visited_children):
-        return None
+        return node.text
 
     def visit_blank_lines(self, node, visited_children):
             return None
@@ -934,41 +1034,3 @@ class ApxNodeVisitor(NodeVisitor):
     def generic_visit(self, node, visited_children):
         """ The generic visit method. """
         return visited_children or node
-
-def parse_apex_file(apex_file: str | Path, apex_version : str = "26.1") -> ApexObject:
-    if type(apex_file) is str:
-        fn = Path(apex_file)
-    else:
-        fn = apex_file
-    with fn.open('r') as f:
-        data = f.read()
-
-    return parse_apex(data, apex_version)
-
-def parse_apex(data: str, apex_version : str = "26.1") -> ApexObject:
-    inp_file = impresources.files(python_oracle_apex) / f'apexlang-{apex_version}.peg'
-    with inp_file.open("rt") as f:
-        template = f.read()
-
-    grammar = Grammar(template)
-
-    nodes = grammar.parse(data)
-
-    visitor = ApxNodeVisitor()
-    output = visitor.visit(nodes)
-    return output
-
-if __name__ == '__main__':    # pragma: no cover
-
-    
-
-    page = parse_apex(
-"""page A (
-)
-""")
-
-
-    
-    print(page)
-
-    print(page.appearance)

python_oracle_apex-0.0.1/README.md

@@ -1,16 +0,0 @@
-# python-oracle-apex
-Parsing an APEX lang export file into Objects
-
-## Oracle APEX
-
-## APEXLang - reading .apx files
-
-```python
-page = parse_apex("examples/login.apx")
-```
-
-## Reading yaml files, pre APEX 26.1
-
-```python
-page = parse_yaml("examples/login.yaml")
-```

python_oracle_apex-0.0.1/src/python_oracle_apex/__init__.py

@@ -1,6 +0,0 @@
-from .grammar import parse_apex_file, parse_apex
-from .reader import parse_yaml_file
-from .objects import *
-
-def main() -> None:
-    print("Hello from python-oracle-apex!")