@trebco/treb 30.2.10 → 30.2.14

package/dist/treb.d.ts

@@ -1310,7 +1310,7 @@ export type Color = ThemeColor | HTMLColor | NullColor;
 export declare const ThemeColorIndex: (color: ThemeColor) => number;
 export declare const IsHTMLColor: (color?: Color) => color is HTMLColor;
 export declare const IsThemeColor: (color?: Color) => color is ThemeColor;
-export declare const IsDefinedColor: (color?: Color) => color is ThemeColor | HTMLColor;
+export declare const IsDefinedColor: (color?: Color) => color is (ThemeColor | HTMLColor);
 export type CellValue = undefined | string | number | boolean | Complex | DimensionedQuantity;
 
 /**

package/esbuild-custom-element.mjs

@@ -1,5 +1,7 @@
 // @ts-check
 
+/* global process */
+
 import * as esbuild from 'esbuild';
 
 import { SassPlugin, WorkerPlugin, NotifyPlugin, HTMLPlugin } from './esbuild-utils.mjs';

package/esbuild-utils.mjs

@@ -1,6 +1,8 @@
 
 // @ts-check
 
+/* global console */
+
 import * as esbuild from 'esbuild';
 import { promises as fs } from 'fs';
 import { minify } from 'html-minifier';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "30.2.10",
+  "version": "30.2.14",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {
@@ -12,13 +12,12 @@
   "type": "module",
   "devDependencies": {
     "@types/html-minifier": "^4.0.2",
-    "@types/node": "^20.8.5",
+    "@types/node": "^22.1.0",
     "@types/uzip": "^0.20201231.0",
-    "archiver": "^6.0.1",
     "base64-js": "^1.5.1",
-    "cssnano": "^6.0.0",
-    "esbuild": "^0.20.1",
-    "eslint": "^8.56.0",
+    "cssnano": "^7.0.4",
+    "esbuild": "^0.23.0",
+    "eslint": "^9.8.0",
     "fast-xml-parser": "^4.0.7",
     "html-minifier": "^4.0.0",
     "sass": "^1.69.3",
@@ -34,7 +33,7 @@
     "ts-node-dev": "^2.0.0",
     "tslib": "^2.2.0",
     "typescript": "^5.3.3",
-    "typescript-eslint": "^7.0.2",
+    "typescript-eslint": "^8.0.0",
     "uzip": "^0.20201231.0"
   },
   "scripts": {

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

@@ -782,7 +782,36 @@ export class ExpressionCalculator {
     // unless the expression changes, which will discard the generated
     // function (along with the expression itself).
 
-    const fn = Primitives.MapOperator(x.operator);
+    // pulling out concat so we can bind the model for language values
+
+    const fn = x.operator === '&' ? (a: UnionValue, b: UnionValue): UnionValue => {
+
+      // this works, but it's not volatile so it doesn't update on 
+      // a language change; maybe language change should force a recalc? (...)
+
+      if (a.type === ValueType.error) { return a; }
+      if (b.type === ValueType.error) { return b; }
+    
+      const strings = [a, b].map(x => {
+        if (x.type === ValueType.undefined) { return ''; }
+        if (x.type === ValueType.boolean) {
+          if (x.value) {
+            return this.data_model.language_model?.boolean_true || 'TRUE';
+          }
+          else {
+            return this.data_model.language_model?.boolean_false || 'FALSE';
+          }
+        }
+        return x.value;
+      });
+
+      return {
+        type: ValueType.string, 
+        value: `${strings[0]}${strings[1]}`,
+      };
+    
+
+    } : Primitives.MapOperator(x.operator);
 
     if (!fn) {
 

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

@@ -301,7 +301,7 @@ export const TextFunctionLibrary: FunctionMap = {
     },
   },
 
-  /** canonical should be CONCAT; concatenate can be an alias */
+ /** canonical should be CONCAT; concatenate can be an alias */
  Concat: {
   description: 'Pastes strings together',
   fn: (...args: CellValue[]): UnionValue => {

package/treb-calculator/src/primitives.ts

@@ -266,6 +266,7 @@ export const Modulo = (a: UnionValue, b: UnionValue): UnionValue => {
   return { value: x % y, type: ValueType.number };
 };
 
+/*
 export const Concatenate = (a: UnionValue, b: UnionValue): UnionValue => {
   if (a.type === ValueType.error) { return a; }
   if (b.type === ValueType.error) { return b; }
@@ -276,6 +277,7 @@ export const Concatenate = (a: UnionValue, b: UnionValue): UnionValue => {
   };
 
 };
+*/
 
 export const Equals = (a: UnionValue, b: UnionValue): UnionValue => {
   if (a.type === ValueType.error) { return a; }
@@ -430,7 +432,7 @@ export const UseComplex = () => {
 
 export const MapOperator = (operator: string) => {
   switch(operator) {
-    case '&': return Concatenate;
+    // case '&': return Concatenate;
     case '+': return Add;
     case '-': return Subtract;
     case '*': return Multiply;

package/treb-embed/src/embedded-spreadsheet.ts

@@ -803,7 +803,7 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
               const obj = JSON.parse(json);
               grid_options.initial_scale = obj.scale || 1;
             }
-            catch (e) {
+            catch {
               console.warn('parsing persisted scale failed');
             }
           }
@@ -2006,10 +2006,17 @@ export class EmbeddedSpreadsheet<USER_DATA_TYPE = unknown> {
     }
 
     language = language.toLowerCase();
-
     let mod: { LanguageMap: LanguageModel } | undefined;
 
-    if (language && language !== 'en') {
+    // FIXME: this should be generated and included, to allow for changes.
+    // for the time being hardcoding as a quick fix
+
+    const supported_languages = [
+      'es', 'fr', 'pt', 'nl', 'de',
+      'pl', 'sv', 'no', 'da', 'it',
+    ];
+
+    if (language && supported_languages.includes(language)) {
 
       // FIXME: even though we now have a dynamic import
       // working, we still probably want to use a filter

package/treb-embed/style/autocomplete.scss

@@ -33,7 +33,6 @@
 
 
     box-sizing: border-box;
-    * { box-sizing: border-box; }
 
     position: fixed;
     top: -1000px;
@@ -46,6 +45,8 @@
     overflow-y: auto;
     z-index: $z-index-autocomplete;
 
+    * { box-sizing: border-box; }
+
     ul {
 
       font-size: inherit;
@@ -73,23 +74,6 @@
         }
       }
 
-      /*
-      here we unwind the selected style if there's a hover,
-      unless you're hovering over the selection. and so on.
-      * /
-
-      &:hover li a.selected {
-        background: inherit;
-        color: inherit;
-
-        &:hover {
-          background: #339966;
-          color: #fff;
-        }
-
-      }
-      */
-
     }
   }
 

package/treb-embed/style/dialog.scss

@@ -98,6 +98,7 @@
       padding: 0;
       background: transparent;
       border: 0;
+      padding: 4px;
 
       &>svg {
 
@@ -112,7 +113,6 @@
         }
       }
 
-      padding: 4px;
 
     }
 

package/treb-embed/style/dropdown-select.scss

@@ -56,6 +56,11 @@
     color: var(--treb-dropdown-color, inherit);
     border: 1px solid var(--treb-dropdown-border-color, unset);
 
+    text-align: left;
+    max-height: 10em;
+    overflow-y: auto;
+    outline: none;
+
     & div {
       padding: 2px;
       cursor: default;
@@ -66,12 +71,6 @@
       color: var(--treb-dropdown-selected-color, #fff);
     }
 
-    text-align: left;
-
-    max-height: 10em;
-    overflow-y: auto;
-    outline: none;
-
   }
 
   .treb-dropdown-caret.active {

package/treb-embed/style/formula-bar.scss

@@ -30,15 +30,17 @@
       text-align: left;
       gap: .5em;
 
-      &[hidden] {
-        display: none;
-      }
+
 
       padding: 0px 2px 12px 2px; // FIXME: use ems?
 
       max-width: 100%;
       overflow-x: hidden;
 
+      &[hidden] {
+        display: none;
+      }
+
       /** label for selection address */
       .treb-address-label {
 

package/treb-embed/style/grid.scss

@@ -207,23 +207,25 @@
       /** specific layout for column header cover */
       &.column-header-cover {
 
+        z-index: $z-index-header-tile-cover;
+
         /** style is attached when mousing over a column boundary */
         &.resize {
           cursor: col-resize;
         }
 
-        z-index: $z-index-header-tile-cover;
       }
 
       /** specific layout for row header cover */
       &.row-header-cover {
 
+        z-index: $z-index-header-tile-cover;
+
         /** style is attached when mousing over a row boundary */
         &.resize {
           cursor: row-resize;
         }
 
-        z-index: $z-index-header-tile-cover;
       }
 
     }
@@ -234,6 +236,9 @@
       top: 0px;
       left: 0px;
 
+      z-index: $z-index-annotations;
+      pointer-events: none;
+
       .annotation {
         position: absolute;
         overflow: hidden;
@@ -297,8 +302,6 @@
         cursor: move;
       }
 
-      z-index: $z-index-annotations;
-      pointer-events: none;
     }
 
     /** selection stacks over the grid but under the cover */

package/treb-embed/style/layout.scss

@@ -68,6 +68,28 @@
 
   line-height: normal;
 
+  // ---------------------------------------------------------------------------
+
+  color-scheme: var(--treb-color-scheme, unset);
+
+  font-family: $font-stack;
+
+  font-style: normal;
+  font-weight: normal;
+  color: inherit;
+  font-size: 14px; // ?
+
+  height: 100%;
+  width: 100%;
+
+  position: relative;
+  display: grid;
+  grid-template-rows: auto minmax(0, 1fr);
+  grid-template-columns: minmax(0, 1fr) auto;
+  // gap: 1em;
+
+  // ---------------------------------------------------------------------------
+
   div, button, input, ul, ol, li, a, textarea, svg {
 
     // maybe this is being too aggressive. we could be a little 
@@ -110,23 +132,6 @@
 
   // ---------------------------------------------------------------------------
 
-  color-scheme: var(--treb-color-scheme, unset);
-
-  font-family: $font-stack;
-
-  font-style: normal;
-  font-weight: normal;
-  color: inherit;
-  font-size: 14px; // ?
-
-  height: 100%;
-  width: 100%;
-
-  position: relative;
-  display: grid;
-  grid-template-rows: auto minmax(0, 1fr);
-  grid-template-columns: minmax(0, 1fr) auto;
-  // gap: 1em;
 
   &[animate] {
     .treb-layout-header {
@@ -354,11 +359,11 @@
         right: 0px;
         border-top-right-radius: 0px;
         border-bottom-right-radius: 0px;
+        background: var(--treb-toolbar-button-background, #fff);
         &::after {
           mask-image: var(--icon-chevron-left);
           -webkit-mask-image: var(--icon-chevron-left);
         }
-        background: var(--treb-toolbar-button-background, #fff);
     
     }
   }

package/treb-embed/style/tab-bar.scss

@@ -29,6 +29,8 @@
 
     grid-area: 3/1/4/2;
 
+    align-items: center;
+
     .treb-spreadsheet-tab-container {
       align-self: flex-start;
       overflow: hidden;
@@ -59,8 +61,6 @@
       display: none;
     }
 
-    align-items: center;
-
     & .treb-spreadsheet-tabs>li {
       display: inline-block;
       position: relative;

package/treb-embed/style/theme-defaults.scss

@@ -234,6 +234,10 @@ $text-reference-color-5: rgb(254, 47, 1);
     color: var(--treb-autocomplete-tooltip-color, inherit);
     border: 1px solid var(--treb-autocomplete-tooltip-border-color, unset);
 
+    padding: 3px 8px;
+    margin: 4px 0px;
+    line-height: normal;
+
     & .active-argument {
       font-weight: 700;
     }
@@ -242,10 +246,6 @@ $text-reference-color-5: rgb(254, 47, 1);
       font-style: italic;
     }
 
-    padding: 3px 8px;
-    margin: 4px 0px;
-    line-height: normal;
-
   }
 
   /** 

package/treb-embed/style/toolbar.scss

@@ -167,10 +167,10 @@ $swatch-size: 18px;
       gap: 0;
 
       button[data-command] {
+        font-size: $split-font-size;
         &::before {
           display: none;
         }
-        font-size: $split-font-size;
       }
 
       & > button {