createLogger with default writer

apps/demo/src/components/cn/ParserCard.tsx

@@ -1,5 +1,5 @@
 import { Button } from '../../daisy';
-import { Parser } from './parseIt';
+import type { Parser } from './parseIt';
 
 export const ParserCard: React.FC<{
   parser: Parser;
@@ -12,14 +12,14 @@ export const ParserCard: React.FC<{
   if (parsed) {
     if ('prev' in parsed) {
       actions.push(
-        <Button size={'sm'} onClick={() => onChange?.(parsed.prev().toString())}>
+        <Button key={'prev'} size={'sm'} onClick={() => onChange?.(parsed.prev().toString())}>
           上一位
         </Button>,
       );
     }
     if ('next' in parsed) {
       actions.push(
-        <Button size={'sm'} onClick={() => onChange?.(parsed.next().toString())}>
+        <Button key={'next'} size={'sm'} onClick={() => onChange?.(parsed.next().toString())}>
           下一位
         </Button>,
       );
@@ -28,7 +28,7 @@ export const ParserCard: React.FC<{
   if (model) {
     if ('random' in model) {
       actions.push(
-        <Button size={'sm'} onClick={() => onChange?.(model.random().toString())}>
+        <Button key={'random'} size={'sm'} onClick={() => onChange?.(model.random().toString())}>
           随机
         </Button>,
       );

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wener/utils",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "type": "module",
   "description": "Utils for daily use",
   "repository": {
@@ -10,9 +10,6 @@
   "homepage": "https://github.com/wenerme/wode#readme",
   "author": "wener",
   "license": "MIT",
-  "engines": {
-    "node": "16+"
-  },
   "main": "dist/cjs/index.cjs",
   "module": "lib/index.js",
   "exports": {

packages/utils/src/index.ts

@@ -43,7 +43,7 @@ export { isModule, type Module } from './modules/isModule';
 
 // logging
 export { type Logger, type LogLevel } from './logging/Logger';
-export { createWriteLogger } from './logging/createWriteLogger';
+export { createLogger } from './logging/createLogger';
 export { createNoopLogger } from './logging/createNoopLogger';
 export { createChildLogger } from './logging/createChildLogger';
 

packages/utils/src/logging/createChildLogger.ts

@@ -1,11 +1,11 @@
 import type { Logger, LoggerWithChild } from './Logger';
-import { createWriteLogger } from './createWriteLogger';
+import { createLogger } from './createLogger';
 
 export function createChildLogger(l: Logger, ctx: object): LoggerWithChild {
   if (l.child) {
     return l.child(ctx) as LoggerWithChild;
   }
-  return createWriteLogger((o) => {
+  return createLogger((o) => {
     const { level, values, ...c } = o;
     if (Object.keys(c).length) {
       l[level](c, ...values);

packages/utils/src/logging/createWriteLogger.ts → packages/utils/src/logging/createLogger.ts

@@ -1,7 +1,14 @@
 import type { LoggerWithChild, LogLevel } from './Logger';
 
-export function createWriteLogger(
-  write: (o: { level: LogLevel; values: any[] } & Record<string | symbol, any>) => void,
+export function createLogger(
+  write: (o: { level: LogLevel; values: any[] } & Record<string | symbol, any>) => void = ({
+    level,
+    values,
+    ...ctx
+  }) => {
+    ({ values, ...ctx } = merge(ctx, values));
+    console[level]?.(...values, ctx);
+  },
   context: object = {},
 ): LoggerWithChild {
   return {
@@ -10,6 +17,15 @@ export function createWriteLogger(
     info: (...values) => write({ ...context, level: 'info', values }),
     warn: (...values) => write({ ...context, level: 'warn', values }),
     error: (...values) => write({ ...context, level: 'error', values }),
-    child: (ctx) => createWriteLogger(write, { ...context, ...ctx }),
+    child: (ctx) => createLogger(write, { ...context, ...ctx }),
   };
 }
+
+// logger.info({name:'wener'},'message')
+// merge initial context with message object
+function merge(ctx: any, values: any[]) {
+  if (values[0] && typeof values[0] === 'object') {
+    return { ...ctx, ...values[0], values: values.slice(1) };
+  }
+  return { ...ctx, values };
+}

packages/utils/src/logging/logger.test.ts

@@ -1,11 +1,11 @@
 import test from 'ava';
 import { createChildLogger } from './createChildLogger';
-import { createWriteLogger } from './createWriteLogger';
+import { createLogger } from './createLogger';
 
 test('logger', (t) => {
   {
     const logs: any[] = [];
-    const base = createWriteLogger((o) => logs.push(o));
+    const base = createLogger((o) => logs.push(o));
     const l = createChildLogger(base, { c: 'test' });
     l.info('hello');
     t.deepEqual(logs.shift(), { level: 'info', values: ['hello'], c: 'test' });
@@ -15,7 +15,7 @@ test('logger', (t) => {
   createChildLogger(console, { c: 'test' }).info('hello');
   {
     let pass = 0;
-    const l = createWriteLogger(
+    const l = createLogger(
       (o) => {
         pass++;
         t.log(`${o.level}: [${[o.m, o.c].filter(Boolean).join('.') || 'default'}]`, ...o.values);
@@ -30,5 +30,7 @@ test('logger', (t) => {
     t.is(pass, 2);
     createChildLogger(l, { m: 'Child' }).info('nice 3');
     t.is(pass, 3);
+
+    createLogger().child({ name: 'wener' }).info({ x: 1 }, 'Nice');
   }
 });