pyfcstm 0.1.0__tar.gz → 0.1.2__tar.gz

{pyfcstm-0.1.0/pyfcstm.egg-info → pyfcstm-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfcstm
-Version: 0.1.0
+Version: 0.1.2
 Summary: A Python framework for parsing finite state machine DSL and generating executable code in multiple target languages.
 Home-page: https://github.com/hansbug/pyfcstm
 Author: HansBug
@@ -91,13 +91,6 @@ Requires-Dist: ipykernel>=6.15; extra == "doc"
 Requires-Dist: py-cpuinfo>=8.0.0; extra == "doc"
 Requires-Dist: click>=7.0.0; extra == "doc"
 Requires-Dist: pandas; extra == "doc"
-Provides-Extra: build
-Requires-Dist: pyinstaller>=4.7; extra == "build"
-Requires-Dist: setuptools; extra == "build"
-Requires-Dist: hbutils; extra == "build"
-Provides-Extra: dev
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: antlr4-python3-runtime==4.9.3; extra == "dev"
 Provides-Extra: test
 Requires-Dist: coverage>=5; extra == "test"
 Requires-Dist: mock>=4.0.3; extra == "test"
@@ -114,6 +107,13 @@ Requires-Dist: easydict<2,>=1.7; extra == "test"
 Requires-Dist: testtools>=2; extra == "test"
 Requires-Dist: where>=1.0.2; extra == "test"
 Requires-Dist: natsort; extra == "test"
+Provides-Extra: dev
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: antlr4-python3-runtime==4.9.3; extra == "dev"
+Provides-Extra: build
+Requires-Dist: pyinstaller>=4.7; extra == "build"
+Requires-Dist: setuptools; extra == "build"
+Requires-Dist: hbutils; extra == "build"
 
 # pyfcstm
 

{pyfcstm-0.1.0 → pyfcstm-0.1.2}/pyfcstm/config/meta.py

@@ -7,7 +7,7 @@ Overview:
 __TITLE__ = 'pyfcstm'
 
 #: Version of this project.
-__VERSION__ = '0.1.0'
+__VERSION__ = '0.1.2'
 
 #: Short description of the project, will be included in ``setup.py``.
 __DESCRIPTION__ = ('A Python framework for parsing finite state machine DSL and '

{pyfcstm-0.1.0 → pyfcstm-0.1.2}/pyfcstm/model/model.py

@@ -38,6 +38,8 @@ __all__ = [
     'parse_dsl_node_to_state_machine',
 ]
 
+from ..utils import sequence_safe
+
 
 @dataclass
 class Operation(AstExportable):
@@ -877,18 +879,27 @@ class State(AstExportable, PlantUMLExportable):
         :return: PlantUML representation of the state
         :rtype: str
         """
+
+        def _name_safe(sub_state: Optional[str] = None):
+            subpath = [*self.path]
+            if sub_state is not None:
+                subpath.append(sub_state)
+            return sequence_safe(subpath)
+
         with io.StringIO() as sf:
             if self.is_leaf_state:
-                print(f'state {self.name}', file=sf, end='')
+                print(f'state {json.dumps(self.name)} as {_name_safe()}', file=sf, end='')
             else:
-                print(f'state {self.name} {{', file=sf)
+                print(f'state {json.dumps(self.name)} as {_name_safe()} {{', file=sf)
                 for state in self.substates.values():
                     print(indent(state.to_plantuml(), prefix='    '), file=sf)
                 for trans in self.transitions:
                     with io.StringIO() as tf:
-                        print('[*]' if trans.from_state is dsl_nodes.INIT_STATE else trans.from_state, file=tf, end='')
+                        print('[*]' if trans.from_state is dsl_nodes.INIT_STATE
+                              else _name_safe(trans.from_state), file=tf, end='')
                         print(' --> ', file=tf, end='')
-                        print('[*]' if trans.to_state is dsl_nodes.EXIT_STATE else trans.to_state, file=tf, end='')
+                        print('[*]' if trans.to_state is dsl_nodes.EXIT_STATE
+                              else _name_safe(trans.to_state), file=tf, end='')
 
                         if trans.event is not None:
                             print(f' : {".".join(list(trans.event.path[len(self.path):]))}', file=tf, end='')
@@ -920,7 +931,7 @@ class State(AstExportable, PlantUMLExportable):
                     for during_aspect_item in self.on_during_aspects:
                         print(during_aspect_item.to_ast_node(), file=tf)
                     text = json.dumps(tf.getvalue().rstrip()).strip("\"")
-                    print(f'{self.name} : {text}', file=sf, end='')
+                    print(f'{_name_safe()} : {text}', file=sf, end='')
 
             return sf.getvalue()
 
@@ -1021,8 +1032,8 @@ class StateMachine(AstExportable, PlantUMLExportable):
                 print('end note', file=sf)
                 print('', file=sf)
             print(self.root_state.to_plantuml(), file=sf)
-            print(f'[*] --> {self.root_state.name}', file=sf)
-            print(f'{self.root_state.name} --> [*]', file=sf)
+            print(f'[*] --> {sequence_safe(self.root_state.path)}', file=sf)
+            print(f'{sequence_safe(self.root_state.path)} --> [*]', file=sf)
             print('@enduml', file=sf, end='')
             return sf.getvalue()
 
@@ -1147,7 +1158,7 @@ def parse_dsl_node_to_state_machine(dnode: dsl_nodes.StateMachineDSLProgram) ->
 
         transitions = current_state.transitions
         for subnode in node.substates:
-            _inner_force_transitions = [*force_transitions]
+            _inner_force_transitions = []
             for from_state, to_state, my_event_id, trans_event, condition_expr, guard in force_transition_tuples_to_inherit:
                 if from_state is dsl_nodes.ALL or from_state == subnode.name:
                     transitions.append(Transition(

{pyfcstm-0.1.0 → pyfcstm-0.1.2}/pyfcstm/utils/__init__.py

@@ -3,5 +3,6 @@ from .decode import auto_decode
 from .doc import format_multiline_comment
 from .jinja2 import add_builtins_to_env, add_settings_for_env
 from .json import IJsonOp
+from .safe import sequence_safe
 from .text import normalize, to_identifier
 from .validate import ValidationError, ModelValidationError, IValidatable

pyfcstm-0.1.2/pyfcstm/utils/safe.py

@@ -0,0 +1,41 @@
+"""
+Utility module for creating safe sequence identifiers.
+
+This module provides functionality to convert sequences of strings into safe, 
+underscore-separated identifiers. It's particularly useful for generating 
+consistent naming conventions from potentially inconsistent input strings.
+
+The main use case is to take a collection of string segments that may use
+different naming conventions (CamelCase, snake_case, kebab-case, etc.) and
+normalize them into a consistent, safe identifier format using underscores
+as separators.
+"""
+
+import re
+from typing import Iterable
+
+from hbutils.string import underscore
+
+
+def sequence_safe(segments: Iterable[str]) -> str:
+    """
+    Convert a sequence of strings into a safe underscore-separated identifier.
+
+    This function takes a sequence of strings, converts each to underscore format,
+    normalizes multiple consecutive underscores to single underscores, and joins
+    them with double underscores ('__'). This is useful for creating consistent
+    identifiers from potentially inconsistent input strings.
+
+    :param segments: A sequence of strings to be converted into a safe identifier.
+    :type segments: Iterable[str]
+
+    :return: A safe underscore-separated identifier string.
+    :rtype: str
+
+    Example::
+        >>> sequence_safe(['CamelCase', 'snake_case', 'kebab-case'])
+        'camel_case__snake_case__kebab_case'
+        >>> sequence_safe(['Hello World', 'Test___String'])
+        'hello_world__test_string'
+    """
+    return '__'.join(map(lambda x: re.sub(r'_+', '_', underscore(x)), segments))

{pyfcstm-0.1.0 → pyfcstm-0.1.2/pyfcstm.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyfcstm
-Version: 0.1.0
+Version: 0.1.2
 Summary: A Python framework for parsing finite state machine DSL and generating executable code in multiple target languages.
 Home-page: https://github.com/hansbug/pyfcstm
 Author: HansBug
@@ -91,13 +91,6 @@ Requires-Dist: ipykernel>=6.15; extra == "doc"
 Requires-Dist: py-cpuinfo>=8.0.0; extra == "doc"
 Requires-Dist: click>=7.0.0; extra == "doc"
 Requires-Dist: pandas; extra == "doc"
-Provides-Extra: build
-Requires-Dist: pyinstaller>=4.7; extra == "build"
-Requires-Dist: setuptools; extra == "build"
-Requires-Dist: hbutils; extra == "build"
-Provides-Extra: dev
-Requires-Dist: ruff; extra == "dev"
-Requires-Dist: antlr4-python3-runtime==4.9.3; extra == "dev"
 Provides-Extra: test
 Requires-Dist: coverage>=5; extra == "test"
 Requires-Dist: mock>=4.0.3; extra == "test"
@@ -114,6 +107,13 @@ Requires-Dist: easydict<2,>=1.7; extra == "test"
 Requires-Dist: testtools>=2; extra == "test"
 Requires-Dist: where>=1.0.2; extra == "test"
 Requires-Dist: natsort; extra == "test"
+Provides-Extra: dev
+Requires-Dist: ruff; extra == "dev"
+Requires-Dist: antlr4-python3-runtime==4.9.3; extra == "dev"
+Provides-Extra: build
+Requires-Dist: pyinstaller>=4.7; extra == "build"
+Requires-Dist: setuptools; extra == "build"
+Requires-Dist: hbutils; extra == "build"
 
 # pyfcstm
 

{pyfcstm-0.1.0 → pyfcstm-0.1.2}/pyfcstm.egg-info/SOURCES.txt

@@ -52,5 +52,6 @@ pyfcstm/utils/decode.py
 pyfcstm/utils/doc.py
 pyfcstm/utils/jinja2.py
 pyfcstm/utils/json.py
+pyfcstm/utils/safe.py
 pyfcstm/utils/text.py
 pyfcstm/utils/validate.py