@trebco/treb 28.17.5 → 29.1.2

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

@@ -21,7 +21,7 @@
 
 import { DOMContext } from 'treb-base-types';
 import type { Theme, Rectangle } from 'treb-base-types';
-import type { AutocompleteExecResult, DescriptorType } from './autocomplete_matcher';
+import type { AutocompleteExecResult, FunctionDescriptor } from './autocomplete_matcher';
 
 export interface AutocompleteResult {
   handled: boolean;
@@ -29,7 +29,7 @@ export interface AutocompleteResult {
   data?: AutocompleteExecResult;
   value?: string;
   click?: boolean;
-  type?: DescriptorType;
+  type?: FunctionDescriptor['type'];
 }
 
 /*

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

@@ -41,15 +41,25 @@ export interface ArgumentDescriptor {
   name?: string;
 }
 
+/*
 export enum DescriptorType {
   Function, Token
 }
+*/
 
 export interface FunctionDescriptor {
   name: string;
   description?: string;
   arguments?: ArgumentDescriptor[];
-  type?: DescriptorType;
+
+  /** switching to literals */
+  type?: 'function'|'token';
+
+  /** this is a named range or named expression. meaning a user/non-system name. */
+  named?: boolean;
+
+  /** scope refers to sheet IDs. names may be scoped. */
+  scope?: number;
 }
 
 export interface AutocompleteMatchData {
@@ -77,43 +87,61 @@ export interface TooltipParserResult {
 export class AutocompleteMatcher {
 
   private function_names: string[] = [];
-
-  //private function_map: {[index: string]: FunctionDescriptor} = {};
+  // private function_map: {[index: string]: FunctionDescriptor} = {};
 
   private argument_separator = Localization.argument_separator.charCodeAt(0);
 
   /**
    * making this public (and scrubbing the type). we need it public so we 
    * can check collisions. I'm not sure why it was originally private...
+   * 
+   * that's backwards. this should be private, and anyone checking 
+   * collisions should ask. also updating to modern type.
+   * 
+   * OK so now a map. all names should be lower-cased for consistency (they
+   * can maintain canonical names inside the object).
    */
-  public function_map: Record<string, FunctionDescriptor> = {};
+  private function_map: Map<string, FunctionDescriptor> = new Map();
 
   public RemoveFunctions(functions: FunctionDescriptor|FunctionDescriptor[]): void {
     if (!Array.isArray(functions)) { functions = [functions]; }
-    let list = Object.keys(this.function_map).map((key) => this.function_map[key]);
-    for (const func of functions) {
-      list = list.filter(test => test.name !== func.name);
+    for (const entry of functions) {
+      this.function_map.delete(entry.name.toLowerCase());
     }
-    this.SetFunctions(list);
+    this.UpdateNameList();
   }
 
   public AddFunctions(functions: FunctionDescriptor|FunctionDescriptor[]): void {
     if (!Array.isArray(functions)) { functions = [functions]; }
-    const list = Object.keys(this.function_map).map((key) => this.function_map[key]).concat(...functions);
-    this.SetFunctions(list);
+    for (const entry of functions) {
+      this.function_map.set(entry.name.toLowerCase(), entry);
+    }
+    this.UpdateNameList();
   }
 
   public SetFunctions(functions: FunctionDescriptor[]): void {
-    this.function_map = {};
-    this.function_names = functions.map((fn) => {
-      this.function_map[fn.name.toLowerCase()] = fn;
-      return fn.name;
-    }).sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+    this.function_map.clear();
+    for (const entry of functions) {
+      this.function_map.set(entry.name.toLowerCase(), entry);
+    }
+    this.UpdateNameList();
   }
 
+  /**
+   * returns the canonical version of the name, if it exists.
+   * @param name 
+   * @returns 
+   */
   public NormalizeIdentifier(name: string): string|undefined {
-    const identifier = this.function_map[name.toLowerCase()];
-    return identifier ? identifier.name : undefined;
+    return this.function_map.get(name.toLowerCase())?.name;
+  }
+
+  /** 
+   * accessor for entries. we're not stopping you from modifying 
+   * in place, for now, but don't do that. 
+   */
+  public Get(name: string): FunctionDescriptor|undefined {
+    return this.function_map.get(name.toLowerCase());
   }
 
   public Exec(data: AutocompleteMatchData): AutocompleteExecResult {
@@ -139,7 +167,9 @@ export class AutocompleteMatcher {
       if (match) {
         const token = match[1];
         const rex = new RegExp('^' + token.replace('.', '\\.'), 'i');
-        const list = this.function_names.filter((name) => rex.test(name)).map((name) => this.function_map[name.toLowerCase()]);
+        const list = this.function_names.filter((name) => 
+          rex.test(name)).map((name) => 
+            this.function_map.get(name.toLowerCase())).filter((test): test is FunctionDescriptor => !!test);
 
         result = {
           completions: list, 
@@ -154,7 +184,7 @@ export class AutocompleteMatcher {
     const parsed = this.ParseTooltip(data.text.substr(0, data.cursor));
 
     if (parsed.function) {
-      const func = this.function_map[parsed.function.toLowerCase()];
+      const func = this.function_map.get(parsed.function.toLowerCase());
       if (func) {
         // if (func.canonical_name) result.tooltip = func.canonical_name;
         // else result.tooltip = tt.toUpperCase();
@@ -257,4 +287,12 @@ export class AutocompleteMatcher {
 
   }
 
+  /**
+   * we maintain a sorted list of names. this needs to get updated
+   * when the list changes.
+   */
+  private UpdateNameList() {
+    this.function_names = [...this.function_map.keys()].sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()));
+  }
+
 }

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

@@ -40,13 +40,13 @@
  * 
  */
 
-import { Area, type IArea, type ICellAddress, IsCellAddress, Localization, type Theme, Rectangle, type Cell, DOMContext } from 'treb-base-types';
+import { Area, type ICellAddress, IsCellAddress, Localization, Rectangle, type Cell, DOMContext } from 'treb-base-types';
 import type { ExpressionUnit, ParseResult, UnitAddress, UnitRange } from 'treb-parser';
-import { Parser, QuotedSheetNameRegex } from 'treb-parser';
-import type { DataModel, ViewModel } from '../types/data_model';
+import { Parser } from 'treb-parser';
+import type { DataModel, ViewModel } from 'treb-data-model';
 import type { Autocomplete, AutocompleteResult } from './autocomplete';
 import { EventSource } from 'treb-utils';
-import { type AutocompleteExecResult, AutocompleteMatcher, DescriptorType } from './autocomplete_matcher';
+import { type AutocompleteExecResult, AutocompleteMatcher, type FunctionDescriptor } from './autocomplete_matcher';
 
 export interface UpdateTextOptions {
   rewrite_addresses: boolean;
@@ -56,7 +56,7 @@ export interface UpdateTextOptions {
   toll_events: boolean;
 }
 
-type GenericEventListener = (event: Event) => any;
+type GenericEventListener = (event: Event) => unknown;
 
 // ----------------
 
@@ -313,7 +313,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
    * 
    * listeners moved to node descriptors so we can have multiple sets.
    */
-  protected RegisterListener<K extends keyof HTMLElementEventMap>(descriptor: NodeDescriptor, key: K, handler: (event: HTMLElementEventMap[K]) => any) {
+  protected RegisterListener<K extends keyof HTMLElementEventMap>(descriptor: NodeDescriptor, key: K, handler: (event: HTMLElementEventMap[K]) => unknown) {
     descriptor.node.addEventListener(key, handler);
     if (!descriptor.listeners) {
       descriptor.listeners = new Map();
@@ -369,12 +369,12 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
       }
     }
 
-  };
+  }
 
   /**
-   * not sure what the ID was, we don't use it atm
+   * 
    */
-  public InsertReference(reference: string, id?: number) {
+  public InsertReference(reference: string) {
 
     if (!this.active_editor) {
       return;
@@ -392,7 +392,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
       return '';
     }
 
-    let range = selection.getRangeAt(0);
+    const range = selection.getRangeAt(0);
     const text = this.active_editor.node.textContent || '';
 
     // so what we are doing here depends on where the caret is.
@@ -472,9 +472,9 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
           const substring = this.SubstringToCaret2(this.active_editor.node)[1];
 
           let leader = '';
-          let trailer = '';
+          // let trailer = '';
 
-          let trimmed = substring.trim();
+          const trimmed = substring.trim();
           if (trimmed.length) {
             const char = trimmed[trimmed.length - 1];
             if (!Editor.FormulaChars.includes(char)) {
@@ -675,12 +675,12 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
         case 'identifier':
         {
-          const named_range = this.model.named_ranges.Get(unit.name);
-          if (named_range) {
-            if (named_range.count === 1) {
+          const named_range = this.model.GetName(unit.name, this.view.active_sheet.id); // FIXME: scoped?
+          if (named_range?.type === 'range') {
+            if (named_range.area.count === 1) {
               reference_list.push({
                 type: 'address',
-                ...named_range.start,
+                ...named_range.area.start,
                 label: unit.name,
                 position: unit.position,
                 id: unit.id,
@@ -694,14 +694,14 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
                   position: unit.position,
                   id: unit.id,
                   label: unit.name,
-                    ...named_range.start,
+                    ...named_range.area.start,
                 },
                 end: {
                   type: 'address',
                   position: unit.position,
                   label: unit.name,
                   id: unit.id,
-                    ...named_range.end,
+                    ...named_range.area.end,
                 },
                 label: unit.name,
                 position: unit.position,
@@ -730,7 +730,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     for (const entry of reference_list) {
 
-      const label = this.model.AddressToLabel(entry, this.view.active_sheet);
+      const label = this.model.AddressToLabel(entry); // , this.view.active_sheet);
       const area = IsCellAddress(entry) ? 
           new Area(entry) : 
           new Area(entry.start, entry.end);
@@ -834,7 +834,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     // console.info({text, substr, substr2});
 
-    let caret_start = substring_start.length;
+    const caret_start = substring_start.length;
     let caret_end = substring_end.length;
 
     // this is a little hacky
@@ -1053,11 +1053,13 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     if (!this.active_editor) return;
 
-    let type = DescriptorType.Function;
+    // let type = DescriptorType.Function;
+    let type: FunctionDescriptor['type'];
+
     if (ac_result.data && ac_result.data.completions) {
       for (const completion of ac_result.data.completions) {
         if (completion.name.toLowerCase() === ac_result.value?.toLowerCase()) {
-          type = completion.type || DescriptorType.Function;
+          type = completion.type ; // || DescriptorType.Function;
           break;
         }
       }
@@ -1073,11 +1075,11 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
     const start = ac_result.data?.position || 0;
     const end = start + (ac_result.data?.token?.length || 0);
 
-    const insertion = (type === DescriptorType.Token) ? ac_result.value : ac_result.value + '(';
+    const insertion = (type === 'token') ? ac_result.value : ac_result.value + '(';
 
     const text = this.active_editor.node.textContent || '';
     let adjusted = text.substring(0, start) + insertion;
-    let caret = adjusted.length;
+    const caret = adjusted.length;
     adjusted += text.substring(end);
 
     this.active_editor.node.textContent = adjusted;
@@ -1137,7 +1139,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
     // how about string concat instead of array join, it's faster in 
     // chrome (!)
 
-    let complete = [ false, false ];
+    const complete = [ false, false ];
 
     const Consume = (element: Node, range: Range) => {
 

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

@@ -19,10 +19,10 @@
  * 
  */
 
-import type { Area, Cell, Theme } from 'treb-base-types';
+// import type { Area, Cell, Theme } from 'treb-base-types';
 import { Editor, type NodeDescriptor, type FormulaEditorEvent } from './editor';
-import { Parser } from 'treb-parser';
-import type { DataModel, ViewModel } from '../types/data_model';
+// import { Parser } from 'treb-parser';
+import type { DataModel, ViewModel } from 'treb-data-model';
 import type { GridOptions } from '../types/grid_options';
 import { Autocomplete } from './autocomplete';
 import { DOMContext } from 'treb-base-types';
@@ -250,7 +250,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
 
     });
 
-    this.RegisterListener(descriptor, 'focusout', (event: FocusEvent) => {
+    this.RegisterListener(descriptor, 'focusout', () => {
 
       if (this.selecting) {
         console.info('focusout, but selecting...');
@@ -328,7 +328,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
     // Q: do we do this in other places? we should consolidate
     // A: I don't think we do just this, usually there's additional logic for % and such
 
-    this.address_label.addEventListener('focusin', (event) => {
+    this.address_label.addEventListener('focusin', () => {
 
       const doc = this.address_label.ownerDocument;
 

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

@@ -21,10 +21,9 @@
 
 import { Editor, type NodeDescriptor } from './editor';
 import { Area, Cell, type CellStyle, type CellValue, Rectangle, Style, type Theme, ThemeColor2 } from 'treb-base-types';
-import { DataModel, type ViewModel } from '../types/data_model';
+import { DataModel, type ViewModel, type GridSelection } from 'treb-data-model';
 import { Autocomplete } from './autocomplete';
 import { UA } from '../util/ua';
-import type { GridSelection } from '../types/grid_selection';
 
 export type OverlayEditorResult = 'handled' | 'commit' | 'discard';
 

package/treb-grid/src/index.ts

@@ -21,23 +21,12 @@
 
 export { Grid } from './types/grid';
 export { GridBase } from './types/grid_base';
-export { Sheet } from './types/sheet';
-export { DataModel, type MacroFunction, type ConnectedElementType } from './types/data_model';
-export type { SerializedNamedExpression, SerializedModel } from './types/data_model';
 export * from './types/grid_events';
-export type { SerializedSheet, FreezePane } from './types/sheet_types';
-export { Annotation } from './types/annotation';
-export type { ViewData as AnnotationViewData } from './types/annotation';
 export type { GridOptions } from './types/grid_options';
 export { CommandKey } from './types/grid_command';
 export type { Command } from './types/grid_command';
-export { NamedRangeCollection } from './types/named_range';
-export type { GridSelection } from './types/grid_selection';
 export { BorderConstants } from './types/border_constants';
-export type { SerializeOptions } from './types/serialize_options';
 export type { FunctionDescriptor, ArgumentDescriptor } from './editors/autocomplete_matcher';
 export { UA } from './util/ua';
 export type { SetRangeOptions } from './types/set_range_options';
-export type { AnnotationData, AnnotationType } from './types/annotation';
 export type { ExternalEditorConfig, DependencyList, ExternalEditorCallback } from './types/external_editor_config';
-export * from './types/conditional_format';

package/treb-grid/src/layout/base_layout.ts

@@ -20,7 +20,7 @@
  */
 
 import { DOMContext } from 'treb-base-types';
-import type { DataModel, ViewModel } from '../types/data_model';
+import type { DataModel, ViewModel, Annotation } from 'treb-data-model';
 
 import type { Tile } from '../types/tile';
 import type { Theme, Point, Extent, Size, Position, ICellAddress, Table, IArea } from 'treb-base-types';
@@ -42,7 +42,6 @@ import type { GridEvent } from '../types/grid_events';
 
 import type { CellValue, AnnotationLayout, Corner } from 'treb-base-types';
 import { Area as TileRange } from 'treb-base-types';
-import type { Annotation } from '../types/annotation';
 
 export { Area as TileRange } from 'treb-base-types';
 
@@ -282,7 +281,9 @@ export abstract class BaseLayout {
         this.dropdown_caret.setAttribute('class', 'treb-dropdown-caret');
         if (event.key === 'Enter' && this.dropdown_callback) {
           if (this.dropdown_selected) {
-            this.dropdown_callback.call(0, (this.dropdown_selected as any).dropdown_value);
+            const value = this.dropdown_selected.dataset.dropdown_value;
+            // this.dropdown_callback.call(0, (this.dropdown_selected as any).dropdown_value);
+            this.dropdown_callback.call(0, value ? JSON.parse(value) : undefined);
           }
         }
       }
@@ -333,7 +334,11 @@ export abstract class BaseLayout {
       this.dropdown_caret.setAttribute('class', 'treb-dropdown-caret');
 
       if (this.dropdown_callback) {
-        this.dropdown_callback.call(0, (target as any).dropdown_value);
+        // this.dropdown_callback.call(0, (target as any).dropdown_value);
+
+        const value = target.dataset.dropdown_value;
+        this.dropdown_callback.call(0, value ? JSON.parse(value) : undefined);
+
       }
     });
 
@@ -608,7 +613,7 @@ export abstract class BaseLayout {
    * 
    */
   public PointToAnnotationCorner(point: Point): Corner {
-    const address = this.PointToAddress_Grid(point, undefined, false);
+    const address = this.PointToAddress_Grid(point, false);
     const cell_rect = this.CellAddressToRectangle(address);
 
     return {
@@ -1417,7 +1422,14 @@ export abstract class BaseLayout {
         this.dropdown_selected = entry;
         entry.classList.add('selected');
       }
-      (entry as any).dropdown_value = value;
+
+      // we're attaching random data to DOM nodes here. that works, but
+      // it's sloppy. I think the reason is we want to preserve type, and
+      // this is simpler than any other solution.
+
+      // (entry as any).dropdown_value = value;
+      entry.dataset.dropdown_value = JSON.stringify(value);
+
       entry.textContent = value?.toString() || '';
     }
 
@@ -1519,7 +1531,7 @@ export abstract class BaseLayout {
     // in two scroll events. however in practice this is called on key events,
     // so it's unlikely.
 
-    let options: ScrollToOptions = {
+    const options: ScrollToOptions = {
       behavior: smooth ? 'smooth' : 'auto',
     };
 
@@ -1662,7 +1674,7 @@ export abstract class BaseLayout {
    * 
    * FIXME: implement cap_maximum parameter (not sure where we would need it)
    */
-  public PointToAddress_Grid(point: Point, cap_maximum = false, offset_freeze = true): ICellAddress {
+  public PointToAddress_Grid(point: Point, offset_freeze = true): ICellAddress {
 
     // offset for freeze pane
 

package/treb-grid/src/layout/grid_layout.ts

@@ -22,7 +22,7 @@
 import { BaseLayout } from './base_layout';
 import type { Tile } from '../types/tile';
 import { DOMContext } from 'treb-base-types';
-import type { DataModel, ViewModel } from '../types/data_model';
+import type { DataModel, ViewModel } from 'treb-data-model';
 
 
 /**
@@ -151,7 +151,7 @@ export class GridLayout extends BaseLayout {
 
   }
 
-  protected UpdateGridTemplates(columns = true, rows = true): void {
+  protected UpdateGridTemplates(): void {
 
     let width = 0;
     let height = 0;

package/treb-grid/src/layout/mock-layout.ts

@@ -1,6 +1,5 @@
 
-import type { DataModel, ViewModel } from '../types/data_model';
-import type { Tile } from '../types/tile';
+import type { DataModel, ViewModel } from 'treb-data-model';
 import { BaseLayout } from './base_layout';
 
 export class MockLayout extends BaseLayout {
@@ -9,15 +8,15 @@ export class MockLayout extends BaseLayout {
     super(model, view, true);
   }
 
-  public InitializeInternal(container: HTMLElement, scroll_callback: () => void): void {
+  public InitializeInternal(): void {
     
   }
 
-  protected UpdateGridTemplates(columns: boolean, rows: boolean): void {
+  protected UpdateGridTemplates(): void {
     
   }
 
-  protected UpdateTileGridPosition(tile: Tile): void {
+  protected UpdateTileGridPosition(): void {
     
   }
 
@@ -25,7 +24,7 @@ export class MockLayout extends BaseLayout {
     
   }
 
-  public ResizeCursor(resize?: 'row' | 'column' | undefined): void {
+  public ResizeCursor(): void {
     
   }
 

package/treb-grid/src/render/selection-renderer.ts

@@ -20,13 +20,12 @@
  */
 
 import type { Theme, ICellAddress } from 'treb-base-types';
-import { DOMContext, Rectangle } from 'treb-base-types';
+import { Rectangle } from 'treb-base-types';
 import type { BaseLayout } from '../layout/base_layout';
 import type { SelectionOffset } from './svg_selection_block';
 import { SVGSelectionBlock } from './svg_selection_block';
-import type { GridSelection } from '../types/grid_selection';
 import { HeaderOverlay, Orientation } from './svg_header_overlay';
-import type { DataModel, ViewModel } from '../types/data_model';
+import type { GridSelection, DataModel, ViewModel } from 'treb-data-model';
 
 // const SVGNS = 'http://www.w3.org/2000/svg';
 

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

@@ -32,7 +32,7 @@ import { FontMetricsCache as FontMetricsCache2 } from '../util/fontmetrics2';
 import type { FormattedString} from 'treb-parser';
 import { MDParser } from 'treb-parser';
 import type { BaseLayout, TileRange } from '../layout/base_layout';
-import type { DataModel, ViewModel } from '../types/data_model';
+import type { DataModel, ViewModel } from 'treb-data-model';
 import type { GridOptions } from '../types/grid_options';
 
 const DEFAULT_INDENT = '  '; // two spaces in the current font