standard-log 9.0.0 → 9.1.1

package/ts/global.ts

@@ -0,0 +1,43 @@
+import { StackTraceMeta } from '@just-func/types'
+import { record } from 'type-plus'
+import { LogStore } from './logStore.js'
+import { createStandardLogClosure, StandardLogInstance } from './standardLog.js'
+import { LoggerOptions, LogMethodNames, StandardLogOptions } from './types.js'
+
+export function getLogger<N extends string = LogMethodNames>(
+  params: [id: string, options?: LoggerOptions], meta?: StackTraceMeta) {
+  return getGlobalSL<N>().getLogger(params, meta)
+}
+
+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()
+
+  return ctx.gsl!.standardLog as StandardLogInstance<N>
+}
+
+export function configGlobal(options: Omit<StandardLogOptions, 'customLevels'>) {
+  if (ctx.configured) {
+    const log = ctx.gsl?.standardLog.getLogger(['standard-log'])
+    log?.warn('configGlobal() is being called more than once. Please make sure this is expected. Application should use `createStandardLog()` most of the time.')
+  }
+
+  if (ctx.gsl) {
+    if (options.logLevel) {
+      ctx.gsl.store.logLevel = options.logLevel
+    }
+    if (options.reporters) {
+      const reporters = ctx.gsl.store.reporters
+      while (reporters.length > 0) reporters.pop()
+      reporters.push(...options.reporters)
+    }
+  }
+  else {
+    ctx.gsl = createStandardLogClosure(options)
+  }
+  ctx.configured = true
+}

package/ts/index.ts

@@ -1,7 +1,11 @@
 export * from './console.js'
 export * from './errors.js'
 export * from './formatter.js'
+export { configGlobal, getLogger } from './global.js'
 export * from './logLevels.js'
 export * from './memory.js'
-export * from './standardLog.js'
+export {
+  createStandardLog, createStandardLogForTest, StandardLog, StandardLogInstance
+} from './standardLog.js'
 export * from './types.js'
+

package/ts/logStore.ts

@@ -4,7 +4,7 @@ import { createConsoleLogReporter } from './console.js'
 import { logLevels, toLogLevel, toLogLevelName } from './logLevels.js'
 import type { Logger, LogLevel, LogReporter, StandardLogOptions } from './types.js'
 
-export function createLogStore(options: StandardLogOptions): LogStore {
+export function createLogStore(options: Required<StandardLogOptions>): LogStore {
   return {
     loggers: {},
     reporters: options.reporters || [createConsoleLogReporter()],

package/ts/logger.ts

@@ -1,5 +1,4 @@
 import type { StackTraceMeta } from '@just-func/types'
-import { RequiredPick } from 'type-plus'
 import { InvalidId } from './errors.js'
 import { logLevels } from './logLevels.js'
 import { LogStore } from './logStore.js'
@@ -7,10 +6,11 @@ import type { LogEntry, LogFunction, Logger, LoggerOptions, LogMethodNames, LogR
 import { LogLevel } from './types.js'
 
 export function createLogger<T extends string = LogMethodNames>(
-  [store, id, { level, writeTo = () => true }]: [LogStore, string, RequiredPick<LoggerOptions, 'level'>],
+  [store, id, options]: [LogStore, string, LoggerOptions | undefined],
   meta?: StackTraceMeta
 ): Logger {
   validateId(id, meta)
+  const writeTo = options?.writeTo ?? (() => true)
   const [filter, reporters]: [(reporterId: string) => boolean, LogReporter[]] = typeof writeTo === 'string'
     ? [id => id === writeTo, store.reporters]
     : writeTo instanceof RegExp
@@ -24,7 +24,7 @@ export function createLogger<T extends string = LogMethodNames>(
   }
 
   const logger = {
-    level,
+    level: options?.level,
     write
   } as any
 

package/ts/platform.browser.ts

@@ -1,8 +1,5 @@
 import type { ConsoleLike, LogEntry } from './types.js'
 
 export const toInspectLogEntry = (e: LogEntry) => e
-export function isConsoleDebugAvailable() {
-  return true
-}
 
 export const polyfill: { console?: ConsoleLike } = {}

package/ts/platform.ts

@@ -1,23 +1,6 @@
 import { inspect } from 'util'
 import type { ConsoleLike, LogEntry } from './types.js'
 
-export function semverGt(versionString: string, version: [number, number, number]) {
-  const actual = versionString.split('.').reverse().reduce((p, v, i) => {
-    p += Number.parseInt(v, 10) * Math.pow(100, i)
-    return p
-  }, 0)
-
-  return actual > (version[0] * 10000 + version[1] * 100 + version[2])
-}
-
-// istanbul ignore next
-export function isConsoleDebugAvailable() {
-  // without this, systemJs will complain `process is not defined`
-  if (!global.process) return true
-  const versionString = process.version.startsWith('v') ? process.version.slice(1) : process.version
-  return semverGt(versionString, [9, 3, 0])
-}
-
 export const toInspectLogEntry = (e: LogEntry) => (
   e.args = e.args.map(value => typeof value === 'object' && value !== null ? inspect(value) : value),
   e)

package/ts/standardLog.ts

@@ -2,37 +2,48 @@ import { StackTraceMeta } from '@just-func/types'
 import { required } from 'type-plus'
 import { createLogger } from './logger.js'
 import { logLevels } from './logLevels.js'
-import { createLogStore } from './logStore.js'
+import { createLogStore, LogStore } from './logStore.js'
 import { createMemoryLogReporter } from './memory.js'
 import type { Logger, LoggerOptions, LogLevel, LogMethodNames, StandardLogOptions } from './types.js'
 
-export interface StandardLog<N extends string = LogMethodNames> {
-  readonly logLevel: number,
+export interface StandardLogInstance<N extends string = LogMethodNames> {
+  logLevel: number,
   toLogLevelName(level: number): string,
   toLogLevel(name: N): number,
-  getLogger(params: [id: string, options?: LoggerOptions], meta?: StackTraceMeta): Logger<N>
+  getLogger(params: [id: string, options?: LoggerOptions], meta?: StackTraceMeta): Logger<N | LogMethodNames>
+}
+
+export interface StandardLog<N extends string = LogMethodNames> extends Readonly<StandardLogInstance<N>> {
 }
 
 export function createStandardLog<N extends string = LogMethodNames>(
-  options?: Partial<StandardLogOptions<N>>, _meta?: StackTraceMeta
-): Readonly<StandardLog<N>> {
+  options?: StandardLogOptions<N>
+): StandardLog<N> {
+  return createStandardLogClosure(options).standardLog
+}
+
+export function createStandardLogClosure<N extends string = LogMethodNames>(
+  options?: StandardLogOptions<N>
+): { store: LogStore, standardLog: StandardLog<N> } {
   const store = createLogStore(required({ logLevel: logLevels.info }, options))
 
-  return Object.freeze({
-    get logLevel() { return store.logLevel },
-
-    toLogLevelName(level: number) {
-      return store.logLevelStore.getName(level)
-    },
-    toLogLevel(name: string) {
-      return store.logLevelStore.getLevel(name)
-    },
-    getLogger([id, options]: [id: string, options?: LoggerOptions], meta?: StackTraceMeta): Logger<N> {
-      if (store.loggers[id]) return store.loggers[id] as any
-      const opt = required({ level: store.logLevel }, options)
-      return store.loggers[id] = createLogger([store, id, opt], { ssf: this.getLogger, ...meta }) as any
+  return {
+    store,
+    standardLog: {
+      get logLevel() { return store.logLevel },
+
+      toLogLevelName(level: number) {
+        return store.logLevelStore.getName(level)
+      },
+      toLogLevel(name: string) {
+        return store.logLevelStore.getLevel(name)
+      },
+      getLogger([id, options]: [id: string, options?: LoggerOptions], meta?: StackTraceMeta) {
+        if (store.loggers[id]) return store.loggers[id] as any
+        return store.loggers[id] = createLogger([store, id, options], { ssf: this.getLogger, ...meta }) as any
+      }
     }
-  })
+  }
 }
 
 export function createStandardLogForTest(logLevel: LogLevel = logLevels.debug) {

package/ts/types.ts

@@ -1,7 +1,7 @@
 export type StandardLogOptions<CustomLevelNames extends string = string> = {
-  customLevels: Record<CustomLevelNames, number>,
-  logLevel: number,
-  reporters: LogReporter[]
+  customLevels?: Record<CustomLevelNames, number>,
+  logLevel?: number,
+  reporters?: LogReporter[]
 }
 
 export interface LoggerOptions {

package/cjs/platform.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=platform.spec.d.ts.map

package/cjs/platform.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.spec.d.ts","sourceRoot":"","sources":["../ts/platform.spec.ts"],"names":[],"mappings":""}

package/cjs/platform.spec.js

@@ -1,22 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var platform_js_1 = require("./platform.js");
-test('9.3.0 returns false', function () {
-    expect((0, platform_js_1.semverGt)('9.3.0', [9, 3, 0])).toBe(false);
-});
-test('9.3.1 returns true', function () {
-    expect((0, platform_js_1.semverGt)('9.3.1', [9, 3, 0])).toBe(true);
-});
-test('9.3.1 returns true', function () {
-    expect((0, platform_js_1.semverGt)('9.3.1', [9, 3, 0])).toBe(true);
-});
-test('9.4.0 returns true', function () {
-    expect((0, platform_js_1.semverGt)('9.4.0', [9, 3, 0])).toBe(true);
-});
-test('9.10.0 returns true', function () {
-    expect((0, platform_js_1.semverGt)('9.10.0', [9, 3, 0])).toBe(true);
-});
-test('10.0.0 returns true', function () {
-    expect((0, platform_js_1.semverGt)('10.0.0', [9, 3, 0])).toBe(true);
-});
-//# sourceMappingURL=platform.spec.js.map

package/cjs/platform.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.spec.js","sourceRoot":"","sources":["../ts/platform.spec.ts"],"names":[],"mappings":";;AAAA,6CAAwC;AAExC,IAAI,CAAC,qBAAqB,EAAE;IAC1B,MAAM,CAAC,IAAA,sBAAQ,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,oBAAoB,EAAE;IACzB,MAAM,CAAC,IAAA,sBAAQ,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,oBAAoB,EAAE;IACzB,MAAM,CAAC,IAAA,sBAAQ,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,oBAAoB,EAAE;IACzB,MAAM,CAAC,IAAA,sBAAQ,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,qBAAqB,EAAE;IAC1B,MAAM,CAAC,IAAA,sBAAQ,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,qBAAqB,EAAE;IAC1B,MAAM,CAAC,IAAA,sBAAQ,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA","sourcesContent":["import { semverGt } from './platform.js'\n\ntest('9.3.0 returns false', () => {\n  expect(semverGt('9.3.0', [9, 3, 0])).toBe(false)\n})\n\ntest('9.3.1 returns true', () => {\n  expect(semverGt('9.3.1', [9, 3, 0])).toBe(true)\n})\n\ntest('9.3.1 returns true', () => {\n  expect(semverGt('9.3.1', [9, 3, 0])).toBe(true)\n})\n\ntest('9.4.0 returns true', () => {\n  expect(semverGt('9.4.0', [9, 3, 0])).toBe(true)\n})\n\ntest('9.10.0 returns true', () => {\n  expect(semverGt('9.10.0', [9, 3, 0])).toBe(true)\n})\n\ntest('10.0.0 returns true', () => {\n  expect(semverGt('10.0.0', [9, 3, 0])).toBe(true)\n})\n"]}

package/esm/platform.spec.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=platform.spec.d.ts.map

package/esm/platform.spec.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.spec.d.ts","sourceRoot":"","sources":["../ts/platform.spec.ts"],"names":[],"mappings":""}

package/esm/platform.spec.js

@@ -1,20 +0,0 @@
-import { semverGt } from './platform.js';
-test('9.3.0 returns false', () => {
-    expect(semverGt('9.3.0', [9, 3, 0])).toBe(false);
-});
-test('9.3.1 returns true', () => {
-    expect(semverGt('9.3.1', [9, 3, 0])).toBe(true);
-});
-test('9.3.1 returns true', () => {
-    expect(semverGt('9.3.1', [9, 3, 0])).toBe(true);
-});
-test('9.4.0 returns true', () => {
-    expect(semverGt('9.4.0', [9, 3, 0])).toBe(true);
-});
-test('9.10.0 returns true', () => {
-    expect(semverGt('9.10.0', [9, 3, 0])).toBe(true);
-});
-test('10.0.0 returns true', () => {
-    expect(semverGt('10.0.0', [9, 3, 0])).toBe(true);
-});
-//# sourceMappingURL=platform.spec.js.map

package/esm/platform.spec.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"platform.spec.js","sourceRoot":"","sources":["../ts/platform.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAExC,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC/B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC9B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC9B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAC9B,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACjD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC/B,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA;AAEF,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC/B,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAClD,CAAC,CAAC,CAAA","sourcesContent":["import { semverGt } from './platform.js'\n\ntest('9.3.0 returns false', () => {\n  expect(semverGt('9.3.0', [9, 3, 0])).toBe(false)\n})\n\ntest('9.3.1 returns true', () => {\n  expect(semverGt('9.3.1', [9, 3, 0])).toBe(true)\n})\n\ntest('9.3.1 returns true', () => {\n  expect(semverGt('9.3.1', [9, 3, 0])).toBe(true)\n})\n\ntest('9.4.0 returns true', () => {\n  expect(semverGt('9.4.0', [9, 3, 0])).toBe(true)\n})\n\ntest('9.10.0 returns true', () => {\n  expect(semverGt('9.10.0', [9, 3, 0])).toBe(true)\n})\n\ntest('10.0.0 returns true', () => {\n  expect(semverGt('10.0.0', [9, 3, 0])).toBe(true)\n})\n"]}