Merge pull request #68 from oven-sh/kai/inherited-property-names

Add method to get own property names plus inherited property names
oven-sh · Nov 9, 2024 · 3bc4abf · 3bc4abf
2 parents c402bba + 79430de
commit 3bc4abf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.cpp b/Source/JavaScriptCore/runtime/ObjectConstructor.cpp
@@ -1240,7 +1240,8 @@ static CachedPropertyNamesKind inferCachedPropertyNamesKind(PropertyNameMode pro
     RELEASE_ASSERT_NOT_REACHED();
 }
 
-JSArray* ownPropertyKeys(JSGlobalObject* globalObject, JSObject* object, PropertyNameMode propertyNameMode, DontEnumPropertiesMode dontEnumPropertiesMode)
+template <bool Inherit>
+static JSArray* getPropertyKeys(JSGlobalObject* globalObject, JSObject* object, PropertyNameMode propertyNameMode, DontEnumPropertiesMode dontEnumPropertiesMode)
 {
     VM& vm = globalObject->vm();
     auto scope = DECLARE_THROW_SCOPE(vm);
@@ -1262,7 +1263,11 @@ JSArray* ownPropertyKeys(JSGlobalObject* globalObject, JSObject* object, Propert
     }
 
     PropertyNameArray properties(vm, propertyNameMode, PrivateSymbolMode::Exclude);
-    object->methodTable()->getOwnPropertyNames(object, globalObject, properties, dontEnumPropertiesMode);
+    if constexpr (Inherit) {
+        object->getPropertyNames(globalObject, properties, dontEnumPropertiesMode);
+    } else {
+        object->methodTable()->getOwnPropertyNames(object, globalObject, properties, dontEnumPropertiesMode);
+    }
     RETURN_IF_EXCEPTION(scope, nullptr);
 
     size_t numProperties = properties.size();
@@ -1349,6 +1354,16 @@ JSArray* ownPropertyKeys(JSGlobalObject* globalObject, JSObject* object, Propert
     return keys;
 }
 
+JSArray* ownPropertyKeys(JSGlobalObject* globalObject, JSObject* object, PropertyNameMode propertyNameMode, DontEnumPropertiesMode dontEnumPropertiesMode)
+{
+    return getPropertyKeys<false>(globalObject, object, propertyNameMode, dontEnumPropertiesMode);
+}
+
+JSArray* allPropertyKeys(JSGlobalObject* globalObject, JSObject* object, PropertyNameMode propertyNameMode, DontEnumPropertiesMode dontEnumPropertiesMode)
+{
+    return getPropertyKeys<true>(globalObject, object, propertyNameMode, dontEnumPropertiesMode);
+}
+
 JSObject* constructObjectFromPropertyDescriptorSlow(JSGlobalObject* globalObject, const PropertyDescriptor& descriptor)
 {
     VM& vm = getVM(globalObject);

diff --git a/Source/JavaScriptCore/runtime/ObjectConstructor.h b/Source/JavaScriptCore/runtime/ObjectConstructor.h
@@ -160,6 +160,7 @@ JS_EXPORT_PRIVATE JSObject* objectConstructorSeal(JSGlobalObject*, JSObject*);
 JSValue objectConstructorGetOwnPropertyDescriptor(JSGlobalObject*, JSObject*, const Identifier&);
 JSValue objectConstructorGetOwnPropertyDescriptors(JSGlobalObject*, JSObject*);
 JSArray* ownPropertyKeys(JSGlobalObject*, JSObject*, PropertyNameMode, DontEnumPropertiesMode);
+JSArray* allPropertyKeys(JSGlobalObject*, JSObject*, PropertyNameMode, DontEnumPropertiesMode);
 bool toPropertyDescriptor(JSGlobalObject*, JSValue, PropertyDescriptor&);
 void objectAssignGeneric(JSGlobalObject*, VM&, JSObject* target, JSObject* source);
 JSValue objectValues(VM&, JSGlobalObject*, JSValue);