Merge pull request #22 from smartive/develop

Release 2017-07-27

.gitignore

@@ -1,12 +1,19 @@
-node_modules
-
 # Logs
 logs
 *.log
 npm-debug.log*
 
+# Dependency directory
+node_modules
+
+# Optional npm cache directory
+.npm
+
+# Optional REPL history
+.node_repl_history
+
 # Typescript stuff
-typings
 build
-docs
 coverage
+
+package-lock.json

.npmignore

@@ -1,22 +1,8 @@
-build
-typings
-
 # Logs
 logs
 *.log
 npm-debug.log*
 
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Directory for instrumented libs generated by jscoverage/JSCover
-lib-cov
-
-# Coverage directory used by tools like istanbul
-coverage
-
 # Dependency directory
 node_modules
 
@@ -26,17 +12,18 @@ node_modules
 # Optional REPL history
 .node_repl_history
 
-
 # Typescript stuff
-typings
-build
-docs
-coverage
+build/
+coverage/
+config/
+tsconfig.json
+tslint.json
 
+# Typescript files (but not the definitions)
 *.ts
 !*.d.ts
 *.js.map
-*.spec.js
-*.spec.ts
-*.spec.d.ts
-*.spec.js.map
+
+# Testfiles
+jest.json
+test/

.npmrc

@@ -0,0 +1 @@
+package-lock=false

.travis.yml

@@ -1,20 +1,25 @@
 language: node_js
+
+cache:
+ directories:
+ - node_modules
+
+notifications:
+ email: false
+
 node_js:
-- '5'
-- '4.2'
+ - '8'
+ - '6'
 
-script: npm run citest
-after_script: "npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls"
+before_script:
+ - npm prune
 
-before_deploy:
- - npm run bootstrap
- - tsc --outDir .
+after_success:
+ - npm install coveralls@^2.11.9 && cat ./coverage/lcov.info | coveralls
+ - npm i
+ - npm run build
+ - npm run semantic-release
 
-deploy:
- provider: npm
- email: [email protected]
- api_key:
- secure: n3BwWneL6rVwcxNI6tGj8nbs3khJGK7QL331rbiMJtwt2Kqo1qjJ33xbrDEs78lsiqKrJr/9nMTo5dtOyp2YV4fB+x1h9Tufo14Ij1vnJB7lDq+m088pLXJHhKjyJXOKdAqjqqXp+D797uH/yGyk4KiGAgflNchwfjB4Io0x4vFNrcxeZXPZm3rkiarVqXcVNgSC3DTFI1Jqjt5qxlk135pdn9Ep8JreZozL/wKG4V99HCN1vdC9pqvm26PJQRoBr8ZKY6Pob6ViThswT4259N4Va2YLa204wzo8aCOAFz1WfWlkerortPEEAXKLueBCMTicxMQxl8saZupjDqDBJrTRwAh/KzcgQGu+upU3AvrhUGJbubJHNmJTBD5jq0MUzRYUfCkWEcikwbxptpjO2KvVt9SuQLF8NkAK+LbJulk09cvr+fQrutJZvhtogXp06gvrvsEZmAeHJsBl7wW/ASW+Q6fUI6KVX2LVoxa+cxlqFs13KOvwHzi6wgpTczKrs8bN1kQsZIkrgluxnNCYTXDYX34kiBE5kh7sKCJgFHapH7Im/pFwZrJeQz46LZaM/+5SW0jVEbfI/bfZgn0bpzXx2OB8YtidU67jXijwxutN6xolqKDV9r91Is/LzMwYdxnMHCK/91GOGdCScwPBzi9exr36rgt9fu3m5gzkZPA=
- on:
- tags: true
- repo: smartive/proc-that
+branches:
+ except:
+ - /^v\d+\.\d+\.\d+$/

config/tsconfig.base.json

@@ -0,0 +1,29 @@
+{
+ "compilerOptions": {
+ "target": "es6",
+ "module": "commonjs",
+ "moduleResolution": "node",
+ "removeComments": false,
+ "outDir": "../build",
+ "rootDir": "../src",
+ "declaration": true,
+ "sourceMap": false,
+ "importHelpers": true,
+ "strictNullChecks": true,
+ "experimentalDecorators": true,
+ "emitDecoratorMetadata": true,
+ "noUnusedLocals": true,
+ "noUnusedParameters": true,
+ "lib": [
+ "es2015",
+ "dom"
+ ]
+ },
+ "include": [
+ "../src/**/*"
+ ],
+ "exclude": [
+ "../node_modules",
+ "../build"
+ ]
+}

config/tsconfig.build.json

@@ -0,0 +1,6 @@
+{
+ "extends": "./tsconfig.base.json",
+ "compilerOptions": {
+ "outDir": "../"
+ }
+}

jest.json

@@ -0,0 +1,19 @@
+{
+ "collectCoverage": true,
+ "mapCoverage": true,
+ "transform": {
+ "^.+\\.tsx?$": "<rootDir>/node_modules/ts-jest/preprocessor.js"
+ },
+ "testMatch": [
+ "**/test/**/*.spec.ts"
+ ],
+ "testPathIgnorePatterns": [
+ "/node_modules/"
+ ],
+ "moduleFileExtensions": [
+ "ts",
+ "tsx",
+ "js",
+ "json"
+ ]
+}

package.json

@@ -1,47 +1,46 @@
 {
  "name": "proc-that",
- "version": "0.6.1",
+ "version": "0.0.0-development",
  "description": "proc(ess)-that - easy extendable etl tool for nodejs written in typesript",
  "main": "index.js",
  "scripts": {
- "clean": "rimraf build",
- "bootstrap": "npm install && typings install",
- "pretest": "npm run clean && tsc",
- "test": "mocha --ui bdd --recursive ./build",
- "precitest": "npm run bootstrap && npm run clean && tsc",
- "citest": "istanbul cover -x \"**/*.spec.*\" _mocha --report lcovonly -- --ui bdd --recursive ./build",
- "develop": "npm run clean && tsc --sourceMap -w --pretty"
+ "clean": "del-cli ./build ./coverage",
+ "build": "npm run clean && tsc -p ./config/tsconfig.build.json",
+ "develop": "npm run clean && tsc -p .",
+ "lint": "tslint -c ./tslint.json -p ./config/tsconfig.build.json",
+ "test": "npm run lint && npm run clean && jest -c ./jest.json",
+ "test:watch": "npm run clean && jest -c ./jest.json --watch",
+ "semantic-release": "semantic-release pre && npm publish && semantic-release post"
  },
  "keywords": [
  "etl",
  "node",
  "typescript"
  ],
  "engines": {
- "node": ">=4.2"
+ "node": ">=6"
  },
  "repository": {
  "type": "git",
- "url": "git@github.com:buehler/proc-that.git"
+ "url": "https://github.com/smartive/proc-that.git"
  },
- "bugs": "https://github.com/buehler/proc-that/issues",
+ "bugs": "https://github.com/smartive/proc-that/issues",
  "author": "Christoph Bühler <[email protected]>",
  "license": "MIT",
  "devDependencies": {
- "chai": "^3.5.0",
- "chai-as-promised": "^5.3.0",
- "del-cli": "^0.2.0",
- "istanbul": "^0.4.4",
- "mocha": "^2.5.3",
- "mocha-lcov-reporter": "^1.2.0",
- "rimraf": "^2.5.2",
- "sinon": "^1.17.4",
- "sinon-chai": "^2.8.0",
- "tslint": "^3.13.0",
- "typescript": "^1.8.10",
- "typings": "^1.3.1"
+ "@types/jest": "^20.0.5",
+ "del-cli": "^1.1.0",
+ "jest": "^20.0.4",
+ "ts-jest": "^20.0.7",
+ "tslint": "^5.5.0",
+ "tslint-config-airbnb": "^5.2.1",
+ "tsutils": "^2.8.0",
+ "typescript": "^2.4.2",
+ "semantic-release": "^6.3.6"
  },
  "dependencies": {
- "rxjs": "5.0.0-beta.10"
+ "@types/node": "^8.0.17",
+ "rxjs": "^5.4.2",
+ "tslib": "^1.7.1"
  }
 }