diff options
author | 2023-06-11 05:26:37 -0700 | |
---|---|---|
committer | 2023-06-11 05:26:37 -0700 | |
commit | ef65f3c305e989bd7d7fe6f0e73822bdbe0e91dd (patch) | |
tree | 208a5f55d885c95afe40366bbe7b0e6d4c5f7859 /src/bun.js/bindings/BunPlugin.cpp | |
parent | 02eafd5019150357012ebb7a39f1c264ba73599e (diff) | |
download | bun-ef65f3c305e989bd7d7fe6f0e73822bdbe0e91dd.tar.gz bun-ef65f3c305e989bd7d7fe6f0e73822bdbe0e91dd.tar.zst bun-ef65f3c305e989bd7d7fe6f0e73822bdbe0e91dd.zip |
Support using `WTF::StringImpl` from Zig (#3279)
* Fix `make headers`
* [JS parser] Fix bug with printing non-ascii import paths in ascii mode
* Introduce `bun.String`
* Add test for non-ascii imports & entry points
* Add comment
* Fix build issue
* Support HTTP server
* Make it print the same
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src/bun.js/bindings/BunPlugin.cpp')
-rw-r--r-- | src/bun.js/bindings/BunPlugin.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/bun.js/bindings/BunPlugin.cpp b/src/bun.js/bindings/BunPlugin.cpp index ea1963c08..ad4039336 100644 --- a/src/bun.js/bindings/BunPlugin.cpp +++ b/src/bun.js/bindings/BunPlugin.cpp @@ -366,15 +366,15 @@ JSFunction* BunPlugin::Group::find(JSC::JSGlobalObject* globalObject, String& pa return nullptr; } -EncodedJSValue BunPlugin::OnLoad::run(JSC::JSGlobalObject* globalObject, ZigString* namespaceString, ZigString* path) +EncodedJSValue BunPlugin::OnLoad::run(JSC::JSGlobalObject* globalObject, BunString* namespaceString, BunString* path) { - Group* groupPtr = this->group(namespaceString ? Zig::toString(*namespaceString) : String()); + Group* groupPtr = this->group(namespaceString ? Bun::toWTFString(*namespaceString) : String()); if (groupPtr == nullptr) { return JSValue::encode(jsUndefined()); } Group& group = *groupPtr; - auto pathString = Zig::toString(*path); + auto pathString = Bun::toWTFString(*path); JSC::JSFunction* function = group.find(globalObject, pathString); if (!function) { @@ -428,9 +428,9 @@ EncodedJSValue BunPlugin::OnLoad::run(JSC::JSGlobalObject* globalObject, ZigStri RELEASE_AND_RETURN(throwScope, JSValue::encode(result)); } -EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, ZigString* namespaceString, ZigString* path, ZigString* importer) +EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, BunString* namespaceString, BunString* path, BunString* importer) { - Group* groupPtr = this->group(namespaceString ? Zig::toString(*namespaceString) : String()); + Group* groupPtr = this->group(namespaceString ? Bun::toWTFString(*namespaceString) : String()); if (groupPtr == nullptr) { return JSValue::encode(jsUndefined()); } @@ -443,7 +443,7 @@ EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, ZigS auto& callbacks = group.callbacks; - WTF::String pathString = Zig::toString(*path); + WTF::String pathString = Bun::toWTFString(*path); for (size_t i = 0; i < filters.size(); i++) { if (!filters[i].get()->match(globalObject, pathString, 0)) { continue; @@ -461,10 +461,10 @@ EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, ZigS auto& builtinNames = clientData->builtinNames(); paramsObject->putDirect( vm, clientData->builtinNames().pathPublicName(), - Zig::toJSStringValue(*path, globalObject)); + Bun::toJS(globalObject, *path)); paramsObject->putDirect( vm, clientData->builtinNames().importerPublicName(), - Zig::toJSStringValue(*importer, globalObject)); + Bun::toJS(globalObject, *importer)); arguments.append(paramsObject); auto throwScope = DECLARE_THROW_SCOPE(vm); @@ -515,12 +515,12 @@ EncodedJSValue BunPlugin::OnResolve::run(JSC::JSGlobalObject* globalObject, ZigS } // namespace Zig -extern "C" JSC::EncodedJSValue Bun__runOnResolvePlugins(Zig::GlobalObject* globalObject, ZigString* namespaceString, ZigString* path, ZigString* from, BunPluginTarget target) +extern "C" JSC::EncodedJSValue Bun__runOnResolvePlugins(Zig::GlobalObject* globalObject, BunString* namespaceString, BunString* path, BunString* from, BunPluginTarget target) { return globalObject->onResolvePlugins[target].run(globalObject, namespaceString, path, from); } -extern "C" JSC::EncodedJSValue Bun__runOnLoadPlugins(Zig::GlobalObject* globalObject, ZigString* namespaceString, ZigString* path, BunPluginTarget target) +extern "C" JSC::EncodedJSValue Bun__runOnLoadPlugins(Zig::GlobalObject* globalObject, BunString* namespaceString, BunString* path, BunPluginTarget target) { return globalObject->onLoadPlugins[target].run(globalObject, namespaceString, path); } |