Keep submit action targets literal

Author: bob-obringer

pkgs/snap/src/react-native/snap-view-core.tsx

@@ -29,7 +29,7 @@ import {
   hasPendingSnapAction,
   markSnapEffectsPresented,
   optionalSnapStringArray,
-  resolveSnapActionParams,
+  resolveSnapActionParamsForAction,
   validateSnapActionTargetUrl,
   type SnapRenderState,
 } from "../render-state";
@@ -50,6 +50,10 @@ function validActionTarget(value: unknown): string | undefined {
   return validateSnapActionTargetUrl(target) ? undefined : target;
 }
 
+function literalStringParam(value: unknown): string {
+  return typeof value === "string" ? value : "";
+}
+
 function recordValue(value: unknown): Record<string, unknown> | undefined {
   return value && typeof value === "object" && !Array.isArray(value)
     ? (value as Record<string, unknown>)
@@ -267,15 +271,15 @@ export function SnapViewCoreInner({
   );
 
   const handleAction = useCallback((name: unknown, params: unknown) => {
-    const p = resolveSnapActionParams(params, stateRef.current);
+    const p = resolveSnapActionParamsForAction(name, params, stateRef.current);
     const inputs = (stateRef.current.inputs ?? {}) as Record<string, JsonValue>;
     const h = handlersRef.current;
     let result: unknown;
     setActionPending(name, p);
 
     switch (name) {
       case "submit":
-        result = h.submit(String(p.target ?? ""), inputs);
+        result = h.submit(literalStringParam(p.target), inputs);
         break;
       case "open_url": {
         const target = validActionTarget(p.target);

pkgs/snap/src/react/snap-view-core.tsx

@@ -16,7 +16,7 @@ import {
   hasPendingSnapAction,
   markSnapEffectsPresented,
   optionalSnapStringArray,
-  resolveSnapActionParams,
+  resolveSnapActionParamsForAction,
   validateSnapActionTargetUrl,
   type SnapRenderState,
 } from "../render-state";
@@ -46,6 +46,10 @@ function validActionTarget(value: unknown): string | undefined {
   return validateSnapActionTargetUrl(target) ? undefined : target;
 }
 
+function literalStringParam(value: unknown): string {
+  return typeof value === "string" ? value : "";
+}
+
 function recordValue(value: unknown): Record<string, unknown> | undefined {
   return value && typeof value === "object" && !Array.isArray(value)
     ? (value as Record<string, unknown>)
@@ -551,7 +555,11 @@ export function SnapViewCore({
 
   const handleAction = useCallback(
     (name: unknown, params: unknown) => {
-      const p = resolveSnapActionParams(params, stateRef.current);
+      const p = resolveSnapActionParamsForAction(
+        name,
+        params,
+        stateRef.current,
+      );
       const inputs = (stateRef.current.inputs ?? {}) as Record<
         string,
         JsonValue
@@ -561,7 +569,7 @@ export function SnapViewCore({
 
       switch (name) {
         case "submit":
-          result = handlers.submit(String(p.target ?? ""), inputs);
+          result = handlers.submit(literalStringParam(p.target), inputs);
           break;
         case "open_url": {
           const target = validActionTarget(p.target);

pkgs/snap/src/render-state.ts

@@ -189,15 +189,29 @@ export function resolveSnapActionParams(
   params: unknown,
   state: SnapRenderState,
 ): Record<string, unknown> {
-  if (!isRecord(params)) return {};
+  const actionParams = getSnapActionParams(params);
 
   const resolved: Record<string, unknown> = {};
-  for (const [key, value] of Object.entries(params)) {
+  for (const [key, value] of Object.entries(actionParams)) {
     resolved[key] = resolveActionParam(value, { stateModel: state });
   }
   return resolved;
 }
 
+export function getSnapActionParams(params: unknown): Record<string, unknown> {
+  if (!isRecord(params)) return {};
+  return cloneSnapRenderState(params);
+}
+
+export function resolveSnapActionParamsForAction(
+  actionName: unknown,
+  params: unknown,
+  state: SnapRenderState,
+): Record<string, unknown> {
+  if (actionName === "submit") return getSnapActionParams(params);
+  return resolveSnapActionParams(params, state);
+}
+
 export function optionalSnapStringArray(value: unknown): string[] | undefined {
   if (Array.isArray(value)) return value.map((item) => String(item));
   return value ? [String(value)] : undefined;

pkgs/snap/tests/render-state.test.ts

@@ -9,6 +9,7 @@ import {
   markSnapEffectsPresented,
   optionalSnapStringArray,
   resolveSnapActionParams,
+  resolveSnapActionParamsForAction,
   type SnapRenderState,
   validateSnapActionTargetUrl,
 } from "../src/render-state";
@@ -142,6 +143,26 @@ describe("snap render state", () => {
     });
   });
 
+  it("keeps submit targets literal while resolving client action params", () => {
+    const params = {
+      target: { $state: "/inputs/target" },
+    };
+    const state: SnapRenderState = {
+      inputs: {
+        target: "https://example.com/submit",
+      },
+    };
+
+    expect(resolveSnapActionParamsForAction("submit", params, state)).toEqual({
+      target: { $state: "/inputs/target" },
+    });
+    expect(
+      resolveSnapActionParamsForAction("open_url", params, state),
+    ).toEqual({
+      target: "https://example.com/submit",
+    });
+  });
+
   it("normalizes dynamic compose_cast embeds that resolve to one string", () => {
     const resolved = resolveSnapActionParams(
       {