emnapi 1.9.1 → 1.9.2

package/dist/library_napi.js

@@ -557,6 +557,7 @@ function _napi_create_async_work(env, resource, resource_name, execute, complete
     var resourceName = String(emnapiCtx.handleStore.get(resource_name).value);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var id = emnapiAWST.create(env, resourceObject, resourceName, execute, complete, data);
+    {{{ from64('result') }}};
     {{{ makeSetValue('result', 0, 'id', '*') }}};
     return envObject.clearLastError();
 }
@@ -728,7 +729,7 @@ var emnapiString = {
         ptr >>>= 0;
         var HEAPU8 = new Uint8Array(wasmMemory.buffer);
         var end = ptr;
-        if (length === -1) {
+        if (length === -1 || length === 4294967295) {
             for (; HEAPU8[end];)
                 ++end;
         }
@@ -821,12 +822,12 @@ var emnapiString = {
             return '';
         ptr >>>= 0;
         var end = ptr;
-        if (length === -1) {
-            var idx = end >> 1;
+        if (length === -1 || length === 4294967295) {
+            var idx = end >>> 1;
             var HEAPU16 = new Uint16Array(wasmMemory.buffer);
             while (HEAPU16[idx])
                 ++idx;
-            end = idx << 1;
+            end = (idx << 1) >>> 0;
         }
         else {
             end = ptr + (length >>> 0) * 2;
@@ -866,7 +867,7 @@ var emnapiString = {
         // @ts-expect-error
         var envObject = emnapiCtx.envStore.get(env);
         envObject.checkGCAccess();
-        var autoLength = length === -1;
+        var autoLength = length === -1 || length === 4294967295;
         var sizelength = length >>> 0;
         if (length !== 0) {
             if (!str)
@@ -891,7 +892,7 @@ var emnapiString = {
         // @ts-expect-error
         var envObject = emnapiCtx.envStore.get(env);
         envObject.checkGCAccess();
-        var autoLength = length === -1;
+        var autoLength = length === -1 || length === 4294967295;
         var sizelength = length >>> 0;
         if (length !== 0) {
             if (!str)
@@ -1041,6 +1042,7 @@ var emnapiExternalMemory = {
         var pointer = _malloc({{{ to64('arrayBuffer.byteLength') }}});
         if (!pointer)
             throw new Error('Out of memory');
+        {{{ from64('pointer') }}};
         new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), pointer);
         info.address = pointer;
         info.ownership = emnapiExternalMemory.registry ? 0 /* ReferenceOwnership.kRuntime */ : 1 /* ReferenceOwnership.kUserland */;
@@ -2349,7 +2351,7 @@ function _napi_define_class(env, utf8name, length, constructor, callback_data, p
             if (!properties)
                 return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
-        if ((length < -1) || (length > 2147483647) || (!utf8name)) {
+        if (!((length >= -1 && length <= 2147483647) || length === 4294967295) || (!utf8name)) {
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         var fresult = emnapiCreateFunction(envObject, utf8name, length, constructor, callback_data);
@@ -2693,7 +2695,7 @@ function emnapiSyncMemory(js_to_wasm, arrayBufferOrView, offset, len) {
         var pointer = emnapiExternalMemory.getArrayBufferPointer(arrayBufferOrView, false).address;
         if (!pointer)
             throw new Error('Unknown ArrayBuffer address');
-        if (typeof len !== 'number' || len === -1) {
+        if (typeof len !== 'number' || len === -1 || len === 4294967295) {
             len = arrayBufferOrView.byteLength - offset;
         }
         len = len >>> 0;
@@ -2715,7 +2717,7 @@ function emnapiSyncMemory(js_to_wasm, arrayBufferOrView, offset, len) {
         var pointer = viewPointerInfo.address;
         if (!pointer)
             throw new Error('Unknown ArrayBuffer address');
-        if (typeof len !== 'number' || len === -1) {
+        if (typeof len !== 'number' || len === -1 || len === 4294967295) {
             len = latestView.byteLength - offset;
         }
         len = len >>> 0;
@@ -3346,6 +3348,7 @@ function _napi_create_buffer(env, size, data, result) {
             pointer = _malloc({{{ to64('size') }}});
             if (!pointer)
                 throw new Error('Out of memory');
+            {{{ from64('pointer') }}};
             new Uint8Array(wasmMemory.buffer).subarray(pointer, pointer + size).fill(0);
             var buffer_1 = Buffer.from(wasmMemory.buffer, pointer, size);
             var viewDescriptor = {
@@ -3549,7 +3552,7 @@ function _node_api_symbol_for(env, utf8description, length, result) {
     {{{ from64('length') }}};
     {{{ from64('utf8description') }}};
     {{{ from64('result') }}};
-    var autoLength = length === -1;
+    var autoLength = length === -1 || length === 4294967295;
     var sizelength = length >>> 0;
     if (length !== 0) {
         if (!utf8description)
@@ -5658,6 +5661,7 @@ var emnapiTSFN = {
         var queue = _malloc({{{ to64('size') }}});
         if (!queue)
             return false;
+        {{{ from64('queue') }}};
         new Uint8Array(wasmMemory.buffer, queue, size).fill(0);
         emnapiTSFN.storeSizeTypeValue(func + emnapiTSFN.offset.queue, queue, false);
         return true;
@@ -5677,6 +5681,7 @@ var emnapiTSFN = {
         var node = _malloc({{{ to64('size') }}});
         if (!node)
             throw new Error('OOM');
+        {{{ from64('node') }}};
         emnapiTSFN.storeSizeTypeValue(node, data, false);
         emnapiTSFN.storeSizeTypeValue(node + {{{ POINTER_SIZE }}}, 0, false);
         if (head === 0 && tail === 0) {
@@ -5860,10 +5865,10 @@ var emnapiTSFN = {
         var arr, index;
 #if MEMORY64
         arr = new BigUint64Array(wasmMemory.buffer);
-        index = (func + offset) >> 3;
+        index = (func + offset) >>> 3;
 #else
         arr = new Uint32Array(wasmMemory.buffer);
-        index = (func + offset) >> 2;
+        index = (func + offset) >>> 2;
 #endif
         Atomics.add(arr, index, {{{ to64('1') }}});
     },
@@ -5872,10 +5877,10 @@ var emnapiTSFN = {
         var arr, index;
 #if MEMORY64
         arr = new BigUint64Array(wasmMemory.buffer);
-        index = (func + offset) >> 3;
+        index = (func + offset) >>> 3;
 #else
         arr = new Uint32Array(wasmMemory.buffer);
-        index = (func + offset) >> 2;
+        index = (func + offset) >>> 2;
 #endif
         Atomics.sub(arr, index, {{{ to64('1') }}});
     },
@@ -5887,10 +5892,10 @@ var emnapiTSFN = {
         var arr, index;
 #if MEMORY64
         arr = new BigUint64Array(wasmMemory.buffer);
-        index = (func + offset) >> 3;
+        index = (func + offset) >>> 3;
 #else
         arr = new Uint32Array(wasmMemory.buffer);
-        index = (func + offset) >> 2;
+        index = (func + offset) >>> 2;
 #endif
         Atomics.add(arr, index, {{{ to64('1') }}});
     },
@@ -5899,18 +5904,18 @@ var emnapiTSFN = {
         var arr, index;
 #if MEMORY64
         arr = new BigUint64Array(wasmMemory.buffer);
-        index = (func + offset) >> 3;
+        index = (func + offset) >>> 3;
 #else
         arr = new Uint32Array(wasmMemory.buffer);
-        index = (func + offset) >> 2;
+        index = (func + offset) >>> 2;
 #endif
         Atomics.sub(arr, index, {{{ to64('1') }}});
     },
     getState: function (func) {
-        return Atomics.load(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.state) >> 2);
+        return Atomics.load(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.state) >>> 2);
     },
     setState: function (func, value) {
-        Atomics.store(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.state) >> 2, value);
+        Atomics.store(new Int32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.state) >>> 2, value);
     },
     getHandlesClosing: function (func) {
         return Atomics.load(new Int8Array(wasmMemory.buffer), (func + emnapiTSFN.offset.handles_closing));
@@ -5919,7 +5924,7 @@ var emnapiTSFN = {
         Atomics.store(new Int8Array(wasmMemory.buffer), (func + emnapiTSFN.offset.handles_closing), value);
     },
     getDispatchState: function (func) {
-        return Atomics.load(new Uint32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.dispatch_state) >> 2);
+        return Atomics.load(new Uint32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.dispatch_state) >>> 2);
     },
     getContext: function (func) {
         return emnapiTSFN.loadSizeTypeValue(func + emnapiTSFN.offset.context, false);
@@ -5951,20 +5956,20 @@ var emnapiTSFN = {
         if (unsigned) {
 #if MEMORY64
             arr = new BigUint64Array(wasmMemory.buffer);
-            ret = Number(Atomics.load(arr, offset >> 3));
+            ret = Number(Atomics.load(arr, offset >>> 3));
 #else
             arr = new Uint32Array(wasmMemory.buffer);
-            ret = Atomics.load(arr, offset >> 2);
+            ret = Atomics.load(arr, offset >>> 2);
 #endif
             return ret;
         }
         else {
 #if MEMORY64
             arr = new BigInt64Array(wasmMemory.buffer);
-            ret = Number(Atomics.load(arr, offset >> 3));
+            ret = Number(Atomics.load(arr, offset >>> 3));
 #else
             arr = new Int32Array(wasmMemory.buffer);
-            ret = Atomics.load(arr, offset >> 2);
+            ret = Atomics.load(arr, offset >>> 2);
 #endif
             return ret;
         }
@@ -5974,20 +5979,20 @@ var emnapiTSFN = {
         if (unsigned) {
 #if MEMORY64
             arr = new BigUint64Array(wasmMemory.buffer);
-            Atomics.store(arr, offset >> 3, BigInt(value));
+            Atomics.store(arr, offset >>> 3, BigInt(value));
 #else
             arr = new Uint32Array(wasmMemory.buffer);
-            Atomics.store(arr, offset >> 2, value);
+            Atomics.store(arr, offset >>> 2, value);
 #endif
             return undefined;
         }
         else {
 #if MEMORY64
             arr = new BigInt64Array(wasmMemory.buffer);
-            Atomics.store(arr, offset >> 3, BigInt(value >>> 0));
+            Atomics.store(arr, offset >>> 3, BigInt(value >>> 0));
 #else
             arr = new Int32Array(wasmMemory.buffer);
-            Atomics.store(arr, offset >> 2, value >>> 0);
+            Atomics.store(arr, offset >>> 2, value >>> 0);
 #endif
             return undefined;
         }
@@ -6006,7 +6011,7 @@ var emnapiTSFN = {
             {{{ makeSetValue('func', 'emnapiTSFN.offset.is_some', '0', 'i8') }}};
             emnapiCtx.removeCleanupHook(envObject, emnapiTSFN.cleanup, func);
             envObject.unref();
-            var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >> 2;
+            var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >>> 2;
             var arr = new Uint32Array(wasmMemory.buffer);
             if (Atomics.load(arr, asyncRefOffset) > 0) {
                 Atomics.store(arr, asyncRefOffset, 0);
@@ -6207,7 +6212,7 @@ var emnapiTSFN = {
         var has_more = true;
         var iterations_left = 1000;
         var ui32a = new Uint32Array(wasmMemory.buffer);
-        var index = (func + emnapiTSFN.offset.dispatch_state) >> 2;
+        var index = (func + emnapiTSFN.offset.dispatch_state) >>> 2;
         while (has_more && --iterations_left !== 0) {
             Atomics.store(ui32a, index, 1);
             has_more = emnapiTSFN.dispatchOne(func);
@@ -6220,7 +6225,7 @@ var emnapiTSFN = {
         }
     },
     send: function (func) {
-        var current_state = Atomics.or(new Uint32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.dispatch_state) >> 2, 1 << 1);
+        var current_state = Atomics.or(new Uint32Array(wasmMemory.buffer), (func + emnapiTSFN.offset.dispatch_state) >>> 2, 1 << 1);
         if ((current_state & 1) === 1) {
             return;
         }
@@ -6415,7 +6420,7 @@ function _napi_unref_threadsafe_function(env, func) {
         return 1 /* napi_status.napi_invalid_arg */;
     }
     {{{ from64('func') }}};
-    var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >> 2;
+    var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >>> 2;
     var arr = new Uint32Array(wasmMemory.buffer);
     var currentValue = Atomics.load(arr, asyncRefOffset);
     if (currentValue > 0) {
@@ -6434,7 +6439,7 @@ function _napi_ref_threadsafe_function(env, func) {
         return 1 /* napi_status.napi_invalid_arg */;
     }
     {{{ from64('func') }}};
-    var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >> 2;
+    var asyncRefOffset = (func + emnapiTSFN.offset.async_ref) >>> 2;
     var arr = new Uint32Array(wasmMemory.buffer);
     var currentValue = Atomics.load(arr, asyncRefOffset);
     if (!currentValue) {

package/include/node/emnapi.h

@@ -7,7 +7,7 @@
 
 #define EMNAPI_MAJOR_VERSION 1
 #define EMNAPI_MINOR_VERSION 9
-#define EMNAPI_PATCH_VERSION 1
+#define EMNAPI_PATCH_VERSION 2
 
 typedef enum {
   emnapi_runtime,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emnapi",
-  "version": "1.9.1",
+  "version": "1.9.2",
   "description": "Node-API implementation for Emscripten",
   "main": "index.js",
   "gypfile": false,