align windows theme store with colors contract

Author: Fei-Away

windows/scripts/theme-windows.ps1

@@ -378,10 +378,28 @@ function Read-DreamSkinTheme {
     Directory = $directory
     ThemePath = $themePath
     ImagePath = $imagePath
-    Theme = $theme
+    Theme = Normalize-DreamSkinThemeContract -Theme $theme
   }
 }
 
+function Normalize-DreamSkinThemeContract {
+  param([Parameter(Mandatory = $true)][object]$Theme)
+  if ($null -eq $Theme -or $Theme -is [string] -or $Theme -is [array]) {
+    throw 'Theme contract must be a JSON object.'
+  }
+  if (-not $Theme.PSObject.Properties['id'] -or -not $Theme.PSObject.Properties['id'].Value) {
+    $Theme | Add-Member -NotePropertyName id -NotePropertyValue 'custom' -Force
+  }
+  if (-not $Theme.PSObject.Properties['appearance'] -or -not $Theme.PSObject.Properties['appearance'].Value) {
+    $Theme | Add-Member -NotePropertyName appearance -NotePropertyValue 'auto' -Force
+  }
+  if (-not $Theme.PSObject.Properties['art'] -or -not $Theme.PSObject.Properties['art'].Value) {
+    $Theme | Add-Member -NotePropertyName art -NotePropertyValue `
+      ([pscustomobject]@{ focusX = $null; focusY = $null; safeArea = 'auto'; taskMode = 'auto' }) -Force
+  }
+  return $Theme
+}
+
 function Write-DreamSkinTheme {
   param(
     [Parameter(Mandatory = $true)][string]$ThemeDirectory,
@@ -390,6 +408,7 @@ function Write-DreamSkinTheme {
   Assert-DreamSkinNoReparseComponents -Path $ThemeDirectory
   New-Item -ItemType Directory -Force -Path $ThemeDirectory | Out-Null
   Assert-DreamSkinNoReparseComponents -Path $ThemeDirectory
+  $Theme = Normalize-DreamSkinThemeContract -Theme $Theme
   $json = $Theme | ConvertTo-Json -Depth 8
   $themePath = Join-Path $ThemeDirectory 'theme.json'
   Assert-DreamSkinNoReparseComponents -Path $themePath
@@ -538,7 +557,6 @@ function Set-DreamSkinActiveTheme {
       name = '自定义主题'
       appearance = 'auto'
       art = [pscustomobject]@{ focusX = $null; focusY = $null; safeArea = 'auto'; taskMode = 'auto' }
-      palette = [pscustomobject]@{}
     }
   }
   $imageName = New-DreamSkinThemeImageName -Extension $extension
@@ -564,15 +582,7 @@ function Set-DreamSkinActiveTheme {
     Assert-DreamSkinImageFile -Path $target
     $Theme | Add-Member -NotePropertyName image -NotePropertyValue $imageName -Force
     if ($Name) { $Theme | Add-Member -NotePropertyName name -NotePropertyValue $Name -Force }
-    if (-not $Theme.id) { $Theme | Add-Member -NotePropertyName id -NotePropertyValue 'custom' -Force }
-    if (-not $Theme.appearance) { $Theme | Add-Member -NotePropertyName appearance -NotePropertyValue 'auto' -Force }
-    if (-not $Theme.art) {
-      $Theme | Add-Member -NotePropertyName art -NotePropertyValue `
-        ([pscustomobject]@{ focusX = $null; focusY = $null; safeArea = 'auto'; taskMode = 'auto' }) -Force
-    }
-    if (-not $Theme.palette) {
-      $Theme | Add-Member -NotePropertyName palette -NotePropertyValue ([pscustomobject]@{}) -Force
-    }
+    $Theme = Normalize-DreamSkinThemeContract -Theme $Theme
     $activeCss = Join-Path $paths.Active 'theme.css'
     Assert-DreamSkinNoReparseComponents -Path $activeCss
     if ($temporaryCss) {
@@ -715,19 +725,7 @@ function Get-DreamSkinThemeRuntimeContentFingerprint {
   $loaded = Read-DreamSkinTheme -ThemeDirectory $ThemeDirectory -SkipImageMetadata
   $runtimeTheme = $loaded.Theme | ConvertTo-Json -Depth 8 | ConvertFrom-Json
   $runtimeTheme.image = '<runtime-image>'
-  if (-not $runtimeTheme.id) {
-    $runtimeTheme | Add-Member -NotePropertyName id -NotePropertyValue 'custom' -Force
-  }
-  if (-not $runtimeTheme.appearance) {
-    $runtimeTheme | Add-Member -NotePropertyName appearance -NotePropertyValue 'auto' -Force
-  }
-  if (-not $runtimeTheme.art) {
-    $runtimeTheme | Add-Member -NotePropertyName art -NotePropertyValue `
-      ([pscustomobject]@{ focusX = $null; focusY = $null; safeArea = 'auto'; taskMode = 'auto' }) -Force
-  }
-  if (-not $runtimeTheme.palette) {
-    $runtimeTheme | Add-Member -NotePropertyName palette -NotePropertyValue ([pscustomobject]@{}) -Force
-  }
+  $runtimeTheme = Normalize-DreamSkinThemeContract -Theme $runtimeTheme
   $canonicalTheme = ConvertTo-DreamSkinCanonicalJsonValue -Value $runtimeTheme
   $themeBytes = [System.Text.Encoding]::UTF8.GetBytes(
     ($canonicalTheme | ConvertTo-Json -Depth 8 -Compress)

windows/tests/run-tests.ps1

@@ -1018,6 +1018,7 @@ try {
     $updatedTheme.Theme.id -cne 'custom' -or
     $updatedTheme.Theme.art.safeArea -cne 'auto' -or
     $updatedTheme.Theme.art.taskMode -cne 'auto' -or
+    $updatedTheme.Theme.PSObject.Properties['palette'] -or
     -not (Test-DreamSkinThemePathWithin -Path $updatedTheme.ImagePath -Root $themePaths.Active)) {
     throw 'Imported image did not reset to the generic adaptive contract inside the managed directory.'
   }

windows/tests/theme-zip-import.tests.ps1

@@ -250,10 +250,19 @@ try {
   $roundtripPaths = Initialize-DreamSkinThemeStore -SkillRoot $Root `
     -StateRoot $roundtripStateRoot
   $officialSaved = Read-DreamSkinTheme -ThemeDirectory $official.Path
+  if (-not $officialSaved.Theme.PSObject.Properties['colors'] -or
+    $officialSaved.Theme.PSObject.Properties['palette']) {
+    throw 'Studio colors-only theme was not preserved as the current community theme contract.'
+  }
   $officialTheme = $officialSaved.Theme | ConvertTo-Json -Depth 8 | ConvertFrom-Json
   $null = Set-DreamSkinActiveTheme -ImagePath $officialSaved.ImagePath `
     -Theme $officialTheme -SafeCssPath (Join-Path $official.Path 'theme.css') `
     -StateRoot $roundtripStateRoot
+  $roundtripActive = Read-DreamSkinTheme -ThemeDirectory $roundtripPaths.Active
+  if (-not $roundtripActive.Theme.PSObject.Properties['colors'] -or
+    $roundtripActive.Theme.PSObject.Properties['palette']) {
+    throw 'Applying a Studio colors-only theme added a legacy palette field.'
+  }
   $roundtripFingerprint = Get-DreamSkinThemeRuntimeContentFingerprint `
     -ThemeDirectory $roundtripPaths.Active
   if ($roundtripFingerprint -cne $official.ContentFingerprint) {