Improving completion to support the correct table name for autocompletion and formatting

src/myfasthtml/controls/DataGrid.py

@@ -24,7 +24,10 @@ from myfasthtml.controls.helpers import mk, icons
 from myfasthtml.core.commands import Command
 from myfasthtml.core.constants import ColumnType, ROW_INDEX_ID, FooterAggregation, DATAGRID_PAGE_SIZE, FILTER_INPUT_CID
 from myfasthtml.core.dbmanager import DbObject
+from myfasthtml.core.dsls import DslsManager
+from myfasthtml.core.formatting.dsl.completion.FormattingCompletionEngine import FormattingCompletionEngine
 from myfasthtml.core.formatting.dsl.definition import FormattingDSL
+from myfasthtml.core.formatting.dsl.parser import DSLParser
 from myfasthtml.core.formatting.engine import FormattingEngine
 from myfasthtml.core.instances import MultipleInstance
 from myfasthtml.core.optimized_ft import OptimizedDiv
@@ -97,6 +100,7 @@ class DatagridSettings(DbObject):
       self.open_file_visible: bool = True
       self.open_settings_visible: bool = True
       self.text_size: str = "sm"
+      self.enable_formatting: bool = True
 
 
 class Commands(BaseCommands):
@@ -206,12 +210,20 @@ class DataGrid(MultipleInstance):
     self._columns_manager.bind_command("ToggleColumn", self.commands.on_column_changed())
     self._columns_manager.bind_command("UpdateColumn", self.commands.on_column_changed())
     
-    editor_conf = DslEditorConf()
-    self._formatting_editor = DataGridFormattingEditor(self,
-                                                       conf=editor_conf,
-                                                       dsl=FormattingDSL(),
-                                                       save_state=self._settings.save_state,
-                                                       _id="-formatting_editor")
+    if self._settings.enable_formatting:
+      completion_engine = FormattingCompletionEngine(self._parent, self.get_table_name())
+      editor_conf = DslEditorConf(engine_id=completion_engine.get_id())
+      dsl = FormattingDSL()
+      self._formatting_editor = DataGridFormattingEditor(self,
+                                                         conf=editor_conf,
+                                                         dsl=dsl,
+                                                         save_state=self._settings.save_state,
+                                                         _id="-formatting_editor")
+      # register the auto-completion for the formatter DSL
+      DslsManager.register(completion_engine,
+                           DSLParser())
+    else:
+      self._formatting_editor = None
     
     # other definitions
     self._mouse_support = {
@@ -220,7 +232,7 @@ class DataGrid(MultipleInstance):
         "shift+click": {"command": self.commands.on_click(), "hx_vals": "js:getCellId()"},
     }
     
-    logger.debug(f"DataGrid '{self._get_full_name()}' with id='{self._id}' created.")
+    logger.debug(f"DataGrid '{self.get_table_name()}' with id='{self._id}' created.")
   
   @property
   def _df(self):
@@ -298,9 +310,6 @@ class DataGrid(MultipleInstance):
     self._state.selection.selected = pos
     self._state.save()
   
-  def _get_full_name(self):
-    return f"{self._settings.namespace}.{self._settings.name}" if self._settings.namespace else self._settings.name
-  
   def init_from_dataframe(self, df, init_state=True):
     
     def _get_column_type(dtype):
@@ -497,6 +506,9 @@ class DataGrid(MultipleInstance):
   def get_settings(self):
     return self._settings
   
+  def get_table_name(self):
+    return f"{self._settings.namespace}.{self._settings.name}" if self._settings.namespace else self._settings.name
+  
   def mk_headers(self):
     resize_cmd = self.commands.set_column_width()
     move_cmd = self.commands.move_column()

src/myfasthtml/controls/DataGridsManager.py

@@ -14,11 +14,7 @@ from myfasthtml.controls.helpers import mk
 from myfasthtml.core.DataGridsRegistry import DataGridsRegistry
 from myfasthtml.core.commands import Command
 from myfasthtml.core.dbmanager import DbObject
-from myfasthtml.core.dsls import DslsManager
-from myfasthtml.core.formatting.dsl.completion.engine import FormattingCompletionEngine
 from myfasthtml.core.formatting.dsl.completion.provider import DatagridMetadataProvider
-from myfasthtml.core.formatting.dsl.definition import FormattingDSL
-from myfasthtml.core.formatting.dsl.parser import DSLParser
 from myfasthtml.core.formatting.presets import DEFAULT_STYLE_PRESETS, DEFAULT_FORMATTER_PRESETS
 from myfasthtml.core.instances import InstancesManager, SingleInstance
 from myfasthtml.icons.fluent_p1 import table_add20_regular
@@ -94,11 +90,6 @@ class DataGridsManager(SingleInstance, DatagridMetadataProvider):
     # Global presets shared across all DataGrids
     self.style_presets: dict = DEFAULT_STYLE_PRESETS.copy()
     self.formatter_presets: dict = DEFAULT_FORMATTER_PRESETS.copy()
-    
-    # register the auto-completion for the formatter DSL
-    DslsManager.register(FormattingDSL().get_id(),
-                         FormattingCompletionEngine(self),
-                         DSLParser())
   
   def upload_from_source(self):
     file_upload = FileUpload(self)
@@ -112,7 +103,7 @@ class DataGridsManager(SingleInstance, DatagridMetadataProvider):
     namespace = file_upload.get_file_basename()
     name = file_upload.get_sheet_name()
     dg_conf = DatagridConf(namespace=namespace, name=name)
-    dg = DataGrid(self._tabs_manager, conf=dg_conf, save_state=True)  # first time the Datagrid is created
+    dg = DataGrid(self, conf=dg_conf, save_state=True)  # first time the Datagrid is created
     dg.init_from_dataframe(df)
     self._registry.put(namespace, name, dg.get_id())
     document = DocumentDefinition(
@@ -133,7 +124,7 @@ class DataGridsManager(SingleInstance, DatagridMetadataProvider):
     document_id = self._tree.get_bag(node_id)
     try:
       document = next(filter(lambda x: x.document_id == document_id, self._state.elements))
-      dg = DataGrid(self._tabs_manager, _id=document.datagrid_id)  # reload the state & settings
+      dg = DataGrid(self, _id=document.datagrid_id)  # reload the state & settings
       return self._tabs_manager.show_or_create_tab(document.tab_id, document.name, dg)
     except StopIteration:
       # the selected node is not a document (it's a folder)
@@ -157,7 +148,7 @@ class DataGridsManager(SingleInstance, DatagridMetadataProvider):
       raise ValueError(f"No document found for tab {tab_id}")
     
     # Recreate the DataGrid with its saved state
-    dg = DataGrid(self._tabs_manager, _id=document.datagrid_id)  # reload the state & settings
+    dg = DataGrid(self, _id=document.datagrid_id)  # reload the state & settings
     return dg
   
   def clear_tree(self):

src/myfasthtml/controls/DslEditor.py

@@ -32,6 +32,7 @@ class DslEditorConf:
   linting: bool = True
   placeholder: str = ""
   readonly: bool = False
+  engine_id: str = None  # id of the DSL engine to use for autocompletion
 
 
 class DslEditorState(DbObject):
@@ -141,7 +142,7 @@ class DslEditor(MultipleInstance):
     simple_mode_config = None
     if hasattr(self._dsl, 'simple_mode_config'):
       simple_mode_config = self._dsl.simple_mode_config
-
+    
     config = {
         "elementId": str(self._id),
         "textareaId": f"ta_{self._id}",
@@ -151,7 +152,7 @@ class DslEditor(MultipleInstance):
         "placeholder": self.conf.placeholder,
         "readonly": self.conf.readonly,
         "updateCommandId": str(self.commands.update_content().id),
-        "dslId": self._dsl.get_id(),
+        "dslId": self.conf.engine_id,
         "dsl": {
             "name": self._dsl.name,
             "completions": self._dsl.completions,