@trebco/treb 30.6.2 → 30.8.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.8. Copyright 2018-2024 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map

package/esbuild-utils.mjs

@@ -74,7 +74,7 @@ export const FormatSize = (size, precision = 1) => {
 
 /** 
  * @function
- * @param {{verbose?: boolean, minify?: boolean}} [options]
+ * @param {{verbose?: boolean, minify?: boolean, define?: Record<string, string>}} [options]
  * @returns {esbuild.Plugin}
  * 
  * inlining the worker build. this works out well with one limitation:
@@ -147,6 +147,8 @@ export const WorkerPlugin = (options) => ({
           bundle: true,
           format: 'esm',
 
+          define: options?.define,
+
           // don't write to filesystem
           write: false,
 

package/package.json

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

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.
@@ -534,7 +551,6 @@ export const BaseFunctionLibrary: FunctionMap = {
         value: delta / divisor,
       };
 
-      return NAError();
     },
   },
 
@@ -1924,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
 
@@ -2359,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 },
@@ -2510,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-charts/src/chart-functions.ts

@@ -196,6 +196,7 @@ export const ChartFunctions: Record<ChartFunction|SupportFunction, CompositeFunc
     arguments: [
       { name: 'Data', metadata: true, },
       { name: 'Chart Title' },
+      { name: 'Min/Max Style' }
     ],
     fn: Identity,
     category: ['chart functions'],

package/treb-charts/src/chart-utils.ts

@@ -1,3 +1,23 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2024 trebco, llc. 
+ * info@treb.app
+ * 
+ */
 
 import { type UnionValue, ValueType, type ArrayUnion, IsComplex, type CellValue } from 'treb-base-types';
 import { IsArrayUnion, IsMetadata, IsSeries, LegendStyle } from './chart-types';
@@ -7,6 +27,8 @@ import { Util } from './util';
 import type { ReferenceSeries } from './chart-types';
 import type { RangeScale } from 'treb-utils';
 
+import { QuickSort } from './quicksort';
+
 /**
  * this file is the concrete translation from function arguments
  * to chart data. chart data is a (somewhat complicated) type with
@@ -148,6 +170,48 @@ export const ArrayToSeries = (array_data: ArrayUnion): SeriesType => {
 
   // series.y.data = flat.map(item => typeof item.value === 'number' ? item.value : undefined);
 
+  // console.trace();
+  
+  const values: number[] = []; // filter any undefineds
+
+  for (const [index, item] of flat.entries()) {
+
+    let value = 0;
+
+    // why is this testing type instead of using the union type?
+
+    if (typeof item.value === 'number') {
+      value = item.value;
+      // series.y.data[index] = item.value;
+      values.push(item.value);
+    }
+    else if (IsMetadata(item)) {
+      if (IsComplex(item.value.value)) {
+        series.x.data[index] = item.value.value.real;
+        // series.y.data[index] = item.value.value.imaginary;
+        // values.push(item.value.value.imaginary);
+        value = item.value.value.imaginary;
+      }
+      else if (typeof item.value.value === 'number') {
+        // series.y.data[index] = item.value.value;
+        // values.push(item.value.value);
+        value = item.value.value;
+      }
+      else {
+        continue;
+      }
+    }
+    else {
+      // series.y.data[index] = undefined;
+      continue;
+    }
+
+    series.y.data[index] = value;
+    values.push(value);
+
+  }
+
+  /*
   series.y.data = flat.map((item, index) => {
 
     // if the data is passed in from the output of a function, it will not
@@ -178,6 +242,7 @@ export const ArrayToSeries = (array_data: ArrayUnion): SeriesType => {
     return undefined;
 
   });
+  */
 
   let first_format = '';
   if (IsMetadata(flat[0])) {
@@ -190,7 +255,9 @@ export const ArrayToSeries = (array_data: ArrayUnion): SeriesType => {
     series.y.labels = series.y.data.map(value => (value === undefined) ? undefined : format.Format(value));
   }
 
-  const values = series.y.data.filter(value => value || value === 0) as number[];
+  // moved up, integrated loops
+  // const values = series.y.data.filter(value => value || value === 0) as number[];
+
   series.y.range = ArrayMinMax(values);
 
   // experimenting with complex... this should only be set if we populated
@@ -589,19 +656,31 @@ export const CreateBoxPlot = (args: UnionValue[]): ChartData => {
 
   let max_n = 0;
 
+  // change to min-max style
+  const minmax = !!args[2];
+
   const stats: BoxPlotData['data'] = series.map(series => {
     // const data = series.y.data.slice(0).filter((test): test is number => test !== undefined).sort((a, b) => a - b);
     const data: number[] = [];
     for (const entry of series.y.data) {
       if (entry !== undefined) { data.push(entry); }
     }
-    data.sort((a, b) => a - b);
+
+    // data.sort((a, b) => a - b);
+    QuickSort(data);
 
     const result = BoxStats(data);
     max_n = Math.max(max_n, result.n);
+
+    if (minmax) {
+      result.whiskers[0] = result.min;
+      result.whiskers[1] = result.max;
+    }
+
     return result;
   });
 
+
   const title = args[1]?.toString() || undefined;
   const x_labels: string[] = [];
   const series_names: string[] = [];

package/treb-charts/src/quicksort.ts

@@ -0,0 +1,54 @@
+/*
+ * This file is part of TREB.
+ *
+ * TREB is free software: you can redistribute it and/or modify it under the 
+ * terms of the GNU General Public License as published by the Free Software 
+ * Foundation, either version 3 of the License, or (at your option) any 
+ * later version.
+ *
+ * TREB is distributed in the hope that it will be useful, but WITHOUT ANY 
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS 
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more 
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License along 
+ * with TREB. If not, see <https://www.gnu.org/licenses/>. 
+ *
+ * Copyright 2022-2024 trebco, llc. 
+ * info@treb.app
+ * 
+ */
+
+// FIXME: move
+
+export const QuickSort = (data: number[]) => {
+  Sort(data, 0, data.length);
+};
+
+const Partition = (data: number[], left: number, right: number) => {
+  const compare = data[right - 1];
+  let min_end = left;
+  for (let max_end = left; max_end < right - 1; max_end += 1) {
+    if (data[max_end] <= compare) {
+      Swap(data, max_end, min_end);
+      min_end += 1;
+    }
+  }
+  Swap(data, min_end, right - 1);
+  return min_end;
+};
+
+const Swap = (data: number[], i: number, j: number) => {
+  const temp = data[i];
+  data[i] = data[j];
+  data[j] = temp;
+};
+
+const Sort = (data: number[], left: number, right: number) => {
+  if (left < right) {
+    const p = Partition(data, left, right);
+    Sort(data, left, p);
+    Sort(data, p + 1, right);
+  }
+}
+

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

@@ -3338,9 +3338,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 +3351,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) {