@hpcc-js/wasm 1.19.0 → 1.20.0

package/bin/sfx-wasm.mjs

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { Zstd, Base91, extract } from '../dist/index.node.es6.mjs';
+import { Zstd, Base91 } from '../dist/index.node.es6.mjs';
 
 const myYargs = yargs(hideBin(process.argv));
 myYargs
@@ -25,13 +25,21 @@ try {
         const str = base91.encode(compressed);
         console.log(`\
 import { extract } from "./extract";
+import wrapper from "../${wasmPath.replace(".wasm", ".js")}";
+
 const blobStr = '${str}';
-export const wasmBinary = extract(blobStr);
+
+let g_module;
+export function loadWasm() {
+    if (!g_module) {
+        g_module = wrapper({
+            wasmBinary: extract(blobStr)
+        });
+    }
+    return g_module;
+}
+
         `);
-        const test = extract(str);
-        if (test.length !== wasmContent.length) {
-            throw new Error("Oh oh");
-        }
     }
     else {
         throw new Error("'filePath' is required.");

package/bin/sfx-wasm.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"sfx-wasm.mjs","sources":["../src/__bin__/sfx-wasm.mts"],"sourcesContent":["import fs from \"fs\";\r\nimport yargs from \"yargs\";\r\nimport { hideBin } from 'yargs/helpers'\r\nimport { Zstd, Base91, extract } from \"../index-node\";\r\n\r\nconst myYargs = yargs(hideBin(process.argv)) as yargs.Argv<{}>;\r\nmyYargs\r\n    .usage(\"Usage: sfx-wasm [options] filePath\")\r\n    .demandCommand(0, 1)\r\n    .example(\"sfx-wasm ./input.wasm\", \"Wrap file in a self extracting JavaScript file.\")\r\n    .help(\"h\")\r\n    .alias(\"h\", \"help\")\r\n    .epilog(\"https://github.com/hpcc-systems/hpcc-js-wasm\")\r\n    ;\r\n\r\nconst argv = await myYargs.argv;\r\n\r\ntry {\r\n    const wasmPath = argv._[0] as string;\r\n    let wasmContent;\r\n    if (fs.existsSync(wasmPath)) {\r\n        wasmContent = fs.readFileSync(wasmPath);\r\n    }\r\n    if (wasmContent) {\r\n        const zstd = await Zstd.load();\r\n        const compressed = zstd.compress(new Uint8Array(wasmContent))\r\n        const base91 = await Base91.load();\r\n        const str = base91.encode(compressed);\r\n        console.log(`\\\r\nimport { extract } from \"./extract\";\r\nconst blobStr = '${str}';\r\nexport const wasmBinary = extract(blobStr);\r\n        `);\r\n        const test = extract(str);\r\n        if (test.length !== wasmContent.length) {\r\n            throw new Error(\"Oh oh\");\r\n        }\r\n    } else {\r\n        throw new Error(\"'filePath' is required.\")\r\n    }\r\n} catch (e: any) {\r\n    console.error(`Error:  ${e?.message}\\n`);\r\n    myYargs.showHelp();\r\n}\r\n"],"names":[],"mappings":";;;;;AAKA,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAmB,CAAC;AAC/D,OAAO;KACF,KAAK,CAAC,oCAAoC,CAAC;AAC3C,KAAA,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC;AACnB,KAAA,OAAO,CAAC,uBAAuB,EAAE,iDAAiD,CAAC;KACnF,IAAI,CAAC,GAAG,CAAC;AACT,KAAA,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;KAClB,MAAM,CAAC,8CAA8C,CAAC,CACtD;AAEL,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;AAEhC,IAAI;IACA,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;AACrC,IAAA,IAAI,WAAW,CAAC;AAChB,IAAA,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;AACzB,QAAA,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC3C,KAAA;AACD,IAAA,IAAI,WAAW,EAAE;AACb,QAAA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;AAC/B,QAAA,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;AAC7D,QAAA,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,CAAA;;mBAED,GAAG,CAAA;;AAEb,QAAA,CAAA,CAAC,CAAC;AACH,QAAA,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;AAC1B,QAAA,IAAI,IAAI,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,EAAE;AACpC,YAAA,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC;AAC5B,SAAA;AACJ,KAAA;AAAM,SAAA;AACH,QAAA,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;AAC7C,KAAA;AACJ,CAAA;AAAC,OAAO,CAAM,EAAE;IACb,OAAO,CAAC,KAAK,CAAC,CAAA,QAAA,EAAW,CAAC,EAAE,OAAO,CAAI,EAAA,CAAA,CAAC,CAAC;IACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;AACtB"}
+{"version":3,"file":"sfx-wasm.mjs","sources":["../src/__bin__/sfx-wasm.mts"],"sourcesContent":["import fs from \"fs\";\r\nimport yargs from \"yargs\";\r\nimport { hideBin } from 'yargs/helpers'\r\nimport { Zstd, Base91 } from \"../index-node\";\r\n\r\nconst myYargs = yargs(hideBin(process.argv)) as yargs.Argv<{}>;\r\nmyYargs\r\n    .usage(\"Usage: sfx-wasm [options] filePath\")\r\n    .demandCommand(0, 1)\r\n    .example(\"sfx-wasm ./input.wasm\", \"Wrap file in a self extracting JavaScript file.\")\r\n    .help(\"h\")\r\n    .alias(\"h\", \"help\")\r\n    .epilog(\"https://github.com/hpcc-systems/hpcc-js-wasm\")\r\n    ;\r\n\r\nconst argv = await myYargs.argv;\r\n\r\ntry {\r\n    const wasmPath = argv._[0] as string;\r\n    let wasmContent;\r\n    if (fs.existsSync(wasmPath)) {\r\n        wasmContent = fs.readFileSync(wasmPath);\r\n    }\r\n    if (wasmContent) {\r\n        const zstd = await Zstd.load();\r\n        const compressed = zstd.compress(new Uint8Array(wasmContent))\r\n        const base91 = await Base91.load();\r\n        const str = base91.encode(compressed);\r\n        console.log(`\\\r\nimport { extract } from \"./extract\";\r\nimport wrapper from \"../${wasmPath.replace(\".wasm\", \".js\")}\";\r\n\r\nconst blobStr = '${str}';\r\n\r\nlet g_module;\r\nexport function loadWasm() {\r\n    if (!g_module) {\r\n        g_module = wrapper({\r\n            wasmBinary: extract(blobStr)\r\n        });\r\n    }\r\n    return g_module;\r\n}\r\n\r\n        `);\r\n    } else {\r\n        throw new Error(\"'filePath' is required.\")\r\n    }\r\n} catch (e: any) {\r\n    console.error(`Error:  ${e?.message}\\n`);\r\n    myYargs.showHelp();\r\n}\r\n"],"names":[],"mappings":";;;;;AAKA,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAmB,CAAC;AAC/D,OAAO;KACF,KAAK,CAAC,oCAAoC,CAAC;AAC3C,KAAA,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC;AACnB,KAAA,OAAO,CAAC,uBAAuB,EAAE,iDAAiD,CAAC;KACnF,IAAI,CAAC,GAAG,CAAC;AACT,KAAA,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC;KAClB,MAAM,CAAC,8CAA8C,CAAC,CACtD;AAEL,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;AAEhC,IAAI;IACA,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;AACrC,IAAA,IAAI,WAAW,CAAC;AAChB,IAAA,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;AACzB,QAAA,WAAW,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;AAC3C,KAAA;AACD,IAAA,IAAI,WAAW,EAAE;AACb,QAAA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;AAC/B,QAAA,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC,CAAA;AAC7D,QAAA,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACnC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,CAAA;;AAEM,wBAAA,EAAA,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;;mBAEvC,GAAG,CAAA;;;;;;;;;;;;AAYb,QAAA,CAAA,CAAC,CAAC;AACN,KAAA;AAAM,SAAA;AACH,QAAA,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;AAC7C,KAAA;AACJ,CAAA;AAAC,OAAO,CAAM,EAAE;IACb,OAAO,CAAC,KAAK,CAAC,CAAA,QAAA,EAAW,CAAC,EAAE,OAAO,CAAI,EAAA,CAAA,CAAC,CAAC;IACzC,OAAO,CAAC,QAAQ,EAAE,CAAC;AACtB"}

package/dist/graphviz.es6.js

@@ -84,12 +84,14 @@ function createFiles(graphviz, _ext) {
     [...ext.files, ...imagesToFiles(ext.images)].forEach(file => graphviz.createFile(file.path, file.data));
 }
 function graphvizVersion(wasmFolder, wasmBinary) {
+    console.warn("Deprecation Warning:  'graphvizVersion' will be refactored into 'Graphviz' in 2.0.0");
     return loadWasm(graphvizlib, "graphvizlib", wasmFolder, wasmBinary).then(module => {
         return module.Graphviz.prototype.version();
     });
 }
 const graphviz = {
     layout(dotSource, outputFormat = "svg", layoutEngine = "dot", ext) {
+        console.warn("Deprecation Warning:  'graphviz' will be replaced with 'Graphviz' in 2.0.0");
         if (!dotSource)
             return Promise.resolve("");
         return loadWasm(graphvizlib, "graphvizlib", ext?.wasmFolder, ext?.wasmBinary).then(module => {
@@ -140,6 +142,7 @@ class GraphvizSync {
         this._wasm = _wasm;
     }
     layout(dotSource, outputFormat = "svg", layoutEngine = "dot", ext) {
+        console.warn("Deprecation Warning:  'GraphvizSync' will be replaced with 'Graphviz' in 2.0.0");
         if (!dotSource)
             return "";
         const graphViz = new this._wasm.Graphviz(ext?.yInvert ? 1 : 0, ext?.nop ? ext?.nop : 0);