@trebco/treb 28.0.5 → 28.2.0

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);

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

@@ -0,0 +1,96 @@
+
+import UZip from 'uzip';
+import Base64JS from 'base64-js';
+
+export class ZipWrapper {
+
+  public records: UZip.UZIPFiles;
+  public text: Map<string, string> = new Map();
+
+  public constructor(buffer: ArrayBuffer) {
+    this.records = UZip.parse(buffer);
+  }
+
+  /**
+   * check if entry exists
+   */
+  public Has(path: string) {
+    return this.text.has(path) || !!this.records?.[path];
+  }
+
+  /**
+   * nondestructive
+   */
+  public ArrayBuffer() {
+    
+    const records: Record<string, Uint8Array> = {};
+    if (this.records) {
+      for (const [key, value] of Object.entries(this.records)) {
+        records[key] = new Uint8Array(value);
+      }
+    }
+
+    const encoder = new TextEncoder();
+    for (const [key, value] of this.text.entries()) {
+      records[key] = encoder.encode(value);
+    }
+
+    return UZip.encode(records);
+
+  }
+
+  /**
+   * set a binary file. set this directly in the records table, 
+   * instead of the text table.
+   */
+  public SetBinary(path: string, data: string, encoding?: 'base64'|'binary') {
+
+    if (encoding === 'base64') {
+      const bytes = Base64JS.toByteArray(data);
+      this.records[path] = bytes;
+    }
+    else {
+      throw new Error('unsupported encoding: ' + encoding);
+    }
+
+  }
+
+  public Set(path: string, text: string) {
+
+    this.text.set(path, text);
+    if (!!this.records[path]) {
+      delete this.records[path];
+    }
+  }
+
+  public GetBinary(path: string) {
+    const data = this.records[path];
+    if (data) {
+      return new Uint8Array(data);
+    }
+    throw new Error('path not in records: ' + path);
+  }
+
+  public Get(path: string) {
+
+    let text = this.text.get(path);
+
+    if (text) {
+      return text;
+    }
+
+    const data = this.records[path];
+    if (data) {
+      text = new TextDecoder().decode(data);
+      this.text.set(path, text);
+      delete this.records[path];
+      return text;
+    }
+
+    console.info(this);
+
+    throw new Error('path not in zip file: ' + path);
+
+  }
+
+}

package/treb-grid/src/types/annotation.ts

@@ -91,9 +91,9 @@ export interface ImageAnnotationData {
    * @privateRemarks
    * why is this a string?
    */
-  scale: string; 
+  scale?: string; 
   
-  original_size: ImageSize;
+  original_size?: ImageSize;
   
 }