@trebco/treb 30.6.0 → 30.6.3

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.0",
+  "version": "30.6.3",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {

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

@@ -534,7 +534,6 @@ export const BaseFunctionLibrary: FunctionMap = {
         value: delta / divisor,
       };
 
-      return NAError();
     },
   },
 

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-embed/src/embedded-spreadsheet.ts

@@ -246,8 +246,8 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
   /* * @internal */
   // public static export_worker_text = '';  
 
-  /** @internal */
-  public static treb_embedded_script_path = '';
+  /* * @internal */
+  // public static treb_embedded_script_path = '';
 
   /** 
    * @internal 

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

@@ -567,7 +567,7 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
    * that's fine, but it needs a new name.
    * 
    */
-  protected UpdateColors(force_event = false) {
+  protected UpdateColors(force_event = false, toll_update = false) {
 
     // const view = this.active_editor?.node.ownerDocument.defaultView as (Window & typeof globalThis);
 
@@ -623,8 +623,10 @@ export class Editor<E = FormulaEditorEvent> extends EventSource<E|FormulaEditorE
 
     this.composite_dependencies = list;
 
-    this.Publish({ type: 'update', dependencies: this.composite_dependencies });
-
+    if (!toll_update) {
+      this.Publish({ type: 'update', dependencies: this.composite_dependencies });
+    }
+    
   }
 
   /**

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

@@ -57,6 +57,8 @@ export type FormulaBar2Event
 export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
 
 
+  public committed = false;
+
   /** is the _editor_ currently focused */
   // tslint:disable-next-line:variable-name
   public focused_ = false;
@@ -219,7 +221,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
     this.active_editor.node.spellcheck = false; // change the default back
 
     this.RegisterListener(descriptor, 'focusin', () => {
-
+     
       // this.editor_node.addEventListener('focusin', () => {
 
       // can't happen
@@ -239,7 +241,9 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
       this.autocomplete?.ResetBlock();
 
       this.UpdateText(this.active_editor);
-      this.UpdateColors();
+      this.UpdateColors(undefined, true); // toll update event -- we will send in order, below
+
+      this.committed = false;
 
       this.Publish([
         { type: 'start-editing', editor: 'formula-bar' },
@@ -256,11 +260,32 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
         console.info('focusout, but selecting...');
       }
 
-      // console.info('focus out');
-
       this.autocomplete?.Hide();
+      
+      const text = (this.active_editor ? 
+        this.GetTextContent(this.active_editor.node).join('') : '').trim();
+
+      if (this.committed) {
+        this.Publish([
+          { type: 'stop-editing' },
+        ]);
+      }
+      else {
+        this.committed = true;
+        this.Publish({
+          type: 'commit',
+          value: text,
+        });
+      }
+
       this.Publish([
         { type: 'stop-editing' },
+        /*
+        {
+          type: 'commit',
+          value: text,
+        }
+          */
       ]);
 
       this.focused_ = false;
@@ -441,6 +466,7 @@ export class FormulaBar extends Editor<FormulaBar2Event|FormulaEditorEvent> {
         const text = (this.active_editor ? 
           this.GetTextContent(this.active_editor.node).join('') : '').trim();
 
+        this.committed = true;
         this.Publish({
           type: 'commit',
           // selection: this.selection,

package/treb-grid/src/types/grid.ts

@@ -193,6 +193,9 @@ export class Grid extends GridBase {
   /** if we are editing, what is the cell? */
   private editing_cell: ICellAddress = { row: -1, column: -1, sheet_id: 0 };
 
+  /**  */
+  private editing_selection: GridSelection|undefined;
+
   /**  */
   private selected_annotation?: Annotation;
 
@@ -2859,6 +2862,7 @@ export class Grid extends GridBase {
 
           this.editing_state = EditingState.FormulaBar;
           this.editing_cell = { ...this.primary_selection.target };
+          this.editing_selection = { ...this.primary_selection };
           break;
 
         case 'discard':
@@ -2924,7 +2928,15 @@ export class Grid extends GridBase {
 
           if (this.container) this.Focus();
 
-          this.SetInferredType(this.primary_selection, event.value, event.array);
+          if (event.event) {
+            this.SetInferredType(this.primary_selection, event.value, event.array);
+          }
+          else {
+            if (this.editing_selection) {
+              this.SetInferredType(this.editing_selection, event.value, event.array);
+            }
+          }
+
           this.ClearAdditionalSelections();
           this.ClearSelection(this.active_selection);