effect-app 4.0.0-beta.284 → 4.0.0-beta.286

package/src/client/apiClientFactory.ts

@@ -224,7 +224,7 @@ const makeApiClientFactory = Effect
         dependencies === undefined
           ? Effect.void
           : Effect.gen(function*() {
-            const dependencyRecorder = yield* DataDependencies.DataDependencyRecorder
+            const dependencyRecorder = yield* DataDependencies.getDataDependencyRecorder
             if (options?.reads) {
               yield* Effect.forEach(dependencies.reads, dependencyRecorder.read, { discard: true })
             }
@@ -308,11 +308,14 @@ const makeApiClientFactory = Effect
                       Effect.provide(svcs)
                     )
                   return isCommand ? unwrapCommand(rpcEffect) : isStream ? rpcEffect : unwrapQuery(rpcEffect)
-                })
+                }),
+                // Forwarding the server's dependency metadata needs a recorder in scope. A parent
+                // query/command (vue) provides one; a top-level call gets a fresh per-request one.
+                DataDependencies.ensureDataDependencyRecorder
               )
 
-            const buildStream = (input: any) =>
-              Stream.unwrap(
+            const buildStream = (input: any) => {
+              const stream = Stream.unwrap(
                 mr.contextEffect.pipe(
                   Effect.flatMap((svcs) =>
                     TheClient
@@ -330,7 +333,7 @@ const makeApiClientFactory = Effect
                                 yield* Effect.forEach(metadata.invalidateQueries, invalidationKeys.add, {
                                   discard: true
                                 })
-                                const dependencyRecorder = yield* DataDependencies.DataDependencyRecorder
+                                const dependencyRecorder = yield* DataDependencies.getDataDependencyRecorder
                                 yield* Effect.forEach(
                                   metadata.dataDependencies.reads,
                                   dependencyRecorder.read,
@@ -358,7 +361,7 @@ const makeApiClientFactory = Effect
                                   yield* Effect.forEach(metadata.invalidateQueries, invalidationKeys.add, {
                                     discard: true
                                   })
-                                  const dependencyRecorder = yield* DataDependencies.DataDependencyRecorder
+                                  const dependencyRecorder = yield* DataDependencies.getDataDependencyRecorder
                                   yield* Effect.forEach(
                                     metadata.dataDependencies.writes,
                                     dependencyRecorder.write,
@@ -378,6 +381,18 @@ const makeApiClientFactory = Effect
                   )
                 )
               )
+              // Forwarding the server's dependency metadata needs a recorder in scope. A parent
+              // query/command (vue) provides one; a top-level stream call gets a fresh per-request one.
+              return Stream.unwrap(
+                Effect.map(
+                  DataDependencies.DataDependencyRecorder,
+                  (current) =>
+                    current === "root"
+                      ? Stream.provide(stream, DataDependencies.DataDependencyRecorder.layer)
+                      : stream
+                )
+              )
+            }
 
             // @ts-expect-error doc
             prev[cur] = Object.keys(fields).length === 0

package/src/rpc/Invalidation.ts

@@ -53,7 +53,10 @@ export const CommandMetaData = S.Struct({
 })
 export type CommandMetaData = S.Schema.Type<typeof CommandMetaData>
 
-export const emptyDataDependencies: DataDependencies.DataDependencySet = { reads: [], writes: [] }
+export const emptyDataDependencies: DataDependencies.DataDependencySet = {
+  reads: DataDependencies.empty(),
+  writes: DataDependencies.empty()
+}
 
 export const makeMetaData = (
   invalidateQueries: InvalidationKeys,

package/src/setupRequest.ts

@@ -1,9 +1,11 @@
 import * as Tracer from "effect/Tracer"
 import { SqlClient } from "effect/unstable/sql"
+import { DataDependencyRecorder } from "./DataDependencies.ts"
 import * as Effect from "./Effect.ts"
 import * as Layer from "./Layer.ts"
 import * as Option from "./Option.ts"
 import { LocaleRef, RequestContext, spanAttributes } from "./RequestContext.ts"
+import * as RequestScopedDependencies from "./RequestScopedDependencies.ts"
 import { NonEmptyString255 } from "./Schema.ts"
 import { ContextMapContainer, storeId } from "./Store.ts"
 
@@ -58,6 +60,8 @@ export interface SetupRequestOptions {
   readonly withTransaction?: boolean
 }
 
+export const requestStateLayer = RequestScopedDependencies.layer(ContextMapContainer, DataDependencyRecorder)
+
 // Build `layer` against the ambient (request) scope rather than a sub-scope of the
 // returned Effect. Required when the returned value is a streaming HttpServerResponse:
 // the response body keeps producing chunks (and using layer-provided state) after the
@@ -80,7 +84,7 @@ export const setupRequestContextFromCurrent =
       .pipe(
         options?.withTransaction === true ? withSqlTransaction : (_) => _,
         withRequestSpan(name, options),
-        Effect.provide(ContextMapContainer.layer, { local: true })
+        Effect.provide(requestStateLayer, { local: true })
       )
 
 // Streaming variant: binds ContextMapContainer to the ambient (request) scope so its
@@ -92,7 +96,7 @@ export const setupStreamingRequestContextFromCurrent =
     self.pipe(
       options?.withTransaction === true ? withSqlTransaction : (_) => _,
       withRequestSpan(name, options),
-      provideOnRequestScope(ContextMapContainer.layer)
+      provideOnRequestScope(requestStateLayer)
     )
 
 // TODO: consider integrating Effect.withParentSpan
@@ -102,7 +106,7 @@ export function setupRequestContext<R, E, A>(
   options?: SetupRequestOptions
 ) {
   const layer = Layer.mergeAll(
-    ContextMapContainer.layer,
+    requestStateLayer,
     Layer.succeed(LocaleRef, requestContext.locale),
     Layer.succeed(storeId, requestContext.namespace)
   )
@@ -121,7 +125,7 @@ export function setupRequestContextWithCustomSpan<R, E, A>(
   options?: Tracer.SpanOptions & SetupRequestOptions
 ) {
   const layer = Layer.mergeAll(
-    ContextMapContainer.layer,
+    requestStateLayer,
     Layer.succeed(LocaleRef, requestContext.locale),
     Layer.succeed(storeId, requestContext.namespace)
   )

package/test/special.test.ts

@@ -469,7 +469,7 @@ describe("OpaqueFacade", () => {
   })
 
   it("keeps generated struct facades decodable with public statics", () => {
-    const input: RequestContext.Encoded = {
+    const input: typeof RequestContext.Encoded = {
       span: { traceId: "trace", spanId: "span", sampled: true },
       name: "operation",
       locale: "en",