@trebco/treb 30.6.3 → 30.9.2

package/dist/treb.d.ts

@@ -1,4 +1,4 @@
-/*! API v30.6. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
+/*! API v30.9. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map
@@ -1779,6 +1779,9 @@ export interface SerializedSheet {
     /** sheet name */
     name?: string;
 
+    /** tab color */
+    tab_color?: Color;
+
     /** current active selection */
     selection: SerializedGridSelection;
 

package/package.json

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

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

@@ -19,6 +19,8 @@
  * 
  */
 
+
+
 /**
  * utility functions, primarily for adjusting lightness. since we generally
  * traffic in RGB (or symbolic colors) that requires translating to/from HSL.
@@ -120,5 +122,35 @@ export const ColorFunctions = {
     return p;
   },
 
+  ////////////////
+
+
+  GetLuminance: (r: number, g: number, b: number): number => {
+    const a = [r, g, b].map(v => {
+        v /= 255;
+        return v <= 0.03928 ? v / 12.92 : Math.pow((v + 0.055) / 1.055, 2.4);
+    });
+    return 0.2126 * a[0] + 0.7152 * a[1] + 0.0722 * a[2];
+  },
+  
+  GetContrastRatio: (data: [number, number]): number => {
+    data.sort((a, b) => b - a);
+    return (data[0] + 0.05) / (data[1] + 0.05);
+  },
+  
+  GetTextColor: (background: [number, number, number], a: [number, number, number], b: [number, number, number]) => {
+
+    const luminance = ColorFunctions.GetLuminance(...background);
+    const luminance_a = ColorFunctions.GetLuminance(...a); 
+    const luminance_b = ColorFunctions.GetLuminance(...b);
+
+    const contrast_a = ColorFunctions.GetContrastRatio([luminance_a, luminance]);
+    const contrast_b = ColorFunctions.GetContrastRatio([luminance_b, luminance]);
+
+    return contrast_a > contrast_b ? a : b;
+  },
+  
 };
 
+
+

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

@@ -19,7 +19,7 @@
  * 
  */
 
-import type { CellStyle } from './style';
+import type { CellStyle, Color } from './style';
 import type { SerializedValueType } from './value-type';
 import type { IArea } from './area';
 import type { AnnotationLayout } from './layout';
@@ -64,14 +64,13 @@ export interface ImportedSheetData {
   // optional, for backcompat
   sheet_style?: number;
   column_styles?: number[];
-
   row_styles?: number[];
 
-  // new
   annotations?: AnchoredAnnotation[];
+  outline?: number[];
 
   // new
-  outline?: number[];
+  tab_color?: Color;
 
   hidden?: boolean;
 

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

@@ -22,6 +22,7 @@
 import { type Color, type CellStyle, IsHTMLColor, IsThemeColor, ThemeColorIndex, type ThemeColor } from './style';
 import { ColorFunctions } from './color';
 import { DOMContext } from './dom-utilities';
+import { Measurement } from 'treb-utils';
 
 /*
  * so this is a little strange. we use CSS to populate a theme object,
@@ -242,7 +243,15 @@ export const ResolveThemeColor = (theme: Theme, color?: Color, default_index?: n
       return ''; 
     }
 
-    const resolved = ResolveThemeColor(theme, color.offset);
+    let resolved = '';
+
+    if (IsHTMLColor(color.offset)) {
+      const clamped = Measurement.MeasureColor(color.offset.text);
+      resolved = `rgb(${clamped[0]}, ${clamped[1]}, ${clamped[2]})`;
+    }
+    else {
+      resolved = ResolveThemeColor(theme, color.offset, undefined);
+    }
 
     // check cache
     if (theme.offset_cache && theme.offset_cache[resolved]) {
@@ -253,17 +262,35 @@ export const ResolveThemeColor = (theme: Theme, color?: Color, default_index?: n
 
     if (resolved) {
       // ok figure it out?
-      const match = resolved.match(/rgb\((\d+), (\d+), (\d+)\)/);
+      const match = resolved.match(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/);
       if (match) {
-        const hsl = ColorFunctions.RGBToHSL(Number(match[1]), Number(match[2]), Number(match[3]));
-        // console.info('resolved', resolved, {hsl});
-        if (hsl.l > .65) {
+
+        type ColorTuple = [number, number, number];
+
+        const background: ColorTuple = [Number(match[1]), Number(match[2]), Number(match[3])];
+
+
+        // const hsl = ColorFunctions.RGBToHSL(r, g, b);
+        // const check = ColorFunctions.GetLuminance(r, g, b);
+
+        const a = Array.from(Measurement.MeasureColor(theme.offset_dark)) as ColorTuple;
+        const b = Array.from(Measurement.MeasureColor(theme.offset_light)) as ColorTuple;
+
+        const tc = ColorFunctions.GetTextColor(background, a, b);
+
+        offset = `rgb(${tc[0]}, ${tc[1]}, ${tc[2]})`;
+
+        /*
+         if (hsl.l >.65)) {
           offset = theme.offset_dark;
         }
+        */
+
+
       }
       else {
         // ...
-        console.warn(`can't offset against color`, resolved);
+        console.warn(`can't offset against color`, resolved, '(1)');
       }
 
       if (!theme.offset_cache) {
@@ -272,7 +299,7 @@ export const ResolveThemeColor = (theme: Theme, color?: Color, default_index?: n
       theme.offset_cache[resolved] = offset;
     }
     else {
-      console.warn(`can't resolve offset color`, color.offset);
+      console.warn(`can't resolve offset color`, color.offset, '(2)');
     }
 
     return offset;

package/treb-calculator/src/calculator.ts

@@ -2383,6 +2383,9 @@ export class Calculator extends Graph {
     // is it also (3) adding unecessary calculations (building the expression,
     // below)?
 
+    // NOTE: moving all conditional formats into EN-US (i.e. dot-separated).
+    // make sure to evaluate them in this format.
+
     if (!list) {
 
       // we could in theory remove all of the leaves (the ones we know to
@@ -2416,8 +2419,15 @@ export class Calculator extends Graph {
       let expression = '';
 
       switch (entry.type) {
+
         case 'cell-match':
-          expression = this.Unresolve(entry.area, context, true, false) + ' ' + entry.expression;
+          if (entry.between) {
+            const addr = this.Unresolve(entry.area, context, true, false);
+            expression = `BETWEEN(${[addr, ...entry.between].join(', ')})`;
+          }
+          else {
+            expression = this.Unresolve(entry.area, context, true, false) + ' ' + entry.expression;
+          }
           break;
 
         case 'expression':
@@ -2440,7 +2450,7 @@ export class Calculator extends Graph {
               entry.min ?? '',
               entry.max ?? '',
 
-            ].join(this.parser.argument_separator)
+            ].join(',')
           })`;
           break;
 
@@ -2464,13 +2474,17 @@ export class Calculator extends Graph {
 
         entry.internal.vertex = vertex;
 
-        let options: EvaluateOptions|undefined;
+        let options: EvaluateOptions = {
+          argument_separator: ',', 
+        };
+
         if (entry.type !== 'gradient' && entry.type !== 'duplicate-values') {
-          options = entry.options;
+          options = {...entry.options, ...options};
         }
 
         // first pass, run the calculation
         const check = this.Evaluate(expression, context, options, true);
+        
         entry.internal.vertex.result = check;
         entry.internal.vertex.updated = true;
 
@@ -2478,7 +2492,7 @@ export class Calculator extends Graph {
 
       const vertex = entry.internal.vertex as LeafVertex;
       this.AddLeafVertex(vertex);
-      this.UpdateLeafVertex(vertex, expression, context);
+      this.UpdateLeafVertex(vertex, expression, context, DecimalMarkType.Period); // force en-us 
 
     }
 
@@ -2846,10 +2860,15 @@ export class Calculator extends Graph {
     return dependencies;
   }
 
-  protected UpdateLeafVertex(vertex: LeafVertex, formula: string, context: Sheet): void {
+  protected UpdateLeafVertex(vertex: LeafVertex, formula: string, context: Sheet, decimal_mark?: DecimalMarkType): void {
 
     vertex.Reset();
 
+    if (decimal_mark) {
+      this.parser.Save();
+      this.parser.SetLocaleSettings(decimal_mark);
+    }
+
     const parse_result = this.parser.Parse(formula);
     if (parse_result.expression) {
       const dependencies =
@@ -2895,6 +2914,10 @@ export class Calculator extends Graph {
 
     // vertex.UpdateState();
 
+    if (decimal_mark) {
+      this.parser.Restore();
+    }
+
   }
 
   /** 

package/treb-calculator/src/expression-calculator.ts

@@ -31,7 +31,7 @@ import { ValueType, GetValueType, Area } from 'treb-base-types';
 import type { Parser, ExpressionUnit, UnitBinary, UnitIdentifier,
          UnitGroup, UnitUnary, UnitAddress, UnitRange, UnitCall, UnitDimensionedQuantity, UnitStructuredReference } from 'treb-parser';
 import type { DataModel, MacroFunction, Sheet } from 'treb-data-model';
-import { NameError, ReferenceError, ExpressionError, UnknownError, SpillError } from './function-error';
+import { NameError, ReferenceError, ExpressionError, UnknownError, SpillError, ValueError } from './function-error';
 
 import * as Primitives from './primitives';
 
@@ -633,7 +633,7 @@ export class ExpressionCalculator {
 
   }
 
-  protected UnaryExpression(x: UnitUnary): (expr: UnitUnary) => UnionValue /*UnionOrArray*/ { // operator: string, operand: any){
+  protected UnaryExpression(x: UnitUnary, return_reference = false): (expr: UnitUnary) => UnionValue /*UnionOrArray*/ { // operator: string, operand: any){
 
     // there are basically three code paths here: negate, identity, and error.
     // they have very different semantics so we're going to do them completely
@@ -663,6 +663,110 @@ export class ExpressionCalculator {
 
       }
 
+    case '@':
+      return (expr: UnitUnary) => {
+
+        // if the operand is a range, then we need to do implicit intersection.
+        // otherwise, calculate the expression and return the first value 
+        // if it's an array.
+
+        let address: UnitAddress|undefined;
+
+        switch (expr.operand.type) {
+          case 'address':
+            if (expr.operand.spill) {
+
+              // we need to calculate the result so we know how large the
+              // range is... perhaps there's a way to look this up without
+              // calculating? (TODO/FIXME)
+
+              const calculated = this.CellFunction2(expr.operand)();
+              if (calculated.type === ValueType.array) {
+
+                const row = this.context.address.row ?? -1;
+                const column = this.context.address.column ?? -1;
+
+                // for this verison we already have the result, so unless
+                // we're trying to preserve the address, we could just 
+                // return it
+
+                if (row >= expr.operand.row && row < expr.operand.row + calculated.value[0]?.length && calculated.value.length === 1) {
+
+                  if (!return_reference) {
+                    return calculated.value[0][row - expr.operand.row];
+                  }
+
+                  address = {
+                    ...expr.operand,
+                    row,
+                    spill: false,
+                  };
+                }
+                else if (column >= expr.operand.column && column < expr.operand.column + calculated.value.length && calculated.value[0]?.length === 1) {
+
+                  if (!return_reference) {
+                    return calculated.value[column - expr.operand.column][0];
+                  }
+
+                  address = {
+                    ...expr.operand,
+                    column,
+                    spill: false,
+                  };
+                }
+                else {
+                  return ValueError(); // out of range
+                }
+
+              }
+
+              // return { type: ValueType.string, value: 'implicit (spill)' };
+            }
+            break;
+
+          case 'range':
+            {
+              // how do we intersect, if at all?
+
+              const row = this.context.address.row ?? -1;
+              const column = this.context.address.column ?? -1;
+              if (row >= expr.operand.start.row && row <= expr.operand.end.row && expr.operand.start.column === expr.operand.end.column) {
+                address = {
+                  ...expr.operand.start,
+                  row,
+                  spill: false,
+                };
+              }
+              else if (column >= expr.operand.start.column && column <= expr.operand.end.column && expr.operand.start.row === expr.operand.end.row) {
+                address = {
+                  ...expr.operand.start,
+                  column,
+                  spill: false,
+                };
+              }
+              else {
+                return ValueError(); // out of range
+              }
+            }
+        }
+
+        if (address) {
+          if (return_reference) {
+            return { type: ValueType.object, value: address,
+            }
+          }
+          return this.CellFunction2(address)();
+       }
+
+        const operand = this.CalculateExpression(expr.operand as ExtendedExpressionUnit);
+
+        if (operand.type === ValueType.array) {
+          return operand.value[0][0];
+        }
+
+        return operand;
+      };
+
     default:
       return () => {
         console.warn('unexpected unary operator:', x.operator);
@@ -977,7 +1081,7 @@ export class ExpressionCalculator {
       return (expr.fn = this.BinaryExpression(expr))(expr); // check
 
     case 'unary':
-      return (expr.fn = this.UnaryExpression(expr))(expr); // check
+      return (expr.fn = this.UnaryExpression(expr, return_reference))(expr); // check
 
     case 'identifier':
       return (expr.fn = this.Identifier(expr))(); // check

package/treb-calculator/src/functions/base-functions.ts

@@ -244,6 +244,23 @@ const ZLookup = (value: number|string|boolean|undefined, table: (number|string|b
 
 };
 
+const NumberArgument = (argument?: UnionValue, default_value: number|false = false) => {
+
+  if (!argument) {
+    return default_value;
+  }
+
+  switch (argument.type) {
+    case ValueType.number:
+      return argument.value;
+    case ValueType.undefined:
+      return default_value;
+  }
+
+  return false;
+
+};
+
 /**
  * alternate functions. these are used (atm) only for changing complex 
  * behavior.
@@ -1923,6 +1940,17 @@ export const BaseFunctionLibrary: FunctionMap = {
       },
     },
 
+    Ceiling: {
+      arguments: [ { unroll: true }, { unroll: true } ], // FIXME: lazy
+
+      fn: (a: number) => {
+        return { 
+          type: ValueType.number, 
+          value: Math.ceil(a),
+        };
+      },
+    },
+
     Round: {
       arguments: [ { unroll: true }, { unroll: true } ], // FIXME: lazy
 
@@ -2358,6 +2386,21 @@ export const BaseFunctionLibrary: FunctionMap = {
       },
     },
 
+    Between: {
+      arguments: [
+        { name: 'target', boxed: true, unroll: true },
+        { name: 'min' },
+        { name: 'max' },
+      ],
+      visibility: 'internal',
+      fn: (target: UnionValue, min = 0, max = 1) => {
+        return {
+          type: ValueType.boolean,
+          value: (target.type === ValueType.number) && (target.value >= min && target.value <= max),
+        };
+      }
+    },
+
     Gradient: {
       arguments: [
         { name: 'range', boxed: true },
@@ -2509,7 +2552,41 @@ export const BaseFunctionLibrary: FunctionMap = {
         return ArgumentError();
 
       },
-    }
+    },
+
+    Sequence: {
+      arguments:[
+        { name: 'rows', boxed: true },
+        { name: 'columns', default: 1, boxed: true },
+        { name: 'start', default: 1, boxed: true },
+        { name: 'step', default: 1, boxed: true }
+      ],
+      fn: (rows: UnionValue, columns: UnionValue, start: UnionValue, step: UnionValue) => {
+
+        const rx = NumberArgument(rows, 1);
+        const cx = NumberArgument(columns, 1);
+        const step_ = NumberArgument(step, 1);
+        const start_ = NumberArgument(start, 1);
+
+        if (rx === false || cx === false || step_ === false || start_ === false) {
+          return ArgumentError();
+        }
+
+        const value: UnionValue[][] = [];
+        for (let c = 0; c < cx; c++) {
+          const col: UnionValue[] = [];
+          for (let r = 0; r < rx; r++) {
+            col.push({ type: ValueType.number, value: start_ + r * step_ * cx + c * step_ });
+          }
+          value.push(col);
+        }
+
+        return { type: ValueType.array, value };
+
+      },
+
+    },
+
 
 };
 

package/treb-calculator/src/functions/sparkline.ts

@@ -173,6 +173,16 @@ export class Sparkline {
       }
     }
 
+    if (min === max) {
+      if (min) {
+        min -= 1;
+        max += 1;
+      }
+      else {
+        max += 1;
+      }
+    }
+
     if (min !== max) {
 
       const step = (width * (1 - 2 * x_margin)) / (values.length - 1);
@@ -251,6 +261,16 @@ export class Sparkline {
       }
     }
 
+    if (min === max) {
+      if (min) {
+        min -= 1;
+        max += 1;
+      }
+      else {
+        max += 1;
+      }
+    }
+
     if (values.length) {
 
       // const step = (width - 2 * x_margin - 2) / (values.length-1);

package/treb-calculator/src/functions/statistics-functions.ts

@@ -685,6 +685,8 @@ export const StatisticsFunctionLibrary: FunctionMap = {
 export const StatisticsFunctionAliases: {[index: string]: string} = {
   Mean: 'Average',
   'StDev': 'StDev.S',
+  'StDevA': 'StDev.S',
+  'StDevPA': 'StDev.P',
   'Var': 'Var.S',
   'Quartile': 'Quartile.Inc',
 };

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

@@ -139,6 +139,7 @@ export interface ConditionalFormatCellMatch extends ConditionalFormatCellMatchOp
 export interface ConditionalFormatCellMatchOptions {
   style: CellStyle;
   expression: string;
+  between?: [number, number];
   options?: EvaluateOptions;
 }
 
@@ -178,8 +179,10 @@ export interface ConditionalFormatDuplicateValues extends ConditionalFormatDupli
  * 
  * ...everybody has a vertex now, we could standardize it
  * 
+ * update: adding a priority field, optional
+ * 
  */
-export type ConditionalFormat = { internal?: unknown } & (
+export type ConditionalFormat = { internal?: unknown, priority?: number } & (
     ConditionalFormatDuplicateValues |
     ConditionalFormatExpression |
     ConditionalFormatCellMatch |

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

@@ -145,6 +145,8 @@ export class Sheet {
 
   public name = Sheet.default_sheet_name;
 
+  public tab_color?: Color;
+
   public background_image?: string;
 
   protected _image: HTMLImageElement|undefined = undefined;
@@ -403,6 +405,9 @@ export class Sheet {
     if (source.name) {
       sheet.name = source.name;
     }
+    if (source.tab_color) {
+      sheet.tab_color = source.tab_color;
+    }
 
     if (source.background_image) {
       sheet.background_image = source.background_image;
@@ -2744,6 +2749,7 @@ export class Sheet {
 
       id: this.id,
       name: this.name,
+      tab_color: this.tab_color,
 
       data,
       sheet_style,
@@ -2915,7 +2921,11 @@ export class Sheet {
     // this.cells.FromJSON(cell_data);
     this.cells.FromJSON(data.cells);
     if (data.name) {
-      this.name = data.name || '';
+      this.name = data.name || ''; // wtf is this?
+    }
+
+    if (data.tab_color) {
+      this.tab_color = data.tab_color;
     }
 
     // 0 is implicitly just a general style
@@ -3338,9 +3348,6 @@ export class Sheet {
     for (const format of this.conditional_formats) {
 
       if (format.internal?.vertex?.updated) {
-
-        // console.info('updated');
-
         format.internal.vertex.updated = false;
       }
 
@@ -3354,6 +3361,10 @@ export class Sheet {
       // stop rule. if you go forwards, you need some sort of indicator 
       // or flag).
 
+      // there's more to this, because there are rules that apply to areas,
+      // which might stop, and there's priority. so we probably need those
+      // flags eventually. 
+
       const area = JSON.parse(JSON.stringify(format.area));
       
       if (area.start.row === null || area.end.row === null) {

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

@@ -19,7 +19,7 @@
  * 
  */
 
-import type { IArea, SerializedCellData, CellStyle } from 'treb-base-types';
+import type { IArea, SerializedCellData, CellStyle, Color } from 'treb-base-types';
 import type { AnnotationData } from './annotation';
 import type { GridSelection, SerializedGridSelection } from './sheet_selection';
 import type { ConditionalFormatList } from './conditional_format';
@@ -126,6 +126,9 @@ export interface SerializedSheet {
   /** sheet name */
   name?: string;
 
+  /** tab color */
+  tab_color?: Color;
+
   /** current active selection */
   selection: SerializedGridSelection;