@fangzhongya/utils 0.0.80 → 0.0.82

package/dist/basic/string/startsNum.cjs

@@ -1,7 +1,20 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-var _chunkILJLXJ5Ocjs = require('../../chunk-ILJLXJ5O.cjs');
-require('../../chunk-75ZPJI57.cjs');
-
-
-exports.startsNum = _chunkILJLXJ5Ocjs.startsNum;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region packages/basic/string/startsNum.ts
+/**
+* 字符串在头部出现次数
+* @param str
+* @param substring
+* @returns
+*/
+function startsNum(str, substring) {
+	if (substring.length === 0) return 0;
+	let count = 0;
+	let index = 0;
+	while (str.startsWith(substring, index)) {
+		count++;
+		index += substring.length;
+	}
+	return count;
+}
+//#endregion
+exports.startsNum = startsNum;

package/dist/basic/string/startsNum.d.cts

@@ -1,9 +1,2 @@
-/**
- * 字符串在头部出现次数
- * @param str
- * @param substring
- * @returns
- */
-declare function startsNum(str: string, substring: string): number;
-
-export { startsNum };
+import { t as startsNum } from "../../startsNum-BUG0fnhL.cjs";
+export { startsNum };

package/dist/basic/string/startsNum.d.ts

@@ -1,9 +1,2 @@
-/**
- * 字符串在头部出现次数
- * @param str
- * @param substring
- * @returns
- */
-declare function startsNum(str: string, substring: string): number;
-
-export { startsNum };
+import { t as startsNum } from "../../startsNum-BUG0fnhL.js";
+export { startsNum };

package/dist/basic/string/startsNum.js

@@ -1,7 +1,19 @@
-import {
-  startsNum
-} from "../../chunk-P7AWHISY.js";
-import "../../chunk-MLKGABMK.js";
-export {
-  startsNum
-};
+//#region packages/basic/string/startsNum.ts
+/**
+* 字符串在头部出现次数
+* @param str
+* @param substring
+* @returns
+*/
+function startsNum(str, substring) {
+	if (substring.length === 0) return 0;
+	let count = 0;
+	let index = 0;
+	while (str.startsWith(substring, index)) {
+		count++;
+		index += substring.length;
+	}
+	return count;
+}
+//#endregion
+export { startsNum };

package/dist/basic/string/toFunction.cjs

@@ -1,11 +1,124 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-
-var _chunkJJ37YIPJcjs = require('../../chunk-JJ37YIPJ.cjs');
-require('../../chunk-75ZPJI57.cjs');
-
-
-
-
-exports.extractParams = _chunkJJ37YIPJcjs.extractParams; exports.getFunctionFormat = _chunkJJ37YIPJcjs.getFunctionFormat; exports.toFunction = _chunkJJ37YIPJcjs.toFunction;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+//#region packages/basic/string/toFunction.ts
+/**
+* 安全拆分函数参数（支持嵌套结构）
+* @param paramStr - 参数字符串
+* @returns 参数列表
+* @example extractParams("a, b = { c: [1,2] }") → ["a", "b = { c: [1,2] }"]
+*/
+function extractParams(paramStr) {
+	const result = [];
+	let depth = 0;
+	let current = "";
+	let inString = false;
+	let quoteType = "";
+	let lastChar = "";
+	for (let i = 0; i < paramStr.length; i++) {
+		const char = paramStr[i];
+		if (lastChar === "\\") {
+			current += char;
+			lastChar = char;
+			continue;
+		}
+		if (!inString && (char === "\"" || char === "'" || char === "`")) {
+			inString = true;
+			quoteType = char;
+		} else if (inString && char === quoteType) inString = false;
+		if (quoteType === "`" && char === "$" && i < paramStr.length - 1 && paramStr[i + 1] === "{") depth++;
+		else if (quoteType === "`" && depth > 0 && char === "}") depth--;
+		if (char === "," && depth === 0 && !inString) {
+			result.push(current.trim());
+			current = "";
+		} else {
+			if (char === "(" || char === "{" || char === "[") depth++;
+			else if (char === ")" || char === "}" || char === "]") depth--;
+			current += char;
+		}
+		lastChar = char;
+	}
+	if (current.trim()) result.push(current.trim());
+	return result;
+}
+const FUNCTION_REGEX = /^\s*(?:(async)\s+)?(?:function\s*(\*?)\s*(\w*)\s*\(([\s\S]*?)\)|(\*?\s*)\b(\w+)\s*\(([\s\S]*?)\)|\(([\s\S]*?)\)|([^=>,\(\)]+?))\s*(?:=>)?\s*(?:\{([\s\S]*?)\}|([\s\S]*))$/;
+/**
+* 解析函数字符串格式（合并正则表达式优化性能）
+* @param v - 输入的函数或字符串
+* @returns 解析后的函数结构对象，失败返回null
+*/
+function getFunctionFormat(v) {
+	if (!v) return;
+	const trimmed = (typeof v === "function" ? v.toString() : v).trim();
+	const match = trimmed.match(FUNCTION_REGEX);
+	if (!match) {
+		console.warn("Unsupported function format:", trimmed.slice(0, 100));
+		return;
+	}
+	const [_, asyncFlag, funcGenerator, funcName, funcParams, methodGenerator, methodName, methodParams, arrowParenParams, arrowSingleParam, blockBody, exprBody] = match;
+	let isAsync = !!asyncFlag;
+	let isGenerator = false;
+	let name = "";
+	let param = "";
+	let body = "";
+	let isArrow = false;
+	let arrowBody = "";
+	if (funcParams !== void 0) {
+		isGenerator = funcGenerator === "*";
+		name = funcName || "";
+		param = funcParams;
+		body = blockBody || exprBody || "";
+	} else if (methodParams !== void 0) {
+		isGenerator = methodGenerator?.includes("*") || false;
+		name = methodName || "";
+		param = methodParams;
+		body = blockBody || exprBody || "";
+	} else if (arrowParenParams !== void 0 || arrowSingleParam !== void 0) {
+		isArrow = true;
+		param = arrowParenParams || arrowSingleParam || "";
+		body = blockBody || exprBody || "";
+		arrowBody = body.trim();
+		if (!blockBody && !/^\s*return\b/.test(body)) body = `return ${body}`;
+	}
+	return {
+		isArrow,
+		isAsync,
+		isGenerator,
+		...name && { name },
+		param: param.trim(),
+		body: body.trim(),
+		arrowBody
+	};
+}
+/**
+* 将函数字符串转换为可执行函数（支持异步函数）
+*/
+function toFunction(str, key) {
+	try {
+		const obj = getFunctionFormat(str);
+		if (!obj?.body) return void 0;
+		const params = obj.param ? extractParams(obj.param) : [];
+		if (params.length > 1e3) throw new Error("Too many parameters (max: 1000)");
+		if (obj.isAsync) try {
+			const fullFunction = `async function${obj.isGenerator ? "*" : ""} ${obj.name ?? key ?? ""} (${obj.param}) { ${obj.body} }`;
+			return new Function(`return ${fullFunction}`)();
+		} catch (error) {
+			const fullFunction = `async function${obj.isGenerator ? "*" : ""} (${obj.param}) { ${obj.body} }`;
+			return new Function(`return ${fullFunction}`)();
+		}
+		else try {
+			const fullFunction = `function${obj.isGenerator ? "*" : ""} ${obj.name ?? key ?? ""}(${obj.param}) { ${obj.body} }`;
+			return new Function(`return (${fullFunction})`)();
+		} catch (error) {
+			return new Function(...params, obj.body);
+		}
+	} catch (error) {
+		console.error("Function creation failed:", {
+			input: str.slice(0, 100),
+			error
+		});
+		return;
+	}
+}
+//#endregion
+exports.extractParams = extractParams;
+exports.getFunctionFormat = getFunctionFormat;
+exports.toFunction = toFunction;

package/dist/basic/string/toFunction.d.cts

@@ -1,28 +1,2 @@
-interface FunctionFormat {
-    isArrow: boolean;
-    isAsync: boolean;
-    isGenerator: boolean;
-    name?: string;
-    param: string;
-    body: string;
-    arrowBody?: string;
-}
-/**
- * 安全拆分函数参数（支持嵌套结构）
- * @param paramStr - 参数字符串
- * @returns 参数列表
- * @example extractParams("a, b = { c: [1,2] }") → ["a", "b = { c: [1,2] }"]
- */
-declare function extractParams(paramStr: string): string[];
-/**
- * 解析函数字符串格式（合并正则表达式优化性能）
- * @param v - 输入的函数或字符串
- * @returns 解析后的函数结构对象，失败返回null
- */
-declare function getFunctionFormat(v: Function | string): FunctionFormat | undefined;
-/**
- * 将函数字符串转换为可执行函数（支持异步函数）
- */
-declare function toFunction(str: string, key?: string): Function | undefined;
-
-export { type FunctionFormat, extractParams, getFunctionFormat, toFunction };
+import { i as toFunction, n as extractParams, r as getFunctionFormat, t as FunctionFormat } from "../../toFunction-86uGTEjr.cjs";
+export { FunctionFormat, extractParams, getFunctionFormat, toFunction };

package/dist/basic/string/toFunction.d.ts

@@ -1,28 +1,2 @@
-interface FunctionFormat {
-    isArrow: boolean;
-    isAsync: boolean;
-    isGenerator: boolean;
-    name?: string;
-    param: string;
-    body: string;
-    arrowBody?: string;
-}
-/**
- * 安全拆分函数参数（支持嵌套结构）
- * @param paramStr - 参数字符串
- * @returns 参数列表
- * @example extractParams("a, b = { c: [1,2] }") → ["a", "b = { c: [1,2] }"]
- */
-declare function extractParams(paramStr: string): string[];
-/**
- * 解析函数字符串格式（合并正则表达式优化性能）
- * @param v - 输入的函数或字符串
- * @returns 解析后的函数结构对象，失败返回null
- */
-declare function getFunctionFormat(v: Function | string): FunctionFormat | undefined;
-/**
- * 将函数字符串转换为可执行函数（支持异步函数）
- */
-declare function toFunction(str: string, key?: string): Function | undefined;
-
-export { type FunctionFormat, extractParams, getFunctionFormat, toFunction };
+import { i as toFunction, n as extractParams, r as getFunctionFormat, t as FunctionFormat } from "../../toFunction-86uGTEjr.js";
+export { FunctionFormat, extractParams, getFunctionFormat, toFunction };

package/dist/basic/string/toFunction.js

@@ -1,11 +1,121 @@
-import {
-  extractParams,
-  getFunctionFormat,
-  toFunction
-} from "../../chunk-Q6BNW3MO.js";
-import "../../chunk-MLKGABMK.js";
-export {
-  extractParams,
-  getFunctionFormat,
-  toFunction
-};
+//#region packages/basic/string/toFunction.ts
+/**
+* 安全拆分函数参数（支持嵌套结构）
+* @param paramStr - 参数字符串
+* @returns 参数列表
+* @example extractParams("a, b = { c: [1,2] }") → ["a", "b = { c: [1,2] }"]
+*/
+function extractParams(paramStr) {
+	const result = [];
+	let depth = 0;
+	let current = "";
+	let inString = false;
+	let quoteType = "";
+	let lastChar = "";
+	for (let i = 0; i < paramStr.length; i++) {
+		const char = paramStr[i];
+		if (lastChar === "\\") {
+			current += char;
+			lastChar = char;
+			continue;
+		}
+		if (!inString && (char === "\"" || char === "'" || char === "`")) {
+			inString = true;
+			quoteType = char;
+		} else if (inString && char === quoteType) inString = false;
+		if (quoteType === "`" && char === "$" && i < paramStr.length - 1 && paramStr[i + 1] === "{") depth++;
+		else if (quoteType === "`" && depth > 0 && char === "}") depth--;
+		if (char === "," && depth === 0 && !inString) {
+			result.push(current.trim());
+			current = "";
+		} else {
+			if (char === "(" || char === "{" || char === "[") depth++;
+			else if (char === ")" || char === "}" || char === "]") depth--;
+			current += char;
+		}
+		lastChar = char;
+	}
+	if (current.trim()) result.push(current.trim());
+	return result;
+}
+const FUNCTION_REGEX = /^\s*(?:(async)\s+)?(?:function\s*(\*?)\s*(\w*)\s*\(([\s\S]*?)\)|(\*?\s*)\b(\w+)\s*\(([\s\S]*?)\)|\(([\s\S]*?)\)|([^=>,\(\)]+?))\s*(?:=>)?\s*(?:\{([\s\S]*?)\}|([\s\S]*))$/;
+/**
+* 解析函数字符串格式（合并正则表达式优化性能）
+* @param v - 输入的函数或字符串
+* @returns 解析后的函数结构对象，失败返回null
+*/
+function getFunctionFormat(v) {
+	if (!v) return;
+	const trimmed = (typeof v === "function" ? v.toString() : v).trim();
+	const match = trimmed.match(FUNCTION_REGEX);
+	if (!match) {
+		console.warn("Unsupported function format:", trimmed.slice(0, 100));
+		return;
+	}
+	const [_, asyncFlag, funcGenerator, funcName, funcParams, methodGenerator, methodName, methodParams, arrowParenParams, arrowSingleParam, blockBody, exprBody] = match;
+	let isAsync = !!asyncFlag;
+	let isGenerator = false;
+	let name = "";
+	let param = "";
+	let body = "";
+	let isArrow = false;
+	let arrowBody = "";
+	if (funcParams !== void 0) {
+		isGenerator = funcGenerator === "*";
+		name = funcName || "";
+		param = funcParams;
+		body = blockBody || exprBody || "";
+	} else if (methodParams !== void 0) {
+		isGenerator = methodGenerator?.includes("*") || false;
+		name = methodName || "";
+		param = methodParams;
+		body = blockBody || exprBody || "";
+	} else if (arrowParenParams !== void 0 || arrowSingleParam !== void 0) {
+		isArrow = true;
+		param = arrowParenParams || arrowSingleParam || "";
+		body = blockBody || exprBody || "";
+		arrowBody = body.trim();
+		if (!blockBody && !/^\s*return\b/.test(body)) body = `return ${body}`;
+	}
+	return {
+		isArrow,
+		isAsync,
+		isGenerator,
+		...name && { name },
+		param: param.trim(),
+		body: body.trim(),
+		arrowBody
+	};
+}
+/**
+* 将函数字符串转换为可执行函数（支持异步函数）
+*/
+function toFunction(str, key) {
+	try {
+		const obj = getFunctionFormat(str);
+		if (!obj?.body) return void 0;
+		const params = obj.param ? extractParams(obj.param) : [];
+		if (params.length > 1e3) throw new Error("Too many parameters (max: 1000)");
+		if (obj.isAsync) try {
+			const fullFunction = `async function${obj.isGenerator ? "*" : ""} ${obj.name ?? key ?? ""} (${obj.param}) { ${obj.body} }`;
+			return new Function(`return ${fullFunction}`)();
+		} catch (error) {
+			const fullFunction = `async function${obj.isGenerator ? "*" : ""} (${obj.param}) { ${obj.body} }`;
+			return new Function(`return ${fullFunction}`)();
+		}
+		else try {
+			const fullFunction = `function${obj.isGenerator ? "*" : ""} ${obj.name ?? key ?? ""}(${obj.param}) { ${obj.body} }`;
+			return new Function(`return (${fullFunction})`)();
+		} catch (error) {
+			return new Function(...params, obj.body);
+		}
+	} catch (error) {
+		console.error("Function creation failed:", {
+			input: str.slice(0, 100),
+			error
+		});
+		return;
+	}
+}
+//#endregion
+export { extractParams, getFunctionFormat, toFunction };

package/dist/basic/string/toFunctionParam.cjs

@@ -1,10 +1,138 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true});
-
-
-var _chunkBWXXXTFUcjs = require('../../chunk-BWXXXTFU.cjs');
-require('../../chunk-JJ37YIPJ.cjs');
-require('../../chunk-75ZPJI57.cjs');
-
-
-
-exports.toFunctionParam = _chunkBWXXXTFUcjs.toFunctionParam; exports.toFunctionParamOptions = _chunkBWXXXTFUcjs.toFunctionParamOptions;
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const require_basic_string_toFunction = require("./toFunction.cjs");
+//#region packages/basic/string/toFunctionParam.ts
+/**
+* 构建函数字符串（优化版）
+*/
+function buildFunctionString(obj) {
+	const { isAsync, isGenerator, param, body } = obj;
+	const funcName = obj.name || "";
+	return `${`${isAsync ? "async " : ""}${isGenerator ? "*" : ""}function${funcName ? ` ${funcName}` : ""}`}(${param}) { ${body} }`;
+}
+/**
+* 快速创建没有外部参数的函数
+*/
+function createSimpleFunction(obj) {
+	return new Function(`return ${buildFunctionString(obj)}`)();
+}
+function getKeys(externalKeys, body) {
+	return externalKeys.filter((o) => body.includes(o));
+}
+/**
+* 使用闭包方式创建函数（推荐方式）- 修复版本
+*/
+function createFunctionWithClosure(obj, externalParams) {
+	const externalKeys = Object.keys(externalParams);
+	if (externalKeys.length === 0) return createSimpleFunction(obj);
+	try {
+		const keys = getKeys(externalKeys, obj.body);
+		return new Function(...keys, `return ${buildFunctionString(obj)};`)(...keys.map((k) => externalParams[k]));
+	} catch (error) {
+		const { param, body } = obj;
+		const keys = getKeys(externalKeys, body);
+		const funcParams = param ? require_basic_string_toFunction.extractParams(param) : [];
+		return (...args) => {
+			const currentExternalValues = keys.map((k) => externalParams[k]);
+			return new Function(...funcParams, ...keys, `'use strict'; ${body}`)(...currentExternalValues, ...args);
+		};
+	}
+}
+function createFunctionWithDynamicBinding(obj, externalParams, autoFirst = false) {
+	const { param, body } = obj;
+	const funcParams = param ? require_basic_string_toFunction.extractParams(param) : [];
+	const getExternalParams = typeof externalParams === "function" ? externalParams : () => externalParams;
+	if (autoFirst) {
+		const currentExternal = getExternalParams();
+		const keys = getKeys(Object.keys(currentExternal), body);
+		const externalValues = keys.map((k) => currentExternal[k]);
+		const func = new Function(...funcParams, ...keys, `'use strict'; ${body}`);
+		return function(...args) {
+			return func(...externalValues, ...args);
+		};
+	} else return function(...args) {
+		const currentExternal = getExternalParams();
+		const keys = getKeys(Object.keys(currentExternal), body);
+		const externalValues = keys.map((k) => currentExternal[k]);
+		return new Function(...keys, ...funcParams, `'use strict'; ${body}`)(...externalValues, ...args);
+	};
+}
+/**
+* 使用非闭包方式创建函数（安全模式）
+*/
+function createFunctionWithoutClosure(obj, externalParams) {
+	const funcParams = obj.param ? require_basic_string_toFunction.extractParams(obj.param) : [];
+	const keys = getKeys(Object.keys(externalParams), obj.body);
+	const baseFunc = createSimpleFunction(obj);
+	return function(...args) {
+		const context = {};
+		keys.forEach((k) => {
+			context[k] = externalParams[k];
+		});
+		funcParams.forEach((paramName, index) => {
+			const cleanParam = paramName.split("=")[0].trim();
+			context[cleanParam] = args[index];
+		});
+		return baseFunc.call(context, ...args);
+	};
+}
+/**
+* 优化的toFunctionParam函数 - 修复版本
+*/
+function toFunctionParam(str, externalParams) {
+	try {
+		const obj = require_basic_string_toFunction.getFunctionFormat(str);
+		if (!obj?.body) return void 0;
+		if (externalParams) {
+			if (typeof externalParams === "function") return createFunctionWithDynamicBinding(obj, externalParams, false);
+			else if (Object.keys(externalParams).length > 0) return createFunctionWithClosure(obj, externalParams);
+		}
+		return createSimpleFunction(obj);
+	} catch (error) {
+		console.error("Function creation failed:", error);
+		return;
+	}
+}
+/**
+* 增强版，支持更多选项（修复版本）
+*/
+function toFunctionParamOptions(str, externalParams, options) {
+	try {
+		const obj = require_basic_string_toFunction.getFunctionFormat(str);
+		if (!obj?.body) return void 0;
+		const opts = {
+			useClosure: true,
+			strictMode: true,
+			context: {},
+			paramDefaults: {},
+			bindThis: false,
+			autoRebind: true,
+			autoFirst: true,
+			useProxy: false,
+			...options
+		};
+		let functionBody = obj.body;
+		if (opts.paramDefaults && Object.keys(opts.paramDefaults).length > 0) functionBody = Object.entries(opts.paramDefaults).map(([name, value]) => `if (${name} === undefined) ${name} = ${JSON.stringify(value)};`).join(" ") + " " + functionBody;
+		if (opts.strictMode) functionBody = `'use strict'; ${functionBody}`;
+		const funcObj = {
+			...obj,
+			body: functionBody
+		};
+		if (opts.name && !funcObj.name) funcObj.name = opts.name;
+		let result;
+		if (externalParams) if (opts.useProxy && typeof externalParams === "object") result = createFunctionWithClosure(funcObj, new Proxy(externalParams, { get: (target, prop) => {
+			return target[prop];
+		} }));
+		else if (opts.autoRebind || typeof externalParams === "function") result = createFunctionWithDynamicBinding(funcObj, typeof externalParams === "function" ? externalParams : () => externalParams, opts.autoFirst);
+		else if (opts.useClosure) result = createFunctionWithClosure(funcObj, externalParams);
+		else result = createFunctionWithoutClosure(funcObj, externalParams);
+		else result = createSimpleFunction(funcObj);
+		if (opts.bindThis && opts.context && Object.keys(opts.context).length > 0) return result.bind(opts.context);
+		return result;
+	} catch (error) {
+		console.error("Enhanced function creation failed:", error);
+		return;
+	}
+}
+//#endregion
+exports.toFunctionParam = toFunctionParam;
+exports.toFunctionParamOptions = toFunctionParamOptions;

package/dist/basic/string/toFunctionParam.d.cts

@@ -1,21 +1,2 @@
-type ObjAny = Record<string, any>;
-/**
- * 优化的toFunctionParam函数 - 修复版本
- */
-declare function toFunctionParam(str: string | Function, externalParams?: ObjAny | (() => ObjAny)): Function | undefined;
-/**
- * 增强版，支持更多选项（修复版本）
- */
-declare function toFunctionParamOptions(str: string | Function, externalParams?: ObjAny | (() => ObjAny), options?: {
-    useClosure?: boolean;
-    strictMode?: boolean;
-    context?: ObjAny;
-    paramDefaults?: Record<string, any>;
-    bindThis?: boolean;
-    name?: string;
-    autoRebind?: boolean;
-    autoFirst?: boolean;
-    useProxy?: boolean;
-}): Function | undefined;
-
-export { toFunctionParam, toFunctionParamOptions };
+import { n as toFunctionParamOptions, t as toFunctionParam } from "../../toFunctionParam-DU064_Tu.cjs";
+export { toFunctionParam, toFunctionParamOptions };

package/dist/basic/string/toFunctionParam.d.ts

@@ -1,21 +1,2 @@
-type ObjAny = Record<string, any>;
-/**
- * 优化的toFunctionParam函数 - 修复版本
- */
-declare function toFunctionParam(str: string | Function, externalParams?: ObjAny | (() => ObjAny)): Function | undefined;
-/**
- * 增强版，支持更多选项（修复版本）
- */
-declare function toFunctionParamOptions(str: string | Function, externalParams?: ObjAny | (() => ObjAny), options?: {
-    useClosure?: boolean;
-    strictMode?: boolean;
-    context?: ObjAny;
-    paramDefaults?: Record<string, any>;
-    bindThis?: boolean;
-    name?: string;
-    autoRebind?: boolean;
-    autoFirst?: boolean;
-    useProxy?: boolean;
-}): Function | undefined;
-
-export { toFunctionParam, toFunctionParamOptions };
+import { n as toFunctionParamOptions, t as toFunctionParam } from "../../toFunctionParam-DU064_Tu.js";
+export { toFunctionParam, toFunctionParamOptions };