emnapi 0.36.2 → 0.37.0

package/dist/library_napi.js

@@ -212,9 +212,13 @@ function _emnapi_create_memory_view(env, typedarray_type, external_data, byte_le
             case -1 /* emnapi_memory_view_type.emnapi_data_view */:
                 viewDescriptor_1 = { Ctor: DataView, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
                 break;
-            case -2 /* emnapi_memory_view_type.emnapi_buffer */:
+            case -2 /* emnapi_memory_view_type.emnapi_buffer */: {
+                if (!emnapiCtx.feature.Buffer) {
+                    throw emnapiCtx.createNotSupportBufferError("emnapi_create_memory_view", "");
+                }
                 viewDescriptor_1 = { Ctor: emnapiCtx.feature.Buffer, address: external_data, length: byte_length, ownership: 1 /* Ownership.kUserland */, runtimeAllocated: 0 };
                 break;
+            }
             default: return envObject_1.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         var Ctor_1 = viewDescriptor_1.Ctor;
@@ -474,9 +478,9 @@ function napi_throw_error(env, code, msg) {
             return envObject_5.setLastError(1 /* napi_status.napi_invalid_arg */);
         {{{ from64("code") }}};
         {{{ from64("msg") }}};
-        var error_1 = new Error(UTF8ToString(msg));
+        var error_1 = new Error(emnapiString.UTF8ToString(msg, -1));
         if (code) {
-            error_1.code = UTF8ToString(code);
+            error_1.code = emnapiString.UTF8ToString(code, -1);
         }
         envObject_5.tryCatch.setError(error_1);
         return envObject_5.clearLastError();
@@ -499,9 +503,9 @@ function napi_throw_type_error(env, code, msg) {
             return envObject_6.setLastError(1 /* napi_status.napi_invalid_arg */);
         {{{ from64("code") }}};
         {{{ from64("msg") }}};
-        var error_2 = new TypeError(UTF8ToString(msg));
+        var error_2 = new TypeError(emnapiString.UTF8ToString(msg, -1));
         if (code) {
-            error_2.code = UTF8ToString(code);
+            error_2.code = emnapiString.UTF8ToString(code, -1);
         }
         envObject_6.tryCatch.setError(error_2);
         return envObject_6.clearLastError();
@@ -524,9 +528,9 @@ function napi_throw_range_error(env, code, msg) {
             return envObject_7.setLastError(1 /* napi_status.napi_invalid_arg */);
         {{{ from64("code") }}};
         {{{ from64("msg") }}};
-        var error_3 = new RangeError(UTF8ToString(msg));
+        var error_3 = new RangeError(emnapiString.UTF8ToString(msg, -1));
         if (code) {
-            error_3.code = UTF8ToString(code);
+            error_3.code = emnapiString.UTF8ToString(code, -1);
         }
         envObject_7.tryCatch.setError(error_3);
         return envObject_7.clearLastError();
@@ -549,9 +553,9 @@ function node_api_throw_syntax_error(env, code, msg) {
             return envObject_8.setLastError(1 /* napi_status.napi_invalid_arg */);
         {{{ from64("code") }}};
         {{{ from64("msg") }}};
-        var error_4 = new SyntaxError(UTF8ToString(msg));
+        var error_4 = new SyntaxError(emnapiString.UTF8ToString(msg, -1));
         if (code) {
-            error_4.code = UTF8ToString(code);
+            error_4.code = emnapiString.UTF8ToString(code, -1);
         }
         envObject_8.tryCatch.setError(error_4);
         return envObject_8.clearLastError();
@@ -703,9 +707,9 @@ function napi_fatal_error(location, location_len, message, message_len) {
     {{{ from64('message') }}};
     {{{ from64('message_len') }}};
     abort('FATAL ERROR: ' +
-        emnapiUtf8ToString(location, location_len) +
+        emnapiString.UTF8ToString(location, location_len) +
         ' ' +
-        emnapiUtf8ToString(message, message_len));
+        emnapiString.UTF8ToString(message, message_len));
 }
 // @ts-expect-error
 function napi_fatal_exception(env, err) {
@@ -733,16 +737,16 @@ function napi_fatal_exception(env, err) {
 emnapiImplementInternal('_emnapi_get_last_error_info', 'vpppp', __emnapi_get_last_error_info);
 emnapiImplement('napi_get_and_clear_last_exception', 'ipp', napi_get_and_clear_last_exception);
 emnapiImplement('napi_throw', 'ipp', napi_throw);
-emnapiImplement('napi_throw_error', 'ippp', napi_throw_error);
-emnapiImplement('napi_throw_type_error', 'ippp', napi_throw_type_error);
-emnapiImplement('napi_throw_range_error', 'ippp', napi_throw_range_error);
-emnapiImplement('node_api_throw_syntax_error', 'ippp', node_api_throw_syntax_error);
-emnapiImplement('napi_create_error', 'ipppp', napi_create_error);
-emnapiImplement('napi_create_type_error', 'ipppp', napi_create_type_error);
-emnapiImplement('napi_create_range_error', 'ipppp', napi_create_range_error);
-emnapiImplement('node_api_create_syntax_error', 'ipppp', node_api_create_syntax_error);
+emnapiImplement('napi_throw_error', 'ippp', napi_throw_error, ['$emnapiString']);
+emnapiImplement('napi_throw_type_error', 'ippp', napi_throw_type_error, ['$emnapiString']);
+emnapiImplement('napi_throw_range_error', 'ippp', napi_throw_range_error, ['$emnapiString']);
+emnapiImplement('node_api_throw_syntax_error', 'ippp', node_api_throw_syntax_error, ['$emnapiString']);
+emnapiImplement('napi_create_error', 'ipppp', napi_create_error, ['$emnapiString']);
+emnapiImplement('napi_create_type_error', 'ipppp', napi_create_type_error, ['$emnapiString']);
+emnapiImplement('napi_create_range_error', 'ipppp', napi_create_range_error, ['$emnapiString']);
+emnapiImplement('node_api_create_syntax_error', 'ipppp', node_api_create_syntax_error, ['$emnapiString']);
 emnapiImplement('napi_is_exception_pending', 'ipp', napi_is_exception_pending);
-emnapiImplement('napi_fatal_error', 'vpppp', napi_fatal_error, ['$emnapiUtf8ToString']);
+emnapiImplement('napi_fatal_error', 'vpppp', napi_fatal_error, ['$emnapiString']);
 emnapiImplement('napi_fatal_exception', 'ipp', napi_fatal_exception);
 // @ts-expect-error
 function napi_create_function(env, utf8name, length, cb, data, result) {
@@ -946,7 +950,7 @@ emnapiImplement('napi_get_new_target', 'ippp', napi_get_new_target);
 /* eslint-disable @typescript-eslint/no-implied-eval */
 function emnapiCreateFunction(envObject, utf8name, length, cb, data) {
     {{{ from64('utf8name') }}};
-    var functionName = (!utf8name || !length) ? '' : (emnapiUtf8ToString(utf8name, length));
+    var functionName = (!utf8name || !length) ? '' : (emnapiString.UTF8ToString(utf8name, length));
     var f;
     var makeFunction = function () { return function () {
         'use strict';
@@ -1137,7 +1141,7 @@ function emnapiUnwrap(env, js_object, result, action) {
         return envObject_14.setLastError(10 /* napi_status.napi_pending_exception */);
     }
 }
-emnapiImplementHelper('$emnapiCreateFunction', undefined, emnapiCreateFunction, ['$emnapiUtf8ToString']);
+emnapiImplementHelper('$emnapiCreateFunction', undefined, emnapiCreateFunction, ['$emnapiString']);
 emnapiImplementHelper('$emnapiDefineProperty', undefined, emnapiDefineProperty, ['$emnapiCreateFunction']);
 emnapiImplementHelper('$emnapiGetHandle', undefined, emnapiGetHandle);
 emnapiImplementHelper('$emnapiWrap', undefined, emnapiWrap, ['$emnapiGetHandle']);
@@ -1380,7 +1384,7 @@ var emnapiExternalMemory = {
         if (!shouldCopy) {
             return info;
         }
-        var pointer = {{{ makeMalloc('$emnapiExternalMemory.getArrayBufferPointer', 'arrayBuffer.byteLength') }}};
+        var pointer = _malloc({{{ to64('arrayBuffer.byteLength') }}});
         if (!pointer)
             throw new Error('Out of memory');
         new Uint8Array(wasmMemory.buffer).set(new Uint8Array(arrayBuffer), pointer);
@@ -2070,7 +2074,7 @@ function napi_set_named_property(env, object, cname, value) {
             return envObject_25.setLastError(1 /* napi_status.napi_invalid_arg */);
         }
         {{{ from64("cname") }}};
-        emnapiCtx.handleStore.get(object).value[UTF8ToString(cname)] = emnapiCtx.handleStore.get(value).value;
+        emnapiCtx.handleStore.get(object).value[emnapiString.UTF8ToString(cname, -1)] = emnapiCtx.handleStore.get(value).value;
         return 0 /* napi_status.napi_ok */;
     }
     catch (err_26) {
@@ -2109,7 +2113,7 @@ function napi_has_named_property(env, object, utf8name, result) {
         }
         {{{ from64("utf8name") }}};
         {{{ from64("result") }}};
-        r = UTF8ToString(utf8name) in v_4;
+        r = emnapiString.UTF8ToString(utf8name, -1) in v_4;
         {{{ makeSetValue("result", 0, "r ? 1 : 0", "i8") }}};
         return envObject_26.getReturnStatus();
     }
@@ -2150,7 +2154,7 @@ function napi_get_named_property(env, object, utf8name, result) {
         {{{ from64("utf8name") }}};
         {{{ from64("result") }}};
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        value = envObject_27.ensureHandleId(v_5[UTF8ToString(utf8name)]);
+        value = envObject_27.ensureHandleId(v_5[emnapiString.UTF8ToString(utf8name, -1)]);
         {{{ makeSetValue("result", 0, "value", "*") }}};
         return envObject_27.getReturnStatus();
     }
@@ -2336,7 +2340,7 @@ function napi_define_properties(env, object, property_count, properties
             {{{ from64("attributes") }}};
             var data_2 = {{{ makeGetValue("propPtr", POINTER_SIZE * 7, "*") }}};
             if (utf8Name_1) {
-                propertyName_1 = UTF8ToString(utf8Name_1);
+                propertyName_1 = emnapiString.UTF8ToString(utf8Name_1, -1);
             }
             else {
                 if (!name_2) {
@@ -2411,14 +2415,14 @@ emnapiImplement('napi_has_property', 'ipppp', napi_has_property);
 emnapiImplement('napi_get_property', 'ipppp', napi_get_property);
 emnapiImplement('napi_delete_property', 'ipppp', napi_delete_property);
 emnapiImplement('napi_has_own_property', 'ipppp', napi_has_own_property);
-emnapiImplement('napi_set_named_property', 'ipppp', napi_set_named_property);
-emnapiImplement('napi_has_named_property', 'ipppp', napi_has_named_property);
-emnapiImplement('napi_get_named_property', 'ipppp', napi_get_named_property);
+emnapiImplement('napi_set_named_property', 'ipppp', napi_set_named_property, ['$emnapiString']);
+emnapiImplement('napi_has_named_property', 'ipppp', napi_has_named_property, ['$emnapiString']);
+emnapiImplement('napi_get_named_property', 'ipppp', napi_get_named_property, ['$emnapiString']);
 emnapiImplement('napi_set_element', 'ippip', napi_set_element);
 emnapiImplement('napi_has_element', 'ippip', napi_has_element);
 emnapiImplement('napi_get_element', 'ippip', napi_get_element);
 emnapiImplement('napi_delete_element', 'ippip', napi_delete_element);
-emnapiImplement('napi_define_properties', 'ipppp', napi_define_properties, ['$emnapiDefineProperty']);
+emnapiImplement('napi_define_properties', 'ipppp', napi_define_properties, ['$emnapiDefineProperty', '$emnapiString']);
 emnapiImplement('napi_object_freeze', 'ipp', napi_object_freeze);
 emnapiImplement('napi_object_seal', 'ipp', napi_object_seal);
 /* eslint-disable @typescript-eslint/indent */
@@ -2462,6 +2466,225 @@ function napi_run_script(env, script, result) {
 }
 emnapiImplement('napi_run_script', 'ippp', napi_run_script, ['napi_set_last_error']);
 /* eslint-disable @typescript-eslint/indent */
+var emnapiString = {
+    utf8Decoder: undefined,
+    utf16Decoder: undefined,
+    init: function () {
+#if !TEXTDECODER || TEXTDECODER == 1
+        var fallbackDecoder = {
+            decode: function (input) {
+                var isArrayBuffer = input instanceof ArrayBuffer;
+                var isView = ArrayBuffer.isView(input);
+                if (!isArrayBuffer && !isView) {
+                    throw new TypeError('The "input" argument must be an instance of ArrayBuffer or ArrayBufferView');
+                }
+                var bytes = isArrayBuffer ? new Uint8Array(input) : new Uint8Array(input.buffer, input.byteOffset, input.byteLength);
+                var inputIndex = 0;
+                var pendingSize = Math.min(256 * 256, bytes.length + 1);
+                var pending = new Uint16Array(pendingSize);
+                var chunks = [];
+                var pendingIndex = 0;
+                for (;;) {
+                    var more = inputIndex < bytes.length;
+                    if (!more || (pendingIndex >= pendingSize - 1)) {
+                        var subarray = pending.subarray(0, pendingIndex);
+                        var arraylike = subarray;
+                        chunks.push(String.fromCharCode.apply(null, arraylike));
+                        if (!more) {
+                            return chunks.join('');
+                        }
+                        bytes = bytes.subarray(inputIndex);
+                        inputIndex = 0;
+                        pendingIndex = 0;
+                    }
+                    var byte1 = bytes[inputIndex++];
+                    if ((byte1 & 0x80) === 0) {
+                        pending[pendingIndex++] = byte1;
+                    }
+                    else if ((byte1 & 0xe0) === 0xc0) {
+                        var byte2 = bytes[inputIndex++] & 0x3f;
+                        pending[pendingIndex++] = ((byte1 & 0x1f) << 6) | byte2;
+                    }
+                    else if ((byte1 & 0xf0) === 0xe0) {
+                        var byte2 = bytes[inputIndex++] & 0x3f;
+                        var byte3 = bytes[inputIndex++] & 0x3f;
+                        pending[pendingIndex++] = ((byte1 & 0x1f) << 12) | (byte2 << 6) | byte3;
+                    }
+                    else if ((byte1 & 0xf8) === 0xf0) {
+                        var byte2 = bytes[inputIndex++] & 0x3f;
+                        var byte3 = bytes[inputIndex++] & 0x3f;
+                        var byte4 = bytes[inputIndex++] & 0x3f;
+                        var codepoint = ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4;
+                        if (codepoint > 0xffff) {
+                            codepoint -= 0x10000;
+                            pending[pendingIndex++] = (codepoint >>> 10) & 0x3ff | 0xd800;
+                            codepoint = 0xdc00 | codepoint & 0x3ff;
+                        }
+                        pending[pendingIndex++] = codepoint;
+                    }
+                    else {
+                    }
+                }
+            }
+        };
+#endif
+        var utf8Decoder;
+#if !TEXTDECODER
+        utf8Decoder = fallbackDecoder;
+#elif TEXTDECODER == 1
+        utf8Decoder = typeof TextDecoder === 'function' ? new TextDecoder() : fallbackDecoder;
+#elif TEXTDECODER == 2
+        utf8Decoder = new TextDecoder();
+#endif
+        emnapiString.utf8Decoder = utf8Decoder;
+#if !TEXTDECODER || TEXTDECODER == 1
+        var fallbackDecoder2 = {
+            decode: function (input) {
+                var isArrayBuffer = input instanceof ArrayBuffer;
+                var isView = ArrayBuffer.isView(input);
+                if (!isArrayBuffer && !isView) {
+                    throw new TypeError('The "input" argument must be an instance of ArrayBuffer or ArrayBufferView');
+                }
+                var bytes = isArrayBuffer ? new Uint16Array(input) : new Uint16Array(input.buffer, input.byteOffset, input.byteLength / 2);
+                var wcharArray = Array(bytes.length);
+                for (var i = 0; i < bytes.length; ++i) {
+                    wcharArray[i] = String.fromCharCode(bytes[i]);
+                }
+                return wcharArray.join('');
+            }
+        };
+#endif
+        var utf16Decoder;
+#if !TEXTDECODER
+        utf16Decoder = fallbackDecoder2;
+#elif TEXTDECODER == 1
+        utf16Decoder = typeof TextDecoder === 'function' ? new TextDecoder('utf-16le') : fallbackDecoder2;
+#elif TEXTDECODER == 2
+        utf16Decoder = new TextDecoder('utf-16le');
+#endif
+        emnapiString.utf16Decoder = utf16Decoder;
+    },
+    lengthBytesUTF8: function (str) {
+        var c;
+        var len = 0;
+        for (var i = 0; i < str.length; ++i) {
+            c = str.charCodeAt(i);
+            if (c <= 0x7F) {
+                len++;
+            }
+            else if (c <= 0x7FF) {
+                len += 2;
+            }
+            else if (c >= 0xD800 && c <= 0xDFFF) {
+                len += 4;
+                ++i;
+            }
+            else {
+                len += 3;
+            }
+        }
+        return len;
+    },
+    UTF8ToString: function (ptr, length) {
+        ptr >>>= 0;
+        if (!ptr || !length)
+            return '';
+        var HEAPU8 = new Uint8Array(wasmMemory.buffer);
+        var end = ptr;
+        if (length === -1) {
+            for (; HEAPU8[end];)
+                ++end;
+        }
+        else {
+            end = ptr + (length >>> 0);
+        }
+        return emnapiString.utf8Decoder.decode({{{ getUnsharedTextDecoderView('HEAPU8', 'ptr', 'end') }}});
+    },
+    stringToUTF8: function (str, outPtr, maxBytesToWrite) {
+        var HEAPU8 = new Uint8Array(wasmMemory.buffer);
+        var outIdx = outPtr;
+        outIdx >>>= 0;
+        if (!(maxBytesToWrite > 0)) {
+            return 0;
+        }
+        var startIdx = outIdx;
+        var endIdx = outIdx + maxBytesToWrite - 1;
+        for (var i = 0; i < str.length; ++i) {
+            var u = str.charCodeAt(i);
+            if (u >= 0xD800 && u <= 0xDFFF) {
+                var u1 = str.charCodeAt(++i);
+                u = 0x10000 + ((u & 0x3FF) << 10) | (u1 & 0x3FF);
+            }
+            if (u <= 0x7F) {
+                if (outIdx >= endIdx)
+                    break;
+                HEAPU8[outIdx++] = u;
+            }
+            else if (u <= 0x7FF) {
+                if (outIdx + 1 >= endIdx)
+                    break;
+                HEAPU8[outIdx++] = 0xC0 | (u >> 6);
+                HEAPU8[outIdx++] = 0x80 | (u & 63);
+            }
+            else if (u <= 0xFFFF) {
+                if (outIdx + 2 >= endIdx)
+                    break;
+                HEAPU8[outIdx++] = 0xE0 | (u >> 12);
+                HEAPU8[outIdx++] = 0x80 | ((u >> 6) & 63);
+                HEAPU8[outIdx++] = 0x80 | (u & 63);
+            }
+            else {
+                if (outIdx + 3 >= endIdx)
+                    break;
+                HEAPU8[outIdx++] = 0xF0 | (u >> 18);
+                HEAPU8[outIdx++] = 0x80 | ((u >> 12) & 63);
+                HEAPU8[outIdx++] = 0x80 | ((u >> 6) & 63);
+                HEAPU8[outIdx++] = 0x80 | (u & 63);
+            }
+        }
+        HEAPU8[outIdx] = 0;
+        return outIdx - startIdx;
+    },
+    UTF16ToString: function (ptr, length) {
+        ptr >>>= 0;
+        if (!ptr || !length)
+            return '';
+        var end = ptr;
+        if (length === -1) {
+            var idx = end >> 1;
+            var HEAPU16 = new Uint16Array(wasmMemory.buffer);
+            while (HEAPU16[idx])
+                ++idx;
+            end = idx << 1;
+        }
+        else {
+            end = ptr + (length >>> 0) * 2;
+        }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        var HEAPU8 = new Uint8Array(wasmMemory.buffer);
+        return emnapiString.utf16Decoder.decode({{{ getUnsharedTextDecoderView('HEAPU8', 'ptr', 'end') }}});
+    },
+    stringToUTF16: function (str, outPtr, maxBytesToWrite) {
+        if (maxBytesToWrite === undefined) {
+            maxBytesToWrite = 0x7FFFFFFF;
+        }
+        if (maxBytesToWrite < 2)
+            return 0;
+        maxBytesToWrite -= 2;
+        var startPtr = outPtr;
+        var numCharsToWrite = (maxBytesToWrite < str.length * 2) ? (maxBytesToWrite / 2) : str.length;
+        for (var i = 0; i < numCharsToWrite; ++i) {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            var codeUnit = str.charCodeAt(i);
+            {{{ makeSetValue('outPtr', 0, 'codeUnit', 'i16') }}};
+            outPtr += 2;
+        }
+        {{{ makeSetValue('outPtr', 0, '0', 'i16') }}};
+        return outPtr - startPtr;
+    }
+};
+emnapiDefineVar('$emnapiString', emnapiString, [], 'emnapiString.init();');
+/* eslint-disable @typescript-eslint/indent */
 var emnapiTSFN = {
     offset: {
         /* napi_ref */ resource: 0,
@@ -2533,7 +2756,7 @@ var emnapiTSFN = {
     },
     initQueue: function (func) {
         var size = 2 * {{{ POINTER_SIZE }}};
-        var queue = {{{ makeMalloc('emnapiTSFN.initQueue', 'size') }}};
+        var queue = _malloc({{{ to64('size') }}});
         if (!queue)
             return false;
         new Uint8Array(wasmMemory.buffer, queue, size).fill(0);
@@ -2552,7 +2775,7 @@ var emnapiTSFN = {
         var tail = emnapiTSFN.loadSizeTypeValue(queue + {{{ POINTER_SIZE }}}, false);
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         var size = 2 * {{{ POINTER_SIZE }}};
-        var node = {{{ makeMalloc('emnapiTSFN.pushQueue', 'size') }}};
+        var node = _malloc({{{ to64('size') }}});
         if (!node)
             throw new Error('OOM');
         emnapiTSFN.storeSizeTypeValue(node, data, false);
@@ -3142,7 +3365,7 @@ function _napi_create_threadsafe_function(env, func, async_resource, async_resou
     var resource_name = envObject.ensureHandleId(asyncResourceName);
     // tsfn create
     var sizeofTSFN = emnapiTSFN.offset.end;
-    var tsfn = {{{ makeMalloc('napi_create_threadsafe_function', 'sizeofTSFN') }}};
+    var tsfn = _malloc({{{ to64('sizeofTSFN') }}});
     if (!tsfn)
         return envObject.setLastError(9 /* napi_status.napi_generic_failure */);
     new Uint8Array(wasmMemory.buffer).subarray(tsfn, tsfn + sizeofTSFN).fill(0);
@@ -3269,6 +3492,8 @@ function _napi_ref_threadsafe_function(env, func) {
 emnapiDefineVar('$emnapiTSFN', emnapiTSFN, [
     '$emnapiInit',
     '$PThread',
+    'malloc',
+    'free',
     '_emnapi_node_emit_async_init',
     '_emnapi_node_emit_async_destroy',
     '_emnapi_runtime_keepalive_pop',
@@ -3816,7 +4041,7 @@ function napi_define_class(env, utf8name, length, constructor, callback_data, pr
             {{{ from64("attributes") }}};
             var data_3 = {{{ makeGetValue("propPtr", POINTER_SIZE * 7, "*") }}};
             if (utf8Name_2) {
-                propertyName_2 = UTF8ToString(utf8Name_2);
+                propertyName_2 = emnapiString.UTF8ToString(utf8Name_2, -1);
             }
             else {
                 if (!name_3) {
@@ -4002,7 +4227,7 @@ function _napi_add_finalizer(env, js_object, finalize_data, finalize_cb, finaliz
     }
     return envObject.clearLastError();
 }
-emnapiImplement('napi_define_class', 'ipppppppp', napi_define_class, ['$emnapiCreateFunction', '$emnapiDefineProperty']);
+emnapiImplement('napi_define_class', 'ipppppppp', napi_define_class, ['$emnapiCreateFunction', '$emnapiDefineProperty', '$emnapiString']);
 emnapiImplement('napi_wrap', 'ipppppp', napi_wrap, ['$emnapiWrap']);
 emnapiImplement('napi_unwrap', 'ippp', napi_unwrap, ['$emnapiUnwrap']);
 emnapiImplement('napi_remove_wrap', 'ippp', napi_remove_wrap, ['$emnapiUnwrap']);
@@ -4531,12 +4756,12 @@ function napi_get_value_string_utf8(env, value, buf, buf_size, result) {
         if (!result)
             return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        var strLength = lengthBytesUTF8(handle.value);
+        var strLength = emnapiString.lengthBytesUTF8(handle.value);
         {{{ makeSetValue('result', 0, 'strLength', SIZE_TYPE) }}};
     }
     else if (buf_size !== 0) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        var copied = stringToUTF8(handle.value, buf, buf_size);
+        var copied = emnapiString.stringToUTF8(handle.value, buf, buf_size);
         if (result) {
             {{{ makeSetValue('result', 0, 'copied', SIZE_TYPE) }}};
         }
@@ -4567,7 +4792,7 @@ function napi_get_value_string_utf16(env, value, buf, buf_size, result) {
     }
     else if (buf_size !== 0) {
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        var copied = stringToUTF16(handle.value, buf, buf_size * 2);
+        var copied = emnapiString.stringToUTF16(handle.value, buf, buf_size * 2);
         if (result) {
             {{{ makeSetValue('result', 0, 'copied / 2', SIZE_TYPE) }}};
         }
@@ -4609,12 +4834,8 @@ emnapiImplement('napi_get_value_external', 'ippp', napi_get_value_external);
 emnapiImplement('napi_get_value_int32', 'ippp', napi_get_value_int32);
 emnapiImplement('napi_get_value_int64', 'ippp', napi_get_value_int64);
 emnapiImplement('napi_get_value_string_latin1', 'ippppp', napi_get_value_string_latin1);
-emnapiImplement('napi_get_value_string_utf8', 'ippppp', napi_get_value_string_utf8);
-#if typeof LEGACY_RUNTIME !== 'undefined' && !LEGACY_RUNTIME
-emnapiImplement('napi_get_value_string_utf16', 'ippppp', napi_get_value_string_utf16, ['$stringToUTF16']);
-#else
-emnapiImplement('napi_get_value_string_utf16', 'ippppp', napi_get_value_string_utf16);
-#endif
+emnapiImplement('napi_get_value_string_utf8', 'ippppp', napi_get_value_string_utf8, ['$emnapiString']);
+emnapiImplement('napi_get_value_string_utf16', 'ippppp', napi_get_value_string_utf16, ['$emnapiString']);
 emnapiImplement('napi_get_value_uint32', 'ippp', napi_get_value_uint32);
 /* eslint-disable @typescript-eslint/indent */
 function napi_create_int32(env, value, result) {
@@ -4737,7 +4958,7 @@ function napi_create_string_utf16(env, str, length, result) {
     if (!(autoLength || (sizelength <= 2147483647))) {
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     }
-    var utf16String = emnapiUtf16ToString(str, length);
+    var utf16String = emnapiString.UTF16ToString(str, length);
     {{{ from64('result') }}};
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var value = emnapiCtx.addToCurrentScope(utf16String).id;
@@ -4761,7 +4982,7 @@ function napi_create_string_utf8(env, str, length, result) {
     if (!(autoLength || (sizelength <= 2147483647))) {
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     }
-    var utf8String = emnapiUtf8ToString(str, length);
+    var utf8String = emnapiString.UTF8ToString(str, length);
     {{{ from64('result') }}};
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var value = emnapiCtx.addToCurrentScope(utf8String).id;
@@ -4873,8 +5094,8 @@ emnapiImplement('napi_create_bigint_int64', 'ipjp', napi_create_bigint_int64);
 emnapiImplement('napi_create_bigint_uint64', 'ipjp', napi_create_bigint_uint64);
 emnapiImplement('napi_create_bigint_words', 'ipippp', napi_create_bigint_words);
 emnapiImplement('napi_create_string_latin1', 'ipppp', napi_create_string_latin1);
-emnapiImplement('napi_create_string_utf16', 'ipppp', napi_create_string_utf16, ['$emnapiUtf16ToString']);
-emnapiImplement('napi_create_string_utf8', 'ipppp', napi_create_string_utf8, ['$emnapiUtf8ToString']);
+emnapiImplement('napi_create_string_utf16', 'ipppp', napi_create_string_utf16, ['$emnapiString']);
+emnapiImplement('napi_create_string_utf8', 'ipppp', napi_create_string_utf8, ['$emnapiString']);
 function napi_create_array(env, result) {
     if (env == 0)
         return 1 /* napi_status.napi_invalid_arg */;
@@ -5214,8 +5435,11 @@ function napi_create_buffer(env, size, data, result
     try {
         if (result == 0)
             return envObject_56.setLastError(1 /* napi_status.napi_invalid_arg */);
-        {{{ from64("result") }}};
         var Buffer_1 = emnapiCtx.feature.Buffer;
+        if (!Buffer_1) {
+            throw emnapiCtx.createNotSupportBufferError("napi_create_buffer", "");
+        }
+        {{{ from64("result") }}};
         var buffer_2 = void 0;
         {{{ from64("size") }}};
         size = size >>> 0;
@@ -5225,7 +5449,7 @@ function napi_create_buffer(env, size, data, result
             {{{ makeSetValue("result", 0, "value", "*") }}};
         }
         else {
-            pointer = {{{ makeMalloc("napi_create_buffer", "size") }}};
+            pointer = _malloc({{{ to64("size") }}});
             if (!pointer)
                 throw new Error("Out of memory");
             new Uint8Array(wasmMemory.buffer).subarray(pointer, pointer + size).fill(0);
@@ -5268,8 +5492,8 @@ function napi_create_buffer_copy(env, length, data, result_data, result
     try {
         if (result == 0)
             return envObject_57.setLastError(1 /* napi_status.napi_invalid_arg */);
-        var arrayBuffer_3 = emnapiCreateArrayBuffer(length, result_data);
         var Buffer_2 = emnapiCtx.feature.Buffer;
+        var arrayBuffer_3 = emnapiCreateArrayBuffer(length, result_data);
         var buffer_4 = Buffer_2.from(arrayBuffer_3);
         {{{ from64("data") }}};
         {{{ from64("length") }}};
@@ -5362,7 +5586,7 @@ function node_api_symbol_for(env, utf8description, length, result) {
     if (!(autoLength || (sizelength <= 2147483647))) {
         return envObject.setLastError(1 /* napi_status.napi_invalid_arg */);
     }
-    var descriptionString = emnapiUtf8ToString(utf8description, length);
+    var descriptionString = emnapiString.UTF8ToString(utf8description, length);
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var value = emnapiCtx.addToCurrentScope(Symbol.for(descriptionString)).id;
     {{{ makeSetValue('result', 0, 'value', '*') }}};
@@ -5382,7 +5606,7 @@ emnapiImplement('napi_create_object', 'ipp', napi_create_object);
 emnapiImplement('napi_create_symbol', 'ippp', napi_create_symbol);
 emnapiImplement('napi_create_typedarray', 'ipipppp', napi_create_typedarray, ['$emnapiExternalMemory']);
 emnapiImplement('napi_create_dataview', 'ippppp', napi_create_dataview, ['$emnapiExternalMemory']);
-emnapiImplement('node_api_symbol_for', 'ipppp', node_api_symbol_for, ['$emnapiUtf8ToString']);
+emnapiImplement('node_api_symbol_for', 'ipppp', node_api_symbol_for, ['$emnapiString']);
 function napi_get_boolean(env, value, result) {
     if (env == 0)
         return 1 /* napi_status.napi_invalid_arg */;
@@ -5623,7 +5847,7 @@ function emnapi_get_module_property(env, utf8name, result) {
         {{{ from64("utf8name") }}};
         {{{ from64("result") }}};
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        value = envObject_60.ensureHandleId(Module[UTF8ToString(utf8name)]);
+        value = envObject_60.ensureHandleId(Module[emnapiString.UTF8ToString(utf8name, -1)]);
         {{{ makeSetValue("result", 0, "value", "*") }}};
         return envObject_60.getReturnStatus();
     }
@@ -5633,7 +5857,7 @@ function emnapi_get_module_property(env, utf8name, result) {
     }
 }
 emnapiImplement2('emnapi_get_module_object', 'ipp', emnapi_get_module_object);
-emnapiImplement2('emnapi_get_module_property', 'ippp', emnapi_get_module_property);
+emnapiImplement2('emnapi_get_module_property', 'ippp', emnapi_get_module_property, ['$emnapiString']);
 emnapiDefineVar('$emnapiCtx', undefined);
 emnapiDefineVar('$emnapiNodeBinding', undefined);
 emnapiDefineVar('$emnapiModule', {
@@ -5703,139 +5927,11 @@ function __emnapi_async_work_pool_size() {
 emnapiImplementInternal('_emnapi_async_work_pool_size', 'i', __emnapi_async_work_pool_size, ['$emnapiAsyncWorkPoolSize']);
 function __emnapi_get_filename(buf, len) {
     if (!buf) {
-        return lengthBytesUTF8(emnapiModule.filename);
+        return emnapiString.lengthBytesUTF8(emnapiModule.filename);
     }
-    return stringToUTF8(emnapiModule.filename, buf, len);
+    return emnapiString.stringToUTF8(emnapiModule.filename, buf, len);
 }
-emnapiImplementInternal('_emnapi_get_filename', 'ipi', __emnapi_get_filename);
-mergeInto(LibraryManager.library, {
-    $emnapiUtf8Decoder__postset: 'emnapiUtf8Decoder();',
-    $emnapiUtf8Decoder: function () {
-#if !TEXTDECODER || TEXTDECODER == 1
-        var fallbackDecoder = {
-            decode: function (input) {
-                var isArrayBuffer = input instanceof ArrayBuffer;
-                var isView = ArrayBuffer.isView(input);
-                if (!isArrayBuffer && !isView) {
-                    throw new TypeError('The "input" argument must be an instance of ArrayBuffer or ArrayBufferView');
-                }
-                var bytes = isArrayBuffer ? new Uint8Array(input) : new Uint8Array(input.buffer, input.byteOffset, input.byteLength);
-                var inputIndex = 0;
-                var pendingSize = Math.min(256 * 256, bytes.length + 1);
-                var pending = new Uint16Array(pendingSize);
-                var chunks = [];
-                var pendingIndex = 0;
-                for (;;) {
-                    var more = inputIndex < bytes.length;
-                    if (!more || (pendingIndex >= pendingSize - 1)) {
-                        var subarray = pending.subarray(0, pendingIndex);
-                        var arraylike = subarray;
-                        chunks.push(String.fromCharCode.apply(null, arraylike));
-                        if (!more) {
-                            return chunks.join('');
-                        }
-                        bytes = bytes.subarray(inputIndex);
-                        inputIndex = 0;
-                        pendingIndex = 0;
-                    }
-                    var byte1 = bytes[inputIndex++];
-                    if ((byte1 & 0x80) === 0) {
-                        pending[pendingIndex++] = byte1;
-                    }
-                    else if ((byte1 & 0xe0) === 0xc0) {
-                        var byte2 = bytes[inputIndex++] & 0x3f;
-                        pending[pendingIndex++] = ((byte1 & 0x1f) << 6) | byte2;
-                    }
-                    else if ((byte1 & 0xf0) === 0xe0) {
-                        var byte2 = bytes[inputIndex++] & 0x3f;
-                        var byte3 = bytes[inputIndex++] & 0x3f;
-                        pending[pendingIndex++] = ((byte1 & 0x1f) << 12) | (byte2 << 6) | byte3;
-                    }
-                    else if ((byte1 & 0xf8) === 0xf0) {
-                        var byte2 = bytes[inputIndex++] & 0x3f;
-                        var byte3 = bytes[inputIndex++] & 0x3f;
-                        var byte4 = bytes[inputIndex++] & 0x3f;
-                        var codepoint = ((byte1 & 0x07) << 0x12) | (byte2 << 0x0c) | (byte3 << 0x06) | byte4;
-                        if (codepoint > 0xffff) {
-                            codepoint -= 0x10000;
-                            pending[pendingIndex++] = (codepoint >>> 10) & 0x3ff | 0xd800;
-                            codepoint = 0xdc00 | codepoint & 0x3ff;
-                        }
-                        pending[pendingIndex++] = codepoint;
-                    }
-                    else {
-                    }
-                }
-            }
-        };
-#endif
-        var tmp; // typescript bug
-#if !TEXTDECODER
-        tmp = fallbackDecoder;
-#elif TEXTDECODER == 1
-        tmp = typeof TextDecoder === 'function' ? new TextDecoder() : fallbackDecoder;
-#elif TEXTDECODER == 2
-        tmp = new TextDecoder();
-#endif
-        emnapiUtf8Decoder = tmp;
-    },
-    $emnapiUtf8ToString__deps: ['$emnapiUtf8Decoder'],
-    $emnapiUtf8ToString: function (ptr, length) {
-        // eslint-disable-next-line eqeqeq
-        if (length == -1) {
-            return UTF8ToString(ptr);
-        }
-        length = length >>> 0;
-        if (!length)
-            return '';
-        return emnapiUtf8Decoder.decode({{{ getUnsharedTextDecoderView('HEAPU8', 'ptr', 'ptr + length') }}});
-    },
-    $emnapiUtf16leDecoder__postset: 'emnapiUtf16leDecoder();',
-    $emnapiUtf16leDecoder: function () {
-#if !TEXTDECODER || TEXTDECODER == 1
-        var fallbackDecoder = {
-            decode: function (input) {
-                var isArrayBuffer = input instanceof ArrayBuffer;
-                var isView = ArrayBuffer.isView(input);
-                if (!isArrayBuffer && !isView) {
-                    throw new TypeError('The "input" argument must be an instance of ArrayBuffer or ArrayBufferView');
-                }
-                var bytes = isArrayBuffer ? new Uint16Array(input) : new Uint16Array(input.buffer, input.byteOffset, input.byteLength / 2);
-                var wcharArray = Array(bytes.length);
-                for (var i = 0; i < bytes.length; ++i) {
-                    wcharArray[i] = String.fromCharCode(bytes[i]);
-                }
-                return wcharArray.join('');
-            }
-        };
-#endif
-        var tmp; // typescript bug
-#if !TEXTDECODER
-        tmp = fallbackDecoder;
-#elif TEXTDECODER == 1
-        tmp = typeof TextDecoder === 'function' ? new TextDecoder('utf-16le') : fallbackDecoder;
-#elif TEXTDECODER == 2
-        tmp = new TextDecoder('utf-16le');
-#endif
-        emnapiUtf16leDecoder = tmp;
-    },
-    $emnapiUtf16ToString__deps: [
-#if typeof LEGACY_RUNTIME !== 'undefined' && !LEGACY_RUNTIME
-        '$UTF16ToString',
-#endif
-        '$emnapiUtf16leDecoder'
-    ],
-    $emnapiUtf16ToString: function (ptr, length) {
-        // eslint-disable-next-line eqeqeq
-        if (length == -1) {
-            return UTF16ToString(ptr);
-        }
-        length = length >>> 0;
-        if (!length)
-            return '';
-        return emnapiUtf16leDecoder.decode({{{ getUnsharedTextDecoderView('HEAPU8', 'ptr', 'ptr + length * 2') }}});
-    }
-});
+emnapiImplementInternal('_emnapi_get_filename', 'ipi', __emnapi_get_filename, ['$emnapiString']);
 /* eslint-disable @typescript-eslint/no-unused-vars */
 function emnapiImplement(name, sig, compilerTimeFunction, deps) {
     var _a;