Merge pull request #18 from aminya/hasNoSlashOrEvenNumberOfSlashes-

Readme.md

@@ -2,7 +2,7 @@
 
 Minify JSON files **blazing fast**! Supports Comments. Written in D.
 
-60 times faster than jsonminify!
+360 times faster than jsonminify!
 
 [![CI](https://github.com/aminya/minijson/actions/workflows/CI.yml/badge.svg)](https://github.com/aminya/minijson/actions/workflows/CI.yml)
 
@@ -88,9 +88,11 @@ minifyFiles(["file1.json", "file2.json"], true);
 
 ### Benchmarks
 
+On AMD Ryzen 7 4800H:
+
 ```
 ❯ node .\benchmark\native-benchmark.mjs
-0.977 seconds
+0.163 seconds
 
 ❯ node .\benchmark\js-benchmark.mjs
 58.818 seconds

package.json

@@ -37,6 +37,7 @@
     "@types/node": "16.0.0",
     "eslint-config-atomic": "^1.16.1",
     "jasmine": "^3.8.0",
+    "jasmine-spec-reporter": "^7.0.0",
     "jsonminify": "^0.4.1",
     "mjs-dirname": "^1.0.0",
     "parcel": "^2.0.0-beta.3.1",

src/native/lib.d

@@ -46,24 +46,24 @@ string minifyString(in string jsonString, in bool hasComment = false) @trusted
     if (noCommentOrNotInComment)
     {
       auto leftContextSubstr = match.pre()[prevFrom .. $];
-      if (leftContextSubstr.length != 0)
+      const noLeftContext = leftContextSubstr.length == 0;
+      if (!in_string && !noLeftContext)
       {
-        if (!in_string)
-        {
-          leftContextSubstr = leftContextSubstr.replaceAll(spaceOrBreakRegex, "");
-        }
+        leftContextSubstr = leftContextSubstr.replaceAll(spaceOrBreakRegex, "");
+      }
+      if (!noLeftContext) {
         result ~= leftContextSubstr;
+      }
 
-        if (matchFrontHit == "\"")
+      if (matchFrontHit == "\"")
+      {
+        if (!in_string || noLeftContext || hasNoSlashOrEvenNumberOfSlashes(leftContextSubstr))
         {
-          if (!in_string || hasNoSlashOrEvenNumberOfSlashes(leftContextSubstr))
-          {
-            // start of string with ", or unescaped " character found to end string
-            in_string = !in_string;
-          }
-          --from; // include " character in next catch
-          rightContext = jsonString[from .. $];
+          // start of string with ", or unescaped " character found to end string
+          in_string = !in_string;
         }
+        --from; // include " character in next catch
+        rightContext = jsonString[from .. $];
       }
     }
     // comments

test/helper.mjs

@@ -39,7 +39,7 @@ export async function minifyFixtures(jsonFiles, hasComment) {
         minifiedObject = JSON.parse(minifiedString)
       } catch (e) {
         console.error(`The minified file is not valid for: ${minifiedFile}`)
-        throw e
+        return { minifiedString, minifiedObject: {} }
       }
       return { minifiedString, minifiedObject }
     })

test/index-test.mjs

@@ -1,3 +1,4 @@
+import "./reporter.mjs"
 import { minifyFixtures } from "./helper.mjs"
 import { minifyFiles, minifyString } from "../dist/lib.js"
 import { standardFiles, withCommentFiles } from "./fixtures.mjs"
@@ -14,7 +15,9 @@ describe("minijson", () => {
     const fixtureNum = pathInfo.length
     for (let iFixture = 0; iFixture !== fixtureNum; ++iFixture) {
       it(pathInfo[iFixture].originalFile, () => {
-        expect(resultInfo[iFixture].minifiedObject).toEqual(originalInfo[iFixture].originalObject)
+        const originalObject = originalInfo[iFixture].originalObject
+        const minifiedObject = resultInfo[iFixture].minifiedObject
+        expect(minifiedObject).toEqual(originalObject)
       })
     }
 

test/reporter.mjs

@@ -0,0 +1,12 @@
+import { SpecReporter } from "jasmine-spec-reporter"
+
+jasmine.getEnv().clearReporters() // remove default reporter logs
+jasmine.getEnv().addReporter(
+  new SpecReporter({
+    spec: {
+      displaySuccessful: true,
+      displayPending: true,
+      displayFailed: true,
+    },
+  })
+)