Fixed Syntax validation and autocompletion. Fixed unit tests

src/myfasthtml/controls/DataGridColumnsManager.py

@@ -10,6 +10,9 @@ from myfasthtml.controls.datagrid_objects import DataGridColumnState
 from myfasthtml.controls.helpers import icons, mk
 from myfasthtml.core.commands import Command
 from myfasthtml.core.constants import ColumnType
+from myfasthtml.core.dsls import DslsManager
+from myfasthtml.core.formula.dsl.completion.FormulaCompletionEngine import FormulaCompletionEngine
+from myfasthtml.core.formula.dsl.parser import FormulaParser
 from myfasthtml.core.instances import MultipleInstance
 from myfasthtml.icons.fluent_p1 import chevron_right20_regular, chevron_left20_regular
 
@@ -37,11 +40,11 @@ class Commands(BaseCommands):
                    self._owner,
                    self._owner.show_all_columns).htmx(target=f"#{self._id}", swap="innerHTML")
   
-  def update_column(self, col_id):
+  def save_column_details(self, col_id):
     return Command(f"UpdateColumn",
                    f"Update column {col_id}",
                    self._owner,
-                   self._owner.update_column,
+                   self._owner.save_column_details,
                    kwargs={"col_id": col_id}
                    ).htmx(target=f"#{self._id}", swap="innerHTML")
   
@@ -64,41 +67,36 @@ class DataGridColumnsManager(MultipleInstance):
     self.commands = Commands(self)
     self._new_column = False
     
-    conf = DslEditorConf(save_button=False, placeholder="{Column} * {OtherColumn}", line_numbers=False)
+    completion_engine = FormulaCompletionEngine(
+      self._parent._parent,
+      self._parent.get_table_name(),
+    )
+    conf = DslEditorConf(save_button=False, line_numbers=False, engine_id=completion_engine.get_id())
     self._formula_editor = DataGridFormulaEditor(self, conf=conf, _id=f"{self._id}-formula-editor")
+    DslsManager.register(completion_engine, FormulaParser())
   
   @property
   def columns(self):
     return self._parent.get_state().columns
   
-  def _get_col_def_from_col_id(self, col_id, updates=None, copy=True):
+  def _get_col_def_from_col_id(self, col_id, copy=True):
     """
-    Retrieves a column definition from the column ID, with optional updates
-    made using information provided by the client response.
-
-    :param col_id: The unique identifier of the column to retrieve.
-    :param updates: Optional dictionary containing updated values for
-        the column attributes provided by the client. If specified, the
-        attributes of the column definition will be updated accordingly.
-    :return: A copy of the column definition object with any updates applied,
-        or None if no column matching the provided ID is found.
-    :rtype: ColumnDefinition | None
     """
-    if updates:
-      updates["visible"] = "visible" in updates and updates["visible"] == "on"
-    
     cols_defs = [c for c in self.columns if c.col_id == col_id]
     if not cols_defs:
-      col_def = DataGridColumnState(col_id, -1)
-    else:
-      col_def = cols_defs[0].copy() if copy else cols_defs[0]
+      return None
     
-    if updates:
+    return cols_defs[0].copy() if copy else cols_defs[0]
+  
+  def _get_updated_col_def_from_col_id(self, col_id, updates=None, copy=True):
+    col_def = self._get_col_def_from_col_id(col_id, copy=copy)
+    if col_def is None:
+      col_def = DataGridColumnState(col_id, -1)
+    
+    if updates is not None:
+      updates["visible"] = "visible" in updates and updates["visible"] == "on"
       for k, v in [(k, v) for k, v in updates.items() if hasattr(col_def, k)]:
-        
-        if k == "visible":
-          col_def.visible = v == "on"
-        elif k == "type":
+        if k == "type":
           col_def.type = ColumnType(v)
         elif k == "width":
           col_def.width = int(v)
@@ -112,7 +110,7 @@ class DataGridColumnsManager(MultipleInstance):
   
   def toggle_column(self, col_id):
     logger.debug(f"toggle_column {col_id=}")
-    col_def = self._get_col_def_from_col_id(col_id)
+    col_def = self._get_col_def_from_col_id(col_id, copy=False)
     if col_def is None:
       logger.debug(f"  column '{col_id}' is not found.")
       return Div(f"Column '{col_id}' not found")
@@ -123,7 +121,7 @@ class DataGridColumnsManager(MultipleInstance):
   
   def show_column_details(self, col_id):
     logger.debug(f"show_column_details {col_id=}")
-    col_def = self._get_col_def_from_col_id(col_id)
+    col_def = self._get_updated_col_def_from_col_id(col_id)
     if col_def is None:
       logger.debug(f"  column '{col_id}' is not found.")
       return Div(f"Column '{col_id}' not found")
@@ -133,25 +131,21 @@ class DataGridColumnsManager(MultipleInstance):
   def show_all_columns(self):
     return self._mk_inner_content()
   
-  def update_column(self, col_id, client_response):
-    logger.debug(f"update_column {col_id=}, {client_response=}")
-    col_def = self._get_col_def_from_col_id(col_id, client_response, copy=False)
-    if col_def is None:
-      logger.debug(f"  column '{col_id}' is not found.")
-    else:
-      # save the new values
-      self._parent.save_state()
+  def save_column_details(self, col_id, client_response):
+    logger.debug(f"save_column_details {col_id=}, {client_response=}")
+    self._get_updated_col_def_from_col_id(col_id, client_response, copy=False)
+    self._parent.save_state()
     
     return self._mk_inner_content()
   
   def on_new_column(self):
     self._new_column = True
-    col_def = self._get_col_def_from_col_id("__new__")
+    col_def = self._get_updated_col_def_from_col_id("__new__")
     return self.mk_column_details(col_def)
   
   def on_column_type_changed(self, col_id, client_response):
     logger.debug(f"on_column_type_changed {col_id=}, {client_response=}")
-    col_def = self._get_col_def_from_col_id(col_id, client_response)
+    col_def = self._get_updated_col_def_from_col_id(col_id, client_response)
     return self.mk_column_details(col_def)
   
   def _register_formula(self, col_def) -> None:
@@ -240,7 +234,7 @@ class DataGridColumnsManager(MultipleInstance):
           legend="Column details",
           cls="fieldset border-base-300 rounded-box"
         ),
-        mk.dialog_buttons(on_ok=self.commands.update_column(col_def.col_id),
+        mk.dialog_buttons(on_ok=self.commands.save_column_details(col_def.col_id),
                           on_cancel=self.commands.show_all_columns()),
         cls="mb-1",
       ),