@wevu/api 0.2.6 → 0.2.8

package/dist/index.d.mts

@@ -8306,11 +8306,11 @@ declare function createWeapi<TAdapter extends WeapiAdapter = WeapiCrossPlatformR
 declare const WEAPI_TYPE_SOURCES: {
   readonly default: {
     readonly package: "miniprogram-api-typings";
-    readonly version: "5.1.3";
+    readonly version: "5.2.0";
   };
   readonly wechat: {
     readonly package: "miniprogram-api-typings";
-    readonly version: "5.1.3";
+    readonly version: "5.2.0";
   };
   readonly alipay: {
     readonly package: "@mini-types/alipay";
@@ -8322,7 +8322,7 @@ declare const WEAPI_TYPE_SOURCES: {
   };
   readonly wx: {
     readonly package: "miniprogram-api-typings";
-    readonly version: "5.1.3";
+    readonly version: "5.2.0";
   };
   readonly my: {
     readonly package: "@mini-types/alipay";
@@ -8336,11 +8336,11 @@ declare const WEAPI_TYPE_SOURCES: {
 declare const WEAPI_PLATFORM_TYPE_SOURCES: {
   readonly default: {
     readonly package: "miniprogram-api-typings";
-    readonly version: "5.1.3";
+    readonly version: "5.2.0";
   };
   readonly wechat: {
     readonly package: "miniprogram-api-typings";
-    readonly version: "5.1.3";
+    readonly version: "5.2.0";
   };
   readonly alipay: {
     readonly package: "@mini-types/alipay";
@@ -8354,7 +8354,7 @@ declare const WEAPI_PLATFORM_TYPE_SOURCES: {
 declare const WEAPI_RUNTIME_TYPE_SOURCES: {
   readonly wx: {
     readonly package: "miniprogram-api-typings";
-    readonly version: "5.1.3";
+    readonly version: "5.2.0";
   };
   readonly my: {
     readonly package: "@mini-types/alipay";

package/dist/index.mjs

@@ -1,4 +1,55 @@
 import { getMiniProgramPlatformByRuntimeGlobalKey, getMiniProgramRuntimeGlobalKey, getMiniProgramRuntimeGlobalKeys, getMiniProgramRuntimeHostConfigKey, normalizeMiniProgramPlatform, resolveMiniProgramPlatform } from "@weapp-core/shared";
+//#region src/core/runtimeGlobal.ts
+/**
+* @description 静态解析当前运行环境的全局根对象，兼容不提供 globalThis 的小程序 worker。
+*/
+function resolveRuntimeRoots() {
+	const roots = [];
+	const appendRoot = (root) => {
+		if (root && !roots.includes(root)) roots.push(root);
+	};
+	if (typeof globalThis !== "undefined") appendRoot(globalThis);
+	if (typeof self !== "undefined") appendRoot(self);
+	if (typeof window !== "undefined") appendRoot(window);
+	if (typeof global !== "undefined") appendRoot(global);
+	return roots;
+}
+/**
+* @description 静态解析当前运行环境的首个全局根对象。
+*/
+function resolveRuntimeRoot() {
+	return resolveRuntimeRoots()[0];
+}
+function resolveTopLevelRuntimeValue(key) {
+	switch (key) {
+		case "wx": return typeof wx !== "undefined" ? wx : void 0;
+		case "my": return typeof my !== "undefined" ? my : void 0;
+		case "tt": return typeof tt !== "undefined" ? tt : void 0;
+		case "swan": return typeof swan !== "undefined" ? swan : void 0;
+		case "jd": return typeof jd !== "undefined" ? jd : void 0;
+		case "xhs": return typeof xhs !== "undefined" ? xhs : void 0;
+		case "qq": return typeof qq !== "undefined" ? qq : void 0;
+		case "ks": return typeof ks !== "undefined" ? ks : void 0;
+		case "dd": return typeof dd !== "undefined" ? dd : void 0;
+		case "qa": return typeof qa !== "undefined" ? qa : void 0;
+		case "qapp": return typeof qapp !== "undefined" ? qapp : void 0;
+		case "uni": return typeof uni !== "undefined" ? uni : void 0;
+		case "__wxConfig": return typeof __wxConfig !== "undefined" ? __wxConfig : void 0;
+		default: return;
+	}
+}
+/**
+* @description 从全局根对象或小程序顶层全局变量读取运行时值。
+*/
+function resolveRuntimeGlobalValue(key, root = resolveRuntimeRoot()) {
+	const roots = root ? [root, ...resolveRuntimeRoots().filter((item) => item !== root)] : resolveRuntimeRoots();
+	for (const item of roots) {
+		const value = item[key];
+		if (value !== void 0) return value;
+	}
+	return resolveTopLevelRuntimeValue(key);
+}
+//#endregion
 //#region src/core/adapter.ts
 const GLOBAL_ADAPTER_KEYS = [
 	...getMiniProgramRuntimeGlobalKeys().map((key) => ({
@@ -30,10 +81,6 @@ const GLOBAL_ADAPTER_KEYS = [
 		key: "uni"
 	}
 ];
-function resolveGlobalThis() {
-	if (typeof globalThis !== "undefined") return globalThis;
-	if (typeof window !== "undefined") return window;
-}
 function isAdapterCandidate(value) {
 	return typeof value === "object" || typeof value === "function";
 }
@@ -41,10 +88,9 @@ function isAdapterCandidate(value) {
 * @description 侦测当前运行环境的全局 API 对象
 */
 function detectGlobalAdapter() {
-	const root = resolveGlobalThis();
-	if (!root) return {};
+	const root = resolveRuntimeRoot();
 	for (const item of GLOBAL_ADAPTER_KEYS) {
-		const candidate = root[item.key];
+		const candidate = resolveRuntimeGlobalValue(item.key, root);
 		if (isAdapterCandidate(candidate)) return {
 			adapter: candidate,
 			platform: item.platform
@@ -107,6 +153,9 @@ function isNonPromisifiedMethod(name) {
 function isPlainObject(value) {
 	return Object.prototype.toString.call(value) === "[object Object]";
 }
+function hasOwn(source, key) {
+	return Object.prototype.hasOwnProperty.call(source, key);
+}
 function hasCallbacks(value) {
 	if (!isPlainObject(value)) return false;
 	return typeof value.success === "function" || typeof value.fail === "function" || typeof value.complete === "function";
@@ -129,7 +178,7 @@ function createNotSupportedError(methodName, platform) {
 //#region src/core/callBridge.ts
 function resolveOptionsArg$1(args) {
 	const nextArgs = args.slice();
-	const lastArg = nextArgs.length > 0 ? nextArgs.at(-1) : void 0;
+	const lastArg = nextArgs.length > 0 ? nextArgs[nextArgs.length - 1] : void 0;
 	if (isPlainObject(lastArg)) {
 		const options = { ...lastArg };
 		nextArgs[nextArgs.length - 1] = options;
@@ -149,7 +198,7 @@ function resolveOptionsArg$1(args) {
 * @description 将错误按小程序回调风格分发；若无回调则返回 reject Promise。
 */
 function callWithError(error, args) {
-	const lastArg = args.length > 0 ? args.at(-1) : void 0;
+	const lastArg = args.length > 0 ? args[args.length - 1] : void 0;
 	if (hasCallbacks(lastArg)) {
 		lastArg.fail?.(error);
 		lastArg.complete?.(error);
@@ -727,11 +776,11 @@ const WEAPI_TT_METHODS = [...WEAPI_TT_METHODS_APPLY_EC_COUPON_TO_UNSUBSCRIBE_ALL
 const WEAPI_TYPE_SOURCES = {
 	default: {
 		package: "miniprogram-api-typings",
-		version: "5.1.3"
+		version: "5.2.0"
 	},
 	wechat: {
 		package: "miniprogram-api-typings",
-		version: "5.1.3"
+		version: "5.2.0"
 	},
 	alipay: {
 		package: "@mini-types/alipay",
@@ -743,7 +792,7 @@ const WEAPI_TYPE_SOURCES = {
 	},
 	wx: {
 		package: "miniprogram-api-typings",
-		version: "5.1.3"
+		version: "5.2.0"
 	},
 	my: {
 		package: "@mini-types/alipay",
@@ -1293,7 +1342,7 @@ function mapSaveFileArgs(args) {
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
 	const nextOptions = { ...lastArg };
-	if (!Object.hasOwn(nextOptions, "apFilePath") && Object.hasOwn(nextOptions, "tempFilePath")) nextOptions.apFilePath = nextOptions.tempFilePath;
+	if (!hasOwn(nextOptions, "apFilePath") && hasOwn(nextOptions, "tempFilePath")) nextOptions.apFilePath = nextOptions.tempFilePath;
 	nextArgs[lastIndex] = nextOptions;
 	return nextArgs;
 }
@@ -1303,15 +1352,15 @@ function mapCreateRewardedVideoAdArgs(args) {
 	const lastIndex = nextArgs.length - 1;
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
-	if (Object.hasOwn(lastArg, "multiton") && lastArg.multiton === true) throw createNotSupportedError("createRewardedVideoAd", "my");
-	if (Object.hasOwn(lastArg, "disableFallbackSharePage") && lastArg.disableFallbackSharePage === true) throw createNotSupportedError("createRewardedVideoAd", "my");
+	if (hasOwn(lastArg, "multiton") && lastArg.multiton === true) throw createNotSupportedError("createRewardedVideoAd", "my");
+	if (hasOwn(lastArg, "disableFallbackSharePage") && lastArg.disableFallbackSharePage === true) throw createNotSupportedError("createRewardedVideoAd", "my");
 	const adUnitId = lastArg.adUnitId;
 	if (typeof adUnitId === "string" && adUnitId.length > 0) nextArgs[lastIndex] = adUnitId;
 	return nextArgs;
 }
 function mapRewardedAdInstance(result, args = []) {
 	if (typeof result !== "object" || result === null) return result;
-	const adUnitIdArg = args.length > 0 ? args.at(-1) : void 0;
+	const adUnitIdArg = args.length > 0 ? args[args.length - 1] : void 0;
 	const adUnitId = typeof adUnitIdArg === "string" ? adUnitIdArg : void 0;
 	if (!adUnitId) return result;
 	const rewardedAd = result;
@@ -1343,7 +1392,7 @@ function mapCheckIsSoterEnrolledInDeviceArgs(args) {
 }
 function mapSoterCheckResult(methodName, result) {
 	if (!isPlainObject(result)) return result;
-	if (Object.hasOwn(result, "errMsg")) return result;
+	if (hasOwn(result, "errMsg")) return result;
 	return {
 		...result,
 		errMsg: `${methodName}:ok`
@@ -1359,11 +1408,11 @@ function toNumberCode(value) {
 function mapBleConnectionResult(methodName, codeKey, result) {
 	if (!isPlainObject(result)) return result;
 	const nextResult = { ...result };
-	if (!Object.hasOwn(nextResult, "errCode")) {
+	if (!hasOwn(nextResult, "errCode")) {
 		const code = toNumberCode(nextResult[codeKey]);
 		if (typeof code === "number") nextResult.errCode = code;
 	}
-	if (!Object.hasOwn(nextResult, "errMsg")) {
+	if (!hasOwn(nextResult, "errMsg")) {
 		if (typeof nextResult.errorMessage === "string" && nextResult.errorMessage.length > 0) nextResult.errMsg = nextResult.errorMessage;
 		else if (nextResult.errCode === 0) nextResult.errMsg = `${methodName}:ok`;
 	}
@@ -1377,7 +1426,7 @@ function mapCloseBleConnectionResult(result) {
 }
 function mapSaveFileResult(result) {
 	if (!isPlainObject(result)) return result;
-	if (!Object.hasOwn(result, "savedFilePath") && Object.hasOwn(result, "apFilePath")) return {
+	if (!hasOwn(result, "savedFilePath") && hasOwn(result, "apFilePath")) return {
 		...result,
 		savedFilePath: result.apFilePath
 	};
@@ -1385,7 +1434,7 @@ function mapSaveFileResult(result) {
 }
 function mapDouyinSaveFileResult(result) {
 	if (!isPlainObject(result)) return result;
-	if (!Object.hasOwn(result, "savedFilePath") && Object.hasOwn(result, "filePath")) return {
+	if (!hasOwn(result, "savedFilePath") && hasOwn(result, "filePath")) return {
 		...result,
 		savedFilePath: result.filePath
 	};
@@ -1412,8 +1461,8 @@ function mapToastArgs(args) {
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
 	const nextOptions = { ...lastArg };
-	if (!Object.hasOwn(nextOptions, "content") && Object.hasOwn(nextOptions, "title")) nextOptions.content = nextOptions.title;
-	if (Object.hasOwn(nextOptions, "icon")) nextOptions.type = mapToastType(nextOptions.icon);
+	if (!hasOwn(nextOptions, "content") && hasOwn(nextOptions, "title")) nextOptions.content = nextOptions.title;
+	if (hasOwn(nextOptions, "icon")) nextOptions.type = mapToastType(nextOptions.icon);
 	nextArgs[lastIndex] = nextOptions;
 	return nextArgs;
 }
@@ -1435,7 +1484,7 @@ function mapLoadingArgs(args) {
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
 	const nextOptions = { ...lastArg };
-	if (!Object.hasOwn(nextOptions, "content") && Object.hasOwn(nextOptions, "title")) nextOptions.content = nextOptions.title;
+	if (!hasOwn(nextOptions, "content") && hasOwn(nextOptions, "title")) nextOptions.content = nextOptions.title;
 	nextArgs[lastIndex] = nextOptions;
 	return nextArgs;
 }
@@ -1446,13 +1495,13 @@ function mapActionSheetArgs(args) {
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
 	const nextOptions = { ...lastArg };
-	if (!Object.hasOwn(nextOptions, "items") && Array.isArray(nextOptions.itemList)) nextOptions.items = nextOptions.itemList;
+	if (!hasOwn(nextOptions, "items") && Array.isArray(nextOptions.itemList)) nextOptions.items = nextOptions.itemList;
 	nextArgs[lastIndex] = nextOptions;
 	return nextArgs;
 }
 function mapActionSheetResult(result) {
 	if (!isPlainObject(result)) return result;
-	if (!Object.hasOwn(result, "tapIndex") && Object.hasOwn(result, "index")) return {
+	if (!hasOwn(result, "tapIndex") && hasOwn(result, "index")) return {
 		...result,
 		tapIndex: result.index
 	};
@@ -1465,11 +1514,11 @@ function mapModalArgs(args) {
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
 	const nextOptions = { ...lastArg };
-	if (Object.hasOwn(nextOptions, "showCancel") && nextOptions.showCancel === false) throw createNotSupportedError("showModal", "my");
-	if (Object.hasOwn(nextOptions, "editable") && nextOptions.editable === true) throw createNotSupportedError("showModal", "my");
-	if (Object.hasOwn(nextOptions, "placeholderText")) throw createNotSupportedError("showModal", "my");
-	if (!Object.hasOwn(nextOptions, "confirmButtonText") && Object.hasOwn(nextOptions, "confirmText")) nextOptions.confirmButtonText = nextOptions.confirmText;
-	if (!Object.hasOwn(nextOptions, "cancelButtonText") && Object.hasOwn(nextOptions, "cancelText")) nextOptions.cancelButtonText = nextOptions.cancelText;
+	if (hasOwn(nextOptions, "showCancel") && nextOptions.showCancel === false) throw createNotSupportedError("showModal", "my");
+	if (hasOwn(nextOptions, "editable") && nextOptions.editable === true) throw createNotSupportedError("showModal", "my");
+	if (hasOwn(nextOptions, "placeholderText")) throw createNotSupportedError("showModal", "my");
+	if (!hasOwn(nextOptions, "confirmButtonText") && hasOwn(nextOptions, "confirmText")) nextOptions.confirmButtonText = nextOptions.confirmText;
+	if (!hasOwn(nextOptions, "cancelButtonText") && hasOwn(nextOptions, "cancelText")) nextOptions.cancelButtonText = nextOptions.cancelText;
 	nextArgs[lastIndex] = nextOptions;
 	return nextArgs;
 }
@@ -1477,11 +1526,11 @@ function mapModalResult(result) {
 	if (!isPlainObject(result)) return result;
 	let changed = false;
 	const nextResult = { ...result };
-	if (!Object.hasOwn(nextResult, "cancel") && Object.hasOwn(nextResult, "confirm")) {
+	if (!hasOwn(nextResult, "cancel") && hasOwn(nextResult, "confirm")) {
 		nextResult.cancel = !nextResult.confirm;
 		changed = true;
 	}
-	if (!Object.hasOwn(nextResult, "content")) {
+	if (!hasOwn(nextResult, "content")) {
 		nextResult.content = "";
 		changed = true;
 	}
@@ -1489,7 +1538,7 @@ function mapModalResult(result) {
 }
 function mapChooseImageResult(result) {
 	if (!isPlainObject(result)) return result;
-	if (!Object.hasOwn(result, "tempFilePaths") && Array.isArray(result.apFilePaths)) return {
+	if (!hasOwn(result, "tempFilePaths") && Array.isArray(result.apFilePaths)) return {
 		...result,
 		tempFilePaths: result.apFilePaths
 	};
@@ -1525,13 +1574,13 @@ function mapSetClipboardArgs(args) {
 	const lastArg = nextArgs[lastIndex];
 	if (!isPlainObject(lastArg)) return nextArgs;
 	const nextOptions = { ...lastArg };
-	if (!Object.hasOwn(nextOptions, "text") && Object.hasOwn(nextOptions, "data")) nextOptions.text = nextOptions.data;
+	if (!hasOwn(nextOptions, "text") && hasOwn(nextOptions, "data")) nextOptions.text = nextOptions.data;
 	nextArgs[lastIndex] = nextOptions;
 	return nextArgs;
 }
 function mapClipboardResult(result) {
 	if (!isPlainObject(result)) return result;
-	if (!Object.hasOwn(result, "data") && Object.hasOwn(result, "text")) return {
+	if (!hasOwn(result, "data") && hasOwn(result, "text")) return {
 		...result,
 		data: result.text
 	};
@@ -2129,7 +2178,6 @@ const PLATFORM_METHOD_SET = {
 	my: new Set(WEAPI_ALIPAY_METHODS),
 	tt: new Set(WEAPI_DOUYIN_METHODS)
 };
-function createFallbackMappingRule(platform, methodName) {}
 function resolveMappingRule(platform, methodName, options = {}) {
 	const methodSet = PLATFORM_METHOD_SET[platform];
 	const explicitRule = METHOD_MAPPINGS[platform]?.[methodName];
@@ -2146,12 +2194,6 @@ function resolveMappingRule(platform, methodName, options = {}) {
 		target: methodName,
 		source: "identity"
 	};
-	const fallbackRule = createFallbackMappingRule(platform, methodName);
-	if (fallbackRule) return {
-		target: fallbackRule.target,
-		source: "fallback",
-		rule: fallbackRule
-	};
 	return {
 		target: methodName,
 		source: "identity"
@@ -2200,13 +2242,13 @@ function resolveQueueSize(value) {
 	return Math.max(1, Math.floor(value));
 }
 function resolveCurrentMiniProgramHostConfig() {
-	const runtimeRoot = globalThis;
+	const runtimeRoot = resolveRuntimeRoot();
 	for (const globalKey of getMiniProgramRuntimeGlobalKeys()) {
-		if (!runtimeRoot[globalKey]) continue;
-		const hostConfig = runtimeRoot[getMiniProgramRuntimeHostConfigKey(getMiniProgramPlatformByRuntimeGlobalKey(globalKey))];
+		if (!resolveRuntimeGlobalValue(globalKey, runtimeRoot)) continue;
+		const hostConfig = resolveRuntimeGlobalValue(getMiniProgramRuntimeHostConfigKey(getMiniProgramPlatformByRuntimeGlobalKey(globalKey)), runtimeRoot);
 		return isPlainObject(hostConfig) ? hostConfig : void 0;
 	}
-	const defaultHostConfig = runtimeRoot[getMiniProgramRuntimeHostConfigKey(void 0)];
+	const defaultHostConfig = resolveRuntimeGlobalValue(getMiniProgramRuntimeHostConfigKey(void 0), runtimeRoot);
 	return isPlainObject(defaultHostConfig) ? defaultHostConfig : void 0;
 }
 function resolveHostTimeoutConfig() {
@@ -2230,7 +2272,7 @@ function clearTimer(timer) {
 }
 function resolveOptionsArg(args) {
 	const nextArgs = args.slice();
-	const lastArg = nextArgs.length > 0 ? nextArgs.at(-1) : void 0;
+	const lastArg = nextArgs.length > 0 ? nextArgs[nextArgs.length - 1] : void 0;
 	if (isPlainObject(lastArg)) {
 		const options = { ...lastArg };
 		nextArgs[nextArgs.length - 1] = options;
@@ -2532,7 +2574,7 @@ function createWeapi(options = {}) {
 			try {
 				runtimeArgs = mappingRule?.mapArgs ? mappingRule.mapArgs(args) : args;
 			} catch (error) {
-				const lastArg = args.length > 0 ? args.at(-1) : void 0;
+				const lastArg = args.length > 0 ? args[args.length - 1] : void 0;
 				if (hasCallbacks(lastArg)) {
 					lastArg.fail?.(error);
 					lastArg.complete?.(error);
@@ -2545,7 +2587,7 @@ function createWeapi(options = {}) {
 				const result = runtimeMethod.apply(runtimeAdapter, runtimeArgs);
 				return mappingRule?.mapResult ? mappingRule.mapResult(result, runtimeArgs) : result;
 			}
-			const lastArg = runtimeArgs.length > 0 ? runtimeArgs.at(-1) : void 0;
+			const lastArg = runtimeArgs.length > 0 ? runtimeArgs[runtimeArgs.length - 1] : void 0;
 			if (hasCallbacks(lastArg)) {
 				if (mappingRule?.mapResult && isPlainObject(lastArg)) {
 					const options = lastArg;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wevu/api",
   "type": "module",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "tsdown bundler template",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@douyin-microapp/typings": "^1.3.1",
     "@mini-types/alipay": "^3.0.14",
-    "miniprogram-api-typings": "^5.1.3",
+    "miniprogram-api-typings": "^5.2.0",
     "@weapp-core/shared": "3.0.4"
   },
   "publishConfig": {