@trebco/treb 37.0.0 → 37.0.1

package/build/treb-base-types/src/theme.js

@@ -0,0 +1,460 @@
+/*
+ * 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-2026 trebco, llc.
+ * info@treb.app
+ *
+ */
+import { IsHTMLColor, IsThemeColor, ThemeColorIndex } from './style';
+import { ColorFunctions } from './color';
+// import * as LCHColorFunctions from './color2';
+import { DOMContext } from './dom-utilities';
+import { Measurement } from 'treb-utils';
+import { font_stack_names, GenerateFontStack } from './font-stack';
+/**
+ * @internal
+ */
+export const DefaultTheme = {
+    grid_color: '#ccc',
+    note_marker_color: '#d2c500',
+    mode: 'light',
+    offset_cache: {},
+    offset_light: '#fff',
+    offset_dark: '#000',
+    font_stacks: {},
+    grid_cell_font_size: { value: 10, unit: 'pt' },
+};
+/* *
+ * now just a wrapper, we should remove
+ *
+ * the only difference between this and the other function (ThemeColor2)
+ * is that this has a default for "defaultindex" => 0; calls can just
+ * call the second method with the extra argument.
+ *
+ * @deprecated
+ * @internal
+ * /
+export const ThemeColor = (theme: Theme, color?: Color): string => {
+  return ThemeColor2(theme, color, 0);
+};
+*/
+/**
+ * we cache values in the theme object so that we can dump it when we
+ * reload or update the theme.
+ *
+ * we're now inverting tint for dark themes. the idea is that if you
+ * are using a dark theme, it's more natural to go in that direction, and
+ * you can use the same foreground color.
+ *
+ * because this is ephemeral it won't impact export.
+ */
+const TintedColor = (theme, source) => {
+    const index = ThemeColorIndex(source);
+    let tint = (source.tint || 0);
+    if (theme.mode === 'dark') {
+        tint = -tint; // invert;
+    }
+    if (!theme.tint_cache) {
+        theme.tint_cache = [];
+    }
+    if (!theme.tint_cache[index]) {
+        theme.tint_cache[index] = {};
+    }
+    let color = theme.tint_cache[index][tint];
+    if (!color) {
+        const rgb = (theme.theme_colors_rgb ? theme.theme_colors_rgb[index] : [0, 0, 0]) || [0, 0, 0];
+        let tinted;
+        if (tint > 0) {
+            tinted = ColorFunctions.Lighten(rgb[0], rgb[1], rgb[2], tint * 100, true);
+        }
+        else {
+            tinted = ColorFunctions.Darken(rgb[0], rgb[1], rgb[2], -tint * 100, true);
+        }
+        color = `rgb(${tinted.r},${tinted.g},${tinted.b})`;
+        /*
+        // L is in [0, 100] and the passed tint value is between (-1 and 1). but
+        // is the tint value the desired value, or the adjustment? (...)
+        // looks like it's the adjustment. makes sense I guess if you pick the
+        // original colors.
+    
+        // if the tint value was not originally in perceptual space we might need
+        // to curve it a bit? (...)
+    
+        const lch = LCHColorFunctions.RGBToLCH(...rgb);
+        const tinted = LCHColorFunctions.LCHToRGB(lch.l + 50 * tint, lch.c, lch.h);
+        color = `rgb(${tinted.r},${tinted.g},${tinted.b})`;
+        */
+        theme.tint_cache[index][tint] = color;
+    }
+    return color;
+};
+/**
+ * this includes an implicit check for valid color, if a color
+ * can't be resolved it returns ''. now supports offset colors.
+ * offset returns a light color against a dark background, and
+ * vice versa. what constitutes a dark background is not entirely
+ * clear; atm using lightness = .65.
+ *
+ * @internal
+ */
+export const ResolveThemeColor = (theme, color, default_index) => {
+    if (color && color.offset) {
+        // don't do this
+        if (color.offset.offset) {
+            console.warn('invalid offset color');
+            return '';
+        }
+        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]) {
+            return theme.offset_cache[resolved];
+        }
+        let offset = theme.offset_light;
+        if (resolved) {
+            // ok figure it out?
+            const match = resolved.match(/rgb\((\d+),\s*(\d+),\s*(\d+)\)/);
+            if (match) {
+                const background = [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));
+                const b = Array.from(Measurement.MeasureColor(theme.offset_light));
+                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, '(1)');
+            }
+            if (!theme.offset_cache) {
+                theme.offset_cache = {};
+            }
+            theme.offset_cache[resolved] = offset;
+        }
+        else {
+            console.warn(`can't resolve offset color`, color.offset, '(2)');
+        }
+        return offset;
+    }
+    // explicit color, or none
+    if (IsHTMLColor(color)) {
+        return color.text === 'none' ? '' : color.text;
+    }
+    // theme color. we need a way to cache these lookups, especially for tinting
+    if (IsThemeColor(color)) {
+        if (color.tint) {
+            return TintedColor(theme, color);
+        }
+        return theme.theme_colors ? theme.theme_colors[ThemeColorIndex(color)] : '';
+    }
+    // default from argument
+    if (default_index || default_index === 0) {
+        return theme.theme_colors ? theme.theme_colors[default_index] : '';
+    }
+    // actual default, which is nothing
+    return '';
+};
+const ParseFontSize = (size) => {
+    let value = 10;
+    let unit = 'pt';
+    const match = size.match(/^([\d.]+)(\D.*)$/); // pt, px, em, rem, %
+    if (match) {
+        value = Number(match[1]);
+        unit = match[2];
+    }
+    return { value, unit };
+};
+/* *
+ * pull out styles we apply to tables, if they differ from the base.
+ * setting "initial" or "inherit" doesn't work to clear them (at least atm);
+ * use "transparent" to unset.
+ * /
+const TableStyleFromCSS = (base: CSSStyleDeclaration, style: CSSStyleDeclaration): Style.Properties => {
+
+  const props: Style.Properties = {};
+
+  if (style.borderTopColor !== base.borderTopColor) {
+    props.border_top = 1;
+    props.border_top_fill = { text: style.borderTopColor };
+    if (style.borderTopStyle === 'double') {
+      props.border_top = 2;
+    }
+  }
+
+  if (style.borderBottomColor !== base.borderBottomColor) {
+    props.border_bottom = 1;
+    props.border_bottom_fill = { text: style.borderBottomColor };
+    if (style.borderBottomStyle === 'double') {
+      props.border_bottom = 2;
+    }
+  }
+
+  if (style.backgroundColor !== base.backgroundColor) {
+    props.fill = { text: style.backgroundColor };
+  }
+
+  if (style.color !== base.color) {
+    props.text = { text: style.color };
+  }
+
+  if (style.fontWeight !== base.fontWeight) {
+    props.bold = /(?:700|bold)/.test(style.fontWeight);
+  }
+
+  if (style.fontStyle !== base.fontStyle) {
+    props.italic = /italic/.test(style.fontStyle);
+  }
+
+  if (style.textDecoration !== base.textDecoration) {
+    const style_underline = /underline/.test(style.textDecoration);
+    const base_underline = /underline/.test(base.textDecoration);
+
+    if (base_underline !== style_underline) {
+      props.underline = style_underline;
+    }
+
+    const style_strike = /line-through/.test(style.textDecoration);
+    const base_strike = /line-through/.test(base.textDecoration);
+
+    if (base_strike !== style_strike) {
+      props.strike = style_strike;
+    }
+
+  }
+  
+  return props;
+
+};
+*/
+// testing
+const StyleFromCSS = (css, include_font_face = false) => {
+    // const { value, unit } = ParseFontSize(css.fontSize||'');
+    const style = {
+        fill: { text: css.backgroundColor }, // || 'none',
+        text: { text: css.color },
+        /*
+        font_size: {
+          unit, value,
+        },
+        */
+        // use container size unless we scale. the reason we do this is 
+        // because if we set scale, we always wind up with em units.
+        font_size: { unit: 'em', value: 1 },
+        // font_face: css.fontFamily,
+    };
+    if (include_font_face) {
+        style.font_face = css.fontFamily;
+    }
+    // the default border comes from the "theme colors", not from 
+    // the CSS property (it used to come from the CSS property, which
+    // is why we have the CSS property set). 
+    //
+    // default border is theme color 1.
+    //
+    if (/italic/i.test(css.font)) {
+        style.italic = true;
+    }
+    // for painting we only support regular (400) and bold (700), those 
+    // are the only values allowed by canvas (I think)
+    if (css.fontWeight === '700') {
+        style.bold = true;
+    }
+    return style;
+};
+/**
+ * how to derive the light/dark theme? it's complicated, as it turns out.
+ * there's almost nothing we can do to reliably determine what theme
+ * is set. the best thing would be color-scheme, which affects (among other
+ * things) scrollbars, but that might be set to something like 'light dark'
+ * which is indeterminate.
+ *
+ * so what we are going to do is check the grid foreground and background;
+ * if the foreground is lighter than the background, we're in dark mode.
+ * and vice-versa.
+ *
+ */
+const DeriveColorScheme = (theme, context) => {
+    const foreground_color = theme.grid_cell?.text;
+    const background_color = theme.grid_cell?.fill;
+    // because these are rendered to a canvas, we know that A is 255
+    context.fillStyle = IsHTMLColor(foreground_color) ? foreground_color.text : '';
+    context.fillRect(0, 0, 3, 3);
+    const fg = ColorFunctions.RGBToHSL(...Array.from(context.getImageData(1, 1, 1, 1).data));
+    context.fillStyle = IsHTMLColor(background_color) ? background_color.text : '';
+    context.fillRect(0, 0, 3, 3);
+    const bg = ColorFunctions.RGBToHSL(...Array.from(context.getImageData(1, 1, 1, 1).data));
+    // console.info({fg, bg});
+    return fg.l > bg.l ? 'dark' : 'light';
+};
+/**
+ * this is a shortcut for creating table formats based on theme colors.
+ * TODO: we might want to swap styles based on light/dark mode?
+ *
+ * @internal
+ */
+export const ThemeColorTable = (theme_color, tint = .7) => {
+    const borders = {
+        border_top: 1,
+        border_top_fill: { theme: theme_color },
+        border_bottom: 1,
+        border_bottom_fill: { theme: theme_color },
+    };
+    return {
+        header: {
+            // text: { theme: theme.mode === 'dark' ? 1 : 0, },
+            // text: { text: '#fff' },
+            text: { offset: { theme: theme_color } },
+            fill: { theme: theme_color },
+            bold: true,
+            ...borders,
+        },
+        odd: {
+            fill: { theme: theme_color, tint },
+            ...borders,
+        },
+        even: {
+            ...borders,
+        },
+        total: {
+            ...borders,
+            border_top: 2,
+        },
+    };
+};
+/**
+ * for stuff that's painted, we wamt to get the corresponding CSS value.
+ * we now set everything via CSS variables, but using the node structure
+ * allows us to read calculated values, especially when there are cascades.
+ *
+ * I keep trying to change this to just read CSS variables, but that does
+ * not do the same thing.
+ *
+ * @internal
+ */
+export const LoadThemeProperties = (container, use_font_stacks = false) => {
+    const theme = JSON.parse(JSON.stringify(DefaultTheme));
+    const DOM = DOMContext.GetInstance(container.ownerDocument);
+    const Append = (parent, classes) => {
+        return DOM.Div(classes, parent);
+    };
+    const ElementCSS = (parent, classes) => {
+        return DOM.view?.getComputedStyle(Append(parent, classes));
+    };
+    const node = Append(container, '');
+    const CSS = ElementCSS.bind(0, node);
+    let css = CSS('grid-cells');
+    theme.grid_cell = StyleFromCSS(css, false);
+    theme.grid_color = css.stroke || '';
+    theme.grid_cell_font_size = ParseFontSize(css.fontSize || '');
+    // console.info({theme});
+    if (use_font_stacks) {
+        for (const key of font_stack_names) {
+            css = CSS(`treb-font-stack-${key}`);
+            theme.font_stacks[key] = GenerateFontStack(key, css);
+        }
+    }
+    else {
+        // default only
+        css = CSS(`treb-font-stack-default`);
+        theme.font_stacks.default = GenerateFontStack('default', css);
+    }
+    // console.info(theme.font_stacks);
+    css = CSS('grid-headers');
+    theme.headers = StyleFromCSS(css, true);
+    theme.headers_grid_color = css.stroke;
+    if (!theme.headers_grid_color || theme.headers_grid_color === 'none') {
+        theme.headers_grid_color = theme.grid_color;
+    }
+    css = CSS('treb-offset-dark');
+    if (css.color) {
+        theme.offset_dark = css.color;
+    }
+    css = CSS('treb-offset-light');
+    if (css.color) {
+        theme.offset_light = css.color;
+    }
+    // this _is_ painted, but it doesn't necessarily need to be -- we
+    // could use a node. that would require moving it around, though. 
+    // let's leave it for now.
+    css = CSS('note-marker');
+    theme.note_marker_color = css.backgroundColor;
+    // updating tables. we're now defining tables as Style.Properties
+    // directly. the aim is to use theme colors so we can have multiple
+    // table styles without too much fuss.
+    /*
+    const root_css = CSS('');
+    theme.table = {
+      header: TableStyleFromCSS(root_css, CSS('treb-table header')),
+      odd: TableStyleFromCSS(root_css, CSS('treb-table row-odd')),
+      even: TableStyleFromCSS(root_css, CSS('treb-table row-even')),
+      // footer: TableStyleFromCSS(root_css, CSS('treb-table footer')),
+      total: TableStyleFromCSS(root_css, CSS('treb-table total')),
+    }
+    */
+    // console.info(theme.table);
+    // theme colors
+    node.style.color = 'rgba(1,2,3,.4)'; // this is an attempt at a unique identifier
+    css = CSS('');
+    const compare = css.color;
+    theme.theme_colors = [
+        IsHTMLColor(theme.grid_cell.fill) ? theme.grid_cell.fill.text : 'rgb(255, 255, 255)',
+        IsHTMLColor(theme.grid_cell.text) ? theme.grid_cell.text.text : 'rgb(51, 51, 51)',
+    ];
+    for (let i = 1; i < 32; i++) {
+        css = CSS(`theme-color-${i}`);
+        if (!css.color || css.color === compare) {
+            break;
+        }
+        theme.theme_colors.push(css.color);
+    }
+    // we could just parse, we know the returned css format is going
+    // to be an rgb triple (I think?)
+    const canvas = DOM.Create('canvas');
+    canvas.width = 3;
+    canvas.height = 3;
+    const context = canvas.getContext('2d', { willReadFrequently: true });
+    if (context) {
+        theme.mode = DeriveColorScheme(theme, context);
+    }
+    if (context) {
+        theme.theme_colors_rgb = theme.theme_colors.map((color) => {
+            context.fillStyle = color;
+            context.fillRect(0, 0, 3, 3);
+            const imagedata = context.getImageData(1, 1, 1, 1);
+            return Array.from(imagedata.data);
+        });
+    }
+    theme.table = ThemeColorTable(4);
+    // this is a little odd, since we have the check above for "existing element";
+    // should we switch on that? or is that never used, and we can drop it? (...)
+    // console.info(node);
+    // console.info(theme);
+    node.parentElement?.removeChild(node);
+    return theme;
+};
+//# sourceMappingURL=theme.js.map

package/build/treb-base-types/src/theme.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../../treb-base-types/src/theme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,EAA8B,WAAW,EAAE,YAAY,EAAE,eAAe,EAAkC,MAAM,SAAS,CAAC;AACjI,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACzC,iDAAiD;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAkB,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAyInF;;GAEG;AACH,MAAM,CAAC,MAAM,YAAY,GAAU;IACjC,UAAU,EAAE,MAAM;IAClB,iBAAiB,EAAE,SAAS;IAC5B,IAAI,EAAE,OAAO;IACb,YAAY,EAAE,EAAE;IAChB,YAAY,EAAE,MAAM;IACpB,WAAW,EAAE,MAAM;IACnB,WAAW,EAAE,EAAE;IACf,mBAAmB,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;CAC/C,CAAC;AAEF;;;;;;;;;;;;;EAaE;AAEF;;;;;;;;;GASG;AACH,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,MAAkB,EAAE,EAAE;IAEvD,MAAM,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC;IAE9B,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;QAC1B,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,UAAU;IAC1B,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QACtB,KAAK,CAAC,UAAU,GAAG,EAAE,CAAC;IACxB,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;QAC7B,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,IAAI,KAAK,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,CAAC,KAAK,EAAE,CAAC;QAEX,MAAM,GAAG,GAA6B,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAExH,IAAI,MAAyC,CAAC;QAC9C,IAAI,IAAI,GAAG,CAAC,EAAE,CAAC;YACb,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;QAC5E,CAAC;aACI,CAAC;YACJ,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC,CAAC;QAC5E,CAAC;QACD,KAAK,GAAG,OAAO,MAAM,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,GAAG,CAAC;QAEnD;;;;;;;;;;;;UAYE;QAEF,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IAExC,CAAC;IAED,OAAO,KAAK,CAAC;AAEf,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAE,KAAa,EAAE,aAAsB,EAAU,EAAE;IAE/F,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAE1B,gBAAgB;QAChB,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxB,OAAO,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;YACrC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,QAAQ,GAAG,EAAE,CAAC;QAElB,IAAI,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5D,QAAQ,GAAG,OAAO,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;QAChE,CAAC;aACI,CAAC;YACJ,QAAQ,GAAG,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QAC/D,CAAC;QAED,cAAc;QACd,IAAI,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvD,OAAO,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QACtC,CAAC;QAED,IAAI,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC;QAEhC,IAAI,QAAQ,EAAE,CAAC;YACb,oBAAoB;YACpB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;YAC/D,IAAI,KAAK,EAAE,CAAC;gBAIV,MAAM,UAAU,GAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAGtF,gDAAgD;gBAChD,sDAAsD;gBAEtD,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAe,CAAC;gBAChF,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAe,CAAC;gBAEjF,MAAM,EAAE,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gBAEzD,MAAM,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;gBAE7C;;;;kBAIE;YAGJ,CAAC;iBACI,CAAC;gBACJ,MAAM;gBACN,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC9D,CAAC;YAED,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;gBACxB,KAAK,CAAC,YAAY,GAAG,EAAE,CAAC;YAC1B,CAAC;YACD,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;QACxC,CAAC;aACI,CAAC;YACJ,OAAO,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,0BAA0B;IAE1B,IAAI,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IACjD,CAAC;IAED,4EAA4E;IAE5E,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACxB,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,OAAO,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QACnC,CAAC;QACD,OAAO,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9E,CAAC;IAED,wBAAwB;IAExB,IAAI,aAAa,IAAI,aAAa,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrE,CAAC;IAED,mCAAmC;IAEnC,OAAO,EAAE,CAAC;AAEZ,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,IAAY,EAA+C,EAAE;IAElF,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,IAAI,GAAsB,IAAI,CAAC;IAEnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC,qBAAqB;IACnE,IAAI,KAAK,EAAE,CAAC;QACV,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,GAAG,KAAK,CAAC,CAAC,CAAuB,CAAC;IACxC,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6DE;AAEF,UAAU;AACV,MAAM,YAAY,GAAG,CAAC,GAAwB,EAAE,iBAAiB,GAAG,KAAK,EAAa,EAAE;IAEtF,2DAA2D;IAE3D,MAAM,KAAK,GAAc;QACvB,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,eAAe,EAAE,EAAE,aAAa;QAClD,IAAI,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,EAAE;QAEzB;;;;UAIE;QAEF,gEAAgE;QAChE,4DAA4D;QAE5D,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE;QAEnC,6BAA6B;KAC9B,CAAC;IAEF,IAAI,iBAAiB,EAAE,CAAC;QACtB,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC;IACnC,CAAC;IAED,8DAA8D;IAC9D,iEAAiE;IACjE,yCAAyC;IACzC,EAAE;IACF,mCAAmC;IACnC,EAAE;IAEF,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,KAAK,CAAC,MAAM,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,oEAAoE;IACpE,kDAAkD;IAElD,IAAI,GAAG,CAAC,UAAU,KAAK,KAAK,EAAE,CAAC;QAC7B,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IACpB,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAE,OAAiC,EAAoB,EAAE;IAE9F,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC;IAC/C,MAAM,gBAAgB,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC;IAE/C,gEAAgE;IAEhE,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAA8B,CAAC,CAAC;IAEvH,OAAO,CAAC,SAAS,GAAG,WAAW,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IAC/E,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC7B,MAAM,EAAE,GAAG,cAAc,CAAC,QAAQ,CAAC,GAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAA8B,CAAC,CAAC;IAEvH,0BAA0B;IAE1B,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;AAExC,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,WAAmB,EAAE,IAAI,GAAG,EAAE,EAAc,EAAE;IAE5E,MAAM,OAAO,GAAc;QACzB,UAAU,EAAE,CAAC;QACb,eAAe,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;QACvC,aAAa,EAAE,CAAC;QAChB,kBAAkB,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;KAC3C,CAAC;IAEF,OAAO;QACL,MAAM,EAAE;YACN,mDAAmD;YACnD,0BAA0B;YAC1B,IAAI,EAAE,EAAE,MAAM,EAAE,EAAC,KAAK,EAAE,WAAW,EAAC,EAAE;YACtC,IAAI,EAAE,EAAC,KAAK,EAAE,WAAW,EAAC;YAC1B,IAAI,EAAE,IAAI;YACV,GAAG,OAAO;SACX;QACD,GAAG,EAAE;YACH,IAAI,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE;YAClC,GAAG,OAAO;SACX;QACD,IAAI,EAAE;YACJ,GAAG,OAAO;SACX;QACD,KAAK,EAAE;YACL,GAAG,OAAO;YACV,UAAU,EAAE,CAAC;SACd;KACF,CAAA;AAEH,CAAC,CAAA;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,SAAsB,EAAE,eAAe,GAAG,KAAK,EAAS,EAAE;IAE5F,MAAM,KAAK,GAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAC9D,MAAM,GAAG,GAAG,UAAU,CAAC,WAAW,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG,CAAC,MAAmB,EAAE,OAAe,EAAkB,EAAE;QACtE,OAAO,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,MAAmB,EAAE,OAAe,EAAuB,EAAE;QAC/E,OAAO,GAAG,CAAC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAwB,CAAC;IACpF,CAAC,CAAA;IAED,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,GAAG,GAA6C,UAAU,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAE/E,IAAI,GAAG,GAAG,GAAG,CAAC,YAAY,CAAC,CAAC;IAC5B,KAAK,CAAC,SAAS,GAAG,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAC3C,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;IACpC,KAAK,CAAC,mBAAmB,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,IAAE,EAAE,CAAC,CAAC;IAE5D,yBAAyB;IAEzB,IAAI,eAAe,EAAE,CAAC;QACpB,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE,CAAC;YACnC,GAAG,GAAG,GAAG,CAAC,mBAAmB,GAAG,EAAE,CAAC,CAAC;YACpC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;SACI,CAAC;QAEJ,eAAe;QAEf,GAAG,GAAG,GAAG,CAAC,yBAAyB,CAAC,CAAC;QACrC,KAAK,CAAC,WAAW,CAAC,OAAO,GAAG,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;IAEhE,CAAC;IACD,mCAAmC;IAGnC,GAAG,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC;IAC1B,KAAK,CAAC,OAAO,GAAG,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACxC,KAAK,CAAC,kBAAkB,GAAG,GAAG,CAAC,MAAM,CAAC;IACtC,IAAI,CAAC,KAAK,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB,KAAK,MAAM,EAAE,CAAC;QACrE,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,UAAU,CAAC;IAC9C,CAAC;IAED,GAAG,GAAG,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAC9B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,WAAW,GAAG,GAAG,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,GAAG,GAAG,GAAG,CAAC,mBAAmB,CAAC,CAAC;IAC/B,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;QACd,KAAK,CAAC,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC;IACjC,CAAC;IAED,iEAAiE;IACjE,kEAAkE;IAClE,0BAA0B;IAE1B,GAAG,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;IACzB,KAAK,CAAC,iBAAiB,GAAG,GAAG,CAAC,eAAe,CAAC;IAE9C,iEAAiE;IACjE,mEAAmE;IACnE,sCAAsC;IAEtC;;;;;;;;;MASE;IAEF,6BAA6B;IAE7B,eAAe;IAEf,IAAI,CAAC,KAAK,CAAC,KAAK,GAAC,gBAAgB,CAAC,CAAC,4CAA4C;IAC/E,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;IACd,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC;IAE1B,KAAK,CAAC,YAAY,GAAG;QACnB,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB;QACpF,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB;KAClF,CAAC;IAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5B,GAAG,GAAG,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,KAAK,OAAO,EAAE,CAAC;YACxC,MAAM;QACR,CAAC;QACD,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,gEAAgE;IAChE,iCAAiC;IAEjC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEpC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;IACjB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IAClB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtE,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,CAAC,IAAI,GAAG,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,KAAK,CAAC,gBAAgB,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACxD,OAAO,CAAC,SAAS,GAAG,KAAK,CAAC;YAC1B,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YAC7B,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;YACnD,OAAO,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAA6B,CAAC;QAChE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IAEjC,8EAA8E;IAC9E,6EAA6E;IAE7E,sBAAsB;IACtB,uBAAuB;IAEtB,IAAI,CAAC,aAAyB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IAEnD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/build/treb-base-types/src/union.d.ts

@@ -0,0 +1,73 @@
+import type { Complex, DimensionedQuantity } from './value-type';
+import { ValueType } from './value-type';
+export type CellValue = undefined | string | number | boolean | Complex | DimensionedQuantity;
+/**
+ * utility method
+ *
+ * @internal
+ */
+export declare const Is2DArray: <T>(obj: undefined | T | T[] | T[][]) => obj is T[][];
+export interface NumberUnion {
+    type: ValueType.number;
+    value: number;
+}
+export interface StringUnion {
+    type: ValueType.string;
+    value: string;
+}
+export interface ErrorUnion {
+    type: ValueType.error;
+    value: string;
+}
+export interface FormulaUnion {
+    type: ValueType.formula;
+    value: string;
+}
+export interface BooleanUnion {
+    type: ValueType.boolean;
+    value: boolean;
+}
+/** we should have these for other types as well */
+export interface ComplexUnion {
+    type: ValueType.complex;
+    value: Complex;
+}
+export interface DimensionedQuantityUnion {
+    type: ValueType.dimensioned_quantity;
+    value: DimensionedQuantity;
+}
+export interface UndefinedUnion {
+    type: ValueType.undefined;
+    value?: undefined;
+}
+export interface ExtendedUnion {
+    type: ValueType.object;
+    value: unknown;
+    key?: string;
+    /** adding a source field so we can track */
+    source?: string;
+}
+export interface FunctionUnion {
+    type: ValueType.function;
+    value: unknown;
+}
+/** potentially recursive structure */
+export interface ArrayUnion {
+    type: ValueType.array;
+    value: UnionValue[][];
+}
+/** switch to a discriminated union. implicit type guards! */
+export type UnionValue = NumberUnion | ArrayUnion | ComplexUnion | DimensionedQuantityUnion | ExtendedUnion | StringUnion | FormulaUnion | UndefinedUnion | BooleanUnion | FunctionUnion | ErrorUnion;
+/**
+ * shortcut, although this is wasteful
+ *
+ * @internal
+ */
+export declare const Box: (value: unknown, type?: ValueType) => UnionValue;
+/**
+ * box a complex value in a union, potentially switching to a real if
+ * there's no imaginary component.
+ *
+ * @internal
+ */
+export declare const ComplexOrReal: (value: Complex) => ComplexUnion | NumberUnion;

package/build/treb-base-types/src/union.js

@@ -0,0 +1,61 @@
+/*
+ * 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-2026 trebco, llc.
+ * info@treb.app
+ *
+ */
+import { ValueType, GetValueType } from './value-type';
+/**
+ * utility method
+ *
+ * @internal
+ */
+export const Is2DArray = (obj) => {
+    return !!obj && Array.isArray(obj) && Array.isArray(obj[0]);
+};
+/**
+ * shortcut, although this is wasteful
+ *
+ * @internal
+ */
+export const Box = (value, type) => {
+    // FIXME: type properly... instead of the GetValueType call
+    if (typeof type === 'undefined') {
+        type = GetValueType(value);
+    }
+    // assert? 
+    return {
+        value,
+        type,
+    };
+};
+/**
+ * box a complex value in a union, potentially switching to a real if
+ * there's no imaginary component.
+ *
+ * @internal
+ */
+export const ComplexOrReal = (value) => {
+    if (value.imaginary) {
+        return {
+            type: ValueType.complex,
+            value,
+        };
+    }
+    return { type: ValueType.number, value: value.real };
+};
+//# sourceMappingURL=union.js.map

package/build/treb-base-types/src/union.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"union.js","sourceRoot":"","sources":["../../../treb-base-types/src/union.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAIvD;;;;GAIG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,GAA0B,EAAgB,EAAE;IACvE,OAAO,CAAC,CAAC,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAA;AAmFD;;;;GAIG;AACH,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,KAAc,EAAE,IAAgB,EAAc,EAAE;IAElE,2DAA2D;IAE3D,IAAI,OAAO,IAAI,KAAK,WAAW,EAAE,CAAC;QAChC,IAAI,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;IAED,WAAW;IAEX,OAAO;QACL,KAAK;QACL,IAAI;KACS,CAAC;AAElB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAc,EAA4B,EAAE;IACxE,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QACpB,OAAO;YACL,IAAI,EAAE,SAAS,CAAC,OAAO;YACvB,KAAK;SACN,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;AACvD,CAAC,CAAA"}