fixes #306. improves json testing

trullock · Mar 16, 2022 · 9a08d1d · 9a08d1d
1 parent 6c60533
commit 9a08d1d
Show file tree

Hide file tree

Showing 13 changed files with 50 additions and 10 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,7 +2,10 @@
 
 ## vNext (unpublished)
 
-## v1.18.9 (16 March 2022)
+## v1.19.0 (16 March 2022)
+- Fixed bug with boolean handling inside JSON
+
+## v1.18.0 (16 March 2022)
 - Added support for compressing `<script type="application/json">`
 
 ## v1.17.14 (8 March 2022)

diff --git a/src/NUglify.Tests/Html/TestScripts.cs b/src/NUglify.Tests/Html/TestScripts.cs
@@ -66,9 +66,10 @@ public void LdJson()
     ""@type"": ""WebSite"",
     ""url"": ""https://domain.ext"",
     ""name"": ""Name Site"",
+	""isChecked"": true,
     ""alternateName"": null
 }</script>";
-            output = @"<script>var js=""somevar""</script><script type=application/ld+json>{""@context"":""http://schema.org/"",""@type"":""WebSite"",""url"":""https://domain.ext"",""name"":""Name Site"",""alternateName"":null}</script>";
+            output = @"<script>var js=""somevar""</script><script type=application/ld+json>{""@context"":""http://schema.org/"",""@type"":""WebSite"",""url"":""https://domain.ext"",""name"":""Name Site"",""isChecked"":true,""alternateName"":null}</script>";
             equal(minify(input), output);
         }
         [Test]
@@ -84,9 +85,10 @@ public void Json()
     ""@type"": ""WebSite"",
     ""url"": ""https://domain.ext"",
     ""name"": ""Name Site"",
+	""isChecked"": true,
     ""alternateName"": null
 }</script>";
-	        output = @"<script>var js=""somevar""</script><script type=application/json>{""@context"":""http://schema.org/"",""@type"":""WebSite"",""url"":""https://domain.ext"",""name"":""Name Site"",""alternateName"":null}</script>";
+	        output = @"<script>var js=""somevar""</script><script type=application/json>{""@context"":""http://schema.org/"",""@type"":""WebSite"",""url"":""https://domain.ext"",""name"":""Name Site"",""isChecked"":true,""alternateName"":null}</script>";
 	        equal(minify(input), output);
         }
     }

diff --git a/src/NUglify.Tests/JavaScript/Bugs.cs b/src/NUglify.Tests/JavaScript/Bugs.cs
@@ -345,5 +345,11 @@ public void Bug305()
         {
 	        TestHelper.Instance.RunTest("-rename:all");
         }
+
+        [Test]
+        public void Bug306()
+        {
+	        TestHelper.Instance.RunTest("-js:json");
+        }
     }
 }
diff --git a/src/NUglify.Tests/JavaScript/Common/TestHelper.cs b/src/NUglify.Tests/JavaScript/Common/TestHelper.cs
@@ -303,6 +303,11 @@ public void RunTest(bool inputExpected, string extraArguments, params string[] e
 
                             args.AddLast(outputMapFile);
                         }
+                        else if (option.Equals("-js:json", StringComparison.OrdinalIgnoreCase))
+                        {
+	                        inputFile += ".json";
+	                        outputFile += ".json";
+                        }
                     }
                 }
             }

diff --git a/src/NUglify.Tests/NUglify.Tests.csproj b/src/NUglify.Tests/NUglify.Tests.csproj
@@ -503,9 +503,9 @@
     <Content Include="TestData\JS\Expected\Bugs\Bug199JS.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\JS\Expected\Bugs\Bug199JSON.js">
+    <None Include="TestData\JS\Expected\Bugs\Bug199JSON.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
     <Content Include="TestData\JS\Expected\Bugs\Bug201.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -542,6 +542,9 @@
     <Content Include="TestData\JS\Expected\Bugs\Bug285.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="TestData\JS\Expected\Bugs\Bug306.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="TestData\JS\Expected\Bugs\Bug305.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -1864,9 +1867,9 @@
     <Content Include="TestData\JS\Expected\CommandLine\Expression.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\JS\Expected\CommandLine\Expression_json.js">
+    <None Include="TestData\JS\Expected\CommandLine\Expression_json.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
     <Content Include="TestData\JS\Expected\CommandLine\Expression_prog.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2881,9 +2884,9 @@
     <Content Include="TestData\JS\Input\Bugs\Bug199JS.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="TestData\JS\Input\Bugs\Bug199JSON.js">
+    <None Include="TestData\JS\Input\Bugs\Bug199JSON.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    </None>
     <Content Include="TestData\JS\Input\Bugs\Bug201.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2923,6 +2926,9 @@
     <Content Include="TestData\JS\Input\Bugs\Bug305.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="TestData\JS\Input\Bugs\Bug306.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="TestData\JS\Input\Bugs\Bug57.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -2968,6 +2974,9 @@
     <Content Include="TestData\JS\Input\Bugs\Bug264.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="TestData\JS\Input\CommandLine\Expression.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <Content Include="TestData\JS\Input\Literals\TemplateLiteralsEscaped.js">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

diff --git a/...s/TestData/JS/Expected/Bugs/Bug199JSON.js → ...TestData/JS/Expected/Bugs/Bug199JSON.json b/...s/TestData/JS/Expected/Bugs/Bug199JSON.js → ...TestData/JS/Expected/Bugs/Bug199JSON.json
diff --git a/src/NUglify.Tests/TestData/JS/Expected/Bugs/Bug306.json b/src/NUglify.Tests/TestData/JS/Expected/Bugs/Bug306.json
@@ -0,0 +1 @@
+{"@context":"http://schema.org/","@type":"WebSite","url":"https://domain.ext","name":"Name Site","isChecked":true,"alternateName":null}
diff --git a/...S/Expected/CommandLine/Expression_json.js → ...Expected/CommandLine/Expression_json.json b/...S/Expected/CommandLine/Expression_json.js → ...Expected/CommandLine/Expression_json.json
diff --git a/...ests/TestData/JS/Input/Bugs/Bug199JSON.js → ...ts/TestData/JS/Input/Bugs/Bug199JSON.json b/...ests/TestData/JS/Input/Bugs/Bug199JSON.js → ...ts/TestData/JS/Input/Bugs/Bug199JSON.json
diff --git a/src/NUglify.Tests/TestData/JS/Input/Bugs/Bug306.json b/src/NUglify.Tests/TestData/JS/Input/Bugs/Bug306.json
@@ -0,0 +1,8 @@
+{
+	"@context": "http://schema.org/",
+	"@type": "WebSite",
+	"url": "https://domain.ext",
+	"name": "Name Site",
+	"isChecked": true,
+	"alternateName": null
+}
diff --git a/src/NUglify.Tests/TestData/JS/Input/CommandLine/Expression.json b/src/NUglify.Tests/TestData/JS/Input/CommandLine/Expression.json
@@ -0,0 +1,5 @@
+[ 1, foo += bar ? function(window){ return window.location.href; }(window) : { loc: "none" } ]
+
+// if we parse this as an expression, it will stop after the above expression and totally
+// ignore the next expression
+alert("great googley-moogley!");
diff --git a/src/NUglify/Html/HtmlMinifier.cs b/src/NUglify/Html/HtmlMinifier.cs
@@ -354,6 +354,7 @@ string MinifyJsOrCss(string text, HtmlScriptStyleElement type)
 		        jsonSettings.Format = JavaScriptFormat.JSON;
 		        jsonSettings.SourceMode = JavaScriptSourceMode.Expression;
 		        jsonSettings.IgnoreConditionalCompilation = true;
+		        jsonSettings.KillSwitch |= (long)TreeModifications.BooleanLiteralsToNotOperators;
 		        result = Uglify.Js(text, "inner_js", jsonSettings);
 	        }
 	        else

diff --git a/src/NUglify/NUglify.csproj b/src/NUglify/NUglify.csproj
@@ -17,7 +17,7 @@
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>git://github.com/trullock/NUglify</RepositoryUrl>
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.3' ">1.6.0</NetStandardImplicitPackageVersion>
-    <Version>1.18.0</Version>
+    <Version>1.19.0</Version>
     <PackageLicenseExpression></PackageLicenseExpression>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"@context":"http://schema.org/","@type":"WebSite","url":"https://domain.ext","name":"Name Site","isChecked":true,"alternateName":null}