wat4wasm 1.0.4 → 1.0.7

package/lib/clean.js

@@ -26,7 +26,7 @@ function FUNC_WAT4WASM_START_CALLS(wat) {
 }
 
 export default function (wat) {
-    let block;
+    let block, $name;
 
     block = FUNC_WAT4WASM_BLOCK_ONEXTERNREADY(wat);
     if (!block.hasAnyBlock) { wat = block.removedRaw(); }
@@ -81,11 +81,37 @@ export default function (wat) {
     wat = maskSet.restore();
     wat = helpers.prepend(wat,
         imports
-            .filter(b => new RegExp(`\\${b.$name}\(\\s|\\)\)`).test(wat))
+            .filter(b => new RegExp(`\\${b.$name}\(\\s|\\)\)`).test(wat) || b.toString().match(/(memory|table)/))
             .sort((a, b) => helpers.generateId(a) - helpers.generateId(b))
             .map(b => b.toString())
             .join("\n")
     );
 
+
+    const funcMask = new helpers.MaskSet(wat);
+    const unusedCalls = new Set();
+
+    funcMask.maskAll("import");
+    funcMask.maskComments();
+
+    while (block = funcMask.lastBlockOf("func")) {
+        funcMask.mask(block);
+        if (($name = block.$name)) {
+            if (wat.match(new RegExp(`\\\((call|start|ref\\.func)\\s+\\${$name}(\\s|\\\))`))) {
+                continue;
+            }
+
+            if (unusedCalls.has($name) === false) {
+                unusedCalls.add($name);
+            }
+        }
+    }
+
+    unusedCalls.forEach($name => {
+        const begin = wat.lastIndexOf(`(func ${$name}`);
+        const block = helpers.parseBlockAt(wat, begin);
+        if (block) { wat = block.removedRaw() }
+    });
+
     return wat;
 }

package/lib/cli.js

@@ -164,7 +164,7 @@ export async function processCLI(compileCallback, PROCESS = process) {
 
                         let wasmGenerator = ``;
                         if (config.generateWASMFromHEXString && !config.generateWASMFromNumberArray) {
-                            wasmGenerator = `Uint8Array.from(/${wasmhex}/.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16)))`;
+                            wasmGenerator = `Uint8Array.from(\`${wasmhex}\`.match(/../g), $ => parseInt($, 16))`;
                         }
                         else if (!config.generateWASMFromHEXString && config.generateWASMFromNumberArray) {
                             wasmGenerator = `Uint8Array.of(${wasmhex.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16))})`;
@@ -228,7 +228,7 @@ export async function processCLI(compileCallback, PROCESS = process) {
 
                         let wasmGenerator = ``;
                         if (config.generateWASMFromHEXString && !config.generateWASMFromNumberArray) {
-                            wasmGenerator = `Uint8Array.from(/${wasmhex}/.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16)))`;
+                            wasmGenerator = `Uint8Array.from(\`${wasmhex}\`.match(/../g), $ => parseInt($, 16))`;
                         }
                         else if (!config.generateWASMFromHEXString && config.generateWASMFromNumberArray) {
                             wasmGenerator = `Uint8Array.of(${wasmhex.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16))})`;

package/lib/helpers.js

@@ -307,8 +307,18 @@ const helpers = {
     },
 
     hasBlock(raw, keyword, filter) {
+        if (!filter && typeof keyword === "object") {
+            filter = keyword;
+            keyword = "";
+        }
+
         if (!keyword) { return raw.indexOf("(", 1) !== -1; };
         keyword = this.fixBlockKeyword(keyword, filter);
+
+        if (filter?.includes) {
+            return raw.includes(filter.includes);
+        }
+
         return raw.includes(keyword);
     },
 
@@ -317,7 +327,6 @@ const helpers = {
     },
 
     MaskSet: class MaskSet extends Map {
-
         constructor(raw) {
             raw = (raw || '').toString().trim();
             Reflect.defineProperty(super(), "input", { value: raw, writable: true })
@@ -333,6 +342,23 @@ const helpers = {
             return this.mask(block, "");
         }
 
+        maskAll(keyword, filter) {
+            let block;
+
+            while (block = this.lastBlockOf(keyword, filter)) {
+                this.mask(block);
+            }
+
+            return this
+        }
+
+        maskComments() {
+            this.input = this.input
+                .split(/\n/)
+                .map(l => l.split(";;").at(0))
+                .join("\n");
+        }
+
         mask(block, maskWith = block.uuid) {
             if (!block.uuid) {
                 throw new Error(`Raw block needs uuid: ${block}`);
@@ -527,6 +553,10 @@ const helpers = {
 
     lastBlockOf(raw, keyword, filter) {
         if (!raw) throw new Error(`no raw for block: ${keyword}`);
+        if (!filter && typeof keyword === "object") {
+            filter = keyword;
+            keyword = "";
+        }
 
         keyword = this.fixBlockKeyword(keyword, filter);
         raw = raw.toString();

package/lib/index.js

@@ -20,7 +20,6 @@ import TEXT from "./processors/text.js"
 import W4W from "./processors/wat4wasm.js"
 
 const processors = [
-    REPLACE_ALL,
     W4W,
     TEXT,
     ASYNC,
@@ -32,6 +31,9 @@ const processors = [
     REF_FUNC,
     START,
     STRING,
+    REPLACE_ALL,
+    REF_EXTERN,
+    DATA,
 ];
 
 

package/lib/processors/text.js

@@ -59,6 +59,8 @@ const TEXT_ONINIT_BLOCK = (offset, length, setter) => String(
     )    
 `).trim();
 
+const extern = new Set();
+
 export default function (wat, WAT4WASM) {
 
     const maskSet = new helpers.MaskSet(wat);
@@ -74,18 +76,26 @@ export default function (wat, WAT4WASM) {
 
     textBlocks.forEach(block => {
         const text = helpers.findQuotedText(block);
-        const view = helpers.encodeText(text);
-
-        const dataRequest = WAT4WASM_ALLOC_DATA_BUFFER(wat, view.buffer);
-
-        block.dataOffset = dataRequest.offset;
-        block.viewLength = view.length;
-        block.strPreview = helpers.abstract(text);
-
-        wat = dataRequest.modifiedRaw;
+        if (extern.has(text) === false) {
+            extern.add(text)
+
+            const view = helpers.encodeText(text);
+            const dataRequest = WAT4WASM_ALLOC_DATA_BUFFER(wat, view.buffer);
+
+            block.dataOffset = dataRequest.offset;
+            block.viewLength = view.length;
+            block.strPreview = helpers.abstract(text);
+            block.strContent = text;
+            block.isExtended = true;
+
+            wat = dataRequest.modifiedRaw;
+        }
+        else {
+            block.isExtended = false;
+        }
     });
 
-    textBlocks.forEach(block => {
+    textBlocks.filter(block => block.isExtended).forEach(block => {
         const growRequest = WAT4WASM_GROW_EXTERN_TABLE(wat);
         block.tableGetter = growRequest.getter.concat(`;; ${block.strPreview} \n`);
         block.tableSetter = growRequest.generateSetter(`
@@ -98,18 +108,20 @@ export default function (wat, WAT4WASM) {
         wat = growRequest.modifiedRaw;
     });
 
-    textBlocks.forEach(block => {
-        wat = wat.replaceAll(block.toString(), block.tableGetter)
+    textBlocks.filter(block => block.isExtended).forEach(block => {
+        wat = wat.replaceAll(block.toString(), block.tableGetter);
     });
 
-    const oninit = textBlocks.map(block =>
+    const oninit = textBlocks.filter(block => block.isExtended).map(block =>
         TEXT_ONINIT_BLOCK(
             block.dataOffset,
             block.viewLength, block.tableSetter
         )
     ).join("\n");
 
-    wat = APPEND_ON_INIT(wat, oninit);
+    if (oninit.trim()) {
+        wat = APPEND_ON_INIT(wat, oninit);
+    }
 
     return wat;
 }

package/lib/processors/wat4wasm.js

@@ -239,14 +239,16 @@ export function DATA_WAT4WASM(wat) {
     });
 }
 
+
 export function WAT4WASM_ALLOC_DATA_BUFFER(wat, buffer) {
     const new_data = Buffer.from(buffer);
     const all_data = DATA_WAT4WASM(wat);
 
     let offset = all_data.buffer.indexOf(new_data);
     let modifiedRaw = wat;
+    let isAllocated = offset === -1;
 
-    if (offset < 1) {
+    if (offset < 0) {
         offset = all_data.offset;
         all_data.buffer.writeUint32LE(offset + new_data.byteLength);
         modifiedRaw = all_data.replacedRaw(WAT4WASM_DATA(Buffer.concat([all_data.buffer, new_data])));
@@ -254,6 +256,7 @@ export function WAT4WASM_ALLOC_DATA_BUFFER(wat, buffer) {
 
     return {
         offset,
+        isAllocated,
         modifiedRaw,
         isRawModified: modifiedRaw.toString() !== wat.toString()
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wat4wasm",
-  "version": "1.0.4",
+  "version": "1.0.7",
   "description": "",
   "homepage": "https://github.com/central-network/wat4wasm#readme",
   "bugs": {

package/wat4wasm

@@ -554,8 +554,15 @@ function wat4beauty(watContent, alignIndentsWith = "\t", exportPadStart = 90) {
         return "0x" + crypto.randomUUID().replace(/\-/g, "");
     },
     hasBlock(raw, keyword, filter) {
+        if (!filter && typeof keyword === "object") {
+            filter = keyword;
+            keyword = "";
+        }
         if (!keyword) { return raw.indexOf("(", 1) !== -1; };
         keyword = this.fixBlockKeyword(keyword, filter);
+        if (filter?.includes) {
+            return raw.includes(filter.includes);
+        }
         return raw.includes(keyword);
     },
     hasAnyBlock(raw) {
@@ -573,6 +580,19 @@ function wat4beauty(watContent, alignIndentsWith = "\t", exportPadStart = 90) {
             }
             return this.mask(block, "");
         }
+        maskAll(keyword, filter) {
+            let block;
+            while (block = this.lastBlockOf(keyword, filter)) {
+                this.mask(block);
+            }
+            return this
+        }
+        maskComments() {
+            this.input = this.input
+                .split(/\n/)
+                .map(l => l.split(";;").at(0))
+                .join("\n");
+        }
         mask(block, maskWith = block.uuid) {
             if (!block.uuid) {
                 throw new Error(`Raw block needs uuid: ${block}`);
@@ -735,6 +755,10 @@ function wat4beauty(watContent, alignIndentsWith = "\t", exportPadStart = 90) {
     },
     lastBlockOf(raw, keyword, filter) {
         if (!raw) throw new Error(`no raw for block: ${keyword}`);
+        if (!filter && typeof keyword === "object") {
+            filter = keyword;
+            keyword = "";
+        }
         keyword = this.fixBlockKeyword(keyword, filter);
         raw = raw.toString();
         let begin = raw.lastIndexOf(keyword);
@@ -1381,6 +1405,7 @@ const TEXT_ONINIT_BLOCK = (offset, length, setter) => String(
         ${setter}
     )    
 `).trim();
+const extern = new Set();
 function TEXT (wat, WAT4WASM) {
     const maskSet = new helpers.MaskSet(wat);
     const textBlocks = new Array();
@@ -1392,14 +1417,22 @@ function TEXT (wat, WAT4WASM) {
     wat = maskSet.restore();
     textBlocks.forEach(block => {
         const text = helpers.findQuotedText(block);
-        const view = helpers.encodeText(text);
-        const dataRequest = WAT4WASM_ALLOC_DATA_BUFFER(wat, view.buffer);
-        block.dataOffset = dataRequest.offset;
-        block.viewLength = view.length;
-        block.strPreview = helpers.abstract(text);
-        wat = dataRequest.modifiedRaw;
+        if (extern.has(text) === false) {
+            extern.add(text)
+            const view = helpers.encodeText(text);
+            const dataRequest = WAT4WASM_ALLOC_DATA_BUFFER(wat, view.buffer);
+            block.dataOffset = dataRequest.offset;
+            block.viewLength = view.length;
+            block.strPreview = helpers.abstract(text);
+            block.strContent = text;
+            block.isExtended = true;
+            wat = dataRequest.modifiedRaw;
+        }
+        else {
+            block.isExtended = false;
+        }
     });
-    textBlocks.forEach(block => {
+    textBlocks.filter(block => block.isExtended).forEach(block => {
         const growRequest = WAT4WASM_GROW_EXTERN_TABLE(wat);
         block.tableGetter = growRequest.getter.concat(`;; ${block.strPreview} \n`);
         block.tableSetter = growRequest.generateSetter(`
@@ -1410,16 +1443,18 @@ function TEXT (wat, WAT4WASM) {
         )`).trim();
         wat = growRequest.modifiedRaw;
     });
-    textBlocks.forEach(block => {
-        wat = wat.replaceAll(block.toString(), block.tableGetter)
+    textBlocks.filter(block => block.isExtended).forEach(block => {
+        wat = wat.replaceAll(block.toString(), block.tableGetter);
     });
-    const oninit = textBlocks.map(block =>
+    const oninit = textBlocks.filter(block => block.isExtended).map(block =>
         TEXT_ONINIT_BLOCK(
             block.dataOffset,
             block.viewLength, block.tableSetter
         )
     ).join("\n");
-    wat = APPEND_ON_INIT(wat, oninit);
+    if (oninit.trim()) {
+        wat = APPEND_ON_INIT(wat, oninit);
+    }
     return wat;
 }
 
@@ -1614,13 +1649,15 @@ function WAT4WASM_ALLOC_DATA_BUFFER(wat, buffer) {
     const all_data = DATA_WAT4WASM(wat);
     let offset = all_data.buffer.indexOf(new_data);
     let modifiedRaw = wat;
-    if (offset < 1) {
+    let isAllocated = offset === -1;
+    if (offset < 0) {
         offset = all_data.offset;
         all_data.buffer.writeUint32LE(offset + new_data.byteLength);
         modifiedRaw = all_data.replacedRaw(WAT4WASM_DATA(Buffer.concat([all_data.buffer, new_data])));
     }
     return {
         offset,
+        isAllocated,
         modifiedRaw,
         isRawModified: modifiedRaw.toString() !== wat.toString()
     };
@@ -1655,7 +1692,7 @@ function W4W (wat) {
     return calls;
 }
 function clean (wat) {
-    let block;
+    let block, $name;
     block = FUNC_WAT4WASM_BLOCK_ONEXTERNREADY(wat);
     if (!block.hasAnyBlock) { wat = block.removedRaw(); }
     block = FUNC_WAT4WASM_BLOCK_ONTEXTREADY(wat);
@@ -1696,11 +1733,31 @@ function clean (wat) {
     wat = maskSet.restore();
     wat = helpers.prepend(wat,
         imports
-            .filter(b => new RegExp(`\\${b.$name}\(\\s|\\)\)`).test(wat))
+            .filter(b => new RegExp(`\\${b.$name}\(\\s|\\)\)`).test(wat) || b.toString().match(/(memory|table)/))
             .sort((a, b) => helpers.generateId(a) - helpers.generateId(b))
             .map(b => b.toString())
             .join("\n")
     );
+    const funcMask = new helpers.MaskSet(wat);
+    const unusedCalls = new Set();
+    funcMask.maskAll("import");
+    funcMask.maskComments();
+    while (block = funcMask.lastBlockOf("func")) {
+        funcMask.mask(block);
+        if (($name = block.$name)) {
+            if (wat.match(new RegExp(`\\\((call|start|ref\\.func)\\s+\\${$name}(\\s|\\\))`))) {
+                continue;
+            }
+            if (unusedCalls.has($name) === false) {
+                unusedCalls.add($name);
+            }
+        }
+    }
+    unusedCalls.forEach($name => {
+        const begin = wat.lastIndexOf(`(func ${$name}`);
+        const block = helpers.parseBlockAt(wat, begin);
+        if (block) { wat = block.removedRaw() }
+    });
     return wat;
 }
 
@@ -1841,7 +1898,7 @@ async function processCLI(compileCallback, PROCESS = process) {
                     if (isJSTarget) {
                         let wasmGenerator = ``;
                         if (config.generateWASMFromHEXString && !config.generateWASMFromNumberArray) {
-                            wasmGenerator = `Uint8Array.from(/${wasmhex}/.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16)))`;
+                            wasmGenerator = `Uint8Array.from(\`${wasmhex}\`.match(/../g), $ => parseInt($, 16))`;
                         }
                         else if (!config.generateWASMFromHEXString && config.generateWASMFromNumberArray) {
                             wasmGenerator = `Uint8Array.of(${wasmhex.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16))})`;
@@ -1897,7 +1954,7 @@ async function processCLI(compileCallback, PROCESS = process) {
                         const thenCall = thenCalls.length && String(`.then(wasm => [${thenCalls}])`) || String();
                         let wasmGenerator = ``;
                         if (config.generateWASMFromHEXString && !config.generateWASMFromNumberArray) {
-                            wasmGenerator = `Uint8Array.from(/${wasmhex}/.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16)))`;
+                            wasmGenerator = `Uint8Array.from(\`${wasmhex}\`.match(/../g), $ => parseInt($, 16))`;
                         }
                         else if (!config.generateWASMFromHEXString && config.generateWASMFromNumberArray) {
                             wasmGenerator = `Uint8Array.of(${wasmhex.toString().match(/[a-f0-9]{2}/g).map(h => parseInt(h, 16))})`;
@@ -1935,7 +1992,6 @@ async function processCLI(compileCallback, PROCESS = process) {
 
 
 const processors = [
-    REPLACE_ALL,
     W4W,
     TEXT,
     ASYNC,
@@ -1947,6 +2003,9 @@ const processors = [
     REF_FUNC,
     START,
     STRING,
+    REPLACE_ALL,
+    REF_EXTERN,
+    DATA,
 ];
 processCLI(async wat4 => {
     let wat2 = wat4, f, i = -1, llen, m = -1, c = 0, ci = 0;