@trebco/treb 30.2.4 → 30.2.10

package/treb-data-model/src/index.ts

@@ -34,4 +34,5 @@ export type { AnnotationData, AnnotationType } from './annotation';
 
 export * from './data-validation';
 export * from './types';
+export * from './language-model';
 

package/{treb-embed → treb-data-model}/src/language-model.ts

@@ -37,5 +37,8 @@ export interface LanguageModel {
   version?: string;
   locale?: string;
   functions?: TranslatedFunctionDescriptor[];
+  
+  boolean_true?: string;
+  boolean_false?: string;
 }
 

package/treb-data-model/src/sheet.ts

@@ -807,19 +807,6 @@ export class Sheet {
     }
   }
 
-  /* *
-   * factory method creates a sheet from a 2D array.
-   *
-   * /
-  public static FromArray(data: any[] = [], transpose = false): Sheet {
-    const sheet = new Sheet();
-    sheet.cells.FromArray(data, transpose);
-
-    return sheet;
-  }
-  */
-
-
   // --- public methods -------------------------------------------------------
 
   public MergeCells(area: Area): void {

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

@@ -49,7 +49,10 @@ import type {
     CondifionalFormatExpressionOptions,
     ConditionalFormatCellMatchOptions,
     ConditionalFormatCellMatch,
-  
+
+    LanguageModel, 
+    TranslatedFunctionDescriptor,
+
    } from 'treb-data-model';
 
 
@@ -88,7 +91,6 @@ import { Spinner } from './spinner';
 import { type EmbeddedSpreadsheetOptions, DefaultOptions, type ExportOptions } from './options';
 import { type TREBDocument, SaveFileType, LoadSource, type EmbeddedSheetEvent, type InsertTableOptions } from './types';
 
-import type { LanguageModel, TranslatedFunctionDescriptor } from './language-model';
 import type { SelectionState } from './selection-state';
 import type { BorderToolbarMessage, ToolbarMessage } from './toolbar-message';
 
@@ -341,8 +343,9 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     return Localization;
   }
 
-  /** loaded language model, if any */
+  /* * loaded language model, if any (moved to data model) * /
   protected language_model?: LanguageModel;
+  */
 
   /** FIXME: fix type (needs to be extensible) */
   protected events = new EventSource<{ type: string }>();
@@ -1204,10 +1207,10 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
 
     let list: FunctionDescriptor[] = this.calculator.SupportedFunctions();
 
-    if (this.language_model?.functions) {
+    if (this.model.language_model?.functions) {
 
       const map: Record<string, TranslatedFunctionDescriptor> = {};
-      for (const entry of this.language_model.functions || []) {
+      for (const entry of this.model.language_model.functions || []) {
         map[entry.base.toUpperCase()] = entry;
       }
 
@@ -2002,8 +2005,6 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
       language = parts[0];
     }
 
-    this.SetLanguage(); // clear
-
     language = language.toLowerCase();
 
     let mod: { LanguageMap: LanguageModel } | undefined;
@@ -2029,39 +2030,14 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     }
 
     if (mod) {
-      this.SetLanguage(mod.LanguageMap);
-    }
-
-  }
-
-  /** 
-   * this is not public _yet_ 
-   * 
-   * @internal
-   */
-  public SetLanguage(model?: LanguageModel): void {
-
-    this.language_model = model;
-
-    if (!model) {
-      this.grid.SetLanguageMap(); // clear
+      this.model.SetLanguage(mod.LanguageMap);
     }
     else {
-
-      // create a name map for grid
-
-      const map: Record< string, string > = {};
-
-      if (model.functions) {
-        for (const entry of model.functions || []) {
-          map[entry.base] = entry.name;
-        }
-      }
-
-      this.grid.SetLanguageMap(map);
-
+      this.model.SetLanguage();
     }
 
+    this.grid.Reselect();
+    this.grid.Update(true);
     this.UpdateAC();
 
   }

package/treb-grid/src/render/tile_renderer.ts

@@ -727,6 +727,20 @@ export class TileRenderer {
     let pad_entry: RenderTextPart | undefined;
     let composite_width = 0;
 
+    // -------------------------------------------------------------------------
+
+    // moved translated boolean formatting here. I don't like this. it 
+    // should be in sheet (at least that's where the rest of formatting
+    // is), but sheet doesn't have a reference to data model (and because
+    // sheets are owned by data model, I don't want to add a circular ref).
+
+    if (cell.rendered_type === ValueType.boolean) {
+      const value = cell.calculated_type ? cell.calculated : cell.value;
+      cell.formatted = value ? (this.model.language_model?.boolean_true || 'TRUE') : (this.model.language_model?.boolean_false || 'FALSE');
+    }
+
+    // -------------------------------------------------------------------------
+
     let override_formatting: string | undefined;
     let formatted = cell.editing ? '' : cell.formatted; // <-- empty on editing, to remove overflows
 

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

@@ -175,18 +175,6 @@ export class Grid extends GridBase {
 
   // --- private members -------------------------------------------------------
 
-  /** 
-   * maps common language (english) -> local language. this should 
-   * be passed in (actually set via a function).
-   */
-   private language_map?: Record<string, string>;
-
-   /**
-    * maps local language -> common (english). this should be constructed
-    * when the forward function is passed in, so there's a 1-1 correspondence.
-    */
-  private reverse_language_map?: Record<string, string>;
-
   // testing
   private hover_data: {
     note?: boolean;
@@ -648,33 +636,10 @@ export class Grid extends GridBase {
   // --- public methods --------------------------------------------------------
 
   /**
-   * set the language translation map. this is a set of function names 
-   * (in english) -> the local equivalent. both should be in canonical form,
-   * as that will be used when we translate one way or the other.
+   * re-select the current selection, for side effects. used when switching
+   * languages to update the function view (if any)
    */
-  public SetLanguageMap(language_map?: Record<string, string>) {
-
-    if (!language_map) {
-      this.language_map = this.reverse_language_map = undefined;
-    }
-    else {
-
-      const keys = Object.keys(language_map);
-
-      // normalize forward
-      this.language_map = {};
-      for (const key of keys) {
-        this.language_map[key.toUpperCase()] = language_map[key];
-      }
-
-      // normalize backward
-      this.reverse_language_map = {};
-      for (const key of keys) {
-        const value = language_map[key];
-        this.reverse_language_map[value.toUpperCase()] = key;
-      }
-
-    }
+  public Reselect() {
 
     // we might need to update the current displayed selection. depends
     // on when we expect languages to be set.
@@ -2171,7 +2136,7 @@ export class Grid extends GridBase {
       
 
     // this is public so we need to (un)translate.
-    data = this.UntranslateData(data);
+    data = this.model.UntranslateData(data);
     
      // single value, easiest
     if (!Array.isArray(data)) {
@@ -2481,105 +2446,12 @@ export class Grid extends GridBase {
 
   // --- private methods -------------------------------------------------------
 
-  /**
-   * translation back and forth is the same operation, with a different 
-   * (inverted) map. although it still might be worth inlining depending
-   * on cost.
-   * 
-   * FIXME: it's about time we started using proper maps, we dropped 
-   * support for IE11 some time ago.
-   */
-  private TranslateInternal(value: string, map: Record<string, string>): string {
-
-    const parse_result = this.parser.Parse(value);
-
-    if (parse_result.expression) {
-      
-      let modified = false;
-      this.parser.Walk(parse_result.expression, unit => {
-        if (unit.type === 'call') {
-          const replacement = map[unit.name.toUpperCase()];
-          if (replacement) {
-            modified = true;
-            unit.name = replacement;
-          }
-        }
-        return true;
-      });
-
-      if (modified) {
-        return '=' + this.parser.Render(parse_result.expression, { missing: '' });
-      }
-    }
-
-    return value;
-
-  }
-
   protected RenameSheetInternal(target: Sheet, name: string) {
     super.RenameSheetInternal(target, name);
     this.tab_bar?.Update();
 
   }
 
-  /**
-   * translate function from common (english) -> local language. this could
-   * be inlined (assuming it's only called in one place), but we are breaking
-   * it out so we can develop/test/manage it.
-   */
-   protected TranslateFunction(value: string): string {
-    if (this.language_map) {
-      return this.TranslateInternal(value, this.language_map);
-    }
-    return value;
-  }
-
-  /**
-   * translate from local language -> common (english).
-   * @see TranslateFunction
-   */
-  protected UntranslateFunction(value: string): string {
-    if (this.reverse_language_map) {
-      return this.TranslateInternal(value, this.reverse_language_map);
-    }
-    return value;
-  }
-
-  protected UntranslateData(value: CellValue|CellValue[]|CellValue[][]): CellValue|CellValue[]|CellValue[][] {
-
-    if (Array.isArray(value)) {
-
-      // could be 1d or 2d. typescript is complaining, not sure why...
-
-      if (Is2DArray(value)) {
-        return value.map(row => row.map(entry => {
-          if (entry && typeof entry === 'string' && entry[0] === '=') {
-            return this.UntranslateFunction(entry);
-          }
-          return entry;
-        }));
-      }
-      else {
-        return value.map(entry => {
-          if (entry && typeof entry === 'string' && entry[0] === '=') {
-            return this.UntranslateFunction(entry);
-          }
-          return entry;
-        });
-      }
-
-    }
-    else if (value && typeof value === 'string' && value[0] === '=') {
-
-      // single value
-      value = this.UntranslateFunction(value);
-
-    }
-
-    return value;
-
-  }
-
   private StyleDefaultFromTheme() {
     this.model.theme_style_properties.font_face = this.theme.grid_cell?.font_face || '';
     this.model.theme_style_properties.font_size = 
@@ -5520,15 +5392,26 @@ export class Grid extends GridBase {
 
     }
 
-    const parse_result: ParseResult2 = (expression && expression.type === 'complex') ?
-      {
+    let parse_result: ParseResult2|undefined;
+
+    if (expression?.type === 'complex') {
+      parse_result = {
         type: ValueType.complex,
         value: { 
           real: expression.real, 
           imaginary: expression.imaginary 
         },
-      } :    
-      ValueParser.TryParse(value);
+      };
+    }
+    else if (expression?.type === 'literal' && typeof expression.value === 'boolean') {
+      parse_result = {
+        type: ValueType.boolean,
+        value: expression.value,
+      };
+    }
+    else {
+      parse_result = ValueParser.TryParse(value);
+    }
 
     if (!is_function && parse_result.type === ValueType.number) {
 
@@ -5593,7 +5476,7 @@ export class Grid extends GridBase {
       key: CommandKey.SetRange,
       area: array ? selection.area : target,
       array,
-      value: is_function ? this.UntranslateFunction(value || '') : parse_result.value,
+      value: is_function ? this.model.UntranslateFunction(value || '') : parse_result.value,
     });
 
     if (exec) {
@@ -5778,7 +5661,10 @@ export class Grid extends GridBase {
       }
     }
     else if (cell.ValueIsBoolean()) {
-      return cell.value.toString().toUpperCase(); // ? 'True' : 'False';
+
+      // TRANSLATION: FIXME/CENTRALIZE
+      return cell.value ? (this.model.language_model?.boolean_true || 'TRUE') : (this.model.language_model?.boolean_false || 'FALSE');
+
     }
     else if (cell.ValueIsNumber()) { // no style: I think this is no longer possible
       if (cell_value && Localization.decimal_separator === ',') {
@@ -5821,7 +5707,7 @@ export class Grid extends GridBase {
       // this is where we _render_ translation. so names in function
       // calls shoule be translated before returning.
 
-      cell_value = this.TranslateFunction(cell.value);
+      cell_value = this.model.TranslateFunction(cell.value);
 
     }
 

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

@@ -398,6 +398,12 @@ export interface OptionalParserFlags {
    */
   // complex_numbers: true,
 
+  /** string representing boolean true, for parsing/rendering */
+  boolean_true?: string;
+
+  /** string representing boolean false, for parsing/rendering */
+  boolean_false?: string;
+
 }
 
 export type ParserFlags = Partial<OptionalParserFlags> & RequiredParserFlags;
@@ -423,6 +429,10 @@ export interface RenderOptions {
   convert_imaginary_number: 'i'|'j';
   long_structured_references: boolean;
   table_name: string;
+
+  boolean_true?: string;
+  boolean_false?: string;
+
 }
 
 /*
@@ -439,5 +449,7 @@ export const DefaultParserConfig: ParserFlags = {
   fractions: true,
   decimal_mark: DecimalMarkType.Period,
   argument_separator: ArgumentSeparatorType.Comma,
+  boolean_true: 'TRUE',
+  boolean_false: 'FALSE',
 };
 

package/treb-parser/src/parser.ts

@@ -108,8 +108,12 @@ const LC_Z = 0x7a;
 const LC_I = 0x69;
 // const LC_J = 0x6a;
 
+// there are a couple of characters we don't want in this 
+// range; we should split into separate ranges. also we 
+// probably have characters we don't need (atm)
+
 const ACCENTED_RANGE_START = 192;
-const ACCENTED_RANGE_END = 312;
+const ACCENTED_RANGE_END = 382; // bumping up for polish // 312;
 
 /**
  * precedence map
@@ -533,7 +537,7 @@ export class Parser {
       convert_argument_separator, 
       // convert_imaginary_number, 
       long_structured_references, 
-      table_name 
+      table_name,
     } = options;
 
     // use default separator, unless we're explicitly converting.
@@ -673,6 +677,18 @@ export class Parser {
           // escape any quotation marks in string
           return '"' + unit.value.replace(/"/g, '""') + '"';
         }
+        else if (typeof unit.value === 'boolean') {
+
+          // use render option (replacement) value; then flags value; then a default
+
+          if (unit.value) {
+            return options.boolean_true || this.flags.boolean_true || 'true' ; // default
+          }
+          else {
+            return options.boolean_false || this.flags.boolean_false || 'false' ; // default
+          }
+
+        }
         else if (convert_decimal && typeof unit.value === 'number') {
           if (unit.text) {
             // here we want to translate the literal typed-in value.
@@ -2290,6 +2306,8 @@ export class Parser {
       
     }
 
+    /* remove special handling
+
     // special handling
 
     if (str.toLowerCase() === 'true') {
@@ -2309,6 +2327,8 @@ export class Parser {
       };
     }
 
+    */
+
     // function takes precendence over address? I guess so
 
     this.ConsumeWhiteSpace();
@@ -2345,8 +2365,29 @@ export class Parser {
 
     }
  
+    // move true/false handling here
+    // should we accept english even if it's not the active language? (...)
+    
+    const lc = str.toLowerCase();
 
+    if (lc === 'true' || (this.flags.boolean_true && lc === this.flags.boolean_true.toLowerCase())) {
+      return {
+        type: 'literal',
+        id: this.id_counter++,
+        value: true,
+        position,
+      };
+    }
     
+    if (lc === 'false' || (this.flags.boolean_false && lc === this.flags.boolean_false.toLowerCase())) {
+      return {
+        type: 'literal',
+        id: this.id_counter++,
+        value: false,
+        position,
+      };
+    }
+
     const identifier: UnitIdentifier = {
       type: 'identifier',
       id: this.id_counter++,

package/tsproject.json

@@ -18,7 +18,7 @@
     "noEmitHelpers": true,
     "verbatimModuleSyntax": true,
     "lib": [
-      "dom", "ESNext"
+      "dom", "esnext"
     ],
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true