zrb 0.21.0__tar.gz → 0.23.0__tar.gz

{zrb-0.21.0 → zrb-0.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.21.0
+Version: 0.23.0
 Summary: A Framework to Enhance Your Workflow
 Home-page: https://github.com/state-alchemists/zrb
 License: AGPL-3.0-or-later
@@ -23,7 +23,7 @@ Requires-Dist: jsons (>=1.6.3,<1.7.0)
 Requires-Dist: libcst (>=0.4.9,<0.5.0)
 Requires-Dist: python-dotenv (>=1.0.1,<1.1.0)
 Requires-Dist: ruamel.yaml (>=0.18.6,<0.19.0)
-Requires-Dist: setuptools (>=69.1.1,<69.2.0)
+Requires-Dist: setuptools (>=70.0.0,<70.1.0)
 Requires-Dist: termcolor (>=2.4.0,<2.5.0)
 Requires-Dist: tomlkit (>=0.12.4,<0.13.0)
 Project-URL: Documentation, https://github.com/state-alchemists/zrb

{zrb-0.21.0 → zrb-0.23.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "zrb"
-version = "0.21.0"
+version = "0.23.0"
 description = "A Framework to Enhance Your Workflow"
 authors = ["Go Frendi Gunawan <gofrendiasgard@gmail.com>"]
 license = "AGPL-3.0-or-later"
@@ -21,7 +21,7 @@ libcst = "~0.4.9"
 python-dotenv = "~1.0.1"
 jsons = "~1.6.3"
 "ruamel.yaml" = "~0.18.6"
-setuptools = "~69.1.1"
+setuptools = "~70.0.0"
 autopep8 = "~2.0.4"
 croniter = "~2.0.2"
 tomlkit = "^0.12.4"

{zrb-0.21.0 → zrb-0.23.0}/src/zrb/builtin/project/add/fastapp/crud/_input.py

@@ -13,7 +13,7 @@ plural_entity_name_input = StrInput(
     shortcut="p",
     description="Plural entity name",
     prompt="Plural entity name",
-    default=lambda m: m.get("entity_name") + "s",
+    default=lambda m: m.get("entity_name", "") + "s",
 )
 
 main_column_name_input = StrInput(

{zrb-0.21.0 → zrb-0.23.0}/src/zrb/helper/string/parse_replacement.py

@@ -1,3 +1,5 @@
+import re
+
 from zrb.helper.accessories.color import colored
 from zrb.helper.log import logger
 from zrb.helper.typecheck import typechecked
@@ -10,5 +12,10 @@ logger.debug(colored("Loading zrb.helper.string.parse_replacment", attrs=["dark"
 def parse_replacement(text: str, replacement: Mapping[str, str]):
     new_text = text
     for old, new in replacement.items():
+        if len(new.strip().split("\n")) > 1:
+            pattern = "".join(["^([ \\t]+)", old])
+            new_replacement = "".join(["\\1", new.replace("\n", "\n\\1")])
+            new_text = re.sub(pattern, new_replacement, new_text, flags=re.MULTILINE)
+            continue
         new_text = new_text.replace(old, new)
     return new_text

{zrb-0.21.0 → zrb-0.23.0}/src/zrb/task_input/multiline_input.py

@@ -55,6 +55,7 @@ class MultilineInput(BaseInput):
         name: str,
         shortcut: Optional[str] = None,
         comment_prefix: str = "//",
+        comment_suffix: str = "",
         editor: str = default_editor,
         extension: str = "txt",
         default: Optional[Union[Any, InputDefault]] = None,
@@ -101,14 +102,14 @@ class MultilineInput(BaseInput):
             should_render=should_render,
         )
         self._comment_prefix = comment_prefix
+        self._comment_suffix = comment_suffix
         self._editor = editor
         self._extension = extension
 
     def _wrapped_default(self) -> Any:
         if self.get_name() not in self.__default_cache:
             text = super()._wrapped_default()
-            prompt = self._prompt if isinstance(self._prompt, str) else self.get_name()
-            mark_comment = " ".join([self._comment_prefix, prompt])
+            mark_comment = self._get_mark_comment()
             self.__default_cache[self.get_name()] = edit(
                 editor=self._editor,
                 mark_comment=mark_comment,
@@ -116,3 +117,9 @@ class MultilineInput(BaseInput):
                 extension=self._extension,
             )
         return self.__default_cache[self.get_name()]
+
+    def _get_mark_comment(self):
+        prompt = self._prompt if isinstance(self._prompt, str) else self.get_name()
+        if self._comment_suffix.strip() == "":
+            return " ".join([self._comment_prefix, prompt])
+        return " ".join([self._comment_prefix, prompt, self._comment_suffix])