From e0d69db23e0d28d9568edea7a37c6ee0cfc0dec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Breitbart?= <jerch@rockborn.de>
Date: Sun, 9 Jun 2019 21:53:24 +0200
Subject: [PATCH] better separation of benchmarks

---
 .gitignore                                    |  2 +-
 .../EscapeSequenceParser.benchmark.ts         |  0
 .../Terminal.benchmark.ts                     |  6 ++--
 benchmark.json => benchmarks/benchmark.json   |  1 +
 benchmarks/tsconfig.json                      | 32 +++++++++++++++++++
 package.json                                  |  6 ++--
 src/benchmark-tests/tsconfig.json             | 23 -------------
 src/tsconfig.json                             |  1 +
 tsconfig.all.json                             |  2 +-
 9 files changed, 42 insertions(+), 31 deletions(-)
 rename {src/benchmark-tests => benchmarks}/EscapeSequenceParser.benchmark.ts (100%)
 rename {src/benchmark-tests => benchmarks}/Terminal.benchmark.ts (95%)
 rename benchmark.json => benchmarks/benchmark.json (93%)
 create mode 100644 benchmarks/tsconfig.json
 delete mode 100644 src/benchmark-tests/tsconfig.json

diff --git a/.gitignore b/.gitignore
index f221a5bc..e386a725 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,5 +21,5 @@ dist/
 demo/dist/
 
 # dont commit benchmark folders
-benchmark/
+.benchmark/
 timeline/
diff --git a/src/benchmark-tests/EscapeSequenceParser.benchmark.ts b/benchmarks/EscapeSequenceParser.benchmark.ts
similarity index 100%
rename from src/benchmark-tests/EscapeSequenceParser.benchmark.ts
rename to benchmarks/EscapeSequenceParser.benchmark.ts
diff --git a/src/benchmark-tests/Terminal.benchmark.ts b/benchmarks/Terminal.benchmark.ts
similarity index 95%
rename from src/benchmark-tests/Terminal.benchmark.ts
rename to benchmarks/Terminal.benchmark.ts
index a9e5bca7..996c9985 100644
--- a/src/benchmark-tests/Terminal.benchmark.ts
+++ b/benchmarks/Terminal.benchmark.ts
@@ -12,11 +12,11 @@ import { Terminal } from 'Terminal';
 class TestTerminal extends Terminal {
   writeSync(data: string): void {
     this.writeBuffer.push(data);
-    (this as any)._innerWrite();
+    this._innerWrite();
   }
   writeSyncUtf8(data: Uint8Array): void {
-    (this as any).writeBufferUtf8.push(data);
-    (this as any)._innerWriteUtf8();
+    this.writeBufferUtf8.push(data);
+    this._innerWriteUtf8();
   }
 }
 
diff --git a/benchmark.json b/benchmarks/benchmark.json
similarity index 93%
rename from benchmark.json
rename to benchmarks/benchmark.json
index 7d8e2223..f8b99b55 100644
--- a/benchmark.json
+++ b/benchmarks/benchmark.json
@@ -1,4 +1,5 @@
 {
+  "APP_PATH": ".benchmark",
   "evalConfig": {
     "tolerance": {
       "*": [0.75, 1.5],
diff --git a/benchmarks/tsconfig.json b/benchmarks/tsconfig.json
new file mode 100644
index 00000000..4dcf9b65
--- /dev/null
+++ b/benchmarks/tsconfig.json
@@ -0,0 +1,32 @@
+{
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "es6",
+    ],
+    "outDir": "../out/test",
+    "types": [
+      "../../node_modules/@types/node"
+    ],
+    "baseUrl": "..",
+    "strict": true,
+    "baseUrl": ".",
+    "paths": {
+      "common/*": [ "../src/common/*" ],
+      "browser/*": [ "../src/browser/*" ],
+      "Terminal": [ "../src/Terminal" ]
+    },
+  },
+  "include": [
+    "./**/*",
+    "../typings/xterm.d.ts"
+  ],
+  "exclude": [
+    "../**/*test.ts"
+  ],
+  "references": [
+    { "path": "../src/common" },
+    { "path": "../src/browser" },
+    { "path": "../src" },
+  ]
+}
diff --git a/package.json b/package.json
index 52fd7001..9cb9e1aa 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
     "prepublishOnly": "npm run package",
     "watch": "tsc -b -w ./tsconfig.all.json --preserveWatchOutput",
     "clean": "rm -rf lib out addons/*/lib",
-    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmark.json",
-    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmark.json --baseline out/benchmark-tests/*benchmark.js",
-    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmark.json --eval out/benchmark-tests/*benchmark.js"
+    "benchmark": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json",
+    "benchmark-baseline": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json --baseline out/test/*benchmark.js",
+    "benchmark-eval": "NODE_PATH=./out xterm-benchmark -r 5 -c benchmarks/benchmark.json --eval out/test/*benchmark.js"
   },
   "devDependencies": {
     "@types/chai": "^3.4.34",
diff --git a/src/benchmark-tests/tsconfig.json b/src/benchmark-tests/tsconfig.json
deleted file mode 100644
index 2c59a500..00000000
--- a/src/benchmark-tests/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "extends": "../tsconfig-library-base",
-  "compilerOptions": {
-    "lib": [
-      "dom",
-      "es6",
-    ],
-    "outDir": "../../out",
-    "types": [
-      "../../node_modules/@types/node"
-    ],
-    "baseUrl": "..",
-    "strict": false
-  },
-  "include": [
-    "./**/*",
-    "../**/*",
-    "../../typings/xterm.d.ts"
-  ],
-  "exclude": [
-    "../**/*test.ts"
-  ]
-}
diff --git a/src/tsconfig.json b/src/tsconfig.json
index 97576668..afaabfbb 100644
--- a/src/tsconfig.json
+++ b/src/tsconfig.json
@@ -11,6 +11,7 @@
     ],
     "rootDir": ".",
     "outDir": "../out",
+    "composite": true,
     "baseUrl": ".",
     "paths": {
       "common/*": [ "./common/*" ],
diff --git a/tsconfig.all.json b/tsconfig.all.json
index 6985b64d..aa368d5b 100644
--- a/tsconfig.all.json
+++ b/tsconfig.all.json
@@ -4,10 +4,10 @@
   "references": [
     { "path": "./src" },
     { "path": "./test" },
+    { "path": "./benchmarks" },
     { "path": "./addons/xterm-addon-attach/src" },
     { "path": "./addons/xterm-addon-fit/src" },
     { "path": "./addons/xterm-addon-search/src" },
     { "path": "./addons/xterm-addon-web-links/src" },
-    { "path": "./src/benchmark-tests" },
   ]
 }