Skip to content

Commit ddd10b0

Browse files
committed
use jsg::Lock methods more
1 parent 554d5f2 commit ddd10b0

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

src/workerd/api/capnp.c++

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ struct JsCapnpConverter {
384384
return js.withinHandleScope([&]() -> v8::Local<v8::Value> {
385385
switch (value.getType()) {
386386
case capnp::DynamicValue::UNKNOWN:
387-
return js.v8Undefined();
387+
return js.undefined();
388388
case capnp::DynamicValue::VOID:
389-
return js.v8Null();
389+
return js.null();
390390
case capnp::DynamicValue::BOOL:
391-
return v8::Boolean::New(js.v8Isolate, value.as<bool>());
391+
return js.boolean(value.as<bool>());
392392
case capnp::DynamicValue::INT: {
393393
if (type.which() == capnp::schema::Type::INT64 ||
394394
type.which() == capnp::schema::Type::UINT64) {
@@ -466,7 +466,7 @@ struct JsCapnpConverter {
466466
return wrapper.wrapCap(js, js.v8Context(), value.as<capnp::DynamicCapability>());
467467
}
468468
case capnp::DynamicValue::ANY_POINTER:
469-
return js.v8Null();
469+
return js.null();
470470
}
471471

472472
KJ_FAIL_ASSERT("Unimplemented DynamicValue type.");

src/workerd/api/http.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ class Request final: public Body {
946946
// the response. There are currently a proposal to add a "full" option which is the model
947947
// we support. Once "full" is added, we need to update this to accept either undefined or
948948
// "full", and possibly decide if we want to support the "half" option.
949-
// jsg::JsValue getDuplex(jsg::Lock& js) { return js.v8Undefined(); }
949+
// jsg::JsValue getDuplex(jsg::Lock& js) { return js.undefined(); }
950950
// TODO(conform): Might implement?
951951

952952
// These relate to CORS support, which we do not implement. WinterTC has determined that

src/workerd/api/node/async-hooks.c++

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ v8::Local<v8::Value> AsyncLocalStorage::exit(jsg::Lock& js,
7171
// implementing the enterWith/disable methods. We can emulate the correct
7272
// behavior simply by calling run with the store value set to undefined, which
7373
// will propagate correctly.
74-
return run(js, js.v8Undefined(), kj::mv(callback), kj::mv(args));
74+
return run(js, js.undefined(), kj::mv(callback), kj::mv(args));
7575
}
7676

7777
v8::Local<v8::Value> AsyncLocalStorage::getStore(jsg::Lock& js) {
@@ -83,7 +83,7 @@ v8::Local<v8::Value> AsyncLocalStorage::getStore(jsg::Lock& js) {
8383
KJ_IF_SOME(value, defaultValue) {
8484
return value.getHandle(js);
8585
}
86-
return js.v8Undefined();
86+
return js.undefined();
8787
}
8888

8989
kj::StringPtr AsyncLocalStorage::getName() {

src/workerd/api/streams/standard.c++

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1925,7 +1925,7 @@ void ReadableStreamDefaultController::close(jsg::Lock& js) {
19251925

19261926
void ReadableStreamDefaultController::enqueue(
19271927
jsg::Lock& js, jsg::Optional<v8::Local<v8::Value>> chunk) {
1928-
auto value = chunk.orDefault(js.v8Undefined());
1928+
auto value = chunk.orDefault(js.undefined());
19291929

19301930
JSG_REQUIRE(impl.canCloseOrEnqueue(), TypeError, "Unable to enqueue");
19311931

@@ -2138,7 +2138,7 @@ jsg::Promise<void> ReadableByteStreamController::cancel(
21382138
byobRequest->invalidate(js);
21392139
}
21402140
}
2141-
return impl.cancel(js, JSG_THIS, maybeReason.orDefault(js.v8Undefined()));
2141+
return impl.cancel(js, JSG_THIS, maybeReason.orDefault(js.undefined()));
21422142
}
21432143

21442144
void ReadableByteStreamController::close(jsg::Lock& js) {
@@ -3193,7 +3193,7 @@ jsg::Promise<void> WritableStreamDefaultController::close(jsg::Lock& js) {
31933193

31943194
void WritableStreamDefaultController::error(
31953195
jsg::Lock& js, jsg::Optional<v8::Local<v8::Value>> reason) {
3196-
impl.error(js, JSG_THIS, reason.orDefault(js.v8Undefined()));
3196+
impl.error(js, JSG_THIS, reason.orDefault(js.undefined()));
31973197
}
31983198

31993199
ssize_t WritableStreamDefaultController::getDesiredSize() {
@@ -3277,7 +3277,7 @@ jsg::Promise<void> WritableStreamJsController::abort(
32773277
return KJ_ASSERT_NONNULL(maybeAbortPromise).whenResolved(js);
32783278
}
32793279
KJ_CASE_ONEOF(controller, Controller) {
3280-
maybeAbortPromise = controller->abort(js, reason.orDefault(js.v8Undefined()));
3280+
maybeAbortPromise = controller->abort(js, reason.orDefault(js.undefined()));
32813281
return KJ_ASSERT_NONNULL(maybeAbortPromise).whenResolved(js);
32823282
}
32833283
}
@@ -3632,7 +3632,7 @@ jsg::Promise<void> WritableStreamJsController::write(
36323632
return js.rejectedPromise<void>(errored.addRef(js));
36333633
}
36343634
KJ_CASE_ONEOF(controller, Controller) {
3635-
return controller->write(js, value.orDefault([&] { return js.v8Undefined(); }));
3635+
return controller->write(js, value.orDefault([&] { return js.undefined(); }));
36363636
}
36373637
}
36383638
KJ_UNREACHABLE;

src/workerd/io/worker.c++

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2026,9 +2026,9 @@ void Worker::handleLog(jsg::Lock& js,
20262026
auto formatLog = formatLogVal.As<v8::Function>();
20272027

20282028
auto levelStr = logLevelToString(level);
2029-
args[length] = v8::Boolean::New(js.v8Isolate, colors);
2030-
args[length + 1] = v8::Boolean::New(js.v8Isolate, bool(loggingOptions.structuredLogging));
2031-
args[length + 2] = jsg::v8StrIntern(js.v8Isolate, levelStr);
2029+
args[length] = js.boolean(colors);
2030+
args[length + 1] = js.boolean(loggingOptions.structuredLogging.toBool());
2031+
args[length + 2] = js.strIntern(levelStr);
20322032
auto formatted = js.toString(
20332033
jsg::check(formatLog->Call(context, js.v8Undefined(), length + 3, args.data())));
20342034
fprintf(fd, "%s\n", formatted.cStr());

src/workerd/jsg/value.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ class OptionalWrapper {
556556
KJ_IF_SOME(p, ptr) {
557557
return static_cast<TypeWrapper*>(this)->wrap(js, context, creator, kj::fwd<U>(p));
558558
} else {
559-
return v8::Undefined(js.v8Isolate);
559+
return js.undefined();
560560
}
561561
}
562562

@@ -593,7 +593,7 @@ class LenientOptionalWrapper {
593593
KJ_IF_SOME(p, ptr) {
594594
return static_cast<TypeWrapper*>(this)->wrap(js, context, creator, kj::fwd<U>(p));
595595
} else {
596-
return v8::Undefined(js.v8Isolate);
596+
return js.undefined();
597597
}
598598
}
599599

@@ -641,7 +641,7 @@ class MaybeWrapper {
641641
KJ_IF_SOME(p, ptr) {
642642
return static_cast<TypeWrapper*>(this)->wrap(js, context, creator, kj::fwd<U>(p));
643643
} else {
644-
return v8::Null(js.v8Isolate);
644+
return js.null();
645645
}
646646
}
647647

@@ -718,7 +718,7 @@ class OneOfWrapper {
718718
kj::OneOf<U...> value) {
719719
v8::Local<v8::Value> result;
720720
if (!(wrapHelper<U>(js, context, creator, value, result) || ...)) {
721-
result = v8::Undefined(js.v8Isolate);
721+
result = js.undefined();
722722
}
723723
return result;
724724
}

0 commit comments

Comments
 (0)