better separation of benchmarks

.gitignore

@@ -21,5 +21,5 @@ dist/
 demo/dist/
 
 # dont commit benchmark folders
-benchmark/
+.benchmark/
 timeline/

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();
   }
 }
 

benchmarks/benchmark.json

@@ -1,4 +1,5 @@
 {
+  "APP_PATH": ".benchmark",
   "evalConfig": {
     "tolerance": {
       "*": [0.75, 1.5],

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" },
+  ]
+}

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",

src/benchmark-tests/tsconfig.json

@@ -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"
-  ]
-}

src/tsconfig.json

@@ -11,6 +11,7 @@
     ],
     "rootDir": ".",
     "outDir": "../out",
+    "composite": true,
     "baseUrl": ".",
     "paths": {
       "common/*": [ "./common/*" ],

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" },
   ]
 }