improved console logger

Author: ShMcK

CHANGELOG.md

@@ -2,7 +2,7 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
-## [0.7.0] -
+## [0.7.0] - 2016-05-23
 - improved console logger
 
 ## [0.6.0] - 2016-04-01

lib/.tmp.js

@@ -1,8 +1,53 @@
-/// coderoad-test-file
-
-
 
+'use strict';
+const util = require('util');
+
+function getType(output) {
+  switch (Object.prototype.toString.call(output)) {
+    case '[object Array]':
+      return 'array';
+    case '[object Date]':
+      return 'date';
+    case '[object Null]':
+      return 'null';
+    case '[object Number]':
+      // NaN !== NaN
+      return (output !== output) ? 'NaN' : 'number';
+  }
+  return typeof output;
+}
+const inspectOptions = {
+  depth: null
+};
+function assignTypes(args) {
+  return JSON.stringify(
+    args.map((output) => {
+      const type = getType(output);
+      switch (type) {
+        case 'object':
+        case 'array':
+          output = JSON.stringify(output);
+          output = util.inspect(output, inspectOptions);
+          output = output.substring(1, output.length - 1);
+          break;
+        case 'undefined':
+        case 'null':
+        case 'NaN':
+          return { type };
+      }
+      return { type, output };
+    })
+  );
+}
 
+if (console && console.log) {
+  const originalLog = console.log;
+  console.log = (...args) => {
+     var stack = new Error().stack;
+     debugger;
+    setTimeout(originalLog.apply(this, [assignTypes(args)], null));
+  };
+};
 var expect = require('chai').expect;
 
 global.something = {
@@ -19,6 +64,10 @@ function subtractOne(x) {
 	return x - 1
 }
 
+console.log({
+	a: 1
+}, 2)
+
 
 describe('01 addOne', function() {
 

lib/index.js

@@ -2,6 +2,7 @@
 var constants_1 = require('./constants');
 var runner_process_1 = require('./runner-process');
 var write_test_1 = require('./write-test');
+var process_console_log_1 = require('process-console-log');
 function runner(testString, config, handleResult) {
     write_test_1.default(testString);
     var runner = runner_process_1.default(config);
@@ -13,10 +14,10 @@ function runner(testString, config, handleResult) {
             var match = signalMatch.exec(data);
             if (!match) {
                 try {
-                    console.log(data);
+                    process_console_log_1.parseLog(data);
                 }
                 catch (e) {
-                    console.log(data);
+                    process_console_log_1.parseLog(data);
                 }
                 return;
             }

lib/logger.js

@@ -0,0 +1,7 @@
+"use strict";
+var fs_1 = require('fs');
+var loggerOverride = fs_1.readFileSync('./override-logger');
+function loadLogger(test) {
+}
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = loadLogger;

lib/runner-process.js

@@ -32,10 +32,12 @@ function runnerProcess(config) {
     if (options.env == null) {
         options.env = Object.create(process.env);
     }
-    options.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE = 1;
-    options.env.DIR = config.dir;
-    options.env.TUTORIAL_DIR = config.dir;
-    options.env.TASK_POSITION = config.taskPosition;
+    Object.assign(options.env, {
+        ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
+        DIR: config.dir,
+        TUTORIAL_DIR: config.dir,
+        TASK_POSITION: config.taskPosition
+    });
     return child_process_1.spawn(node, [
         mocha,
         '--bail',

lib/write-test.js

@@ -1,7 +1,9 @@
 "use strict";
 var fs_1 = require('fs');
+var process_console_log_1 = require('process-console-log');
 var constants_1 = require('./constants');
 function writeTest(output) {
+    output = process_console_log_1.logger + output;
     fs_1.writeFileSync(constants_1.testPath, output, 'utf8');
 }
 Object.defineProperty(exports, "__esModule", { value: true });

src/index.ts

@@ -1,11 +1,11 @@
-import {signal, testPath} from './constants';
+import {signal} from './constants';
 import runnerProcess from './runner-process';
 import writeTest from './write-test';
-// import {parseLog} from 'process-console-log';
-// import loadLogger from './logger';
+import {parseLog} from 'process-console-log';
 
 export default function runner(
-  testString: string, config: CR.Config,
+  testString: string,
+  config: CR.Config,
   handleResult: (result) => CR.TestResult
 ) {
   // write tests to file
@@ -25,9 +25,11 @@ export default function runner(
 
       if (!match) {
         try {
-          console.log(data);
+          // console.log(data);
+          parseLog(data);
         } catch (e) {
-          console.log(data);
+          // console.log(data);
+          parseLog(data);
         }
         return;
       }

src/logger.ts

@@ -36,10 +36,13 @@ export default function runnerProcess(config: CR.Config) {
   if (options.env == null) {
     options.env = Object.create(process.env);
   }
-  options.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE = 1;
-  options.env.DIR = config.dir;
-  options.env.TUTORIAL_DIR = config.dir;
-  options.env.TASK_POSITION = config.taskPosition;
+
+  Object.assign(options.env, {
+    ATOM_SHELL_INTERNAL_RUN_AS_NODE: 1,
+    DIR: config.dir,
+    TUTORIAL_DIR: config.dir,
+    TASK_POSITION: config.taskPosition
+  });
 
   // spawn child process calling mocha test runner
   return spawn(node, [

src/runner-process.ts

@@ -1,4 +1,5 @@
 declare module 'process-console-log' {
   export function parseLog(logged: {type: string, output: any}[]): void;
   export function initProcessLogger(): void;
+  export const logger: string;
 }

src/typings/process-console-log/index.d.ts

@@ -1,6 +1,10 @@
 import {writeFileSync} from 'fs';
+import {logger} from 'process-console-log';
 import {testPath} from './constants';
 
 export default function writeTest(output: string) {
+  // append logger
+  output = logger + output;
+  // write test file
   writeFileSync(testPath, output, 'utf8');
 }

src/write-test.ts

@@ -17,7 +17,6 @@
     "files": [
         "src/constants.ts",
         "src/index.ts",
-        "src/logger.ts",
         "src/reporter.ts",
         "src/runner-process.ts",
         "src/write-test.ts",