objdiff-wasm 3.0.0 → 3.1.0

package/dist/interfaces/objdiff-core-diff.d.ts

@@ -45,6 +45,14 @@ export interface DiffResult {
   left?: ObjectDiff,
   right?: ObjectDiff,
 }
+/**
+ * # Variants
+ * 
+ * ## `"target"`
+ * 
+ * ## `"base"`
+ */
+export type DiffSide = 'target' | 'base';
 
 export class DiffConfig {
   constructor()
@@ -57,7 +65,7 @@ export class Object {
    * This type does not have a public constructor.
    */
   private constructor();
-  static parse(data: Uint8Array, config: DiffConfig): Object;
+  static parse(data: Uint8Array, config: DiffConfig, side: DiffSide): Object;
   hash(): bigint;
 }
 

package/dist/objdiff.js

@@ -76,7 +76,7 @@ function utf8Encode(s, realloc, memory) {
 let exports0;
 let exports1;
 let memory0;
-function trampoline3(arg0, arg1, arg2, arg3, arg4) {
+function trampoline4(arg0, arg1, arg2, arg3, arg4) {
     let enum0;
     switch(arg0){
         case 0:
@@ -125,7 +125,7 @@ const handleTable0 = [
 ];
 const finalizationRegistry0 = finalizationRegistryCreate((handle)=>{
     const { rep } = rscTableRemove(handleTable0, handle);
-    exports0['1'](rep);
+    exports0['3'](rep);
 });
 handleTables[0] = handleTable0;
 const trampoline0 = rscTableCreateOwn.bind(null, handleTable0);
@@ -139,16 +139,20 @@ const finalizationRegistry1 = finalizationRegistryCreate((handle)=>{
 });
 handleTables[1] = handleTable1;
 const trampoline1 = rscTableCreateOwn.bind(null, handleTable1);
+function trampoline2(handle) {
+    const handleEntry = rscTableRemove(handleTable0, handle);
+    if (handleEntry.own) exports0['3'](handleEntry.rep);
+}
 const handleTable2 = [
     T_FLAG,
     0
 ];
 const finalizationRegistry2 = finalizationRegistryCreate((handle)=>{
     const { rep } = rscTableRemove(handleTable2, handle);
-    exports0['3'](rep);
+    exports0['1'](rep);
 });
 handleTables[2] = handleTable2;
-const trampoline2 = rscTableCreateOwn.bind(null, handleTable2);
+const trampoline3 = rscTableCreateOwn.bind(null, handleTable2);
 let exports1Init;
 function init(arg0) {
     var val0 = arg0;
@@ -198,15 +202,15 @@ class DiffConfig {
             writable: true,
             value: handle1
         });
-        finalizationRegistry1.register(rsc0, handle1, rsc0);
+        finalizationRegistry2.register(rsc0, handle1, rsc0);
         Object.defineProperty(rsc0, symbolDispose, {
             writable: true,
             value: function() {
-                finalizationRegistry1.unregister(rsc0);
-                rscTableRemove(handleTable1, handle1);
+                finalizationRegistry2.unregister(rsc0);
+                rscTableRemove(handleTable2, handle1);
                 rsc0[symbolDispose] = emptyFunc;
                 rsc0[symbolRscHandle] = void 0;
-                exports0['2'](handleTable1[(handle1 << 1) + 1] & ~T_FLAG);
+                exports0['1'](handleTable2[(handle1 << 1) + 1] & ~T_FLAG);
             }
         });
         return rsc0;
@@ -215,8 +219,8 @@ class DiffConfig {
 let diffMethodDiffConfigSetProperty;
 DiffConfig.prototype.setProperty = function(arg1, arg2) {
     var handle1 = this[symbolRscHandle];
-    if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
+    if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
     var ptr2 = utf8Encode(arg1, realloc0, memory0);
     var len2 = utf8EncodedLen;
     var ptr3 = utf8Encode(arg2, realloc0, memory0);
@@ -250,8 +254,8 @@ DiffConfig.prototype.setProperty = function(arg1, arg2) {
 let diffMethodDiffConfigGetProperty;
 DiffConfig.prototype.getProperty = function(arg1) {
     var handle1 = this[symbolRscHandle];
-    if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
+    if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
     var ptr2 = utf8Encode(arg1, realloc0, memory0);
     var len2 = utf8EncodedLen;
     const ret = diffMethodDiffConfigGetProperty(handle0, ptr2, len2);
@@ -289,54 +293,67 @@ class Object$1 {
         throw new Error('"Object$1" resource does not define a constructor');
     }
 }
-Object$1.parse = function(arg0, arg1) {
+Object$1.parse = function(arg0, arg1, arg2) {
     var val0 = arg0;
     var len0 = val0.byteLength;
     var ptr0 = realloc0(0, 0, 1, +len0);
     var src0 = new Uint8Array(val0.buffer || val0, val0.byteOffset, +len0);
     new Uint8Array(memory0.buffer, ptr0, +len0).set(src0);
     var handle2 = arg1[symbolRscHandle];
-    if (!handle2 || (handleTable1[(handle2 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle1 = handleTable1[(handle2 << 1) + 1] & ~T_FLAG;
-    const ret = diffStaticObjectParse(ptr0, len0, handle1);
-    let variant6;
+    if (!handle2 || (handleTable2[(handle2 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle1 = handleTable2[(handle2 << 1) + 1] & ~T_FLAG;
+    var val3 = arg2;
+    let enum3;
+    switch(val3){
+        case 'target':
+            enum3 = 0;
+            break;
+        case 'base':
+            enum3 = 1;
+            break;
+        default:
+            if (arg2 instanceof Error) console.error(arg2);
+            throw new TypeError(`"${val3}" is not one of the cases of diff-side`);
+    }
+    const ret = diffStaticObjectParse(ptr0, len0, handle1, enum3);
+    let variant7;
     switch(dataView(memory0).getUint8(ret + 0, true)){
         case 0:
-            var handle4 = dataView(memory0).getInt32(ret + 4, true);
-            var rsc3 = new.target === Object$1 ? this : Object.create(Object$1.prototype);
-            Object.defineProperty(rsc3, symbolRscHandle, {
+            var handle5 = dataView(memory0).getInt32(ret + 4, true);
+            var rsc4 = new.target === Object$1 ? this : Object.create(Object$1.prototype);
+            Object.defineProperty(rsc4, symbolRscHandle, {
                 writable: true,
-                value: handle4
+                value: handle5
             });
-            finalizationRegistry2.register(rsc3, handle4, rsc3);
-            Object.defineProperty(rsc3, symbolDispose, {
+            finalizationRegistry1.register(rsc4, handle5, rsc4);
+            Object.defineProperty(rsc4, symbolDispose, {
                 writable: true,
                 value: function() {
-                    finalizationRegistry2.unregister(rsc3);
-                    rscTableRemove(handleTable2, handle4);
-                    rsc3[symbolDispose] = emptyFunc;
-                    rsc3[symbolRscHandle] = void 0;
-                    exports0['3'](handleTable2[(handle4 << 1) + 1] & ~T_FLAG);
+                    finalizationRegistry1.unregister(rsc4);
+                    rscTableRemove(handleTable1, handle5);
+                    rsc4[symbolDispose] = emptyFunc;
+                    rsc4[symbolRscHandle] = void 0;
+                    exports0['2'](handleTable1[(handle5 << 1) + 1] & ~T_FLAG);
                 }
             });
-            variant6 = {
+            variant7 = {
                 tag: 'ok',
-                val: rsc3
+                val: rsc4
             };
             break;
         case 1:
-            var ptr5 = dataView(memory0).getInt32(ret + 4, true);
-            var len5 = dataView(memory0).getInt32(ret + 8, true);
-            var result5 = utf8Decoder.decode(new Uint8Array(memory0.buffer, ptr5, len5));
-            variant6 = {
+            var ptr6 = dataView(memory0).getInt32(ret + 4, true);
+            var len6 = dataView(memory0).getInt32(ret + 8, true);
+            var result6 = utf8Decoder.decode(new Uint8Array(memory0.buffer, ptr6, len6));
+            variant7 = {
                 tag: 'err',
-                val: result5
+                val: result6
             };
             break;
         default:
             throw new TypeError('invalid variant discriminant for expected');
     }
-    const retVal = variant6;
+    const retVal = variant7;
     postReturn1(ret);
     if ('object' == typeof retVal && 'err' === retVal.tag) throw new ComponentError(retVal.val);
     return retVal.val;
@@ -344,8 +361,8 @@ Object$1.parse = function(arg0, arg1) {
 let diffMethodObjectHash;
 Object$1.prototype.hash = function() {
     var handle1 = this[symbolRscHandle];
-    if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
-    var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
+    if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
+    var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
     const ret = diffMethodObjectHash(handle0);
     return BigInt.asUintN(64, ret);
 };
@@ -637,8 +654,8 @@ function runDiff(arg0, arg1, arg2, arg3) {
     } else {
         const e = variant2;
         var handle1 = e[symbolRscHandle];
-        if (!handle1 || (handleTable2[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
-        var handle0 = handleTable2[(handle1 << 1) + 1] & ~T_FLAG;
+        if (!handle1 || (handleTable1[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
+        var handle0 = handleTable1[(handle1 << 1) + 1] & ~T_FLAG;
         variant2_0 = 1;
         variant2_1 = handle0;
     }
@@ -651,14 +668,14 @@ function runDiff(arg0, arg1, arg2, arg3) {
     } else {
         const e = variant5;
         var handle4 = e[symbolRscHandle];
-        if (!handle4 || (handleTable2[(handle4 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
-        var handle3 = handleTable2[(handle4 << 1) + 1] & ~T_FLAG;
+        if (!handle4 || (handleTable1[(handle4 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "Object" resource.');
+        var handle3 = handleTable1[(handle4 << 1) + 1] & ~T_FLAG;
         variant5_0 = 1;
         variant5_1 = handle3;
     }
     var handle7 = arg2[symbolRscHandle];
-    if (!handle7 || (handleTable1[(handle7 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle6 = handleTable1[(handle7 << 1) + 1] & ~T_FLAG;
+    if (!handle7 || (handleTable2[(handle7 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle6 = handleTable2[(handle7 << 1) + 1] & ~T_FLAG;
     var { mappings: v8_0, selectingLeft: v8_1, selectingRight: v8_2 } = arg3;
     var vec12 = v8_0;
     var len12 = vec12.length;
@@ -733,7 +750,7 @@ function runDiff(arg0, arg1, arg2, arg3) {
                                 rscTableRemove(handleTable0, handle18);
                                 rsc17[symbolDispose] = emptyFunc;
                                 rsc17[symbolRscHandle] = void 0;
-                                exports0['1'](handleTable0[(handle18 << 1) + 1] & ~T_FLAG);
+                                exports0['3'](handleTable0[(handle18 << 1) + 1] & ~T_FLAG);
                             }
                         });
                         variant19 = rsc17;
@@ -761,7 +778,7 @@ function runDiff(arg0, arg1, arg2, arg3) {
                                 rscTableRemove(handleTable0, handle21);
                                 rsc20[symbolDispose] = emptyFunc;
                                 rsc20[symbolRscHandle] = void 0;
-                                exports0['1'](handleTable0[(handle21 << 1) + 1] & ~T_FLAG);
+                                exports0['3'](handleTable0[(handle21 << 1) + 1] & ~T_FLAG);
                             }
                         });
                         variant22 = rsc20;
@@ -1029,8 +1046,8 @@ function displayInstructionRow(arg0, arg1, arg2, arg3) {
     if (!handle1 || (handleTable0[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "ObjectDiff" resource.');
     var handle0 = handleTable0[(handle1 << 1) + 1] & ~T_FLAG;
     var handle3 = arg3[symbolRscHandle];
-    if (!handle3 || (handleTable1[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle2 = handleTable1[(handle3 << 1) + 1] & ~T_FLAG;
+    if (!handle3 || (handleTable2[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle2 = handleTable2[(handle3 << 1) + 1] & ~T_FLAG;
     const ret = displayDisplayInstructionRow(handle0, toUint32(arg1), toUint32(arg2), handle2);
     var len12 = dataView(memory0).getInt32(ret + 4, true);
     var base12 = dataView(memory0).getInt32(ret + 0, true);
@@ -1381,8 +1398,8 @@ function instructionContext(arg0, arg1, arg2, arg3) {
     if (!handle1 || (handleTable0[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "ObjectDiff" resource.');
     var handle0 = handleTable0[(handle1 << 1) + 1] & ~T_FLAG;
     var handle3 = arg3[symbolRscHandle];
-    if (!handle3 || (handleTable1[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle2 = handleTable1[(handle3 << 1) + 1] & ~T_FLAG;
+    if (!handle3 || (handleTable2[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle2 = handleTable2[(handle3 << 1) + 1] & ~T_FLAG;
     const ret = displayInstructionContext(handle0, toUint32(arg1), toUint32(arg2), handle2);
     var len10 = dataView(memory0).getInt32(ret + 4, true);
     var base10 = dataView(memory0).getInt32(ret + 0, true);
@@ -1465,8 +1482,8 @@ function instructionHover(arg0, arg1, arg2, arg3) {
     if (!handle1 || (handleTable0[(handle1 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "ObjectDiff" resource.');
     var handle0 = handleTable0[(handle1 << 1) + 1] & ~T_FLAG;
     var handle3 = arg3[symbolRscHandle];
-    if (!handle3 || (handleTable1[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
-    var handle2 = handleTable1[(handle3 << 1) + 1] & ~T_FLAG;
+    if (!handle3 || (handleTable2[(handle3 << 1) + 1] & T_FLAG) === 0) throw new TypeError('Resource error: Not a valid "DiffConfig" resource.');
+    var handle2 = handleTable2[(handle3 << 1) + 1] & ~T_FLAG;
     const ret = displayInstructionHover(handle0, toUint32(arg1), toUint32(arg2), handle2);
     var len8 = dataView(memory0).getInt32(ret + 4, true);
     var base8 = dataView(memory0).getInt32(ret + 0, true);
@@ -1530,13 +1547,14 @@ function instructionHover(arg0, arg1, arg2, arg3) {
 const $init = (()=>{
     let gen = function*() {
         const module0 = fetchCompile(new URL('./objdiff.core.wasm', import.meta.url));
-        const module1 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwADBQQBAAAABAUBcAEEBAccBQEwAAABMQABATIAAgEzAAMIJGltcG9ydHMBAAoxBBEAIAAgASACIAMgBEEAEQEACwkAIABBAREAAAsJACAAQQIRAAALCQAgAEEDEQAACwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjM0LjA');
-        const module2 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwACJAUAATAAAQABMQAAAAEyAAAAATMAAAAIJGltcG9ydHMBcAEEBAkKAQBBAAsEAAECAwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjM0LjA');
+        const module1 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwADBQQBAAAABAUBcAEEBAccBQEwAAABMQABATIAAgEzAAMIJGltcG9ydHMBAAoxBBEAIAAgASACIAMgBEEAEQEACwkAIABBAREAAAsJACAAQQIRAAALCQAgAEEDEQAACwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjM3LjA');
+        const module2 = base64Compile('AGFzbQEAAAABDQJgAX8AYAV/f39/fwACJAUAATAAAQABMQAAAAEyAAAAATMAAAAIJGltcG9ydHMBcAEEBAkKAQBBAAsEAAECAwAvCXByb2R1Y2VycwEMcHJvY2Vzc2VkLWJ5AQ13aXQtY29tcG9uZW50BzAuMjM3LjA');
         ({ exports: exports0 } = yield instantiateCore((yield module1)));
         ({ exports: exports1 } = yield instantiateCore((yield module0), {
             '[export]objdiff:core/diff': {
-                '[resource-new]diff-config': trampoline1,
-                '[resource-new]object': trampoline2,
+                '[resource-drop]object-diff': trampoline2,
+                '[resource-new]diff-config': trampoline3,
+                '[resource-new]object': trampoline1,
                 '[resource-new]object-diff': trampoline0
             },
             'wasi:logging/logging@0.1.0-draft': {
@@ -1547,10 +1565,10 @@ const $init = (()=>{
         ({ exports: exports2 } = yield instantiateCore((yield module2), {
             '': {
                 $imports: exports0.$imports,
-                0: trampoline3,
-                1: exports1['objdiff:core/diff#[dtor]object-diff'],
-                2: exports1['objdiff:core/diff#[dtor]diff-config'],
-                3: exports1['objdiff:core/diff#[dtor]object']
+                0: trampoline4,
+                1: exports1['objdiff:core/diff#[dtor]diff-config'],
+                2: exports1['objdiff:core/diff#[dtor]object'],
+                3: exports1['objdiff:core/diff#[dtor]object-diff']
             }
         }));
         postReturn0 = exports1.cabi_post_version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "objdiff-wasm",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "A local diffing tool for decompilation projects.",
   "author": {
     "name": "Luke Street",
@@ -19,8 +19,8 @@
   "types": "dist/objdiff.d.ts",
   "scripts": {
     "build": "npm run build:wasm && npm run build:transpile && npm run build:lib",
-    "build:wasm": "cargo +nightly -Zbuild-std=panic_abort,core,alloc -Zbuild-std-features=compiler-builtins-mem build --target wasm32-wasip2 --release --no-default-features",
-    "build:transpile": "jco transpile ../target/wasm32-wasip2/release/objdiff_wasm.wasm --no-nodejs-compat --no-wasi-shim --no-namespaced-exports --map wasi:logging/logging=./wasi-logging.js --optimize -o pkg --name objdiff",
+    "build:wasm": "cargo build --profile release-min --no-default-features",
+    "build:transpile": "jco transpile ../target/wasm32-wasip2/release-min/objdiff_wasm.wasm --no-nodejs-compat --no-wasi-shim --no-namespaced-exports --map wasi:logging/logging=./wasi-logging.js --optimize -o pkg --name objdiff",
     "build:lib": "rslib build"
   },
   "devDependencies": {