zrb 0.0.52__py3-none-any.whl → 0.0.53__py3-none-any.whl

zrb/builtin/generator/fastapp_crud/template/src/kebab-app-name/src/module/snake_module_name/entity/snake_entity_name/api.py

@@ -7,8 +7,8 @@ from module.auth.core import Authorizer
 from module.snake_module_name.schema.snake_entity_name import (
     PascalEntityName, PascalEntityNameData, PascalEntityNameResult
 )
-from module.auth.schema.token import TokenData
-from module.auth.component import token_scheme
+from module.auth.schema.token import AccessTokenData
+from module.auth.component import access_token_scheme
 
 
 def register_api(
@@ -25,7 +25,7 @@ def register_api(
     )
     async def get_snake_entity_names(
         keyword: str = '', limit: int = 100, offset: int = 0,
-        user_token_data: TokenData = Depends(token_scheme)
+        user_token_data: AccessTokenData = Depends(access_token_scheme)
     ):
         if not await authorizer.is_having_permission(
             user_token_data.user_id, 'snake_module_name:snake_entity_name:get'
@@ -48,7 +48,8 @@ def register_api(
         '/api/v1/kebab-module-name/kebab-plural-entity-name/{id}', response_model=PascalEntityName
     )
     async def get_snake_entity_name_by_id(
-        id: str, user_token_data: TokenData = Depends(token_scheme)
+        id: str,
+        user_token_data: AccessTokenData = Depends(access_token_scheme)
     ):
         if not await authorizer.is_having_permission(
             user_token_data.user_id, 'snake_module_name:snake_entity_name:get_by_id'
@@ -68,7 +69,7 @@ def register_api(
     )
     async def insert_snake_entity_name(
         data: PascalEntityNameData,
-        user_token_data: TokenData = Depends(token_scheme)
+        user_token_data: AccessTokenData = Depends(access_token_scheme)
     ):
         if not await authorizer.is_having_permission(
             user_token_data.user_id, 'snake_module_name:snake_entity_name:insert'
@@ -88,7 +89,7 @@ def register_api(
     )
     async def update_snake_entity_name(
         id: str, data: PascalEntityNameData,
-        user_token_data: TokenData = Depends(token_scheme)
+        user_token_data: AccessTokenData = Depends(access_token_scheme)
     ):
         if not await authorizer.is_having_permission(
             user_token_data.user_id, 'snake_module_name:snake_entity_name:update'
@@ -107,7 +108,8 @@ def register_api(
         '/api/v1/kebab-module-name/kebab-plural-entity-name/{id}', response_model=PascalEntityName
     )
     async def delete_snake_entity_name(
-        id: str, user_token_data: TokenData = Depends(token_scheme)
+        id: str,
+        user_token_data: AccessTokenData = Depends(access_token_scheme)
     ):
         if not await authorizer.is_having_permission(
             user_token_data.user_id, 'snake_module_name:snake_entity_name:delete'

zrb/builtin/generator/fastapp_crud/template/src/kebab-app-name/src/module/snake_module_name/entity/snake_entity_name/rpc.py

@@ -7,7 +7,7 @@ from module.snake_module_name.component.model.snake_entity_name_model import (
     snake_entity_name_model
 )
 from module.snake_module_name.schema.snake_entity_name import PascalEntityNameData
-from module.auth.schema.token import TokenData
+from module.auth.schema.token import AccessTokenData
 
 
 def register_rpc(
@@ -48,7 +48,7 @@ def register_rpc(
         data: Mapping[str, Any],
         user_token_data: Mapping[str, Any]
     ) -> Mapping[str, Any]:
-        user_token_data = TokenData(**user_token_data)
+        user_token_data = AccessTokenData(**user_token_data)
         data['created_by'] = user_token_data.user_id
         data['updated_by'] = user_token_data.user_id
         row = await snake_entity_name_model.insert(
@@ -62,7 +62,7 @@ def register_rpc(
         data: Mapping[str, Any],
         user_token_data: Mapping[str, Any]
     ) -> Mapping[str, Any]:
-        user_token_data = TokenData(**user_token_data)
+        user_token_data = AccessTokenData(**user_token_data)
         data['updated_by'] = user_token_data.user_id
         row = await snake_entity_name_model.update(
             id=id, data=PascalEntityNameData(**data)
@@ -74,6 +74,6 @@ def register_rpc(
         id: str,
         user_token_data: Mapping[str, Any]
     ) -> Mapping[str, Any]:
-        user_token_data = TokenData(**user_token_data)
+        user_token_data = AccessTokenData(**user_token_data)
         row = await snake_entity_name_model.delete(id=id)
         return row.dict()

zrb/builtin/generator/fastapp_field/add.py

@@ -1,13 +1,13 @@
 from typing import Any
-from ..._group import project_add_group
-from ....task.task import Task
-from ....task.decorator import python_task
-from ....runner import runner
 from .._common.input import (
     project_dir_input, app_name_input, module_name_input, entity_name_input,
     column_name_input, column_type_input
 )
 from .._common.helper import validate_project_dir
+from ..._group import project_add_group
+from ....task.task import Task
+from ....task.decorator import python_task
+from ....runner import runner
 from ....helper import util
 from ....helper.codemod.add_property_to_class import add_property_to_class
 from ....helper.codemod.add_key_value_to_dict import add_key_value_to_dict
@@ -15,6 +15,7 @@ from ....helper.file.text import read_text_file_async, write_text_file_async
 
 import asyncio
 import os
+import re
 
 current_dir = os.path.dirname(__file__)
 
@@ -78,10 +79,16 @@ async def add_fastapp_field(*args: Any, **kwargs: Any):
     column_name = kwargs.get('column_name')
     column_type = kwargs.get('column_name')
     kebab_app_name = util.to_kebab_case(app_name)
+    kebab_module_name = util.to_kebab_case(module_name)
     snake_module_name = util.to_snake_case(module_name)
+    kebab_entity_name = util.to_kebab_case(entity_name)
     snake_entity_name = util.to_snake_case(entity_name)
     pascal_entity_name = util.to_pascal_case(entity_name)
     snake_column_name = util.to_snake_case(column_name)
+    kebab_column_name = util.to_kebab_case(column_name)
+    capitalized_human_readable_column_name = util.to_capitalized_human_readable( # noqa
+        column_name
+    )
     await asyncio.gather(
         asyncio.create_task(add_column_to_test(
             task, project_dir, kebab_app_name, snake_module_name,
@@ -97,10 +104,202 @@ async def add_fastapp_field(*args: Any, **kwargs: Any):
             snake_entity_name, pascal_entity_name, snake_column_name,
             column_type
         )),
+        asyncio.create_task(add_column_to_list_page(
+            task, project_dir, kebab_app_name, kebab_module_name,
+            kebab_entity_name, snake_column_name,
+            capitalized_human_readable_column_name
+        )),
+        asyncio.create_task(add_column_to_detail_page(
+            task, project_dir, kebab_app_name, kebab_module_name,
+            kebab_entity_name, kebab_column_name, snake_column_name,
+            capitalized_human_readable_column_name
+        )),
+        asyncio.create_task(add_column_to_delete_page(
+            task, project_dir, kebab_app_name, kebab_module_name,
+            kebab_entity_name, kebab_column_name, snake_column_name,
+            capitalized_human_readable_column_name
+        )),
+        asyncio.create_task(add_column_to_update_page(
+            task, project_dir, kebab_app_name, kebab_module_name,
+            kebab_entity_name, kebab_column_name, snake_column_name,
+            capitalized_human_readable_column_name
+        )),
+        asyncio.create_task(add_column_to_insert_page(
+            task, project_dir, kebab_app_name, kebab_module_name,
+            kebab_entity_name, kebab_column_name, snake_column_name,
+            capitalized_human_readable_column_name
+        )),
     )
     task.print_out('Success')
 
 
+async def add_column_to_insert_page(
+    task: Task,
+    project_dir: str,
+    kebab_app_name: str,
+    kebab_module_name: str,
+    kebab_entity_name: str,
+    kebab_column_name: str,
+    snake_column_name: str,
+    capitalized_human_readable_column_name: str
+):
+    list_page_file_path = os.path.join(
+        project_dir, 'src', kebab_app_name, 'src', 'frontend', 'src', 'routes',
+        kebab_module_name, kebab_entity_name, 'new', '+page.svelte'
+    )
+    task.print_out(f'Read HTML from: {list_page_file_path}')
+    html_content = await read_text_file_async(list_page_file_path)
+    task.print_out('Add field to insert page')
+    regex = r"(.*)(<!-- DON'T DELETE: insert new field here-->)"
+    subst = '\\n'.join([
+        '\\1<div class="mb-4">',
+        f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>', # noqa
+        f'\\1    <input type="text" class="input w-full" id="{kebab_column_name}" placeholder="{capitalized_human_readable_column_name}" bind:value=' + '{row.' + snake_column_name + '}>', # noqa
+        '\\1</div>',
+        '\\1\\2'
+    ])
+    html_content = re.sub(
+        regex, subst, html_content, 0, re.MULTILINE
+    )
+    task.print_out(f'Write modified HTML to: {list_page_file_path}')
+    await write_text_file_async(list_page_file_path, html_content)
+
+
+async def add_column_to_update_page(
+    task: Task,
+    project_dir: str,
+    kebab_app_name: str,
+    kebab_module_name: str,
+    kebab_entity_name: str,
+    kebab_column_name: str,
+    snake_column_name: str,
+    capitalized_human_readable_column_name: str
+):
+    list_page_file_path = os.path.join(
+        project_dir, 'src', kebab_app_name, 'src', 'frontend', 'src', 'routes',
+        kebab_module_name, kebab_entity_name, 'update', '[id]', '+page.svelte'
+    )
+    task.print_out(f'Read HTML from: {list_page_file_path}')
+    html_content = await read_text_file_async(list_page_file_path)
+    task.print_out('Add field to update page')
+    regex = r"(.*)(<!-- DON'T DELETE: insert new field here-->)"
+    subst = '\\n'.join([
+        '\\1<div class="mb-4">', 
+        f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>', # noqa
+        f'\\1    <input type="text" class="input w-full" id="{kebab_column_name}" placeholder="{capitalized_human_readable_column_name}" bind:value=' + '{row.' + snake_column_name + '}>', # noqa
+        '\\1</div>',
+        '\\1\\2'
+    ])
+    html_content = re.sub(
+        regex, subst, html_content, 0, re.MULTILINE
+    )
+    task.print_out(f'Write modified HTML to: {list_page_file_path}')
+    await write_text_file_async(list_page_file_path, html_content)
+
+
+async def add_column_to_delete_page(
+    task: Task,
+    project_dir: str,
+    kebab_app_name: str,
+    kebab_module_name: str,
+    kebab_entity_name: str,
+    kebab_column_name: str,
+    snake_column_name: str,
+    capitalized_human_readable_column_name: str
+):
+    list_page_file_path = os.path.join(
+        project_dir, 'src', kebab_app_name, 'src', 'frontend', 'src', 'routes',
+        kebab_module_name, kebab_entity_name, 'delete', '[id]', '+page.svelte'
+    )
+    task.print_out(f'Read HTML from: {list_page_file_path}')
+    html_content = await read_text_file_async(list_page_file_path)
+    task.print_out('Add field to delete page')
+    regex = r"(.*)(<!-- DON'T DELETE: insert new field here-->)"
+    subst = '\\n'.join([
+        '\\1<div class="mb-4">',
+        f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>', # noqa
+        f'\\1    <span id="{kebab_column_name}">' + '{row.' + snake_column_name + '}</span>', # noqa
+        '\\1</div>',
+        '\\1\\2'
+    ])
+    html_content = re.sub(
+        regex, subst, html_content, 0, re.MULTILINE
+    )
+    task.print_out(f'Write modified HTML to: {list_page_file_path}')
+    await write_text_file_async(list_page_file_path, html_content)
+
+
+async def add_column_to_detail_page(
+    task: Task,
+    project_dir: str,
+    kebab_app_name: str,
+    kebab_module_name: str,
+    kebab_entity_name: str,
+    kebab_column_name: str,
+    snake_column_name: str,
+    capitalized_human_readable_column_name: str
+):
+    list_page_file_path = os.path.join(
+        project_dir, 'src', kebab_app_name, 'src', 'frontend', 'src', 'routes',
+        kebab_module_name, kebab_entity_name, 'detail', '[id]', '+page.svelte'
+    )
+    task.print_out(f'Read HTML from: {list_page_file_path}')
+    html_content = await read_text_file_async(list_page_file_path)
+    task.print_out('Add field to detail page')
+    regex = r"(.*)(<!-- DON'T DELETE: insert new field here-->)"
+    subst = '\\n'.join([
+        '\\1<div class="mb-4">',
+        f'\\1    <label class="block text-gray-700 font-bold mb-2" for="{kebab_column_name}">{capitalized_human_readable_column_name}</label>', # noqa
+        f'\\1    <span id="{kebab_column_name}">' + '{row.' + snake_column_name + '}</span>',  # noqa
+        '\\1</div>',
+        '\\1\\2'
+    ])
+    html_content = re.sub(
+        regex, subst, html_content, 0, re.MULTILINE
+    )
+    task.print_out(f'Write modified HTML to: {list_page_file_path}')
+    await write_text_file_async(list_page_file_path, html_content)
+
+
+async def add_column_to_list_page(
+    task: Task,
+    project_dir: str,
+    kebab_app_name: str,
+    kebab_module_name: str,
+    kebab_entity_name: str,
+    snake_column_name: str,
+    capitalized_human_readable_column_name: str
+):
+    list_page_file_path = os.path.join(
+        project_dir, 'src', kebab_app_name, 'src', 'frontend', 'src', 'routes',
+        kebab_module_name, kebab_entity_name, '+page.svelte'
+    )
+    task.print_out(f'Read HTML from: {list_page_file_path}')
+    html_content = await read_text_file_async(list_page_file_path)
+    # process header
+    task.print_out('Add column header to table')
+    header_regex = r"(.*)(<!-- DON'T DELETE: insert new column header here-->)"
+    header_subst = '\\n'.join([
+        f'\\1<th>{capitalized_human_readable_column_name}</th>',
+        '\\1\\2'
+    ])
+    html_content = re.sub(
+        header_regex, header_subst, html_content, 0, re.MULTILINE
+    )
+    # process column
+    task.print_out('Add column to table')
+    column_regex = r"(.*)(<!-- DON'T DELETE: insert new column here-->)"
+    column_subst = '\\n'.join([
+        '\\1<td>{row.' + snake_column_name + '}</td>',
+        '\\1\\2'
+    ])
+    html_content = re.sub(
+        column_regex, column_subst, html_content, 0, re.MULTILINE
+    )
+    task.print_out(f'Write modified HTML to: {list_page_file_path}')
+    await write_text_file_async(list_page_file_path, html_content)
+
+
 async def add_column_to_test(
     task: Task,
     project_dir: str,

zrb/builtin/generator/project/template/.gitignore

@@ -1,3 +1,3 @@
 __pycache__
 venv
-/.env
+.env

zrb/builtin/generator/simple_python_app/template/src/kebab-app-name/src/.gitignore

@@ -1,3 +1,3 @@
-/.env
+.env
 __pycache__
 venv

zrb/helper/util.py

@@ -73,6 +73,10 @@ def to_human_readable(text: Optional[str]) -> str:
     ])
 
 
+def to_capitalized_human_readable(text: Optional[str]) -> str:
+    return to_human_readable(text).capitalize()
+
+
 def _to_space_separated(text: Optional[str]) -> str:
     text = str(text) if not _is_undefined(text) else ''
     text = text.replace('-', ' ').replace('_', ' ')

zrb/task/resource_maker.py

@@ -7,7 +7,7 @@ from ..task_input.base_input import BaseInput
 from ..helper.file.copy_tree import copy_tree
 from ..helper.util import (
     to_camel_case, to_pascal_case, to_kebab_case, to_snake_case,
-    to_human_readable
+    to_human_readable, to_capitalized_human_readable
 )
 
 import os
@@ -129,6 +129,7 @@ class ResourceMaker(BaseTask):
             'camel': to_camel_case,
             'snake': to_snake_case,
             'human readable': to_human_readable,
+            'Human readable': to_capitalized_human_readable,
         }
         keys = list(rendered_replacements.keys())
         for key in keys:

{zrb-0.0.52.dist-info → zrb-0.0.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: zrb
-Version: 0.0.52
+Version: 0.0.53
 Summary: Your faithful companion
 Author-email: Go Frendi Gunawan <gofrendiasgard@gmail.com>
 Requires-Python: >=3.8
@@ -24,8 +24,8 @@ Requires-Dist: pytest==7.2.1 ; extra == "test"
 Requires-Dist: pytest-cov==4.0.0 ; extra == "test"
 Requires-Dist: pytest-xdist==3.2.0 ; extra == "test"
 Requires-Dist: pytest-asyncio==0.21.0 ; extra == "test"
-Project-URL: Bug Tracker, https://github.com/state-alchemists/zaruba/issues
-Project-URL: Homepage, https://github.com/state-alchemists/zaruba
+Project-URL: Bug Tracker, https://github.com/state-alchemists/zrb/issues
+Project-URL: Homepage, https://github.com/state-alchemists/zrb
 Provides-Extra: dev
 Provides-Extra: test