@niceties/draftlog-appender 1.2.3 → 1.2.4

package/core/package.json

@@ -1,3 +1,5 @@
 {
-  "types": "../dist/core.d.ts"
+  "type": "module",
+  "types": "../dist/core.d.ts",
+  "main": "../dist/core.mjs"
 }

package/dist/core.cjs

@@ -1,25 +1,18 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var draftlog = require('draftlog');
 var list = require('@slimlib/list');
 
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var draftlog__default = /*#__PURE__*/_interopDefaultLegacy(draftlog);
-
 const createCanvas = (spinner, formatter, ident) => {
-    draftlog__default["default"](console);
-    draftlog__default["default"].defaults.canReWrite = false;
+    draftlog(console);
+    draftlog.defaults.canReWrite = false;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const updaters = [];
     const getPrefix = (status, tick) => {
         // status is truthy when it is inprogress
-        const prefix = status ? spinner.frames[tick] :
+        return status ? spinner.frames[tick] :
             // status not null when it is finished
             status != null;
-        return prefix;
     };
     return (model) => {
         if (model.skipLines_) {

package/dist/core.mjs

@@ -8,10 +8,9 @@ const createCanvas = (spinner, formatter, ident) => {
     const updaters = [];
     const getPrefix = (status, tick) => {
         // status is truthy when it is inprogress
-        const prefix = status ? spinner.frames[tick] :
+        return status ? spinner.frames[tick] :
             // status not null when it is finished
             status != null;
-        return prefix;
     };
     return (model) => {
         if (model.skipLines_) {

package/dist/index.cjs

@@ -1,18 +1,58 @@
 'use strict';
 
-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 kleur = require('kleur');
 var core = require('./core.cjs');
 var spinners = require('./spinners.cjs');
 require('draftlog');
 require('@slimlib/list');
 
-const supportsUnicode = formatUtils.terminalSupportsUnicode();
+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 ? spinners.dots : spinners.line;
-const formatter = formatUtils.createFormatter(defaultFormatting.colors, supportsUnicode ? defaultFormatting.unicodePrefixes : defaultFormatting.asciiPrefixes, defaultFormatting.tagFactory);
+const formatter = createFormatter(colors, supportsUnicode ? unicodePrefixes : asciiPrefixes, tagFactory);
 let minLogLevel = 1 /* info */;
-globalAppender.appender(appenderUtils.filterMessages((message) => message.loglevel >= minLogLevel || message.action !== 3 /* log */, core.createDraftlogAppender(spinner, formatter, false, 2), // eslint-disable-line indent
+appender(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,16 +1,56 @@
-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 kleur from 'kleur';
 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);
 let minLogLevel = 1 /* info */;
-appender(filterMessages((message) => message.loglevel >= minLogLevel || message.action !== 3 /* log */, createDraftlogAppender(spinner, formatter, false, 2), // eslint-disable-line indent
+appender(filterMessages((message) => message.loglevel >= minLogLevel && message.action !== 3 /* log */, createDraftlogAppender(spinner, formatter, false, 2), // eslint-disable-line indent
 { setMinLevel(logLevel) { minLogLevel = logLevel; } } // eslint-disable-line indent
 ));

package/dist/spinners.cjs

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 const dots = {
     interval: 50,
     frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏']

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.2.3",
+  "version": "1.2.4",
   "license": "MIT",
   "name": "@niceties/draftlog-appender",
   "author": {
@@ -43,7 +43,7 @@
   "readme": "README.md",
   "description": "Appender for '@niceites/logger' implemented using draftlog package.",
   "scripts": {
-    "build": "pkgbld",
+    "build": "pkgbld-internal",
     "test": "node --expose-gc ../node_modules/jest-cli/bin/jest.js --collectCoverage",
     "lint": "eslint ./src",
     "semantic-release": "npx semantic-release"
@@ -65,10 +65,10 @@
     "ts-jest": "27.1.3",
     "typescript": "4.6.x",
     "update-monorepo-package-json": "0.2.0",
-    "pkgbld": "1.2.1"
+    "pkgbld-internal": "1.0.2"
   },
   "peerDependencies": {
-    "@niceties/logger": "^1.1.4"
+    "@niceties/logger": "^1.1.5"
   },
   "dependencies": {
     "draftlog": "^1.0.13",

package/spinners/package.json

@@ -1,3 +1,5 @@
 {
-  "types": "../dist/spinners.d.ts"
+  "type": "module",
+  "types": "../dist/spinners.d.ts",
+  "main": "../dist/spinners.mjs"
 }