python-oracle-apex 0.0.3__tar.gz → 0.0.5__tar.gz

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: python-oracle-apex
-Version: 0.0.3
+Version: 0.0.5
 Summary: Parsing files exported from Oracle APEX
 Author: Maurice Koster
 Author-email: Maurice Koster <maurice@mauricekoster.com>

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "python-oracle-apex"
-version = "0.0.3"
+version = "0.0.5"
 description = "Parsing files exported from Oracle APEX"
 readme = "README.md"
 requires-python = ">=3.13"

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "python-oracle-apex"
-version = "0.0.3"
+version = "0.0.5"
 description = "Parsing files exported from Oracle APEX"
 readme = "README.md"
 authors = [

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/src/python_oracle_apex/__init__.py

@@ -1,4 +1,4 @@
 from .parser import parse_apex_file, parse_apex
-from .reader import parse_page_file
+from .reader.parse import parse_page_file
 from .objects import *
 

python_oracle_apex-0.0.5/src/python_oracle_apex/grammar-24.0.peg

@@ -0,0 +1 @@
+YAML!

python_oracle_apex-0.0.3/src/python_oracle_apex/apexlang-26.1.peg → python_oracle_apex-0.0.5/src/python_oracle_apex/grammar-26.1.peg

@@ -3,9 +3,7 @@ component                           = page_object blank_lines
                                     / process blank_lines
                                     / button blank_lines
                                     / computation_a blank_lines
-
-
-
+                                    / facet 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
@@ -17,6 +15,7 @@ page_direct_property                = "page" ":" ws number
                                     / "name" ":" ws string_like_value
                                     / "alias" ":" ws string_like_value
                                     / "title" ":" ws string_like_value
+                                    / "pageGroup" ":" ws reference
 
 page_group_block                    = page_appearance
                                     / page_navigation
@@ -74,10 +73,14 @@ page_child_component                = region
                                     / dynamic_action
                                     / process
                                     / computation_a
+#####
+# REGION
+#####
 
 region                              = indent "region" (required_ws component_id)? ws "(" line_end region_body_line* indent ")" line_end
 region_body_line                    = region_direct_property_line
                                     / region_group_block
+                                    / region_child_component
                                     / blank_lines
 
 region_direct_property_line         = indent region_direct_property line_end                               
@@ -91,6 +94,11 @@ region_group_block                  = region_layout
                                     / region_advanced
                                     / region_source
                                     / region_component_appearance
+                                    / region_settings
+                                    / region_accessibility
+                                    / region_plugin_avatar
+                                    / region_plugin_badge
+                                    / region_pagination
 
 region_layout                       = indent "layout" ws "{" line_end region_layout_property_line* indent "}" line_end
 region_layout_property_line         = indent region_layout_property line_end
@@ -134,13 +142,13 @@ region_advanced_property            = "savedReportMappingIdentifier" ":" ws stri
 
 region_source                       = indent "source" ws "{" line_end region_source_property_line* indent "}" line_end
 region_source_property_line         = indent region_source_property line_end
-region_source_property              = "sqlQuery" ":" ws multiline_string
-                                    / "plsqlCode" ":" ws multiline_string
-                                    / "plsqlFunctionBody" ":" ws multiline_string
-                                    / "htmlCode" ":" ws multiline_string
+region_source_property              = "sqlQuery" ":" ws code_block
+                                    / "plsqlCode" ":" ws code_block
+                                    / "plsqlFunctionBody" ":" ws code_block
+                                    / "htmlCode" ":" ws code_block
                                     / "text" ":" ws multiline_string
                                     / "language" ":" ws ( "plsql" / "javaScript-mle" )
-                                    / "javaScriptFunctionBody" ":" ws multiline_string
+                                    / "javaScriptFunctionBody" ":" ws code_block
                                     / "location" ":" ws ( "localDatabase" / "restEnabledSql" / "restSource" / "jsonDualityView" / "jsonSource" / "sampleData" )
                                     / "remoteServer" ":" ws reference
                                     / "sampleData" ":" ws ( "employees" / "tasks" / "products" / "projects" )
@@ -174,7 +182,7 @@ region_component_appearance_property = "display" ":" ws string_like_value
                                     / "listTemplate" ":" ws reference
                                     / "breadcrumbTemplate" ":" ws reference
                                     / "cssClasses" ":" ws array_of_string_like_value
-                                    / "templateOptions" ":" ws array_of_string_like_value
+                                    / "templateOptions" ":" ws (array_of_string_like_value / string_like_value)
                                     / "templateType" ":" ws ( "theme" / "predefined" )
                                     / "template" ":" ws ( "html" / "verticalReport" / "csv" / "xml" / reference )
                                     / "customAttributes" ":" ws string_like_value
@@ -182,7 +190,66 @@ region_component_appearance_property = "display" ":" ws string_like_value
                                     / "selectFirstRow" ":" ws boolean
                                     / "fixedRowHeight" ":" ws boolean
 
+region_settings                     = indent "settings" ws "{" line_end region_settings_property_line* indent "}" line_end
+region_settings_property_line       = indent region_settings_property line_end
+region_settings_property            = "timeAxisType" ":" ws ( "auto" / "disabled" / "enabled" / "mixedFrequency" / "skipGaps" ) 
+                                    / "zoomAndScroll" ":" ws ( "false" / "delayed" / "delayedScrollOnly" / "live" / "liveScrollOnly" )
+                                    / "zoomDirection" ":" ws ( "bothAxes" / "xAxis" / "yAxis" )
+                                    / "initialZooming" ":" ws ( "first" / "last" / "none" )
+                                    / "showHorizontalGrid" ":" ws ( "auto" / "true" / "false" )
+                                    / "showVerticalGrid" ":" ws ( "auto" / "true" / "false" )
+                                    / "showRowAxis" ":" ws boolean
+                                    / "axisPosition" ":" ws ( "top" / "bottom" )
+                                    / "pieSelectionEffect" ":" ws ( "explode" / "highlightAndExplode" / "highlight" )
+                                    / "renderAs" ":" ws ( "area" / "bar" / "candlestick" / "line" / "lineWithArea" )
+
+# UNDOCUMENTED! used in brookstrut page 2 (type: Faceted Search)
+                                    / "compactNosThreshold" ":" ws number
+                                    / "showCurrentFacets" ":" ws ( "selector" )
+                                    / "currentFacetsSelector" ":" ws string_like_value
+                                    / "displayChartForTopNValues" ":" ws number
 
+                                    / "title" ":" ws string_like_value
+                                    / "description" ":" ws code_block
+                                    / "miscellaneous" ":" ws code_block
+                                    / "displayAvatar" ":" ws boolean
+                                    / "displayBadge" ":" ws boolean
+
+region_plugin_avatar                = indent "plugin-avatar" ws "{" line_end region_plugin_avatar_property_line* indent "}" line_end
+region_plugin_avatar_property_line  = indent region_plugin_avatar_property line_end
+region_plugin_avatar_property       = "icon" ":" ws string_like_value
+
+region_plugin_badge                 = indent "plugin-badge" ws "{" line_end region_plugin_badge_property_line* indent "}" line_end
+region_plugin_badge_property_line   = indent region_plugin_badge_property line_end
+region_plugin_badge_property        = "label" ":" ws string_like_value
+                                    / "value" ":" ws string_like_value
+
+region_accessibility                = indent "accessibility" ws "{" line_end region_accessibility_property_line* indent "}" line_end
+region_accessibility_property_line  = indent region_accessibility_property line_end
+region_accessibility_property       = "useLandmark" ":" ws boolean
+                                    / "landmarkType" ":" ws ( "banner" / "complementary" / "contentInfo" / "form" / "main" / "navigation" / "region" / "search" )
+                                    / "landmarkLabel" ":" ws string_like_value
+
+region_pagination                   = indent "pagination" ws "{" line_end region_pagination_property_line* indent "}" line_end
+region_pagination_property_line     = indent region_pagination_property line_end
+region_pagination_property          = "type" ":" ws ( "rowRangesXToYNoPagination" / "rowRangesXToYOfZNoPagination" /
+                                         "rowRangesXToYOfZWithPagination" / "setPaginationLinks" /
+                                         "setPaginationSelectList" / "setPaginationSearchEngine" / 
+                                         "externalPaginationButtons" / "nextAndPreviousLinks" /
+                                         "page" / "scroll" 
+                                         )
+                                    / "type" ":" ws string_like_value
+                                    / "displayPosition" ":" ws ( "bottomLeft" / "bottomRight" / "topLeft" / "topRight" /
+                                             "topAndBottomLeft" / "topAndBottomRight" )
+                                    / "partialPageRefresh" ":" ws boolean
+                                    / "showTotalCount" ":" ws boolean
+                                    / "maxRowsToDisplay" ":" ws string_like_value
+                                    / "cardsPerPage" ":" ws number
+                                    / "entitiesPerPage" ":" ws number
+                                    / "initialEntitiesCount" ":" ws number
+
+
+region_child_component              = facet
 page_item                           = indent "pageItem" (required_ws component_id)? ws "(" line_end page_item_body_line* indent ")" line_end
 page_item_body_line                 = page_item_direct_property_line
                                     / page_item_group_block
@@ -268,9 +335,6 @@ page_item_security_property         = "authorizationScheme" ":" ws reference
                                     / "encryptSessionState" ":" ws boolean
                                     / "escapeSpecialChars" ":" ws boolean
                                     / "restrictedChars" ":" ws ( "alphanumWithSpace" / "webSafe" / "noSpecialChar" / "noSpecialCharNoNewline" / "workspaceSchema" / "workspaceUserSchema" / "workspaceUserSchemaId" )
-
-
-
 button                              = indent "button" (required_ws component_id)? ws "(" line_end button_body_line* indent ")" line_end
 button_body_line                    = button_direct_property_line
                                     / button_group_block
@@ -321,7 +385,6 @@ button_behavior_property            = "type" ":" ws string_like_value
                                     / "warnOnUnsavedChanges" ":" ws ( "doNotCheck" )
                                     / "databaseAction" ":" ws ( "insert" / "update" / "delete" )
                                     / "requiresConfirmation" ":" ws boolean
-
 process                             = indent "process" (required_ws component_id)? ws "(" line_end process_body_line* indent ")" line_end
 process_body_line                   = process_direct_property_line
                                     / process_group_block
@@ -358,8 +421,6 @@ process_advanced                    = indent "advanced" ws "{" line_end process_
 process_advanced_property_line      = indent process_advanced_property line_end
 process_advanced_property           = "staticId" ":" ws string_like_value
                                     / "executionMappingIdentifier" ":" ws string_like_value
-
-
 computation_a                       = indent "computation" (required_ws component_id)? ws "(" line_end computation_a_body_line* indent ")" line_end
 computation_a_body_line             = computation_a_direct_property_line
                                     / computation_a_group_block
@@ -388,9 +449,6 @@ computation_a_computation_property  = "type" ":" ws ( "staticValue" / "item" / "
                                     / "javaScriptFunctionBody" ":" ws multiline_string
                                     / "itemName" ":" ws string_like_value
                                     / "preference" ":" ws string_like_value
-
-
-
 dynamic_action                      = indent "dynamicAction" (required_ws component_id)? ws "(" line_end dynamic_action_body_line* indent ")" line_end
 dynamic_action_body_line            = dynamic_action_direct_property_line
                                     / dynamic_action_group_block
@@ -440,8 +498,6 @@ dynamic_action_client_side_condition_property = "type" ":" ws ( "item=value" / "
                                     / "column" ":" ws string_like_value
 
 dynamic_action_child_component      = action_c
-
-
 action_c                            = indent "action" (required_ws component_id)? ws "(" line_end action_c_body_line* indent ")" line_end
 action_c_body_line                  = action_c_direct_property_line
                                     / action_c_group_block
@@ -473,10 +529,64 @@ action_c_execution_property         = "sequence" ":" ws number
                                     / "fireOnInit" ":" ws boolean
                                     / "stopExecutionOnError" ":" ws boolean
                                     / "waitForResult" ":" ws boolean
-
-
-
-
+facet                       = indent "facet" (required_ws component_id)? ws "(" line_end facet_body_line* indent ")" line_end
+facet_body_line             = facet_direct_property_line
+                            / facet_group_block
+
+facet_direct_property_line  = indent facet_direct_property line_end
+facet_direct_property       = "name" ":" ws string_like_value
+                            / "type" ":" ws string_like_value
+
+facet_group_block           = facet_label
+
+facet_group_block           = facet_label
+                            / facet_layout
+                            / facet_source
+                            / facet_lov
+                            / facet_list_entries
+
+facet_label                 = indent "label" ws "{" line_end facet_label_property_line* indent "}" line_end
+facet_label_property_line   = indent facet_label_property line_end
+facet_label_property        = "label" ":" ws string_like_value
+                            / "showLabelForCurrentFacet" ":" ws boolean
+
+facet_layout                = indent "layout" ws "{" line_end facet_layout_property_line* indent "}" line_end
+facet_layout_property_line  = indent facet_layout_property line_end
+facet_layout_property       = "sequence" ":" ws number
+                            / "maxHeight" ":" ws number
+
+facet_source                = indent "source" ws "{" line_end facet_source_property_line* indent "}" line_end
+facet_source_property_line  = indent facet_source_property line_end
+facet_source_property       = "databaseColumn" ":" ws string_like_value
+                            / "dbColumns" ":" ws string_like_value
+                            / "dataType" ":" ws ( "varchar2" / "number" / "date" / "timestamp" / 
+                                "timestampWithTimeZone" / "timestampWithLocalTimeZone" / 
+                                "intervalYearToMonth" / "intervalDayToSecond" / 
+                                "clob" / "blob" / "boolean" / "rowid" / "bfile" / "sdoGeometry" )
+
+facet_lov                   = indent "lov" ws "{" line_end* facet_lov_property_line* indent "}" line_end
+facet_lov_property_line     = indent facet_lov_property line_end
+facet_lov_property          = "type" ":" ws string_like_value
+                            / "lov" ":" ws reference
+                            / "sqlQuery" ":" ws code_block
+                            / "staticValues" ":" ws code_block
+                            / "language" ":" ws ( "plsql" / "javaScript-mle" )
+                            / "plsqlFunctionBody" ":" ws code_block
+                            / "javaScriptFunctionBody" ":" ws code_block
+                            / "sortDirection" ":" ws ( "asc" / "desc" )
+                            / "includeNullOption" ":" ws boolean
+                            / "nullDisplayValue" ":" ws string_like_value
+
+facet_list_entries          = indent "listEntries" ws "{" line_end facet_list_entries_property_line* indent "}" line_end
+facet_list_entries_property_line    = indent facet_list_entries_property line_end
+facet_list_entries_property = "computeCounts" ":" ws boolean
+                            / "showCounts" ":" ws boolean
+                            / "zeroCountEntries" ":" ws ( "hide" / "disable" / "showLast" )
+                            / "sortByTopCounts" ":" ws boolean
+                            / "showSelectedFirst" ":" ws boolean
+                            / "maxDisplayedEntries" ":" ws number
+                            / "allowToExclude" ":" ws boolean
+                            / "displayFilterInitially" ":" ws boolean
 
 reference                       = "@" reference_character*
 component_id                    = string / identifier / number

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/src/python_oracle_apex/objects/__init__.py

@@ -46,7 +46,8 @@ from .region import (
     RegionAdvanced,
     RegionComponentAppearance,
     RegionImage,
-    RegionSource
+    RegionSource,
+    RegionSettings
 )
 from .page import (
     Page, 

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/src/python_oracle_apex/objects/region.py

@@ -13,12 +13,12 @@ class RegionLayout(ApexGroup):
         return self.properties.get('parentRegion', None)
 
 class RegionAppearance(ApexGroup):
-    def __init__(self, initial_data={}):
-        super().__init__(initial_data)
-
+    pass
 
 class RegionSource(ApexGroup):
-    pass
+    @property
+    def list(self):
+        return self.properties.get('list', None)
 
 
 class RegionAdvanced(ApexGroup):
@@ -32,6 +32,10 @@ class RegionComponentAppearance(ApexGroup):
 class RegionImage(ApexGroup):
     pass
 
+class RegionSettings(ApexGroup):
+    pass
+
+
 class Region(ApexObject):
     def __init__(self, component_id=None, initial_data={}):
         super().__init__(component_id, initial_data)
@@ -55,4 +59,13 @@ class Region(ApexObject):
     @property
     def appearance(self):
         return self.groups.get('appearance', RegionAppearance())
-  
+
+    @property
+    def settings(self):
+        return self.groups.get('settings', RegionSettings())
+
+    @property
+    def source(self):
+        return self.groups.get('source', RegionSource())
+      
+    

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/src/python_oracle_apex/parser.py

@@ -10,7 +10,7 @@ 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'
+        inp_file = impresources.files(python_oracle_apex) / f'grammar-{apex_version}.peg'
         with inp_file.open("rt") as f:
             template = f.read()
     

{python_oracle_apex-0.0.3 → python_oracle_apex-0.0.5}/src/python_oracle_apex/visitor/region.py

@@ -17,8 +17,12 @@ class RegionVisitor:
             if type(item) is tuple:
                 if type(item[1]) is dict:
                     region.add_group(item[0], item[1])
+                elif isinstance(item[1], ApexGroup):
+                    region.add_group(item[0], item[1])
                 else:
                     region.add_property(item[0], item[1])
+            elif isinstance(item, ApexObject):
+                region.add_child(item)
             elif item is None:
                 # blanklines
                 continue
@@ -171,7 +175,32 @@ class RegionVisitor:
     def visit_region_component_appearance_property(self, node, visited_children):
         v = visited_children[0]
         match v[0].text:
-            case 'listTemplate' | 'templateOptions':
+            case 'listTemplate' :
                 return (v[0].text, v[3])
+            case 'templateOptions':
+                return (v[0].text, v[3][0])
             case _:
                 raise RuleNotImplemented()
+
+    def visit_region_settings(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 ('settings', RegionSettings(d))
+    
+    def visit_region_settings_property_line(self, node, visited_children):
+        return visited_children[1]
+
+    def visit_region_csettings_property(self, node, visited_children):
+        v = visited_children[0]
+        match v[0].text:
+            # case 'listTemplate' :
+            #     return (v[0].text, v[3])
+            # case 'templateOptions':
+            #     return (v[0].text, v[3][0])
+            case _:
+                raise RuleNotImplemented()