@jiakun-zhao/utils 1.3.6 → 1.4.0

package/dist/index.d.mts

@@ -1,15 +1,72 @@
-export * from '@antfu/utils';
-
-declare const isArray: (arg: any) => arg is any[];
-declare function singleOrNull<T>(arr: T[]): T | null;
-declare function createArray<T = number>(length: number, mapFn?: (index: number) => T): T[];
-
-declare function cleanText(str: string, searchValue: RegExp | string): string;
-
-declare function getValueOrUndefined<T>(condition: any, value: T): T | undefined;
-declare function from<T>(value: T): {
-    get: () => T;
-    to: <R>(fn: (value: T) => R) => ReturnType<typeof from<R>>;
-};
-
-export { cleanText, createArray, from, getValueOrUndefined, isArray, singleOrNull };
+//#region src/add-ons/assert.d.ts
+declare function assert(condition: boolean, message: string): asserts condition;
+//#endregion
+//#region src/add-ons/natural-compare.d.ts
+declare function naturalCompare<T extends string | number>(a: T, b: T): -1 | 0 | 1;
+//#endregion
+//#region src/add-ons/promise.d.ts
+type Awaitable<T> = T | PromiseLike<T>;
+//#endregion
+//#region src/base/array.d.ts
+type ElementOf<T> = T extends (infer E)[] ? E : never;
+type Arrayable<T> = T | Array<T>;
+declare const isArray: (val: unknown) => val is any[];
+declare const toArray: <T>(val: Arrayable<T>) => T[];
+declare const uniq: <T>(arr: readonly T[]) => T[];
+declare const singleOrNull: <T>(arr: T[]) => T | null;
+declare function createArray<T = number>(len: number, mapFn?: (idx: number) => T): T[];
+declare function shuffle<T>(array: T[]): T[];
+declare function range(stop: number): number[];
+declare function range(start: number, stop: number, step?: number): number[];
+//#endregion
+//#region src/base/boolean.d.ts
+declare const isBoolean: (val: any) => val is boolean;
+//#endregion
+//#region src/base/date.d.ts
+declare const isDate: (val: any) => val is Date;
+declare const timestamp: () => number;
+type Unit = 'year' | 'month' | 'dayOfMonth' | 'hour' | 'minute' | 'second' | 'millisecond' | 'dayOfWeek';
+declare function isSameDay(dateA: Date, dateB?: Date): boolean;
+declare function dateCalculate(date: Date, value: number, unit?: Unit): Date;
+//#endregion
+//#region src/base/function.d.ts
+type Fn<T = void> = () => T;
+declare const isFunction: <T extends Function>(val: any) => val is T;
+declare const noop: () => void;
+declare const transform: <T, R>(val: T, fn: (val: T) => R) => R;
+//#endregion
+//#region src/base/nullable.d.ts
+type Nullable<T> = T | null | undefined;
+declare const isTruthy: <T>(v: T) => v is NonNullable<T>;
+declare const isUndefined: (val: any) => val is undefined;
+declare const notUndefined: <T>(v: T) => v is Exclude<T, undefined>;
+declare const isNull: (val: any) => val is null;
+declare const notNull: <T>(v: T | null) => v is Exclude<T, null>;
+declare const notNullish: <T>(v: T | null | undefined) => v is NonNullable<T>;
+declare const isDefined: <T = any>(val?: T) => val is T;
+//#endregion
+//#region src/base/number.d.ts
+declare const isNumber: (val: any) => val is number;
+declare const clamp: (n: number, min: number, max: number) => number;
+declare function lerp(min: number, max: number, t: number): number;
+//#endregion
+//#region src/base/object.d.ts
+declare const isObject: (val: any) => val is object;
+declare const isKeyOf: <T extends object>(val: T, key: keyof any) => key is keyof T;
+declare function objectFilter<O extends object>(obj: O, fn: (key: keyof O, value: O[keyof O]) => boolean): O;
+declare function objectPick<O extends object, T extends keyof O>(obj: O, ...keys: T[]): Pick<O, T>;
+declare function objectOmit<O extends object, T extends keyof O>(obj: O, ...keys: T[]): Omit<O, T>;
+declare function clearUndefined<O extends object>(obj: O): O;
+//#endregion
+//#region src/base/regexp.d.ts
+declare const isRegExp: (val: any) => val is RegExp;
+//#endregion
+//#region src/base/string.d.ts
+declare const toString: (val: any) => string;
+declare const isString: (val: unknown) => val is string;
+declare const slash: (str: string) => string;
+declare const ensurePrefix: (prefix: string, str: string) => string;
+declare const ensureSuffix: (suffix: string, str: string) => string;
+declare const capitalize: (str: string) => string;
+//#endregion
+export { Arrayable, Awaitable, ElementOf, Fn, Nullable, assert, capitalize, clamp, clearUndefined, createArray, dateCalculate, ensurePrefix, ensureSuffix, isArray, isBoolean, isDate, isDefined, isFunction, isKeyOf, isNull, isNumber, isObject, isRegExp, isSameDay, isString, isTruthy, isUndefined, lerp, naturalCompare, noop, notNull, notNullish, notUndefined, objectFilter, objectOmit, objectPick, range, shuffle, singleOrNull, slash, timestamp, toArray, toString, transform, uniq };

package/dist/index.mjs

@@ -1,25 +1,154 @@
-export * from '@antfu/utils';
+//#region src/add-ons/assert.ts
+function assert(condition, message) {
+	if (!condition) throw new Error(message);
+}
+
+//#endregion
+//#region src/add-ons/natural-compare.ts
+function naturalCompare(a, b) {
+	var i, codeA, codeB = 1, posA = 0, posB = 0, alphabet = String.alphabet;
+	function getCode(str, pos, code) {
+		if (code) {
+			for (i = pos; code = getCode(str, i), code < 76 && code > 65;) ++i;
+			return +str.slice(pos - 1, i);
+		}
+		code = alphabet && alphabet.indexOf(str.charAt(pos));
+		return code > -1 ? code + 76 : (code = str.charCodeAt(pos) || 0, code < 45 || code > 127) ? code : code < 46 ? 65 : code < 48 ? code - 1 : code < 58 ? code + 18 : code < 65 ? code - 11 : code < 91 ? code + 11 : code < 97 ? code - 37 : code < 123 ? code + 5 : code - 63;
+	}
+	if ((a += "") != (b += "")) for (; codeB;) {
+		codeA = getCode(a, posA++);
+		codeB = getCode(b, posB++);
+		if (codeA < 76 && codeB < 76 && codeA > 66 && codeB > 66) {
+			codeA = getCode(a, posA, posA);
+			codeB = getCode(b, posB, posA = i);
+			posB = i;
+		}
+		if (codeA != codeB) return codeA < codeB ? -1 : 1;
+	}
+	return 0;
+}
+
+//#endregion
+//#region src/base/array.ts
+const isArray = (val) => Array.isArray(val);
+const toArray = (val) => isArray(val) ? val : [val];
+const uniq = (arr) => [...new Set(arr)];
+const singleOrNull = (arr) => arr.length === 1 ? arr[0] : null;
+function createArray(len, mapFn) {
+	return Array.from({ length: len }, (_, index) => mapFn?.(index) ?? index);
+}
+function shuffle(array) {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1));
+		[array[i], array[j]] = [array[j], array[i]];
+	}
+	return array;
+}
+function range(...args) {
+	if (args.length === 1) args.unshift(0);
+	const [start, stop, step = 1] = args;
+	const result = [];
+	for (let i = start; i < stop; i += step) result.push(i);
+	return result;
+}
 
-const isArray = Array.isArray;
-function singleOrNull(arr) {
-  return arr.length === 1 ? arr[0] : null;
+//#endregion
+//#region src/base/boolean.ts
+const isBoolean = (val) => typeof val === "boolean";
+
+//#endregion
+//#region src/base/string.ts
+const toString = (val) => Object.prototype.toString.call(val);
+const isString = (val) => typeof val === "string";
+const slash = (str) => str.replace(/\\/g, "/");
+const ensurePrefix = (prefix, str) => str.startsWith(prefix) ? str : prefix + str;
+const ensureSuffix = (suffix, str) => str.endsWith(suffix) ? str : str + suffix;
+const capitalize = (str) => str[0].toUpperCase() + str.slice(1).toLowerCase();
+
+//#endregion
+//#region src/base/date.ts
+const isDate = (val) => toString(val) === "[object Date]";
+const timestamp = () => +Date.now();
+function isSameDay(dateA, dateB = /* @__PURE__ */ new Date()) {
+	return dateA.getDate() === dateB.getDate() && dateA.getMonth() === dateB.getMonth() && dateA.getFullYear() === dateB.getFullYear();
 }
-function createArray(length, mapFn) {
-  return Array.from({ length }, (_, index) => mapFn?.(index) ?? index);
+function dateCalculate(date, value, unit = "dayOfMonth") {
+	const result = new Date(date);
+	switch (unit) {
+		case "year":
+			result.setFullYear(date.getFullYear() + value);
+			break;
+		case "month":
+			result.setMonth(date.getMonth() + value);
+			break;
+		case "dayOfMonth":
+			result.setDate(date.getDate() + value);
+			break;
+		case "dayOfWeek":
+			result.setDate(date.getDay() + value);
+			break;
+		case "hour":
+			result.setHours(date.getHours() + value);
+			break;
+		case "minute":
+			result.setMinutes(date.getMinutes() + value);
+			break;
+		case "second":
+			result.setSeconds(date.getSeconds() + value);
+			break;
+		case "millisecond":
+			result.setMilliseconds(date.getMilliseconds() + value);
+			break;
+		default: return date;
+	}
+	return result;
 }
 
-function cleanText(str, searchValue) {
-  return str.replace(searchValue, "");
+//#endregion
+//#region src/base/function.ts
+const isFunction = (val) => typeof val === "function";
+const noop = () => {};
+const transform = (val, fn) => fn(val);
+
+//#endregion
+//#region src/base/nullable.ts
+const isTruthy = (v) => Boolean(v);
+const isUndefined = (val) => toString(val) === "[object Undefined]";
+const notUndefined = (v) => v !== void 0;
+const isNull = (val) => toString(val) === "[object Null]";
+const notNull = (v) => v !== null;
+const notNullish = (v) => v != null;
+const isDefined = (val) => typeof val !== "undefined";
+
+//#endregion
+//#region src/base/number.ts
+const isNumber = (val) => typeof val === "number";
+const clamp = (n, min, max) => Math.min(max, Math.max(min, n));
+function lerp(min, max, t) {
+	const interpolation = clamp(t, 0, 1);
+	return min + (max - min) * interpolation;
 }
 
-function getValueOrUndefined(condition, value) {
-  return condition ? value : void 0;
+//#endregion
+//#region src/base/object.ts
+const isObject = (val) => toString(val) === "[object Object]";
+const isKeyOf = (val, key) => key in val;
+function objectFilter(obj, fn) {
+	return Object.fromEntries(Object.entries(obj).filter(([key, value]) => fn(key, value)));
 }
-function from(value) {
-  return {
-    get: () => value,
-    to: (fn) => from(fn(value))
-  };
+function objectPick(obj, ...keys) {
+	return objectFilter(obj, (key) => keys.includes(key));
 }
+function objectOmit(obj, ...keys) {
+	return objectFilter(obj, (key) => !keys.includes(key));
+}
+function clearUndefined(obj) {
+	return objectFilter(obj, (_, value) => notUndefined(value));
+}
+
+//#endregion
+//#region src/base/regexp.ts
+const isRegExp = (val) => toString(val) === "[object RegExp]";
 
-export { cleanText, createArray, from, getValueOrUndefined, isArray, singleOrNull };
+//#endregion
+export { assert, capitalize, clamp, clearUndefined, createArray, dateCalculate, ensurePrefix, ensureSuffix, isArray, isBoolean, isDate, isDefined, isFunction, isKeyOf, isNull, isNumber, isObject, isRegExp, isSameDay, isString, isTruthy, isUndefined, lerp, naturalCompare, noop, notNull, notNullish, notUndefined, objectFilter, objectOmit, objectPick, range, shuffle, singleOrNull, slash, timestamp, toArray, toString, transform, uniq };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jiakun-zhao/utils",
   "type": "module",
-  "version": "1.3.6",
+  "version": "1.4.0",
   "description": "Utils.",
   "author": "Jiakun Zhao <hi@zhaojiakun.com>",
   "license": "MIT",
@@ -16,37 +16,27 @@
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
-      "types": "./dist/index.d.ts"
-    },
-    "./natural-compare": {
-      "import": "./dist/natural-compare.mjs",
-      "types": "./dist/natural-compare.d.ts"
+      "types": "./dist/index.d.mts"
     }
   },
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
+  "types": "./dist/index.d.mts",
   "files": [
     "dist"
   ],
-  "dependencies": {
-    "@antfu/utils": "^9.2.0"
-  },
   "devDependencies": {
     "@jiakun-zhao/eslint-config": "^4.1.8",
-    "@types/natural-compare": "^1.4.3",
-    "@types/node": "^24.0.3",
-    "bumpp": "^10.2.0",
-    "eslint": "^9.29.0",
-    "natural-compare": "^1.4.0",
-    "typescript": "^5.8.3",
-    "unbuild": "^3.5.0",
-    "vitest": "^3.2.4"
+    "@types/node": "^25.0.3",
+    "bumpp": "^10.3.2",
+    "eslint": "^9.39.2",
+    "tsdown": "^0.18.1",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.16"
   },
   "scripts": {
-    "build": "unbuild",
+    "build": "tsdown",
     "release": "bumpp && pnpm publish && npx cnpm sync @jiakun-zhao/utils",
-    "stub": "unbuild --stub",
     "test": "vitest"
   }
 }

package/dist/index.d.ts

@@ -1,15 +0,0 @@
-export * from '@antfu/utils';
-
-declare const isArray: (arg: any) => arg is any[];
-declare function singleOrNull<T>(arr: T[]): T | null;
-declare function createArray<T = number>(length: number, mapFn?: (index: number) => T): T[];
-
-declare function cleanText(str: string, searchValue: RegExp | string): string;
-
-declare function getValueOrUndefined<T>(condition: any, value: T): T | undefined;
-declare function from<T>(value: T): {
-    get: () => T;
-    to: <R>(fn: (value: T) => R) => ReturnType<typeof from<R>>;
-};
-
-export { cleanText, createArray, from, getValueOrUndefined, isArray, singleOrNull };

package/dist/natural-compare.d.mts

@@ -1,6 +0,0 @@
-declare const naturalCompare: {
-    (a: string, b: string): -1 | 0 | 1;
-    (a: number, b: number): -1 | 0 | 1;
-};
-
-export { naturalCompare as default, naturalCompare };

package/dist/natural-compare.d.ts

@@ -1,6 +0,0 @@
-declare const naturalCompare: {
-    (a: string, b: string): -1 | 0 | 1;
-    (a: number, b: number): -1 | 0 | 1;
-};
-
-export { naturalCompare as default, naturalCompare };

package/dist/natural-compare.mjs

@@ -1,74 +0,0 @@
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
-var naturalCompare$1 = {exports: {}};
-
-var hasRequiredNaturalCompare;
-
-function requireNaturalCompare () {
-	if (hasRequiredNaturalCompare) return naturalCompare$1.exports;
-	hasRequiredNaturalCompare = 1;
-	/*
-	 * @version    1.4.0
-	 * @date       2015-10-26
-	 * @stability  3 - Stable
-	 * @author     Lauri Rooden (https://github.com/litejs/natural-compare-lite)
-	 * @license    MIT License
-	 */
-
-
-	var naturalCompare = function(a, b) {
-		var i, codeA
-		, codeB = 1
-		, posA = 0
-		, posB = 0
-		, alphabet = String.alphabet;
-
-		function getCode(str, pos, code) {
-			if (code) {
-				for (i = pos; code = getCode(str, i), code < 76 && code > 65;) ++i;
-				return +str.slice(pos - 1, i)
-			}
-			code = alphabet && alphabet.indexOf(str.charAt(pos));
-			return code > -1 ? code + 76 : ((code = str.charCodeAt(pos) || 0), code < 45 || code > 127) ? code
-				: code < 46 ? 65               // -
-				: code < 48 ? code - 1
-				: code < 58 ? code + 18        // 0-9
-				: code < 65 ? code - 11
-				: code < 91 ? code + 11        // A-Z
-				: code < 97 ? code - 37
-				: code < 123 ? code + 5        // a-z
-				: code - 63
-		}
-
-
-		if ((a+="") != (b+="")) for (;codeB;) {
-			codeA = getCode(a, posA++);
-			codeB = getCode(b, posB++);
-
-			if (codeA < 76 && codeB < 76 && codeA > 66 && codeB > 66) {
-				codeA = getCode(a, posA, posA);
-				codeB = getCode(b, posB, posA = i);
-				posB = i;
-			}
-
-			if (codeA != codeB) return (codeA < codeB) ? -1 : 1
-		}
-		return 0
-	};
-
-	try {
-		naturalCompare$1.exports = naturalCompare;
-	} catch (e) {
-		String.naturalCompare = naturalCompare;
-	}
-	return naturalCompare$1.exports;
-}
-
-var naturalCompareExports = requireNaturalCompare();
-const defaultNaturalCompare = /*@__PURE__*/getDefaultExportFromCjs(naturalCompareExports);
-
-const naturalCompare = defaultNaturalCompare;
-
-export { naturalCompare as default, naturalCompare };