@jiakun-zhao/utils 1.1.2 → 1.2.1

package/README.md

@@ -7,4 +7,3 @@ Extends [@antfu/utils](https://github.com/antfu/utils) and add some utils.
 ```bash
 pnpm i -D @jiakun-zhao/utils
 ```
-

package/dist/index.cjs

@@ -1,34 +1,14 @@
 'use strict';
 
-const isFunction = (val) => typeof val === "function";
-const isBoolean = (val) => typeof val === "boolean";
-const isNumber = (val) => typeof val === "number";
-const isString = (val) => typeof val === "string";
-const toString = (value) => Object.prototype.toString.call(value);
-const isObject = (val) => toString(val) === "[object Object]";
-const isUndefined = (val) => toString(val) === "[object Undefined]";
-const isNull = (val) => toString(val) === "[object Null]";
-const isRegExp = (val) => toString(val) === "[object RegExp]";
-const isDate = (val) => toString(val) === "[object Date]";
-const isArray = Array.isArray;
-const notNullish = (v) => v != null;
-const notNull = (v) => v !== null;
-const notUndefined = (v) => v !== void 0;
+const utils = require('@antfu/utils');
 
 function singleOrNull(arr) {
   return arr.length === 1 ? arr[0] : null;
 }
-function toArray(array) {
-  array = array ?? [];
-  return isArray(array) ? array : [array];
-}
 
-function take(value, fn) {
+function transform(value, fn) {
   return fn(value);
 }
-function takeIf(value, predicate, defaultValue) {
-  return predicate(value) ? value : notUndefined(defaultValue) ? defaultValue : null;
-}
 function safe(fn) {
   try {
     return fn();
@@ -36,10 +16,6 @@ function safe(fn) {
   }
 }
 
-function random(max, min = 0) {
-  return Math.floor(Math.random() * max) + min;
-}
-
 const colors = {
   /** 重置颜色 */
   reset: "\x1B[0m",
@@ -102,26 +78,26 @@ function print(msg, type) {
 }
 
 const timestamp = () => +Date.now();
+const isArray = Array.isArray;
+function getValueOrUndefined(condition, value) {
+  return condition ? value : void 0;
+}
+function cleanString(str, regexp) {
+  return str.replace(regexp, "");
+}
+function random(max, min = 0) {
+  return Math.floor(Math.random() * max) + min;
+}
 
-exports.colors = colors;
+exports.cleanString = cleanString;
+exports.getValueOrUndefined = getValueOrUndefined;
 exports.isArray = isArray;
-exports.isBoolean = isBoolean;
-exports.isDate = isDate;
-exports.isFunction = isFunction;
-exports.isNull = isNull;
-exports.isNumber = isNumber;
-exports.isObject = isObject;
-exports.isRegExp = isRegExp;
-exports.isString = isString;
-exports.isUndefined = isUndefined;
-exports.notNull = notNull;
-exports.notNullish = notNullish;
-exports.notUndefined = notUndefined;
 exports.print = print;
 exports.random = random;
 exports.safe = safe;
 exports.singleOrNull = singleOrNull;
-exports.take = take;
-exports.takeIf = takeIf;
 exports.timestamp = timestamp;
-exports.toArray = toArray;
+exports.transform = transform;
+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,86 +1,10 @@
-type Nullable<T> = T | null | undefined;
-type NotNullable<T> = Exclude<T, null | undefined>;
-type NotNull<T> = Exclude<T, null>;
-type NotUndefined<T> = Exclude<T, undefined>;
-type Arrayable<T> = T | Array<T>;
-type ElementOf<T> = T extends Array<infer Element> ? Element : never;
-type Fn<R = void> = (...args: any[]) => R;
+export * from '@antfu/utils';
 
 declare function singleOrNull<T>(arr: T[]): T | null;
-declare function toArray<T>(array?: T | Array<T>): Array<T>;
 
-declare function take<T, R = void>(value: T, fn: (it: T) => R): R;
-declare function takeIf<T>(value: T, predicate: (it: T) => boolean): T | null;
-declare function takeIf<T>(value: T, predicate: (it: T) => boolean, defaultValue: T): T;
+declare function transform<T, R = void>(value: T, fn: (it: T) => R): R;
 declare function safe<R>(fn: () => R): R | undefined;
 
-declare const isFunction: (val: any) => val is Fn;
-declare const isBoolean: (val: any) => val is boolean;
-declare const isNumber: (val: any) => val is number;
-declare const isString: (val: unknown) => val is string;
-declare const isObject: (val: any) => val is object;
-declare const isUndefined: (val: any) => val is undefined;
-declare const isNull: (val: any) => val is null;
-declare const isRegExp: (val: any) => val is RegExp;
-declare const isDate: (val: any) => val is Date;
-declare const isArray: (arg: any) => arg is any[];
-declare const notNullish: <T>(v: T | null | undefined) => v is NonNullable<T>;
-declare const notNull: <T>(v: T | null) => v is Exclude<T, null>;
-declare const notUndefined: <T>(v: T | undefined) => v is Exclude<T, undefined>;
-
-/**
- * @description min <= result < max
- */
-declare function random(max: number, min?: number): number;
-
-declare const colors: {
-    /** 重置颜色 */
-    reset: string;
-    /** 亮色(加粗) */
-    bright: string;
-    /** 斜体 */
-    italic: string;
-    /** 下划线 */
-    underline: string;
-    /** 反向 */
-    reverse: string;
-    /** 隐藏 */
-    hidden: string;
-    /** 灰色 */
-    grey: string;
-    /** 黑色 */
-    black: string;
-    /** 红色 */
-    red: string;
-    /** 绿色 */
-    green: string;
-    /** 黄色 */
-    yellow: string;
-    /** 蓝色 */
-    blue: string;
-    /** 品红 */
-    magenta: string;
-    /** 青色 */
-    cyan: string;
-    /** 白色 */
-    white: string;
-    /** 背景黑色 */
-    bgBlack: string;
-    /** 背景红色 */
-    bgRed: string;
-    /** 背景绿色 */
-    bgGreen: string;
-    /** 背景黄色 */
-    bgYellow: string;
-    /** 背景蓝色 */
-    bgBlue: string;
-    /** 背景品红 */
-    bgMagenta: string;
-    /** 背景青色 */
-    bgCyan: string;
-    /** 背景白色 */
-    bgWhite: string;
-};
 declare const map: {
     info: {
         color: string;
@@ -106,5 +30,12 @@ declare const map: {
 declare function print(msg: any, type?: keyof typeof map): void;
 
 declare const timestamp: () => number;
+declare const isArray: (arg: any) => arg is any[];
+declare function getValueOrUndefined<T>(condition: unknown, value: T): T | undefined;
+declare function cleanString(str: string, regexp: RegExp): string;
+/**
+ * @description min <= result < max
+ */
+declare function random(max: number, min?: number): number;
 
-export { type Arrayable, type ElementOf, type Fn, type NotNull, type NotNullable, type NotUndefined, type Nullable, colors, isArray, isBoolean, isDate, isFunction, isNull, isNumber, isObject, isRegExp, isString, isUndefined, notNull, notNullish, notUndefined, print, random, safe, singleOrNull, take, takeIf, timestamp, toArray };
+export { cleanString, getValueOrUndefined, isArray, print, random, safe, singleOrNull, timestamp, transform };

package/dist/index.d.mts

@@ -1,86 +1,10 @@
-type Nullable<T> = T | null | undefined;
-type NotNullable<T> = Exclude<T, null | undefined>;
-type NotNull<T> = Exclude<T, null>;
-type NotUndefined<T> = Exclude<T, undefined>;
-type Arrayable<T> = T | Array<T>;
-type ElementOf<T> = T extends Array<infer Element> ? Element : never;
-type Fn<R = void> = (...args: any[]) => R;
+export * from '@antfu/utils';
 
 declare function singleOrNull<T>(arr: T[]): T | null;
-declare function toArray<T>(array?: T | Array<T>): Array<T>;
 
-declare function take<T, R = void>(value: T, fn: (it: T) => R): R;
-declare function takeIf<T>(value: T, predicate: (it: T) => boolean): T | null;
-declare function takeIf<T>(value: T, predicate: (it: T) => boolean, defaultValue: T): T;
+declare function transform<T, R = void>(value: T, fn: (it: T) => R): R;
 declare function safe<R>(fn: () => R): R | undefined;
 
-declare const isFunction: (val: any) => val is Fn;
-declare const isBoolean: (val: any) => val is boolean;
-declare const isNumber: (val: any) => val is number;
-declare const isString: (val: unknown) => val is string;
-declare const isObject: (val: any) => val is object;
-declare const isUndefined: (val: any) => val is undefined;
-declare const isNull: (val: any) => val is null;
-declare const isRegExp: (val: any) => val is RegExp;
-declare const isDate: (val: any) => val is Date;
-declare const isArray: (arg: any) => arg is any[];
-declare const notNullish: <T>(v: T | null | undefined) => v is NonNullable<T>;
-declare const notNull: <T>(v: T | null) => v is Exclude<T, null>;
-declare const notUndefined: <T>(v: T | undefined) => v is Exclude<T, undefined>;
-
-/**
- * @description min <= result < max
- */
-declare function random(max: number, min?: number): number;
-
-declare const colors: {
-    /** 重置颜色 */
-    reset: string;
-    /** 亮色(加粗) */
-    bright: string;
-    /** 斜体 */
-    italic: string;
-    /** 下划线 */
-    underline: string;
-    /** 反向 */
-    reverse: string;
-    /** 隐藏 */
-    hidden: string;
-    /** 灰色 */
-    grey: string;
-    /** 黑色 */
-    black: string;
-    /** 红色 */
-    red: string;
-    /** 绿色 */
-    green: string;
-    /** 黄色 */
-    yellow: string;
-    /** 蓝色 */
-    blue: string;
-    /** 品红 */
-    magenta: string;
-    /** 青色 */
-    cyan: string;
-    /** 白色 */
-    white: string;
-    /** 背景黑色 */
-    bgBlack: string;
-    /** 背景红色 */
-    bgRed: string;
-    /** 背景绿色 */
-    bgGreen: string;
-    /** 背景黄色 */
-    bgYellow: string;
-    /** 背景蓝色 */
-    bgBlue: string;
-    /** 背景品红 */
-    bgMagenta: string;
-    /** 背景青色 */
-    bgCyan: string;
-    /** 背景白色 */
-    bgWhite: string;
-};
 declare const map: {
     info: {
         color: string;
@@ -106,5 +30,12 @@ declare const map: {
 declare function print(msg: any, type?: keyof typeof map): void;
 
 declare const timestamp: () => number;
+declare const isArray: (arg: any) => arg is any[];
+declare function getValueOrUndefined<T>(condition: unknown, value: T): T | undefined;
+declare function cleanString(str: string, regexp: RegExp): string;
+/**
+ * @description min <= result < max
+ */
+declare function random(max: number, min?: number): number;
 
-export { type Arrayable, type ElementOf, type Fn, type NotNull, type NotNullable, type NotUndefined, type Nullable, colors, isArray, isBoolean, isDate, isFunction, isNull, isNumber, isObject, isRegExp, isString, isUndefined, notNull, notNullish, notUndefined, print, random, safe, singleOrNull, take, takeIf, timestamp, toArray };
+export { cleanString, getValueOrUndefined, isArray, print, random, safe, singleOrNull, timestamp, transform };

package/dist/index.d.ts

@@ -1,86 +1,10 @@
-type Nullable<T> = T | null | undefined;
-type NotNullable<T> = Exclude<T, null | undefined>;
-type NotNull<T> = Exclude<T, null>;
-type NotUndefined<T> = Exclude<T, undefined>;
-type Arrayable<T> = T | Array<T>;
-type ElementOf<T> = T extends Array<infer Element> ? Element : never;
-type Fn<R = void> = (...args: any[]) => R;
+export * from '@antfu/utils';
 
 declare function singleOrNull<T>(arr: T[]): T | null;
-declare function toArray<T>(array?: T | Array<T>): Array<T>;
 
-declare function take<T, R = void>(value: T, fn: (it: T) => R): R;
-declare function takeIf<T>(value: T, predicate: (it: T) => boolean): T | null;
-declare function takeIf<T>(value: T, predicate: (it: T) => boolean, defaultValue: T): T;
+declare function transform<T, R = void>(value: T, fn: (it: T) => R): R;
 declare function safe<R>(fn: () => R): R | undefined;
 
-declare const isFunction: (val: any) => val is Fn;
-declare const isBoolean: (val: any) => val is boolean;
-declare const isNumber: (val: any) => val is number;
-declare const isString: (val: unknown) => val is string;
-declare const isObject: (val: any) => val is object;
-declare const isUndefined: (val: any) => val is undefined;
-declare const isNull: (val: any) => val is null;
-declare const isRegExp: (val: any) => val is RegExp;
-declare const isDate: (val: any) => val is Date;
-declare const isArray: (arg: any) => arg is any[];
-declare const notNullish: <T>(v: T | null | undefined) => v is NonNullable<T>;
-declare const notNull: <T>(v: T | null) => v is Exclude<T, null>;
-declare const notUndefined: <T>(v: T | undefined) => v is Exclude<T, undefined>;
-
-/**
- * @description min <= result < max
- */
-declare function random(max: number, min?: number): number;
-
-declare const colors: {
-    /** 重置颜色 */
-    reset: string;
-    /** 亮色(加粗) */
-    bright: string;
-    /** 斜体 */
-    italic: string;
-    /** 下划线 */
-    underline: string;
-    /** 反向 */
-    reverse: string;
-    /** 隐藏 */
-    hidden: string;
-    /** 灰色 */
-    grey: string;
-    /** 黑色 */
-    black: string;
-    /** 红色 */
-    red: string;
-    /** 绿色 */
-    green: string;
-    /** 黄色 */
-    yellow: string;
-    /** 蓝色 */
-    blue: string;
-    /** 品红 */
-    magenta: string;
-    /** 青色 */
-    cyan: string;
-    /** 白色 */
-    white: string;
-    /** 背景黑色 */
-    bgBlack: string;
-    /** 背景红色 */
-    bgRed: string;
-    /** 背景绿色 */
-    bgGreen: string;
-    /** 背景黄色 */
-    bgYellow: string;
-    /** 背景蓝色 */
-    bgBlue: string;
-    /** 背景品红 */
-    bgMagenta: string;
-    /** 背景青色 */
-    bgCyan: string;
-    /** 背景白色 */
-    bgWhite: string;
-};
 declare const map: {
     info: {
         color: string;
@@ -106,5 +30,12 @@ declare const map: {
 declare function print(msg: any, type?: keyof typeof map): void;
 
 declare const timestamp: () => number;
+declare const isArray: (arg: any) => arg is any[];
+declare function getValueOrUndefined<T>(condition: unknown, value: T): T | undefined;
+declare function cleanString(str: string, regexp: RegExp): string;
+/**
+ * @description min <= result < max
+ */
+declare function random(max: number, min?: number): number;
 
-export { type Arrayable, type ElementOf, type Fn, type NotNull, type NotNullable, type NotUndefined, type Nullable, colors, isArray, isBoolean, isDate, isFunction, isNull, isNumber, isObject, isRegExp, isString, isUndefined, notNull, notNullish, notUndefined, print, random, safe, singleOrNull, take, takeIf, timestamp, toArray };
+export { cleanString, getValueOrUndefined, isArray, print, random, safe, singleOrNull, timestamp, transform };

package/dist/index.mjs

@@ -1,32 +1,12 @@
-const isFunction = (val) => typeof val === "function";
-const isBoolean = (val) => typeof val === "boolean";
-const isNumber = (val) => typeof val === "number";
-const isString = (val) => typeof val === "string";
-const toString = (value) => Object.prototype.toString.call(value);
-const isObject = (val) => toString(val) === "[object Object]";
-const isUndefined = (val) => toString(val) === "[object Undefined]";
-const isNull = (val) => toString(val) === "[object Null]";
-const isRegExp = (val) => toString(val) === "[object RegExp]";
-const isDate = (val) => toString(val) === "[object Date]";
-const isArray = Array.isArray;
-const notNullish = (v) => v != null;
-const notNull = (v) => v !== null;
-const notUndefined = (v) => v !== void 0;
+export * from '@antfu/utils';
 
 function singleOrNull(arr) {
   return arr.length === 1 ? arr[0] : null;
 }
-function toArray(array) {
-  array = array ?? [];
-  return isArray(array) ? array : [array];
-}
 
-function take(value, fn) {
+function transform(value, fn) {
   return fn(value);
 }
-function takeIf(value, predicate, defaultValue) {
-  return predicate(value) ? value : notUndefined(defaultValue) ? defaultValue : null;
-}
 function safe(fn) {
   try {
     return fn();
@@ -34,10 +14,6 @@ function safe(fn) {
   }
 }
 
-function random(max, min = 0) {
-  return Math.floor(Math.random() * max) + min;
-}
-
 const colors = {
   /** 重置颜色 */
   reset: "\x1B[0m",
@@ -100,5 +76,15 @@ function print(msg, type) {
 }
 
 const timestamp = () => +Date.now();
+const isArray = Array.isArray;
+function getValueOrUndefined(condition, value) {
+  return condition ? value : void 0;
+}
+function cleanString(str, regexp) {
+  return str.replace(regexp, "");
+}
+function random(max, min = 0) {
+  return Math.floor(Math.random() * max) + min;
+}
 
-export { colors, isArray, isBoolean, isDate, isFunction, isNull, isNumber, isObject, isRegExp, isString, isUndefined, notNull, notNullish, notUndefined, print, random, safe, singleOrNull, take, takeIf, timestamp, toArray };
+export { cleanString, getValueOrUndefined, isArray, print, random, safe, singleOrNull, timestamp, transform };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jiakun-zhao/utils",
   "type": "module",
-  "version": "1.1.2",
+  "version": "1.2.1",
   "description": "Utils.",
   "author": "Jiakun Zhao <hi@zhaojiakun.com>",
   "license": "MIT",
@@ -18,36 +18,25 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
       "require": "./dist/index.cjs"
-    },
-    "./fs": {
-      "types": "./dist/fs.d.ts",
-      "import": "./dist/fs.mjs",
-      "require": "./dist/fs.cjs"
     }
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
-    "dist",
-    "index.d.ts",
-    "fs.d.ts"
+    "dist"
   ],
   "dependencies": {
-    "fast-glob": "^3.3.2"
+    "@antfu/utils": "^0.7.8"
   },
   "devDependencies": {
-    "@jiakun-zhao/eslint-config": "^1.3.1",
-    "@types/node": "^20.10.0",
-    "bumpp": "^9.2.0",
-    "eslint": "^8.54.0",
-    "esno": "^4.0.0",
-    "typescript": "^5.3.2",
+    "@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": "^0.34.6"
-  },
-  "eslintConfig": {
-    "extends": "@jiakun-zhao"
+    "vitest": "^1.6.0"
   },
   "scripts": {
     "build": "unbuild",

package/dist/fs.cjs

@@ -1,45 +0,0 @@
-'use strict';
-
-const node_crypto = require('node:crypto');
-const node_fs = require('node:fs');
-const promises = require('node:fs/promises');
-const node_path = require('node:path');
-const fastGlob = require('fast-glob');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
-const fastGlob__default = /*#__PURE__*/_interopDefaultCompat(fastGlob);
-
-async function exists(...path) {
-  return await promises.access(node_path.join(...path), promises.constants.F_OK).then(() => true, () => false);
-}
-async function readText(...path) {
-  return await promises.readFile(node_path.join(...path), "utf-8");
-}
-async function readJson(...path) {
-  return JSON.parse(await readText(...path));
-}
-async function writeText(content, ...path) {
-  await promises.writeFile(node_path.join(...path), content, "utf-8");
-}
-async function writeJson(content, ...path) {
-  await writeText(`${JSON.stringify(content, null, 2)}
-`, ...path);
-}
-async function toMD5(...path) {
-  const hash = node_crypto.createHash("md5");
-  const stream = node_fs.createReadStream(node_path.join(...path));
-  return new Promise((resolve, reject) => {
-    stream.on("data", (chunk) => hash.update(chunk));
-    stream.on("end", () => resolve(hash.digest("base64url")));
-    stream.on("error", reject);
-  });
-}
-
-exports.glob = fastGlob__default;
-exports.exists = exists;
-exports.readJson = readJson;
-exports.readText = readText;
-exports.toMD5 = toMD5;
-exports.writeJson = writeJson;
-exports.writeText = writeText;

package/dist/fs.d.cts

@@ -1,10 +0,0 @@
-export { default as glob } from 'fast-glob';
-
-declare function exists(...path: string[]): Promise<boolean>;
-declare function readText(...path: string[]): Promise<string>;
-declare function readJson<T>(...path: string[]): Promise<T>;
-declare function writeText(content: string, ...path: string[]): Promise<void>;
-declare function writeJson(content: object, ...path: string[]): Promise<void>;
-declare function toMD5(...path: string[]): Promise<string>;
-
-export { exists, readJson, readText, toMD5, writeJson, writeText };

package/dist/fs.d.mts

@@ -1,10 +0,0 @@
-export { default as glob } from 'fast-glob';
-
-declare function exists(...path: string[]): Promise<boolean>;
-declare function readText(...path: string[]): Promise<string>;
-declare function readJson<T>(...path: string[]): Promise<T>;
-declare function writeText(content: string, ...path: string[]): Promise<void>;
-declare function writeJson(content: object, ...path: string[]): Promise<void>;
-declare function toMD5(...path: string[]): Promise<string>;
-
-export { exists, readJson, readText, toMD5, writeJson, writeText };

package/dist/fs.d.ts

@@ -1,10 +0,0 @@
-export { default as glob } from 'fast-glob';
-
-declare function exists(...path: string[]): Promise<boolean>;
-declare function readText(...path: string[]): Promise<string>;
-declare function readJson<T>(...path: string[]): Promise<T>;
-declare function writeText(content: string, ...path: string[]): Promise<void>;
-declare function writeJson(content: object, ...path: string[]): Promise<void>;
-declare function toMD5(...path: string[]): Promise<string>;
-
-export { exists, readJson, readText, toMD5, writeJson, writeText };

package/dist/fs.mjs

@@ -1,33 +0,0 @@
-import { createHash } from 'node:crypto';
-import { createReadStream } from 'node:fs';
-import { access, constants, readFile, writeFile } from 'node:fs/promises';
-import { join } from 'node:path';
-export { default as glob } from 'fast-glob';
-
-async function exists(...path) {
-  return await access(join(...path), constants.F_OK).then(() => true, () => false);
-}
-async function readText(...path) {
-  return await readFile(join(...path), "utf-8");
-}
-async function readJson(...path) {
-  return JSON.parse(await readText(...path));
-}
-async function writeText(content, ...path) {
-  await writeFile(join(...path), content, "utf-8");
-}
-async function writeJson(content, ...path) {
-  await writeText(`${JSON.stringify(content, null, 2)}
-`, ...path);
-}
-async function toMD5(...path) {
-  const hash = createHash("md5");
-  const stream = createReadStream(join(...path));
-  return new Promise((resolve, reject) => {
-    stream.on("data", (chunk) => hash.update(chunk));
-    stream.on("end", () => resolve(hash.digest("base64url")));
-    stream.on("error", reject);
-  });
-}
-
-export { exists, readJson, readText, toMD5, writeJson, writeText };

package/fs.d.ts

@@ -1,2 +0,0 @@
-export * from './dist/fs'
-export { default } from './dist/fs'

package/index.d.ts

@@ -1,2 +0,0 @@
-export * from './dist/index'
-export { default } from './dist/index'