@trebco/treb 28.0.5 → 28.2.0

package/dist/treb.d.ts

@@ -1,4 +1,4 @@
-/*! API v28.0. Copyright 2018-2023 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
+/*! API v28.2. Copyright 2018-2023 trebco, llc. All rights reserved. LGPL: https://treb.app/license */
 
 /**
  * add our tag to the map
@@ -1754,8 +1754,8 @@ export interface ImageAnnotationData {
     src: string;
 
     /**/
-    scale: string;
-    original_size: ImageSize;
+    scale?: string;
+    original_size?: ImageSize;
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trebco/treb",
-  "version": "28.0.5",
+  "version": "28.2.0",
   "license": "LGPL-3.0-or-later",
   "homepage": "https://treb.app",
   "repository": {
@@ -13,15 +13,16 @@
   "devDependencies": {
     "@types/html-minifier": "^4.0.2",
     "@types/node": "^20.8.5",
+    "@types/uzip": "^0.20201231.0",
     "@typescript-eslint/eslint-plugin": "^6.1.0",
     "@typescript-eslint/parser": "^6.1.0",
     "archiver": "^6.0.1",
+    "base64-js": "^1.5.1",
     "cssnano": "^6.0.0",
     "esbuild": "^0.19.2",
     "eslint": "^8.19.0",
     "fast-xml-parser": "^4.0.7",
     "html-minifier": "^4.0.0",
-    "jszip": "^3.6.0",
     "sass": "^1.69.3",
     "treb-base-types": "file:treb-base-types",
     "treb-calculator": "file:treb-calculator",
@@ -33,7 +34,8 @@
     "treb-utils": "file:treb-utils",
     "ts-node-dev": "^2.0.0",
     "tslib": "^2.2.0",
-    "typescript": "^5.0.2"
+    "typescript": "^5.0.2",
+    "uzip": "^0.20201231.0"
   },
   "scripts": {
     "build": "node esbuild-custom-element.mjs",

package/treb-base-types/src/import.ts

@@ -46,6 +46,7 @@ export interface AnchoredAnnotation {
   layout: AnnotationLayout;
   type?: AnnotationType;
   formula?: string;
+  data?: any;
 }
 
 /**

package/treb-embed/src/embedded-spreadsheet.ts

@@ -4390,7 +4390,8 @@ export class EmbeddedSpreadsheet {
   /**
    *
    */
-   protected async ImportXLSX(data: string, source: LoadSource): Promise<Blob | void> {
+   protected async ImportXLSX( // data: string, source: LoadSource): Promise<Blob | void> {
+    data: ArrayBuffer, source: LoadSource): Promise<Blob | void> {
 
     // this is inlined to ensure the code will be tree-shaken properly
     if (!process.env.XLSX_SUPPORT) {
@@ -4819,30 +4820,12 @@ export class EmbeddedSpreadsheet {
               this.LoadCSV(reader.result as string, source);
             }
             else if (process.env.XLSX_SUPPORT &&  /\.xls[xm]$/i.test(file.name)) {
-              let contents: string;
-
               if (typeof reader.result === 'string') {
-                contents = reader.result;
+                finalize('Unsupported file');
               }
-              else {  // IE11
-
-                /* can break on large blob
-                contents = String.fromCharCode.apply(null,
-                  (new Uint8Array(reader.result as ArrayBuffer) as any));
-                */
-
-                // FIXME: chunk
-
-                contents = '';
-                const bytes = new Uint8Array(reader.result);
-                for (let i = 0; i < bytes.byteLength; i++) {
-                  contents += String.fromCharCode(bytes[i]);
-                }
-
+              else {
+                this.ImportXLSX(reader.result, source).then(() => finalize()).catch(err => finalize(err));
               }
-
-              this.ImportXLSX(contents, source).then(() => finalize()).catch(err => finalize(err));
-
               return;
             }
             else {
@@ -4864,13 +4847,8 @@ export class EmbeddedSpreadsheet {
       // FIXME: this should be done async, possibly in a worker
 
       setTimeout(() => {
-        if (/\.xlsx$/i.test(file.name)) {
-          if (reader.readAsBinaryString) {
-            reader.readAsBinaryString(file);
-          }
-          else {
-            reader.readAsArrayBuffer(file); // IE11
-          }
+        if (/\.xls[xm]$/i.test(file.name)) {
+          reader.readAsArrayBuffer(file);
         }
         else {
           reader.readAsText(file);

package/treb-export/src/export-worker/export-worker.ts

@@ -27,27 +27,22 @@ import { Importer } from '../import2';
 const ctx: Worker = self as any;
 const exporter = new Exporter();
 
-const ExportSheets = async (data: any) => {
+const ExportSheets = (data: any) => {
 
   if (data.sheet) {
-    await exporter.Init(data.decorated || []);
-    await exporter.Export(data.sheet);
-
-    const blob = await exporter.AsBlob(1);
-    const corrected = (blob as Blob).slice(0, (blob as Blob).size,
-      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
-
-    ctx.postMessage({ status: 'complete', blob: corrected });
+    exporter.Init(data.decorated || []);
+    exporter.Export(data.sheet);
+    ctx.postMessage({ status: 'complete', blob: exporter.Blob() });
   }
 
 };
 
-const ImportSheet = async (data: any) => {
+const ImportSheet = (data: any) => {
 
   const importer = new Importer();
 
   try {
-    await importer.Init(data.data);
+    importer.Init(data.data);
 
     const count = importer.SheetCount();
     const results = {
@@ -57,7 +52,7 @@ const ImportSheet = async (data: any) => {
     };
 
     for (let i = 0; i < count; i++) {
-      const result = await importer.GetSheet(i);
+      const result = importer.GetSheet(i);
       if (result) {
         results.sheets.push(result);
       }

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