@trebco/treb 27.12.2 → 28.2.0

package/treb-export/src/export2.ts

@@ -25,7 +25,10 @@
  * run, but it will take a bit more work.
  */
 
-import JSZip from 'jszip';
+// import JSZip from 'jszip';
+
+import UZip from 'uzip';
+import * as Base64JS from 'base64-js';
 
 import { PixelsToColumnWidth } from './column-width';
 
@@ -62,10 +65,12 @@ 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 { ZipWrapper } from './zip-wrapper';
 
 export class Exporter {
 
-  public zip?: JSZip;
+  // public zip?: JSZip;
+  public zip?: ZipWrapper;
 
   public xmloptions: Partial<XmlBuilderOptions> = {
     format: true,
@@ -129,19 +134,18 @@ export class Exporter {
    * 
    * @param decorated_functions 
    */
-  public async Init(decorated_functions: Record<string, string> = {}): Promise<void> {
-
-    // this.decorated_functions = decorated_functions.map(name => name.toLowerCase()); // normalized
+  public Init(decorated_functions: Record<string, string> = {}) {
 
     for (const key of Object.keys(decorated_functions)) {
       this.decorated_functions[key.toLowerCase()] = decorated_functions[key]; // normalized
     }
 
-    this.zip = await new JSZip().loadAsync(template, {base64: true});
+    const parsed = Base64JS.toByteArray(template);
+    this.zip = new ZipWrapper(parsed);
 
   }
 
-  public async WriteRels(rels: RelationshipMap, path: string, dump = false): Promise<void> {
+  public WriteRels(rels: RelationshipMap, path: string, dump = false) {
 
     if (!this.zip) {
       throw new Error('missing zip');
@@ -176,14 +180,15 @@ export class Exporter {
     if (dump) {
       console.info(xml);
     }
-    await this.zip?.file(path, xml);
+    
+    this.zip.Set(path, xml);
 
   }
 
   /**
    * format and write styles
    */
-  public async WriteStyleCache(style_cache: StyleCache): Promise<void> {
+  public WriteStyleCache(style_cache: StyleCache) {
 
     if (!this.zip) {
       throw new Error('missing zip');
@@ -501,7 +506,7 @@ export class Exporter {
     const xml = XMLDeclaration + this.xmlbuilder1.build(dom);
     // console.info(xml);
     
-    await this.zip?.file('xl/styles.xml', xml);
+    this.zip?.Set('xl/styles.xml', xml);
 
   }
 
@@ -509,7 +514,7 @@ export class Exporter {
    * format and write shared strings file to the zip archive. this will
    * replace any existing shared strings file.
    */
-  public async WriteSharedStrings(shared_strings: SharedStrings): Promise<void> {
+  public WriteSharedStrings(shared_strings: SharedStrings) {
 
     // console.info({shared_strings});
 
@@ -534,7 +539,7 @@ export class Exporter {
 
     // console.info(xml);
 
-    await this.zip?.file('xl/sharedStrings.xml', xml);
+    this.zip.Set('xl/sharedStrings.xml', xml);
 
   }
 
@@ -1157,13 +1162,13 @@ export class Exporter {
    
   }
 
-  public async Export(source: {
+  public Export(source: {
       sheet_data: SerializedSheet[];
       active_sheet?: number;
       named_ranges?: {[index: string]: IArea};
       named_expressions?: Array<{ name: string, expression: string }>;
       decimal_mark: ','|'.';
-    }): Promise<void> {
+    }) {
       
     // --- create a map --------------------------------------------------------
 
@@ -1198,11 +1203,11 @@ export class Exporter {
     const style_cache = new StyleCache();
     const theme = new Theme();
 
-    let data = await this.zip?.file('xl/theme/theme1.xml')?.async('text') as string;
+    let data = this.zip?.Get('xl/theme/theme1.xml');
     theme.FromXML(this.xmlparser2.parse(data || ''));
     // console.info({data, xml: this.xmlparser2.parse(data)})
 
-    data = await this.zip?.file('xl/styles.xml')?.async('text') as string;
+    data = this.zip?.Get('xl/styles.xml');
     style_cache.FromXML(this.xmlparser2.parse(data || ''), theme);
 
     // reset counters
@@ -2037,7 +2042,7 @@ export class Exporter {
         };
 
         const xml = XMLDeclaration + this.xmlbuilder1.build(table_dom);
-        await this.zip?.file(`xl/tables/table${table.index}.xml`, xml);
+        this.zip?.Set(`xl/tables/table${table.index}.xml`, xml);
 
       }
 
@@ -2304,25 +2309,27 @@ export class Exporter {
         }
 
         for (const {image} of drawing.images) {
-          // console.info({image}, `xl/media/image${image.index}.${image.extension}`);
-          await this.zip?.file(`xl/media/image${image.index}.${image.extension}`, image.options.data||'', {
-            base64: image.options.encoding === 'base64'
-          });
+          if (image.options.data) {
+            this.zip?.SetBinary(
+              `xl/media/image${image.index}.${image.extension}`, 
+              image.options.data, 
+              image.options.encoding);
+          }
           // no media rels!
         }
 
         for (const {chart} of drawing.charts) {
           const dom = chart.toJSON();
           const xml = XMLDeclaration + this.xmlbuilder1.build(dom);
-          await this.zip?.file(`xl/charts/chart${chart.index}.xml`, xml);
-          await this.WriteRels(chart.relationships, `xl/charts/_rels/chart${chart.index}.xml.rels`);
+          this.zip?.Set(`xl/charts/chart${chart.index}.xml`, xml);
+          this.WriteRels(chart.relationships, `xl/charts/_rels/chart${chart.index}.xml.rels`);
         }
 
-        await this.WriteRels(drawing.relationships, `xl/drawings/_rels/drawing${drawing.index}.xml.rels`);
+        this.WriteRels(drawing.relationships, `xl/drawings/_rels/drawing${drawing.index}.xml.rels`);
 
         const xml = XMLDeclaration + this.xmlbuilder1.build(drawing.toJSON());
 
-        await this.zip?.file(`xl/drawings/drawing${drawing.index}.xml`, xml);
+        this.zip?.Set(`xl/drawings/drawing${drawing.index}.xml`, xml);
 
         drawings.push(drawing); // for [ContentTypes]
 
@@ -2358,7 +2365,7 @@ export class Exporter {
 
       // write this into the file
 
-      await this.zip?.file(`xl/worksheets/sheet${sheet_index + 1}.xml`, xml);
+       this.zip?.Set(`xl/worksheets/sheet${sheet_index + 1}.xml`, xml);
       if (Object.keys(sheet_rels).length) {
         this.WriteRels(sheet_rels, `xl/worksheets/_rels/sheet${sheet_index + 1}.xml.rels`);
       }
@@ -2369,8 +2376,8 @@ export class Exporter {
 
     // these are workbook global so after all sheets are done
 
-    await this.WriteSharedStrings(shared_strings);
-    await this.WriteStyleCache(style_cache);
+    this.WriteSharedStrings(shared_strings);
+    this.WriteStyleCache(style_cache);
 
     // now have to write/update
     //
@@ -2389,7 +2396,7 @@ export class Exporter {
       `worksheets/sheet${index + 1}.xml`,
     ));
 
-    await this.WriteRels(workbook_rels, `xl/_rels/workbook.xml.rels`);
+    this.WriteRels(workbook_rels, `xl/_rels/workbook.xml.rels`);
 
     let definedNames: any = {definedName: []};
     if (source.named_ranges) {
@@ -2480,7 +2487,7 @@ export class Exporter {
 
     const workbook_xml = XMLDeclaration + this.xmlbuilder1.build(workbook_dom);
     // console.info(workbook_xml);
-    await this.zip?.file(`xl/workbook.xml`, workbook_xml);
+    this.zip?.Set(`xl/workbook.xml`, workbook_xml);
 
     // const extensions: Array<{ Extension: string, ContentType: string }> = [];
     const extensions: Record<string, string> = {};
@@ -2560,11 +2567,26 @@ export class Exporter {
 
     const content_types_xml = XMLDeclaration + this.xmlbuilder1.build(content_types_dom);
     // console.info(content_types_xml);
-    await this.zip?.file(`[Content_Types].xml`, content_types_xml);
+    this.zip?.Set(`[Content_Types].xml`, content_types_xml);
 
   }
 
-  /** zip -> binary string */
+  public ArrayBuffer() {
+    if (!this.zip) {
+      throw new Error('missing zip');
+    }
+    return this.zip.ArrayBuffer();
+  }
+
+  public Blob() {
+    if (!this.zip) {
+      throw new Error('missing zip');
+    }
+    const buffer = this.zip.ArrayBuffer();
+    return new Blob([buffer], { type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' });
+  }
+
+  /* * zip -> binary string * /
   public async AsBinaryString(compression_level?: number) {
     if (!this.zip) {
       throw new Error('missing zip');
@@ -2578,7 +2600,7 @@ export class Exporter {
     return output;
   }
 
-  /** zip -> blob */
+  /* * zip -> blob * /
   public async AsBlob(compression_level?: number) {
     if (!this.zip) {
       throw new Error('missing zip');
@@ -2591,5 +2613,7 @@ export class Exporter {
     const output = await this.zip.generateAsync(opts);
     return output;
   }
+  */
+
 
 }

package/treb-export/src/import2.ts

@@ -19,10 +19,12 @@
  * 
  */
 
-//import * as JSZip from 'jszip';
-import JSZip from 'jszip';
+// import JSZip from 'jszip';
 
-import type { AnchoredChartDescription} from './workbook2';
+import UZip from 'uzip';
+import Base64JS from 'base64-js';
+
+import type { AnchoredChartDescription, AnchoredImageDescription} from './workbook2';
 import { ChartType, ConditionalFormatOperators, Workbook } from './workbook2';
 import type { ParseResult } from 'treb-parser';
 import { Parser } from 'treb-parser';
@@ -38,6 +40,7 @@ import { XMLUtils } from './xml-utils';
 // import { one_hundred_pixels } from './constants';
 import { ColumnWidthToPixels } from './column-width';
 import type { AnnotationType, ConditionalFormat } from 'treb-grid';
+import { ZipWrapper } from './zip-wrapper';
 
 interface SharedFormula {
   row: number;
@@ -55,22 +58,14 @@ export class Importer {
 
   public workbook?: Workbook;
 
-  public archive?: JSZip;
-
-  public async Init(data: string | JSZip): Promise<void> {
+  // public archive?: JSZip;
 
-    if (typeof data === 'string') {
-      this.archive = await JSZip().loadAsync(data);
-    }
-    else {
-      this.archive = data;
-    }
-
-    if (this.archive) {
-      this.workbook = new Workbook(this.archive);
-      await this.workbook.Init();
-    }
+  public zip?: ZipWrapper;
 
+  public Init(data: ArrayBuffer) {
+    this.zip = new ZipWrapper(data);
+    this.workbook = new Workbook(this.zip);
+    this.workbook.Init();
   }
 
   /** FIXME: accessor */
@@ -465,7 +460,7 @@ export class Importer {
     return undefined;
   }
 
-  public async GetSheet(index = 0): Promise<ImportedSheetData> {
+  public GetSheet(index = 0): ImportedSheetData {
 
     if (!this.workbook) {
       throw new Error('missing workbook');
@@ -764,7 +759,7 @@ export class Importer {
         const relationship = sheet.rels[rel];
         if (relationship) {
           reference = relationship.target || '';
-          const description = await this.workbook.ReadTable(reference);
+          const description = this.workbook.ReadTable(reference);
           if (description) {
 
             // console.info({description});
@@ -806,8 +801,10 @@ export class Importer {
 
     const drawings = FindAll('worksheet/drawing');
     const chart_descriptors: AnchoredChartDescription[] = [];
+    const image_descriptors: AnchoredImageDescription[] = [];
 
     for (const child of drawings) {
+      
       const rel = child.a$ ? child.a$['r:id'] : undefined;
       if (rel) {
 
@@ -819,9 +816,18 @@ export class Importer {
         }
 
         if (reference) {
-          const drawing = await this.workbook.ReadDrawing(reference);
+          const drawing = this.workbook.ReadDrawing(reference);
           if (drawing && drawing.length) {
-            chart_descriptors.push(...drawing);
+            for (const entry of drawing) {
+              switch (entry.type) {
+                case 'chart':
+                  chart_descriptors.push(entry);
+                  break;
+                case 'image':
+                  image_descriptors.push(entry);
+                  break;
+              }
+            }
           }
         }
 
@@ -861,6 +867,40 @@ export class Importer {
 
     };
 
+    for (const descriptor of image_descriptors) {
+      if (descriptor && descriptor.image) {
+
+        const layout: AnnotationLayout = {
+          tl: AnchorToCorner(descriptor.anchor.from),
+          br: AnchorToCorner(descriptor.anchor.to),
+        };
+        
+        let type: AnnotationType = 'image';
+        const data = Base64JS.fromByteArray(descriptor.image);
+        let imagetype: string = '';
+
+        if (descriptor.filename) {
+          if (/jpe*g$/i.test(descriptor.filename)) {
+            imagetype = 'jpeg';
+          }
+          else if (/png$/i.test(descriptor.filename)) {
+            imagetype = 'png';
+          }
+          else if (/gif$/i.test(descriptor.filename)) {
+            imagetype = 'gif';
+          }
+        }
+
+        if (imagetype && data) {
+          const src = 'data:image/' + imagetype + ';base64,' + data;
+          annotations.push({
+            layout, type, data: { src },
+          });
+        }
+
+      }
+    }
+
     for (const descriptor of chart_descriptors) {
       if (descriptor && descriptor.chart) {
 

package/treb-export/src/workbook2.ts

@@ -19,8 +19,12 @@
  * 
  */
 
-import type JSZip from 'jszip';
+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';
 
@@ -39,6 +43,7 @@ import { StyleCache } from './workbook-style2';
 import { Theme } from './workbook-theme2';
 import { Sheet, VisibleState } from './workbook-sheet2';
 import type { RelationshipMap } from './relationship';
+import { ZipWrapper } from './zip-wrapper';
 
 
 /*
@@ -79,11 +84,21 @@ export interface ChartDescription {
   series?: ChartSeries[];
 }
 
+export interface AnchoredImageDescription {
+  type: 'image';
+  image?: Uint8Array;
+  filename?: string;
+  anchor: TwoCellAnchor,
+}
+
 export interface AnchoredChartDescription {
+  type: 'chart';
   chart?: ChartDescription, 
   anchor: TwoCellAnchor,
 }
 
+export type AnchoredDrawingPart = AnchoredChartDescription|AnchoredImageDescription;
+
 export interface TableFooterType {
   type: 'label'|'formula';
   value: string;
@@ -138,17 +153,17 @@ export class Workbook {
     return this.sheets.length;
   }
 
-  constructor(public zip: JSZip) {
+  constructor(public zip: ZipWrapper) {
 
   }
 
   /**
    * given a path in the zip file, read and parse the rels file
    */
-  public async ReadRels(path: string): Promise<RelationshipMap> {
+  public ReadRels(path: string): RelationshipMap {
 
     const rels: RelationshipMap = {};
-    const data = await this.zip.file(path)?.async('text') as string;
+    const data = this.zip.Has(path) ? this.zip.Get(path) : '';
 
     //
     // force array on <Relationship/> elements, but be slack on the rest
@@ -169,30 +184,30 @@ export class Workbook {
 
   }
 
-  public async Init(): Promise<void> {
+  public Init() {
 
     // read workbook rels
-    this.rels = await this.ReadRels( 'xl/_rels/workbook.xml.rels');
-    
+    this.rels = this.ReadRels( 'xl/_rels/workbook.xml.rels');
+
     // shared strings
-    let data = await this.zip.file('xl/sharedStrings.xml')?.async('text') as string;
+    let data = this.zip.Has('xl/sharedStrings.xml') ? this.zip.Get('xl/sharedStrings.xml') : '';
     let xml = xmlparser2.parse(data || '');
     this.shared_strings.FromXML(xml);
 
     // theme
-    data = await this.zip.file('xl/theme/theme1.xml')?.async('text') as string;
+    data = this.zip.Get('xl/theme/theme1.xml');
     xml = xmlparser2.parse(data);
     this.theme.FromXML(xml);
 
     // styles
-    data = await this.zip.file('xl/styles.xml')?.async('text') as string;
+    data = this.zip.Get('xl/styles.xml');
     xml = xmlparser2.parse(data);
     this.style_cache.FromXML(xml, this.theme);
 
     // console.info({c: this.style_cache});
 
     // read workbook
-    data = await this.zip.file('xl/workbook.xml')?.async('text') as string;
+    data = this.zip.Get('xl/workbook.xml');
     xml = xmlparser2.parse(data);
 
     // defined names
@@ -240,9 +255,9 @@ export class Workbook {
         worksheet.path = `xl/${this.rels[rid].target}`;
         worksheet.rels_path = worksheet.path.replace('worksheets', 'worksheets/_rels') + '.rels';
 
-        data = await this.zip.file(worksheet.path)?.async('text') as string;
+        data = this.zip.Get(worksheet.path);
         worksheet.sheet_data = xmlparser2.parse(data || '');
-        worksheet.rels = await this.ReadRels(worksheet.rels_path);
+        worksheet.rels = this.ReadRels(worksheet.rels_path);
 
         worksheet.Parse();
         // console.info("TS", worksheet);
@@ -256,9 +271,9 @@ export class Workbook {
 
   }
 
-  public async ReadTable(reference: string): Promise<TableDescription|undefined> {
+  public ReadTable(reference: string): TableDescription|undefined {
 
-    const data = await this.zip.file(reference.replace(/^../, 'xl'))?.async('text') as string;
+    const data = this.zip.Get(reference.replace(/^../, 'xl'));
 
     if (!data) {
       return undefined;
@@ -276,19 +291,21 @@ export class Workbook {
     };
 
     return table;
+
   }
 
-  public async ReadDrawing(reference: string): Promise<AnchoredChartDescription[] | undefined> {
+  public ReadDrawing(reference: string): AnchoredDrawingPart[] | undefined {
 
-    const data = await this.zip.file(reference.replace(/^../, 'xl'))?.async('text') as string;
+    const data = this.zip.Get(reference.replace(/^../, 'xl'));
+    
     if (!data) {
       return undefined;
     }
     const xml = xmlparser2.parse(data);
 
-    const drawing_rels = await this.ReadRels(reference.replace(/^..\/drawings/, 'xl/drawings/_rels') + '.rels');
+    const drawing_rels = this.ReadRels(reference.replace(/^..\/drawings/, 'xl/drawings/_rels') + '.rels');
 
-    const results: AnchoredChartDescription[] = [];
+    const results: AnchoredDrawingPart[] = [];
     const anchor_nodes = XMLUtils.FindAll(xml, 'xdr:wsDr/xdr:twoCellAnchor');
 
     /* FIXME: move to drawing? */
@@ -308,18 +325,46 @@ export class Workbook {
         from: ParseAnchor(anchor_node['xdr:from']), 
         to: ParseAnchor(anchor_node['xdr:to']),
       };
-      const result: AnchoredChartDescription = { anchor };
 
       const chart_reference = XMLUtils.FindAll(anchor_node, `xdr:graphicFrame/a:graphic/a:graphicData/c:chart`)[0];
 
       if (chart_reference && chart_reference.a$ && chart_reference.a$['r:id']) {
+        const result: AnchoredChartDescription = { type: 'chart', anchor };
         const chart_rel = drawing_rels[chart_reference.a$['r:id']];
         if (chart_rel && chart_rel.target) {
-          result.chart = await this.ReadChart(chart_rel.target);
+          result.chart = this.ReadChart(chart_rel.target);
         }
+        results.push(result);
       }
+      else {
 
-      results.push(result);
+        const media_reference = XMLUtils.FindAll(anchor_node, `xdr:pic/xdr:blipFill/a:blip`)[0];
+        if (media_reference && media_reference.a$['r:embed']) {
+          const media_rel = drawing_rels[media_reference.a$['r:embed']];
+
+          // const chart_rel = drawing_rels[chart_reference.a$['r:id']];
+          // console.info("Maybe an image?", media_reference, media_rel)
+
+          if (media_rel && media_rel.target) {
+            if (/(?:jpg|jpeg|png|gif)$/i.test(media_rel.target)) {
+
+              // const result: AnchoredImageDescription = { type: 'image' };
+              const path = media_rel.target.replace(/^\.\./, 'xl');
+              const filename = path.replace(/^.*\//, '');
+              
+              const result: AnchoredImageDescription = {
+                type: 'image', anchor, image: this.zip.GetBinary(path), filename
+              }
+
+              results.push(result);
+
+            }
+          }
+
+        }
+
+
+      }
 
     }
 
@@ -332,9 +377,9 @@ export class Workbook {
    * FIXME: this is using the old options with old structure, just have
    * not updated it yet
    */
-  public async ReadChart(reference: string): Promise<ChartDescription|undefined> {
+  public ReadChart(reference: string): ChartDescription|undefined {
 
-    const data = await this.zip.file(reference.replace(/^../, 'xl'))?.async('text') as string;
+    const data = this.zip.Get(reference.replace(/^../, 'xl'));
     if (!data) { return undefined; }
 
     const xml = xmlparser1.parse(data);