Merge pull request #13 from aminya/perf

.prettierignore

@@ -3,3 +3,5 @@ pnpm-lock.yaml
 package-lock.json
 CHANGELOG.md
 dist
+test/fixtures/*-minified.json
+dub.selections.json

Readme.md

@@ -1,8 +1,8 @@
 # minijson
 
-Minify JSON files **fast**! Written in D.
+Minify JSON files **blazing fast**! Written in D.
 
-1.5 times faster than jsonminify.
+55 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)
 
@@ -23,9 +23,9 @@ https://github.com/aminya/minijson/releases/tag/v0.3.1
 - Dub
 
 ```
-dub build --config=library --build=release --compiler=ldc2
+dub build --config=library --build=release-nobounds --compiler=ldc2
 # or
-dub build --config=executable --build=release --compiler=ldc2
+dub build --config=executable --build=release-nobounds --compiler=ldc2
 ```
 
 ### CLI Usage
@@ -70,10 +70,10 @@ minifyFiles(["file1.json", "file2.json"]);
 
 ```
 ❯ node .\benchmark\native-benchmark.mjs
-38,823 ms
+1.086 seconds
 
 ❯ node .\benchmark\js-benchmark.mjs
-58,686 ms
+58.686 seconds
 ```
 
 ### Contributing

benchmark/js-benchmark.mjs

@@ -18,4 +18,4 @@ await Promise.all(
 )
 
 const t2 = performance.now()
-console.log(t2 - t1)
+console.log(((t2 - t1)/1000).toFixed(3), "seconds")

benchmark/native-benchmark.mjs

@@ -8,4 +8,4 @@ const t1 = performance.now()
 await minifyFiles(jsonFiles)
 
 const t2 = performance.now()
-console.log(t2 - t1)
+console.log(((t2 - t1)/1000).toFixed(3), "seconds")

dub.sdl

@@ -9,6 +9,8 @@ targetPath "./dist"
 sourcePaths "./src/native"
 importPaths "./src/native"
 
+dependency "automem" version="~>0.6.6"
+
 configuration "executable" {
   targetType "executable"
   mainSourceFile "./src/native/cli.d"

dub.selections.json

@@ -0,0 +1,8 @@
+{
+	"fileVersion": 1,
+	"versions": {
+		"automem": "0.6.6",
+		"test_allocator": "0.3.3",
+		"unit-threaded": "2.0.0"
+	}
+}

package.json

@@ -2,7 +2,7 @@
   "name": "@aminya/minijson",
   "author": "Amin Yahyaabdi",
   "version": "0.3.1",
-  "description": "Minify JSON files fast! Written in D",
+  "description": "Minify JSON files blazing fast! Written in D",
   "homepage": "https://github.com/aminya/minijson",
   "license": "MIT",
   "files": [
@@ -20,9 +20,9 @@
     "test": "jasmine ./test/index-test.mjs",
     "clean": "shx rm -rf dist",
     "build.native": "dub build --config=executable",
-    "build.native.release": "pnpm build.native -- --build release",
-    "build.native.profile": "pnpm build.native -- --build profile",
-    "start.profile": "cd dist && minijson.exe --file ../benchmark/fixtures/1.0.0.json && profdump.exe --dot trace.log trace.dot && dot -Tsvg trace.dot -o trace.svg && ./trace.svg",
+    "build.native.release": "pnpm build.native -- --build release-nobounds --compiler=ldc2",
+    "build.native.profile": "pnpm build.native -- --build profile --compiler=ldc2",
+    "start.profile": "cd dist && minijson.exe --file ../test/fixtures/0.4.2.json && profdump.exe --dot trace.log trace.dot && dot -Tsvg trace.dot -o trace.svg && ./trace.svg",
     "build.node": "npm run build.native.release && node ./src/node/build.js && (tsc -p ./src/node/tsconfig.json || echo done)",
     "build.wasm": "ldc2 ./src/wasm/wasm.d ./src/native/lib.d --od ./dist --O3 --mtriple=wasm32-unknown-unknown-wasm",
     "build.browser": "npm run build.wasm && parcel build --target browser ./src/browser/index.html",

src/native/lib.d

@@ -1,8 +1,10 @@
 module minijson.lib;
 
-import std : ctRegex, replaceAll, join, appender, array, matchAll, matchFirst, RegexMatch;
+import std : ctRegex, replaceAll, join, array, matchAll, matchFirst, RegexMatch;
+import automem : Vector;
 
-const tokenizer = ctRegex!(`"|(/\*)|(\*/)|(//)|\n|\r|[|]`, "g");
+const tokenizerWithComment = ctRegex!(`"|(/\*)|(\*/)|(//)|\n|\r|\[|]`, "g");
+const tokenizerNoComment = ctRegex!(`[\n\r"[]]`, "g");
 
 const spaceOrBreakRegex = ctRegex!(`\s`);
 
@@ -18,15 +20,17 @@ const repeatingBackSlashRegex = ctRegex!(`(\\)*$`);
   Return:
     the minified json string
 */
-string minifyString(string jsonString, bool hasComments = false) @safe
+string minifyString(string jsonString, bool hasComments = false) @trusted
 {
   auto in_string = false;
   auto in_multiline_comment = false;
   auto in_singleline_comment = false;
-  auto new_str = appender!(string[]);
+  Vector!string new_str;
   size_t from = 0;
   auto rightContext = "";
 
+  const tokenizer = !hasComments ? tokenizerNoComment : tokenizerWithComment;
+
   auto match = jsonString.matchAll(tokenizer);
 
   while (!match.empty())
@@ -39,22 +43,23 @@ string minifyString(string jsonString, bool hasComments = false) @safe
     const lastIndex = jsonString.length - rightContext.length;
 
     const noCommentOrNotInComment = !hasComments || (!in_multiline_comment && !in_singleline_comment);
+
+    auto leftContextSubstr = leftContext[from .. $];
     if (noCommentOrNotInComment)
     {
-      auto leftContextSubstr = leftContext[from .. $];
       if (!in_string)
       {
         leftContextSubstr = leftContextSubstr.replaceAll(spaceOrBreakRegex, "");
       }
-      new_str.put(leftContextSubstr);
+      new_str ~= leftContextSubstr;
     }
     from = lastIndex;
 
     if (noCommentOrNotInComment)
     {
       if (matchFrontHit == "\"")
       {
-        if (!in_string || hasNoSlashOrEvenNumberOfSlashes(leftContext))
+        if (!in_string || hasNoSlashOrEvenNumberOfSlashes(leftContextSubstr))
         {
           // start of string with ", or unescaped " character found to end string
           in_string = !in_string;
@@ -64,7 +69,7 @@ string minifyString(string jsonString, bool hasComments = false) @safe
       }
       else if (matchFrontHit.matchFirst(spaceOrBreakRegex).empty())
       {
-        new_str.put(matchFrontHit);
+        new_str ~= matchFrontHit;
       }
     }
     // comments
@@ -93,14 +98,15 @@ string minifyString(string jsonString, bool hasComments = false) @safe
 
     match.popFront();
   }
-  new_str.put(rightContext);
+  new_str ~= rightContext;
   return new_str.array().join("");
 }
 
 bool hasNoSlashOrEvenNumberOfSlashes(string leftContext) @safe
 {
   auto leftContextMatch = leftContext.matchFirst(repeatingBackSlashRegex);
-  return leftContextMatch.empty() || (leftContextMatch.hit().length % 2 == 0);
+  // if not matched the hit length will be 0 (== leftContextMatch.empty())
+  return leftContextMatch.hit().length % 2 == 0;
 }
 
 /**

test/helper.mjs

@@ -30,7 +30,13 @@ export async function minifyFixtures(jsonFiles) {
   const resultInfo = await Promise.all(
     minifiedFiles.map(async (minifiedFile) => {
       const minifiedString = await readFile(minifiedFile, "utf8")
-      const minifiedObject = JSON.parse(minifiedString)
+      let minifiedObject
+      try {
+        minifiedObject = JSON.parse(minifiedString)
+      } catch (e) {
+        console.error(`The minified file is not valid for: ${minifiedFile}`)
+        throw e
+      }
       return { minifiedString, minifiedObject }
     })
   )