refactor: function command structure change, include validators in plugins

Author: lokesh-coder

packages/core/__tests__/helpers/cmdCreators.ts

@@ -3,12 +3,12 @@ export const newCmdObj = (name, props = {}) => ({
   run: () => {},
   ...props,
 });
-export const newCmdFn = (name, props = {}) => (cmd: any) => {
-  cmd.name = name;
-  cmd.run = () => {};
-  Object.keys(props).forEach((k: string) => {
-    cmd[k] = props[k];
-  });
+export const newCmdFn = (name, props = {}) => () => {
+  return {
+    name,
+    run: () => {},
+    ...props,
+  };
 };
 export const newCmdClass = (name, props = {}) => {
   return class CustomCommand {

packages/core/src/command.ts

@@ -139,8 +139,7 @@ class LesyCommand {
         });
       });
     } else {
-      cmdObj = { ...this.defaultProps, ...cmd };
-      cmd(cmdObj);
+      cmdObj = { ...this.defaultProps, ...cmd() };
     }
 
     return this.formatNames(cmdObj);

packages/core/src/core.ts

@@ -1,5 +1,4 @@
 import { LesyCommand } from "./command";
-import { LesyFeature } from "./feature";
 import { LesyLoader } from "./loader";
 import { LesyMiddleware } from "./middleware";
 import { MiddlewareContext, MiddlewarePlacement as $, State } from "./model";
@@ -23,14 +22,17 @@ class LesyCoreClass {
     config = {},
   }): Promise<LesyCoreClass> {
     this.loader = new LesyLoader(
-      { commands, features, middlewares, plugins },
+      { commands, features, middlewares, validators, plugins },
       root,
     );
     // todo: store plugin config under config.plugins
     for (const prop in this.loader.pluginConfigs) {
       config[prop] = this.loader.pluginConfigs[prop];
     }
 
+    // tslint:disable-next-line: no-parameter-reassignment
+    validators = this.loader.validators;
+
     this.mwCtrl = this.loader.mwCtrl;
     this.state = { root, utils, validators, config };
     if (this.mwCtrl) await this.hook($.INIT);

packages/core/src/loader.ts

@@ -14,23 +14,26 @@ class LesyLoader {
   commands: any[] = [];
   middlewares: any[] = [];
   features: any[] = [];
+  validators: any[] = [];
 
   constructor(
     {
       commands = [],
       features = [],
       middlewares = [],
       plugins = [],
+      validators = [],
     }: {
       commands?: Command[] | string[];
       features?: string[];
       middlewares?: string[];
+      validators?: any[];
       plugins?: Plugin[];
     },
     root: string,
   ) {
     this.root = root;
-    const corePlugin = { commands, middlewares, features };
+    const corePlugin = { commands, middlewares, features, validators };
     this.loadPlugins([corePlugin, ...plugins]);
   }
 
@@ -57,10 +60,12 @@ class LesyLoader {
     commands = [],
     middlewares = [],
     features = [],
+    validators = [],
   }): void {
     this.commands = this.commands.concat(commands);
     this.middlewares = this.middlewares.concat(middlewares);
     this.features = this.features.concat(features);
+    this.validators = this.validators.concat(validators);
   }
   loadPluginFromFile(path: string): void {
     let plugin = this.getModuleFromFile(path);