8.0.24

.gitignore

@@ -1,3 +1,4 @@
+.nogit/
 node_modules/
 test/
 pages/

.gitlab-ci.yml

@@ -7,15 +7,26 @@ cache:
   key: "$CI_BUILD_STAGE"
 
 stages:
+- mirror
 - test
 - release
 - trigger
 - pages
 
+mirror:
+  image: hosttoday/ht-docker-node:npmci
+  stage: mirror
+  script:
+    - npmci git mirror
+  tags:
+    - docker
+
 testLEGACY:
   stage: test
   script:
-    - npmci test legacy
+    - npmci node install legacy
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -24,7 +35,9 @@ testLEGACY:
 testLTS:
   stage: test
   script:
-    - npmci test lts
+    - npmci node install lts
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -32,7 +45,9 @@ testLTS:
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -40,7 +55,8 @@ testSTABLE:
 release:
   stage: release
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:

CHANGELOG

@@ -1,11 +0,0 @@
-Please view this file on the master branch, on stable branches it's out of date.
-
-v 6.0.0 (released)
-    - remove TypeDoc, please look at npmpage
-    - check package.json
-
-v 7.0.0
-    - switch from mocha to tap
-    - run tests in SubProcesses with coverage
-    - improve ES6 handling
-    - add smartanalytics

dist/mod02/index.js

@@ -14,6 +14,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./mod02.plugins");
 const paths = require("../npmts.paths");
 const q = require("smartq");
+let testTypeScriptConfig = {
+    target: 'ES5',
+    emitDecoratorMetadata: true,
+    experimentalDecorators: true,
+    lib: [
+        'DOM',
+        'ESNext'
+    ]
+};
 /**
  * runs mocha
  * @returns INpmtsConfig
@@ -31,12 +40,7 @@ let tap = function (configArg) {
     let testableFilesSmartstream = new plugins.smartstream.Smartstream([
         plugins.smartgulp.src([plugins.path.join(paths.cwd, './ts/**/*.ts')]),
         plugins.gulpSourcemaps.init(),
-        plugins.gulpTypeScript({
+        plugins.gulpTypeScript(testTypeScriptConfig),
-            target: 'ES5',
-            emitDecoratorMetadata: true,
-            experimentalDecorators: true,
-            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
-        }),
         plugins.gulpSourcemaps.write(),
         npmtsTapBuffer.pipeTestableFiles(),
         plugins.smartstream.cleanPipe()
@@ -47,12 +51,7 @@ let tap = function (configArg) {
     let testFilesSmartstream = new plugins.smartstream.Smartstream([
         plugins.smartgulp.src([plugins.path.join(paths.cwd, 'test/*.ts')]),
         plugins.gulpSourcemaps.init(),
-        plugins.gulpTypeScript({
+        plugins.gulpTypeScript(testTypeScriptConfig),
-            target: 'ES5',
-            emitDecoratorMetadata: true,
-            experimentalDecorators: true,
-            lib: ['DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable']
-        }),
         plugins.gulpSourcemaps.write(),
         npmtsTapBuffer.pipeTestFiles(),
         plugins.smartstream.cleanPipe()

dist/npmts.cli.js

@@ -1,4 +1,12 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const plugins = require("./npmts.plugins");
@@ -15,18 +23,35 @@ const NpmtsShip = require("./npmts.ship");
  * Since yarn is out and there is heavy caching going on,
  * pure download stats are just not reliable enough for us anymore
  * Feel free to dig into the smartanalytics package, if you are interested in how it works.
- * It is just an https call to Google Analytics.
+ * It is just an https call to our own Lossless Analytics API.
  * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
  */
-let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts', 'UA-64087619-5');
+let npmtsAnalytics = new plugins.smartanalytics.Analytics({
-npmtsAnalytics.sendEvent('npm', 'exec', 'git.zone');
+    apiEndPoint: 'https://pubapi.lossless.one/analytics',
-exports.run = () => {
+    projectId: 'gitzone',
+    appName: 'npmts'
+});
+process.nextTick(() => __awaiter(this, void 0, void 0, function* () {
+    // make the analytics call
+    npmtsAnalytics.recordEvent('npmToolExecution', {
+        executionMode: (yield NpmtsConfig.configPromise).mode,
+        tsOptions: (yield NpmtsConfig.configPromise).tsOptions,
+        watch: (yield NpmtsConfig.configPromise).watch,
+        coverageTreshold: (yield NpmtsConfig.configPromise).coverageTreshold
+    }).catch(err => {
+        plugins.beautylog.warn('Lossless Analytics API not available...');
+    });
+}));
+exports.run = () => __awaiter(this, void 0, void 0, function* () {
     let done = q.defer();
+    plugins.beautylog.figletSync('NPMTS');
     let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot);
+    // check for updates
+    yield plugins.smartupdate.standardHandler.check('npmts', npmtsProjectInfo.version, 'http://gitzone.gitlab.io/npmts/changelog.html');
+    plugins.beautylog.log('---------------------------------------------');
     let npmtsCli = new plugins.smartcli.Smartcli();
     npmtsCli.standardTask()
         .then((argvArg) => {
-        plugins.beautylog.figletSync('NPMTS');
         plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version);
         return NpmtsConfig.run(argvArg);
     })
@@ -68,5 +93,5 @@ exports.run = () => {
     } });
     npmtsCli.addVersion(npmtsProjectInfo.version);
     npmtsCli.startParse();
-    return done.promise;
+    return yield done.promise;
-};
+});

dist/npmts.config.d.ts

@@ -23,3 +23,4 @@ export interface INpmtsConfig {
     };
 }
 export declare let run: (argvArg: any) => Promise<{}>;
+export declare let configPromise: Promise<INpmtsConfig>;

dist/npmts.config.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./npmts.plugins");
 const paths = require("./npmts.paths");
-const q = require("smartq");
+const smartq = require("smartq");
 exports.run = function (argvArg) {
-    let done = q.defer();
+    let done = smartq.defer();
     let defaultConfig = {
         argv: undefined,
         coverageTreshold: 70,
@@ -63,5 +63,9 @@ exports.run = function (argvArg) {
     }
     plugins.beautylog.ok('build options are ready!');
     done.resolve(config);
+    configDeferred.resolve(config);
     return done.promise;
 };
+// config deferred usage
+let configDeferred = smartq.defer();
+exports.configPromise = configDeferred.promise;

dist/npmts.plugins.d.ts

@@ -13,5 +13,6 @@ import * as smartpath from 'smartpath';
 import * as smartstream from 'smartstream';
 import * as smartstring from 'smartstring';
 import * as smartsystem from 'smartsystem';
+import * as smartupdate from 'smartupdate';
 import * as through2 from 'through2';
-export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartanalytics, smartcli, smarterror, smartfile, smartpath, smartstream, smartstring, smartsystem, through2 };
+export { beautylog, depcheck, lodash, npmextra, projectinfo, path, smartanalytics, smartcli, smarterror, smartfile, smartpath, smartstream, smartstring, smartsystem, smartupdate, through2 };

dist/npmts.plugins.js

@@ -29,5 +29,7 @@ const smartstring = require("smartstring");
 exports.smartstring = smartstring;
 const smartsystem = require("smartsystem");
 exports.smartsystem = smartsystem;
+const smartupdate = require("smartupdate");
+exports.smartupdate = smartupdate;
 const through2 = require("through2");
 exports.through2 = through2;

docs/changelog.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 2017-07-30: Version 7.x.x -> 8.x.x
+Testfiles in ./test/ can now import files directly from the ts dir:
+
+```javascript
+// ./test/test.ts
+import * as myModule from '../ts/index
+```

docs/getstarted.md

@@ -0,0 +1,38 @@
+---
+name: Get Started
+description: learn how to quickly write npm TypeScript modules
+---
+# Get Started with NPMTS
+and learn how to quickly write npm TypeScript modules
+
+## Step1: Install the tools
+
+To use npmts install it using npm or yarn:
+
+```sh
+npm install -g npmts # install with npm
+yarn global add npmts # install with yarn
+```
+
+For the purpose of getting started quickly please also install **gitzone**.
+It'll proovide awesome scaffolding for new npmts maintained modules and also updates them later on. 
+
+```sh
+npm install -g gitzone # install with npm
+yarn global add gitzone # install with yarn
+```
+
+You can make sure npmts and gitzone are installed correctly by typing `npmts -v && gitzone -v`.
+
+## Scaffold a new module
+
+To scaffold a new module type
+
+```shell
+gitzone template npm
+```
+
+This will run you through a series of question to get gitzone to know the specifics of your module.
+Enter all information accordingly.
+
+## Run NPMTS for the first time

docs/index.md

@@ -1,8 +1,9 @@
 ---
-name: Start
+name: Index
+description: best practice npm TypeScript modules
 ---
 # npmts
-Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
+best practice npm TypeScript modules
 
 ## Availabililty
 [![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)

docs/structure.md

@@ -0,0 +1,26 @@
+---
+name: npmts project structure
+description: how npmts projects are structured
+---
+# npmts - Project Structure
+
+**locally**
+
+```text
+projectroot
+|- .nogit/           # contains files that should not be checked into git - NOgit
+|- dist/             # contains compiled js files and their corresponding typings - git
+|- node_modules/     # contains the installed node modules - NOgit
+|- test/             # contains the test files - git
+|- ts/               # contains the source TypeScript files - git 
+|
+|- .gitignore        # the normal gitignore file
+|- .gitlab-ci.yml    # the gitlab ci yml file
+|- npmextra.json     # npmextra.json
+|- package.json      # the standard npm module package.json file
+|- readme.md         # the standard project readme
+|- tslint.json       # the standard tslint.json for TypeScript
+|- yarn.lock         # yarn.lock - the standard yarn.lock file
+```
+
+**in git**

package.json

@@ -1,7 +1,7 @@
 {
   "name": "npmts",
-  "version": "8.0.0",
+  "version": "8.0.24",
-  "description": "Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.",
+  "description": "best practice npm TypeScript modules",
   "main": "dist/index.js",
   "bin": {
     "npmts": "assets/cliNpmts.js"
@@ -35,33 +35,34 @@
   "homepage": "https://gitlab.com/gitzone/npmts#readme",
   "dependencies": {
     "@types/gulp-sourcemaps": "0.0.31",
-    "@types/minimatch": "^2.0.29",
+    "@types/minimatch": "^3.0.1",
     "@types/through2": "^2.0.33",
     "beautylog": "^6.1.10",
     "depcheck": "^0.6.7",
     "early": "^2.1.1",
     "gulp-function": "^2.2.9",
-    "gulp-sourcemaps": "^2.6.0",
+    "gulp-sourcemaps": "^2.6.1",
-    "gulp-typescript": "^3.2.1",
+    "gulp-typescript": "^3.2.2",
     "lodash": "^4.17.4",
-    "npmextra": "^2.0.8",
+    "npmextra": "^2.0.9",
-    "projectinfo": "^3.0.2",
+    "projectinfo": "^3.0.4",
-    "smartanalytics": "^1.0.6",
+    "smartanalytics": "^2.0.9",
     "smartchok": "^1.0.11",
     "smartcli": "^2.0.7",
     "smartcov": "^1.0.2",
     "smarterror": "^1.0.3",
-    "smartfile": "^4.2.17",
+    "smartfile": "^4.2.26",
     "smartgulp": "^1.0.6",
     "smartpath": "^3.2.8",
     "smartq": "^1.1.6",
     "smartstream": "^1.0.10",
     "smartstring": "^2.0.24",
-    "smartsystem": "^1.0.18",
+    "smartsystem": "^2.0.2",
+    "smartupdate": "^1.0.13",
     "tapbuffer": "^1.0.29",
     "through2": "^2.0.3",
     "tsn": "^2.0.15",
-    "typescript": "^2.4.2",
+    "typescript": "^2.5.3",
     "typings-global": "^1.0.20"
   },
   "devDependencies": {}

readme.md

@@ -1,5 +1,5 @@
 # npmts
-Write npm modules with TypeScript without hassle. TypeScript ready. Fully ES6.
+best practice npm TypeScript modules
 
 ## Availabililty
 [![npm](https://gitzone.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/npmts)
@@ -38,6 +38,9 @@ For more information about how to best write tap tests check out the [tapbundle
 This works on your machine and in CI. There is a prebuild docker image available that includes npmts to make CI a breeze:  
 [hosttoday/ht-docker-node:npmts on Dockerhub](https://hub.docker.com/r/hosttoday/ht-docker-node/)
 
+## Changelog
+For breaking changes please see the [changelog](https://gitzone.gitlab.io/npmts/changelog.html).
+
 For further information read the linked docs at the top of this README.
 
 > MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)

ts/index.ts

@@ -8,7 +8,7 @@ early.start('NPMTS')
 import * as plugins from './npmts.plugins'
 import * as cli from './npmts.cli'
 early.stop()
-    .then(() => {
+  .then(() => {
-        let loaded = plugins // to make sure plugins get actually loaded
+    let loaded = plugins // to make sure plugins get actually loaded
-        cli.run()
+    cli.run()
-    })
+  })

ts/mod02/index.ts

@@ -10,6 +10,16 @@ import * as q from 'smartq'
 import { INpmtsConfig } from '../npmts.config'
 import { Smartfile } from 'smartfile'
 
+let testTypeScriptConfig = {
+  target: 'ES5',
+  emitDecoratorMetadata: true,
+  experimentalDecorators: true,
+  lib: [
+    'DOM',
+    'ESNext'
+  ]
+}
+
 /**
  * runs mocha
  * @returns INpmtsConfig
@@ -30,12 +40,7 @@ let tap = function (configArg: INpmtsConfig) {
   let testableFilesSmartstream = new plugins.smartstream.Smartstream([
     plugins.smartgulp.src([ plugins.path.join(paths.cwd, './ts/**/*.ts') ]),
     plugins.gulpSourcemaps.init(),
-    plugins.gulpTypeScript({
+    plugins.gulpTypeScript(testTypeScriptConfig),
-      target: 'ES5',
-      emitDecoratorMetadata: true,
-      experimentalDecorators: true,
-      lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
-    }),
     plugins.gulpSourcemaps.write(),
     npmtsTapBuffer.pipeTestableFiles(),
     plugins.smartstream.cleanPipe()
@@ -47,12 +52,7 @@ let tap = function (configArg: INpmtsConfig) {
   let testFilesSmartstream = new plugins.smartstream.Smartstream([
     plugins.smartgulp.src([ plugins.path.join(paths.cwd, 'test/*.ts') ]),
     plugins.gulpSourcemaps.init(),
-    plugins.gulpTypeScript({
+    plugins.gulpTypeScript(testTypeScriptConfig),
-      target: 'ES5',
-      emitDecoratorMetadata: true,
-      experimentalDecorators: true,
-      lib: [ 'DOM', 'ES5', 'ES2015.Promise', 'ES2015.Generator', 'ES2015.Iterable' ]
-    }),
     plugins.gulpSourcemaps.write(),
     npmtsTapBuffer.pipeTestFiles(),
     plugins.smartstream.cleanPipe()

ts/npmts.cli.ts

@@ -15,19 +15,38 @@ import * as NpmtsShip from './npmts.ship'
  * Since yarn is out and there is heavy caching going on,
  * pure download stats are just not reliable enough for us anymore
  * Feel free to dig into the smartanalytics package, if you are interested in how it works.
- * It is just an https call to Google Analytics.
+ * It is just an https call to our own Lossless Analytics API.
  * Our privacy policy can be found here: https://lossless.gmbh/privacy.html
  */
-let npmtsAnalytics = new plugins.smartanalytics.AnalyticsAccount('npmts','UA-64087619-5')
+let npmtsAnalytics = new plugins.smartanalytics.Analytics({
-npmtsAnalytics.sendEvent('npm','exec','git.zone')
+  apiEndPoint: 'https://pubapi.lossless.one/analytics',
+  projectId: 'gitzone',
+  appName: 'npmts'
+})
 
-export let run = () => {
+process.nextTick(async () => {
+  // make the analytics call
+  npmtsAnalytics.recordEvent('npmToolExecution', {
+    executionMode: (await NpmtsConfig.configPromise).mode,
+    tsOptions: (await NpmtsConfig.configPromise).tsOptions,
+    watch: (await NpmtsConfig.configPromise).watch,
+    coverageTreshold: (await NpmtsConfig.configPromise).coverageTreshold
+  }).catch(err => {
+    plugins.beautylog.warn('Lossless Analytics API not available...')
+  })
+})
+
+export let run = async () => {
   let done = q.defer()
+
+  plugins.beautylog.figletSync('NPMTS')
   let npmtsProjectInfo = new plugins.projectinfo.ProjectinfoNpm(paths.npmtsPackageRoot)
+  // check for updates
+  await plugins.smartupdate.standardHandler.check('npmts', npmtsProjectInfo.version, 'http://gitzone.gitlab.io/npmts/changelog.html')
+  plugins.beautylog.log('---------------------------------------------')
   let npmtsCli = new plugins.smartcli.Smartcli()
   npmtsCli.standardTask()
     .then((argvArg) => {
-      plugins.beautylog.figletSync('NPMTS')
       plugins.beautylog.info('npmts version: ' + npmtsProjectInfo.version)
       return NpmtsConfig.run(argvArg)
     })
@@ -68,5 +87,5 @@ export let run = () => {
     .catch((err) => { if (err instanceof Error) { console.log(err) } })
   npmtsCli.addVersion(npmtsProjectInfo.version)
   npmtsCli.startParse()
-  return done.promise
+  return await done.promise
 }

ts/npmts.config.ts

@@ -1,7 +1,7 @@
 import plugins = require('./npmts.plugins')
 import paths = require('./npmts.paths')
 
-import * as q from 'smartq'
+import * as smartq from 'smartq'
 
 // interfaces
 import { ITapbufferConfig } from 'tapbuffer'
@@ -32,7 +32,7 @@ export interface INpmtsConfig {
 }
 
 export let run = function (argvArg) {
-  let done = q.defer()
+  let done = smartq.defer()
   let defaultConfig: INpmtsConfig = {
     argv: undefined,
     coverageTreshold: 70,
@@ -104,5 +104,10 @@ export let run = function (argvArg) {
 
   plugins.beautylog.ok('build options are ready!')
   done.resolve(config)
+  configDeferred.resolve(config)
   return done.promise
 }
+
+// config deferred usage
+let configDeferred = smartq.defer<INpmtsConfig>()
+export let configPromise = configDeferred.promise

ts/npmts.plugins.ts

@@ -14,6 +14,7 @@ import * as smartpath from 'smartpath'
 import * as smartstream from 'smartstream'
 import * as smartstring from 'smartstring'
 import * as smartsystem from 'smartsystem'
+import * as smartupdate from 'smartupdate'
 import * as through2 from 'through2'
 
 export {
@@ -31,5 +32,6 @@ export {
     smartstream,
     smartstring,
     smartsystem,
+    smartupdate,
     through2
 }

ts/npmts.watch.ts

@@ -8,27 +8,27 @@ import { INpmtsConfig } from './npmts.config'
 
 let npmtsSmartchok: smartchok.Smartchok = null
 export let run = (configArg: INpmtsConfig) => {
-    let done = q.defer()
+  let done = q.defer()
-    if (configArg.watch && npmtsSmartchok === null) {
+  if (configArg.watch && npmtsSmartchok === null) {
-        let pathsToWatch: string[] = []
+    let pathsToWatch: string[] = []
-        for (let key in configArg.ts) {
+    for (let key in configArg.ts) {
-            pathsToWatch.push(key)
+      pathsToWatch.push(key)
-        }
-        for (let key in configArg.testTs) {
-            pathsToWatch.push(key)
-        }
-        npmtsSmartchok = new smartchok.Smartchok(pathsToWatch)
-        npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
-            plugins.beautylog.info('now watching...')
-            changeObservableArg.subscribe(() => {
-                cli.run()
-            })
-        })
-        npmtsSmartchok.start()
-        done.resolve(configArg)
-    } else {
-        plugins.beautylog.info('not watching')
-        done.resolve(configArg)
     }
-    return done.promise
+    for (let key in configArg.testTs) {
+      pathsToWatch.push(key)
+    }
+    npmtsSmartchok = new smartchok.Smartchok(pathsToWatch)
+    npmtsSmartchok.getObservableFor('change').then((changeObservableArg) => {
+      plugins.beautylog.info('now watching...')
+      changeObservableArg.subscribe(() => {
+        cli.run()
+      })
+    })
+    npmtsSmartchok.start()
+    done.resolve(configArg)
+  } else {
+    plugins.beautylog.info('not watching')
+    done.resolve(configArg)
+  }
+  return done.promise
 }