@trebco/treb 32.14.0 → 36.1.3

package/treb-export/src/index.worker.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
  * 
  */
@@ -22,74 +22,106 @@
 import type { ImportedSheetData } from 'treb-base-types';
 import type { SerializedModel } from 'treb-data-model';
 
+import * as Messages from './import-export-messages';
+
 import { Exporter } from './export';
 import { Importer } from './import';
 
-const ctx: Worker = self as unknown as Worker;
-const exporter = new Exporter();
+import { GetWorkerContext } from 'treb-base-types';
+
+export function AttachInProcess() {
+  console.info("AOP");
+}
+
+// avoid top-level await so we can support older js engines
 
-const ExportSheets = (data: {
-  sheet: SerializedModel,
-  decorated: Record<string, string>,
-}) => {
+GetWorkerContext().then(ctx => {
 
-  if (data.sheet) {
-    exporter.Init(data.decorated || []);
-    exporter.Export(data.sheet);
-    ctx.postMessage({ status: 'complete', blob: exporter.Blob() });
-  }
+  const exporter = new Exporter();
 
-};
+  const ExportSheets = (data: {
+    sheet: SerializedModel,
+    decorated: Record<string, string>,
+  }) => {
 
-const ImportSheet = (data: { data: ArrayBuffer }) => {
+    if (data.sheet) {
+      exporter.Init(data.decorated || []);
+      exporter.Export(data.sheet);
+
+      const message: Messages.ExportCompleteMessage = {
+        type: 'export-complete',
+        blob: exporter.Blob(),
+      };
+
+      ctx.postMessage(message);
+      
+    }
 
-  const importer = new Importer();
+  };
 
-  try {
-    importer.Init(data.data);
+  const ImportSheet = (data: { data: ArrayBuffer }) => {
 
-    const named = importer.workbook?.GetNamedRanges();
+    const importer = new Importer();
 
-    const count = importer.SheetCount();
-    const results = {
-      sheets: [] as ImportedSheetData[],
-      named,
-      active_tab: importer.workbook?.active_tab,
-    };
+    try {
+      importer.Init(data.data);
 
-    for (let i = 0; i < count; i++) {
-      const result = importer.GetSheet(i);
-      if (result) {
-        results.sheets.push(result);
+      const named = importer.workbook?.GetNamedRanges();
+
+      const count = importer.SheetCount();
+      const results = {
+        sheets: [] as ImportedSheetData[],
+        named,
+        active_tab: importer.workbook?.active_tab,
+      };
+
+      for (let i = 0; i < count; i++) {
+        const result = importer.GetSheet(i);
+        if (result) {
+          results.sheets.push(result);
+        }
       }
-    }
 
-    for (const entry of named || []) {
-      if (typeof entry.local_scope === 'number') {
-        const sheet = results.sheets[entry.local_scope];
-        if (sheet) {
-          entry.scope = sheet.name;
+      for (const entry of named || []) {
+        if (typeof entry.local_scope === 'number') {
+          const sheet = results.sheets[entry.local_scope];
+          if (sheet) {
+            entry.scope = sheet.name;
+          }
         }
       }
+
+      const message: Messages.ImportCompleteMessage = {
+        type: 'import-complete',
+        results,
+      }
+
+      ctx.postMessage(message);
+
+    }
+    catch (err) {
+      console.warn('error importing xlsx file');
+      console.info(err);
+
+      const message: Messages.ImportErrorMessage = {
+        type: 'import-error',
+        error: err,
+      };
+
+      ctx.postMessage(message);
     }
 
-    ctx.postMessage({ status: 'complete', results });
-
-  }
-  catch (err) {
-    console.warn('error importing xlsx file');
-    console.info(err);
-    ctx.postMessage({ status: 'error', data: err });
-  }
-
-};
-
-// initialize message handler
-ctx.addEventListener('message', (event) => {
-  if (event.data && event.data.command === 'export'){
-    ExportSheets(event.data as { sheet: SerializedModel, decorated: Record<string, string>});
-  }
-  else if (event.data && event.data.command === 'import'){
-    ImportSheet(event.data as { data: ArrayBuffer });
-  }
+  };
+
+  // initialize message handler
+  ctx.addEventListener('message', (event: MessageEvent<Messages.ImportMessage|Messages.ExportMessage>) => {
+    if (event.data && event.data.type === 'export'){
+      ExportSheets(event.data as Messages.ExportMessage);
+    }
+    else if (event.data && event.data.type === 'import'){
+      ImportSheet(event.data as Messages.ImportMessage);
+    }
+  });
+
 });
+

package/treb-export/src/metadata.ts

@@ -1,4 +1,28 @@
-import { XMLUtils } from './xml-utils';
+/*
+ * 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 * as OOXML from 'ooxml-types';
+import { IterateTags } from './ooxml';
+
+// import { XMLUtils } from './xml-utils';
 
 /**
  * https://learn.microsoft.com/en-us/dotnet/api/documentformat.openxml.spreadsheet.metadatarecord?view=openxml-3.0.1
@@ -118,8 +142,7 @@ export const LookupMetadata = (source: Metadata, type: 'cell'|'value', index: nu
 
 };
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const ParseMetadataXML = (xml: any): Metadata => {
+export const ParseMetadataXML = (root: OOXML.Metadata): Metadata => {
 
   const metadata: Metadata = {
     metadata_types: [],
@@ -127,6 +150,17 @@ export const ParseMetadataXML = (xml: any): Metadata => {
     future_metadata: {},
   };
 
+  IterateTags(root.metadataTypes, metadataTypes => {
+    IterateTags(metadataTypes.metadataType, entry => {
+      const name: string = entry.$attributes?.name || '';
+      const cell_meta = !!entry.$attributes?.cellMeta;
+      metadata.metadata_types.push({ 
+        name, cell_meta 
+      });
+    });
+  });
+
+  /*
   const metadata_types = XMLUtils.FindAll(xml, 'metadata/metadataTypes/metadataType');
   for (const entry of metadata_types) {
 
@@ -139,7 +173,26 @@ export const ParseMetadataXML = (xml: any): Metadata => {
     });
 
   }
+  */
 
+  IterateTags(root.futureMetadata, entry => {
+    const name = entry.$attributes?.name;
+    if (name) {
+      const future_metadata_list: FutureMetadata[] = [];
+      IterateTags(entry.bk, bk => {
+        const future_metadata: FutureMetadata = { flags: {} };
+        IterateTags(bk.extLst?.ext, ext => {
+          if (ext.dynamicArrayProperties?.$attributes?.fDynamic) {
+            future_metadata.flags['dynamic-array'] = true;
+          }
+        });
+        future_metadata_list.push(future_metadata);
+      });
+      metadata.future_metadata[name] = future_metadata_list;
+    }
+  });
+
+  /*
   const future_metadata_blocks = XMLUtils.FindAll(xml, 'metadata/futureMetadata');
   for (const entry of future_metadata_blocks) {
 
@@ -172,13 +225,28 @@ export const ParseMetadataXML = (xml: any): Metadata => {
 
     }
   }
+  */
+
+  IterateTags(root.cellMetadata, cellMetadata => {
+    IterateTags(cellMetadata.bk, bk => {
+      IterateTags(bk.rc, rc => {
+        if (rc.$attributes) {
+          metadata.cell_metadata.push({
+            ...rc.$attributes
+          })
+        }
+      });
+    });
+  });
 
+  /*
   for (const entry of XMLUtils.FindAll(xml, 'metadata/cellMetadata/bk/rc')) {
     metadata.cell_metadata.push({
       t: Number(entry.a$?.t || -1),
       v: Number(entry.a$?.v || -1),
     });
   }
+  */
 
   // console.info({metadata});
 

package/treb-export/src/ooxml.ts

@@ -0,0 +1,47 @@
+
+
+
+import { XMLParser } from 'fast-xml-parser';
+import * as OOXML from 'ooxml-types';
+
+export const ooxml_parser = new XMLParser({
+  attributesGroupName: '$attributes',
+  ignoreAttributes: false,
+  parseAttributeValue: true,
+  attributeNamePrefix: '',
+  removeNSPrefix: true,
+  textNodeName: '$text',
+  cdataPropName: '$cdata',
+  parseTagValue: false,
+  alwaysCreateTextNode: true,
+});
+
+export function EnsureArray<T>(tag?: OOXML.OneOrMany<T>) {
+  if (Array.isArray(tag)) {
+    return tag;
+  }
+  if (tag === undefined ) { 
+    return []; 
+  }
+  return [tag];
+}
+
+export function IterateTags<T>(root: OOXML.OneOrMany<T>|undefined, fn: (tag: T) => false|void) {
+  for (const element of EnsureArray(root)) { 
+    const test = fn(element);
+    if (test === false) {
+      break;
+    }
+  }
+}
+
+export function MapTags<K, T>(root: OOXML.OneOrMany<T>|undefined, fn: (tag: T) => K) {
+  const arr: K[] = [];
+  for (const element of EnsureArray(root)) { arr.push(fn(element)); }
+  return arr;
+}
+
+export function FirstTag<T>(root: OOXML.OneOrMany<T>) {
+  return EnsureArray(root)[0];
+}
+

package/treb-export/src/relationship.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/shared-strings.ts

@@ -14,12 +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 {XMLUtils} from './xml-utils'; 
+import * as OOXML from 'ooxml-types';
+import { EnsureArray, IterateTags } from './ooxml';
 
 export class SharedStrings {
 
@@ -27,7 +28,7 @@ export class SharedStrings {
   public reverse: Record<string, number> = {};
 
   /** read strings table from (pre-parsed) xml; removes any existing strings */
-  public FromXML(xml: any) {
+  public FromXML(sst: OOXML.SharedStringTable) {
 
     // clear
 
@@ -36,7 +37,7 @@ export class SharedStrings {
 
     let index = 0;
 
-    for (const si of XMLUtils.FindAll(xml, 'sst/si')) {
+    IterateTags(sst.si, si => {
 
       // simple string looks like
       //
@@ -57,8 +58,8 @@ export class SharedStrings {
 
         let base = '';
         if (typeof si.t === 'string') { base = si.t; }
-        else if (si.t.t$) {
-          base = si.t.t$;
+        else if (si.t.$text) {
+          base = si.t.$text;
         }
 
         this.strings[index] = base;
@@ -80,14 +81,17 @@ export class SharedStrings {
       // collect text.
 
       else if (si.r) {
-        const parts = XMLUtils.FindAll(si.r, 't');
-        
-        const composite = parts.map(part => {
-          return (typeof part === 'string') ? part : (part.t$ || '');
-        }).join('');
-        
-        this.strings[index] = composite;
-        this.reverse[composite] = index;
+
+        // not sure what happens if there are multiple <r/> tags
+
+        const r = EnsureArray(si.r)[0];
+        if (r) {
+          const parts = EnsureArray(r.t);
+          const composite = parts.map(part => part.$text || '').join('');
+          this.strings[index] = composite;
+          this.reverse[composite] = index;
+        }
+
       }
       else {
         console.warn(` ** unexpected shared string @ ${index}`);
@@ -96,7 +100,7 @@ export class SharedStrings {
 
       index++;
 
-    }
+    });
  
   }
   

package/treb-export/src/template-2.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/unescape_xml.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/workbook-sheet.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
  * 
  */
@@ -47,10 +47,12 @@ import type { SharedStrings } from './shared-strings';
 import type { Drawing } from './drawing/drawing';
 import type { RelationshipMap } from './relationship';
 
+import * as OOXML from 'ooxml-types';
+
 export interface SheetOptions {
   name?: string;
   id?: number;
-  rid?: any;
+  rid?: string;
 }
 
 export interface RangeOptions {
@@ -74,7 +76,7 @@ export class Sheet {
   public rels_path?: string;
   public rels: RelationshipMap = {};
 
-  public sheet_data: any = {};
+  // public sheet_data: any = {};
 
   public shared_strings?: SharedStrings;
   public extent?: RangeType;
@@ -86,8 +88,9 @@ export class Sheet {
 
   public drawings: Drawing[] = [];
 
-  constructor(public options: SheetOptions = {}) {
-  }
+  constructor(
+      public options: SheetOptions, 
+      public root: OOXML.Worksheet) {}
 
   /**
    * A1 -> {row: 1, col: 1} etc.
@@ -165,8 +168,10 @@ export class Sheet {
     // we can read column/row sizes in here, or anything else we need to do
     // atm just extent
 
-    const dim = this.sheet_data.worksheet?.dimension?.a$?.ref;
+    // const dim = this.sheet_data.worksheet?.dimension?.a$?.ref;
+    const dim = this.root.dimension?.$attributes?.ref;
 
+    // what's up with the copies? 
     const extent = this.TranslateAddress(dim || '');
     if (is_range(extent)) {
       this.extent = JSON.parse(JSON.stringify(extent));