@wener/utils 1.1.8 → 1.1.9

package/src/index.ts

@@ -34,6 +34,8 @@ export { isDefined } from './validations/isDefined';
 export { isEmptyObject } from './validations/isEmptyObject';
 export { isUUID } from './validations/isUUID';
 export { isPlainObject } from './validations/isPlainObject';
+export { parseTimestamp } from './validations/parseTimestamp';
+export { parseBoolean } from './validations/parseBoolean';
 
 // modules
 export { parseModuleId, type ParsedModuleId } from './modules/parseModuleId';
@@ -41,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';
 
@@ -79,3 +81,5 @@ export { isULID, createULID, ulid, parseULID } from './crypto/ulid';
 
 // misc
 export { createRandom } from './maths/random';
+
+export type FetchLike = (url: string, init?: RequestInit) => Promise<Response>;

package/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);

package/src/logging/{createWriteLogger.ts → 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 };
+}

package/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');
   }
 });

package/src/server/polyfillBrowser.test.ts

@@ -1,7 +1,11 @@
 import test from 'ava';
+import * as nodeFetch from 'node-fetch';
 import { polyfillBrowser } from './polyfillBrowser';
+import { polyfillFetch } from './polyfillFetch';
 
-test.before(async () => {
+test.before(async (t) => {
+  t.true(polyfillFetch(nodeFetch));
+  t.false(polyfillFetch());
   await polyfillBrowser();
 });
 

package/src/server/polyfillFetch.ts

@@ -1,28 +1,26 @@
-export async function polyfillFetch() {
+import type { MaybePromise } from '../asyncs/MaybePromise';
+
+export function polyfillFetch(nodeFetch: typeof import('node-fetch')): boolean;
+export function polyfillFetch(nodeFetch?: undefined): Promise<boolean>;
+export function polyfillFetch(nodeFetch?: typeof import('node-fetch')): MaybePromise<boolean> {
   if ('fetch' in globalThis) {
     return false;
   }
-  const {
-    default: fetch,
-    Response,
-    Headers,
-    Request,
-    AbortError,
-    FetchError,
-    FormData,
-    Blob,
-    File,
-  } = await import('node-fetch');
-  Object.assign(globalThis, {
-    fetch,
-    Response,
-    Headers,
-    Request,
-    AbortError,
-    FetchError,
-    FormData,
-    Blob,
-    File,
-  });
-  return true;
+  // sync mode
+  if (nodeFetch) {
+    const { default: fetch, Response, Headers, Request, AbortError, FetchError, FormData, Blob, File } = nodeFetch;
+    Object.assign(globalThis, {
+      fetch,
+      Response,
+      Headers,
+      Request,
+      AbortError,
+      FetchError,
+      FormData,
+      Blob,
+      File,
+    });
+    return true;
+  }
+  return import('node-fetch').then((v) => polyfillFetch(v));
 }

package/src/validations/parseBoolean.ts

@@ -0,0 +1,30 @@
+export function parseBoolean(s: string | boolean | number | null | undefined, strict: true): boolean | undefined;
+export function parseBoolean(s: string | boolean | number | null | undefined): boolean;
+export function parseBoolean(s?: string | boolean | number | null, strict = false): boolean | undefined {
+  if (typeof s === 'boolean') {
+    return s;
+  }
+  if (typeof s === 'string') {
+    switch (s.toLowerCase()) {
+      case 'f':
+      case 'false':
+      case '0':
+        return false;
+      case '1':
+      case 't':
+      case 'true':
+        return true;
+    }
+  } else if (typeof s === 'number') {
+    switch (s) {
+      case 0:
+        return false;
+      case 1:
+        return true;
+    }
+  }
+  if (strict) {
+    return undefined;
+  }
+  return Boolean(s);
+}

package/src/validations/parseTimestamp.test.ts

@@ -0,0 +1,7 @@
+import test from 'ava';
+import { parseTimestamp } from './parseTimestamp';
+
+test('parseTimestamp', (t) => {
+  t.is(parseTimestamp(''), undefined);
+  t.is(parseTimestamp(), undefined);
+});

package/src/validations/parseTimestamp.ts

@@ -0,0 +1,29 @@
+export function parseTimestamp(raw?: string | number | Date): Date | undefined {
+  if (!raw) {
+    return undefined;
+  }
+  if (raw instanceof Date) {
+    return raw;
+  }
+
+  if (typeof raw === 'string' && /^[0-9.]+$/.test(raw)) {
+    let n = parseFloat(raw);
+    const len = Math.floor(n).toString().length;
+    /*
+    最常见的是 10 位和 13 位
+    9999999999 - 10*9 - 1970-04-26
+    99999999999 - 11*9 - 1973
+    999999999999 - 12*9 - 2001
+     */
+    if (len <= 11) {
+      n *= 1000;
+    }
+    return new Date(n);
+  } else if (typeof raw === 'string') {
+    const date = new Date(raw);
+    if (!isNaN(+date)) {
+      return date;
+    }
+  }
+  throw new Error(`parseTimestamp: invalid "${raw}"`);
+}

package/lib/logging/createWriteLogger.js

@@ -1,13 +0,0 @@
-function createWriteLogger(write, context = {}) {
-  return {
-    trace: (...values) => write({ ...context, level: "trace", values }),
-    debug: (...values) => write({ ...context, level: "debug", values }),
-    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 })
-  };
-}
-
-export { createWriteLogger };
-//# sourceMappingURL=createWriteLogger.js.map

package/lib/logging/createWriteLogger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"createWriteLogger.js","sources":["../../src/logging/createWriteLogger.ts"],"sourcesContent":["import type { LoggerWithChild, LogLevel } from './Logger';\n\nexport function createWriteLogger(\n  write: (o: { level: LogLevel; values: any[] } & Record<string | symbol, any>) => void,\n  context: object = {},\n): LoggerWithChild {\n  return {\n    trace: (...values) => write({ ...context, level: 'trace', values }),\n    debug: (...values) => write({ ...context, level: 'debug', values }),\n    info: (...values) => write({ ...context, level: 'info', values }),\n    warn: (...values) => write({ ...context, level: 'warn', values }),\n    error: (...values) => write({ ...context, level: 'error', values }),\n    child: (ctx) => createWriteLogger(write, { ...context, ...ctx }),\n  };\n}\n"],"names":[],"mappings":"AAEO,SAAS,iBACd,CAAA,KAAA,EACA,OAAkB,GAAA,EACD,EAAA;AACjB,EAAO,OAAA;AAAA,IACL,KAAA,EAAO,CAAI,GAAA,MAAA,KAAW,KAAM,CAAA,EAAE,GAAG,OAAS,EAAA,KAAA,EAAO,OAAS,EAAA,MAAA,EAAQ,CAAA;AAAA,IAClE,KAAA,EAAO,CAAI,GAAA,MAAA,KAAW,KAAM,CAAA,EAAE,GAAG,OAAS,EAAA,KAAA,EAAO,OAAS,EAAA,MAAA,EAAQ,CAAA;AAAA,IAClE,IAAA,EAAM,CAAI,GAAA,MAAA,KAAW,KAAM,CAAA,EAAE,GAAG,OAAS,EAAA,KAAA,EAAO,MAAQ,EAAA,MAAA,EAAQ,CAAA;AAAA,IAChE,IAAA,EAAM,CAAI,GAAA,MAAA,KAAW,KAAM,CAAA,EAAE,GAAG,OAAS,EAAA,KAAA,EAAO,MAAQ,EAAA,MAAA,EAAQ,CAAA;AAAA,IAChE,KAAA,EAAO,CAAI,GAAA,MAAA,KAAW,KAAM,CAAA,EAAE,GAAG,OAAS,EAAA,KAAA,EAAO,OAAS,EAAA,MAAA,EAAQ,CAAA;AAAA,IAClE,KAAA,EAAO,CAAC,GAAA,KAAQ,iBAAkB,CAAA,KAAA,EAAO,EAAE,GAAG,OAAA,EAAS,GAAG,GAAA,EAAK,CAAA;AAAA,GACjE,CAAA;AACF;;;;"}