@hpcc-js/wasm 1.13.0 → 1.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hpcc-js/wasm",
-  "version": "1.13.0",
+  "version": "1.15.0",
   "description": "hpcc-js - WASM Libraries",
   "keywords": [
     "graphviz",
@@ -44,8 +44,8 @@
     "install-expat:linux": "./scripts/cpp-install-expat.sh",
     "install-expat:win32": "wsl -e ./scripts/cpp-install-expat.sh",
     "install-build-deps": "run-s install-emsdk install-graphviz install-expat",
+    "uninstall-build-deps": "rimraf ./emsdk ./src-graphviz ./src-expat",
     "clean": "rimraf coverage build dist lib* types *.tsbuildinfo",
-    "clean-build-deps": "rimraf ./emsdk ./src-graphviz ./src-expat",
     "compile-es6": "tsc --module es6 --outDir ./lib-es6",
     "compile-es6-watch": "npm run compile-es6 -- -w",
     "compile-umd": "tsc --module umd --outDir ./lib-umd",
@@ -72,35 +72,35 @@
     "update": "npx npm-check-updates -u"
   },
   "dependencies": {
-    "yargs": "^17.3.1"
+    "yargs": "^17.5.1"
   },
   "devDependencies": {
     "@rollup/plugin-alias": "^3.1.9",
-    "@rollup/plugin-commonjs": "^21.0.2",
-    "@rollup/plugin-node-resolve": "^13.1.3",
+    "@rollup/plugin-commonjs": "^22.0.1",
+    "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
-    "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.1.0",
-    "@typescript-eslint/eslint-plugin": "^5.12.1",
-    "@typescript-eslint/parser": "^5.12.1",
+    "@types/chai": "^4.3.1",
+    "@types/mocha": "^9.1.1",
+    "@typescript-eslint/eslint-plugin": "^5.30.5",
+    "@typescript-eslint/parser": "^5.30.5",
     "chai": "^4.3.6",
-    "eslint": "^8.10.0",
-    "karma": "^6.3.16",
+    "eslint": "^8.19.0",
+    "karma": "^6.4.0",
     "karma-chai": "^0.1.0",
-    "karma-chrome-launcher": "^3.1.0",
+    "karma-chrome-launcher": "^3.1.1",
     "karma-mocha": "^2.0.1",
-    "karma-spec-reporter": "^0.0.33",
-    "local-web-server": "^5.1.1",
-    "mocha": "^9.2.1",
+    "karma-spec-reporter": "^0.0.34",
+    "local-web-server": "^5.2.1",
+    "mocha": "^10.0.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
-    "rollup": "^2.68.0",
+    "rollup": "^2.75.7",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "run-script-os": "^1.1.6",
-    "standard-version": "^9.3.2",
-    "terser": "^5.11.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.5.5"
+    "standard-version": "^9.5.0",
+    "terser": "^5.14.1",
+    "tslib": "^2.4.0",
+    "typescript": "^4.7.4"
   },
   "repository": {
     "type": "git",

package/types/expat.d.ts

@@ -16,12 +16,12 @@ export declare class StackElement {
 }
 export declare class StackParser implements IParser {
     private _stack;
-    parse(xml: string, wasmFolder?: string, wasmBinary?: Uint8Array): Promise<boolean>;
+    parse(xml: string, wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<boolean>;
     top(): StackElement;
     startElement(tag: string, attrs: Attributes): StackElement;
     endElement(tag: string): StackElement;
     characterData(content: string): void;
 }
-export declare function expatVersion(wasmFolder?: string, wasmBinary?: Uint8Array): Promise<any>;
-export declare function parse(xml: string, callback: IParser, wasmFolder?: string, wasmBinary?: Uint8Array): Promise<boolean>;
+export declare function expatVersion(wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<any>;
+export declare function parse(xml: string, callback: IParser, wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<boolean>;
 //# sourceMappingURL=expat.d.ts.map

package/types/expat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"expat.d.ts","sourceRoot":"","sources":["../src/expat.ts"],"names":[],"mappings":"AAIA,oBAAY,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AACnD,MAAM,WAAW,OAAO;IACpB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACnD,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC;AAED,qBAAa,YAAY;IAOT,QAAQ,CAAC,GAAG,EAAE,MAAM;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU;IAL5D,OAAO,CAAC,QAAQ,CAAM;IACtB,IAAI,OAAO,IAAI,MAAM,CAEpB;gBAEoB,GAAG,EAAE,MAAM,EAAW,KAAK,EAAE,UAAU;IAG5D,aAAa,CAAC,OAAO,EAAE,MAAM;CAGhC;AAED,qBAAa,WAAY,YAAW,OAAO;IACvC,OAAO,CAAC,MAAM,CAAsB;IAEpC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAIlF,GAAG,IAAI,YAAY;IAInB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,YAAY;IAM1D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAIrC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAGvC;AAcD,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,gBAIxE;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBpH"}
+{"version":3,"file":"expat.d.ts","sourceRoot":"","sources":["../src/expat.ts"],"names":[],"mappings":"AAIA,oBAAY,UAAU,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AACnD,MAAM,WAAW,OAAO;IACpB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,IAAI,CAAC;IACnD,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC;AAED,qBAAa,YAAY;IAOT,QAAQ,CAAC,GAAG,EAAE,MAAM;IAAE,QAAQ,CAAC,KAAK,EAAE,UAAU;IAL5D,OAAO,CAAC,QAAQ,CAAM;IACtB,IAAI,OAAO,IAAI,MAAM,CAEpB;gBAEoB,GAAG,EAAE,MAAM,EAAW,KAAK,EAAE,UAAU;IAG5D,aAAa,CAAC,OAAO,EAAE,MAAM;CAGhC;AAED,qBAAa,WAAY,YAAW,OAAO;IACvC,OAAO,CAAC,MAAM,CAAsB;IAEpC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC;IAInF,GAAG,IAAI,YAAY;IAInB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,GAAG,YAAY;IAM1D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY;IAIrC,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;CAGvC;AAcD,wBAAgB,YAAY,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,gBAIzE;AAED,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,OAAO,CAAC,CAkBrH"}

package/types/graphviz.d.ts

@@ -13,21 +13,21 @@ export interface Ext {
     images?: Image[];
     files?: File[];
     wasmFolder?: string;
-    wasmBinary?: Uint8Array;
+    wasmBinary?: ArrayBuffer;
     yInvert?: boolean;
     nop?: number;
 }
-export declare function graphvizVersion(wasmFolder?: string, wasmBinary?: Uint8Array): Promise<any>;
+export declare function graphvizVersion(wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<any>;
 export declare const graphviz: {
-    layout(dotSource: string, outputFormat?: Format, layoutEngine?: Engine, ext?: Ext | undefined): Promise<string>;
-    circo(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    dot(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    fdp(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    sfdp(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    neato(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    osage(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    patchwork(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
-    twopi(dotSource: string, outputFormat?: Format, ext?: Ext | undefined): Promise<string>;
+    layout(dotSource: string, outputFormat?: Format, layoutEngine?: Engine, ext?: Ext): Promise<string>;
+    circo(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    dot(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    fdp(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    sfdp(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    neato(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    osage(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    patchwork(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
+    twopi(dotSource: string, outputFormat?: Format, ext?: Ext): Promise<string>;
 };
 export declare class GraphvizSync {
     private _wasm;
@@ -42,5 +42,5 @@ export declare class GraphvizSync {
     patchwork(dotSource: string, outputFormat?: Format, ext?: Ext): string;
     twopi(dotSource: string, outputFormat?: Format, ext?: Ext): string;
 }
-export declare function graphvizSync(wasmFolder?: string, wasmBinary?: Uint8Array): Promise<GraphvizSync>;
+export declare function graphvizSync(wasmFolder?: string, wasmBinary?: ArrayBuffer): Promise<GraphvizSync>;
 //# sourceMappingURL=graphviz.d.ts.map

package/types/graphviz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphviz.d.ts","sourceRoot":"","sources":["../src/graphviz.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"graphviz.d.ts","sourceRoot":"","sources":["../src/graphviz.ts"],"names":[],"mappings":"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"}

package/types/util.d.ts

@@ -1,3 +1,3 @@
 export declare function wasmFolder(_?: string): string | undefined;
-export declare function loadWasm(_wasmLib: any, wf?: string, wasmBinary?: Uint8Array): Promise<any>;
+export declare function loadWasm(_wasmLib: any, wf?: string, wasmBinary?: ArrayBuffer): Promise<any>;
 //# sourceMappingURL=util.d.ts.map

package/types/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAUA,wBAAgB,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKzD;AAgBD,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAY1F"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAUA,wBAAgB,UAAU,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAKzD;AAgBD,wBAAgB,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAY3F"}