development-core - npm Package Compare versions

Comparing version 0.4.13 to 0.5.0

gulpfile.ts

@@ -64,7 +64,7 @@ // DynamicTask
         },
-        { src: 'src/**/*.ts', name: 'watch', watch: ['tscompile'] },
+        { src: 'src/**/*.ts', name: 'watch', watchTasks: ['tscompile'] },
         { name: 'clean', order: 0, src: 'src', dist: 'lib', task: (config) => del(config.getDist()) }
-    ], oper, env);
+    ], { oper: oper, watch: env.watch });
 
     return runTaskSequence(gulp, tasks, config);
 }

lib/bindingConfig.js

@@ -1,2 +0,2 @@
-"use strict";function bindingConfig(e){return e.oper||(e.oper=currentOperation(e.env)),e.fileFilter=e.fileFilter||utils_1.files,e.runSequence=e.runSequence||taskSequence_1.runSequence,e.addToSequence=e.addToSequence||taskSequence_1.addToSequence,e.generateTask=e.generateTask||function(n){return generateTask_1.generateTask(n,e.oper,e.env)},e.findTasks=e.findTasks||decorator_1.findTasksInModule.bind(e),e.findTasksInDir=e.findTasksInDir||decorator_1.findTasksInDir.bind(e),e.findTaskDefine=e.findTaskDefine||decorator_1.findTaskDefineInModule.bind(e),e.findTaskDefineInDir=e.findTaskDefineInDir||decorator_1.findTaskDefineInDir.bind(e),e.subTaskName=e.subTaskName||function(n){var i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r="";_.isString(n)?r=n:n&&(r=utils_1.taskStringVal(n.name,e.oper));var t=utils_1.taskStringVal(e.option.name,e.oper);return t?t+"-"+(r||i):r},e.getSrc=e.getSrc||function(n){var i=void 0;return n&&(i=utils_1.taskSourceVal(n.src,e.oper)),i||(i=utils_1.taskSourceVal(e.option.src,e.oper)),i},e.getDist=e.getDist||function(n){if(n){var i=getCurrentDist(n,e.oper);if(i)return i}return getCurrentDist(e.option,e.oper)},e}function currentOperation(e){var n=void 0;return n=e.deploy?TaskConfig_1.Operation.deploy:e.release?TaskConfig_1.Operation.release:e.e2e?TaskConfig_1.Operation.e2e:e.test?TaskConfig_1.Operation.test:TaskConfig_1.Operation.build}function getCurrentDist(e,n){var i=void 0;switch(n){case TaskConfig_1.Operation.build:i=e.build||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.test:i=e.test||e.build||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.e2e:i=e.e2e||e.build||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.release:i=e.release||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.deploy:i=e.deploy||utils_1.taskStringVal(e.dist,n);break;default:i=""}return i}var _=require("lodash"),TaskConfig_1=require("./TaskConfig"),generateTask_1=require("./generateTask"),taskSequence_1=require("./taskSequence"),utils_1=require("./utils"),decorator_1=require("./decorator");exports.bindingConfig=bindingConfig,exports.currentOperation=currentOperation;
+"use strict";function bindingConfig(e){return e.oper||(e.oper=currentOperation(e.env)),e.fileFilter=e.fileFilter||utils_1.files,e.runSequence=e.runSequence||taskSequence_1.runSequence,e.addToSequence=e.addToSequence||taskSequence_1.addToSequence,e.generateTask=e.generateTask||function(n){return generateTask_1.generateTask(n,{oper:e.oper,watch:e.env.watch})},e.findTasks=e.findTasks||decorator_1.findTasksInModule.bind(e),e.findTasksInDir=e.findTasksInDir||decorator_1.findTasksInDir.bind(e),e.findTaskDefine=e.findTaskDefine||decorator_1.findTaskDefineInModule.bind(e),e.findTaskDefineInDir=e.findTaskDefineInDir||decorator_1.findTaskDefineInDir.bind(e),e.subTaskName=e.subTaskName||function(n){var i=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"",r="";_.isString(n)?r=n:n&&(r=utils_1.taskStringVal(n.name,e.oper));var t=utils_1.taskStringVal(e.option.name,e.oper);return t?t+"-"+(r||i):r},e.getSrc=e.getSrc||function(n){var i=void 0;return n&&(i=utils_1.taskSourceVal(n.src,e.oper)),i||(i=utils_1.taskSourceVal(e.option.src,e.oper)),i},e.getDist=e.getDist||function(n){if(n){var i=getCurrentDist(n,e.oper);if(i)return i}return getCurrentDist(e.option,e.oper)},e}function currentOperation(e){var n=void 0;return n=e.deploy?TaskConfig_1.Operation.deploy:e.release?TaskConfig_1.Operation.release:e.e2e?TaskConfig_1.Operation.e2e:e.test?TaskConfig_1.Operation.test:TaskConfig_1.Operation.build}function getCurrentDist(e,n){var i=void 0;switch(n){case TaskConfig_1.Operation.build:i=e.build||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.test:i=e.test||e.build||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.e2e:i=e.e2e||e.build||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.release:i=e.release||utils_1.taskStringVal(e.dist,n);break;case TaskConfig_1.Operation.deploy:i=e.deploy||utils_1.taskStringVal(e.dist,n);break;default:i=""}return i}var _=require("lodash"),TaskConfig_1=require("./TaskConfig"),generateTask_1=require("./generateTask"),taskSequence_1=require("./taskSequence"),utils_1=require("./utils"),decorator_1=require("./decorator");exports.bindingConfig=bindingConfig,exports.currentOperation=currentOperation;
 //# sourceMappingURL=sourcemaps/bindingConfig.js.map

lib/decorator.d.ts

 /// <reference types="chai" />
 import 'reflect-metadata';
-import { ITask, ITaskInfo, ITaskDefine, Src, Operation, IEnvOption } from './TaskConfig';
+import { ITask, ITaskInfo, ITaskDefine, Src } from './TaskConfig';
 export declare function task<T extends Function>(target?: (new <T>() => T) | ITaskInfo): any;
 export declare function dynamicTask<T extends Function>(target?: (new <T>() => T) | ITaskInfo): any;
-export declare function findTasks(target: any, oper?: Operation, env?: IEnvOption): ITask[];
+export declare function findTasks(target: any, match?: ITaskInfo): ITask[];
 export declare function taskdefine<T extends Function>(target?: (new <T>() => T)): any;
@@ -11,4 +11,4 @@ export declare function findTaskDefines(target: any): ITaskDefine[];
 export declare function findTaskDefineInModule(md: string | Object): Promise<ITaskDefine>;
-export declare function findTasksInModule(md: string | Object, oper?: Operation, env?: IEnvOption): Promise<ITask[]>;
+export declare function findTasksInModule(md: string | Object, match?: ITaskInfo): Promise<ITask[]>;
 export declare function findTaskDefineInDir(dirs: Src): Promise<ITaskDefine>;
-export declare function findTasksInDir(dirs: Src, oper?: Operation, env?: IEnvOption): Promise<ITask[]>;
+export declare function findTasksInDir(dirs: Src, match?: ITaskInfo): Promise<ITask[]>;

lib/decorator.js

@@ -1,2 +0,2 @@
-"use strict";function task(e){if(_.isFunction(e))return e.__task={},e;var n=function(){var n=e;return{v:function(e){return e.__task=n||{},e}}}();return"object"===("undefined"==typeof n?"undefined":_typeof(n))?n.v:void 0}function dynamicTask(e){if(e&&_.isFunction(e))return e.__dynamictask=!0,e;var n=function(){var n=e;return{v:function(e){return e.__dynamictask=n||!0,e}}}();return"object"===("undefined"==typeof n?"undefined":_typeof(n))?n.v:void 0}function findTasks(e,n,r){var i=[];if(!e)return i;if(_.isFunction(e)){if(e.__task){var t=new e;t.decorator=e.__task,i.push(t)}if(e.__dynamictask){var s=(new e).tasks();i=i.concat(generateTask_1.generateTask(s,n,r))}}else _.isArray(e)?_.each(e,function(e){i.concat(findTasks(e))}):_.each(_.keys(e),function(n){n&&e[n]&&!/^[0-9]+$/.test(n)&&(console.log(chalk.grey("find task from :"),chalk.cyan(n)),i=i.concat(findTasks(e[n])))});return i}function taskdefine(e){if(_.isFunction(e))return e.__taskdefine=!0,e;var n=function(){var n=e;return{v:function(e){return e.__taskdefine=n||!0,e}}}();return"object"===("undefined"==typeof n?"undefined":_typeof(n))?n.v:void 0}function findTaskDefines(e){var n=[];return e?(_.isFunction(e)?e.__taskdefine&&n.push(new e):_.isArray(e)?_.each(e,function(e){n.concat(findTaskDefines(e))}):_.each(_.keys(e),function(r){r&&e[r]&&!/^[0-9]+$/.test(r)&&(console.log(chalk.grey("find task define from :"),chalk.cyan(r)),n=n.concat(findTaskDefines(e[r])))}),n):n}function findTaskDefine(e){var n=void 0;return e?(_.isFunction(e)?e.__taskdefine&&(n=new e):_.isArray(e)?_.each(e,function(e){return!n&&(n=findTaskDefine(e),!0)}):_.each(_.keys(e),function(r){return!n&&(!(r&&e[r]&&!/^[0-9]+$/.test(r))||(console.log(chalk.grey("find task define from :"),chalk.cyan(r)),n=findTaskDefine(e[r]),!0))}),n):null}function findTaskDefineInModule(e){var n=void 0;try{n=findTaskDefine(_.isString(e)?require(e):e)}catch(e){return Promise.reject(e)}return n?Promise.resolve(n):Promise.reject("can not found task define.")}function findTasksInModule(e,n,r){var i=void 0;try{i=_.isString(e)?findTasks(require(e),n,r):findTasks(e,n,r)}catch(e){return Promise.reject(e)}return Promise.resolve(i)}function findTaskDefineInDir(e){return Promise.race(_.map(_.isArray(e)?e:[e],function(e){return new Promise(function(n,r){if(fs_1.existsSync(e)){var i=requireDir(e);if(i){var t=findTaskDefine(i);t&&n(t)}}})}))}function findTasksInDir(e,n,r){return Promise.all(_.map(_.isArray(e)?e:[e],function(e){console.log(chalk.grey("begin load task from dir"),chalk.cyan(e));try{var i=requireDir(e,{recurse:!0});return Promise.resolve(findTasks(i,n,r))}catch(e){return Promise.reject(e)}})).then(function(e){return _.flatten(e)})}var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};require("reflect-metadata");var _=require("lodash"),chalk=require("chalk"),generateTask_1=require("./generateTask"),fs_1=require("fs"),requireDir=require("require-dir");exports.task=task,exports.dynamicTask=dynamicTask,exports.findTasks=findTasks,exports.taskdefine=taskdefine,exports.findTaskDefines=findTaskDefines,exports.findTaskDefine=findTaskDefine,exports.findTaskDefineInModule=findTaskDefineInModule,exports.findTasksInModule=findTasksInModule,exports.findTaskDefineInDir=findTaskDefineInDir,exports.findTasksInDir=findTasksInDir;
+"use strict";function task(e){if(_.isFunction(e))return e.__task={},e;var n=function(){var n=e;return{v:function(e){return e.__task=n||{},e}}}();return"object"===("undefined"==typeof n?"undefined":_typeof(n))?n.v:void 0}function dynamicTask(e){if(e&&_.isFunction(e))return e.__dynamictask=!0,e;var n=function(){var n=e;return{v:function(e){return e.__dynamictask=n||!0,e}}}();return"object"===("undefined"==typeof n?"undefined":_typeof(n))?n.v:void 0}function findTasks(e,n){var r=[];if(!e)return r;if(_.isFunction(e)){if(e.__task){var i=e.__task;if(n){if(n.oper&&i.oper&&(i.oper&n.oper)<=0)return r;if(n.group&&i.group!==n.group)return r}if(i.watch){if(!n||!n.watch)return r;if(i.watch!==n.watch)return r}var t=new e;t.decorator=i,r.push(t)}else if(e.__dynamictask){var a=e.__dynamictask;if(n){if(n.oper&&a.oper&&(a.oper&n.oper)<=0)return r;if(n.group&&a.group!==n.group)return r}if(a.watch){if(!n||!n.watch)return r;if(a.watch!==n.watch)return r}var s=(new e).tasks();r=r.concat(generateTask_1.generateTask(s,n))}}else _.isArray(e)?_.each(e,function(e){r.concat(findTasks(e,n))}):_.each(_.keys(e),function(i){i&&e[i]&&!/^[0-9]+$/.test(i)&&(console.log(chalk.grey("find task from :"),chalk.cyan(i)),r=r.concat(findTasks(e[i],n)))});return r}function taskdefine(e){if(_.isFunction(e))return e.__taskdefine=!0,e;var n=function(){var n=e;return{v:function(e){return e.__taskdefine=n||!0,e}}}();return"object"===("undefined"==typeof n?"undefined":_typeof(n))?n.v:void 0}function findTaskDefines(e){var n=[];return e?(_.isFunction(e)?e.__taskdefine&&n.push(new e):_.isArray(e)?_.each(e,function(e){n.concat(findTaskDefines(e))}):_.each(_.keys(e),function(r){r&&e[r]&&!/^[0-9]+$/.test(r)&&(console.log(chalk.grey("find task define from :"),chalk.cyan(r)),n=n.concat(findTaskDefines(e[r])))}),n):n}function findTaskDefine(e){var n=void 0;return e?(_.isFunction(e)?e.__taskdefine&&(n=new e):_.isArray(e)?_.each(e,function(e){return!n&&(n=findTaskDefine(e),!0)}):_.each(_.keys(e),function(r){return!n&&(!(r&&e[r]&&!/^[0-9]+$/.test(r))||(console.log(chalk.grey("find task define from :"),chalk.cyan(r)),n=findTaskDefine(e[r]),!0))}),n):null}function findTaskDefineInModule(e){var n=void 0;try{n=findTaskDefine(_.isString(e)?require(e):e)}catch(e){return Promise.reject(e)}return n?Promise.resolve(n):Promise.reject("can not found task define.")}function findTasksInModule(e,n){var r=void 0;try{r=_.isString(e)?findTasks(require(e),n):findTasks(e,n)}catch(e){return Promise.reject(e)}return Promise.resolve(r)}function findTaskDefineInDir(e){return Promise.race(_.map(_.isArray(e)?e:[e],function(e){return new Promise(function(n,r){if(fs_1.existsSync(e)){var i=requireDir(e);if(i){var t=findTaskDefine(i);t&&n(t)}}})}))}function findTasksInDir(e,n){return Promise.all(_.map(_.isArray(e)?e:[e],function(e){console.log(chalk.grey("begin load task from dir"),chalk.cyan(e));try{var r=requireDir(e,{recurse:!0});return Promise.resolve(findTasks(r,n))}catch(e){return Promise.reject(e)}})).then(function(e){return _.flatten(e)})}var _typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};require("reflect-metadata");var _=require("lodash"),chalk=require("chalk"),generateTask_1=require("./generateTask"),fs_1=require("fs"),requireDir=require("require-dir");exports.task=task,exports.dynamicTask=dynamicTask,exports.findTasks=findTasks,exports.taskdefine=taskdefine,exports.findTaskDefines=findTaskDefines,exports.findTaskDefine=findTaskDefine,exports.findTaskDefineInModule=findTaskDefineInModule,exports.findTasksInModule=findTasksInModule,exports.findTaskDefineInDir=findTaskDefineInDir,exports.findTasksInDir=findTasksInDir;
 //# sourceMappingURL=sourcemaps/decorator.js.map

lib/generateTask.d.ts

@@ -1,2 +0,2 @@
-import { IDynamicTask, IEnvOption, Operation, ITask } from './TaskConfig';
-export declare function generateTask(tasks: IDynamicTask | IDynamicTask[], oper?: Operation, env?: IEnvOption): ITask[];
+import { ITaskInfo, IDynamicTask, ITask } from './TaskConfig';
+export declare function generateTask(tasks: IDynamicTask | IDynamicTask[], match?: ITaskInfo): ITask[];

lib/generateTask.js

@@ -1,2 +0,2 @@
-"use strict";function _classCallCheck(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}function generateTask(e,n,t){var r=[];return _.each(_.isArray(e)?e:[e],function(e){if(!(n&&e.oper&&(e.oper&n)<=0))if(t&&e.watch){if(!t.watch)return;r.push(createWatchTask(e))}else _.isFunction(e.task)?r.push(createTask(e)):r.push(createPipesTask(e))}),r}function createTask(e){var n=function(n,t){var r=n.subTaskName(e.name);return console.log("register custom dynamic task:",chalk.cyan(r)),t.task(r,function(){return e.task(n,e,t)}),r};return new DynamicTask({order:e.order,oper:e.oper,watch:!!e.watch},n)}function createWatchTask(e){var n=function(n,t){var r=_.isFunction(e.watch)?e.watch(n):e.watch;_.isFunction(_.last(r))||r.push(function(t){e.watchChanged&&e.watchChanged(t,n)}),r=_.map(r,function(e){return _.isString(e)?n.subTaskName(e):e});var a=n.subTaskName(e);return console.log("register watch  dynamic task:",chalk.cyan(a)),t.task(a,function(){console.log("watch, src:",chalk.cyan.call(chalk,n.option.src)),t.watch(n.getSrc(e),r)}),a};return new DynamicTask({order:e.order,oper:e.oper,watch:!!e.watch},n)}function createPipesTask(e){var n=function(n,t){var r=n.subTaskName(e);return console.log("register pipes  dynamic task:",chalk.cyan(r)),t.task(r,function(){var r=Promise.resolve(t.src(n.getSrc(e)));return e.pipes?!function(){var a=_.isFunction(e.pipes)?e.pipes(n,e,t):e.pipes;r=r.then(function(r){return Promise.all(_.map(a,function(r){return _.isFunction(r)?r(n,e,t):r})).then(function(e){return _.each(e,function(e){r=r.pipe(e)}),r})})}():e.pipe&&(r=r.then(function(t){return new Promise(function(r,a){return e.pipe(t,n,e,function(e){e?a(e):r(t)})})})),r=null!==e.output?r.then(function(r){if(e.output){var a=_.isFunction(e.output)?e.output(n,e):e.output;return Promise.all(_.map(a,function(a){return Promise.resolve(_.isFunction(a)?a(r,n,e,t):a).then(function(e){return new Promise(function(n,t){e.once("end",function(){n(e)}).once("error",t)})})}))}return new Promise(function(a,c){var o=t.dest(n.getDist(e));r.pipe(o).once("end",function(){a(o)}).once("error",c)})}):r.then(function(e){return new Promise(function(n,t){e.once("end",function(){n(e)}).once("error",t)})}),r.catch(function(e){console.log(chalk.red(e)),process.exit(0)})}),r};return new DynamicTask({order:e.order,oper:e.oper,watch:!!e.watch},n)}var _createClass=function(){function e(e,n){for(var t=0;t<n.length;t++){var r=n[t];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(n,t,r){return t&&e(n.prototype,t),r&&e(n,r),n}}(),_=require("lodash"),coregulp=require("gulp"),chalk=require("chalk"),DynamicTask=function(){function e(n,t){_classCallCheck(this,e),this.decorator=n,this.factory=t}return _createClass(e,[{key:"setup",value:function(e,n){var t=this.factory(e,n||coregulp);return t&&(this.decorator.name=t),t}}]),e}();exports.generateTask=generateTask;
+"use strict";function _classCallCheck(e,n){if(!(e instanceof n))throw new TypeError("Cannot call a class as a function")}function generateTask(e,n){var t=[];return _.each(_.isArray(e)?e:[e],function(e){if(n){if(n.oper&&e.oper&&(e.oper&n.oper)<=0)return;if(n.group&&e.group!==n.group)return}if(e.watchTasks&&(e.watch=e.watch||!!e.watchTasks),e.watch){if(!n||!n.watch)return;e.watch===n.watch&&t.push(createWatchTask(e))}else _.isFunction(e.task)?t.push(createTask(e)):t.push(createPipesTask(e))}),t}function createTask(e){var n=function(n,t){var r=n.subTaskName(e.name);return console.log("register custom dynamic task:",chalk.cyan(r)),t.task(r,function(){return e.task(n,e,t)}),r};return new DynamicTask({order:e.order,oper:e.oper,watch:e.watch},n)}function createWatchTask(e){var n=function(n,t){var r=_.isFunction(e.watchTasks)?e.watchTasks(n):e.watchTasks;_.isFunction(_.last(r))||r.push(function(t){e.watchChanged&&e.watchChanged(t,n)}),r=_.map(r,function(e){return _.isString(e)?n.subTaskName(e):e});var a=n.subTaskName(e);return console.log("register watch  dynamic task:",chalk.cyan(a)),t.task(a,function(){console.log("watch, src:",chalk.cyan.call(chalk,n.option.src)),t.watch(n.getSrc(e),r)}),a};return new DynamicTask({order:e.order,oper:e.oper,watch:e.watch},n)}function createPipesTask(e){var n=function(n,t){var r=n.subTaskName(e);return console.log("register pipes  dynamic task:",chalk.cyan(r)),t.task(r,function(){var r=Promise.resolve(t.src(n.getSrc(e)));return e.pipes?!function(){var a=_.isFunction(e.pipes)?e.pipes(n,e,t):e.pipes;r=r.then(function(r){return Promise.all(_.map(a,function(r){return _.isFunction(r)?r(n,e,t):r})).then(function(e){return _.each(e,function(e){r=r.pipe(e)}),r})})}():e.pipe&&(r=r.then(function(t){return new Promise(function(r,a){return e.pipe(t,n,e,function(e){e?a(e):r(t)})})})),r=null!==e.output?r.then(function(r){if(e.output){var a=_.isFunction(e.output)?e.output(n,e):e.output;return Promise.all(_.map(a,function(a){return Promise.resolve(_.isFunction(a)?a(r,n,e,t):a).then(function(e){return new Promise(function(n,t){e.once("end",function(){n(e)}).once("error",t)})})}))}return new Promise(function(a,c){var o=t.dest(n.getDist(e));r.pipe(o).once("end",function(){a(o)}).once("error",c)})}):r.then(function(e){return new Promise(function(n,t){e.once("end",function(){n(e)}).once("error",t)})}),r.catch(function(e){console.log(chalk.red(e)),process.exit(0)})}),r};return new DynamicTask({order:e.order,oper:e.oper,watch:!!e.watch},n)}var _createClass=function(){function e(e,n){for(var t=0;t<n.length;t++){var r=n[t];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(n,t,r){return t&&e(n.prototype,t),r&&e(n,r),n}}(),_=require("lodash"),coregulp=require("gulp"),chalk=require("chalk"),DynamicTask=function(){function e(n,t){_classCallCheck(this,e),this.decorator=n,this.factory=t}return _createClass(e,[{key:"setup",value:function(e,n){var t=this.factory(e,n||coregulp);return t&&(this.decorator.taskName=t),t}}]),e}();exports.generateTask=generateTask;
 //# sourceMappingURL=sourcemaps/generateTask.js.map

lib/TaskConfig.d.ts

@@ -19,4 +19,5 @@ /// <reference types="gulp" />
     order?: number;
-    name?: Src;
-    watch?: boolean;
+    taskName?: Src;
+    watch?: boolean | string;
+    group?: string;
 }
@@ -64,7 +65,5 @@ export declare type TaskResult = Src | void;
 }
-export interface IDynamicTask extends IOutputDist {
+export interface IDynamicTask extends IOutputDist, ITaskInfo {
     name: TaskString;
-    order?: number;
-    oper?: Operation;
-    watch?: Array<string | WatchCallback> | ((config?: ITaskConfig, dt?: IDynamicTask) => Array<string | WatchCallback>);
+    watchTasks?: Array<string | WatchCallback> | ((config?: ITaskConfig, dt?: IDynamicTask) => Array<string | WatchCallback>);
     watchChanged?(event: WatchEvent, config: ITaskConfig): any;
@@ -71,0 +70,0 @@ pipe?(gulpsrc: ITransform, config: ITaskConfig, dt?: IDynamicTask, callback?: TaskCallback): ITransform | Promise<ITransform> | void;

lib/taskSequence.js

@@ -1,2 +0,2 @@
-"use strict";function toSequence(e,r,n){var t=[],o=r.length;return o<1?t:(r=_.orderBy(r,function(e){return _.isArray(e)?o:_.isNumber(e.decorator.order)?e.decorator.order:o}),_.each(r,function(r){if((!r.decorator.watch||n.env.watch)&&(!r.decorator.oper||r.decorator.oper&&(r.decorator.oper&n.oper)>0)){var o=r.setup(n,e);o&&t.push(o)}}),t)}function addToSequence(e,r){if(!r)return e;if(r.name){if(_.isNumber(r.order)&&r.order>=0&&r.order<e.length)return e.splice(r.order,0,r.name),e;e.push(r.name)}return e}function runSequence(e,r){console.log("run tasks : ",chalk.cyan(r));var n=new Promise(function(n,t){var o=null;return r&&r.length>0&&_.each(r,function(r){o=o?o.then(function(){return startTask(e,r)}):startTask(e,r)}),o.then(n).catch(t)});return n.catch(function(e){console.error(chalk.red(e)),process.exit(0)})}function startTask(e,r){var n=null,t=null;return new Promise(function(o,u){var c={};_.each(_.isArray(r)?r:[r],function(e){c[e]=!1}),n=function(e){process.exit(e),console.error(chalk.red(e)),u(e)},t=function(e){c[e.task]=!0,_.some(_.values(c),function(e){return!e})||o()},e.on("task_stop",t).on("task_err",n),e.start(r)}).then(function(){e.removeListener&&(e.removeListener("task_stop",t),e.removeListener("task_err",n))},function(r){e.removeListener&&(e.removeListener("task_stop",t),e.removeListener("task_err",n))})}function runTaskSequence(e,r,n){var t=toSequence(e,r,n);return runSequence(e,t)}var _=require("lodash"),chalk=require("chalk");exports.toSequence=toSequence,exports.addToSequence=addToSequence,exports.runSequence=runSequence,exports.runTaskSequence=runTaskSequence;
+"use strict";function toSequence(e,r,n){var t=[],o=r.length;return o<1?t:(r=_.orderBy(r,function(e){return _.isArray(e)?o:_.isNumber(e.decorator.order)?e.decorator.order:o}),_.each(r,function(r){if((!r.decorator.watch||n.env.watch)&&(!r.decorator.oper||r.decorator.oper&&(r.decorator.oper&n.oper)>0)){var o=r.setup(n,e);o&&t.push(o)}}),t)}function addToSequence(e,r){if(!r)return e;if(r.taskName){if(_.isNumber(r.order)&&r.order>=0&&r.order<e.length)return e.splice(r.order,0,r.taskName),e;e.push(r.taskName)}return e}function runSequence(e,r){console.log("run tasks : ",chalk.cyan(r));var n=new Promise(function(n,t){var o=null;return r&&r.length>0&&_.each(r,function(r){o=o?o.then(function(){return startTask(e,r)}):startTask(e,r)}),o.then(n).catch(t)});return n.catch(function(e){console.error(chalk.red(e)),process.exit(0)})}function startTask(e,r){var n=null,t=null;return new Promise(function(o,u){var c={};_.each(_.isArray(r)?r:[r],function(e){c[e]=!1}),n=function(e){process.exit(e),console.error(chalk.red(e)),u(e)},t=function(e){c[e.task]=!0,_.some(_.values(c),function(e){return!e})||o()},e.on("task_stop",t).on("task_err",n),e.start(r)}).then(function(){e.removeListener&&(e.removeListener("task_stop",t),e.removeListener("task_err",n))},function(r){e.removeListener&&(e.removeListener("task_stop",t),e.removeListener("task_err",n))})}function runTaskSequence(e,r,n){var t=toSequence(e,r,n);return runSequence(e,t)}var _=require("lodash"),chalk=require("chalk");exports.toSequence=toSequence,exports.addToSequence=addToSequence,exports.runSequence=runSequence,exports.runTaskSequence=runTaskSequence;
 //# sourceMappingURL=sourcemaps/taskSequence.js.map

package.json

 {
   "name": "development-core",
-  "version": "0.4.13",
+  "version": "0.5.0",
   "description": "development build tools.",
@@ -5,0 +5,0 @@ "main": "./lib/index.js",

README.md

@@ -195,3 +195,3 @@ # packaged development-core
         },
-        { src: 'src/**/*.ts', name: 'watch', watch: ['tscompile'] },
+        { src: 'src/**/*.ts', name: 'watch', watchTasks: ['tscompile'] },
         { name: 'clean', order: 0, src: 'src', dist: 'lib', task: (config) => del(config.getDist()) }
@@ -198,0 +198,0 @@ ], oper, env);

src/bindingConfig.ts

@@ -26,3 +26,3 @@ import * as _ from 'lodash';
     cfg.generateTask = cfg.generateTask || ((tasks: IDynamicTask | IDynamicTask[]) => {
-        return generateTask(tasks, cfg.oper, cfg.env);
+        return generateTask(tasks, { oper: cfg.oper, watch: cfg.env.watch });
     });
@@ -29,0 +29,0 @@

src/decorator.ts

@@ -44,2 +44,3 @@ import 'reflect-metadata';
 
+
 /**
@@ -50,7 +51,6 @@ * find tasks in Object module.
  * @param {*} target
- * @param {Operation} [oper]
- * @param {IEnvOption} [env]
+ * @param {ITaskInfo} [match]
  * @returns {ITask[]}
  */
-export function findTasks(target: any, oper?: Operation, env?: IEnvOption): ITask[] {
+export function findTasks(target: any, match?: ITaskInfo): ITask[] {
     let tasks: ITask[] = [];
@@ -62,13 +62,52 @@ if (!target) {
         if (target['__task']) {
+            let tinfo: ITaskInfo = target['__task'];
+
+            if (match) {
+                if (match.oper && tinfo.oper && (tinfo.oper & match.oper) <= 0) {
+                    return tasks;
+                }
+
+                if (match.group && tinfo.group !== match.group) {
+                    return tasks;
+                }
+            }
+
+            if (tinfo.watch) {
+                if (!match || !match.watch) {
+                    return tasks;
+                } else if (tinfo.watch !== match.watch) {
+                    return tasks;
+                }
+            }
+
+
             let task: ITask = new target();
-            task.decorator = <ITaskInfo>target['__task'];
+            task.decorator = tinfo;
             tasks.push(task);
-        }
-        if (target['__dynamictask']) {
+        } else if (target['__dynamictask']) {
+            let tinfo: ITaskInfo = target['__dynamictask'];
+            if (match) {
+                if (match.oper && tinfo.oper && (tinfo.oper & match.oper) <= 0) {
+                    return tasks;
+                }
+
+                if (match.group && tinfo.group !== match.group) {
+                    return tasks;
+                }
+            }
+
+            if (tinfo.watch) {
+                if (!match || !match.watch) {
+                    return tasks;
+                } else if (tinfo.watch !== match.watch) {
+                    return tasks;
+                }
+            }
+
             let dyts = (<IDynamicTasks>new target()).tasks()
-            tasks = tasks.concat(generateTask(dyts, oper, env));
+            tasks = tasks.concat(generateTask(dyts, match));
         }
     } else if (_.isArray(target)) {
         _.each(target, sm => {
-            tasks.concat(findTasks(sm));
+            tasks.concat(findTasks(sm, match));
         });
@@ -81,3 +120,3 @@ } else {
             console.log(chalk.grey('find task from :'), chalk.cyan(key));
-            tasks = tasks.concat(findTasks(target[key]));
+            tasks = tasks.concat(findTasks(target[key], match));
         });
@@ -211,9 +250,9 @@ }
 
-export function findTasksInModule(md: string | Object, oper?: Operation, env?: IEnvOption): Promise<ITask[]> {
+export function findTasksInModule(md: string | Object, match?: ITaskInfo): Promise<ITask[]> {
     let mdls;
     try {
         if (_.isString(md)) {
-            mdls = findTasks(require(md), oper, env);
+            mdls = findTasks(require(md), match);
         } else {
-            mdls = findTasks(md, oper, env);
+            mdls = findTasks(md, match);
         }
@@ -256,5 +295,6 @@ } catch (err) {
  * @param {Src} dirs
+ * @param {ITaskInfo} [match]
  * @returns {Promise<ITask[]>}
  */
-export function findTasksInDir(dirs: Src, oper?: Operation, env?: IEnvOption): Promise<ITask[]> {
+export function findTasksInDir(dirs: Src, match?: ITaskInfo): Promise<ITask[]> {
     return Promise.all(_.map(_.isArray(dirs) ? dirs : [dirs], dir => {
@@ -264,3 +304,3 @@ console.log(chalk.grey('begin load task from dir'), chalk.cyan(dir));
             let mdl = requireDir(dir, { recurse: true });
-            return Promise.resolve(findTasks(mdl, oper, env));
+            return Promise.resolve(findTasks(mdl, match));
         } catch (err) {
@@ -267,0 +307,0 @@ return Promise.reject(err);

src/generateTask.ts

@@ -15,3 +15,3 @@ import * as _ from 'lodash';
         if (name) {
-            this.decorator.name = name;
+            this.decorator.taskName = name;
         }
@@ -26,17 +26,29 @@ return name;
  * @export
- * @param {(DynamicTask | DynamicTask[])} tasks
- * @param {Operation} oper
+ * @param {(IDynamicTask | IDynamicTask[])} tasks
+ * @param {ITaskInfo} [match]
  * @returns {ITask[]}
  */
-export function generateTask(tasks: IDynamicTask | IDynamicTask[], oper?: Operation, env?: IEnvOption): ITask[] {
+export function generateTask(tasks: IDynamicTask | IDynamicTask[], match?: ITaskInfo): ITask[] {
     let taskseq: ITask[] = [];
     _.each(_.isArray(tasks) ? tasks : [tasks], dt => {
-        if (oper && dt.oper && (dt.oper & oper) <= 0) {
-            return;
+        if (match) {
+            if (match.oper && dt.oper && (dt.oper & match.oper) <= 0) {
+                return;
+            }
+
+            if (match.group && dt.group !== match.group) {
+                return;
+            }
         }
-        if (env && dt.watch) {
-            if (!env.watch) {
+        if (dt.watchTasks) {
+            dt.watch = dt.watch || !!dt.watchTasks;
+        }
+
+        if (dt.watch) {
+            if (!match || !match.watch) {
                 return;
             }
-            taskseq.push(createWatchTask(dt));
+            if (dt.watch === match.watch) {
+                taskseq.push(createWatchTask(dt));
+            }
         } else if (_.isFunction(dt.task)) {
@@ -73,3 +85,3 @@ // custom task
 
-    return new DynamicTask({ order: dt.order, oper: dt.oper, watch: !!dt.watch }, factory);
+    return new DynamicTask({ order: dt.order, oper: dt.oper, watch: dt.watch }, factory);
 }
@@ -84,3 +96,3 @@ /**
     let factory = (cfg: ITaskConfig, gulp: Gulp) => {
-        let watchs = _.isFunction(dt.watch) ? dt.watch(cfg) : dt.watch;
+        let watchs = _.isFunction(dt.watchTasks) ? dt.watchTasks(cfg) : dt.watchTasks;
         if (!_.isFunction(_.last(watchs))) {
@@ -107,3 +119,3 @@ watchs.push(<WatchCallback>(event: WatchEvent) => {
 
-    return new DynamicTask({ order: dt.order, oper: dt.oper, watch: !!dt.watch }, factory);
+    return new DynamicTask({ order: dt.order, oper: dt.oper, watch: dt.watch }, factory);
 }
@@ -110,0 +122,0 @@ function createPipesTask(dt: IDynamicTask) {

src/TaskConfig.ts

@@ -71,3 +71,3 @@ import { Gulp, WatchEvent, WatchCallback, TaskCallback } from 'gulp';
     /**
-     * name.
+     * dynamic generate task name.
      * 
@@ -77,3 +77,3 @@ * @type {Src}
      */
-    name?: Src;
+    taskName?: Src;
 
@@ -83,6 +83,14 @@ /**
      * 
-     * @type {boolean}
+     * @type {boolean | string}
      * @memberOf ITaskInfo
      */
-    watch?: boolean;
+    watch?: boolean | string;
+
+    /**
+     * assert tasks. assert group name or extends name.
+     * 
+     * @type {string}
+     * @memberOf ITaskInfo
+     */
+    group?: string;
 }
@@ -318,3 +326,3 @@
  */
-export interface IDynamicTask extends IOutputDist {
+export interface IDynamicTask extends IOutputDist, ITaskInfo {
     /**
@@ -327,16 +335,16 @@ * task name
     name: TaskString;
-    /**
-     * task order.
-     * 
-     * @type {number}
-     * @memberOf IDynamicTask
-     */
-    order?: number;
-    /**
-     * task type. default for all Operation.
-     * 
-     * @type {Operation}
-     * @memberOf IDynamicTask
-     */
-    oper?: Operation;
+    // /**
+    //  * task order.
+    //  * 
+    //  * @type {number}
+    //  * @memberOf IDynamicTask
+    //  */
+    // order?: number;
+    // /**
+    //  * task type. default for all Operation.
+    //  * 
+    //  * @type {Operation}
+    //  * @memberOf IDynamicTask
+    //  */
+    // oper?: Operation;
 
@@ -349,3 +357,3 @@ /**
      */
-    watch?: Array<string | WatchCallback> | ((config?: ITaskConfig, dt?: IDynamicTask) => Array<string | WatchCallback>);
+    watchTasks?: Array<string | WatchCallback> | ((config?: ITaskConfig, dt?: IDynamicTask) => Array<string | WatchCallback>);
     /**
@@ -352,0 +360,0 @@ * watch changed.

src/taskSequence.ts

@@ -62,8 +62,8 @@ import * as _ from 'lodash';
     }
-    if (rst.name) {
+    if (rst.taskName) {
         if (_.isNumber(rst.order) && rst.order >= 0 && rst.order < taskSequence.length) {
-            taskSequence.splice(rst.order, 0, rst.name);
+            taskSequence.splice(rst.order, 0, rst.taskName);
             return taskSequence;
         }
-        taskSequence.push(rst.name);
+        taskSequence.push(rst.taskName);
     }
@@ -70,0 +70,0 @@ return taskSequence;

test/decorator.spec.ts

@@ -37,2 +37,18 @@ import 'mocha';
 
+    it('findTasks from module with Operation', () => {
+
+        let tasks = findTasks(model, { oper: Operation.build });
+
+        expect(tasks.length).eq(6);
+
+    })
+
+    it('findTasks from module with Operation and env', () => {
+
+        let tasks = findTasks(model, { oper: Operation.build, watch: true });
+
+        expect(tasks.length).eq(8);
+
+    })
+
     it('find task define from module', () => {
@@ -39,0 +55,0 @@

test/generateTask.spec.ts

@@ -65,3 +65,3 @@ import 'mocha';
             },
-            { name: 'test-watch', src: 'src/**/*.ts',  watch: ['tscompile'] },
+            { name: 'test-watch', src: 'src/**/*.ts', watchTasks: ['tscompile'] },
             { name: 'test-clean', order: 0, src: 'src', dist: 'lib', task: (config) => del(config.getDist()) }
@@ -72,3 +72,3 @@ ];
     it('generate build tasks', () => {
-        let tks = generateTask(tasks, Operation.build, { });
+        let tks = generateTask(tasks, { oper: Operation.build });
 
@@ -89,3 +89,3 @@ expect(tks).to.not.null;
     it('generate build tasks with watch', () => {
-        let tks = generateTask(tasks, Operation.build, { watch: true });
+        let tks = generateTask(tasks, { oper: Operation.build, watch: true });
 
@@ -106,3 +106,3 @@ expect(tks).to.not.null;
     it('generate test tasks', () => {
-        let tks = generateTask(tasks, Operation.test, { watch: true });
+        let tks = generateTask(tasks, { oper: Operation.test, watch: true });
 
@@ -124,3 +124,3 @@ expect(tks).to.not.null;
     it('generate release tasks', () => {
-        let tks = generateTask(tasks, Operation.release, { watch: true });
+        let tks = generateTask(tasks, { oper: Operation.release, watch: true });
 
@@ -127,0 +127,0 @@ expect(tks).to.not.null;

test/tasks/task.ts

@@ -64,3 +64,3 @@ import * as mocha from 'gulp-mocha';
             },
-            { name: 'test-watch', src: 'src/**/*.ts',  watch: ['tscompile'] },
+            { name: 'test-watch', src: 'src/**/*.ts',  watchTasks: ['tscompile'] },
             { name: 'test-clean', order: 0, src: 'src', dist: 'lib', task: (config) => del(config.getDist()) }
@@ -67,0 +67,0 @@ ];

No alert changes

Improved metrics

Total package byte prevSize

166548

increased by4.24%

Lines of code

2123

increased by2.71%

No dependency changes