@trenskow/log 1.1.6 → 2.0.2

package/.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+	"cSpell.words": [
+		"Kristian"
+	]
+}

package/README.md

@@ -8,7 +8,7 @@ Just a simple function which lets you log JSON to the console.
 ````javascript
 const log = require('@trenskow/log');
 
-log('info', 'server', {
+await log('info', {
 	state: 'running',
 	port: process.env.PORT
 });
@@ -17,7 +17,7 @@ log('info', 'server', {
 This will output to stdout.
 
 ````json
-{"time":"2020-01-23T10:16:55.289Z","type":"info","subtype":"server","payload":{"state":"running","port":3000}}
+{"time":"2020-01-23T10:16:55.289Z","level":"info","state":"running","port":3000}
 ````
 
 ## Debugging

package/index.js

@@ -1,28 +1,58 @@
 'use strict';
 
+const
+	{ promises: { appendFile } } = require('fs');
+
 const
 	objectMap = require('@trenskow/object-map'),
-	typeOf = require('type-of');
+	merge = require('merge');
 
 const transform = (value) => {
 	if (Array.isArray(value)) return value.map(transform);
-	if (typeOf(value) === 'object') return objectMap.values(value, (_, value) => transform(value));
-	if (typeOf(value) === 'string') return value.replace(/(auth|app|password|secret|api-key|authorization-token)=.*?(&|$)/ig, '$1=🤫$2');
+	if (typeof value === 'object' && value !== null) return objectMap.values(value, (_, value) => transform(value));
+	if (typeof value === 'string') return value.replace(/(auth|app|password|secret|api-key|authorization-token)=.*?(&|$)/ig, '$1=🤫$2');
 	return value;
 };
 
-exports = module.exports = (type, subtype, payload) => {
-	if (!subtype && !payload) {
-		payload = type;
-		type = 'info';
-		subtype = 'message';
+exports = module.exports = async (level = 'info', message) => {
+
+	if (typeof level === 'object' && typeof message === 'undefined') {
+		message = level;
+		level = 'info';
+	}
+	
+	const log = merge({ level }, transform(message));
+
+	let data;
+
+	switch (process.env.LOG_STYLE) {
+	case 'pretty':
+		data = JSON.stringify(log, null, parseInt(process.env.LOG_STYLE_PRETTY_INDENTATION_WIDTH) || 4);
+		break;
+	default:
+		data = JSON.stringify(log);
+		break;
 	}
-	const log = {
-		time: new Date(),
-		type: type,
-		subtype: subtype,
-		payload: transform(payload)
-	};
-	console.info(JSON.stringify(log, null, process.env.LOG_OUTPUT !== 'pretty' ? undefined : 4));
+
+	data = `${data}\n`;
+
+	const output = process.env.LOG_OUTPUT || 'stdout';
+
+	switch (output) {
+	case 'stdout':
+	case 'stderr':
+		await new Promise((resolve, reject) => {
+			process[output].write(data, (err) => {
+				if (err) return reject(err);
+				resolve();
+			});
+		});
+		break;
+	default:
+		await appendFile(process.env.LOG_OUTPUT, data);
+		break;
+	}
+
 	return log;
+
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/log",
-  "version": "1.1.6",
+  "version": "2.0.2",
   "description": "Simple JSON log function.",
   "main": "index.js",
   "scripts": {
@@ -21,10 +21,10 @@
   },
   "homepage": "https://github.com/trenskow/log#readme",
   "devDependencies": {
-    "eslint": "^7.6.0"
+    "eslint": "^8.13.0"
   },
   "dependencies": {
     "@trenskow/object-map": "^0.1.0",
-    "type-of": "^2.0.1"
+    "merge": "^2.1.1"
   }
 }