Merge pull request #196 from unoplatform/pj/allow-comments-on-json-do…

…cument Allow comments on json document
unoplatform · Nov 14, 2023 · 8c52ecf · 8c52ecf
2 parents 146ecf6 + fa289c4
commit 8c52ecf
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 28 deletions.
diff --git a/doc/using-uno-resizetizer.md b/doc/using-uno-resizetizer.md
@@ -190,6 +190,9 @@ Icon = "@mipmap/iconapp",
 > [!NOTE]
 > In some projects the `manifest.webmanifest` be `manifest.json`. If so, you can either adjust your project to use `manifest.webmanifest` or keep it as `manifest.json`.
 
+> [!INFO]
+> Uno.Resizetizer will support comments on your json file, but they will ignored on the final generated file.
+
 # [**Apple**](#tab/Apple)
 
 * For `mac-catalyst` and `iOS`, open the [`info.plist` file](https://github.com/unoplatform/uno.resizetizer/blob/main/samples/NewTemplate/Resizetizer.Extensions.Sample.Mobile/iOS/Info.plist), find the `XSAppIconAsset` key, and change its value to `Assets.xcassets/iconapp.appiconset`.

diff --git a/samples/NewTemplate/Resizetizer.Extensions.Sample.Wasm/manifest.json b/samples/NewTemplate/Resizetizer.Extensions.Sample.Wasm/manifest.json
@@ -1,8 +1,9 @@
 {
+  // comment test
   "background_color": "#ffffff",
   "description": "Resizetizer.Extensions.Sample",
   "display": "standalone",
-  "icons": [ ],
+  "icons": [],
   "name": "Resizetizer.Extensions.Sample",
   "short_name": "Resizetizer.Extensions.Sample",
   "start_url": "/index.html",

diff --git a/src/Resizetizer/src/CreatePartialInfoPlistTask.cs b/src/Resizetizer/src/CreatePartialInfoPlistTask.cs
@@ -26,7 +26,7 @@ public class CreatePartialInfoPlistTask_v0 : Task
 		public override bool Execute()
 		{
 #if DEBUG_RESIZETIZER
-			System.Diagnostics.Debugger.Launch();
+		//	System.Diagnostics.Debugger.Launch();
 #endif
 			try
 			{

diff --git a/src/Resizetizer/src/GeneratePackageAppxManifest.cs b/src/Resizetizer/src/GeneratePackageAppxManifest.cs
@@ -48,7 +48,7 @@ public class GeneratePackageAppxManifest_v0 : Task
 		public override bool Execute()
 		{
 #if DEBUG_RESIZETIZER
-			System.Diagnostics.Debugger.Launch();
+	//		System.Diagnostics.Debugger.Launch();
 #endif
 			try
 			{

diff --git a/src/Resizetizer/src/GenerateSplashAndroidResources.cs b/src/Resizetizer/src/GenerateSplashAndroidResources.cs
@@ -21,7 +21,7 @@ public class GenerateSplashAndroidResources_v0 : Task, ILogger
 		public override bool Execute()
 		{
 #if DEBUG_RESIZETIZER
-			System.Diagnostics.Debugger.Launch();
+			//System.Diagnostics.Debugger.Launch();
 #endif
 			var splash = UnoSplashScreen[0];
 

diff --git a/src/Resizetizer/src/GenerateSplashAssets.cs b/src/Resizetizer/src/GenerateSplashAssets.cs
@@ -19,7 +19,7 @@ public class GenerateSplashAssets_v0 : Task, ILogger
 		public override bool Execute()
 		{
 #if DEBUG_RESIZETIZER
-			System.Diagnostics.Debugger.Launch();
+			//System.Diagnostics.Debugger.Launch();
 #endif
 			var splash = UnoSplashScreen[0];
 

diff --git a/src/Resizetizer/src/GenerateSplashStoryboard.cs b/src/Resizetizer/src/GenerateSplashStoryboard.cs
@@ -20,7 +20,7 @@ public class GenerateSplashStoryboard_v0 : Task
 		public override bool Execute()
 		{
 #if DEBUG_RESIZETIZER
-			System.Diagnostics.Debugger.Launch();
+			//System.Diagnostics.Debugger.Launch();
 #endif
 			var splash = UnoSplashScreen[0];
 

diff --git a/src/Resizetizer/src/GenerateWasmSplashAssets.cs b/src/Resizetizer/src/GenerateWasmSplashAssets.cs
@@ -29,11 +29,11 @@ public override bool Execute()
 	{
 #if DEBUG_RESIZETIZER
 
-		if (System.Diagnostics.Debugger.IsAttached)
-		{
-			System.Diagnostics.Debugger.Break();
-		}
-		System.Diagnostics.Debugger.Launch();
+		//if (System.Diagnostics.Debugger.IsAttached)
+		//{
+		//	System.Diagnostics.Debugger.Break();
+		//}
+		//System.Diagnostics.Debugger.Launch();
 
 #endif
 		if (UnoSplashScreen is null || UnoSplashScreen.Length is 0 )

diff --git a/src/Resizetizer/src/JsonHelper.cs b/src/Resizetizer/src/JsonHelper.cs
@@ -7,9 +7,13 @@ namespace Uno.Resizetizer;
 // From https://github.com/dotnet/runtime/issues/31433#issuecomment-570475853
 public static class JsonHelper
 {
+	internal static JsonDocumentOptions jsonDocumentOptions = new()
+	{
+		CommentHandling = JsonCommentHandling.Skip
+	};
 	public static void Merge(string originalJson, string newContent, Utf8JsonWriter jsonWriter)
 	{
-		using (JsonDocument jDoc1 = JsonDocument.Parse(originalJson))
+		using (JsonDocument jDoc1 = JsonDocument.Parse(originalJson, jsonDocumentOptions))
 		using (JsonDocument jDoc2 = JsonDocument.Parse(newContent))
 		{
 			JsonElement root1 = jDoc1.RootElement;

diff --git a/src/Resizetizer/src/ResizetizeImages.cs b/src/Resizetizer/src/ResizetizeImages.cs
@@ -51,11 +51,11 @@ public override System.Threading.Tasks.Task ExecuteAsync()
 		{
 #if DEBUG_RESIZETIZER
 
-		if (System.Diagnostics.Debugger.IsAttached)
-		{
-			System.Diagnostics.Debugger.Break();
-		}
-		System.Diagnostics.Debugger.Launch();
+		//if (System.Diagnostics.Debugger.IsAttached)
+		//{
+		//	System.Diagnostics.Debugger.Break();
+		//}
+		//System.Diagnostics.Debugger.Launch();
 
 #endif
 			TargetPlatform = PlatformType;

diff --git a/src/Resizetizer/src/WasmIconGenerator.cs b/src/Resizetizer/src/WasmIconGenerator.cs
@@ -1,14 +1,8 @@
-using SkiaSharp;
-using System.Collections.Generic;
-using System.Data;
-using System.Diagnostics.Contracts;
-using System.Globalization;
+using System.Globalization;
 using System.IO;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using System.Text.Json.Serialization;
 
 namespace Uno.Resizetizer;
 internal sealed class WasmIconGenerator
@@ -33,6 +27,16 @@ public WasmIconGenerator(ResizeImageInfo info, string intermediateOutputPath, IL
 
 	public string ProcessThePwaManifest()
 	{
+#if DEBUG_RESIZETIZER
+
+		if (System.Diagnostics.Debugger.IsAttached)
+		{
+			System.Diagnostics.Debugger.Break();
+		}
+		System.Diagnostics.Debugger.Launch();
+
+#endif
+
 		if (string.IsNullOrWhiteSpace(pwaManifestPath))
 		{
 			Logger.Log("There's no PWA Manifest file.");
@@ -41,7 +45,7 @@ public string ProcessThePwaManifest()
 
 		var json = File.ReadAllText(pwaManifestPath);
 
-		var jsonNodeManifest = JsonNode.Parse(json);
+		var jsonNodeManifest = JsonNode.Parse(json, documentOptions: JsonHelper.jsonDocumentOptions);
 
 		if (!IconPropertyIsEmpty(jsonNodeManifest))
 		{
@@ -51,7 +55,7 @@ public string ProcessThePwaManifest()
 
 		var appIconImagesJson = new JsonArray();
 		Logger.Log("Creating the icons property for the PWA manifest.");
-		
+
 		foreach (var dpi in dpiPaths)
 		{
 			var w = dpi.Size.Value.Width.ToString("0.#", CultureInfo.InvariantCulture);
@@ -86,7 +90,7 @@ public string ProcessThePwaManifest()
 		using var writer = new Utf8JsonWriter(fs, writeOptions);
 
 		Logger.Log("Merging the original PWA manifest with the icons property.");
-		
+
 		JsonHelper.Merge(json, jsonIconsObject.ToJsonString(), writer);
 
 		writer.Flush();