Merge pull request #664 from FH-Inway/select-psfobject-with-non-object-variables

Select psfobject with non-object variables

Author: FriedrichWeinmann

PSFramework/bin/PSFramework.dll

@@ -1,4 +1,4 @@
-Describe "Select-PSFObject Unit Tests" -Tag "UnitTests" {
+Describe "Select-PSFObject Unit Tests" -Tag "UnitTests" {
 	BeforeAll {
 		$object = [PSCustomObject]@{
 			Foo  = 42
@@ -18,6 +18,8 @@
 			Bar  = 88
 			Tara = 28
 		}
+
+		$variable = 42
 	}
 
 	Describe "Basic DSL functionalities" {
@@ -34,17 +36,26 @@
 			($object2 | Select-PSFObject -Property 'Foo size KB:1:1').Foo | Should -Be "41 KB"
 		}
 	}
-	
-	Describe "Selects from other variables" {
-		It "picks values from other variables" {
+
+	Describe "Selects from other object variables" {
+		It "picks values from other object variables" {
 			($object2 | Select-PSFObject -Property 'Tara from object').Tara | Should -Be 21
 		}
 
 		It "picks values from the properties of the right object in a list" {
 			($object2 | Select-PSFObject -Property 'Tara from List where Foo = Bar').Tara | Should -Be 28
 		}
 	}
-	
+
+	Describe "Selects from other non-object variables" {
+		It "picks values from other non-object variables" {
+			($object2 | Select-PSFObject -Property '$variable as Tara').Tara | Should -Be 42
+		}
+		It "uses the variable name as property name" {
+			($object2 | Select-PSFObject -Property '$variable').variable | Should -Be 42
+		}
+	}
+
 	Describe "Display Settings are applied" {
 		It "sets the correct properties to show in whitelist mode" {
 			$obj = [PSCustomObject]@{ Foo = "Bar"; Bar = 42; Right = "Left" }

PSFramework/bin/PSFramework.pdb

@@ -6,7 +6,7 @@
 namespace PSFramework.Parameter
 {
     /// <summary>
-    /// Class that automatically parses input chosen for the -Property parameter of Select-PSUObject
+    /// Class that automatically parses input chosen for the -Property parameter of Select-PSFObject
     /// </summary>
     public class SelectParameter : ParameterClass
     {
@@ -23,6 +23,14 @@ public SelectParameter(string Value)
         {
             InputObject = Value;
 
+            // check if Value is a variable name (i.e. starts with $ and is a single word)
+            // if so, the variable value is stored in a property with the same name
+            if (Value.StartsWith("$") && !Value.Contains(" "))
+            {
+                Value = Value + " as " + Value.Substring(1);
+            }
+
+            // check if Value is a property name (i.e. is a single word)
             if (!Value.Contains(" "))
             {
                 this.Value = Value;
@@ -119,7 +127,16 @@ public SelectParameter(string Value)
             }
 
             if (propertyName != ".")
-                stringValue = String.Format("{0}.{1}", stringValue, valueName);
+            {
+                if (valueName.StartsWith("$"))
+                {
+                    stringValue = valueName;
+                }
+                else
+                {
+                    stringValue = String.Format("{0}.{1}", stringValue, valueName);
+                }
+            }
 
             // <guid> = $_
             // "(<size>(<cast>(<value>))<sizeName>)"