Add simple log collector to plugin context

frctl · Mar 9, 2019 · 9349471 · 9349471
1 parent d1be855
commit 9349471
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 14 deletions.
diff --git a/packages/app/src/app.js b/packages/app/src/app.js
@@ -157,7 +157,10 @@ module.exports = function(compiler, opts = {}) {
     koa.context.mode = mode;
     koa.context.utils = utils;
 
-    const state = await compiler.run();
+    const state = compiler.getState();
+
+    const { info } = await compiler.run();
+    app.emit('state.updated', state, info, true);
 
     middleware.forEach(mw => koa.use(mw));
 

diff --git a/packages/core/src/compiler.js b/packages/core/src/compiler.js
@@ -39,25 +39,38 @@ module.exports = function(config = {}) {
   };
 
   compiler.run = async function() {
-    const hrStart = process.hrtime();
     emitter.emit('start');
+    const ctx = {};
+    const logs = [];
+    const hrStart = process.hrtime();
     const { paths, opts } = parseSrc;
 
     let files = await readFiles(paths, {
       onlyFiles: false,
       gitignore: !!opts.gitignore
     });
 
+    ctx.files = files;
+    ctx.log = (message, level) => {
+      logs.push({ level, message });
+    };
+
     const components = await compileComponents(files, opts);
     files = files.filter(f => f.stats.isFile());
     const applyPlugins = compose(
       middlewares,
-      { files }
+      ctx
     );
     await applyPlugins(components);
     state.update({ components, files });
-    emitter.emit('finish', state, process.hrtime(hrStart));
-    return state;
+
+    const info = {
+      logs,
+      time: process.hrtime(hrStart)
+    };
+
+    emitter.emit('finish', state, info);
+    return { state, info };
   };
 
   compiler.watch = function(callback) {
@@ -84,12 +97,11 @@ module.exports = function(config = {}) {
   function watchHandler(parseEvents) {
     let lastResult = null;
     return debounce(async (event, path) => {
-      const hrStart = process.hrtime();
       try {
         // Only re-parse for 'primary' events, otherwise just notify of changes
         lastResult = parseEvents.includes(event) ? await compiler.run() : lastResult;
-        const time = process.hrtime(hrStart);
-        watchCallbacks.forEach(cb => cb(null, lastResult, { path, event, time }));
+        const info = { path, event, ...lastResult.info };
+        watchCallbacks.forEach(cb => cb(null, lastResult.state, info));
       } catch (err) {
         watchCallbacks.forEach(cb => cb(err));
       }

diff --git a/packages/fractalite/bin/fractalite b/packages/fractalite/bin/fractalite
@@ -52,22 +52,24 @@ const args = mri(process.argv.slice(2));
       const mode = assign({ mode: 'develop' }, config.develop || {}, args);
       const app = fractalite({ mode, ...config });
 
-      const interactiveLogger = new Signale({interactive: true});
-
       app.on('error', function onError(err) {
         if (err.message.indexOf('ECONNRESET') >= 0) {
           return;
         }
         if (err.status === 404) {
-          interactiveLogger.warn(`${err.message} ${dim(`[${err.path}]`)}`);
+          logger.warn(`${err.message} ${dim(`[${err.path}]`)}`);
         } else {
-          interactiveLogger.error(err);
+          logger.error(err);
         }
       });
 
-      app.on('state.pending', () => interactiveLogger.await(`Updating state`));
+      app.on('state.pending', () => logger.info(`Source change detected`));
       app.on('state.updated', (state, info) => {
-        interactiveLogger.complete(`Updated in %d.%ds`, info.time[0], Math.round(info.time[1] / 1000000))
+        for (const log of info.logs || []) {
+          log.message instanceof Error ? logger.error(log.message) : logger[log.level || 'info'](log.message);
+        }
+        logger.success(`Compiled in %d.%ds`, info.time[0], Math.round(info.time[1] / 1000000))
+        logger.log('')
       });
 
       const server = await app.run();