@weapp-core/shared 3.0.4 → 3.0.5

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import get from "get-value";
 import set from "set-value";
 
 //#region ../../node_modules/.pnpm/defu@6.1.7/node_modules/defu/dist/defu.d.mts
@@ -18,6 +19,28 @@ type MergeArrays<Destination, Source> = Destination extends Array<infer Destinat
 type Merge<Destination extends Input, Defaults extends Input> = Destination extends nullish ? Defaults extends nullish ? nullish : Defaults : Defaults extends nullish ? Destination : Destination extends Array<any> ? Defaults extends Array<any> ? MergeArrays<Destination, Defaults> : Destination | Defaults : Destination extends Function ? Destination | Defaults : Destination extends RegExp ? Destination | Defaults : Destination extends Promise<any> ? Destination | Defaults : Defaults extends Function ? Destination | Defaults : Defaults extends RegExp ? Destination | Defaults : Defaults extends Promise<any> ? Destination | Defaults : Destination extends Input ? Defaults extends Input ? MergeObjects<Destination, Defaults> : Destination | Defaults : Destination | Defaults;
 declare const defu: DefuInstance;
 //#endregion
+//#region src/layoutHostRegistry.d.ts
+interface MiniProgramLayoutHostWaitOptions {
+  interval?: number;
+  retries?: number;
+}
+type MiniProgramLayoutHostResolver<TBridge, THost = unknown> = (bridge: TBridge, key: string) => THost | null | undefined;
+/**
+ * @description 对 layout host key 去重并过滤空字符串。
+ */
+declare function normalizeMiniProgramLayoutHostKeys(keys: string | string[]): string[];
+/**
+ * @description 创建小程序 layout host 注册表。
+ */
+declare function createMiniProgramLayoutHostRegistry<TBridge>(): {
+  register: (keys: string | string[], bridge: TBridge, pageKeys: string[]) => string[] | null;
+  resolveBridge: (key: string, pageKeys: string[]) => TBridge | undefined;
+  resolveHost: <THost>(key: string, pageKeys: string[], resolver: MiniProgramLayoutHostResolver<TBridge, THost>) => NonNullable<THost> | null;
+  unregister: (keys: string | string[], bridge: TBridge, pageKeys: string[]) => boolean;
+  unregisterBridge: (bridge: TBridge) => boolean;
+  waitForHost: <THost>(key: string, resolvePageKeys: () => string[], resolver: MiniProgramLayoutHostResolver<TBridge, THost>, options?: MiniProgramLayoutHostWaitOptions) => Promise<THost | null>;
+};
+//#endregion
 //#region src/platforms/types.d.ts
 type MpPlatform = 'weapp' | 'alipay' | 'tt' | 'swan' | 'jd' | 'xhs';
 type MiniProgramTemplatePreset = 'wechat' | 'alipay' | 'tt' | 'swan';
@@ -327,52 +350,6 @@ declare function supportsMiniProgramRuntimeCapability(platform: MpPlatform | und
  */
 declare function resolveMiniProgramPageKeys(page?: Record<string, any>, platform?: MpPlatform): string[];
 //#endregion
-//#region ../../node_modules/.pnpm/get-value@4.0.1/node_modules/get-value/index.d.ts
-declare function get<T>(obj: T): T;
-declare function get(obj: object, key: string | string[], options?: get.Options): any;
-declare namespace get {
-  interface Options {
-    /**
-     * The default value to return when get-value cannot result a value from the given object.
-     *
-     * default: `undefined`
-     */
-    default?: any;
-    /**
-     * If defined, this function is called on each resolved value.
-     * Useful if you want to do `.hasOwnProperty` or `Object.prototype.propertyIsEnumerable`.
-     */
-    isValid?: (<K extends string>(key: K, object: Record<K, any>) => boolean) | undefined;
-    /**
-     * Custom function to use for splitting the string into object path segments.
-     *
-     * default: `String.split`
-     */
-    split?: ((s: string) => string[]) | undefined;
-    /**
-     * The separator to use for spliting the string.
-     * (this is probably not needed when `options.split` is used).
-     *
-     *  default: `"."`
-     */
-    separator?: string | RegExp | undefined;
-    /**
-     * Customize how the object path is created when iterating over path segments.
-     *
-     * default: `Array.join`
-     */
-    join?: ((segs: string[]) => string) | undefined;
-    /**
-     * The character to use when re-joining the string to check for keys
-     * with dots in them (this is probably not needed when `options.join` is used).
-     * This can be a different value than the separator, since the separator can be a string or regex.
-     *
-     * default: `"."`
-     */
-    joinChar?: string | undefined;
-  }
-}
-//#endregion
 //#region src/index.d.ts
 /**
  * @description 转义字符串中的正则特殊字符
@@ -407,4 +384,4 @@ declare function isObject(x: unknown): x is Record<string | symbol | number, unk
  */
 declare function isEmptyObject(obj: unknown): boolean;
 //#endregion
-export { MINI_PROGRAM_PLATFORM_ALIASES, MINI_PROGRAM_PLATFORM_DESCRIPTORS, MiniProgramPageIdentityRule, MiniProgramPlatformDescriptor, MiniProgramPlatformFamily, MiniProgramRuntimeCapabilities, MiniProgramRuntimeCapabilityName, MiniProgramTemplatePreset, MpPlatform, OutputExtensions, addExtension, arrify, defu, defuOverrideArray, escapeStringRegexp, get, getDefaultMiniProgramPlatform, getDefaultMiniProgramRuntimeGlobalKey, getMiniProgramAppTypesPackage, getMiniProgramDefaultBuildTarget, getMiniProgramDirectivePrefix, getMiniProgramPlatformByRuntimeGlobalKey, getMiniProgramPlatformDescriptor, getMiniProgramRouteRuntimeGlobalKeys, getMiniProgramRuntimeCapabilities, getMiniProgramRuntimeGlobalKey, getMiniProgramRuntimeGlobalKeys, getMiniProgramRuntimeGlobalKeysByResolvePriority, getMiniProgramRuntimeHostConfigKey, getMiniProgramTemplatePreset, getSupportedMiniProgramDirectivePrefixes, getSupportedMiniProgramPlatforms, isEmptyObject, isObject, normalizeMiniProgramPlatform, removeExtension, removeExtensionDeep, resolveMiniProgramPageKeys, resolveMiniProgramPlatform, set, supportsMiniProgramAutoTouchAppStyle, supportsMiniProgramRuntimeCapability };
+export { MINI_PROGRAM_PLATFORM_ALIASES, MINI_PROGRAM_PLATFORM_DESCRIPTORS, MiniProgramLayoutHostResolver, MiniProgramLayoutHostWaitOptions, type MiniProgramPageIdentityRule, type MiniProgramPlatformDescriptor, type MiniProgramPlatformFamily, type MiniProgramRuntimeCapabilities, type MiniProgramRuntimeCapabilityName, type MiniProgramTemplatePreset, type MpPlatform, type OutputExtensions, addExtension, arrify, createMiniProgramLayoutHostRegistry, defu, defuOverrideArray, escapeStringRegexp, get, getDefaultMiniProgramPlatform, getDefaultMiniProgramRuntimeGlobalKey, getMiniProgramAppTypesPackage, getMiniProgramDefaultBuildTarget, getMiniProgramDirectivePrefix, getMiniProgramPlatformByRuntimeGlobalKey, getMiniProgramPlatformDescriptor, getMiniProgramRouteRuntimeGlobalKeys, getMiniProgramRuntimeCapabilities, getMiniProgramRuntimeGlobalKey, getMiniProgramRuntimeGlobalKeys, getMiniProgramRuntimeGlobalKeysByResolvePriority, getMiniProgramRuntimeHostConfigKey, getMiniProgramTemplatePreset, getSupportedMiniProgramDirectivePrefixes, getSupportedMiniProgramPlatforms, isEmptyObject, isObject, normalizeMiniProgramLayoutHostKeys, normalizeMiniProgramPlatform, removeExtension, removeExtensionDeep, resolveMiniProgramPageKeys, resolveMiniProgramPlatform, set, supportsMiniProgramAutoTouchAppStyle, supportsMiniProgramRuntimeCapability };

package/dist/index.js

@@ -5,7 +5,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __commonJSMin = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
+var __commonJSMin = (cb, mod) => () => (mod || (cb((mod = { exports: {} }).exports, mod), cb = null), mod.exports);
 var __copyProps = (to, from, except, desc) => {
 	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 		key = keys[i];
@@ -48,18 +48,84 @@ function createDefu(merger) {
 	return (...arguments_) => arguments_.reduce((p, c) => _defu(p, c, "", merger), {});
 }
 const defu = createDefu();
-createDefu((object, key, currentValue) => {
-	if (object[key] !== void 0 && typeof currentValue === "function") {
-		object[key] = currentValue(object[key]);
-		return true;
+//#endregion
+//#region src/layoutHostRegistry.ts
+/**
+* @description 对 layout host key 去重并过滤空字符串。
+*/
+function normalizeMiniProgramLayoutHostKeys(keys) {
+	return Array.from(new Set(Array.isArray(keys) ? keys : [keys])).filter((key) => typeof key === "string" && key.length > 0);
+}
+/**
+* @description 创建小程序 layout host 注册表。
+*/
+function createMiniProgramLayoutHostRegistry() {
+	const registries = /* @__PURE__ */ new Map();
+	function register(keys, bridge, pageKeys) {
+		const normalizedKeys = normalizeMiniProgramLayoutHostKeys(keys);
+		if (normalizedKeys.length === 0 || pageKeys.length === 0) return null;
+		for (const pageKey of pageKeys) {
+			const registry = registries.get(pageKey) ?? /* @__PURE__ */ new Map();
+			for (const key of normalizedKeys) registry.set(key, bridge);
+			registries.set(pageKey, registry);
+		}
+		return normalizedKeys;
 	}
-});
-createDefu((object, key, currentValue) => {
-	if (Array.isArray(object[key]) && typeof currentValue === "function") {
-		object[key] = currentValue(object[key]);
-		return true;
+	function unregister(keys, bridge, pageKeys) {
+		const normalizedKeys = normalizeMiniProgramLayoutHostKeys(keys);
+		if (normalizedKeys.length === 0 || pageKeys.length === 0) return false;
+		let removed = false;
+		for (const pageKey of pageKeys) {
+			const registry = registries.get(pageKey);
+			if (!registry) continue;
+			for (const key of normalizedKeys) if (registry.get(key) === bridge) {
+				registry.delete(key);
+				removed = true;
+			}
+			if (registry.size === 0) registries.delete(pageKey);
+		}
+		return removed;
 	}
-});
+	function unregisterBridge(bridge) {
+		let removed = false;
+		for (const registry of registries.values()) for (const [key, currentBridge] of registry) if (currentBridge === bridge) {
+			registry.delete(key);
+			removed = true;
+		}
+		for (const [pageKey, registry] of registries) if (registry.size === 0) registries.delete(pageKey);
+		return removed;
+	}
+	function resolveBridge(key, pageKeys) {
+		return pageKeys.map((pageKey) => registries.get(pageKey)?.get(key)).find(Boolean);
+	}
+	function resolveHost(key, pageKeys, resolver) {
+		const bridge = resolveBridge(key, pageKeys);
+		if (!bridge) return null;
+		return resolver(bridge, key) ?? null;
+	}
+	function waitForHost(key, resolvePageKeys, resolver, options = {}) {
+		const retries = options.retries ?? 20;
+		const interval = options.interval ?? 16;
+		const host = resolveHost(key, resolvePageKeys(), resolver);
+		if (host || retries <= 0) return Promise.resolve(host);
+		return new Promise((resolve) => {
+			setTimeout(() => {
+				resolve(waitForHost(key, resolvePageKeys, resolver, {
+					...options,
+					retries: retries - 1
+				}));
+			}, interval);
+		});
+	}
+	return {
+		register,
+		resolveBridge,
+		resolveHost,
+		unregister,
+		unregisterBridge,
+		waitForHost
+	};
+}
 //#endregion
 //#region src/platforms/descriptors.ts
 const DEFAULT_PROJECT_CONFIG_ROOT_KEYS = ["miniprogramRoot", "srcMiniprogramRoot"];
@@ -560,7 +626,7 @@ function resolveMiniProgramPageKeys(page, platform) {
 	return Array.from(new Set(keys));
 }
 //#endregion
-//#region ../../node_modules/.pnpm/get-value@4.0.1/node_modules/get-value/dist/index.mjs
+//#region ../../node_modules/.pnpm/get-value@4.1.0/node_modules/get-value/dist/index.mjs
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", {
 	value,
@@ -591,7 +657,9 @@ var index_default = /* @__PURE__ */ __name((target, path, options = {}) => {
 	const splitChar = options.separator || ".";
 	const joinChar = options.joinChar || (typeof splitChar === "string" ? splitChar : ".");
 	if (!pathIsString && !pathIsArray) return target;
-	if (target[path] !== void 0) return isValid(path, target, options) ? target[path] : options.default;
+	let value = target[path];
+	if (value === void 0 && typeof target.get === "function") value = target.get(path);
+	if (value !== void 0) return isValid(path, target, options) ? value : options.default;
 	const segs = pathIsArray ? path : split(path, splitChar, options);
 	const len = segs.length;
 	let idx = 0;
@@ -599,17 +667,21 @@ var index_default = /* @__PURE__ */ __name((target, path, options = {}) => {
 		let prop = segs[idx];
 		if (typeof prop !== "string") prop = String(prop);
 		while (prop && prop.slice(-1) === "\\") prop = join([prop.slice(0, -1), segs[++idx] || ""], joinChar, options);
-		if (target[prop] !== void 0) {
+		value = target[prop];
+		if (value === void 0 && typeof target.get === "function") value = target.get(prop);
+		if (value !== void 0) {
 			if (!isValid(prop, target, options)) return options.default;
-			target = target[prop];
+			target = value;
 		} else {
 			let hasProp = false;
 			let n = idx + 1;
 			while (n < len) {
 				prop = join([prop, segs[n++]], joinChar, options);
-				if (hasProp = target[prop] !== void 0) {
+				value = target[prop];
+				if (value === void 0 && typeof target.get === "function") value = target.get(prop);
+				if (hasProp = value !== void 0) {
 					if (!isValid(prop, target, options)) return options.default;
-					target = target[prop];
+					target = value;
 					idx = n - 1;
 					break;
 				}
@@ -677,6 +749,12 @@ var require_is_plain_object = /* @__PURE__ */ __commonJSMin(((exports, module) =
 		return true;
 	};
 }));
+/*!
+* set-value <https://github.com/jonschlinkert/set-value>
+*
+* Copyright (c) Jon Schlinkert (https://github.com/jonschlinkert).
+* Released under the MIT License.
+*/
 //#endregion
 //#region src/index.ts
 var import_set_value = /* @__PURE__ */ __toESM((/* @__PURE__ */ __commonJSMin(((exports, module) => {
@@ -853,4 +931,4 @@ function isEmptyObject(obj) {
 }
 //#endregion
 var set = import_set_value.default;
-export { MINI_PROGRAM_PLATFORM_ALIASES, MINI_PROGRAM_PLATFORM_DESCRIPTORS, addExtension, arrify, defu, defuOverrideArray, escapeStringRegexp, index_default as get, getDefaultMiniProgramPlatform, getDefaultMiniProgramRuntimeGlobalKey, getMiniProgramAppTypesPackage, getMiniProgramDefaultBuildTarget, getMiniProgramDirectivePrefix, getMiniProgramPlatformByRuntimeGlobalKey, getMiniProgramPlatformDescriptor, getMiniProgramRouteRuntimeGlobalKeys, getMiniProgramRuntimeCapabilities, getMiniProgramRuntimeGlobalKey, getMiniProgramRuntimeGlobalKeys, getMiniProgramRuntimeGlobalKeysByResolvePriority, getMiniProgramRuntimeHostConfigKey, getMiniProgramTemplatePreset, getSupportedMiniProgramDirectivePrefixes, getSupportedMiniProgramPlatforms, isEmptyObject, isObject, normalizeMiniProgramPlatform, removeExtension, removeExtensionDeep, resolveMiniProgramPageKeys, resolveMiniProgramPlatform, set, supportsMiniProgramAutoTouchAppStyle, supportsMiniProgramRuntimeCapability };
+export { MINI_PROGRAM_PLATFORM_ALIASES, MINI_PROGRAM_PLATFORM_DESCRIPTORS, addExtension, arrify, createMiniProgramLayoutHostRegistry, defu, defuOverrideArray, escapeStringRegexp, index_default as get, getDefaultMiniProgramPlatform, getDefaultMiniProgramRuntimeGlobalKey, getMiniProgramAppTypesPackage, getMiniProgramDefaultBuildTarget, getMiniProgramDirectivePrefix, getMiniProgramPlatformByRuntimeGlobalKey, getMiniProgramPlatformDescriptor, getMiniProgramRouteRuntimeGlobalKeys, getMiniProgramRuntimeCapabilities, getMiniProgramRuntimeGlobalKey, getMiniProgramRuntimeGlobalKeys, getMiniProgramRuntimeGlobalKeysByResolvePriority, getMiniProgramRuntimeHostConfigKey, getMiniProgramTemplatePreset, getSupportedMiniProgramDirectivePrefixes, getSupportedMiniProgramPlatforms, isEmptyObject, isObject, normalizeMiniProgramLayoutHostKeys, normalizeMiniProgramPlatform, removeExtension, removeExtensionDeep, resolveMiniProgramPageKeys, resolveMiniProgramPlatform, set, supportsMiniProgramAutoTouchAppStyle, supportsMiniProgramRuntimeCapability };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@weapp-core/shared",
   "type": "module",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "@weapp-core/shared",
   "author": "ice breaker <1324318532@qq.com>",
   "license": "MIT",