@niceties/draftlog-appender 1.2.4 → 1.2.5

package/dist/index.cjs

@@ -1,58 +1,18 @@
 'use strict';
 
-var kleur = require('kleur');
+var appenderUtils = require('@niceties/logger/appender-utils');
+var globalAppender = require('@niceties/logger/global-appender');
+var formatUtils = require('@niceties/logger/format-utils');
+var defaultFormatting = require('@niceties/logger/default-formatting');
 var core = require('./core.cjs');
 var spinners = require('./spinners.cjs');
 require('draftlog');
 require('@slimlib/list');
 
-const filterMessages = (predicate, appender, api) => {
-    return Object.assign(function (logMessage) {
-        if (predicate(logMessage)) {
-            appender(logMessage);
-        }
-    }, api);
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let globalAppender;
-const appender = (appender) => {
-    if (appender !== undefined) {
-        globalAppender = appender;
-    }
-    return globalAppender;
-};
-
-const createFormatter = (colors, prefixes, tagFactory) => {
-    return ({ loglevel, message, context, action, tag }, usePrefix, identation = 0) => {
-        const prefix = usePrefix === true ? (`${prefixes[loglevel]} `) : (typeof usePrefix === 'string' ? (`${usePrefix} `) : '');
-        const color = colors[loglevel];
-        const text = `${prefix}${loglevel === 0 /* verbose */ && action === 3 /* log */ && tag !== undefined ? tagFactory(tag) + ' ' : ''}${message}${context != null ? ' ' + context : ''}`;
-        return `${' '.repeat(identation)}${color ? color(text) : text}`;
-    };
-};
-// from dreidels/utils
-const terminalSupportsUnicode = () => {
-    // The default command prompt and powershell in Windows do not support Unicode characters.
-    // However, the VSCode integrated terminal and the Windows Terminal both do.
-    return process.platform !== 'win32'
-        || process.env.TERM_PROGRAM === 'vscode'
-        || !!process.env.WT_SESSION;
-};
-
-const { green, red, yellow, blue } = kleur;
-const unicodePrefixes = [`${green('✓')}`, `${green('✓')}`, '⚠', '✕'];
-const asciiPrefixes = [`${green('+')}`, `${green('+')}`, '!', 'x'];
-// eslint-disable-next-line no-sparse-arrays
-const colors = [, , yellow, red];
-const tagFactory = (tag) => {
-    return '[' + blue(tag) + ']';
-};
-
-const supportsUnicode = terminalSupportsUnicode();
+const supportsUnicode = formatUtils.terminalSupportsUnicode();
 const spinner = supportsUnicode ? spinners.dots : spinners.line;
-const formatter = createFormatter(colors, supportsUnicode ? unicodePrefixes : asciiPrefixes, tagFactory);
+const formatter = formatUtils.createFormatter(defaultFormatting.colors, supportsUnicode ? defaultFormatting.unicodePrefixes : defaultFormatting.asciiPrefixes, defaultFormatting.tagFactory);
 let minLogLevel = 1 /* info */;
-appender(filterMessages((message) => message.loglevel >= minLogLevel && message.action !== 3 /* log */, core.createDraftlogAppender(spinner, formatter, false, 2), // eslint-disable-line indent
+globalAppender.appender(appenderUtils.filterMessages((message) => message.loglevel >= minLogLevel && message.action !== 3 /* log */, core.createDraftlogAppender(spinner, formatter, false, 2), // eslint-disable-line indent
 { setMinLevel(logLevel) { minLogLevel = logLevel; } } // eslint-disable-line indent
 ));

package/dist/index.mjs

@@ -1,52 +1,12 @@
-import kleur from 'kleur';
+import { filterMessages } from '@niceties/logger/appender-utils';
+import { appender } from '@niceties/logger/global-appender';
+import { terminalSupportsUnicode, createFormatter } from '@niceties/logger/format-utils';
+import { colors, unicodePrefixes, asciiPrefixes, tagFactory } from '@niceties/logger/default-formatting';
 import { createDraftlogAppender } from './core.mjs';
 import { dots, line } from './spinners.mjs';
 import 'draftlog';
 import '@slimlib/list';
 
-const filterMessages = (predicate, appender, api) => {
-    return Object.assign(function (logMessage) {
-        if (predicate(logMessage)) {
-            appender(logMessage);
-        }
-    }, api);
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-let globalAppender;
-const appender = (appender) => {
-    if (appender !== undefined) {
-        globalAppender = appender;
-    }
-    return globalAppender;
-};
-
-const createFormatter = (colors, prefixes, tagFactory) => {
-    return ({ loglevel, message, context, action, tag }, usePrefix, identation = 0) => {
-        const prefix = usePrefix === true ? (`${prefixes[loglevel]} `) : (typeof usePrefix === 'string' ? (`${usePrefix} `) : '');
-        const color = colors[loglevel];
-        const text = `${prefix}${loglevel === 0 /* verbose */ && action === 3 /* log */ && tag !== undefined ? tagFactory(tag) + ' ' : ''}${message}${context != null ? ' ' + context : ''}`;
-        return `${' '.repeat(identation)}${color ? color(text) : text}`;
-    };
-};
-// from dreidels/utils
-const terminalSupportsUnicode = () => {
-    // The default command prompt and powershell in Windows do not support Unicode characters.
-    // However, the VSCode integrated terminal and the Windows Terminal both do.
-    return process.platform !== 'win32'
-        || process.env.TERM_PROGRAM === 'vscode'
-        || !!process.env.WT_SESSION;
-};
-
-const { green, red, yellow, blue } = kleur;
-const unicodePrefixes = [`${green('✓')}`, `${green('✓')}`, '⚠', '✕'];
-const asciiPrefixes = [`${green('+')}`, `${green('+')}`, '!', 'x'];
-// eslint-disable-next-line no-sparse-arrays
-const colors = [, , yellow, red];
-const tagFactory = (tag) => {
-    return '[' + blue(tag) + ']';
-};
-
 const supportsUnicode = terminalSupportsUnicode();
 const spinner = supportsUnicode ? dots : line;
 const formatter = createFormatter(colors, supportsUnicode ? unicodePrefixes : asciiPrefixes, tagFactory);

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.4",
+  "version": "1.2.5",
   "license": "MIT",
   "name": "@niceties/draftlog-appender",
   "author": {
@@ -65,10 +65,10 @@
     "ts-jest": "27.1.3",
     "typescript": "4.6.x",
     "update-monorepo-package-json": "0.2.0",
-    "pkgbld-internal": "1.0.2"
+    "pkgbld-internal": "1.0.3"
   },
   "peerDependencies": {
-    "@niceties/logger": "^1.1.5"
+    "@niceties/logger": "^1.1.6"
   },
   "dependencies": {
     "draftlog": "^1.0.13",