Merge pull request #613 from deco-cx/revert-612-revert-593-fixes-for-…

…roles-n-perm fix invoke resolve chain
deco-cx · May 2, 2024 · 519d2d3 · 519d2d3
2 parents c32f58e + 2c9a480
commit 519d2d3
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 8 deletions.
diff --git a/blocks/app.ts b/blocks/app.ts
@@ -18,6 +18,7 @@ import {
 } from "../engine/middleware.ts";
 import { DecoManifest, FnContext } from "../types.ts";
 import { resolversFrom } from "./appsUtil.ts";
+import { isInvokeCtx } from "./loader.ts";
 import { fnContextFromHttpContext } from "./utils.tsx";
 
 export type Apps = InstanceOf<AppRuntime, "#/root/apps">;
@@ -72,6 +73,7 @@ export type AppMiddlewareContext<
   TApp extends App = App,
   TResponse = any,
 > = AppContext<TApp> & {
+  isInvoke: boolean;
   resolveChain: FieldResolver[];
   next?: () => Promise<TResponse>;
 };
@@ -247,6 +249,7 @@ const appMiddlewareToResolverMiddleware = <
         const appCtx = {
           ...fnContextFromHttpContext(appHttpCtx),
           ...state,
+          isInvoke: isInvokeCtx(ctx),
           resolveChain: ctx.resolveChain,
           next: ctx.next?.bind?.(ctx),
         };

diff --git a/engine/manifest/defaults.ts b/engine/manifest/defaults.ts
@@ -161,7 +161,7 @@ export default {
   },
   invoke: async function invoke(
     { props, block }: BlockInvocation,
-    { resolvables, resolvers, resolve },
+    { resolvables, resolvers, resolve, ...ctx },
   ) {
     const invokeBlock = `${INVOKE_PREFIX_KEY}${block}`;
     const _invokeResolver = resolvers[invokeBlock];
@@ -181,10 +181,22 @@ export default {
       }
       const { __resolveType, ...savedprops } = resolvable;
       // recursive call
-      return await resolve({ ...props, ...savedprops, __resolveType });
+      return await resolve({ ...props, ...savedprops, __resolveType }, {
+        resolveChain: [...ctx?.resolveChain ?? [], {
+          type: "resolvable",
+          value: block,
+        }, {
+          type: "resolver",
+          value: __resolveType,
+        }],
+      });
     }
     return await resolve({ ...props, __resolveType }, {
       propsAreResolved: true,
+      resolveChain: [...ctx?.resolveChain ?? [], {
+        type: "resolver",
+        value: __resolveType,
+      }],
     });
   },
 } satisfies ResolverMap<BaseContext>;
diff --git a/runtime/fresh/routes/batchInvoke.ts b/runtime/fresh/routes/batchInvoke.ts
@@ -64,7 +64,9 @@ export const handler = async (
     ? await req.json()
     : bodyFromUrl("body", new URL(req.url)); // TODO(mcandeia) check if ctx.url can be used here
 
-  const result = await resolve(payloadToResolvable(data)).catch(wrapInvokeErr);
+  const result = await resolve(payloadToResolvable(data), {
+    resolveChain: [{ type: "resolver", value: "invoke" }],
+  }).catch(wrapInvokeErr);
 
   const response = invokeToHttpResponse(req, result);
 

diff --git a/runtime/fresh/routes/invoke.ts b/runtime/fresh/routes/invoke.ts
@@ -26,7 +26,9 @@ export const handler = async (
       (url.searchParams.getAll("select") ?? []) as InvokeFunction["select"],
   };
 
-  const resp = await resolve(payloadToResolvable(invokeFunc)).catch(
+  const resp = await resolve(payloadToResolvable(invokeFunc), {
+    resolveChain: [{ type: "resolver", value: "invoke" }],
+  }).catch(
     wrapInvokeErr,
   );
 

diff --git a/utils/invoke.server.ts b/utils/invoke.server.ts
@@ -41,10 +41,7 @@ export const buildInvokeFunc = <
       payloadForFunc({ key, props } as InvokeFunction<TManifest>),
       {
         ...options,
-        resolveChain: [...options?.resolveChain ?? [], {
-          type: "resolver" as const,
-          value: key,
-        }],
+        resolveChain: options?.resolveChain ?? [],
       },
       partialCtx,
     );