Merged PR 151039: defer initialize custom external objects

defer initialize custom external objects

Author: MikeHolman

lib/Jsrt/ChakraCommon.h

@@ -765,6 +765,7 @@ typedef unsigned short uint16_t;
         JsValueRef hasTrap;
         JsValueRef getOwnPropertyDescriptorTrap;
         JsValueRef definePropertyTrap;
+        JsValueRef initializerTrap;
 
         explicit JsGetterSetterInterceptor(JsGetterSetterInterceptor * getterSetterInterceptor);
 

lib/Jsrt/JsrtExternalObject.h

@@ -66,6 +66,7 @@ class JsrtExternalObject : public Js::DynamicObject
     int GetInlineSlotSize() const;
     void* GetInlineSlots() const;
 
+    Field(bool) initialized = true;
 private:
     enum class SlotType {
         Inline,

lib/Runtime/Language/JavascriptOperators.cpp

@@ -1163,7 +1163,7 @@ using namespace Js;
             CustomExternalWrapperObject * wrapper = JavascriptOperators::TryFromVar<CustomExternalWrapperObject>(object);
             if (wrapper)
             {
-                JavascriptArray* wrapperResult = wrapper->PropertyKeysTrap(CustomExternalWrapperObject::KeysTrapKind::GetOwnPropertyNamesKind, scriptContext);
+                JavascriptArray* wrapperResult = wrapper->PropertyKeysTrap(CustomExternalWrapperObject::KeysTrapKind::GetOwnEnumerablePropertyNamesKind, scriptContext);
                 JavascriptArray* wrapperResultToReturn = scriptContext->GetLibrary()->CreateArray(0);
                 if (wrapperResult != nullptr)
                 {
@@ -1209,7 +1209,7 @@ using namespace Js;
             CustomExternalWrapperObject * wrapper = JavascriptOperators::TryFromVar<CustomExternalWrapperObject>(object);
             if (wrapper)
             {
-                return wrapper->PropertyKeysTrap(CustomExternalWrapperObject::KeysTrapKind::KeysKind, scriptContext);
+                return wrapper->PropertyKeysTrap(CustomExternalWrapperObject::KeysTrapKind::EnumerableKeysKind, scriptContext);
             }
         }