Skip to content

Commit

Permalink
jsg rtti: move implementation types to a separate enum
Browse files Browse the repository at this point in the history 
This is what clients actually need to know if this is a built-in
type or JS type.
  • Loading branch information
@mikea
mikea committed Oct 3, 2022
1 parent 6c613df commit 9edfb18
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 72 deletions.
15 changes: 9 additions & 6 deletions src/workerd/jsg/rtti-test.c++
View file
Expand Up @@ -102,16 +102,19 @@ KJ_TEST("generic types") {

KJ_TEST("builtins") {
KJ_EXPECT(tType<jsg::BufferSource>() == "(builtin = (type = jsgBufferSource))");
KJ_EXPECT(tType<jsg::Lock>() == "(builtin = (type = jsgLock))");
KJ_EXPECT(tType<jsg::Unimplemented>() == "(builtin = (type = jsgUnimplemented))");
KJ_EXPECT(tType<jsg::Varargs>() == "(builtin = (type = jsgVarargs))");
KJ_EXPECT(tType<v8::Uint8Array>() == "(builtin = (type = v8Uint8Array))");
KJ_EXPECT(tType<v8::ArrayBufferView>() == "(builtin = (type = v8ArrayBufferView))");
KJ_EXPECT(tType<v8::Isolate*>() == "(builtin = (type = v8Isolate))");
KJ_EXPECT(tType<v8::Function>() == "(builtin = (type = v8Function))");
KJ_EXPECT(tType<kj::Date>() == "(builtin = (type = kjDate))");
KJ_EXPECT(tType<MockConfig>() == "(builtin = (type = configuration))");
KJ_EXPECT(tType<jsg::TypeHandler<kj::Date>>() == "(builtin = (type = jsgTypeHandler))");
}

KJ_TEST("jsgImpl") {
KJ_EXPECT(tType<jsg::Lock>() == "(jsgImpl = (type = jsgLock))");
KJ_EXPECT(tType<jsg::Unimplemented>() == "(jsgImpl = (type = jsgUnimplemented))");
KJ_EXPECT(tType<jsg::Varargs>() == "(jsgImpl = (type = jsgVarargs))");
KJ_EXPECT(tType<v8::Isolate*>() == "(jsgImpl = (type = v8Isolate))");
KJ_EXPECT(tType<MockConfig>() == "(jsgImpl = (type = configuration))");
KJ_EXPECT(tType<jsg::TypeHandler<kj::Date>>() == "(jsgImpl = (type = jsgTypeHandler))");
}

KJ_TEST("functions") {
Expand Down
44 changes: 25 additions & 19 deletions src/workerd/jsg/rtti.capnp
View file
Expand Up @@ -56,6 +56,9 @@ struct Type {

function @14 :FunctionType;
# jsg::Function

jsgImpl @15 :JsgImplType;
# jsg implementation type
}
}

Expand Down Expand Up @@ -123,26 +126,8 @@ struct BuiltinType {
kjDate @3;
# kj::Date

jsgUnimplemented @4;
# jsg::Unimplemented

v8Isolate @5;
# v8::Isolate

jsgVarargs @6;
# jsg::Varargs;

v8Function @7;
v8Function @4;
# v8::Function

configuration @8;
# api meta configuration object

jsgLock @9;
# jsg::Lock

jsgTypeHandler @10;
# jsg::TypeHandler
}

type @0 :Type;
Expand All @@ -156,6 +141,27 @@ struct FunctionType {
args @1 :List(Type);
}

struct JsgImplType {
# one of the internal jsg types that are not exposed directly but handled specially

enum Type {
configuration @0;
# api meta configuration object

v8Isolate @1;

jsgLock @2;

jsgTypeHandler @3;

jsgUnimplemented @4;

jsgVarargs @5;
}

type @0 :Type;
}

struct Structure {
# A description of either JSG_RESOURCE or JSG_STRUCT

Expand Down
111 changes: 64 additions & 47 deletions src/workerd/jsg/rtti.h
View file
Expand Up @@ -98,7 +98,7 @@ struct TupleRttiBuilder {
private:
template<size_t...Indexes>
static inline void build(std::integer_sequence<size_t, Indexes...> seq,
capnp::List<Type>::Builder builder,
capnp::List<Type>::Builder builder,
Builder<Configuration>& rtti) {
((buildIndex<Indexes>(builder, rtti)), ...);
}
Expand Down Expand Up @@ -184,87 +184,87 @@ struct BuildRtti<Configuration, v8::Object> {

template<typename Configuration, typename T>
struct BuildRtti<Configuration, Ref<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, V8Ref<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, HashableV8Ref<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, v8::Local<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, v8::Global<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, jsg::MemoizedIdentity<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, jsg::Identified<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

// Generic Types

template<typename Configuration, typename T>
struct BuildRtti<Configuration, kj::Maybe<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initMaybe().initValue(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initMaybe().initValue(), rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, jsg::Optional<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initMaybe().initValue(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initMaybe().initValue(), rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, kj::Array<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initArray().initElement(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initArray().initElement(), rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, kj::ArrayPtr<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initArray().initElement(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initArray().initElement(), rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, jsg::Sequence<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initArray().initElement(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initArray().initElement(), rtti);
}
};

Expand All @@ -289,7 +289,7 @@ struct BuildRtti<Configuration, kj::OneOf<Variants...>> {

template<size_t...Indexes>
static inline void buildVariants(std::integer_sequence<size_t, Indexes...> seq,
capnp::List<Type>::Builder builder,
capnp::List<Type>::Builder builder,
Builder<Configuration>& rtti) {
((buildVariant<Indexes>(builder, rtti)), ...);
}
Expand All @@ -304,23 +304,23 @@ struct BuildRtti<Configuration, kj::OneOf<Variants...>> {

template<typename Configuration, typename T>
struct BuildRtti<Configuration, kj::Promise<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initPromise().initValue(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initPromise().initValue(), rtti);
}
};


template<typename Configuration, typename T>
struct BuildRtti<Configuration, jsg::Promise<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initPromise().initValue(), rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder.initPromise().initValue(), rtti);
}
};

template<typename Configuration>
struct BuildRtti<Configuration, v8::Promise> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
builder.initPromise().initValue().setUnknown();
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
builder.initPromise().initValue().setUnknown();
}
};

Expand All @@ -336,31 +336,48 @@ struct BuildRtti<Configuration, T> { \

#define FOR_EACH_BUILTIN_TYPE(F, ...) \
F(jsg::BufferSource, BuiltinType::Type::JSG_BUFFER_SOURCE) \
F(jsg::Lock, BuiltinType::Type::JSG_LOCK) \
F(jsg::Unimplemented, BuiltinType::Type::JSG_UNIMPLEMENTED) \
F(jsg::Varargs, BuiltinType::Type::JSG_VARARGS) \
F(kj::Date, BuiltinType::Type::KJ_DATE) \
F(v8::ArrayBufferView, BuiltinType::Type::V8_ARRAY_BUFFER_VIEW) \
F(v8::Function, BuiltinType::Type::V8_FUNCTION) \
F(v8::Isolate*, BuiltinType::Type::V8_ISOLATE) \
F(v8::Uint8Array, BuiltinType::Type::V8_UINT8_ARRAY)

FOR_EACH_BUILTIN_TYPE(DECLARE_BUILTIN_TYPE)

#undef FOR_EACH_BUILTIN_TYPE
#undef DECLARE_BUILTIN_TYPE

// Jsg implementation types

#define DECLARE_JSG_IMPL_TYPE(T, V) \
template<typename Configuration> \
struct BuildRtti<Configuration, T> { \
static void build(Type::Builder builder, Builder<Configuration>& rtti) { \
builder.initJsgImpl().setType(V); \
} \
};

#define FOR_EACH_JSG_IMPL_TYPE(F, ...) \
F(jsg::Lock, JsgImplType::Type::JSG_LOCK) \
F(jsg::Unimplemented, JsgImplType::Type::JSG_UNIMPLEMENTED) \
F(jsg::Varargs, JsgImplType::Type::JSG_VARARGS) \
F(v8::Isolate*, JsgImplType::Type::V8_ISOLATE)

FOR_EACH_JSG_IMPL_TYPE(DECLARE_JSG_IMPL_TYPE)

#undef FOR_EACH_JSG_IMPL_TYPE
#undef DECLARE_JSG_IMPL_TYPE

template<typename Configuration>
struct BuildRtti<Configuration, Configuration> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
builder.initBuiltin().setType(BuiltinType::Type::CONFIGURATION);
builder.initJsgImpl().setType(JsgImplType::Type::CONFIGURATION);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, jsg::TypeHandler<T>> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
builder.initBuiltin().setType(BuiltinType::Type::JSG_TYPE_HANDLER);
builder.initJsgImpl().setType(JsgImplType::Type::JSG_TYPE_HANDLER);
}
};

Expand All @@ -382,29 +399,29 @@ struct BuildRtti<Configuration, jsg::Function<Fn>> {

template<typename Configuration, typename T>
struct BuildRtti<Configuration, const T> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, T&> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, T&&> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

template<typename Configuration, typename T>
struct BuildRtti<Configuration, const T&> {
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
static void build(Type::Builder builder, Builder<Configuration>& rtti) {
BuildRtti<Configuration, T>::build(builder, rtti);
}
};

Expand Down Expand Up @@ -439,7 +456,7 @@ struct MemberCounter {

template<const char* name, typename Getter, Getter getter, typename Setter, Setter setter>
inline void registerPrototypeProperty() { ++count; }

template<const char* name, typename Getter, Getter getter>
inline void registerReadonlyInstanceProperty() { ++count; }

Expand Down

0 comments on commit 9edfb18

Please sign in to comment.