diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2022-05-10 20:24:07 -0700 |
|---|---|---|
| committer | Jarred Sumner <jarred@jarredsumner.com>
| 2022-05-10 20:24:07 -0700 |
| commit | 08e40efe118f6245efde0ec4c98ad5e2dde7db14 (patch) | |
| tree | 06384cac8da728eb0327c0a18c1b53045e669cb8 /src/javascript/jsc/bindings/napi.cpp | |
| parent | 01a0aee1e8622b130b1742ab278dcfea312ae24d (diff) | |
| download | bun-08e40efe118f6245efde0ec4c98ad5e2dde7db14.tar.gz bun-08e40efe118f6245efde0ec4c98ad5e2dde7db14.tar.zst bun-08e40efe118f6245efde0ec4c98ad5e2dde7db14.zip | |
[napi] Fix string bug
Diffstat (limited to 'src/javascript/jsc/bindings/napi.cpp')
| -rw-r--r-- | src/javascript/jsc/bindings/napi.cpp | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/src/javascript/jsc/bindings/napi.cpp b/src/javascript/jsc/bindings/napi.cpp index 3335cde9e..ca208f23f 100644 --- a/src/javascript/jsc/bindings/napi.cpp +++ b/src/javascript/jsc/bindings/napi.cpp @@ -216,22 +216,22 @@ static void defineNapiProperty(Zig::GlobalObject* globalObject, JSC::JSObject* t if (property.method) { JSC::JSValue value; auto method = reinterpret_cast<Zig::FFIFunction>(property.method); - if (!dataPtr) { - JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create( - globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue { - JSC::MarkedArgumentBuffer values; - values.append(callFrame->thisValue()); - for (int i = 0; i < callFrame->argumentCount(); i++) { - values.append(callFrame->argument(i)); - } - return method(globalObject, callFrame); - }); - value = JSC::JSValue(func); - } else { - auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, nameStr, method); - function->dataPtr = dataPtr; - value = JSC::JSValue(function); - } + // if (!dataPtr) { + // JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create( + // globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue { + // JSC::MarkedArgumentBuffer values; + // values.append(callFrame->thisValue()); + // for (int i = 0; i < callFrame->argumentCount(); i++) { + // values.append(callFrame->argument(i)); + // } + // return method(globalObject, callFrame); + // }); + // value = JSC::JSValue(func); + // } else { + auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, nameStr, method); + function->dataPtr = dataPtr; + value = JSC::JSValue(function); + // } to->putDirect(vm, propertyName, value, getPropertyAttributes(property) | JSC::PropertyAttribute::Function); return; @@ -541,22 +541,22 @@ extern "C" napi_status napi_create_function(napi_env env, const char* utf8name, JSC::VM& vm = globalObject->vm(); auto name = WTF::String::fromUTF8(utf8name, length == NAPI_AUTO_LENGTH ? strlen(utf8name) : length).isolatedCopy(); auto method = reinterpret_cast<Zig::FFIFunction>(cb); - if (data) { - auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, name, method); - function->dataPtr = data; - *result = toNapi(JSC::JSValue(function)); - } else { - JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create( - globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue { - JSC::MarkedArgumentBuffer values; - values.append(callFrame->thisValue()); - for (int i = 0; i < callFrame->argumentCount(); i++) { - values.append(callFrame->argument(i)); - } - return method(globalObject, callFrame); - }); - *result = toNapi(JSC::JSValue(func)); - } + // if (data) { + auto function = Zig::JSFFIFunction::create(vm, globalObject, 1, name, method); + function->dataPtr = data; + *result = toNapi(JSC::JSValue(function)); + // } else { + // JSC::JSNativeStdFunction* func = JSC::JSNativeStdFunction::create( + // globalObject->vm(), globalObject, 1, String(), [method](JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame) -> JSC::EncodedJSValue { + // JSC::MarkedArgumentBuffer values; + // values.append(callFrame->thisValue()); + // for (int i = 0; i < callFrame->argumentCount(); i++) { + // values.append(callFrame->argument(i)); + // } + // return method(globalObject, callFrame); + // }); + // *result = toNapi(JSC::JSValue(func)); + // } // std::cout << "napi_create_function: " << utf8name << std::endl; |