@jiakun-zhao/utils 1.3.3 → 1.3.5

package/dist/index.d.mts

@@ -1,5 +1,4 @@
 export * from '@antfu/utils';
-export { default as naturalCompare } from 'natural-compare';
 
 declare const isArray: (arg: any) => arg is any[];
 declare function singleOrNull<T>(arr: T[]): T | null;
@@ -9,38 +8,8 @@ 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): {
-    to: <R>(fn: (value: T) => R) => {
-        to: <R_1>(fn: (value: R) => R_1) => {
-            to: <R_2>(fn: (value: R_1) => R_2) => {
-                to: <R_3>(fn: (value: R_2) => R_3) => {
-                    to: <R_4>(fn: (value: R_3) => R_4) => {
-                        to: <R_5>(fn: (value: R_4) => R_5) => {
-                            to: <R_6>(fn: (value: R_5) => R_6) => {
-                                to: <R_7>(fn: (value: R_6) => R_7) => {
-                                    to: <R_8>(fn: (value: R_7) => R_8) => {
-                                        to: <R_9>(fn: (value: R_8) => R_9) => {
-                                            to: <R_10>(fn: (value: R_9) => R_10) => /*elided*/ any;
-                                            get: () => R_9;
-                                        };
-                                        get: () => R_8;
-                                    };
-                                    get: () => R_7;
-                                };
-                                get: () => R_6;
-                            };
-                            get: () => R_5;
-                        };
-                        get: () => R_4;
-                    };
-                    get: () => R_3;
-                };
-                get: () => R_2;
-            };
-            get: () => R_1;
-        };
-        get: () => R;
-    };
     get: () => T;
+    to: <R>(fn: (value: T) => R) => ReturnType<typeof from<R>>;
 };
 
 export { cleanText, createArray, from, getValueOrUndefined, isArray, singleOrNull };

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from '@antfu/utils';
-export { default as naturalCompare } from 'natural-compare';
 
 declare const isArray: (arg: any) => arg is any[];
 declare function singleOrNull<T>(arr: T[]): T | null;
@@ -9,38 +8,8 @@ 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): {
-    to: <R>(fn: (value: T) => R) => {
-        to: <R_1>(fn: (value: R) => R_1) => {
-            to: <R_2>(fn: (value: R_1) => R_2) => {
-                to: <R_3>(fn: (value: R_2) => R_3) => {
-                    to: <R_4>(fn: (value: R_3) => R_4) => {
-                        to: <R_5>(fn: (value: R_4) => R_5) => {
-                            to: <R_6>(fn: (value: R_5) => R_6) => {
-                                to: <R_7>(fn: (value: R_6) => R_7) => {
-                                    to: <R_8>(fn: (value: R_7) => R_8) => {
-                                        to: <R_9>(fn: (value: R_8) => R_9) => {
-                                            to: <R_10>(fn: (value: R_9) => R_10) => /*elided*/ any;
-                                            get: () => R_9;
-                                        };
-                                        get: () => R_8;
-                                    };
-                                    get: () => R_7;
-                                };
-                                get: () => R_6;
-                            };
-                            get: () => R_5;
-                        };
-                        get: () => R_4;
-                    };
-                    get: () => R_3;
-                };
-                get: () => R_2;
-            };
-            get: () => R_1;
-        };
-        get: () => R;
-    };
     get: () => T;
+    to: <R>(fn: (value: T) => R) => ReturnType<typeof from<R>>;
 };
 
 export { cleanText, createArray, from, getValueOrUndefined, isArray, singleOrNull };

package/dist/index.mjs

@@ -1,5 +1,4 @@
 export * from '@antfu/utils';
-export { default as naturalCompare } from 'natural-compare';
 
 const isArray = Array.isArray;
 function singleOrNull(arr) {
@@ -18,8 +17,8 @@ function getValueOrUndefined(condition, value) {
 }
 function from(value) {
   return {
-    to: (fn) => from(fn(value)),
-    get: () => value
+    get: () => value,
+    to: (fn) => from(fn(value))
   };
 }
 

package/dist/natural-compare.d.mts

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,6 @@
+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

@@ -0,0 +1,74 @@
+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 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@jiakun-zhao/utils",
   "type": "module",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Utils.",
   "author": "Jiakun Zhao <hi@zhaojiakun.com>",
   "license": "MIT",
@@ -16,19 +16,21 @@
   "exports": {
     ".": {
       "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs",
       "types": "./dist/index.d.ts"
+    },
+    "./natural-compare": {
+      "import": "./dist/natural-compare.mjs",
+      "types": "./dist/natural-compare.d.ts"
     }
   },
-  "main": "./dist/index.cjs",
+  "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
   "dependencies": {
-    "@antfu/utils": "^9.2.0",
-    "natural-compare": "^1.4.0"
+    "@antfu/utils": "^9.2.0"
   },
   "devDependencies": {
     "@jiakun-zhao/eslint-config": "^4.1.8",
@@ -36,6 +38,7 @@
     "@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"

package/dist/index.cjs

@@ -1,48 +0,0 @@
-'use strict';
-
-const utils = require('@antfu/utils');
-const naturalCompare = require('natural-compare');
-
-function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
-
-const naturalCompare__default = /*#__PURE__*/_interopDefaultCompat(naturalCompare);
-
-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 cleanText(str, searchValue) {
-  return str.replace(searchValue, "");
-}
-
-function getValueOrUndefined(condition, value) {
-  return condition ? value : void 0;
-}
-function from(value) {
-  return {
-    to: (fn) => from(fn(value)),
-    get: () => value
-  };
-}
-
-exports.naturalCompare = naturalCompare__default;
-exports.cleanText = cleanText;
-exports.createArray = createArray;
-exports.from = from;
-exports.getValueOrUndefined = getValueOrUndefined;
-exports.isArray = isArray;
-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,46 +0,0 @@
-export * from '@antfu/utils';
-export { default as naturalCompare } from 'natural-compare';
-
-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): {
-    to: <R>(fn: (value: T) => R) => {
-        to: <R_1>(fn: (value: R) => R_1) => {
-            to: <R_2>(fn: (value: R_1) => R_2) => {
-                to: <R_3>(fn: (value: R_2) => R_3) => {
-                    to: <R_4>(fn: (value: R_3) => R_4) => {
-                        to: <R_5>(fn: (value: R_4) => R_5) => {
-                            to: <R_6>(fn: (value: R_5) => R_6) => {
-                                to: <R_7>(fn: (value: R_6) => R_7) => {
-                                    to: <R_8>(fn: (value: R_7) => R_8) => {
-                                        to: <R_9>(fn: (value: R_8) => R_9) => {
-                                            to: <R_10>(fn: (value: R_9) => R_10) => /*elided*/ any;
-                                            get: () => R_9;
-                                        };
-                                        get: () => R_8;
-                                    };
-                                    get: () => R_7;
-                                };
-                                get: () => R_6;
-                            };
-                            get: () => R_5;
-                        };
-                        get: () => R_4;
-                    };
-                    get: () => R_3;
-                };
-                get: () => R_2;
-            };
-            get: () => R_1;
-        };
-        get: () => R;
-    };
-    get: () => T;
-};
-
-export { cleanText, createArray, from, getValueOrUndefined, isArray, singleOrNull };