Version 5.5.5: Enhanced ScriptObject to simplify script object access without "dynamic"; added IWindowsScriptObject (GitHub Issue microsoft#97); improved property accessor scriptability (GitHub Issue microsoft#88); updated API documentation. Tested with V8 7.2.502.25.

Author: ClearScriptLib

ClearScript.NoV8.sln.DotSettings

@@ -47,6 +47,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

ClearScript.sln.DotSettings

@@ -47,6 +47,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>

ClearScript/ClearScript.csproj

@@ -141,6 +141,7 @@
     <Compile Include="V8\V8RuntimeFlags.cs" />
     <Compile Include="V8\V8TestProxy.cs" />
     <Compile Include="Windows\IHostWindow.cs" />
+    <Compile Include="Windows\IWindowsScriptObject.cs" />
     <Compile Include="Windows\WindowsScriptEngineFlags.cs" />
     <Compile Include="Util\IDynamic.cs" />
     <Compile Include="Util\SpecialMemberNames.cs" />

ClearScript/Exports/VersionSymbols.h

@@ -5,5 +5,5 @@
 
 #pragma once
 
-#define CLEARSCRIPT_VERSION_STRING "5.5.4.0"
-#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,5,4,0
+#define CLEARSCRIPT_VERSION_STRING "5.5.5.0"
+#define CLEARSCRIPT_VERSION_COMMA_SEPARATED 5,5,5,0

ClearScript/HostItem.cs

@@ -968,7 +968,7 @@ private object InvokeDynamicMember(string name, BindingFlags invokeFlags, object
             {
                 if (name == SpecialMemberNames.Default)
                 {
-                    return TargetDynamic.Invoke(args, true);
+                    return TargetDynamic.Invoke(true, args);
                 }
 
                 throw new InvalidOperationException("Invalid constructor invocation");
@@ -980,7 +980,7 @@ private object InvokeDynamicMember(string name, BindingFlags invokeFlags, object
                 {
                     try
                     {
-                        return TargetDynamic.Invoke(args, false);
+                        return TargetDynamic.Invoke(false, args);
                     }
                     catch (Exception)
                     {
@@ -1302,7 +1302,7 @@ private object InvokeHostMember(string name, BindingFlags invokeFlags, object[]
                             var enumerableHelpersHostItem = Wrap(engine, EnumerableHelpers.HostType, HostItemFlags.PrivateAccess);
                             try
                             {
-                                return ((IDynamic)enumerableHelpersHostItem).InvokeMethod("GetEnumerator", new object[] { this });
+                                return ((IDynamic)enumerableHelpersHostItem).InvokeMethod("GetEnumerator", this);
                             }
                             catch (MissingMemberException)
                             {
@@ -1542,7 +1542,7 @@ private object GetHostProperty(PropertyInfo property, BindingFlags invokeFlags,
             }
 
             var getMethod = property.GetMethod;
-            if ((getMethod == null) || !getMethod.IsAccessible(accessContext) || getMethod.IsBlockedFromScript(defaultAccess))
+            if ((getMethod == null) || !getMethod.IsAccessible(accessContext) || getMethod.IsBlockedFromScript(defaultAccess, false))
             {
                 throw new UnauthorizedAccessException("Property get method is unavailable or inaccessible");
             }
@@ -1655,7 +1655,7 @@ private object SetHostProperty(PropertyInfo property, BindingFlags invokeFlags,
             }
 
             var setMethod = property.SetMethod;
-            if ((setMethod == null) || !setMethod.IsAccessible(accessContext) || setMethod.IsBlockedFromScript(defaultAccess))
+            if ((setMethod == null) || !setMethod.IsAccessible(accessContext) || setMethod.IsBlockedFromScript(defaultAccess, false))
             {
                 throw new UnauthorizedAccessException("Property set method is unavailable or inaccessible");
             }
@@ -1697,7 +1697,7 @@ public override string ToString()
 
         public override bool TryCreateInstance(CreateInstanceBinder binder, object[] args, out object result)
         {
-            result = ThisDynamic.Invoke(args, true).ToDynamicResult(engine);
+            result = ThisDynamic.Invoke(true, args).ToDynamicResult(engine);
             return true;
         }
 
@@ -1709,7 +1709,7 @@ public override bool TryGetMember(GetMemberBinder binder, out object result)
 
         public override bool TrySetMember(SetMemberBinder binder, object value)
         {
-            ThisDynamic.SetProperty(binder.Name, new[] { value });
+            ThisDynamic.SetProperty(binder.Name, value);
             return true;
         }
 
@@ -1730,7 +1730,7 @@ public override bool TryGetIndex(GetIndexBinder binder, object[] indices, out ob
 
             if (indices.Length > 1)
             {
-                result = ThisDynamic.GetProperty(SpecialMemberNames.Default, indices);
+                result = ThisDynamic.GetProperty(SpecialMemberNames.Default, indices).ToDynamicResult(engine);
                 return true;
             }
 
@@ -1748,7 +1748,7 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indices, object
                     return true;
                 }
 
-                ThisDynamic.SetProperty(indices[0].ToString(), new[] { value });
+                ThisDynamic.SetProperty(indices[0].ToString(), value);
                 return true;
             }
 
@@ -1762,7 +1762,7 @@ public override bool TrySetIndex(SetIndexBinder binder, object[] indices, object
 
         public override bool TryInvoke(InvokeBinder binder, object[] args, out object result)
         {
-            result = ThisDynamic.Invoke(args, false).ToDynamicResult(engine);
+            result = ThisDynamic.Invoke(false, args).ToDynamicResult(engine);
             return true;
         }
 
@@ -1930,12 +1930,12 @@ Type IReflect.UnderlyingSystemType
 
         #region IDynamic implementation
 
-        object IDynamic.GetProperty(string name, object[] args)
+        object IDynamic.GetProperty(string name, params object[] args)
         {
             return InvokeReflectMember(name, BindingFlags.GetProperty, args, CultureInfo.InvariantCulture, null);
         }
 
-        object IDynamic.GetProperty(string name, object[] args, out bool isCacheable)
+        object IDynamic.GetProperty(string name, out bool isCacheable, params object[] args)
         {
             return InvokeReflectMember(name, BindingFlags.GetProperty, args, CultureInfo.InvariantCulture, null, out isCacheable);
         }
@@ -2011,7 +2011,7 @@ object IDynamic.GetProperty(int index)
 
         void IDynamic.SetProperty(int index, object value)
         {
-            ThisDynamic.SetProperty(index.ToString(CultureInfo.InvariantCulture), new[] { value });
+            ThisDynamic.SetProperty(index.ToString(CultureInfo.InvariantCulture), value);
         }
 
         bool IDynamic.DeleteProperty(int index)
@@ -2064,12 +2064,12 @@ int[] IDynamic.GetPropertyIndices()
             });
         }
 
-        object IDynamic.Invoke(object[] args, bool asConstructor)
+        object IDynamic.Invoke(bool asConstructor, params object[] args)
         {
             return ThisReflect.InvokeMember(SpecialMemberNames.Default, asConstructor ? BindingFlags.CreateInstance : ((args.Length < 1) ? BindingFlags.InvokeMethod : BindingFlags.InvokeMethod | BindingFlags.GetProperty), null, ThisReflect, args, null, CultureInfo.InvariantCulture, null);
         }
 
-        object IDynamic.InvokeMethod(string name, object[] args)
+        object IDynamic.InvokeMethod(string name, params object[] args)
         {
             return ThisReflect.InvokeMember(name, BindingFlags.InvokeMethod, null, ThisReflect, args, null, CultureInfo.InvariantCulture, null);
         }

ClearScript/Properties/AssemblyInfo.cs

@@ -17,13 +17,13 @@
 [assembly: InternalsVisibleTo("ClearScriptTest")]
 
 [assembly: ComVisible(false)]
-[assembly: AssemblyVersion("5.5.4.0")]
-[assembly: AssemblyFileVersion("5.5.4.0")]
+[assembly: AssemblyVersion("5.5.5.0")]
+[assembly: AssemblyFileVersion("5.5.5.0")]
 
 namespace Microsoft.ClearScript.Properties
 {
     internal static class ClearScriptVersion
     {
-        public const string Value = "5.5.4.0";
+        public const string Value = "5.5.5.0";
     }
 }

ClearScript/PropertyBag.cs

@@ -161,16 +161,20 @@ private void NotifyExposedToScriptCode(object value)
 
         #endregion
 
-        #region IEnumerable<KeyValuePair<string, object>> implementation
+        #region IEnumerable implementation
 
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Justification = "This member requires explicit implementation to resolve ambiguity.")]
-        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
+        IEnumerator IEnumerable.GetEnumerator()
         {
             return dictionary.GetEnumerator();
         }
 
+        #endregion
+
+        #region IEnumerable<KeyValuePair<string, object>> implementation
+
         [SuppressMessage("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes", Justification = "This member requires explicit implementation to resolve ambiguity.")]
-        IEnumerator IEnumerable.GetEnumerator()
+        IEnumerator<KeyValuePair<string, object>> IEnumerable<KeyValuePair<string, object>>.GetEnumerator()
         {
             return dictionary.GetEnumerator();
         }

ClearScript/ScriptItem.cs

@@ -143,6 +143,32 @@ private DynamicMetaObject PostProcessBindResult(DynamicMetaObject result)
             return new DynamicMetaObject(Expression.TryCatchFinally(result.Expression, Expression.Call(clearLastScriptErrorMethod), Expression.Catch(typeof(Exception), catchBody)), result.Restrictions);
         }
 
+        #region ScriptObject overrides
+
+        public override IEnumerable<string> PropertyNames
+        {
+            get { return GetPropertyNames(); }
+        }
+
+        public override IEnumerable<int> PropertyIndices
+        {
+            get { return GetPropertyIndices(); }
+        }
+
+        public new object this[string name, params object[] args]
+        {
+            get { return GetProperty(name, args).ToDynamicResult(Engine); }
+            set { SetProperty(name, args.Concat(new[] { value }).ToArray()); }
+        }
+
+        public new object this[int index]
+        {
+            get { return GetProperty(index).ToDynamicResult(Engine); }
+            set { SetProperty(index, value); }
+        }
+
+        #endregion
+
         #region DynamicObject overrides
 
         public override DynamicMetaObject GetMetaObject(Expression param)
@@ -263,7 +289,7 @@ public object InvokeMember(string name, BindingFlags invokeFlags, Binder binder,
             {
                 if (name == SpecialMemberNames.Default)
                 {
-                    return Invoke(args, false);
+                    return Invoke(false, args);
                 }
 
                 return InvokeMethod(name, args);
@@ -336,7 +362,7 @@ public void RemoveMember(MemberInfo member)
 
         #region IDynamic implementation
 
-        public object GetProperty(string name, object[] args, out bool isCacheable)
+        public object GetProperty(string name, out bool isCacheable, params object[] args)
         {
             isCacheable = false;
             return GetProperty(name, args);
@@ -346,16 +372,8 @@ public object GetProperty(string name, object[] args, out bool isCacheable)
 
         #region IDynamic implementation (abstract)
 
-        public abstract object GetProperty(string name, object[] args);
-        public abstract void SetProperty(string name, object[] args);
-        public abstract bool DeleteProperty(string name);
         public abstract string[] GetPropertyNames();
-        public abstract object GetProperty(int index);
-        public abstract void SetProperty(int index, object value);
-        public abstract bool DeleteProperty(int index);
         public abstract int[] GetPropertyIndices();
-        public abstract object Invoke(object[] args, bool asConstructor);
-        public abstract object InvokeMethod(string name, object[] args);
 
         #endregion
 

ClearScript/ScriptObject.cs

@@ -1,15 +1,12 @@
-using System.Dynamic;
+using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
 
 namespace Microsoft.ClearScript
 {
     /// <summary>
     /// Represents a script object.
     /// </summary>
-    /// <remarks>
-    /// Use this class in conjunction with C#'s
-    /// <c><see href="https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/keywords/is">is</see></c>
-    /// operator to identify script objects.
-    /// </remarks>
     /// <seealso cref="ScriptEngine.Evaluate(string, bool, string)"/>
     public abstract class ScriptObject : DynamicObject
     {
@@ -21,5 +18,101 @@ internal ScriptObject()
         /// Gets the script engine that owns the object.
         /// </summary>
         public abstract ScriptEngine Engine { get; }
+
+        /// <summary>
+        /// Gets the value of a named script object property.
+        /// </summary>
+        /// <param name="name">The name of the property to get.</param>
+        /// <param name="args">Optional arguments for property retrieval.</param>
+        /// <returns>The value of the specified property.</returns>
+        public abstract object GetProperty(string name, params object[] args);
+
+        /// <summary>
+        /// Sets the value of a named script object property.
+        /// </summary>
+        /// <param name="name">The name of the property to set.</param>
+        /// <param name="args">An array containing optional arguments and the new property value.</param>
+        /// <remarks>
+        /// The <paramref name="args"></paramref> array must contain at least one element. The new
+        /// property value must be the last element of the array.
+        /// </remarks>
+        public abstract void SetProperty(string name, params object[] args);
+
+        /// <summary>
+        /// Removes a named script object property.
+        /// </summary>
+        /// <param name="name">The name of the property to remove.</param>
+        /// <returns><c>True</c> if the property was removed successfully, <c>false</c> otherwise.</returns>
+        public abstract bool DeleteProperty(string name);
+
+        /// <summary>
+        /// Enumerates the script object's property names.
+        /// </summary>
+        public abstract IEnumerable<string> PropertyNames { get; }
+
+        /// <summary>
+        /// Gets or sets the value of a named script object property.
+        /// </summary>
+        /// <param name="name">The name of the property to get or set.</param>
+        /// <param name="args">Optional arguments for property access.</param>
+        /// <returns>The value of the specified property.</returns>
+        public object this[string name, params object[] args]
+        {
+            get { return GetProperty(name, args); }
+            set { SetProperty(name, args.Concat(new[] { value }).ToArray()); }
+        }
+
+        /// <summary>
+        /// Gets the value of an indexed script object property.
+        /// </summary>
+        /// <param name="index">The index of the property to get.</param>
+        /// <returns>The value of the specified property.</returns>
+        public abstract object GetProperty(int index);
+
+        /// <summary>
+        /// Sets the value of an indexed script object property.
+        /// </summary>
+        /// <param name="index">The index of the property to set.</param>
+        /// <param name="value">The new property value.</param>
+        public abstract void SetProperty(int index, object value);
+
+        /// <summary>
+        /// Removes an indexed script object property.
+        /// </summary>
+        /// <param name="index">The index of the property to remove.</param>
+        /// <returns><c>True</c> if the property was removed successfully, <c>false</c> otherwise.</returns>
+        public abstract bool DeleteProperty(int index);
+
+        /// <summary>
+        /// Enumerates the script object's property indices.
+        /// </summary>
+        public abstract IEnumerable<int> PropertyIndices { get; }
+
+        /// <summary>
+        /// Gets or sets the value of an indexed script object property.
+        /// </summary>
+        /// <param name="index">The index of the property to get or set.</param>
+        /// <returns>The value of the specified property.</returns>
+        public object this[int index]
+        {
+            get { return GetProperty(index); }
+            set { SetProperty(index, value); }
+        }
+
+        /// <summary>
+        /// Invokes the script object.
+        /// </summary>
+        /// <param name="asConstructor"><c>True</c> to invoke the object as a constructor, <c>false</c> otherwise.</param>
+        /// <param name="args">Optional arguments for object invocation.</param>
+        /// <returns>The invocation result value.</returns>
+        public abstract object Invoke(bool asConstructor, params object[] args);
+
+        /// <summary>
+        /// Invokes a script object method.
+        /// </summary>
+        /// <param name="name">The name of the method to invoke.</param>
+        /// <param name="args">Optional arguments for method invocation.</param>
+        /// <returns>The invocation result value.</returns>
+        public abstract object InvokeMethod(string name, params object[] args);
     }
 }