🐛 Fix bugs and add demo animation

brianary · brianary · commit 843703a95eda · 2026-06-02T21:27:12.000-07:00
diff --git a/images/demo.gif b/images/demo.gif
diff --git a/images/demo.tape b/images/demo.tape
@@ -7,6 +7,24 @@ Enter
 Type "Clear-Host"
 Enter
 Show
-Type "#TODO"
+Type `'{"":3.14}' |Select-Json /`
+Enter
+Sleep 2s
+Type `'{"a":{"b":true}}' |Select-Json /a/*`
+Enter
+Sleep 2s
+Type "'[1, 2, 3]' |Set-Json /1 0"
+Enter
+Sleep 2s
+Type `'{"list":[1, 2]}' |Set-Json /list/- 3`
+Enter
+Sleep 2s
+Type "'{a:1}' |Resolve-JsonPointer /*"
+Enter
+Sleep 2s
+Type `'{"a":1,"b":{"u":3},"c":{"v":5}}','{"a":{"w":8},"b":2,"c":{"x":6}}' |Merge-Json`
+Enter
+Sleep 2s
+Type `'{d:{a:{b:1,c:{"$ref":"#/d/two"}},two:2}}' |Export-Json /d/a`
 Enter
 Sleep 9s
diff --git a/src/private/Merge-PSObject.ps1 b/src/private/Merge-PSObject.ps1
@@ -0,0 +1,87 @@
+﻿<#
+.SYNOPSIS
+Create a new PSObject by recursively combining the properties of PSObjects.
+
+.INPUTS
+System.Management.Automation.PSObject to combine.
+
+.OUTPUTS
+System.Management.Automation.PSObject combining the inputs.
+
+.FUNCTIONALITY
+PowerShell
+
+.LINK
+Get-Member
+
+.LINK
+Add-Member
+
+.EXAMPLE
+Merge-PSObject ([pscustomobject]@{a=1;b=2}) ([pscustomobject]@{b=0;c=3})
+
+a b c
+- - -
+1 2 3
+
+.EXAMPLE
+Merge-PSObject ([pscustomobject]@{a=1;b=2}) ([pscustomobject]@{b=0;c=3}) -Force
+
+a b c
+- - -
+1 0 3
+
+.EXAMPLE
+'{"a":1,"b":{"u":3},"c":{"v":5}}','{"a":{"w":8},"b":2,"c":{"x":6}}' |ConvertFrom-Json |Merge-PSObject -Accumulate -Force |select -Last 1 |ConvertTo-Json
+
+{
+  "a": {
+    "w": 8
+  },
+  "b": 2,
+  "c": {
+    "v": 5,
+    "x": 6
+  }
+}
+#>
+
+[CmdletBinding()][OutputType([PSObject])] Param(
+# Initial PSObject to combine.
+[Parameter(Position=0)][PSObject] $ReferenceObject = [pscustomobject]@{},
+<#
+PSObjects to combine. PSObject descendant properties are recursively merged.
+Primitive values are overwritten by any matching ones in the new PSObject.
+#>
+[Parameter(Position=1,Mandatory=$true,ValueFromPipeline=$true)][PSObject] $InputObject,
+# Continue merging each pipeline object's properties into the same accumulator object.
+[switch] $Accumulate,
+# Overwrite existing properties.
+[switch] $Force
+)
+Begin {if($Accumulate) {$value = $ReferenceObject.PSObject.Copy()}}
+Process
+{
+	if(!$Accumulate) {$value = $ReferenceObject.PSObject.Copy()}
+	foreach($p in $InputObject |Get-Member -Type Properties)
+	{
+		$name,$type = $p.Name,$p.MemberType
+		$newvalue = $InputObject.$name
+		if(!($value |Get-Member $name -Type $type))
+		{
+			$value |Add-Member $name -Type $type -Value $newvalue
+		}
+		elseif($Force)
+		{
+			$currentvalue = $value.$name
+			$value.$name =
+				if($currentvalue -isnot [PSObject] -or $newvalue -isnot [PSObject]) {$newvalue}
+				else {Merge-PSObject $currentvalue $newvalue}
+		}
+		elseif($value.$name -is [PSObject] -and $newvalue -is [PSObject])
+		{
+			$value.$name = Merge-PSObject $value.$name $newvalue
+		}
+	}
+	return $value
+}
diff --git a/src/public/Merge-Json.ps1 b/src/public/Merge-Json.ps1
@@ -43,5 +43,5 @@ Primitive values are overwritten by any matching ones in the new JSON string.
 )
 Begin {$value = [pscustomobject]@{}}
 #TODO: Add or replace dependency.
-Process {$value = $value,($InputObject |ConvertFrom-Json) |Merge-PSObject.ps1}
+Process {$value = $value,($InputObject |ConvertFrom-Json) |Merge-PSObject}
 End {$value  |ConvertTo-Json -Compress:$Compress}

Original file line number	Diff line number	Diff line change
`@@ -43,5 +43,5 @@ Primitive values are overwritten by any matching ones in the new JSON string.`
`43`	`43`	`)`
`44`	`44`	`Begin {$value = [pscustomobject]@{}}`
`45`	`45`	`#TODO: Add or replace dependency.`
`46`		`-Process {$value = $value,($InputObject \|ConvertFrom-Json) \|Merge-PSObject.ps1}`
	`46`	`+Process {$value = $value,($InputObject \|ConvertFrom-Json) \|Merge-PSObject}`
`47`	`47`	`End {$value \|ConvertTo-Json -Compress:$Compress}`