Skip to content

Fix Issue in Select-Object where Hashtable members (e.g., Keys) cannot be used with -Property or -ExpandProperty #11097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daxian-dbw merged 11 commits into from
Jun 19, 2020
Merged

Fix Issue in Select-Object where Hashtable members (e.g., Keys) cannot be used with -Property or -ExpandProperty #11097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
afa6c9a
:sparkles: Allow referencing hashtable members
vexx32 Nov 18, 2019
d406d2e
:art: Whitespace fixes
vexx32 Nov 18, 2019
2e7dd02
:white_check_mark: Add new tests
vexx32 Nov 18, 2019
41ce650
:bug: Fix remaining bugs
vexx32 Nov 18, 2019
989bde8
:white_check_mark: add missing CI tag
vexx32 Nov 18, 2019
532c83e
:white_check_mark: Fix test that was broken
vexx32 Nov 18, 2019
74e066c
:recycle: Address @daxian-dbw review comments
vexx32 Jun 11, 2020
cfea794
:recycle: un-break test file
vexx32 Jun 11, 2020
f7845eb
:white_check_mark: Resolve test issues
vexx32 Jun 12, 2020
3d83000
:recycle: Address review comments
vexx32 Jun 16, 2020
f0802de
:white_check_mark: Restore mangled tests
vexx32 Jun 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 40 additions & 23 deletions src/System.Management.Automation/FormatAndOutput/common/Utilities/Mshexpression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Management.Automation.Language;
Expand Down Expand Up @@ -159,27 +160,43 @@ public List<PSPropertyExpression> ResolveNames(PSObject target, bool expand)

// If the object passed in is a hashtable, then turn it into a PSCustomObject so
// that property expressions can work on it.
target = IfHashtableWrapAsPSCustomObject(target);
var wrappedTarget = IfHashtableWrapAsPSCustomObject(target, out bool wasHashtable);

// we have a string value
IEnumerable<PSMemberInfo> members = null;
IEnumerable<PSMemberInfo> members;
if (HasWildCardCharacters)
{
// get the members first: this will expand the globbing on each parameter
members = target.Members.Match(_stringValue,
PSMemberTypes.Properties | PSMemberTypes.PropertySet | PSMemberTypes.Dynamic);
members = wrappedTarget.Members.Match(
_stringValue,
PSMemberTypes.Properties | PSMemberTypes.PropertySet | PSMemberTypes.Dynamic);

// if target was a hashtable and no result is found from the keys, then use property value if available
if (wasHashtable && !members.Any())
{
members = target.Members.Match(
_stringValue,
PSMemberTypes.Properties | PSMemberTypes.PropertySet | PSMemberTypes.Dynamic);
Copy link
Collaborator

@iSazonov iSazonov Jun 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We evaluate this again. Maybe put this in a variable before line 172?

Copy link
Collaborator Author

@vexx32 vexx32 Jun 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is evaluated against the wrapped target object in the prior case.

Copy link
Collaborator

@iSazonov iSazonov Jun 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean PSMemberTypes.Properties | PSMemberTypes.PropertySet | PSMemberTypes.Dynamic

}
}
else
{
// we have no globbing: try an exact match, because this is quicker.
PSMemberInfo x = target.Members[_stringValue];
PSMemberInfo x = wrappedTarget.Members[_stringValue];

if ((x == null) && (target.BaseObject is System.Dynamic.IDynamicMetaObjectProvider))
if (x == null)
{
// We could check if GetDynamicMemberNames includes the name... but
// GetDynamicMemberNames is only a hint, not a contract, so we'd want
// to attempt the binding whether it's in there or not.
x = new PSDynamicMember(_stringValue);
if (wasHashtable)
{
x = target.Members[_stringValue];
}
else if (wrappedTarget.BaseObject is System.Dynamic.IDynamicMetaObjectProvider)
{
// We could check if GetDynamicMemberNames includes the name... but
// GetDynamicMemberNames is only a hint, not a contract, so we'd want
// to attempt the binding whether it's in there or not.
x = new PSDynamicMember(_stringValue);
}
}

List<PSMemberInfo> temp = new List<PSMemberInfo>();
Expand Down Expand Up @@ -269,10 +286,6 @@ public List<PSPropertyExpressionResult> GetValues(PSObject target, bool expand,
{
List<PSPropertyExpressionResult> retVal = new List<PSPropertyExpressionResult>();

// If the object passed in is a hashtable, then turn it into a PSCustomObject so
// that property expressions can work on it.
target = IfHashtableWrapAsPSCustomObject(target);

// process the script case
if (Script != null)
{
Expand All @@ -282,13 +295,10 @@ public List<PSPropertyExpressionResult> GetValues(PSObject target, bool expand,
return retVal;
}

// process the expression
List<PSPropertyExpression> resolvedExpressionList = this.ResolveNames(target, expand);

foreach (PSPropertyExpression re in resolvedExpressionList)
foreach (PSPropertyExpression resolvedName in ResolveNames(target, expand))
{
PSPropertyExpressionResult r = re.GetValue(target, eatExceptions);
retVal.Add(r);
PSPropertyExpressionResult result = resolvedName.GetValue(target, eatExceptions);
retVal.Add(result);
}

return retVal;
Expand Down Expand Up @@ -344,13 +354,21 @@ private PSPropertyExpressionResult GetValue(PSObject target, bool eatExceptions)
}
}

private PSObject IfHashtableWrapAsPSCustomObject(PSObject target)
private PSObject IfHashtableWrapAsPSCustomObject(PSObject target, out bool wrapped)
{
wrapped = false;

// If the object passed in is a hashtable, then turn it into a PSCustomObject so
// that property expressions can work on it.
if (PSObject.Base(target) is Hashtable targetAsHash)
{
target = (PSObject)(LanguagePrimitives.ConvertPSObjectToType(targetAsHash, typeof(PSObject), false, null, true));
wrapped = true;
return (PSObject)(LanguagePrimitives.ConvertPSObjectToType(
targetAsHash,
typeof(PSObject),
recursion: false,
formatProvider: null,
ignoreUnknownMembers: true));
}

return target;
Expand All @@ -363,4 +381,3 @@ private PSObject IfHashtableWrapAsPSCustomObject(PSObject target)
#endregion Private Members
}
}

Loading