Allow Dictionary to be used as a base class to extend from within application javascript

Author: Jake Champion

c-dependencies/js-compute-runtime/js-compute-builtins.cpp

@@ -4996,21 +4996,6 @@ DictionaryHandle dictionary_handle(JSObject *obj) {
   return DictionaryHandle{static_cast<uint32_t>(val.toInt32())};
 }
 
-JSObject *create(JSContext *cx, const char *name, size_t name_len);
-
-bool constructor(JSContext *cx, unsigned argc, Value *vp) {
-  REQUEST_HANDLER_ONLY("The Dictionary builtin");
-  CTOR_HEADER("Dictionary", 1);
-
-  size_t name_len;
-  UniqueChars name = encode(cx, args[0], &name_len);
-  RootedObject dictionary(cx, create(cx, name.get(), name_len));
-  if (!dictionary)
-    return false;
-  args.rval().setObject(*dictionary);
-  return true;
-}
-
 const unsigned ctor_length = 1;
 
 bool check_receiver(JSContext *cx, HandleValue receiver, const char *method_name);
@@ -5046,20 +5031,25 @@ bool get(JSContext *cx, unsigned argc, Value *vp) {
 const JSFunctionSpec methods[] = {JS_FN("get", get, 1, JSPROP_ENUMERATE), JS_FS_END};
 
 const JSPropertySpec properties[] = {JS_PS_END};
-
+bool constructor(JSContext *cx, unsigned argc, Value *vp);
 CLASS_BOILERPLATE(Dictionary)
 
-JSObject *create(JSContext *cx, const char *name, size_t name_len) {
-  RootedObject dict(cx, JS_NewObjectWithGivenProto(cx, &class_, proto_obj));
-  if (!dict)
-    return nullptr;
-  DictionaryHandle dict_handle = {INVALID_HANDLE};
-  if (!HANDLE_RESULT(cx, xqd_dictionary_open(name, name_len, &dict_handle)))
-    return nullptr;
+bool constructor(JSContext *cx, unsigned argc, Value *vp) {
+  REQUEST_HANDLER_ONLY("The Dictionary builtin");
+  CTOR_HEADER("Dictionary", 1);
 
-  JS::SetReservedSlot(dict, Slots::Dictionary, JS::Int32Value((int)dict_handle.handle));
+  size_t name_len;
+  UniqueChars name = encode(cx, args[0], &name_len);
+  RootedObject dictionary(cx, JS_NewObjectForConstructor(cx, &class_, args));
+  DictionaryHandle dict_handle = {INVALID_HANDLE};
+  if (!HANDLE_RESULT(cx, xqd_dictionary_open(name.get(), name_len, &dict_handle)))
+    return false;
 
-  return dict;
+  JS::SetReservedSlot(dictionary, Slots::Dictionary, JS::Int32Value((int)dict_handle.handle));
+  if (!dictionary)
+    return false;
+  args.rval().setObject(*dictionary);
+  return true;
 }
 } // namespace Dictionary
 

integration-tests/js-compute/fixtures/extend-from-builtins/extend-from-builtins.ts

@@ -5,7 +5,7 @@ const builtins = [
     CompressionStream,
     // Request,
     // Response,
-    // Dictionary,
+    Dictionary,
     // Headers,
     // CacheOverride,
     // TextEncoder,