Improved script tags in package.json

Author: patrick-tolosa

.gitignore

@@ -7,3 +7,5 @@ bin
 *.map
 !lib
 test_cache/
+.nyc_output
+docs

package.json

@@ -34,7 +34,7 @@
     "jsdom": "^9.12.0",
     "jsdom-global": "2.1.1",
     "mocha": "^5.0.0",
-    "nyc": "^13.0.1",
+    "nyc": "^13.3.0",
     "sinon": "^6.1.4",
     "webpack-cli": "^3.2.1"
   },
@@ -48,17 +48,17 @@
   ],
   "types": "types",
   "scripts": {
-    "test": "set -e node_v=$(node --version)z\nif [[ \"${node_v%%.*z}\" == 'v4' ]]\nthen\nnpm run test-es5\nelse\nnpm run test-es6\nfi\nnpm run dtslint",
-    "dtslint": "dtslint --expectOnly --localTs node_modules/typescript/lib types ",
+    "test": "tools/scripts/test.sh",
+    "dtslint": "tools/scripts/ditslint.sh",
     "lint": "eslint .",
-    "compile": "node_modules/.bin/babel lib --out-dir lib-es5 --delete-dir-on-start --verbose",
-    "test-es6": "which node && node node_modules/.bin/mocha --ui bdd -R spec --recursive test/",
-    "test-es5": "node node_modules/.bin/mocha -R spec --recursive --require 'babel-register' --require 'babel-polyfill' test/",
-    "docs": "npm run compile && node_modules/.bin/jsdoc -d docs -r -p lib/*"
+    "compile": "tools/scripts/compile.sh",
+    "coverage": "tools/scripts/test.es6.sh --coverage",
+    "test-es6": "tools/scripts/test.es6.sh",
+    "test-es5": "tools/scripts/test.es5.sh",
+    "docs": "tools/scripts/docs.sh"
   },
   "optionalDependencies": {},
   "engines": {
     "node": ">=0.6"
   }
 }
-

tools/scripts/compile.sh

@@ -0,0 +1 @@
+babel lib --out-dir lib-es5 --delete-dir-on-start --verbose

tools/scripts/ditslint.sh

@@ -0,0 +1 @@
+dtslint --expectOnly --localTs node_modules/typescript/lib types

tools/scripts/docs.sh

@@ -0,0 +1 @@
+npm run compile && jsdoc -d docs -r -p lib/*

tools/scripts/test.es5.sh

@@ -0,0 +1 @@
+mocha -R spec --recursive --require 'babel-register' --require 'babel-polyfill' test/

tools/scripts/test.es6.sh

@@ -0,0 +1,20 @@
+COLLECT_COVERAGE=0;
+
+for arg in "$@"
+do
+    case $arg in
+        --coverage)
+        COLLECT_COVERAGE=1
+        shift # Remove --initialize from processing
+    esac
+done
+
+if [ "$COLLECT_COVERAGE" -eq "1" ]; then
+  echo 'Running code coverage test on ES6 code'
+  nyc --reporter=text mocha --ui bdd -R spec --recursive test/
+  exit;
+else
+  echo 'Running tests on ES6 Code'
+  mocha --ui bdd -R spec --recursive test/
+fi
+

tools/scripts/test.sh

@@ -0,0 +1,8 @@
+set -e node_v=$(node --version)z
+if [[ "${node_v%%.*z}" == 'v4' ]]
+then
+  npm run test-es5
+else
+  npm run test-es6
+fi
+  npm run dtslint