@trebco/treb 32.13.2 → 36.1.2

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

@@ -14,18 +14,22 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
 
+import * as OOXML from 'ooxml-types';
+import { MapTags } from './ooxml';
+
+
 // import * as ElementTree from 'elementtree';
 // import { Element, ElementTree as Tree } from 'elementtree';
 
 import { type CompositeBorderEdge, Style, type CellStyle, type PropertyKeys, type Color, IsHTMLColor, IsThemeColor, type ThemeColor, type HTMLColor, ThemeColorIndex } from 'treb-base-types';
 import { Theme } from './workbook-theme';
 import { NumberFormatCache } from 'treb-format';
-import { XMLUtils } from './xml-utils';
+// import { XMLUtils } from './xml-utils';
 
 import { Unescape } from './unescape_xml';
 
@@ -1115,14 +1119,20 @@ export class StyleCache {
 
   }
 
-  public FromXML(xml: any, theme: Theme): void {
+  public FromXML(stylesheet: OOXML.StyleSheet, theme: Theme): void {
 
-    const FindAll = XMLUtils.FindAll.bind(XMLUtils, xml);
+    // const FindAll = XMLUtils.FindAll.bind(XMLUtils, xml);
 
     this.theme = theme;
 
     // ---
 
+    this.number_formats = MapTags(stylesheet.numFmts?.numFmt, element => ({
+      id: element.$attributes?.numFmtId,
+      format: Unescape(element.$attributes?.formatCode || ''),
+    }));
+
+    /*
     let composite = FindAll('styleSheet/numFmts/numFmt');
 
     this.number_formats = composite.map(element => ({
@@ -1131,42 +1141,48 @@ export class StyleCache {
       }));
 
     // ---
+    */
 
-    composite = FindAll('styleSheet/borders/border');
-
-    const ElementToBorderEdge = (element: any, edge: BorderEdge) => {
-
-      if (element?.a$) {
-        edge.style = element.a$.style;
-        if (typeof element.color === 'object') {
-          if (typeof element.color.a$?.indexed !== 'undefined') {
-            edge.color = Number(element.color.a$.indexed);
-          }
-          if (typeof element.color.a$?.theme !== 'undefined') {
-            edge.theme = Number(element.color.a$.theme);
-          }
-          if (typeof element.color.a$?.tint !== 'undefined') {
-            edge.tint = Number(element.color.a$.tint);
-          }
+    const ElementToBorderEdge = (element: OOXML.BorderEdge|undefined, edge: BorderEdge) => {
+      if (element?.$attributes) {
+        edge.style = element.$attributes.style;
+        if (element.color) {
+          edge.color = element.color.$attributes?.indexed;
+          edge.theme = element.color.$attributes?.theme;
+          edge.tint = element.color.$attributes?.tint;
         }
       }
-
     };
-    
 
-    this.borders = composite.map(element => {
+    this.borders = MapTags(stylesheet.borders?.border, element => {
       const border: BorderStyle = JSON.parse(JSON.stringify(default_border));
-
       ElementToBorderEdge(element.left, border.left);
       ElementToBorderEdge(element.right, border.right);
       ElementToBorderEdge(element.top, border.top);
       ElementToBorderEdge(element.bottom, border.bottom);
-      
       return border;
     });
 
     // ---
 
+    this.cell_xfs = MapTags(stylesheet.cellXfs?.xf, element => {
+      const xf: CellXf = {
+        number_format: element.$attributes?.numFmtId ?? -1,
+        font: element.$attributes?.fontId ?? -1,
+        fill: element.$attributes?.fillId ?? -1,
+        border: element.$attributes?.borderId ?? -1,
+        xfid: element.$attributes?.xfId ?? -1,
+      };  
+      if (element.alignment) {
+        xf.horizontal_alignment = element.alignment.$attributes?.horizontal;
+        xf.vertical_alignment = element.alignment.$attributes?.vertical;
+        xf.wrap_text = !!element.alignment.$attributes?.wrapText;
+        xf.indent = element.alignment.$attributes?.indent;
+      }
+      return xf;
+    });
+
+    /*
     composite = FindAll('styleSheet/cellXfs/xf');
     this.cell_xfs = composite.map(element => {
 
@@ -1188,9 +1204,46 @@ export class StyleCache {
       return xf;
 
     });
+    */
 
     // ---
 
+    this.fills = MapTags(stylesheet.fills?.fill, element => {
+      const fill: Fill = { pattern_type: 'none' };
+      if (element.patternFill) {
+        const type = element.patternFill.$attributes?.patternType;
+        switch(type) {
+          case 'none':
+          case undefined:
+            break;
+
+          case 'solid':
+            fill.pattern_type = 'solid';
+            if (element.patternFill.fgColor) {
+              fill.fg_color = {
+                theme: element.patternFill.fgColor.$attributes?.theme,
+                indexed: element.patternFill.fgColor.$attributes?.indexed,
+                tint: element.patternFill.fgColor.$attributes?.tint,
+                argb: element.patternFill.fgColor.$attributes?.rgb,
+              };
+            }
+            break;
+
+          default:
+            {
+              const match = type?.match(/^gray(\d+)$/);
+              if (match) {
+                fill.pattern_type = 'gray';
+                fill.pattern_gray = Number(match[1]);
+              }
+            }
+            break;
+        }
+      }
+      return fill;
+    });
+
+    /*
     const ParseFill = (element: any) => {
 
       const fill: Fill = { pattern_type: 'none' };
@@ -1233,9 +1286,31 @@ export class StyleCache {
     composite = FindAll('styleSheet/fills/fill');
 
     this.fills = composite.map(ParseFill);
+    */
 
     // ---
 
+    this.fonts = MapTags(stylesheet.fonts?.font, element => {
+      const font: Font = {};
+
+      font.italic = !!element.i;
+      font.bold = !!element.b;
+      font.underline = !!element.u;
+      font.strike = !!element.strike;
+
+      font.size = element.sz?.$attributes?.val;
+      font.scheme = element.scheme?.$attributes?.val;
+      font.name = element.name?.$attributes?.val;
+      font.family = element.family?.$attributes?.val;
+
+      font.color_theme = element.color?.$attributes?.theme;
+      font.color_tint = element.color?.$attributes?.tint;
+      font.color_argb = element.color?.$attributes?.rgb;
+
+      return font;
+    });
+
+    /*
     const ParseFont = (element: any) => {
 
       const font: Font = {};
@@ -1277,7 +1352,43 @@ export class StyleCache {
 
     composite = FindAll('styleSheet/fonts/font');
     this.fonts = composite.map(ParseFont);
+    */
 
+    // ---
+
+    const ParseDXFColor = (element: OOXML.Color): Color => {
+      const color: Color = {};
+      if (element.$attributes?.rgb) {
+        (color as HTMLColor).text = '#' + element.$attributes.rgb.substring(2);
+      }
+      else if (element.$attributes?.theme !== undefined) {
+        (color as ThemeColor).theme = element.$attributes.theme;
+        if (element.$attributes.tint !== undefined) {
+          (color as ThemeColor).tint = Math.round(element.$attributes.tint * 1000) / 1000;
+        }
+      }
+      return color;
+    };
+
+    this.dxf_styles = MapTags(stylesheet.dxfs?.dxf, dxf => {
+      const style: CellStyle = {};
+
+      if (dxf.font) {
+        style.bold = !!dxf.font?.b;
+        style.italic = !!dxf.font?.i;
+      }
+
+      if (dxf.font?.color?.$attributes) {
+        style.text = ParseDXFColor(dxf.font.color);
+      }
+      if (dxf.fill?.patternFill?.bgColor?.$attributes) {
+        style.fill = ParseDXFColor(dxf.fill.patternFill.bgColor);
+      }
+      
+      return style;
+    });
+
+    /*
     // dxfs (differential formats) are inline. because reasons? not sure
     // what's allowed in there, atm we're just looking at font color and 
     // background color.
@@ -1319,6 +1430,7 @@ export class StyleCache {
 
       return style;
     });
+    */
 
     // console.info({dxfs: this.dxf_styles});
 

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

@@ -14,11 +14,13 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
 
+import * as OOXML from 'ooxml-types';
+
 export interface ColorSchemeElement {
   name?: string;
   value?: string;
@@ -27,8 +29,7 @@ export interface ColorSchemeElement {
 
 export class Theme {
 
-  // where is this defined?
-  public static color_map = [
+  public static color_map: (keyof Omit<OOXML.ColorScheme, '$attributes'>)[] = [
     'lt1', // bg 1
     'dk1', // text 1
     'lt2', // bg 2
@@ -47,8 +48,22 @@ export class Theme {
 
   // private dom?: ElementTree.ElementTree;
 
-  public FromXML(xml: any): void {
+  public FromXML(theme: OOXML.Theme): void {
+
+    const color_scheme = theme.themeElements.clrScheme;
+    for (const name of Theme.color_map) {
+      const element = color_scheme[name];
+      if (element.srgbClr) {
+        this.colors[name] = {name, value: element.srgbClr.$attributes?.val || '', type: 'rgb'};
+
+      }
+      else if (element.sysClr) {
+        this.colors[name] = {name, value: element.sysClr.$attributes?.lastClr || '', type: 'system'};
+
+      }
+    }
 
+    /*    
     const tag = Object.keys(xml)[0];
 
     let namespace = '';
@@ -80,6 +95,7 @@ export class Theme {
 
       }
     }
+    */
 
   }
 

package/treb-export/src/workbook.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -40,6 +40,13 @@ import type { CellStyle, ThemeColor } from 'treb-base-types';
 import type { SerializedNamed } from 'treb-data-model';
 import { type Metadata, ParseMetadataXML } from './metadata';
 
+///////////////
+
+import * as OOXML from 'ooxml-types';
+import { ooxml_parser, IterateTags, MapTags, FirstTag } from './ooxml';
+
+///////////////
+
 /**
  * @privateRemarks -- FIXME: not sure about the equal/equals thing. need to check.
  */
@@ -196,22 +203,24 @@ export class Workbook {
 
     const rels: RelationshipMap = {};
     const data = this.zip.Has(path) ? this.zip.Get(path) : '';
-
-    //
-    // force array on <Relationship/> elements, but be slack on the rest
-    // (we know they are single elements)
-    //
-    const xml = xmlparser2.parse(data || '');
-
-    for (const relationship of xml.Relationships?.Relationship || []) {
-      const id = relationship.a$.Id;
-      rels[id] = {
-        id, 
-        type: relationship.a$.Type,
-        target: relationship.a$.Target,
-      };
+    const root = ooxml_parser.parse(data);
+
+    if (root.Relationships) {
+      const relationships = root.Relationships as OOXML.Relationships;
+      IterateTags(relationships.Relationship, (relationship) => {
+        const id = relationship.$attributes?.Id;
+        if (id) {
+          rels[id] = {
+            id, 
+            type: relationship.$attributes?.Type || '',
+            target: relationship.$attributes?.Target || '',
+          };
+        }
+      });
     }
 
+    // console.info({rels});
+
     return rels;
 
   }
@@ -223,110 +232,98 @@ export class Workbook {
 
     // shared strings
     let data = this.zip.Has('xl/sharedStrings.xml') ? this.zip.Get('xl/sharedStrings.xml') : '';
-    let xml = xmlparser2.parse(data || '');
-    this.shared_strings.FromXML(xml);
+    let parsed = ooxml_parser.parse(data || '');
+    if (parsed.sst) {
+      this.shared_strings.FromXML(parsed.sst as OOXML.SharedStringTable);
+    }
 
-    // new(ish) metadata
+    // metadata
     if (this.zip.Has('xl/metadata.xml')) {
       data = this.zip.Get('xl/metadata.xml');
-      xml = xmlparser2.parse(data);
-      this.metadata = ParseMetadataXML(xml);
+      parsed = ooxml_parser.parse(data || '');
+      if (parsed.metadata) {
+        this.metadata = ParseMetadataXML(parsed.metadata as OOXML.Metadata);
+      }
     }
 
     // theme
     data = this.zip.Get('xl/theme/theme1.xml');
-    xml = xmlparser2.parse(data);
-    this.theme.FromXML(xml);
+    parsed = ooxml_parser.parse(data);
+    if (parsed.theme) {
+      this.theme.FromXML(parsed.theme as OOXML.Theme);
+    }
 
     // styles
     data = this.zip.Get('xl/styles.xml');
-    xml = xmlparser2.parse(data);
-    this.style_cache.FromXML(xml, this.theme);
-
-    // console.info({c: this.style_cache});
+    parsed = ooxml_parser.parse(data);
+    if (parsed.styleSheet) {
+      this.style_cache.FromXML(parsed.styleSheet as OOXML.StyleSheet, this.theme);
+    }
 
     // read workbook
     data = this.zip.Get('xl/workbook.xml');
-    xml = xmlparser2.parse(data);
+    parsed = ooxml_parser.parse(data);
 
     // 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,
-      });
+    if (parsed.workbook) {
 
-    }
+      const wb = parsed.workbook as OOXML.Workbook;
 
-    /*
-    this.defined_names = {};
-    const defined_names = XMLUtils.FindAll(xml, 'workbook/definedNames/definedName');
+      this.named = MapTags(wb.definedNames?.definedName, defined_name => {
+        return {
+          name: defined_name.$attributes?.name || '',
+          expression: defined_name.$text || '',
+          local_scope: defined_name.$attributes?.localSheetId,
+        };
+      });
 
-    console.info({defined_names});
+      const view = FirstTag(wb.bookViews?.workbookView);
+      this.active_tab = view?.$attributes?.activeTab ?? 0;
 
-    for (const defined_name of defined_names) {
-      if (name && expression) {
-        this.defined_names[name] = expression;
-      }
-    }
-    */
-
-    const workbook_views = XMLUtils.FindAll(xml, 'workbook/bookViews/workbookView');
+      IterateTags(wb.sheets.sheet, element => {
 
-    if (workbook_views[0]?.a$?.activeTab) {
-      this.active_tab = Number(workbook_views[0].a$.activeTab) || 0;
-    }
+        const name = element.$attributes?.name;
+        if (name) {
 
-    // read sheets. in this version we preparse everything.
-    const composite = XMLUtils.FindAll(xml, 'workbook/sheets/sheet');
+          const state = element.$attributes?.state;
+          const rid = element.$attributes?.id ?? '';
+          const id = element.$attributes?.sheetId;
 
+          const worksheet_path = `xl/${this.rels[rid].target}`;
+          data = this.zip.Get(worksheet_path);
+          parsed = ooxml_parser.parse(data);
+          if (parsed.worksheet) {
 
-    for (const element of composite) {
-      const name = element.a$?.name;
+            const root = parsed.worksheet as OOXML.Worksheet;            
+            const worksheet = new Sheet({
+              name, rid, id,
+            }, root);
 
-      if (name) {
+            switch (state) {
+              case 'hidden': 
+                worksheet.visible_state = VisibleState.hidden;
+                break;
 
-        const state = element.a$.state;
-        const rid = element.a$['r:id'];
-  
-        const worksheet = new Sheet({
-          name, rid, id: Number(element.a$.sheetId) 
-        });
-        
-        if (state === 'hidden') {
-          worksheet.visible_state = VisibleState.hidden;
-        }
-        else if (state === 'veryHidden') {
-          worksheet.visible_state = VisibleState.very_hidden;
-        }
-    
-        worksheet.shared_strings = this.shared_strings;
+              case 'veryHidden':
+                worksheet.visible_state = VisibleState.hidden;
+                break;
+            }
+            
+            worksheet.shared_strings = this.shared_strings;
 
-        worksheet.path = `xl/${this.rels[rid].target}`;
-        worksheet.rels_path = worksheet.path.replace('worksheets', 'worksheets/_rels') + '.rels';
+            worksheet.path = worksheet_path;
+            worksheet.rels_path = worksheet.path.replace('worksheets', 'worksheets/_rels') + '.rels';
+            worksheet.rels = this.ReadRels(worksheet.rels_path);
 
-        data = this.zip.Get(worksheet.path);
-        worksheet.sheet_data = xmlparser2.parse(data || '');
-        worksheet.rels = this.ReadRels(worksheet.rels_path);
+            worksheet.Parse();
+            this.sheets.push(worksheet);
 
-        worksheet.Parse();
-        // console.info("TS", worksheet);
+          }
+        }
+      });
 
-        this.sheets.push(worksheet);
-      }
     }
 
-    // console.info("TS", this.sheets);
-
 
   }
 

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

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

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

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-export/src/zip-wrapper.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-export/tsconfig.json

@@ -11,7 +11,8 @@
     "../treb-parser/**/*.ts",
     "../treb-calculator/**/*.ts",
     "../treb-data-model/**/*.ts",
-    "../treb-base-types/**/*.ts"
+    "../treb-base-types/**/*.ts",
+    "../ooxml-types/**/*.ts"
   ],
   "exclude": [
     "src/export-worker/index-legacy.ts"

package/treb-format/src/format.test.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-format/src/format.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -125,8 +125,8 @@ export class NumberFormat {
   public static minus_character = '-'; // hyphen
   // public static minus_character = '−'; // minus
 
-  /** for the "General" format, a magic decimal point */
-  public magic_decimal = false;
+  /* * for the "General" format, a magic decimal point */
+  // public magic_decimal = false;
 
   /**
    * (testing) transformer. this is not rendered or persisted, like magic
@@ -595,11 +595,11 @@ export class NumberFormat {
     }
     else {
 
-      // magic 
-
+      /*      
       if (this.magic_decimal && parts[1] === '') {
         parts.splice(1, 1);
       }
+      */
 
       text_parts = [
         ...(section.prefix.map((text_part) => {
@@ -936,7 +936,14 @@ export class NumberFormat {
 
     const parts = representation.split('.');
 
+    if (parts.length === 2 && parts[1] === '' && section.decimal_min_digits === 0) {
+      parts.splice(1, 1);
+    }
+
     while (parts[0].length < section.integer_min_digits) {
+
+      // this is sloppy
+
       parts[0] = ('0000000000000000' + parts[0]).slice(-section.integer_min_digits);
     }
 

package/treb-format/src/format_cache.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */
@@ -169,12 +169,12 @@ export class NumberFormatCache {
     // we're doing this to hide it, but we might as well allow it
     // since js interfaces will find it regardless
 
-    this.cache['General'].magic_decimal = true;
+    // this.cache['General'].magic_decimal = true;
 
     // special general type for complex has fewer digits by default
 
     this.complex_general = new NumberFormat('0.###');
-    this.complex_general.magic_decimal = true;
+    // this.complex_general.magic_decimal = true;
 
     for (const key of Object.keys(this.aliases)) {
       this.cache[key] = this.cache[this.aliases[key]];

package/treb-format/src/format_parser.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */

package/treb-format/src/index.ts

@@ -14,7 +14,7 @@
  * 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-2025 trebco, llc. 
+ * Copyright 2022-2026 trebco, llc. 
  * info@treb.app
  * 
  */