@jiakun-zhao/utils 1.2.0 → 1.3.0

package/dist/index.cjs

@@ -2,6 +2,7 @@
 
 const utils = require('@antfu/utils');
 
+const isArray = Array.isArray;
 function singleOrNull(arr) {
   return arr.length === 1 ? arr[0] : null;
 }
@@ -11,8 +12,10 @@ function transform(value, fn) {
 }
 function safe(fn) {
   try {
-    return fn();
+    const res = fn();
+    return res instanceof Promise ? res.catch(() => null) : res;
   } catch {
+    return null;
   }
 }
 
@@ -68,29 +71,55 @@ const colors = {
   /** 背景白色 */
   bgWhite: "\x1B[47m"
 };
-const map = {
+const messages = {
   info: { color: colors.blue, symbol: "\u{1D4F2}" },
   warn: { color: colors.yellow, symbol: "\u{1D4F2}" },
   success: { color: colors.green, symbol: "\u2714\uFE0E" },
   error: { color: colors.red, symbol: "\u2718" }
 };
-function print(msg, type) {
-  if (!type)
-    console.log(msg);
-  else
-    console.log(`${map[type].color}${map[type].symbol} ${colors.grey}${msg}${colors.reset}`);
+function print(...args) {
+  if (!args.length)
+    return;
+  if (utils.isString(args[0])) {
+    const [msg, type = "info"] = args;
+    console.log(`${messages[type].color}${messages[type].symbol} ${colors.grey}${msg}${colors.reset}`);
+  }
+  let text = args.map((it) => `${it.color ? colors[it.color] : ""}${it.value}`).join("");
+  console.log(`${text}${colors.reset}`);
 }
 
-const timestamp = () => +Date.now();
-const isArray = Array.isArray;
+function cleanText(str, searchValue) {
+  return str.replace(searchValue, "");
+}
 
+function getValueOrUndefined(condition, value) {
+  return condition ? value : void 0;
+}
+function setFromObject(entry, obj, format) {
+  Object.entries(obj).forEach(([name, value], index) => {
+    const [_name, _value] = format?.(name, value, index) ?? [name, value];
+    entry.set(_name, _value);
+  });
+  return entry;
+}
+
+exports.cleanText = cleanText;
+exports.colors = colors;
+exports.getValueOrUndefined = getValueOrUndefined;
 exports.isArray = isArray;
 exports.print = print;
 exports.random = random;
 exports.safe = safe;
+exports.setFromObject = setFromObject;
 exports.singleOrNull = singleOrNull;
-exports.timestamp = timestamp;
 exports.transform = transform;
+Object.prototype.hasOwnProperty.call(utils, '__proto__') &&
+  !Object.prototype.hasOwnProperty.call(exports, '__proto__') &&
+  Object.defineProperty(exports, '__proto__', {
+    enumerable: true,
+    value: utils['__proto__']
+  });
+
 Object.keys(utils).forEach(function (k) {
   if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = utils[k];
 });

package/dist/index.d.cts

@@ -1,40 +1,99 @@
 export * from '@antfu/utils';
 
+declare const isArray: (arg: any) => arg is any[];
 declare function singleOrNull<T>(arr: T[]): T | null;
 
 declare function transform<T, R = void>(value: T, fn: (it: T) => R): R;
-declare function safe<R>(fn: () => R): R | undefined;
+declare function safe<R>(fn: () => R): typeof fn extends () => Promise<infer T> ? Promise<T | null> : (R | null);
 
 /**
  * @description min <= result < max
  */
 declare function random(max: number, min?: number): number;
 
-declare const map: {
-    info: {
-        color: string;
-        symbol: string;
+declare const colors: {
+    /** 重置颜色 */
+    readonly reset: "\u001B[0m";
+    /** 亮色(加粗) */
+    readonly bright: "\u001B[1m";
+    /** 斜体 */
+    readonly italic: "\u001B[3m";
+    /** 下划线 */
+    readonly underline: "\u001B[4m";
+    /** 反向 */
+    readonly reverse: "\u001B[7m";
+    /** 隐藏 */
+    readonly hidden: "\u001B[8m";
+    /** 灰色 */
+    readonly grey: "\u001B[2m";
+    /** 黑色 */
+    readonly black: "\u001B[30m";
+    /** 红色 */
+    readonly red: "\u001B[31m";
+    /** 绿色 */
+    readonly green: "\u001B[32m";
+    /** 黄色 */
+    readonly yellow: "\u001B[33m";
+    /** 蓝色 */
+    readonly blue: "\u001B[34m";
+    /** 品红 */
+    readonly magenta: "\u001B[35m";
+    /** 青色 */
+    readonly cyan: "\u001B[36m";
+    /** 白色 */
+    readonly white: "\u001B[37m";
+    /** 背景黑色 */
+    readonly bgBlack: "\u001B[40m";
+    /** 背景红色 */
+    readonly bgRed: "\u001B[41m";
+    /** 背景绿色 */
+    readonly bgGreen: "\u001B[42m";
+    /** 背景黄色 */
+    readonly bgYellow: "\u001B[43m";
+    /** 背景蓝色 */
+    readonly bgBlue: "\u001B[44m";
+    /** 背景品红 */
+    readonly bgMagenta: "\u001B[45m";
+    /** 背景青色 */
+    readonly bgCyan: "\u001B[46m";
+    /** 背景白色 */
+    readonly bgWhite: "\u001B[47m";
+};
+declare const messages: {
+    readonly info: {
+        readonly color: "\u001B[34m";
+        readonly symbol: "𝓲";
     };
-    warn: {
-        color: string;
-        symbol: string;
+    readonly warn: {
+        readonly color: "\u001B[33m";
+        readonly symbol: "𝓲";
     };
-    success: {
-        color: string;
-        symbol: string;
+    readonly success: {
+        readonly color: "\u001B[32m";
+        readonly symbol: "✔︎";
     };
-    error: {
-        color: string;
-        symbol: string;
+    readonly error: {
+        readonly color: "\u001B[31m";
+        readonly symbol: "✘";
     };
 };
 /**
  * process.stdout.write('msg')
  * process.stdout.clearLine(0)
  */
-declare function print(msg: any, type?: keyof typeof map): void;
+type ColorType = keyof typeof colors;
+type MessageType = keyof typeof messages;
+declare function print(msg: string, type?: MessageType): void;
+declare function print(...msg: {
+    color?: ColorType;
+    value: string;
+}[]): void;
 
-declare const timestamp: () => number;
-declare const isArray: (arg: any) => arg is any[];
+declare function cleanText(str: string, searchValue: RegExp | string): string;
+
+declare function getValueOrUndefined<T>(condition: unknown, value: T): T | undefined;
+declare function setFromObject<Value, Entry extends {
+    set: (name: string, value: Value) => any;
+}>(entry: Entry, obj: Record<string, Value>, format?: (name: string, value: Value, index: number) => [string, Value]): Entry;
 
-export { isArray, print, random, safe, singleOrNull, timestamp, transform };
+export { cleanText, colors, getValueOrUndefined, isArray, print, random, safe, setFromObject, singleOrNull, transform };

package/dist/index.d.mts

@@ -1,40 +1,99 @@
 export * from '@antfu/utils';
 
+declare const isArray: (arg: any) => arg is any[];
 declare function singleOrNull<T>(arr: T[]): T | null;
 
 declare function transform<T, R = void>(value: T, fn: (it: T) => R): R;
-declare function safe<R>(fn: () => R): R | undefined;
+declare function safe<R>(fn: () => R): typeof fn extends () => Promise<infer T> ? Promise<T | null> : (R | null);
 
 /**
  * @description min <= result < max
  */
 declare function random(max: number, min?: number): number;
 
-declare const map: {
-    info: {
-        color: string;
-        symbol: string;
+declare const colors: {
+    /** 重置颜色 */
+    readonly reset: "\u001B[0m";
+    /** 亮色(加粗) */
+    readonly bright: "\u001B[1m";
+    /** 斜体 */
+    readonly italic: "\u001B[3m";
+    /** 下划线 */
+    readonly underline: "\u001B[4m";
+    /** 反向 */
+    readonly reverse: "\u001B[7m";
+    /** 隐藏 */
+    readonly hidden: "\u001B[8m";
+    /** 灰色 */
+    readonly grey: "\u001B[2m";
+    /** 黑色 */
+    readonly black: "\u001B[30m";
+    /** 红色 */
+    readonly red: "\u001B[31m";
+    /** 绿色 */
+    readonly green: "\u001B[32m";
+    /** 黄色 */
+    readonly yellow: "\u001B[33m";
+    /** 蓝色 */
+    readonly blue: "\u001B[34m";
+    /** 品红 */
+    readonly magenta: "\u001B[35m";
+    /** 青色 */
+    readonly cyan: "\u001B[36m";
+    /** 白色 */
+    readonly white: "\u001B[37m";
+    /** 背景黑色 */
+    readonly bgBlack: "\u001B[40m";
+    /** 背景红色 */
+    readonly bgRed: "\u001B[41m";
+    /** 背景绿色 */
+    readonly bgGreen: "\u001B[42m";
+    /** 背景黄色 */
+    readonly bgYellow: "\u001B[43m";
+    /** 背景蓝色 */
+    readonly bgBlue: "\u001B[44m";
+    /** 背景品红 */
+    readonly bgMagenta: "\u001B[45m";
+    /** 背景青色 */
+    readonly bgCyan: "\u001B[46m";
+    /** 背景白色 */
+    readonly bgWhite: "\u001B[47m";
+};
+declare const messages: {
+    readonly info: {
+        readonly color: "\u001B[34m";
+        readonly symbol: "𝓲";
     };
-    warn: {
-        color: string;
-        symbol: string;
+    readonly warn: {
+        readonly color: "\u001B[33m";
+        readonly symbol: "𝓲";
     };
-    success: {
-        color: string;
-        symbol: string;
+    readonly success: {
+        readonly color: "\u001B[32m";
+        readonly symbol: "✔︎";
     };
-    error: {
-        color: string;
-        symbol: string;
+    readonly error: {
+        readonly color: "\u001B[31m";
+        readonly symbol: "✘";
     };
 };
 /**
  * process.stdout.write('msg')
  * process.stdout.clearLine(0)
  */
-declare function print(msg: any, type?: keyof typeof map): void;
+type ColorType = keyof typeof colors;
+type MessageType = keyof typeof messages;
+declare function print(msg: string, type?: MessageType): void;
+declare function print(...msg: {
+    color?: ColorType;
+    value: string;
+}[]): void;
 
-declare const timestamp: () => number;
-declare const isArray: (arg: any) => arg is any[];
+declare function cleanText(str: string, searchValue: RegExp | string): string;
+
+declare function getValueOrUndefined<T>(condition: unknown, value: T): T | undefined;
+declare function setFromObject<Value, Entry extends {
+    set: (name: string, value: Value) => any;
+}>(entry: Entry, obj: Record<string, Value>, format?: (name: string, value: Value, index: number) => [string, Value]): Entry;
 
-export { isArray, print, random, safe, singleOrNull, timestamp, transform };
+export { cleanText, colors, getValueOrUndefined, isArray, print, random, safe, setFromObject, singleOrNull, transform };

package/dist/index.d.ts

@@ -1,40 +1,99 @@
 export * from '@antfu/utils';
 
+declare const isArray: (arg: any) => arg is any[];
 declare function singleOrNull<T>(arr: T[]): T | null;
 
 declare function transform<T, R = void>(value: T, fn: (it: T) => R): R;
-declare function safe<R>(fn: () => R): R | undefined;
+declare function safe<R>(fn: () => R): typeof fn extends () => Promise<infer T> ? Promise<T | null> : (R | null);
 
 /**
  * @description min <= result < max
  */
 declare function random(max: number, min?: number): number;
 
-declare const map: {
-    info: {
-        color: string;
-        symbol: string;
+declare const colors: {
+    /** 重置颜色 */
+    readonly reset: "\u001B[0m";
+    /** 亮色(加粗) */
+    readonly bright: "\u001B[1m";
+    /** 斜体 */
+    readonly italic: "\u001B[3m";
+    /** 下划线 */
+    readonly underline: "\u001B[4m";
+    /** 反向 */
+    readonly reverse: "\u001B[7m";
+    /** 隐藏 */
+    readonly hidden: "\u001B[8m";
+    /** 灰色 */
+    readonly grey: "\u001B[2m";
+    /** 黑色 */
+    readonly black: "\u001B[30m";
+    /** 红色 */
+    readonly red: "\u001B[31m";
+    /** 绿色 */
+    readonly green: "\u001B[32m";
+    /** 黄色 */
+    readonly yellow: "\u001B[33m";
+    /** 蓝色 */
+    readonly blue: "\u001B[34m";
+    /** 品红 */
+    readonly magenta: "\u001B[35m";
+    /** 青色 */
+    readonly cyan: "\u001B[36m";
+    /** 白色 */
+    readonly white: "\u001B[37m";
+    /** 背景黑色 */
+    readonly bgBlack: "\u001B[40m";
+    /** 背景红色 */
+    readonly bgRed: "\u001B[41m";
+    /** 背景绿色 */
+    readonly bgGreen: "\u001B[42m";
+    /** 背景黄色 */
+    readonly bgYellow: "\u001B[43m";
+    /** 背景蓝色 */
+    readonly bgBlue: "\u001B[44m";
+    /** 背景品红 */
+    readonly bgMagenta: "\u001B[45m";
+    /** 背景青色 */
+    readonly bgCyan: "\u001B[46m";
+    /** 背景白色 */
+    readonly bgWhite: "\u001B[47m";
+};
+declare const messages: {
+    readonly info: {
+        readonly color: "\u001B[34m";
+        readonly symbol: "𝓲";
     };
-    warn: {
-        color: string;
-        symbol: string;
+    readonly warn: {
+        readonly color: "\u001B[33m";
+        readonly symbol: "𝓲";
     };
-    success: {
-        color: string;
-        symbol: string;
+    readonly success: {
+        readonly color: "\u001B[32m";
+        readonly symbol: "✔︎";
     };
-    error: {
-        color: string;
-        symbol: string;
+    readonly error: {
+        readonly color: "\u001B[31m";
+        readonly symbol: "✘";
     };
 };
 /**
  * process.stdout.write('msg')
  * process.stdout.clearLine(0)
  */
-declare function print(msg: any, type?: keyof typeof map): void;
+type ColorType = keyof typeof colors;
+type MessageType = keyof typeof messages;
+declare function print(msg: string, type?: MessageType): void;
+declare function print(...msg: {
+    color?: ColorType;
+    value: string;
+}[]): void;
 
-declare const timestamp: () => number;
-declare const isArray: (arg: any) => arg is any[];
+declare function cleanText(str: string, searchValue: RegExp | string): string;
+
+declare function getValueOrUndefined<T>(condition: unknown, value: T): T | undefined;
+declare function setFromObject<Value, Entry extends {
+    set: (name: string, value: Value) => any;
+}>(entry: Entry, obj: Record<string, Value>, format?: (name: string, value: Value, index: number) => [string, Value]): Entry;
 
-export { isArray, print, random, safe, singleOrNull, timestamp, transform };
+export { cleanText, colors, getValueOrUndefined, isArray, print, random, safe, setFromObject, singleOrNull, transform };

package/dist/index.mjs

@@ -1,5 +1,7 @@
+import { isString } from '@antfu/utils';
 export * from '@antfu/utils';
 
+const isArray = Array.isArray;
 function singleOrNull(arr) {
   return arr.length === 1 ? arr[0] : null;
 }
@@ -9,8 +11,10 @@ function transform(value, fn) {
 }
 function safe(fn) {
   try {
-    return fn();
+    const res = fn();
+    return res instanceof Promise ? res.catch(() => null) : res;
   } catch {
+    return null;
   }
 }
 
@@ -66,20 +70,36 @@ const colors = {
   /** 背景白色 */
   bgWhite: "\x1B[47m"
 };
-const map = {
+const messages = {
   info: { color: colors.blue, symbol: "\u{1D4F2}" },
   warn: { color: colors.yellow, symbol: "\u{1D4F2}" },
   success: { color: colors.green, symbol: "\u2714\uFE0E" },
   error: { color: colors.red, symbol: "\u2718" }
 };
-function print(msg, type) {
-  if (!type)
-    console.log(msg);
-  else
-    console.log(`${map[type].color}${map[type].symbol} ${colors.grey}${msg}${colors.reset}`);
+function print(...args) {
+  if (!args.length)
+    return;
+  if (isString(args[0])) {
+    const [msg, type = "info"] = args;
+    console.log(`${messages[type].color}${messages[type].symbol} ${colors.grey}${msg}${colors.reset}`);
+  }
+  let text = args.map((it) => `${it.color ? colors[it.color] : ""}${it.value}`).join("");
+  console.log(`${text}${colors.reset}`);
 }
 
-const timestamp = () => +Date.now();
-const isArray = Array.isArray;
+function cleanText(str, searchValue) {
+  return str.replace(searchValue, "");
+}
+
+function getValueOrUndefined(condition, value) {
+  return condition ? value : void 0;
+}
+function setFromObject(entry, obj, format) {
+  Object.entries(obj).forEach(([name, value], index) => {
+    const [_name, _value] = format?.(name, value, index) ?? [name, value];
+    entry.set(_name, _value);
+  });
+  return entry;
+}
 
-export { isArray, print, random, safe, singleOrNull, timestamp, transform };
+export { cleanText, colors, getValueOrUndefined, isArray, print, random, safe, setFromObject, singleOrNull, transform };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jiakun-zhao/utils",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Utils.",
   "author": "Jiakun Zhao <hi@zhaojiakun.com>",
   "license": "MIT",
@@ -27,21 +27,19 @@
     "dist"
   ],
   "dependencies": {
-    "@antfu/utils": "^0.7.8"
+    "@antfu/utils": "^9.1.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^2.19.0",
-    "@types/node": "^20.12.12",
-    "bumpp": "^9.4.1",
-    "eslint": "^9.3.0",
-    "typescript": "^5.4.5",
-    "unbuild": "^2.0.0",
-    "vitest": "^1.6.0"
+    "@antfu/eslint-config": "^4.3.0",
+    "@types/node": "^22.13.4",
+    "bumpp": "^10.0.3",
+    "eslint": "^9.20.1",
+    "typescript": "^5.7.3",
+    "unbuild": "^3.3.1"
   },
   "scripts": {
     "build": "unbuild",
     "stub": "unbuild --stub",
-    "test": "vitest -u",
     "release": "bumpp && pnpm publish && npx cnpm sync @jiakun-zhao/utils"
   }
 }