@jiakun-zhao/utils 1.3.2 → 1.3.4

package/dist/index.d.mts

@@ -4,15 +4,16 @@ 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 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 function cleanText(str: string, searchValue: RegExp | string): string;
 
+declare const naturalCompare: {
+    (a: string, b: string): -1 | 0 | 1;
+    (a: number, b: number): -1 | 0 | 1;
+};
 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, getValueOrUndefined, isArray, random, safe, singleOrNull };
+export { cleanText, createArray, from, getValueOrUndefined, isArray, naturalCompare, singleOrNull };

package/dist/index.d.ts

@@ -4,15 +4,16 @@ 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 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 function cleanText(str: string, searchValue: RegExp | string): string;
 
+declare const naturalCompare: {
+    (a: string, b: string): -1 | 0 | 1;
+    (a: number, b: number): -1 | 0 | 1;
+};
 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, getValueOrUndefined, isArray, random, safe, singleOrNull };
+export { cleanText, createArray, from, getValueOrUndefined, isArray, naturalCompare, singleOrNull };

package/dist/index.mjs

@@ -1,5 +1,76 @@
 export * from '@antfu/utils';
 
+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 naturalCompareFn = /*@__PURE__*/getDefaultExportFromCjs(naturalCompareExports);
+
 const isArray = Array.isArray;
 function singleOrNull(arr) {
   return arr.length === 1 ? arr[0] : null;
@@ -8,25 +79,19 @@ function createArray(length, mapFn) {
   return Array.from({ length }, (_, index) => mapFn?.(index) ?? index);
 }
 
-function safe(fn) {
-  try {
-    const res = fn();
-    return res instanceof Promise ? res.catch(() => null) : res;
-  } catch {
-    return null;
-  }
-}
-
-function random(max, min = 0) {
-  return Math.floor(Math.random() * max) + min;
-}
-
 function cleanText(str, searchValue) {
   return str.replace(searchValue, "");
 }
 
+const naturalCompare = naturalCompareFn;
 function getValueOrUndefined(condition, value) {
   return condition ? value : void 0;
 }
+function from(value) {
+  return {
+    get: () => value,
+    to: (fn) => from(fn(value))
+  };
+}
 
-export { cleanText, createArray, getValueOrUndefined, isArray, random, safe, singleOrNull };
+export { cleanText, createArray, from, getValueOrUndefined, isArray, naturalCompare, singleOrNull };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jiakun-zhao/utils",
   "type": "module",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "description": "Utils.",
   "author": "Jiakun Zhao <hi@zhaojiakun.com>",
   "license": "MIT",
@@ -15,12 +15,11 @@
   },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
       "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
+      "types": "./dist/index.d.ts"
     }
   },
-  "main": "./dist/index.cjs",
+  "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
@@ -30,16 +29,20 @@
     "@antfu/utils": "^9.2.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.12.0",
-    "@types/node": "^22.15.3",
-    "bumpp": "^10.1.0",
-    "eslint": "^9.25.1",
+    "@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"
+    "unbuild": "^3.5.0",
+    "vitest": "^3.2.4"
   },
   "scripts": {
     "build": "unbuild",
+    "release": "bumpp && pnpm publish && npx cnpm sync @jiakun-zhao/utils",
     "stub": "unbuild --stub",
-    "release": "bumpp && pnpm publish && npx cnpm sync @jiakun-zhao/utils"
+    "test": "vitest"
   }
 }

package/dist/index.cjs

@@ -1,50 +0,0 @@
-'use strict';
-
-const utils = require('@antfu/utils');
-
-const isArray = Array.isArray;
-function singleOrNull(arr) {
-  return arr.length === 1 ? arr[0] : null;
-}
-function createArray(length, mapFn) {
-  return Array.from({ length }, (_, index) => mapFn?.(index) ?? index);
-}
-
-function safe(fn) {
-  try {
-    const res = fn();
-    return res instanceof Promise ? res.catch(() => null) : res;
-  } catch {
-    return null;
-  }
-}
-
-function random(max, min = 0) {
-  return Math.floor(Math.random() * max) + min;
-}
-
-function cleanText(str, searchValue) {
-  return str.replace(searchValue, "");
-}
-
-function getValueOrUndefined(condition, value) {
-  return condition ? value : void 0;
-}
-
-exports.cleanText = cleanText;
-exports.createArray = createArray;
-exports.getValueOrUndefined = getValueOrUndefined;
-exports.isArray = isArray;
-exports.random = random;
-exports.safe = safe;
-exports.singleOrNull = singleOrNull;
-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,18 +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 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 function cleanText(str: string, searchValue: RegExp | string): string;
-
-declare function getValueOrUndefined<T>(condition: any, value: T): T | undefined;
-
-export { cleanText, createArray, getValueOrUndefined, isArray, random, safe, singleOrNull };