@trebco/treb 32.13.2 → 36.1.2

package/treb-export/src/export.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
  * 
  */
@@ -42,7 +42,6 @@ import { Area, Cells, ValueType, Style, IsHTMLColor, IsThemeColor, ThemeColorInd
 
 // import * as xmlparser from 'fast-xml-parser';
 import type { XmlBuilderOptions} from 'fast-xml-parser';
-import { XMLParser } from 'fast-xml-parser';
 
 import { SharedStrings } from './shared-strings';
 import type { XlColor, BorderEdge } from './workbook-style';
@@ -51,7 +50,7 @@ import { Theme } from './workbook-theme';
 
 import type { RelationshipMap} from './relationship';
 import { AddRel } from './relationship';
-import { type DOMContent, XMLOptions2, PatchXMLBuilder } from './xml-utils';
+import { type DOMContent, PatchXMLBuilder } from './xml-utils';
 
 import type { UnitAddress, UnitRange, ExpressionUnit} from 'treb-parser';
 import { Parser } from 'treb-parser';
@@ -65,6 +64,7 @@ import { Drawing } from './drawing/drawing';
 import { ConditionalFormatOperators, type TableDescription, type TableFooterType } from './workbook';
 import type { AnnotationData } from 'treb-data-model/src/annotation';
 import { ZipWrapper } from './zip-wrapper';
+import { ooxml_parser } from './ooxml';
 
 /*
 interface NestedDOMType {
@@ -153,7 +153,7 @@ export class Exporter {
 
   // public xmlparser = new xmlparser.j2xParser(this.xmloptions);
   public xmlbuilder1 = PatchXMLBuilder(this.xmloptions);
-  public xmlparser2 = new XMLParser(XMLOptions2);
+  // public xmlparser2 = new XMLParser(XMLOptions2);
 
   // FIXME: need a way to share/pass parser flags
   public parser = new Parser();
@@ -1214,11 +1214,19 @@ export class Exporter {
     const theme = new Theme();
 
     let data = this.zip?.Get('xl/theme/theme1.xml');
-    theme.FromXML(this.xmlparser2.parse(data || ''));
+    theme.FromXML(ooxml_parser.parse(data || '')?.theme);
+
+    // theme.FromXML(this.xmlparser2.parse(data || ''));
     // console.info({data, xml: this.xmlparser2.parse(data)})
 
     data = this.zip?.Get('xl/styles.xml');
-    style_cache.FromXML(this.xmlparser2.parse(data || ''), theme);
+    
+    //style_cache.FromXML(this.xmlparser2.parse(data || ''), theme);
+    style_cache.FromXML(ooxml_parser.parse(data || '')?.styleSheet, theme);
+
+    // new flag: we need metadata for dynamic arrays
+
+    let dynamic_array_metadata = false;
 
     // reset counters
 
@@ -1573,6 +1581,7 @@ export class Exporter {
               }
               
               if (cell.area && cell.area.start.row === r && cell.area.start.column === c) {
+
                 if (typeof f === 'string') {
                   f = {
                     t$: f,
@@ -1584,6 +1593,25 @@ export class Exporter {
                 }
               }
 
+              let cm: number|undefined = undefined;
+
+              if (cell.spill && cell.spill.start.row === r && cell.spill.start.column === c) {
+
+                cm = 1;
+                dynamic_array_metadata = true;
+
+                if (typeof f === 'string') {
+                  f = {
+                    t$: f,
+                    a$: {
+                      t: 'array',
+                      ref: cell.spill.spreadsheet_label,
+                    },
+                  }
+                }
+
+              }
+
               row.push({
                 a$: {
 
@@ -1597,6 +1625,9 @@ export class Exporter {
                   // or there is no column style and it's equal to sheet style
 
                   s,
+
+                  cm,
+
                 },
 
                 f,
@@ -2357,6 +2388,83 @@ export class Exporter {
       `worksheets/sheet${index + 1}.xml`,
     ));
 
+    if (dynamic_array_metadata) {
+
+      const metadata_dom: DOMContent = {
+        metadata: {
+          a$: {
+            xmlns: 'http://schemas.openxmlformats.org/spreadsheetml/2006/main',
+            'xmlns:xda': 'http://schemas.microsoft.com/office/spreadsheetml/2017/dynamicarray',
+          },
+
+          metadataTypes: {
+            a$: {
+              count: 1,
+            },
+            metadataType: {
+              a$: {
+                name: 'XLDAPR',
+                minSupportedVersion: '120000',
+                copy: 1,
+                pasteAll: 1,
+                pasteValues: 1,
+                merge: 1,
+                splitFirst: 1,
+                rowColShift: 1,
+                clearFormats: 1,
+                clearComments: 1,
+                assign: 1,
+                coerce: 1,
+                cellMeta: 1,
+              },
+            },
+          },
+
+          futureMetadata: {
+            a$: {
+              name: 'XLDAPR',
+              count: 1,
+            },
+            bk: {
+              extLst: {
+                ext: {
+                  a$: {
+                    uri: '{bdbb8cdc-fa1e-496e-a857-3c3f30c029c3}',
+                  },
+                  'xda:dynamicArrayProperties': {
+                    a$: {
+                      fDynamic: 1,
+                      fCollapsed: `0`,
+                    },
+                  },
+                },
+              },
+            },
+          },
+
+          cellMetadata: {
+            a$: { count: 1 },
+            bk: {
+              rc: {
+                a$: {
+                  t: 1, 
+                  v: `0`,
+                }
+              },
+            },
+          },
+
+
+        },
+      };
+      const metadata_xml = XMLDeclaration + this.xmlbuilder1.build(metadata_dom);
+      // console.info(metadata_xml);
+      this.zip?.Set(`xl/metadata.xml`, metadata_xml);
+       
+      // add rel
+      AddRel(workbook_rels, 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/sheetMetadata', 'metadata.xml');
+    }
+
     this.WriteRels(workbook_rels, `xl/_rels/workbook.xml.rels`);
 
     const definedNames: DOMContent|undefined = source.named?.length ? {
@@ -2381,8 +2489,8 @@ export class Exporter {
 
       }),
     } : undefined;
-    
-    
+   
+   
     const workbook_dom: DOMContent = {
       workbook: {
         a$: {
@@ -2487,6 +2595,11 @@ export class Exporter {
           { a$: { PartName: '/xl/styles.xml', ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml' }},
           { a$: { PartName: '/xl/sharedStrings.xml', ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml' }},
 
+          // metadata
+          ...(dynamic_array_metadata ? [
+            { a$: { PartName: '/xl/metadata.xml', ContentType: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheetMetadata+xml' }},
+          ] : []),
+
           // tables
           ...global_tables.map(table => {
             return { a$: {

package/treb-export/src/import-export-messages.ts

@@ -0,0 +1,61 @@
+/*
+ * 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 type { ImportedSheetData } from 'treb-base-types';
+import type { SerializedModel, SerializedNamed } from 'treb-data-model';
+
+export type ExportMessage = {
+  type: 'export';
+  sheet: SerializedModel;
+  decorated: Record<string, string>;
+};
+
+export type ImportMessage = {
+  type: 'import';
+  data: ArrayBuffer;
+};
+
+export type ExportCompleteMessage = {
+  type: 'export-complete';
+  blob: Blob;
+};
+
+export type ImportErrorMessage = {
+  type: 'import-error';
+  error: unknown;
+};
+
+export type ImportCompleteMessage = {
+  type: 'import-complete';
+
+  results: {
+    sheets: ImportedSheetData[];
+    named?:  (SerializedNamed & {
+        local_scope?: number;
+    })[];
+    active_tab?: number;
+  };
+};
+
+export type RXMessages = ExportMessage|ImportMessage;
+export type TXMessages = ImportCompleteMessage|ImportErrorMessage|ExportCompleteMessage;
+
+