@trebco/treb 28.17.5 → 29.1.2

package/treb-embed/src/types.ts

@@ -20,8 +20,11 @@
  */
 
 import type { IArea, Table, TableTheme } from 'treb-base-types';
-import type { SerializedNamedExpression, SerializedSheet } from 'treb-grid';
-import type { SerializedMacroFunction } from 'treb-grid/src/types/data_model';
+import type { 
+  SerializedNamedExpression, 
+  SerializedSheet,
+  SerializedMacroFunction,
+  SerializedNamed } from 'treb-data-model';
 
 export enum SaveFileType {
   json = 'json',
@@ -66,7 +69,7 @@ export interface TREBDocument {
    * opaque user data. we don't read or parse this, but applications can
    * use it to store arbitrary data.
    */
-  user_data?: any;
+  user_data?: unknown;
 
   /**
    * per-sheet data. this should be an array, but for historical reasons
@@ -86,12 +89,17 @@ export interface TREBDocument {
    */
   rendered_values?: boolean;
   
-  /** document named ranges */
+  /** document named ranges @deprecated */
   named_ranges?: Record<string, IArea>;
 
-  /** document named expressions */
+  /** document named expressions @deprecated */
   named_expressions?: SerializedNamedExpression[];
 
+  /**
+   * new consolidated named ranges & expressions
+   */
+  named?: SerializedNamed[];
+
   /** document macro functions */
   macro_functions?: SerializedMacroFunction[];
 

package/treb-export/src/export-worker/export-worker.ts

@@ -19,15 +19,19 @@
  * 
  */
 
-import type { ImportedSheetData } from 'treb-base-types/src';
+import type { ImportedSheetData } from 'treb-base-types';
+import type { SerializedModel } from 'treb-data-model';
 
 import { Exporter } from '../export2';
 import { Importer } from '../import2';
 
-const ctx: Worker = self as any;
+const ctx: Worker = self as unknown as Worker;
 const exporter = new Exporter();
 
-const ExportSheets = (data: any) => {
+const ExportSheets = (data: {
+  sheet: SerializedModel,
+  decorated: Record<string, string>,
+}) => {
 
   if (data.sheet) {
     exporter.Init(data.decorated || []);
@@ -37,17 +41,19 @@ const ExportSheets = (data: any) => {
 
 };
 
-const ImportSheet = (data: any) => {
+const ImportSheet = (data: { data: ArrayBuffer }) => {
 
   const importer = new Importer();
 
   try {
     importer.Init(data.data);
 
+    const named = importer.workbook?.GetNamedRanges();
+
     const count = importer.SheetCount();
     const results = {
       sheets: [] as ImportedSheetData[],
-      names: importer.workbook?.GetNamedRanges(),
+      named,
       active_tab: importer.workbook?.active_tab,
     };
 
@@ -58,6 +64,15 @@ const ImportSheet = (data: any) => {
       }
     }
 
+    for (const entry of named || []) {
+      if (typeof entry.local_scope === 'number') {
+        const sheet = results.sheets[entry.local_scope];
+        if (sheet) {
+          entry.scope = sheet.name;
+        }
+      }
+    }
+
     ctx.postMessage({ status: 'complete', results });
 
   }
@@ -72,9 +87,9 @@ const ImportSheet = (data: any) => {
 // initialize message handler
 ctx.addEventListener('message', (event) => {
   if (event.data && event.data.command === 'export'){
-    ExportSheets(event.data);
+    ExportSheets(event.data as { sheet: SerializedModel, decorated: Record<string, string>});
   }
   else if (event.data && event.data.command === 'import'){
-    ImportSheet(event.data);
+    ImportSheet(event.data as { data: ArrayBuffer });
   }
 });

package/treb-export/src/export2.ts

@@ -27,7 +27,6 @@
 
 // import JSZip from 'jszip';
 
-import UZip from 'uzip';
 import * as Base64JS from 'base64-js';
 
 import { PixelsToColumnWidth } from './column-width';
@@ -35,7 +34,7 @@ import { PixelsToColumnWidth } from './column-width';
 const XMLDeclaration = `<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n`;
 
 import { template } from './template-2';
-import type { SerializedSheet } from 'treb-grid';
+import type { SerializedModel, SerializedSheet } from 'treb-data-model';
 
 import type { IArea, ICellAddress, CellValue, DataValidation, CellStyle,
          AnnotationLayout, Corner as LayoutCorner, Cell, Rectangle } from 'treb-base-types';
@@ -52,7 +51,7 @@ import { Theme } from './workbook-theme2';
 
 import type { RelationshipMap} from './relationship';
 import { AddRel } from './relationship';
-import { XMLOptions2 } from './xml-utils';
+import { type DOMContent, XMLOptions2 } from './xml-utils';
 
 import type { UnitAddress, UnitRange, ExpressionUnit} from 'treb-parser';
 import { Parser, QuotedSheetNameRegex } from 'treb-parser';
@@ -64,9 +63,15 @@ import type { ImageOptions } from './drawing2/embedded-image';
 import type { TwoCellAnchor } from './drawing2/drawing2';
 import { Drawing } from './drawing2/drawing2';
 import { ConditionalFormatOperators, type TableDescription, type TableFooterType } from './workbook2';
-import type { AnnotationData } from 'treb-grid/src/types/annotation';
+import type { AnnotationData } from 'treb-data-model/src/annotation';
 import { ZipWrapper } from './zip-wrapper';
 
+/*
+interface NestedDOMType {
+  [index: string]: string|number|NestedDOMType|NestedDOMType[];
+}
+*/
+
 export class Exporter {
 
   // public zip?: JSZip;
@@ -153,14 +158,14 @@ export class Exporter {
 
     const keys = Object.keys(rels);
 
-    const dom = {
+    const dom: DOMContent = {
       Relationships: {
         a$: {
           xmlns: 'http://schemas.openxmlformats.org/package/2006/relationships',
         },
         Relationship: keys.map(key => {
           const rel = rels[key];
-          const a$: any = {
+          const a$: DOMContent = {
             Id: rel.id,
             Target: rel.target,
             Type: rel.type,
@@ -198,7 +203,8 @@ export class Exporter {
 
       // we could just pass through except that we have argb and excel has rgb
 
-      const attrs: any = {};
+      const attrs: XlColor & { rgb?: string } = {};
+
       if (color.indexed !== undefined) {
         attrs.indexed = color.indexed;
       }
@@ -212,10 +218,11 @@ export class Exporter {
         attrs.rgb = color.argb;
       }
       return attrs;
+
     };
 
     const xfs = style_cache.cell_xfs.map(xf => {
-      const block: any = {
+      const block: DOMContent = {
         a$: {
           numFmtId: xf.number_format,
           fontId: xf.font,
@@ -225,22 +232,24 @@ export class Exporter {
       };
 
       if (xf.horizontal_alignment || xf.vertical_alignment || xf.wrap_text || xf.indent) {
-        // block.a$.applyAlignment = 1;
-        block.alignment = { a$: {}};
+
+        const attrs: DOMContent = {};
 
         if (xf.horizontal_alignment) {
-          block.alignment.a$.horizontal = xf.horizontal_alignment;
+          attrs.horizontal = xf.horizontal_alignment;
         }
         if (xf.vertical_alignment) {
-          block.alignment.a$.vertical = xf.vertical_alignment;
+          attrs.vertical = xf.vertical_alignment;
         }
         if (xf.wrap_text) {
-          block.alignment.a$.wrapText = 1;
+          attrs.wrapText = 1;
         }
         if (xf.indent && xf.horizontal_alignment !== 'center') {
-          block.alignment.a$.indent = xf.indent;
+          attrs.indent = xf.indent;
         }
 
+        block.alignment = { a$: attrs };
+
       }
 
       return block;
@@ -377,7 +386,7 @@ export class Exporter {
       return block;
     });
 
-    const dom: any = {
+    const dom: DOMContent = {
       styleSheet: {
         a$: {
           'xmlns':        'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
@@ -396,14 +405,14 @@ export class Exporter {
 
     if (style_cache.number_formats.length) {
 
-      dom.styleSheet.numFmts = {
+      (dom.styleSheet as DOMContent).numFmts = {
         a$: { count: style_cache.number_formats.length },
         numFmt: style_cache.number_formats.map(format => {
           return {
             a$: {
               numFmtId: format.id,
               formatCode: format.format,
-            },  
+            } as DOMContent,  
           };
         }),
       };
@@ -414,21 +423,21 @@ export class Exporter {
     }
 
     if (fonts.length) {
-      dom.styleSheet.fonts = {
+      (dom.styleSheet as DOMContent).fonts = {
         a$: { count: fonts.length },
         font: fonts,
       };
     }
 
     if (fills.length) {
-      dom.styleSheet.fills = {
+      (dom.styleSheet as DOMContent).fills = {
         a$: { count: fills.length },
         fill: fills,
       };
     }
 
     if (borders.length) {
-      dom.styleSheet.borders = {
+      (dom.styleSheet as DOMContent).borders = {
         a$: { count: borders.length },
         border: borders,
       };
@@ -437,27 +446,27 @@ export class Exporter {
     // console.info("B", borders, JSON.stringify(dom.styleSheet.borders, undefined, 2))
 
     if (xfs.length) {
-      dom.styleSheet.cellXfs = {
+      (dom.styleSheet as DOMContent).cellXfs = {
         a$: { count: xfs.length },
         xf: xfs,
       };
     }
 
     if (style_cache.dxf_styles.length) {
-      const dxf: any[] = [];
+      const dxf: DOMContent[] = [];
       for (const style of style_cache.dxf_styles) {
-        const entry: any = {};
+        const entry: DOMContent = {};
         if (style.text || style.bold || style.italic || style.underline) {
-          const font: any = {};
+          const font: DOMContent = {};
           if (style.text) {
             font.color = { a$: {}};
             if (style.text.text) {
-              font.color.a$.rgb = `FF` + style.text.text.substring(1);
+              (font.color.a$ as DOMContent).rgb = `FF` + style.text.text.substring(1);
             }
             else if (style.text.theme) {
-              font.color.a$.theme = style.text.theme;
+              (font.color.a$ as DOMContent).theme = style.text.theme;
               if (style.text.tint) {
-                font.color.a$.tint = style.text.tint;
+                (font.color.a$ as DOMContent).tint = style.text.tint;
               }
             }
           }
@@ -476,23 +485,24 @@ export class Exporter {
           entry.font = font;
         }
         if (style.fill) {
-          const color: any = { a$: {}};
+          const attrs: DOMContent = {};
           if (style.fill.text) {
-            color.a$.rgb = `FF` + style.fill.text.substring(1);
+            attrs.rgb = `FF` + style.fill.text.substring(1);
           }
           else if (style.fill.theme) {
-            color.a$.theme = style.fill.theme;
+            attrs.theme = style.fill.theme;
             if (style.fill.tint) {
-              color.a$.tint = style.fill.tint;
+              attrs.tint = style.fill.tint;
             }
           }
+          const color: DOMContent = { a$: attrs };
           entry.fill = { patternFill: { bgColor: color }};
         }
         dxf.push(entry);
       }
 
       if (dxf.length) {
-        dom.styleSheet.dxfs = {
+        (dom.styleSheet as DOMContent).dxfs = {
           a$: { count: dxf.length },
           dxf,
         };
@@ -527,7 +537,7 @@ export class Exporter {
       throw new Error('missing zip');
     }
 
-    const dom: any = {
+    const dom: DOMContent = {
       sst: {
         a$: {
           'xmlns': 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
@@ -1206,13 +1216,7 @@ export class Exporter {
    
   }
 
-  public Export(source: {
-      sheet_data: SerializedSheet[];
-      active_sheet?: number;
-      named_ranges?: {[index: string]: IArea};
-      named_expressions?: Array<{ name: string, expression: string }>;
-      decimal_mark: ','|'.';
-    }) {
+  public Export(source: SerializedModel) {
       
     // --- create a map --------------------------------------------------------
 
@@ -2443,6 +2447,68 @@ export class Exporter {
     this.WriteRels(workbook_rels, `xl/_rels/workbook.xml.rels`);
 
     let definedNames: any = {definedName: []};
+
+    if (source.named) {
+      for (const entry of source.named) {
+
+        let scope: string|undefined = undefined;
+
+        if (entry.scope) {
+
+          const test = entry.scope.toLowerCase();
+          for (const [index, sheet] of source.sheet_data.entries()) {
+            if (sheet.name?.toLowerCase() === test) {
+              scope = index.toString();
+              break;
+            }
+          }
+        }
+
+        if (entry.area) {
+          let sheet_name = '';
+          const area = new Area(entry.area.start, entry.area.end);
+          area.start.absolute_column = area.start.absolute_row = true;
+          area.end.absolute_column = area.end.absolute_row = true;
+
+          if (entry.area.start.sheet) {
+            sheet_name = entry.area.start.sheet;
+          }
+          else if (entry.area.start.sheet_id) {
+            for (const sheet of source.sheet_data) {
+              if (sheet.id === area.start.sheet_id) {
+                sheet_name = sheet.name || '';
+                break;
+              }
+            }
+          }
+  
+          if (sheet_name) {
+            if (QuotedSheetNameRegex.test(sheet_name)) {
+              sheet_name = `'${sheet_name}'`;
+            }
+            sheet_name += '!';
+          }
+  
+          // console.info({key, area, lx: area.spreadsheet_label, sheet_name });
+          definedNames.definedName.push({
+            a$: { name: entry.name, localSheetId: scope },
+            t$: sheet_name + area.spreadsheet_label,
+          });
+  
+        }
+        else if (entry.expression) {
+          definedNames.definedName.push({
+            a$: { name: entry.name, localSheetId: scope },
+            t$: entry.expression,
+          });
+        }
+
+      }
+    }
+
+    console.info("DB", definedNames);
+
+    /*
     if (source.named_ranges) {
       const keys = Object.keys(source.named_ranges);
       for (const key of keys) {
@@ -2483,10 +2549,13 @@ export class Exporter {
         });
       }
     }
+    */
+
     if (!definedNames.definedName.length) {
       definedNames = undefined;
     }
-
+    // else { console.info({definedNames}); }
+    
     const workbook_dom: any = {
       workbook: {
         a$: {

package/treb-export/src/import2.ts

@@ -21,7 +21,7 @@
 
 // import JSZip from 'jszip';
 
-import UZip from 'uzip';
+// import UZip from 'uzip';
 import Base64JS from 'base64-js';
 
 import type { AnchoredChartDescription, AnchoredImageDescription, AnchoredTextBoxDescription} from './workbook2';
@@ -31,7 +31,7 @@ import { Parser } from 'treb-parser';
 import type { RangeType, AddressType, HyperlinkType } from './address-type';
 import { is_range, ShiftRange, InRange, is_address } from './address-type';
 import type { ImportedSheetData, AnchoredAnnotation, CellParseResult, AnnotationLayout, Corner as LayoutCorner, ICellAddress, DataValidation, IArea, GradientStop, Color } from 'treb-base-types/src';
-import { type ValueType, ValidationType, type SerializedValueType } from 'treb-base-types/src';
+import { ValidationType, type SerializedValueType } from 'treb-base-types/src';
 import type { Sheet} from './workbook-sheet2';
 import { VisibleState } from './workbook-sheet2';
 import type { CellAnchor } from './drawing2/drawing2';
@@ -39,8 +39,9 @@ import { XMLUtils } from './xml-utils';
 
 // import { one_hundred_pixels } from './constants';
 import { ColumnWidthToPixels } from './column-width';
-import type { AnnotationType, ConditionalFormat } from 'treb-grid';
+import type { AnnotationType } from 'treb-data-model';
 import { ZipWrapper } from './zip-wrapper';
+import type { ConditionalFormat } from 'treb-data-model';
 
 interface SharedFormula {
   row: number;
@@ -146,7 +147,7 @@ export class Importer {
 
     if (element.a$?.t && element.a$.t === 's') {
       type = 'string'; // ValueType.string;
-      if (typeof element.v !== undefined) {
+      if (typeof element.v !== 'undefined') {
         const index = Number(element.v);
         if (!isNaN(index) && sheet.shared_strings) {
           value = sheet.shared_strings.Get(index) || '';
@@ -934,7 +935,7 @@ export class Importer {
           br: AnchorToCorner(descriptor.anchor.to),
         };
         
-        let type: AnnotationType = 'image';
+        const type: AnnotationType = 'image';
         const data = Base64JS.fromByteArray(descriptor.image);
         let imagetype: string = '';
 

package/treb-export/src/workbook2.ts

@@ -19,12 +19,6 @@
  * 
  */
 
-import UZip from 'uzip';
-
-// import type JSZip from 'jszip';
-// import * as xmlparser from 'fast-xml-parser';
-
-
 import { XMLParser } from 'fast-xml-parser';
 import { XMLUtils, XMLOptions, XMLOptions2 } from './xml-utils';
 
@@ -45,6 +39,7 @@ import { Sheet, VisibleState } from './workbook-sheet2';
 import type { RelationshipMap } from './relationship';
 import { ZipWrapper } from './zip-wrapper';
 import type { CellStyle } from 'treb-base-types';
+import type { CompositeNamed } from 'treb-data-model';
 
 
 /*
@@ -157,8 +152,10 @@ export class Workbook {
   /** theme */
   public theme = new Theme();
 
-  /** defined names. these can be ranges or expressions. */
-  public defined_names: Record<string, string> = {};
+  /* * defined names. these can be ranges or expressions. */
+  // public defined_names: Record<string, string> = {};
+
+  public named: Array<CompositeNamed & {local_scope?: number}> = [];
 
   /** the workbook "rels" */
   public rels: RelationshipMap = {};
@@ -229,15 +226,34 @@ export class Workbook {
     xml = xmlparser2.parse(data);
 
     // defined names
-    this.defined_names = {};
+    this.named = [];
     const defined_names = XMLUtils.FindAll(xml, 'workbook/definedNames/definedName');
     for (const defined_name of defined_names) {
       const name = defined_name.a$?.name;
       const expression = defined_name.t$ || '';
+      const sheet_index = (defined_name.a$?.localSheetId) ? Number(defined_name.a$.localSheetId) : undefined;
+
+      // console.info({defined_name, name, expression, sheet_index});
+      this.named.push({
+        name, 
+        expression: typeof expression === 'string' ? expression : expression?.toString() || '',  
+        local_scope: sheet_index,
+      });
+
+    }
+
+    /*
+    this.defined_names = {};
+    const defined_names = XMLUtils.FindAll(xml, 'workbook/definedNames/definedName');
+
+    console.info({defined_names});
+
+    for (const defined_name of defined_names) {
       if (name && expression) {
         this.defined_names[name] = expression;
       }
     }
+    */
 
     const workbook_views = XMLUtils.FindAll(xml, 'workbook/bookViews/workbookView');
 
@@ -390,7 +406,7 @@ export class Workbook {
             const fill = sppr['a:solidFill'];
             if (fill) {
               if (fill['a:schemeClr']?.a$?.val) {
-                let m = (fill['a:schemeClr'].a$.val).match(/accent(\d+)/);
+                const m = (fill['a:schemeClr'].a$.val).match(/accent(\d+)/);
                 if (m) {
                   style.fill = { theme: Number(m[1]) + 3 }
                   if (fill['a:schemeClr']['a:lumOff']?.a$?.val) {
@@ -428,7 +444,7 @@ export class Workbook {
               const para: { text: string, style?: CellStyle }[] = [];
               let style: CellStyle|undefined;
 
-              let appr = paragraph['a:pPr'];
+              const appr = paragraph['a:pPr'];
               if (appr) {
                 style = {};
                 if (appr.a$?.algn === 'r') {
@@ -673,13 +689,15 @@ export class Workbook {
   }
 
   /** FIXME: accessor */
-  public GetNamedRanges(): Record<string, string> {
+  public GetNamedRanges() {
     
     // ... what does this do, not do, or what is it supposed to do?
     // note that this is called by the import routine, so it probably
     // expects to do something
 
-    return this.defined_names;
+    // return this.defined_names;
+
+    return this.named;
 
   }
 

package/treb-export/src/xml-utils.ts

@@ -24,6 +24,10 @@ import type { X2jOptions } from 'fast-xml-parser';
 
 export const XMLTagProcessor = (name: string, value: string): string => Unescape(value);
 
+export interface DOMContent {
+  [index: string]: string|DOMContent|string[]|DOMContent[]|number|number[];
+}
+
 export const XMLOptions: Partial<X2jOptions> = {
   ignoreAttributes: false,
   attributeNamePrefix: '__',
@@ -48,7 +52,7 @@ export const XMLOptions2: Partial<X2jOptions> = {
 
   // arrayMode: false, // this was removed in FXP, but false is default anyway
 
-  isArray: (tagName: string, jPath: string, isLeafNode: boolean, isAttribute: boolean) => {
+  isArray: (tagName: string) => {
     return /Relationship$/.test(tagName);
   },
 

package/treb-format/src/format.ts

@@ -19,6 +19,8 @@
  * 
  */
 
+/* eslint-disable no-irregular-whitespace */
+
 import { FormatParser } from './format_parser';
 import { NumberFormatSection } from './number_format_section';
 import type { TextPart, Complex, DimensionedQuantity, CellValue} from 'treb-base-types';
@@ -534,7 +536,7 @@ export class NumberFormat {
       if (has_imaginary_value) {
 
         // also has imaginary part
-        const i = Math.abs(value.imaginary);
+        // const i = Math.abs(value.imaginary);
         parts.push({ text: value.imaginary < 0 ? ` ${NumberFormat.minus_character} ` : ' + ' });
 
         const reformatted_imaginary = drop_imaginary_coefficient ?
@@ -559,7 +561,7 @@ export class NumberFormat {
    * states. it's intended for graphical representation where things
    * like hidden characters and padding require multiple passes or measurement.
    */
-  public FormatParts(value: any): TextPart[] {
+  public FormatParts(value: CellValue): TextPart[] {
 
     // new, shortcut
     if (typeof value !== 'number' && !this.sections[3]) {
@@ -567,7 +569,7 @@ export class NumberFormat {
       // NOTE: that note (next line) seems to be incorrect, not sure why
       // ofc if that was true there'd be no point to this block...
 
-      return [{ text: value.toString() }] as TextPart[]; // unreachable because we ensure 4 sections
+      return [{ text: (value??'').toString() }] as TextPart[]; // unreachable because we ensure 4 sections
     }
 
     const { parts, section } = this.BaseFormat(value);
@@ -621,7 +623,7 @@ export class NumberFormat {
    * FIXME: date, string (this is lagging)
    * UPDATE: unifying, basing this on the text part functionality
    */
-  public Format(value: any, text_width = 0): string {
+  public Format(value: CellValue, text_width = 0): string {
 
     /*
     const parts = this.FormatParts(value);
@@ -857,14 +859,14 @@ export class NumberFormat {
 
   }
 
-  public BaseFormat(value: any) {
+  public BaseFormat(value: CellValue) {
 
     if (this.sections[0].date_format) {
       return this.DateFormat(Number(value));
     }
 
     if (typeof value !== 'number') {
-      return this.StringFormat(value.toString(), this.sections[3]);
+      return this.StringFormat((value??'').toString(), this.sections[3]);
     }
 
     let section = this.sections[0];