@trebco/treb 28.15.0 → 28.15.1

package/package.json

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

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

@@ -729,6 +729,77 @@ export const BaseFunctionLibrary: FunctionMap = {
       })
     },
 
+    Large: {
+      description: 'Returns the nth numeric value from the data, in descending order',
+      arguments: [
+        {
+          name: 'values',
+        }, 
+        {
+          name: 'index',
+        }
+      ],
+
+      // OK a little tricky here -- we're going to reverse the arguments
+      // so we can call apply as array, but applying against the trailing
+      // arguments.
+
+      fn: Utils.ApplyAsArraySwap((data: any, index: number) => {
+
+        if (index <= 0) {
+          return ArgumentError();
+        }
+
+        const flat = Utils.FlattenUnboxed(data);
+        const numeric: number[] = flat.filter(test => typeof test === 'number');
+        numeric.sort((a, b) => b - a);
+
+        if (index <= numeric.length) {
+          return {
+            type: ValueType.number,
+            value: numeric[index - 1],
+          };
+        }
+
+        return ArgumentError();
+      }),
+    },
+
+    Small: {
+      description: 'Returns the nth numeric value from the data, in ascending order',
+      arguments: [
+        {
+          name: 'values',
+        }, 
+        {
+          name: 'index',
+        }
+      ],
+
+      // see large, above
+
+      fn: Utils.ApplyAsArraySwap((data: any, index: number) => {
+
+        if (index <= 0) {
+          return ArgumentError();
+        }
+
+        const flat = Utils.FlattenUnboxed(data);
+        const numeric: number[] = flat.filter(test => typeof test === 'number');
+        numeric.sort((a, b) => a - b);
+
+        if (index <= numeric.length) {
+          return {
+            type: ValueType.number,
+            value: numeric[index - 1],
+          };
+        }
+
+        return ArgumentError();
+
+      }),
+    },
+
     /**
      * sort arguments, but ensure we return empty strings to
      * fill up the result array

package/treb-calculator/src/utilities.ts

@@ -193,22 +193,52 @@ export const ApplyArrayFunc = (base: (...args: any[]) => any) => {
   };
 };
 
+export const ApplyAsArraySwap = (base: (...args: any[]) => UnionValue) => {
+  return (...args: any[]): UnionValue => {
+
+    // swap here
+    args.reverse();
+    const [a, ...rest] = args;
+
+    if (Array.isArray(a)) {
+      return {
+        type: ValueType.array,
+        value: a.map(row => row.map((element: any) => {
+
+          // swap back
+          const swapped = [...rest, element];
+          return base(...swapped);
+
+        })),
+      };
+    }
+    else if (typeof a === 'object' && !!a && a.type === ValueType.array ) {
+      return {
+        type: ValueType.array,
+        value: (a as ArrayUnion).value.map(row => row.map((element: any) => {
+
+          const swapped = [...rest, element];
+          return base(...swapped);
+
+        })),
+      };
+      
+    }
+    else {
+      return base(...rest, a);
+    }
+  }
+};
+
 export const ApplyAsArray = (base: (a: any, ...rest: any[]) => UnionValue) => {
   return (a: any, ...rest: any[]): UnionValue => {
     if (Array.isArray(a)) {
-
       return {
         type: ValueType.array,
         value: a.map(row => row.map((element: any) => {
           return base(element, ...rest);
         })),
       };
-
-      /*
-      return a.map(row => row.map((element: any) => {
-        return base(element, ...rest);
-      }));
-      */
     }
     else if (typeof a === 'object' && !!a && a.type === ValueType.array ) {
       return {
@@ -280,23 +310,6 @@ export const ApplyAsArray2 = (base: (a: any, b: any, ...rest: any[]) => UnionVal
       };
     }
 
-    /*
-    if (Array.isArray(a)) {
-      if (Array.isArray(b)) {
-        return a.map((row, i: number) => row.map((element: any, j: number) => {
-          return base(element, b[i][j], ...rest);
-        }));
-      }
-      else {
-        return a.map(row => row.map((element: any) => {
-          return base(element, b, ...rest);
-        }));
-      }
-    }
-    else {
-      return base(a, b, ...rest);
-    }
-    */
     return base(a, b, ...rest);
 
   }

package/treb-export/src/import2.ts

@@ -93,7 +93,7 @@ export class Importer {
           ref?: string;
         },
       };
-    }, // ElementTree.Element,
+    },
     shared_formulae: SharedFormulaMap,
     arrays: RangeType[],
     merges: RangeType[],
@@ -117,11 +117,9 @@ export class Importer {
     // console.info(element);
 
     let value: undefined | number | boolean | string;
-    // let type: ValueType = ValueType.undefined;
     let type: SerializedValueType = 'undefined';
 
     let calculated_value: undefined | number | boolean | string;
-    // let calculated_type: ValueType = ValueType.undefined;
     let calculated_type: SerializedValueType = 'undefined';
     
     // QUESTIONS:
@@ -397,7 +395,6 @@ export class Importer {
         if (rule.formula) {
 
           if (typeof rule.formula !== 'string') {
-            console.info("conditional expression", {rule});
             if (rule.formula.t$) {
 
               // the only case (to date) we've seen here is that the attribute 
@@ -407,6 +404,10 @@ export class Importer {
               rule.formula = rule.formula.t$;
 
             }
+            else {
+              console.info("unexpected conditional expression", {rule});
+
+            }
           }
 
           let style = {};
@@ -536,18 +537,6 @@ export class Importer {
           }
         }
 
-        /*
-        const area = sheet.TranslateAddress(element.a$.sqref);
-        if (element.cfRule) {
-          const rules = Array.isArray(element.cfRule) ? element.cfRule : [element.cfRule];
-          for (const rule of rules) {
-            const format = this.ParseConditionalFormat(area, rule);
-            if (format) {
-              conditional_formats.push(format);
-            }
-          }
-        }
-        */
       }
     }
     

package/treb-export/src/workbook-style2.ts

@@ -669,7 +669,7 @@ export class StyleCache {
 
     // indent
 
-    props.indent = xf.indent;
+    props.indent = (typeof xf.indent === 'string') ? Number(xf.indent) : xf.indent;
 
     // wrap
 
@@ -722,6 +722,19 @@ export class StyleCache {
 
   /** map all cell xfs to styles; retain order */
   public CellXfToStyles(): CellStyle[] {
+
+    /*
+    const mapped = this.cell_xfs.map((xf, index) => {
+      const style = this.CellXfToStyle(xf);
+      if (style.font_size?.value && style.font_size.value > 200) {
+        console.info({index, fs: JSON.stringify(style.font_size), style, xf});
+        console.info(this);
+      }
+      return style;
+    });
+    return mapped;
+    */
+
     return this.cell_xfs.map((xf) => this.CellXfToStyle(xf));
   }
 
@@ -1174,40 +1187,14 @@ export class StyleCache {
     
 
     this.borders = composite.map(element => {
-
       const border: BorderStyle = JSON.parse(JSON.stringify(default_border));
 
-      /*
-      // we're relying on these being empty strings -> falsy, not a good look
-
-      if (element.left) {
-        // border.left.style = element.left.a$.style;
-        // border.left.color = Number(element.left.color?.a$?.indexed);
-      }
-
-      if (element.right) {
-        // border.right.style = element.right.a$.style;
-        // border.right.color = Number(element.right.color?.a$?.indexed);
-      }
-
-      if (element.top) {
-        // border.top.style = element.top.a$.style;
-        // border.top.color = Number(element.top.color?.a$?.indexed);
-      }
-
-      if (element.bottom) {
-        // border.bottom.style = element.bottom.a$.style;
-        // border.bottom.color = Number(element.bottom.color?.a$?.indexed);
-      }
-      */
-
       ElementToBorderEdge(element.left, border.left);
       ElementToBorderEdge(element.right, border.right);
       ElementToBorderEdge(element.top, border.top);
       ElementToBorderEdge(element.bottom, border.bottom);
       
       return border;
-
     });
 
     // ---
@@ -1313,6 +1300,7 @@ export class StyleCache {
         if (element.color.a$?.rgb) {
           font.color_argb = element.color.a$.rgb;
         }
+
       }
 
       return font;

package/treb-grid/src/render/tile_renderer.ts

@@ -744,12 +744,12 @@ export class TileRenderer {
       // this is a single line, with number formatting
 
       if (indent) {
-        if (style.horizontal_align === 'left') {
-          formatted.unshift({ text: indent });
-        }
-        else if (style.horizontal_align === 'right') {
+        if (style.horizontal_align === 'right') {
           formatted.push({ text: indent });
         }
+        else if (style.horizontal_align !== 'center') {
+          formatted.unshift({ text: indent });
+        }
       }
 
       for (const part of formatted) {
@@ -953,12 +953,13 @@ export class TileRenderer {
             });
 
             if (style.indent) {
-              if (style.horizontal_align === 'left') {
-                line_string.unshift({ text: indent, hidden: false, width: indent_width });
-              }
-              else if (style.horizontal_align === 'right') {
+              if (style.horizontal_align === 'right') {
                 line_string.push({ text: indent, hidden: false, width: indent_width });
               }
+              else if (style.horizontal_align !== 'center') {
+                line_string.unshift({ text: indent, hidden: false, width: indent_width });
+              }
+    
             }
 
             strings.push(line_string);
@@ -977,12 +978,13 @@ export class TileRenderer {
           const parts: RenderTextPart[] = [];
 
           if (style.indent) {
-            if (style.horizontal_align === 'left') {
-              line.unshift({ text: indent });
-            }
-            else if (style.horizontal_align === 'right') {
+            if (style.horizontal_align === 'right') {
               line.push({ text: indent });
             }
+            else if (style.horizontal_align !== 'center') {
+              line.unshift({ text: indent });
+            }
+    
           }
 
           let line_width = 0;

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

@@ -978,7 +978,7 @@ export class Grid extends GridBase {
 
         const validated = this.model.named_ranges.ValidateNamed(name);
         if (!validated) {
-          console.warn(`invalid name: ${name}`);
+          console.warn(`invalid name: ${name}`, import_data.names[name]);
           continue;
         }