Reorganization

Author: elifarley

src/cedarscript_editor/__init__.py

@@ -8,5 +8,21 @@
     "read_file", "write_file", "bow_to_search_range"
 ]
 
-__all__ = ["CEDARScriptEditor"]
-
+def find_commands(content: str):
+    # Regex pattern to match CEDARScript blocks
+    pattern = r'```CEDARScript\n(.*?)```'
+    cedar_script_blocks = re.findall(pattern, content, re.DOTALL)
+    print(f'[find_cedar_commands] Script block count: {len(cedar_script_blocks)}')
+    if len(cedar_script_blocks) == 0:
+        raise ValueError(
+            "No CEDARScript block detected. "
+            "Perhaps you forgot to enclose the block using ```CEDARScript and ``` ? "
+            "Or was that intentional? If so, just write tag <NOSCRIPT/> and nothing else."
+        )
+    cedarscript_parser = CEDARScriptASTParser()
+    for cedar_script in cedar_script_blocks:
+        parsed_commands, parse_errors = cedarscript_parser.parse_script(cedar_script)
+        if parse_errors:
+            raise ValueError(f"CEDARScript parsing errors: {[str(pe) for pe in parse_errors]}")
+        for cedar_command in parsed_commands:
+            yield cedar_command

src/cedarscript_editor/cedarscript_editor.py

@@ -7,9 +7,9 @@
     InsertClause, ReplaceClause, EditingAction, BodyOrWhole, RegionClause, MarkerType
 from cedarscript_ast_parser.cedarscript_ast_parser import MarkerCompatible, RelativeMarker, \
     RelativePositionType
-from ..text_manipulation.indentation_kit import IndentationInfo
-from ..text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
-from ..text_manipulation.text_editor_kit import read_file, write_file, bow_to_search_range
+from text_manipulation.indentation_kit import IndentationInfo
+from text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
+from text_manipulation.text_editor_kit import read_file, write_file, bow_to_search_range
 
 from .identifier_selector import select_finder
 

src/text_manipulation/__init__.py

@@ -0,0 +1,12 @@
+from .indentation_kit import IndentationInfo
+from .range_spec import IdentifierBoundaries, RangeSpec
+from .text_editor_kit import read_file, write_file, bow_to_search_range
+
+__all__ = [
+    "IndentationInfo",
+    "IdentifierBoundaries",
+    "RangeSpec",
+    "read_file",
+    "write_file",
+    "bow_to_search_range",
+]

src/text_manipulation/indentation_kit.py

@@ -67,7 +67,7 @@ class IndentationInfo(NamedTuple):
     message: str | None = None
 
     @classmethod
-    def from_content[T: IndentationInfo, S: Sequence[str]](cls: T, content: str | S) -> T:
+    def from_content(cls, content: str | Sequence[str]) -> 'IndentationInfo':
         """
         Analyzes the indentation in the given content and creates an IndentationInfo instance.
 
@@ -185,7 +185,7 @@ def adjust_line(line: str) -> str:
             return new_indent + line.lstrip()
         return adjust_line
 
-    def apply_relative_indents[S: Sequence[str]](self, content: str | S, context_indent_count: int = 0) -> list[str]:
+    def apply_relative_indents(self, content: str | Sequence[str], context_indent_count: int = 0) -> list[str]:
         """
         Applies relative indentation based on annotations in the content.
 

src/text_manipulation/range_spec.py

@@ -3,7 +3,7 @@
 from typing import NamedTuple
 
 from cedarscript_ast_parser import Marker, RelativeMarker, RelativePositionType, MarkerType, BodyOrWhole
-from text_manipulation.indentation_kit import get_line_indent_count
+from .indentation_kit import get_line_indent_count
 
 MATCH_TYPES = ('exact', 'stripped', 'normalized', 'partial')
 
@@ -36,13 +36,13 @@ def inc(self, count: int = 1):
     def dec(self, count: int = 1):
         return self._replace(start=self.start - count, end=self.end - count)
 
-    def read[S: Sequence[str]](self, src: S) -> S:
+    def read(self, src: Sequence[str]) -> Sequence[str]:
         return src[self.start:self.end]
 
-    def write[S: Sequence[str]](self, src: S, target: S):
+    def write(self, src: Sequence[str], target: Sequence[str]):
         target[self.start:self.end] = src
 
-    def delete[S: Sequence[str]](self, src: S) -> S:
+    def delete(self, src: Sequence[str]) -> Sequence[str]:
         result = self.read(src)
         del src[self.start:self.end]
         return result
@@ -52,12 +52,12 @@ def normalize_line(line: str):
         return re.sub(r'[^\w]', '.', line.strip(), flags=re.UNICODE)
 
     @classmethod
-    def from_line_marker[T: RangeSpec](
-            cls: T,
+    def from_line_marker(
+            cls,
             lines: Sequence[str],
             search_term: Marker,
             search_range: 'RangeSpec' = None
-    ) -> T | None:
+    ):
         """
         Find the index of a specified line within a list of strings, considering different match types and an offset.
 

src/text_manipulation/text_editor_kit.py

@@ -2,7 +2,7 @@
 from typing import Protocol, runtime_checkable
 
 from cedarscript_ast_parser import Marker, RelativeMarker, RelativePositionType, Segment, MarkerType, BodyOrWhole
-from text_manipulation.range_spec import IdentifierBoundaries, RangeSpec
+from .range_spec import IdentifierBoundaries, RangeSpec
 
 
 def read_file(file_path: str) -> str: