devframe 0.9.17 → 0.9.18

package/dist/in-page-channel/index.mjs

@@ -186,6 +186,12 @@ function createLocalFunctionRegistry(codec) {
 		register(definition) {
 			definitions.set(channelMethod(definition.type, definition.name), definition);
 		},
+		registerInternal(method, handler) {
+			definitions.set(method, {
+				name: method,
+				handler
+			});
+		},
 		on(name, listener) {
 			const key = channelMethod("event", name);
 			let registered = listeners.get(key);
@@ -202,12 +208,7 @@ function createLocalFunctionRegistry(codec) {
 		resolve(name) {
 			const definition = definitions.get(name);
 			const registered = listeners.get(name);
-			if (!definition && !registered?.size) {
-				if (name.startsWith(FUNCTION_METHOD_PREFIX)) return () => {
-					throw diagnostics.DF0077({ name: name.slice(FUNCTION_METHOD_PREFIX.length) });
-				};
-				return;
-			}
+			if (!definition && !registered?.size) return void 0;
 			return async (...rawArgs) => {
 				const args = codec.deserialize ? rawArgs.map(codec.deserialize) : rawArgs;
 				if (definition?.jsonSerializable) assertJsonSerializable(args, "its arguments", definition.name);
@@ -221,6 +222,21 @@ function createLocalFunctionRegistry(codec) {
 		}
 	};
 }
+/**
+* Consult each registry in order and, only once none owns the name, fall back
+* to the coded "not registered" error for a `function:` call (events stay
+* silent). The fallback lives here, after every registry, so chaining a
+* state registry ahead of the user registry never masks a real handler.
+*/
+function resolveLocalHandler(name, registries) {
+	for (const registry of registries) {
+		const handler = registry(name);
+		if (handler) return handler;
+	}
+	if (name.startsWith(FUNCTION_METHOD_PREFIX)) return () => {
+		throw diagnostics.DF0077({ name: name.slice(FUNCTION_METHOD_PREFIX.length) });
+	};
+}
 function wrapPostError(error) {
 	if (error instanceof DOMException && error.name === "DataCloneError") return new InPageChannelError("not-cloneable", `a payload could not be structured-cloned across the in-page channel: ${error.message}. Strip non-cloneable values (functions, DOM nodes, framework reactivity proxies) before sending: declare the function \`jsonSerializable: true\` for a precise error, or provide a \`serialize\` hook.`, { cause: error });
 	return error;
@@ -539,12 +555,9 @@ function createPageScriptChannel(options) {
 			}
 		});
 		const stateRegistry = createLocalFunctionRegistry(codec);
-		for (const [name, handler] of Object.entries(internal.internalHandlers)) stateRegistry.register({
-			name,
-			handler
-		});
+		for (const [method, handler] of Object.entries(internal.internalHandlers)) stateRegistry.registerInternal(method, handler);
 		internal.attached = attachChannelPort(port, {
-			resolveLocal: (fnName) => stateRegistry.resolve(fnName) ?? registry.resolve(fnName),
+			resolveLocal: (fnName) => resolveLocalHandler(fnName, [stateRegistry.resolve, registry.resolve]),
 			onControl: (kind) => {
 				if (kind === "ping") internal.attached.postControl("pong");
 			},
@@ -697,10 +710,7 @@ function connectPanelChannel(options) {
 		call: (method, args) => enqueueCall(method, serializeArgs(codec, args))
 	});
 	const stateRegistry = createLocalFunctionRegistry(codec);
-	for (const [name, handler] of Object.entries(stateHost.handlers)) stateRegistry.register({
-		name,
-		handler
-	});
+	for (const [method, handler] of Object.entries(stateHost.handlers)) stateRegistry.registerInternal(method, handler);
 	function sendEventNow(method, args) {
 		attached?.rpc.$callRaw({
 			method,
@@ -746,7 +756,7 @@ function connectPanelChannel(options) {
 			reason: "the panel adopted a newer port"
 		});
 		attached = attachChannelPort(port, {
-			resolveLocal: (fnName) => stateRegistry.resolve(fnName) ?? registry.resolve(fnName),
+			resolveLocal: (fnName) => resolveLocalHandler(fnName, [stateRegistry.resolve, registry.resolve]),
 			onControl: (kind) => {
 				if (kind === "ping") attached?.postControl("pong");
 			},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "devframe",
   "type": "module",
-  "version": "0.9.17",
+  "version": "0.9.18",
   "description": "Framework for building one portable devtool integration that runs in any viewer.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",