@trebco/treb 30.1.2 → 30.2.4

package/treb-embed/src/embedded-spreadsheet.ts

@@ -170,7 +170,6 @@ export interface LoadDocumentOptions {
   source?: LoadSource,
 }
 
-
 /**
  * options for the GetRange method
  */
@@ -255,6 +254,15 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
   /** @internal */
   public static treb_embedded_script_path = '';
 
+  /** 
+   * @internal 
+   * 
+   * keep track of modules we've tried to load dynamically, so we don't
+   * do it again. not sure if this is strictly necessary but especially if
+   * we're logging I don't want to see it again 
+   */
+  protected static failed_dynamic_modules: string[] = [];
+
   /* * @internal */
   // public static enable_engine = false;
 
@@ -646,8 +654,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
    */
   constructor(options: EmbeddedSpreadsheetOptions & { model?: EmbeddedSpreadsheet }) { 
 
-    // super();
-
     // we renamed this option, default to the new name
 
     if (options.storage_key && !options.local_storage) {
@@ -842,6 +848,24 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
       this.grid.headless = true; // FIXME: move into grid options
     }
 
+    // --- testing dynamic loading ---------------------------------------------
+
+    this.LoadLanguage(options.language);
+
+    // --- testing plugins -----------------------------------------------------
+
+    /*
+    // FIXME: when to do this? could it wait? should it be async? (...)
+
+    if (options.plugins) {
+      for (const plugin of options.plugins) {
+        plugin.Attach(this);
+      }
+    }
+    */
+
+    // -------------------------------------------------------------------------
+
     // we're now gating this on container to support fully headless operation
 
     if (container) {
@@ -1180,7 +1204,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
     let list: FunctionDescriptor[] = this.calculator.SupportedFunctions();
 
-    if (this.language_model) {
+    if (this.language_model?.functions) {
 
       const map: Record<string, TranslatedFunctionDescriptor> = {};
       for (const entry of this.language_model.functions || []) {
@@ -1188,7 +1212,20 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
       }
 
       list = list.map(descriptor => {
-        return map[descriptor.name.toUpperCase()] || descriptor;
+        const partial = map[descriptor.name.toUpperCase()];
+
+        // FIXME: this is not deep enough if we are going to modify
+        // argument names. we will need to keep other elements of the 
+        // argument entries. this is sufficient for now if we're just
+        // setting function names / descriptions.
+
+        if (partial) {
+          return {
+            ...descriptor,
+            ...partial, 
+          };
+        }
+        return descriptor;
       });
 
     }
@@ -1956,6 +1993,47 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
   // --- public API methods ----------------------------------------------------
 
+  /** dynamically load language module */
+  public async LoadLanguage(language = '') {
+
+    if (!language || language === 'locale') {
+      const locale = Localization.locale || '';
+      const parts = locale.split(/-/).map(part => part.toLowerCase());
+      language = parts[0];
+    }
+
+    this.SetLanguage(); // clear
+
+    language = language.toLowerCase();
+
+    let mod: { LanguageMap: LanguageModel } | undefined;
+
+    if (language && language !== 'en') {
+
+      // FIXME: even though we now have a dynamic import
+      // working, we still probably want to use a filter
+      // list to avoid unnecessary 404s.
+
+      // regarding the import, this is specially crafted to 
+      // work in both esbuild and vite. probably will break
+      // some other bundlers though -- might need some magic
+      // comments
+
+      try {
+        mod = await import(`esbuild-ignore-import:./languages/treb-i18n-${language}.mjs`);
+      }
+      catch (err) {
+        console.error(err);
+      }
+
+    }
+
+    if (mod) {
+      this.SetLanguage(mod.LanguageMap);
+    }
+
+  }
+
   /** 
    * this is not public _yet_ 
    * 
@@ -1973,10 +2051,15 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
       // create a name map for grid
 
       const map: Record< string, string > = {};
-      for (const entry of model.functions || []) {
-        map[entry.base] = entry.name;
+
+      if (model.functions) {
+        for (const entry of model.functions || []) {
+          map[entry.base] = entry.name;
+        }
       }
+
       this.grid.SetLanguageMap(map);
+
     }
 
     this.UpdateAC();

package/treb-embed/src/options.ts

@@ -22,6 +22,7 @@
 import type { ICellAddress } from 'treb-base-types';
 import type { TREBDocument } from './types';
 import type { ChartRenderer } from 'treb-charts';
+// import type { TREBPlugin } from './plugin';
 
 /**
  * factory type for chart renderer, if you want instances (pass a constructor)
@@ -327,6 +328,23 @@ export interface EmbeddedSpreadsheetOptions {
    */
   spill?: boolean;
 
+  /**
+   * language. at the moment this controls spreadsheet function names
+   * only; the plan is to expand to the rest of the interface over time.
+   * should be an ISO 639-1 language code, like "en", "fr" or "sv" (case
+   * insensitive). we only support a limited subset of languages at the 
+   * moment.
+   * 
+   * leave blank or set to "locale" to use the current locale.
+   */
+  language?: string;
+
+  /* * 
+   * @internal 
+   * testing plugins
+   */
+  // plugins?: TREBPlugin[];
+
 }
 
 /**

package/treb-embed/src/plugin.ts

@@ -0,0 +1,31 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2024 trebco, llc. 
+ * info@treb.app
+ * 
+ */
+
+import type { EmbeddedSpreadsheet } from './embedded-spreadsheet';
+
+/** 
+ * @internal
+ * 
+ * testing plugins
+ */
+export interface TREBPlugin {
+  Attach: (instance: EmbeddedSpreadsheet) => void;
+}

package/treb-grid/src/editors/autocomplete_matcher.ts

@@ -151,6 +151,8 @@ export class AutocompleteMatcher {
       return {};
     }
 
+    // console.info(data);
+
     let match;
     let result: AutocompleteExecResult = {};
 
@@ -162,7 +164,8 @@ export class AutocompleteMatcher {
       // if it's a token, and ends with a legal character
       // UPDATE: adding the negative leading \d to fix entering complex numbers
 
-      match = data.text.match(/(?:^|[^A-Za-z_\d])([A-Za-z_][\w\d_.]*)\s*$/);
+      // match = data.text.match(/(?:^|[^A-Za-z_\d])([A-Za-z_][\w\d_.]*)\s*$/);
+      match = data.text.match(/(?:^|[^a-zA-Z\u00C0-\u024F_\d])([a-zA-Z\u00C0-\u024F_][\w\d\u00C0-\u024F_.]*)\s*$/);
 
       if (match) {
         const token = match[1];
@@ -178,6 +181,9 @@ export class AutocompleteMatcher {
         };
 
       }
+      else {
+        // console.info("NOP");
+      }
 
     }
 
@@ -261,6 +267,7 @@ export class AutocompleteMatcher {
             if ( (char >= 0x61 && char <= 0x7a) // a-z
               || (char >= 0x41 && char <= 0x5a) // A-Z
               || (char >= 0x30 && char <= 0x39) // 0-9
+              || (char >= 0x00C0 && char <= 0x024F) // accented characters
               || (char === 0x5f)                // _
               || (char === 0x2e)) {             // .
     

package/treb-grid/src/types/grid.ts

@@ -6385,6 +6385,14 @@ export class Grid extends GridBase {
       if ((area.start.row === Infinity || area.start.row < this.active_sheet.rows) &&
         (area.start.column === Infinity || area.start.column < this.active_sheet.columns)) {
 
+          if (area.start.spill && area.end.row === area.start.row && area.end.column === area.start.column) {
+            const sheet = this.model.sheets.Find(area.start.sheet_id || -1);
+            const cell = sheet?.CellData(area.start);
+            if (cell?.spill && cell.spill.start.row === area.start.row && cell.spill.start.column === area.start.column) {
+              area.ConsumeArea(cell.spill);
+            }
+          }
+
           area = this.active_sheet.RealArea(area);
           const label = area.spreadsheet_label;