standard-log 11.4.0 → 11.5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "standard-log",
-  "version": "11.4.0",
+  "version": "11.5.0",
   "description": "The standard log library",
   "homepage": "https://github.com/unional/standard-log/tree/main/packages/log",
   "bugs": {
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "@just-func/types": "^0.5.0",
-    "iso-error": "^4.4.0",
+    "iso-error": "^5.0.0",
     "ms": "^2.1.3",
     "type-plus": "^4.16.0",
     "upper-case": "^2.0.2"
@@ -95,7 +95,7 @@
     "build:clean": "rimraf *.tsbuildinfo",
     "build:cjs": "tsc -p ./tsconfig.cjs.json && ncp package.cjs.json cjs/package.json",
     "build:esm": "tsc -p ./tsconfig.esm.json",
-    "build:tslib": "tsc -p ./tsconfig.tslib.json",
+    "build:tslib": "tsc -p ./tsconfig.tslib.json && ncp package.cjs.json tslib/package.json",
     "bundle": "run-p bundle:es5 bundle:esm",
     "bundle:es5": "webpack -c ./webpack.es5.cjs",
     "bundle:esm": "webpack -c ./webpack.esm.cjs",

package/ts/index.ts

@@ -7,5 +7,10 @@ export {
   configGlobal, createStandardLog, createStandardLogForTest,
   getLogger, suppressLogs
 } from './standardLog.js'
-export type { StandardLog, StandardLogForTest, StandardLogInstance } from './standardLog.js'
-export * from './types.js'
+export type { GetLogger, StandardLog, StandardLogForTest } from './standardLog.js'
+export type {
+  ConsoleLike, LogEntry, LogFilter, LogFormatter, LogFunction, Logger, LoggerOptions, LogLevel,
+  LogLevelEntry, LogMethod, LogMethodNames, LogReporter, LogReporterOptions, ReporterFilter,
+  StandardLogInstance, StandardLogOptions
+} from './types.js'
+

package/ts/logger.ts

@@ -30,11 +30,10 @@ export function createLogger<N extends string = LogMethodNames>(
     count: {
       writable: false,
       value: ((counter) => (...args: any[]) => {
-        const level = logLevels.debug
-        if (shouldLog(store, level, logger.level))
+        if (shouldLog(store, logLevels.debug, logger.level))
           write({
             id,
-            level,
+            level: logLevels.debug,
             args: [++counter, ...args],
             timestamp: new Date()
           })
@@ -47,7 +46,7 @@ export function createLogger<N extends string = LogMethodNames>(
         if (shouldLog(store, logLevel, logger.level)) {
           const methodName = store.logLevelStore.getName(logLevel)
           const bindedMethod = logger[methodName].bind(logger)
-          const result = logFn(bindedMethod)
+          const result = logFn(bindedMethod, logger.level ?? store.logLevel)
           if (result) bindedMethod(result)
         }
       }

package/ts/standardLog.ctx.ts

@@ -0,0 +1,8 @@
+import { record } from 'type-plus'
+import type { LogStore } from './logStore.js'
+import type { LogMethodNames, StandardLogInstance } from './types.js'
+
+export const ctx: {
+  configured?: boolean,
+  gsl?: { store: LogStore, standardLog: StandardLogInstance<LogMethodNames> }
+} = record()

package/ts/standardLog.ts

@@ -3,15 +3,8 @@ import { createLogger } from './logger.js'
 import { DEFAULT_LOG_METHOD_NAMES, logLevels } from './logLevels.js'
 import { createLogStore, LogStore } from './logStore.js'
 import { createMemoryLogReporter, MemoryLogReporter } from './memory.js'
-import type { Logger, LoggerOptions, LogLevel, LogMethodNames, StandardLogOptions } from './types.js'
-
-export interface StandardLogInstance<N extends string = LogMethodNames> {
-  logLevel: number,
-  toLogLevelName(level: number): string,
-  toLogLevel(name: N): number,
-  getLogger(id: string, options?: LoggerOptions): Logger<N | LogMethodNames>,
-  getNonConsoleLogger(id: string, options?: LoggerOptions): Logger<N | LogMethodNames>
-}
+import { ctx } from './standardLog.ctx.js'
+import type { Logger, LoggerOptions, LogLevel, LogMethodNames, StandardLogInstance, StandardLogOptions } from './types.js'
 
 export interface StandardLog<N extends string = LogMethodNames> extends Readonly<StandardLogInstance<N>> {
 }
@@ -113,11 +106,6 @@ export function getLogger<N extends string = LogMethodNames>(id: string, options
   return getGlobalSL<N>().getLogger(id, options)
 }
 
-export const ctx: {
-  configured?: boolean,
-  gsl?: { store: LogStore, standardLog: StandardLogInstance<LogMethodNames> }
-} = record()
-
 function getGlobalSL<N extends string = LogMethodNames>(): StandardLogInstance<N> {
   if (!ctx.gsl) ctx.gsl = createStandardLogClosure()
 

package/ts/types.ts

@@ -1,4 +1,4 @@
-import { StackTraceMeta } from '@just-func/types'
+import type { StackTraceMeta } from '@just-func/types'
 
 export type StandardLogOptions<CustomLevelNames extends string = LogMethodNames> = {
   customLevels?: Record<CustomLevelNames, number>,
@@ -44,10 +44,18 @@ export type LogEntry = {
 
 export type LogMethod = (...args: any[]) => void
 
-export type LogFunction = ((log: LogMethod) => void) | (() => string)
+export type LogFunction = (log: LogMethod, logLevel: number) => string | void
 
 export type ReporterFilter = string | RegExp | ((reporterId: string) => boolean)
 
+export interface StandardLogInstance<N extends string = LogMethodNames> {
+  logLevel: number,
+  toLogLevelName(level: number): string,
+  toLogLevel(name: N): number,
+  getLogger(id: string, options?: LoggerOptions): Logger<N | LogMethodNames>,
+  getNonConsoleLogger(id: string, options?: LoggerOptions): Logger<N | LogMethodNames>
+}
+
 /**
  * Formats a log entry.
  * Depends on the reporter, it can expect a different return type.