log fn

Author: prohazko2

index.js

@@ -1,5 +1,6 @@
 
 
 Object.assign(module.exports, {
+  node: require('./src/node'),  
   log: require('./src/log')
 });

package.json

@@ -1,22 +1,25 @@
 {
   "name": "@rightech/utils",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "",
   "main": "index.js",
+  "private": false,
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/Rightech/node-utils.git"
   },
-  "author": "",
+  "author": "[email protected]",
   "license": "Apache-2.0",
   "bugs": {
     "url": "https://github.com/Rightech/node-utils/issues"
   },
   "homepage": "https://github.com/Rightech/node-utils#readme",
   "dependencies": {
-    "colors": "^1.3.3"
+    "colors": "^1.3.3",
+    "deepmerge": "^4.0.0",
+    "stack-trace": "0.0.10"
   }
 }

src/log.js

@@ -1,11 +1,15 @@
 const colors = require('colors/safe');
+const merge = require('deepmerge');
+const { inspect } = require('util');
+
+const { caller } = require('./node');
 
 const LEVELS = Object.freeze({
-  NONE: 0,
-  ERROR: 1,
-  WARN: 2,
-  INFO: 3,
-  DEBUG: 4
+  none: 0,
+  error: 1,
+  warn: 2,
+  info: 3,
+  debug: 4
 });
 
 const COLORS = Object.freeze({
@@ -16,24 +20,98 @@ const COLORS = Object.freeze({
 });
 
 const FORMAT = Object.freeze({
-  ascii: 'ascii',
+  term: 'term',
   text: 'text',
   json: 'json'
 });
 
+const TIMEOF = Object.freeze({
+  iso: 'iso',
+  ru: 'ru',
+  en: 'en'
+});
+
 function getDefaultOptions() {
   return {
-    level: LEVELS.INFO,
+    level: LEVELS.info,
+    time : TIMEOF.iso,
     width: {
-      category: 40
+      object: 40
     }
   };
 }
 
+let options = getDefaultOptions();
+
+function setOptions(opts = {}) {
+  options = getOptions(opts);
+}
 
-module.exports = {
-  LEVELS,
-  COLORS,
-  FORMAT
+function getOptions(opts = {}) {
+  return merge.all([getDefaultOptions(), options || {}, opts]);
+}
 
+function summary(message) {
+  if (!message) {
+    return '[undefined]';
+  }
+  if (message instanceof Error) {
+    const joiner = colors.red('* ');
+    return message.stack.split('  at').join(joiner);
+  }
+  return inspect(message);
 }
+
+function log(message = '?', object = caller(), level = LEVELS.info) {
+  const opts = getOptions();
+
+  if (level > opts.level || level === LEVELS.NONE) {
+    return;
+  }
+  if (message && message._silent) {
+    return;
+  }
+  const color = COLORS[level];
+  let date = new Date().toISOString(); //utils.formatDate(new Date());
+
+  let line = '';
+
+  if (typeof object === 'object' && object.module) {
+    object = object.module;
+  }
+
+  if (object) {
+    if (!isNaN(+object)) {
+      object = `[${object}]`;
+    }
+    object = (object || '').toString().substring(0, opts.width.object);
+    object = `${object.padEnd(opts.width.object, ' ')} : `;
+    line += colors.bold(object);
+  }
+
+  if (typeof message === 'object') {
+    message = summary(message);
+  } else {
+    message = message + '';
+  }
+  if (color) {
+    date = colors[color](date);
+    line = colors[color](line);
+  }
+  console.log(`${date} ${line} ${message}`);
+}
+
+log.LEVELS = LEVELS;
+log.COLORS = COLORS;
+log.FORMAT = FORMAT;
+
+log.setOptions = setOptions;
+log.getOptions = getOptions;
+
+log.debug = (message, object) => log(message, object || caller(), LEVELS.debug);
+log.info = (message, object) => log(message, object || caller(), LEVELS.info);
+log.warn = (message, object) => log(message, object || caller(), LEVELS.warn);
+log.error = (message, object) => log(message, object || caller(), LEVELS.error);
+
+
+module.exports = log;

src/node.js

@@ -0,0 +1,42 @@
+
+function isMongoId(id) {
+  return id && id._bsontype && id._bsontype === 'ObjectID';
+}
+
+function callers() {
+  if (!require.main) {
+    return [];
+  }
+
+  const rootPath = path.dirname(require.main.filename);
+  const modulesPath = path.join(rootPath, '..', 'modules');
+
+  return stackTrace.get()
+    .filter(entry => {
+      const name = entry.getFileName();
+      return name && name.includes(modulesPath);
+    })
+    .map(origin => {
+      const filename = origin.getFileName();
+      const parts = filename.split(path.sep);
+      const name = parts[parts.indexOf('modules') + 1];
+      return {
+        name,
+        line: origin.getLineNumber(),
+        file: path.basename(filename),
+        module: `system [${name || 'unknown'}]`
+      };
+    });
+}
+
+function caller(skip, name) {
+  skip = skip || 0;
+  name = name || 'system';
+  return callers()[skip] || { name, module: name };
+}
+
+module.exports = {
+  isMongoId,
+  callers,
+  caller,
+}