refactor: replace normalize_identifier with _normalize_prop and remove utils.py

Author: GreyElaina

api/python/slint/slint/codegen/emitters.py

@@ -9,14 +9,14 @@
 import libcst as cst
 
 from .models import GenerationConfig, ModuleArtifacts, CallbackMeta
-from .utils import normalize_identifier, path_literal
+from .. import _normalize_prop
 
 
 def module_relative_path_expr(module_dir: Path, target: Path) -> str:
     try:
         rel = os.path.relpath(target, module_dir)
     except ValueError:
-        return f"Path({path_literal(target)})"
+        return repr(target)
 
     if rel in (".", ""):
         return "_MODULE_DIR"
@@ -50,14 +50,14 @@ def _stmt(code: str) -> cst.BaseStatement:
     include_expr_code = f"[{', '.join(include_exprs)}]" if include_exprs else "None"
 
     library_items = [
-        f"{path_literal(name)}: {module_relative_path_expr(module_dir, lib_path)}"
+        f"{repr(Path(name))}: {module_relative_path_expr(module_dir, lib_path)}"
         for name, lib_path in config.library_paths.items()
     ]
     library_expr_code = f"{{{', '.join(library_items)}}}" if library_items else "None"
 
-    style_expr = path_literal(config.style) if config.style else "None"
+    style_expr = repr(Path(config.style)) if config.style else "None"
     domain_expr = (
-        path_literal(config.translation_domain) if config.translation_domain else "None"
+        repr(Path(config.translation_domain)) if config.translation_domain else "None"
     )
 
     export_bindings: dict[str, str] = {}
@@ -69,7 +69,7 @@ def _stmt(code: str) -> cst.BaseStatement:
         export_bindings[enum.name] = enum.py_name
 
     export_items = list(export_bindings.values()) + [
-        normalize_identifier(alias) for _, alias in artifacts.named_exports
+        _normalize_prop(alias) for _, alias in artifacts.named_exports
     ]
 
     header: list[cst.CSTNode] = [
@@ -152,8 +152,8 @@ def _stmt(code: str) -> cst.BaseStatement:
     for original, binding in export_bindings.items():
         body.append(_stmt(f"{binding} = _module.{original}"))
     for orig, alias in artifacts.named_exports:
-        alias_name = normalize_identifier(alias)
-        target = export_bindings.get(orig, normalize_identifier(orig))
+        alias_name = _normalize_prop(alias)
+        target = export_bindings.get(orig, _normalize_prop(orig))
         body.append(_stmt(f"{alias_name} = {target}"))
 
     module = cst.Module(body=header + body)  # type: ignore[arg-type]
@@ -187,7 +187,7 @@ def register_type(type_str: str) -> None:
     export_names += [struct.py_name for struct in artifacts.structs]
     export_names += [enum.py_name for enum in artifacts.enums]
     export_names += [
-        normalize_identifier(alias) for _, alias in artifacts.named_exports
+        _normalize_prop(alias) for _, alias in artifacts.named_exports
     ]
     if export_names:
         all_list = cst.List(
@@ -354,8 +354,8 @@ def init_stub() -> cst.FunctionDef:
         bindings[enum_meta.name] = enum_meta.py_name
 
     for orig, alias in artifacts.named_exports:
-        alias_name = normalize_identifier(alias)
-        target = bindings.get(orig, normalize_identifier(orig))
+        alias_name = _normalize_prop(alias)
+        target = bindings.get(orig, _normalize_prop(orig))
         post_body.append(_stmt(f"{alias_name} = {target}"))
         post_body.append(cst.EmptyLine())
 

api/python/slint/slint/codegen/generator.py

@@ -22,7 +22,7 @@
     StructFieldMeta,
     StructMeta,
 )
-from .utils import normalize_identifier
+from .. import _normalize_prop
 
 if TYPE_CHECKING:
     from slint.slint import CallbackInfo, FunctionInfo, PyDiagnostic
@@ -149,7 +149,7 @@ def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
             properties.append(
                 PropertyMeta(
                     name=key,
-                    py_name=normalize_identifier(key),
+                    py_name=_normalize_prop(key),
                     type_hint=type_hint,
                 )
             )
@@ -171,7 +171,7 @@ def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
             properties_meta: list[PropertyMeta] = []
 
             for key in comp.global_properties(global_name):
-                py_key = normalize_identifier(key)
+                py_key = _normalize_prop(key)
                 info = global_property_info[key]
                 type_hint = info.python_type
                 properties_meta.append(
@@ -195,7 +195,7 @@ def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
             globals_meta.append(
                 GlobalMeta(
                     name=global_name,
-                    py_name=normalize_identifier(global_name),
+                    py_name=_normalize_prop(global_name),
                     properties=properties_meta,
                     callbacks=callbacks_meta,
                     functions=functions_meta,
@@ -205,7 +205,7 @@ def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
         components.append(
             ComponentMeta(
                 name=name,
-                py_name=normalize_identifier(name),
+                py_name=_normalize_prop(name),
                 properties=properties,
                 callbacks=callbacks,
                 functions=functions,
@@ -223,14 +223,14 @@ def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
             fields.append(
                 StructFieldMeta(
                     name=field_name,
-                    py_name=normalize_identifier(field_name),
+                    py_name=_normalize_prop(field_name),
                     type_hint=_python_value_hint(value),
                 )
             )
         structs_meta.append(
             StructMeta(
                 name=struct_name,
-                py_name=normalize_identifier(struct_name),
+                py_name=_normalize_prop(struct_name),
                 fields=fields,
             )
         )
@@ -241,14 +241,14 @@ def _collect_metadata(result: native.CompilationResult) -> ModuleArtifacts:
             values.append(
                 EnumValueMeta(
                     name=member,
-                    py_name=normalize_identifier(member),
+                    py_name=_normalize_prop(member),
                     value=enum_member.name,
                 )
             )
         enums_meta.append(
             EnumMeta(
                 name=enum_name,
-                py_name=normalize_identifier(enum_name),
+                py_name=_normalize_prop(enum_name),
                 values=values,
             )
         )
@@ -285,7 +285,7 @@ def _python_value_hint(value: object) -> str:
 def _callback_meta(name: str, info: CallbackInfo | FunctionInfo) -> CallbackMeta:
     return CallbackMeta(
         name=name,
-        py_name=normalize_identifier(name),
+        py_name=_normalize_prop(name),
         arg_types=[param.python_type for param in info.parameters],
         return_type=info.return_type,
     )