8.0.26

.gitlab-ci.yml

@@ -7,12 +7,20 @@ cache:
   key: "$CI_BUILD_STAGE"
 
 stages:
+- mirror
 - test
 - release
 - trigger
-- mirror
 - pages
 
+mirror:
+  image: hosttoday/ht-docker-node:npmci
+  stage: mirror
+  script:
+    - npmci git mirror
+  tags:
+    - docker
+
 testLEGACY:
   stage: test
   script:
@@ -63,16 +71,6 @@ trigger:
   tags:
     - docker
 
-mirror:
-  image: hosttoday/ht-docker-node:npmci
-  stage: mirror
-  script:
-    - npmci git mirror
-  tags:
-    - docker
-  only:
-    - tags
-
 pages:
   image: hosttoday/ht-docker-node:npmci
   stage: pages

dist/mod_compile/index.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * Note: Test files are only compiled in memory
  * -------------------------------------------- */
 const q = require("smartq");
-const plugins = require("./mod00.plugins");
+const plugins = require("./mod.plugins");
-const NpmtsAssets = require("./mod00.assets");
+const NpmtsAssets = require("./mod.assets");
-const NpmtsCheck = require("./mod00.check");
+const NpmtsCheck = require("./mod.check");
-const NpmtsClean = require("./mod00.clean");
+const NpmtsClean = require("./mod.clean");
-const NpmtsCompile = require("./mod00.compile");
+const NpmtsCompile = require("./mod.compile");
 exports.run = function (configArg) {
     let done = q.defer();
     plugins.beautylog.ora.text('starting TypeScript Compilation');

dist/mod_compile/mod.assets.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const paths = require("../npmts.paths");
-const plugins = require("./mod00.plugins");
+const plugins = require("./mod.plugins");
-const mod00_check_1 = require("../mod00/mod00.check");
+const mod_check_1 = require("../mod_compile/mod.check");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;
     plugins.beautylog.ora.text('now looking at ' + 'required assets');
     if (config.cli === true) {
-        let mainJsPath = mod00_check_1.projectInfo.packageJson.main;
+        let mainJsPath = mod_check_1.projectInfo.packageJson.main;
         let cliJsString = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'));
         cliJsString = cliJsString.replace('{{pathToIndex}}', mainJsPath);
         plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir, 'cli.js'));

dist/mod_compile/mod.check.js

@@ -11,7 +11,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const projectinfo_1 = require("projectinfo");
 const paths = require("../npmts.paths");
-const plugins = require("./mod00.plugins");
+const plugins = require("./mod.plugins");
 let checkProjectTypings = (configArg) => {
     let done = q.defer();
     plugins.beautylog.ora.text('Check Module: Check Project Typings...');
@@ -20,7 +20,6 @@ let checkProjectTypings = (configArg) => {
         plugins.beautylog.error(`please add typings field to package.json`);
         process.exit(1);
     }
-    ;
     done.resolve(configArg);
     return done.promise;
 };
@@ -66,7 +65,6 @@ let checkDependencies = (configArg) => {
         for (let item in unused.invalidFiles) {
             plugins.beautylog.warn(`Watch out: could not parse file ${item}`);
         }
-        ;
         for (let item in unused.invalidDirs) {
             plugins.beautylog.warn(`Watch out: could not parse directory ${item}`);
         }

dist/mod_compile/mod.clean.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const paths = require("../npmts.paths");
-const plugins = require("./mod00.plugins");
+const plugins = require("./mod.plugins");
 /**
  * removes the  dist directory which will be entirely rebuild
  */

dist/mod_compile/mod.compile.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const q = require("smartq");
 const paths = require("../npmts.paths");
-const plugins = require("./mod00.plugins");
+const plugins = require("./mod.plugins");
 exports.run = function (configArg) {
     let done = q.defer();
     let config = configArg;

dist/mod_test/index.js

@@ -11,9 +11,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /* ------------------------------------------
  * This module tests the compiled TypeScript files
  * -------------------------------------------- */
-const plugins = require("./mod02.plugins");
+const plugins = require("./mod.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

@@ -58,15 +58,15 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () {
         .then((configArg) => {
         let done = q.defer();
         plugins.beautylog.ora.start('loading additional modules...');
-        NpmtsMods.mod00.load()
+        NpmtsMods.modCompile.load()
-            .then((mod00) => {
+            .then((modCompile) => {
-            return mod00.run(configArg);
+            return modCompile.run(configArg);
         })
             .then(configArg => {
             let done = q.defer();
-            NpmtsMods.mod01.load()
+            NpmtsMods.modDocs.load()
-                .then(mod01 => {
+                .then(modDocs => {
-                return mod01.run(configArg);
+                return modDocs.run(configArg);
             })
                 .then(configArg => {
                 done.resolve(configArg);
@@ -75,9 +75,9 @@ exports.run = () => __awaiter(this, void 0, void 0, function* () {
         })
             .then(configArg => {
             let done = q.defer();
-            NpmtsMods.mod02.load()
+            NpmtsMods.modTest.load()
-                .then(mod02 => {
+                .then(modTest => {
-                return mod02.run(configArg);
+                return modTest.run(configArg);
             })
                 .then(configArg => {
                 done.resolve(configArg);

dist/npmts.mods.d.ts

@@ -1,7 +1,7 @@
 import { LazyModule } from 'smartsystem';
-import * as _mod00 from './mod00/index';
+import * as _modCompile from './mod_compile/index';
-import * as _mod01 from './mod01/index';
+import * as _modDocs from './mod_docs/index';
-import * as _mod02 from './mod02/index';
+import * as _modTest from './mod_test/index';
-export declare let mod00: LazyModule<typeof _mod00>;
+export declare let modCompile: LazyModule<typeof _modCompile>;
-export declare let mod01: LazyModule<typeof _mod01>;
+export declare let modDocs: LazyModule<typeof _modDocs>;
-export declare let mod02: LazyModule<typeof _mod02>;
+export declare let modTest: LazyModule<typeof _modTest>;

dist/npmts.mods.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const smartsystem_1 = require("smartsystem");
-exports.mod00 = new smartsystem_1.LazyModule('./mod00/index', __dirname);
+exports.modCompile = new smartsystem_1.LazyModule('./mod_compile/index', __dirname);
-exports.mod01 = new smartsystem_1.LazyModule('./mod01/index', __dirname);
+exports.modDocs = new smartsystem_1.LazyModule('./mod_docs/index', __dirname);
-exports.mod02 = new smartsystem_1.LazyModule('./mod02/index', __dirname);
+exports.modTest = new smartsystem_1.LazyModule('./mod_test/index', __dirname);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmts",
-  "version": "8.0.20",
+  "version": "8.0.26",
   "description": "best practice npm TypeScript modules",
   "main": "dist/index.js",
   "bin": {
@@ -34,36 +34,35 @@
   },
   "homepage": "https://gitlab.com/gitzone/npmts#readme",
   "dependencies": {
-    "@types/gulp-sourcemaps": "0.0.31",
+    "@types/gulp-sourcemaps": "0.0.32",
     "@types/minimatch": "^3.0.1",
     "@types/through2": "^2.0.33",
     "beautylog": "^6.1.10",
-    "depcheck": "^0.6.7",
+    "depcheck": "^0.6.8",
     "early": "^2.1.1",
     "gulp-function": "^2.2.9",
     "gulp-sourcemaps": "^2.6.1",
-    "gulp-typescript": "^3.2.2",
+    "gulp-typescript": "^3.2.3",
     "lodash": "^4.17.4",
     "npmextra": "^2.0.9",
-    "projectinfo": "^3.0.2",
+    "projectinfo": "^3.0.4",
     "smartanalytics": "^2.0.9",
     "smartchok": "^1.0.11",
-    "smartcli": "^2.0.7",
+    "smartcli": "^2.0.9",
     "smartcov": "^1.0.2",
     "smarterror": "^1.0.3",
-    "smartfile": "^4.2.20",
+    "smartfile": "^4.2.26",
     "smartgulp": "^1.0.6",
     "smartpath": "^3.2.8",
     "smartq": "^1.1.6",
     "smartstream": "^1.0.10",
-    "smartstring": "^2.0.24",
+    "smartstring": "^2.0.28",
     "smartsystem": "^2.0.2",
-    "smartupdate": "^1.0.11",
+    "smartupdate": "^1.0.13",
-    "tapbuffer": "^1.0.29",
+    "tapbuffer": "^1.0.31",
     "through2": "^2.0.3",
     "tsn": "^2.0.15",
-    "typescript": "^2.5.2",
+    "typescript": "^2.6.2"
-    "typings-global": "^1.0.20"
   },
   "devDependencies": {}
 }

ts/mod00/index.ts

@@ -1,27 +0,0 @@
-/* ------------------------------------------
- * This module compiles the module's TypeScript files
- * Note: Test files are only compiled in memory
- * -------------------------------------------- */
-import * as q from 'smartq'
-
-import { INpmtsConfig } from '../npmts.config'
-
-import * as plugins from './mod00.plugins'
-
-import * as NpmtsAssets from './mod00.assets'
-import * as NpmtsCheck from './mod00.check'
-import * as NpmtsClean from './mod00.clean'
-import * as NpmtsCompile from './mod00.compile'
-
-export let run = function(configArg: INpmtsConfig): Promise<INpmtsConfig> {
-    let done = q.defer<INpmtsConfig>()
-    plugins.beautylog.ora.text('starting TypeScript Compilation')
-    NpmtsClean.run(configArg)
-        .then(NpmtsCheck.run)
-        .then(NpmtsCompile.run)
-        .then(NpmtsAssets.run)
-        .then(function(){
-            done.resolve(configArg)
-        })
-        return done.promise
-}

ts/mod00/mod00.assets.ts

@@ -1,24 +0,0 @@
-import * as q from 'smartq'
-
-import paths = require('../npmts.paths')
-
-import plugins = require('./mod00.plugins')
-import { projectInfo } from '../mod00/mod00.check'
-
-export let run = function(configArg){
-    let done = q.defer()
-    let config = configArg
-    plugins.beautylog.ora.text('now looking at ' + 'required assets')
-    if (config.cli === true) {
-        let mainJsPath = projectInfo.packageJson.main
-        let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir,'cli.js'))
-        cliJsString = cliJsString.replace('{{pathToIndex}}',mainJsPath)
-        plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir,'cli.js'))
-        plugins.beautylog.ok('installed CLI assets!')
-        done.resolve(config)
-    } else {
-        plugins.beautylog.ok('No additional assets required!')
-        done.resolve(config)
-    }
-    return done.promise
-}

ts/mod_compile/index.ts

@@ -0,0 +1,27 @@
+/* ------------------------------------------
+ * This module compiles the module's TypeScript files
+ * Note: Test files are only compiled in memory
+ * -------------------------------------------- */
+import * as q from 'smartq'
+
+import { INpmtsConfig } from '../npmts.config'
+
+import * as plugins from './mod.plugins'
+
+import * as NpmtsAssets from './mod.assets'
+import * as NpmtsCheck from './mod.check'
+import * as NpmtsClean from './mod.clean'
+import * as NpmtsCompile from './mod.compile'
+
+export let run = function (configArg: INpmtsConfig): Promise<INpmtsConfig> {
+  let done = q.defer<INpmtsConfig>()
+  plugins.beautylog.ora.text('starting TypeScript Compilation')
+  NpmtsClean.run(configArg)
+    .then(NpmtsCheck.run)
+    .then(NpmtsCompile.run)
+    .then(NpmtsAssets.run)
+    .then(function () {
+      done.resolve(configArg)
+    })
+  return done.promise
+}

ts/mod_compile/mod.assets.ts

@@ -0,0 +1,24 @@
+import * as q from 'smartq'
+
+import paths = require('../npmts.paths')
+
+import plugins = require('./mod.plugins')
+import { projectInfo } from '../mod_compile/mod.check'
+
+export let run = function (configArg) {
+  let done = q.defer()
+  let config = configArg
+  plugins.beautylog.ora.text('now looking at ' + 'required assets')
+  if (config.cli === true) {
+    let mainJsPath = projectInfo.packageJson.main
+    let cliJsString: string = plugins.smartfile.fs.toStringSync(plugins.path.join(paths.npmtsAssetsDir, 'cli.js'))
+    cliJsString = cliJsString.replace('{{pathToIndex}}', mainJsPath)
+    plugins.smartfile.memory.toFsSync(cliJsString, plugins.path.join(paths.distDir, 'cli.js'))
+    plugins.beautylog.ok('installed CLI assets!')
+    done.resolve(config)
+  } else {
+    plugins.beautylog.ok('No additional assets required!')
+    done.resolve(config)
+  }
+  return done.promise
+}

ts/mod_compile/mod.check.ts

@@ -6,7 +6,7 @@ import { INpmtsConfig } from '../npmts.config'
 
 import * as paths from '../npmts.paths'
 
-import * as plugins from './mod00.plugins'
+import * as plugins from './mod.plugins'
 
 export let projectInfo: ProjectinfoNpm
 
@@ -17,7 +17,7 @@ let checkProjectTypings = (configArg: INpmtsConfig) => {
   if (typeof projectInfo.packageJson.typings === 'undefined') {
     plugins.beautylog.error(`please add typings field to package.json`)
     process.exit(1)
-  };
+  }
   done.resolve(configArg)
   return done.promise
 }
@@ -64,7 +64,7 @@ let checkDependencies = (configArg: INpmtsConfig) => {
     }
     for (let item in unused.invalidFiles) {
       plugins.beautylog.warn(`Watch out: could not parse file ${item}`)
-    };
+    }
     for (let item in unused.invalidDirs) {
       plugins.beautylog.warn(`Watch out: could not parse directory ${item}`)
     }

ts/mod_compile/mod.clean.ts

@@ -1,7 +1,7 @@
 import * as q from 'smartq'
 import paths = require('../npmts.paths')
 
-import plugins = require('./mod00.plugins')
+import plugins = require('./mod.plugins')
 
 /**
  * removes the  dist directory which will be entirely rebuild

ts/mod_compile/mod.compile.ts

@@ -2,7 +2,7 @@ import * as q from 'smartq'
 
 import * as paths from '../npmts.paths'
 
-import * as plugins from './mod00.plugins'
+import * as plugins from './mod.plugins'
 
 export let run = function (configArg) {
   let done = q.defer()

ts/mod_docs/index.ts

@@ -6,10 +6,10 @@ import * as q from 'smartq'
 import * as paths from '../npmts.paths'
 import { INpmtsConfig } from '../npmts.config'
 
-import * as plugins from './mod01.plugins'
+import * as plugins from './mod.plugins'
 
 export let run = function (configArg: INpmtsConfig) {
-    let done = q.defer<INpmtsConfig>()
+  let done = q.defer<INpmtsConfig>()
-    done.resolve(configArg)
+  done.resolve(configArg)
-    return done.promise
+  return done.promise
 }

ts/mod_test/index.ts

@@ -1,7 +1,7 @@
 /* ------------------------------------------
  * This module tests the compiled TypeScript files
  * -------------------------------------------- */
-import plugins = require('./mod02.plugins')
+import plugins = require('./mod.plugins')
 import paths = require('../npmts.paths')
 
 import * as q from 'smartq'
@@ -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

@@ -53,15 +53,15 @@ export let run = async () => {
     .then((configArg: NpmtsConfig.INpmtsConfig) => {
       let done = q.defer()
       plugins.beautylog.ora.start('loading additional modules...')
-      NpmtsMods.mod00.load()
+      NpmtsMods.modCompile.load()
-        .then((mod00) => {
+        .then((modCompile) => {
-          return mod00.run(configArg)
+          return modCompile.run(configArg)
         })
         .then(configArg => {
           let done = q.defer<NpmtsConfig.INpmtsConfig>()
-          NpmtsMods.mod01.load()
+          NpmtsMods.modDocs.load()
-            .then(mod01 => {
+            .then(modDocs => {
-              return mod01.run(configArg)
+              return modDocs.run(configArg)
             })
             .then(configArg => {
               done.resolve(configArg)
@@ -70,9 +70,9 @@ export let run = async () => {
         })
         .then(configArg => {
           let done = q.defer<NpmtsConfig.INpmtsConfig>()
-          NpmtsMods.mod02.load()
+          NpmtsMods.modTest.load()
-            .then(mod02 => {
+            .then(modTest => {
-              return mod02.run(configArg)
+              return modTest.run(configArg)
             })
             .then(configArg => {
               done.resolve(configArg)

ts/npmts.mods.ts

@@ -2,10 +2,10 @@ import * as plugins from './npmts.plugins'
 
 import { LazyModule } from 'smartsystem'
 
-import * as _mod00 from './mod00/index'
+import * as _modCompile from './mod_compile/index'
-import * as _mod01 from './mod01/index'
+import * as _modDocs from './mod_docs/index'
-import * as _mod02 from './mod02/index'
+import * as _modTest from './mod_test/index'
 
-export let mod00 = new LazyModule<typeof _mod00>('./mod00/index',__dirname)
+export let modCompile = new LazyModule<typeof _modCompile>('./mod_compile/index',__dirname)
-export let mod01 = new LazyModule<typeof _mod01>('./mod01/index',__dirname)
+export let modDocs = new LazyModule<typeof _modDocs>('./mod_docs/index',__dirname)
-export let mod02 = new LazyModule<typeof _mod02>('./mod02/index',__dirname)
+export let modTest = new LazyModule<typeof _modTest>('./mod_test/index',__dirname)