feat: added deep file watcher to CLI

Author: kevinries

misc/development/cli/simple/services/index.js

@@ -0,0 +1,18 @@
+const { testFunc } = require('../testlib');
+
+exports.name = 'test-service2';
+
+exports.started = function () {
+  this.timer = setInterval(() => {
+  }, 2000);
+};
+
+exports.actions = {
+  hello (context) {
+    return context.data;
+  }
+};
+
+exports.started = async function () {
+  testFunc();
+};

misc/development/cli/simple/services/test2.service.js

@@ -5,7 +5,6 @@ const { createZipkinExporter } = require('../../packages/tracing-adapters/zipkin
 
 const app = createBroker({
   nodeId: 'trace',
-  watchServices: true,
   logger: {
     enabled: true
   },

misc/development/tracing.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const { debounce } = require('@weave-js/utils');
 const fs = require('fs');
-// const watch = require('../../utils/watchRecursive');
 
 function createWatchMiddleware (weaveCli) {
   return function watchMiddleware (runtime) {
@@ -83,7 +82,7 @@ function createWatchMiddleware (weaveCli) {
         return;
       }
 
-      if (filename.includes('node_modules') !== -1) {
+      if (filename.includes('node_modules')) {
         if (cache.get(filename)) {
           return;
         }
@@ -104,9 +103,11 @@ function createWatchMiddleware (weaveCli) {
         const watchItem = getFileWatchItem(filename);
         watchItem.restartBroker = true;
       } else {
-        const watchItem = getFileWatchItem(filename);
-        watchItem.otherFiles.push(filename);
-        watchItem.restartAllServices = true;
+        if (parents) {
+          const watchItem = getFileWatchItem(filename);
+          watchItem.otherFiles.push(filename);
+          watchItem.restartAllServices = true;
+        }
       }
 
       if (module.children && module.children.length > 0) {
@@ -222,7 +223,7 @@ function createWatchMiddleware (weaveCli) {
       },
       serviceStarted () {
         if (runtime.state.isStarted) {
-          // debouncedWatchProjectFiles();
+          debouncedWatchProjectFiles();
         }
       },
       stopped () {

packages/core/cli/lib/commands/start/createWatchMiddlewares.js

@@ -1,5 +1,6 @@
 const path = require('path');
 const fs = require('fs');
+const { isFunction } = require('@weave-js/utils');
 
 exports.loadServices = (broker, param) => {
   const servicePathsParams = param.split(',');
@@ -13,6 +14,18 @@ exports.loadServices = (broker, param) => {
     const isDir = fs.lstatSync(servicePath).isDirectory();
 
     if (isDir) {
+      // if there is an index file in the folder, we use this file as factory
+      // Otherwise we load all service files from the folder.
+      // if (fs.existsSync(path.join(servicePath, 'index.js'))) {
+      //   const serviceFactory = require(path.join(servicePath, 'index.js'));
+      //   if (isFunction(serviceFactory)) {
+      //     serviceFactory(broker);
+      //     return;
+      //   } else {
+      //     broker.log.debug(`An index.js file was found in the "${servicePath}" folder. Since it is not a service loader function, it was ignored.`);
+      //   }
+      // }
+
       broker.loadServices(servicePath);
     } else {
       broker.loadService(servicePath);

packages/core/cli/lib/commands/start/loadServices.js

@@ -28,7 +28,7 @@ program
 program
   .command('create <type> <name>')
   .description('create a new project powered by vue-cli-service')
-  .option('-t,--template <teplate>', 'Start broker with config file.')
+  .option('-t,--template <template>', 'Start broker with config file.')
   .option('-s,--suffix <suffix>', 'Service file suffix (default: service)')
   .action((type, name, options) => {
     require('./commands/create').handler(type, name, options);

packages/core/cli/lib/index.js

@@ -16,17 +16,16 @@
   "author": {
     "name": "Kevin Ries",
     "company": "Fachwerk Software",
-    "email": "kevin.ries@fachwerk.io",
-    "url": "https://weave-js.com"
+    "email": "kevin.ries@fachwerk.io"
   },
   "license": "MIT",
   "dependencies": {
     "@weave-js/core": "^0.11.1",
     "@weave-js/repl": "^0.11.1",
     "@weave-js/utils": "^0.10.1",
-    "commander": "^8.3.0",
-    "consolidate": "^0.16.0",
-    "inquirer": "^8.2.0",
+    "commander": "^9.1.0",
+    "ejs": "^3.1.6",
+    "inquirer": "^8.2.2",
     "kleur": "^4.1.4",
     "update-notifier": "^5.1.0"
   },