@trebco/treb 28.17.4 → 29.1.2

package/{treb-grid/src/types → treb-data-model/src}/sheet.ts

@@ -39,8 +39,8 @@ import type { TextPart ,
 
 import type { FreezePane, SerializedSheet, ScrollOffset } from './sheet_types';
 import type { SerializeOptions } from './serialize_options';
-import type { GridSelection } from './grid_selection';
-import { CreateSelection } from './grid_selection';
+import type { GridSelection } from './sheet_selection';
+import { CreateSelection } from './sheet_selection';
 import { Annotation } from './annotation';
 import type { ConditionalFormatList } from './conditional_format';
 
@@ -2506,6 +2506,7 @@ export class Sheet {
       }
     }
 
+    /*
     const translate_border_color = (color: string | undefined, default_color: string | undefined): string | undefined => {
       if (typeof color !== 'undefined' && color !== 'none') {
         if (color === default_color) {
@@ -2517,6 +2518,7 @@ export class Sheet {
       }
       return undefined;
     }
+    */
 
     const translate_border_fill = (color: Color = {}, default_color: Color = {}) => {
       const result: Color = {
@@ -3070,6 +3072,12 @@ export class Sheet {
 
         for (const key of keys) {
           if (typeof column_style[key] !== 'undefined') {
+
+            // what's the correct pattern (if any) for this? these
+            // are the same type so the type of the indexed value should
+            // be equivalent... no? maybe there is no correct way
+
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             (overrides as any)[key] = properties[key];
           }
         }
@@ -3171,8 +3179,8 @@ export class Sheet {
 
   public BleedFlush(area: IArea) {
 
-    let rows = [Math.max(0, area.start.row - 1), area.end.row + 1];
-    let cols = [Math.max(0, area.start.column - 1), area.end.column + 1];
+    const rows = [Math.max(0, area.start.row - 1), area.end.row + 1];
+    const cols = [Math.max(0, area.start.column - 1), area.end.column + 1];
 
     for (let row = rows[0]; row <= rows[1]; row++) {
       for (let column = cols[0]; column <= cols[1]; column++) {
@@ -3323,7 +3331,7 @@ export class Sheet {
           }
           else {
             if (result.type === ValueType.boolean || result.type === ValueType.number) {
-              if(!!result.value) {
+              if(result.value) {
                 for (let row = area.start.row; row <= area.end.row; row++) {
                   if (!temp[row]) { temp[row] = []; }
                   for (let column = area.start.column; column <= area.end.column; column++) {

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

@@ -0,0 +1,114 @@
+
+import type { Sheet } from './sheet';
+
+/**
+ * we spend a lot of time looking up sheets by name, or id, or 
+ * sometimes index. it makes sense to have a class that can 
+ * support all of these, ideally without looping.
+ * 
+ * we just have to make sure that no one is assigning to the
+ * array, or we'll lose track. 
+ * 
+ * also there are some operations -- rename, in particular -- that
+ * require updating indexes.
+ * 
+ * 
+ * FIXME: new file (1 class per file)
+ */
+export class SheetCollection {
+
+  /** 
+   * returns a read-only copy of the list. useful for indexing or 
+   * functional-style calls. it's not actually read-only, but it's a 
+   * copy, so changes will be ignored.
+   */
+  public get list() {
+    return this.sheets_.slice(0);
+  }
+
+  /**
+   * length of list
+   */
+  public get length() {
+    return this.sheets_.length;
+  }
+
+  /** map of (normalized) name -> sheet */
+  protected names: Map<string, Sheet> = new Map();
+
+  /** map of id -> sheet */
+  protected ids: Map<number, Sheet> = new Map();
+
+  /** the actual list */
+  private sheets_: Sheet[] = [];
+
+  /**
+   * remove any existing sheets and add the passed list. updates indexes.
+   */
+  public Assign(sheets: Sheet[]) {
+    this.sheets_ = [...sheets];
+    this.UpdateIndexes();
+  }
+
+  /** 
+   * add a new sheet to the end of the list (push). updates indexes. 
+   */
+  public Add(sheet: Sheet) {
+    this.sheets_.push(sheet);
+    this.UpdateIndexes();
+  }
+
+  /** 
+   * wrapper for array splice. updates indexes. 
+   */
+  public Splice(insert_index: number, delete_count: number, ...items: Sheet[]) {
+    this.sheets_.splice(insert_index, delete_count, ...items);
+    this.UpdateIndexes();
+  }
+  
+  /**
+   * so our new strategy is to add lookup methods first -- then 
+   * we can fix the underlying storage implementation.
+   * 
+   * NOTE we normalize strings here so you do not need to do it (don't)
+   */
+   public Find(id: string|number): Sheet|undefined {
+
+    // console.info('get', typeof id);
+
+    if (typeof id === 'string') {
+      return this.names.get(id.toLocaleUpperCase());
+    }
+    else {
+      return this.ids.get(id);
+    }
+
+    return undefined;
+  }
+
+  /** get name for sheet with given id */
+  public Name(id: number): string|undefined {
+    return this.ids.get(id)?.name || undefined;
+  }
+
+  /** get ID for sheet with given name */
+  public ID(name: string): number|undefined {
+    return this.names.get(name.toLocaleUpperCase())?.id || undefined;
+  }
+
+  /** not sure why this is private, makes it a little more complicated */
+  public UpdateIndexes(): void {
+
+    this.names.clear();
+    this.ids.clear();
+
+    for (const sheet of this.sheets_) {
+      const uc = sheet.name.toLocaleUpperCase();
+      this.names.set(uc, sheet);
+      this.ids.set(sheet.id, sheet);
+    }
+
+  }
+
+
+}

package/{treb-grid/src/types → treb-data-model/src}/sheet_types.ts

@@ -19,9 +19,9 @@
  * 
  */
 
-import type { IArea, SerializedCellData, Style, CellStyle } from 'treb-base-types';
-import type { Annotation, AnnotationData } from './annotation';
-import type { GridSelection, SerializedGridSelection } from './grid_selection';
+import type { IArea, SerializedCellData, CellStyle } from 'treb-base-types';
+import type { AnnotationData } from './annotation';
+import type { GridSelection, SerializedGridSelection } from './sheet_selection';
 import type { ConditionalFormatList } from './conditional_format';
 
 export interface UpdateHints {
@@ -142,5 +142,8 @@ export interface SerializedSheet {
 /**
  * support for legacy sheet data
  * (I think we can drop)
+ * 
+ * @internal
+ * @deprecated
  */
 export type LegacySerializedSheet = SerializedSheet & { primary_selection?: GridSelection }

package/treb-embed/modern.tsconfig.json

@@ -6,6 +6,7 @@
     "../treb-utils/**/*.ts",
     "../treb-grid/**/*.ts",
     "../treb-charts/**/*.ts",
+    "../treb-data-model/**/*.ts",
     "../treb-export/**/*.ts",
     "../treb-format/**/*.ts",
     "../treb-parser/**/*.ts",

package/treb-embed/src/custom-element/spreadsheet-constructor.ts

@@ -146,9 +146,8 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
     if (this.root) {
 
       const names = this.root.getAttributeNames();
-      console.info({names});
 
-      for (let name of names) {
+      for (const name of names) {
 
         switch (name) {
 
@@ -612,7 +611,7 @@ export class SpreadsheetConstructor<USER_DATA_TYPE = unknown> {
 
     comment_box.value = '';
 
-    for (const [key, value] of Object.entries(this.toolbar_controls)) {
+    for (const value of Object.values(this.toolbar_controls)) {
       if (value) {
         // value.classList.remove('treb-active');
         value.removeAttribute('active');