build immutable bundles for new platform plugins

packages/kbn-dev-utils/src/index.ts

@@ -18,12 +18,7 @@
  */
 
 export { withProcRunner, ProcRunner } from './proc_runner';
-export {
-  ToolingLog,
-  ToolingLogTextWriter,
-  pickLevelFromFlags,
-  ToolingLogCollectingWriter,
-} from './tooling_log';
+export * from './tooling_log';
 export { createAbsolutePathSerializer } from './serializers';
 export {
   CA_CERT_PATH,

packages/kbn-dev-utils/src/tooling_log/index.ts

@@ -19,5 +19,5 @@
 
 export { ToolingLog } from './tooling_log';
 export { ToolingLogTextWriter, ToolingLogTextWriterConfig } from './tooling_log_text_writer';
-export { pickLevelFromFlags, LogLevel } from './log_levels';
+export { pickLevelFromFlags, parseLogLevel, LogLevel } from './log_levels';
 export { ToolingLogCollectingWriter } from './tooling_log_collecting_writer';

packages/kbn-dev-utils/src/tooling_log/tooling_log_text_writer.ts

@@ -82,20 +82,28 @@ export class ToolingLogTextWriter implements Writer {
     }
   }
 
-  write({ type, indent, args }: Message) {
-    if (!shouldWriteType(this.level, type)) {
+  write(msg: Message) {
+    if (!shouldWriteType(this.level, msg.type)) {
       return false;
     }
 
-    const txt = type === 'error' ? stringifyError(args[0]) : format(args[0], ...args.slice(1));
-    const prefix = has(MSG_PREFIXES, type) ? MSG_PREFIXES[type] : '';
+    const prefix = has(MSG_PREFIXES, msg.type) ? MSG_PREFIXES[msg.type] : '';
+    ToolingLogTextWriter.write(this.writeTo, prefix, msg);
+    return true;
+  }
+
+  static write(writeTo: ToolingLogTextWriter['writeTo'], prefix: string, msg: Message) {
+    const txt =
+      msg.type === 'error'
+        ? stringifyError(msg.args[0])
+        : format(msg.args[0], ...msg.args.slice(1));
 
     (prefix + txt).split('\n').forEach((line, i) => {
       let lineIndent = '';
 
-      if (indent > 0) {
+      if (msg.indent > 0) {
         // if we are indenting write some spaces followed by a symbol
-        lineIndent += ' '.repeat(indent - 1);
+        lineIndent += ' '.repeat(msg.indent - 1);
         lineIndent += line.startsWith('-') ? '└' : '│';
       }
 
@@ -105,9 +113,7 @@ export class ToolingLogTextWriter implements Writer {
         lineIndent += PREFIX_INDENT;
       }
 
-      this.writeTo.write(`${lineIndent}${line}\n`);
+      writeTo.write(`${lineIndent}${line}\n`);
     });
-
-    return true;
   }
 }

packages/kbn-optimizer/src/log_optimizer_state.ts

@@ -39,27 +39,25 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
         if (event?.type === 'worker stdio') {
           const chunk = event.chunk.toString('utf8');
           log.warning(
-            '⚙️  worker',
+            `worker`,
             event.stream,
             chunk.slice(0, chunk.length - (chunk.endsWith('\n') ? 1 : 0))
           );
         }
 
         if (event?.type === 'worker started') {
-          log.info(`⚙️  worker started for bundles ${event.bundles.map(b => b.id).join(', ')}`);
+          log.info(`worker started for bundles ${event.bundles.map(b => b.id).join(', ')}`);
         }
 
         if (state.phase === 'reallocating') {
-          log.debug(`⚙️  changes detected...`);
+          log.debug(`changes detected...`);
           return;
         }
 
         if (state.phase === 'initialized') {
           if (!loggedInit) {
             loggedInit = true;
-            log.info(
-              `⚙️  @kbn/optimizer intialized, ${state.offlineBundles.length} bundles cached`
-            );
+            log.info(`intialized, ${state.offlineBundles.length} bundles cached`);
             log.debug(`version: ${state.version}`);
             log.debug(`cached: ${state.offlineBundles.map(b => b.id)}`);
           }
@@ -76,7 +74,7 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
 
           bundleStates.set(id, type);
           log.debug(
-            `⚙️  [${id}] state = "${type}"${type !== 'running' ? ` after ${state.durSec} sec` : ''}`
+            `[${id}] state = "${type}"${type !== 'running' ? ` after ${state.durSec} sec` : ''}`
           );
         }
 
@@ -85,7 +83,7 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
         }
 
         if (state.phase === 'issue') {
-          log.error('⚙️  webpack compile errors');
+          log.error(`webpack compile errors`);
           log.indent(4);
           for (const b of state.compilerStates) {
             if (b.type === 'compiler issue') {
@@ -102,8 +100,8 @@ export function logOptimizerState(log: ToolingLog, config: OptimizerConfig) {
         if (state.phase === 'success') {
           log.success(
             config.watch
-              ? `⚙️  watching for changes in all bundles after ${state.durSec} sec`
-              : `⚙️  all bundles compiled successfully after ${state.durSec} sec`
+              ? `watching for changes in all bundles after ${state.durSec} sec`
+              : `all bundles compiled successfully after ${state.durSec} sec`
           );
           return true;
         }

packages/kbn-optimizer/src/optimizer.ts

@@ -205,7 +205,7 @@ export class Optimizer {
                   // reset start time if we are transitioning into running
                   const startTime =
                     (prevState.phase === 'success' || prevState.phase === 'issue') &&
-                    stateChanges?.phase === 'running'
+                    (stateChanges?.phase === 'running' || stateChanges?.phase === 'reallocating')
                       ? Date.now()
                       : prevState.startTime;
 

src/cli/cluster/run_kbn_optimizer.ts

@@ -19,7 +19,13 @@
 
 import Chalk from 'chalk';
 import moment from 'moment';
-import { ToolingLog, pickLevelFromFlags, REPO_ROOT } from '@kbn/dev-utils';
+import {
+  ToolingLog,
+  pickLevelFromFlags,
+  ToolingLogTextWriter,
+  parseLogLevel,
+  REPO_ROOT,
+} from '@kbn/dev-utils';
 import { OptimizerConfig, Optimizer, logOptimizerState } from '@kbn/optimizer';
 
 import { LegacyConfig } from '../../core/server/legacy';
@@ -34,23 +40,40 @@ export function runKbnOptimizer(opts: Record<string, any>, config: LegacyConfig)
   });
 
   const dim = Chalk.dim('np bld');
+  const name = Chalk.magentaBright('@kbn/optimizer');
   const time = () => moment().format('HH:mm:ss.SSS');
-  const toolingLog = new ToolingLog({
-    level: pickLevelFromFlags(opts),
-    writeTo: {
-      write: chunk => {
-        const trailingNewLine = chunk[chunk.length - 1] === '\n';
+  const level = (msgType: string) => {
+    switch (msgType) {
+      case 'info':
+        return Chalk.green(msgType);
+      case 'success':
+        return Chalk.cyan(msgType);
+      case 'debug':
+        return Chalk.gray(msgType);
+      default:
+        return msgType;
+    }
+  };
+  const { flags: levelFlags } = parseLogLevel(pickLevelFromFlags(opts));
+  const toolingLog = new ToolingLog();
+  const has = <T extends object>(obj: T, x: any): x is keyof T => obj.hasOwnProperty(x);
 
-        process.stdout.write(
-          chunk
-            .slice(0, chunk.length - (trailingNewLine ? 1 : 0))
-            .split('\n')
-            .map(line => `${dim}    log   [${time()}] ${line}`)
-            .join('\n') + (trailingNewLine ? '\n' : '')
+  toolingLog.setWriters([
+    {
+      write(msg) {
+        if (has(levelFlags, msg.type) && !levelFlags[msg.type]) {
+          return false;
+        }
+
+        ToolingLogTextWriter.write(
+          process.stdout,
+          `${dim}    log   [${time()}] [${level(msg.type)}][${name}] `,
+          msg
         );
+        return true;
       },
     },
-  });
+  ]);
 
   const optimizer = new Optimizer(optimizerConfig);
   return optimizer.run().pipe(logOptimizerState(toolingLog, optimizerConfig));