Merge pull request #105 from GordonSmith/WASM_BINARY

fix:  wasmBinary should be an ArrayBuffer

Author: GordonSmith

src/expat.ts

@@ -27,7 +27,7 @@ export class StackElement {
 export class StackParser implements IParser {
     private _stack: StackElement[] = [];
 
-    parse(xml: string, wasmFolder?: string, wasmBinary?: Uint8Array): Promise<boolean> {
+    parse(xml: string, wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<boolean> {
         return parse(xml, this, wasmFolder, wasmBinary);
     }
 
@@ -62,13 +62,13 @@ function parseAttrs(attrs: string): Attributes {
     return retVal;
 }
 
-export function expatVersion(wasmFolder?: string, wasmBinary?: Uint8Array) {
+export function expatVersion(wasmFolder?: string, wasmBinary?: ArrayBuffer) {
     return loadWasm(expatlib, wasmFolder, wasmBinary).then(module => {
         return module.CExpat.prototype.version();
     });
 }
 
-export function parse(xml: string, callback: IParser, wasmFolder?: string, wasmBinary?: Uint8Array): Promise<boolean> {
+export function parse(xml: string, callback: IParser, wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<boolean> {
     return loadWasm(expatlib, wasmFolder, wasmBinary).then(module => {
         const parser = new module.CExpatJS();
         parser.startElement = function () {

src/graphviz.ts

@@ -20,7 +20,7 @@ export interface Ext {
     images?: Image[];
     files?: File[];
     wasmFolder?: string;
-    wasmBinary?: Uint8Array;
+    wasmBinary?: ArrayBuffer;
     yInvert?: boolean;
     nop?: number;
 }
@@ -47,7 +47,7 @@ function createFiles(graphviz: any, _ext?: Ext) {
     [...ext.files, ...imagesToFiles(ext.images)].forEach(file => graphviz.createFile(file.path, file.data));
 }
 
-export function graphvizVersion(wasmFolder?: string, wasmBinary?: Uint8Array) {
+export function graphvizVersion(wasmFolder?: string, wasmBinary?: ArrayBuffer) {
     return loadWasm(graphvizlib, wasmFolder, wasmBinary).then(module => {
         return module.Graphviz.prototype.version();
     });
@@ -143,6 +143,6 @@ export class GraphvizSync {
     }
 }
 
-export function graphvizSync(wasmFolder?: string, wasmBinary?: Uint8Array): Promise<GraphvizSync> {
+export function graphvizSync(wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<GraphvizSync> {
     return loadWasm(graphvizlib, wasmFolder, wasmBinary).then(wasm => new GraphvizSync(wasm));
 }

src/util.ts

@@ -6,7 +6,7 @@ function getGlobal() {
 }
 
 const globalNS: any = getGlobal();
-  
+
 let _wasmFolder: string | undefined = globalNS.__hpcc_wasmFolder || undefined;
 export function wasmFolder(_?: string): string | undefined {
     if (!arguments.length) return _wasmFolder;
@@ -29,15 +29,15 @@ function trimStart(str: string, charToRemove: string) {
     return str;
 }
 
-export function loadWasm(_wasmLib: any, wf?: string, wasmBinary?: Uint8Array): Promise<any> {
+export function loadWasm(_wasmLib: any, wf?: string, wasmBinary?: ArrayBuffer): Promise<any> {
     const wasmLib = _wasmLib.default || _wasmLib;
     //  Prevent double load ---
     if (!wasmLib.__hpcc_promise) {
         wasmLib.__hpcc_promise = wasmLib({
-                wasmBinary,
-                locateFile: (path: string, prefix: string) => {
-                    return `${trimEnd(wf || wasmFolder() || prefix || ".", "/")}/${trimStart(path, "/")}`;
-                }
+            wasmBinary,
+            locateFile: (path: string, prefix: string) => {
+                return `${trimEnd(wf || wasmFolder() || prefix || ".", "/")}/${trimStart(path, "/")}`;
+            }
         });
     }
     return wasmLib.__hpcc_promise;