Merge branch 'master' of https://github.com/HelpfulScripts/hsDatab

Author: hs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hsdatab",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "main": "./index.js",
   "types": "./index.d.ts",
   "keywords": [
@@ -43,7 +43,9 @@
     "grunt-tslint": "^4.0.1",
     "grunt-typedoc": "^0.2.4",
     "grunt-webpack": "^3.1.2",
+    "jest": "^23.4.2",
     "tslint": "^4.5.1",
+    "ts-jest": "^23.0.1",
     "typedoc": "^0.11.1",
     "typescript": "^2.9.2",
     "uglifyjs-webpack-plugin": "^1.2.5",

sharedGruntConfig.js

@@ -23,24 +23,21 @@ module.exports = (grunt, dir, dependencies, type, lib) => {
 	grunt.loadNpmTasks('grunt-contrib-clean');
     grunt.loadNpmTasks('grunt-contrib-copy');
     grunt.loadNpmTasks('grunt-contrib-less');
-    grunt.loadNpmTasks('grunt-coveralls');
     grunt.loadNpmTasks('grunt-typedoc');
     grunt.loadNpmTasks('grunt-tslint');
     grunt.loadNpmTasks('grunt-ts');
     grunt.loadNpmTasks('grunt-webpack');
     grunt.loadNpmTasks('jest');
 
     //------ Add Doc Tasks
-    grunt.registerTask('doc', ['clean:docs', 'copy:html', 'typedoc', 'sourceCode']);
+    grunt.registerTask('doc', ['clean:docs', 'copy:htmlGH', 'typedoc', 'sourceCode', 'copy:docs2NPM']);
 
     //------ Add Staging Tasks
-    grunt.registerTask('stage', ['copy:docs2NPM', `${(type === 'app')? 'copy:app2NPM': 'copy:lib2NPM'}`]);
+    grunt.registerTask('stage', [`${(type === 'app')? 'copy:app2NPM': 'copy:lib2NPM'}`]);
 
     //------ Add Test Tasks
     grunt.registerTask('ospec', () => { require('child_process').spawnSync('./node_modules/.bin/ospec', {stdio: 'inherit'}); });
-    grunt.registerTask('jest',  () => { require('child_process').spawnSync('./node_modules/.bin/jest',  
-        ['-c=jest.config.json', '-i'], 
-        {stdio: 'inherit'}); });
+    grunt.registerTask('jest',  () => { require('child_process').spawnSync('./node_modules/.bin/jest',  ['-c=jest.config.json', '-i'], {stdio: 'inherit'}); });
     grunt.registerTask('test', ['clean:cov', 'jest', 'copy:coverage', 'cleanupCoverage']); 
 
     //------ Add Build Tasks
@@ -94,7 +91,7 @@ module.exports = (grunt, dir, dependencies, type, lib) => {
                     src:['*.md', 'package.json'], dest:'bin' 
                 }
             ]},
-            html: { files: [
+            htmlGH: { files: [
                 { expand:true, cwd: devPath+'/staging/',    // index.html
                     src:['index.html'], dest:'docs' 
                 }
@@ -253,13 +250,6 @@ module.exports = (grunt, dir, dependencies, type, lib) => {
             }
         },
 
-        coveralls: {
-            options: { force: false },
-            target: {
-                src: `./docs/data/src/${lib}/coverage/lcov.info`,
-                options: {}
-            }
-        },
         watch: {
             dependencies: {
                 files: dependencies.map(d => `./node_modules/${d.toLowerCase()}/index.js`),

src/Data.jest.ts

@@ -1,5 +1,3 @@
-require('coveralls');
-
 import * as hsdatab     from './';
 import { Data } from './Data';