@trebco/treb 29.3.3 → 29.4.1

package/dist/treb.d.ts

@@ -1,4 +1,4 @@
-/*! API v29.3. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
+/*! API v29.4. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map
@@ -743,13 +743,13 @@ export declare class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     /**
      * set or clear cell valiation.
      *
-     * @param address - target cell
+     * @param target - target cell/area
      * @param validation - a spreadsheet range, list of data, or undefined. pass
      * undefined to remove existing cell validation.
      * @param error - setting an invalid value in the target cell is an error (and
      * is blocked). defaults to false.
      */
-    SetValidation(address: AddressReference, validation?: RangeReference | CellValue[], error?: boolean): void;
+    SetValidation(target: RangeReference, validation?: RangeReference | CellValue[], error?: boolean): void;
 
     /**
      * Delete a macro function.
@@ -1727,7 +1727,6 @@ export interface BaseCellData {
     table?: Table;
     area?: IArea;
     merge_area?: IArea;
-    validation?: DataValidation;
     calculated_type?: SerializedValueType;
     note?: string;
     hyperlink?: string;
@@ -1817,27 +1816,6 @@ export interface Table {
      */
     sort?: TableSortOptions;
 }
-export type DataValidation = DataValidationList | DataValidationRange | DataValidationNumber | DataValidationDate | DataValidationBoolean;
-export interface DataValidationBase {
-    error?: boolean;
-}
-export interface DataValidationRange extends DataValidationBase {
-    type: 'range';
-    area: IArea;
-}
-export interface DataValidationList extends DataValidationBase {
-    type: 'list';
-    list: CellValue[];
-}
-export interface DataValidationDate extends DataValidationBase {
-    type: 'date';
-}
-export interface DataValidationNumber extends DataValidationBase {
-    type: 'number';
-}
-export interface DataValidationBoolean extends DataValidationBase {
-    type: 'boolean';
-}
 
 /**
  * string types for import/export

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "29.3.3",
+  "version": "29.4.1",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {

package/treb-base-types/src/area.ts

@@ -169,12 +169,29 @@ export class Area implements IArea {
 
   public static CellAddressToLabel(address: ICellAddress, sheet_id = false): string {
 
-    if (address.row === Infinity || address.column === Infinity) {
+    if (address.row === Infinity && address.column === Infinity) {
       throw new Error('this is going to break something');
     }
 
     const prefix = sheet_id ? `${address.sheet_id || 0}!` : '';
 
+    if (address.row === Infinity) {
+      return prefix
+        + (address.absolute_column ? '$' : '')
+        + this.ColumnToLabel(address.column)
+        // + (address.absolute_row ? '$' : '')
+        // + (address.row + 1);
+        ;
+    }
+    if (address.column === Infinity) {
+      return prefix
+        // + (address.absolute_column ? '$' : '')
+        // + this.ColumnToLabel(address.column)
+        + (address.absolute_row ? '$' : '')
+        + (address.row + 1)
+        ;
+    }
+
     return prefix
       + (address.absolute_column ? '$' : '')
       + this.ColumnToLabel(address.column)
@@ -567,6 +584,13 @@ export class Area implements IArea {
       && area.end_.column === this.end_.column;
   }
 
+  public Equals2(area: IArea): boolean {
+    return area.start.row === this.start_.row
+      && area.start.column === this.start_.column
+      && area.end.row === this.end_.row
+      && area.end.column === this.end_.column;
+  }
+
   public Clone(): Area {
     return new Area(this.start, this.end); // ensure copies
   }

package/treb-base-types/src/cell.ts

@@ -21,7 +21,7 @@
 
 // import { Parser } from 'treb-parser';
 
-import type { Area, IArea } from './area';
+import type { Area } from './area';
 import type { CellStyle } from './style';
 import type { TextPart } from './text_part';
 import type { Complex } from './value-type';
@@ -117,50 +117,6 @@ export type ClickFunction = (options: ClickFunctionOptions) => ClickFunctionResu
  *  - raw per-cell style information. this is in a separate array (object).
  */
 
-/**
- * validation TODO: date, number, boolean, &c
- */
-export enum ValidationType {
-  List = 'list',
-  Date = 'date',
-  Range = 'range',
-  Number = 'number',
-  Boolean = 'boolean',
-}
-
-export interface DataValidationBase {
-  error?: boolean;
-}
-
-export interface DataValidationRange extends DataValidationBase {
-  type: 'range'; // ValidationType.Range;
-  area: IArea;
-}
-
-export interface DataValidationList extends DataValidationBase {
-  type: 'list'; // ValidationType.List;
-  list: CellValue[];
-}
-
-export interface DataValidationDate extends DataValidationBase {
-  type: 'date'; // ValidationType.Date;
-}
-
-export interface DataValidationNumber extends DataValidationBase {
-  type: 'number'; // ValidationType.Number;
-}
-
-export interface DataValidationBoolean extends DataValidationBase {
-  type: 'boolean'; // ValidationType.Boolean;
-}
-
-export type DataValidation 
-  = DataValidationList
-  | DataValidationRange
-  | DataValidationNumber
-  | DataValidationDate
-  | DataValidationBoolean;
-
 export class Cell {
 
   // --- static methods -------------------------------------------------------
@@ -342,7 +298,7 @@ export class Cell {
   /** not editable */
   // public locked?: boolean;
 
-  public validation?: DataValidation;
+  // public validation?: DataValidation;
 
   // --- class methods --------------------------------------------------------
 

package/treb-base-types/src/cells.ts

@@ -26,7 +26,9 @@
 
 import type { IArea, ICellAddress} from './area';
 import { Area, IsCellAddress } from './area';
-import type { DataValidation } from './cell';
+
+// import type { DataValidation } from './cell';
+
 import { Cell } from './cell';
 import type { Table } from './table';
 import { type SerializedValueType, ValueType, GetValueType, ValueTypeList } from './value-type';
@@ -79,7 +81,7 @@ export interface BaseCellData {
   table?: Table;
   area?: IArea;
   merge_area?: IArea;
-  validation?: DataValidation;
+  // validation?: DataValidation;
   calculated_type?: SerializedValueType; //  ValueType;
   note?: string;
   hyperlink?: string;
@@ -404,7 +406,7 @@ export class Cells {
 
 
 
-  /**
+  /* *
    * this method is used for importing legacy data validation types. in those
    * those we used a numeric enum. we're just dropping that altogether (c.f.
    * ValueType, which we're keeping) so we need to translate for backcompat. 
@@ -419,7 +421,8 @@ export class Cells {
    *   Boolean = 'boolean',
    * }
    * 
-   */
+   * OK, removed
+   * /
   public ImportDataValidation(value: DataValidation): DataValidation|undefined {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -435,6 +438,7 @@ export class Cells {
 
     return value;
   }
+  */
 
   /**
    * UPDATE: adding optional style refs, for export
@@ -572,6 +576,7 @@ export class Cells {
         }
       }
 
+      /*
       if (obj.validation) {
 
         // the old type used a numeric enum. we just dropped that in favor
@@ -581,6 +586,7 @@ export class Cells {
         cell.validation = this.ImportDataValidation(obj.validation);
 
       }
+      */
 
     }
 
@@ -678,7 +684,7 @@ export class Cells {
               (merge_head || cell.type || (cell.calculated_type && options.expand_arrays) ||
                 (cell.calculated_type && options.calculated_value) ||
                 (cell.note) ||
-                (cell.validation) ||
+                // (cell.validation) ||
                 (options.decorated_cells && cell.style &&
                   ( cell.style.fill || cell.style.border_bottom ||
                     cell.style.border_top || cell.style.border_left || cell.style.border_right)))){
@@ -715,9 +721,9 @@ export class Cells {
             if (cell.merge_area) {
               obj.merge_area = cell.merge_area.toJSON();
             }
-            if (cell.validation) {
-              obj.validation = cell.validation; // safe? 
-            }
+            // if (cell.validation) {
+            //   obj.validation = cell.validation; // safe? 
+            // }
 
             if (options.cell_style_refs &&
                 options.cell_style_refs[column] &&

package/treb-base-types/src/import.ts

@@ -23,9 +23,8 @@ import type { CellStyle } from './style';
 import type { SerializedValueType } from './value-type';
 import type { IArea } from './area';
 import type { AnnotationLayout } from './layout';
-import type { DataValidation } from './cell';
 import type { Table } from './table';
-import type { AnnotationType, ConditionalFormat } from 'treb-data-model';
+import type { DataValidation, AnnotationType, ConditionalFormat } from 'treb-data-model';
 
 export interface CellParseResult {
   row: number,
@@ -60,6 +59,7 @@ export interface ImportedSheetData {
   row_heights: number[];
   styles: CellStyle[];
   conditional_formats: ConditionalFormat[];
+  data_validations?: DataValidation[];
 
   // optional, for backcompat
   sheet_style?: number;

package/treb-calculator/src/calculator.ts

@@ -184,7 +184,7 @@ export class Calculator extends Graph {
 
     super();
 
-    this.expression_calculator = new ExpressionCalculator(this.library, this.parser);
+    this.expression_calculator = new ExpressionCalculator(this.model, this.library, this.parser);
 
 
     // at the moment options are only used here; in the future
@@ -208,6 +208,9 @@ export class Calculator extends Graph {
 
     }
 
+    // FIXME: why is this called here, if model now owns it?
+    // TODO: move to model
+
     this.UpdateLocale(); // for parser
 
     // base functions
@@ -1391,6 +1394,11 @@ export class Calculator extends Graph {
       };
     });
 
+    // FIXME: this doesn't need to be here, if it's owned by model.
+    // we should have model responsible for retrieving these names
+    // (along with named ranges/expressions). also, should macro 
+    // functions support scoping?
+
     for (const macro of this.model.macro_functions.values()) {
       function_list.push({
         name: macro.name,
@@ -1448,8 +1456,7 @@ export class Calculator extends Graph {
       // that rely on it. which is a pretty far-fetched scenario, but we might
       // as well protect against it.
 
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      descriptor.fn = (...args: any[]) => {
+      descriptor.fn = (...args: unknown[]) => {
         return original_function.apply({
           address: { ...this.expression_calculator.context.address},
         }, args);
@@ -1460,22 +1467,23 @@ export class Calculator extends Graph {
 
   }
 
-  /**
+  /* *
    * wrap the attachdata function so we can update the expression calculator
    * at the same time (we should unwind this a little bit, it's an artifact
    * of graph being a separate class)
-   */
+   * /
   public AttachModel(): void {
     // this.RebuildMap();
-    this.expression_calculator.SetModel(this.model);
+    // this.expression_calculator.SetModel(this.model);
   }
+  */
 
   /**
    * wrapper method for calculation
    */
   public Calculate(subset?: Area): void {
 
-    this.AttachModel();
+    // this.AttachModel();
 
     // this gets checked later, now... it would be better if we could
     // check it here are skip the later check, but that field is optional
@@ -1539,7 +1547,7 @@ export class Calculator extends Graph {
   public Reset(): void {
 
     this.FlushTree();
-    this.AttachModel();
+    // this.AttachModel();
 
     this.full_rebuild_required = true;
   }
@@ -1572,7 +1580,10 @@ export class Calculator extends Graph {
     return map;
   }
 
+  /** overload */
   public Evaluate(expression: string, active_sheet?: Sheet, options?: EvaluateOptions, raw_result?: false): CellValue|CellValue[][];
+
+  /** overload */
   public Evaluate(expression: string, active_sheet?: Sheet, options?: EvaluateOptions, raw_result?: true): UnionValue;
 
   /** moved from embedded sheet */
@@ -1687,8 +1698,6 @@ export class Calculator extends Graph {
 
     this.full_rebuild_required = false; // unset
 
-    this.AttachModel();
-
     this.RebuildGraph();
 
     // add leaf vertices for annotations
@@ -1955,7 +1964,7 @@ export class Calculator extends Graph {
   }
 
   /**
-   * 
+   * FIXME: just add a quote option to the model method and we can drop this function
    */
   public ResolveSheetName(id: number, quote = false): string | undefined {
     const sheet = this.model.sheets.Find(id);
@@ -2792,10 +2801,11 @@ export class Calculator extends Graph {
 
   }
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  /*
   protected IsNativeOrTypedArray(val: unknown): boolean {
     return Array.isArray(val) || (val instanceof Float64Array) || (val instanceof Float32Array);
   }
+  */
 
   /**
    * check if a cell is volatile. normally this falls out of the calculation,

package/treb-calculator/src/dag/graph.ts

@@ -639,6 +639,8 @@ export abstract class Graph implements GraphCallbacks {
 
     const map = this.vertices[u.start.sheet_id];
 
+    // console.info({u});
+
     // this might happen on create, we can let it go because the 
     // references will be added when the relevant sheet is added
 
@@ -680,10 +682,17 @@ export abstract class Graph implements GraphCallbacks {
     else {
       for (let row = u.start.row; row <= u.end.row; row++) {
         for (let column = u.start.column; column <= u.end.column; column++) {
-          const vertex = map[column][row];
-          if (vertex) {
-            array_vertex.DependsOn(vertex);
+          if (map[column]) {
+            const vertex = map[column][row];
+            if (vertex) {
+              array_vertex.DependsOn(vertex);
+            }
+          }
+          /*
+          else {
+            console.info("HERE", column, row);
           }
+          */
         }
       }
     }