@reventlessdev/reventless-local 3.0.0-alpha.152 → 3.0.0-alpha.153

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.0.0-alpha.153 (2026-07-14)
+
+### Features
+
+* **local:** plugin=subgraph composition — per-plugin subschemas merged at start (Phase 6, plan complete) ([40f44c5](https://github.com/ReventlessDev/reventless-core/commit/40f44c5c6aa32fbbd64f362841cf41ba4e2fc2e0))
+
+
 # 3.0.0-alpha.152 (2026-07-14)
 
 **Note:** Version bump only for package @reventlessdev/reventless-local

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reventlessdev/reventless-local",
-  "version": "3.0.0-alpha.152",
+  "version": "3.0.0-alpha.153",
   "description": "Local platform for Reventless (in-memory or SQLite backend, for development and testing without AWS)",
   "license": "Apache-2.0",
   "jest": {
@@ -31,17 +31,17 @@
     "graphql-yoga": "^5.21.0",
     "sury": "11.0.0-alpha.4",
     "ws": "^8.18.0",
-    "@reventlessdev/rescript-jest": "1.0.0-alpha.7",
     "@reventlessdev/rescript-effect": "0.1.0-alpha.27",
-    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.15",
+    "@reventlessdev/rescript-jest": "1.0.0-alpha.7",
     "@reventlessdev/rescript-mcp-sdk": "1.0.0-alpha.18",
-    "@reventlessdev/reventless-core": "3.0.0-alpha.166",
-    "@reventlessdev/rescript-graphql-yoga": "1.0.0-alpha.20",
-    "@reventlessdev/reventless-graphql-server": "1.0.0-alpha.13",
-    "@reventlessdev/reventless-gwt": "1.0.0-alpha.112",
-    "@reventlessdev/reventless-infra": "3.0.0-alpha.98",
-    "@reventlessdev/reventless-postgres": "3.0.0-alpha.30",
-    "@reventlessdev/reventless-spec": "3.0.0-alpha.76"
+    "@reventlessdev/rescript-pulumi-pulumi": "2.3.0-alpha.15",
+    "@reventlessdev/rescript-graphql-yoga": "1.0.0-alpha.21",
+    "@reventlessdev/reventless-core": "3.0.0-alpha.167",
+    "@reventlessdev/reventless-graphql-server": "1.0.0-alpha.14",
+    "@reventlessdev/reventless-infra": "3.0.0-alpha.99",
+    "@reventlessdev/reventless-spec": "3.0.0-alpha.76",
+    "@reventlessdev/reventless-postgres": "3.0.0-alpha.31",
+    "@reventlessdev/reventless-gwt": "1.0.0-alpha.113"
   },
   "devDependencies": {
     "rescript": "^12.3.0",

package/src/Platform.res

@@ -61,23 +61,6 @@ let decodeUiFragmentRegistryEventEnvelope = (
   | exception _ => None
   }
 
-// Same {id, meta, event} envelope for the ApiFragmentRegistry singleton aggregate's
-// events on its own aggregate event topic (the registry is an aggregate now, not a
-// DCB slice — its events no longer ride the admin DcbEventLog). Top-level so the
-// decode is unit-testable.
-let decodeApiFragmentRegistryEventEnvelope = (
-  eventJson: JSON.t,
-): option<ReventlessCore.ApiFragmentRegistrySpec.event> =>
-  switch eventJson
-  ->JSON.Decode.object
-  ->Option.flatMap(d => d->Dict.get("event"))
-  ->Option.map(payload =>
-    payload->S.parseJsonOrThrow(ReventlessCore.ApiFragmentRegistrySpec.eventSchema)
-  ) {
-  | result => result
-  | exception _ => None
-  }
-
 // Configurable platform — set silent=true to suppress diagnostic warnings in tests,
 // splitApi=true to serve core and plugin APIs on separate ports,
 // backend=Backend.Sqlite({...}) to opt into file-backed SQLite persistence.
@@ -176,6 +159,30 @@ module MakeWithConfig = (
   // Domain = plugin-facing (default); Platform = admin/core (split mode).
   let currentDeployTarget: ref<apiTarget> = ref(Domain)
 
+  // Plugin=subgraph scoping (mirrors the AWS plugin=source-API model): each
+  // plugin's construction runs inside its own DomainGraphQL_Server scope so
+  // its GraphQL registrations form a standalone subgraph, validated in
+  // isolation and composed at start(). The plugin name is only known after
+  // construction (via the synchronous plugin-built hook), so the scope opens
+  // under a unique token and is relabeled to the plugin name afterwards.
+  let pluginScopeCounter = ref(0)
+  let buildPluginInScope = (
+    ~makePlugin: unit => ReventlessCore.Plugin.component,
+    ~builtInfos: ref<array<ReventlessCore.Plugin_Helpers.pluginBuiltInfo>>,
+  ): ReventlessCore.Plugin.component => {
+    pluginScopeCounter.contents = pluginScopeCounter.contents + 1
+    let scopeToken = `plugin-${pluginScopeCounter.contents->Int.toString}`
+    DomainGraphQL_Server.setScope(scopeToken)
+    let countBefore = builtInfos.contents->Array.length
+    let component = makePlugin()
+    switch builtInfos.contents->Array.get(countBefore) {
+    | Some(info) => DomainGraphQL_Server.relabelScope(~from=scopeToken, ~to_=info.name)
+    | None => ()
+    }
+    DomainGraphQL_Server.resetScope()
+    component
+  }
+
   // Track which GraphQL servers have had admin schema (Plugin queries/mutations) registered.
   // Prevents double-registration when makePlatform and deployPlugin both target the same server.
   let adminRegisteredServers: ref<array<ReventlessGraphqlServer.GraphQL_ServerInstance.t>> = ref([])
@@ -672,8 +679,7 @@ module MakeWithConfig = (
 
   // Admin UI-fragment registry (docs/plans/event-sourced-fragment-registries.md): the
   // platform UI-fragment registry hosted as an admin DCB slice on the admin DcbEventLog.
-  // Built once and passed into Admin.construct below. (The API-fragment registry is a
-  // singleton aggregate — see LocalApiFragmentRegistryAggregate — not a slice.)
+  // Built once and passed into Admin.construct below.
   module UiFragmentRegistrySlice = StateChangeSlice.Make(
     ReventlessCore.UiFragmentRegistry,
     ReventlessCore.UiFragmentRegistry_Behavior,
@@ -716,35 +722,6 @@ module MakeWithConfig = (
       InboundTranslationSliceMaker.Make(Spec, Translation)
   }
 
-  // Empty base fragment — no types, no mutations, no queries.
-  // Used by the plugin Api in split mode so plugin schema has no core fields.
-  let emptyBaseFragment = ReventlessCore.GraphQL_Stitcher.encode({
-    types: [],
-    mutations: [],
-    queries: [],
-    subscriptions: [],
-    subscriptionSources: [],
-  })
-
-  module Api = {
-    module Make = (
-      FragmentConfig: {
-        let baseFragment: ReventlessInfra.Api.schemaFragment
-      },
-    ): ReventlessInfra.Api.T => {
-      module Builder = ReventlessCore.Api_Builder.Make(LocalGraphQL_Adapter)
-      // In split mode, the plugin API uses an empty base fragment so plugin schema
-      // has no core fields. In unified mode, use the provided base fragment as-is.
-      let effectiveBaseFragment = if Config.splitApi {
-        emptyBaseFragment
-      } else {
-        FragmentConfig.baseFragment
-      }
-      let make = (~name, ~opts=?) =>
-        Builder.make(~name, ~baseFragment=effectiveBaseFragment, ~opts?)
-    }
-  }
-
   module PluginMaker = Plugin_Builder.Make(
     Bus,
     {
@@ -797,33 +774,6 @@ module MakeWithConfig = (
     PluginsReadModelMappings,
   )
 
-  // Admin-internal ApiFragmentRegistry singleton aggregate — the platform API-schema
-  // fragment registry (docs/plans/event-sourced-fragment-registries.md). Threaded into
-  // Admin.construct's ~aggregates so registerAdminAggregateMutations wires
-  // Platform_ApiFragmentRegistry_RegisterApiFragment / _DeregisterApiFragment through the
-  // standard CommandGenerator auto-flow. RecordApiFragmentPush carries `@noApi`.
-  module LocalApiFragmentRegistryAggregate: ReventlessInfra.Aggregate.T
-    with type api = unit = AggregateMaker.Make(
-    ReventlessCore.ApiFragmentRegistrySpec,
-    ReventlessCore.ApiFragmentRegistryBehavior,
-    ReventlessInfra.NoEventMappings.Make(ReventlessCore.ApiFragmentRegistrySpec),
-  )
-
-  // Admin ApiFragments read model — per-plugin status rows off the aggregate's event
-  // topic, backing the Platform_ApiFragments status query.
-  module ApiFragmentsReadModelMappings: Reventless.Projection.Mappings
-    with module Target := ReventlessCore.ApiFragmentsReadModelSpec = {
-    module M = ReventlessCore.ApiFragmentsProjection.Mappings
-    module type Mapping = M.Mapping
-    let moduleUrl: string = ReventlessCore.ApiFragmentsProjection.moduleUrl
-    let mappings: array<module(Mapping)> = ReventlessCore.ApiFragmentsProjection.mappings
-  }
-  module ApiFragmentsReadModel = ReadModelMaker.MakeNoResolver(
-    ReventlessCore.ApiFragmentsReadModelSpec,
-    ApiFragmentsReadModelMappings,
-  )
-
-
   module Admin = ReventlessCore.Platform_Admin.Make(
     LocalRuntimeEnvironment,
     EventCollectorChannel,
@@ -954,57 +904,6 @@ module MakeWithConfig = (
     Bus.dispatchCommand(adminDcbCmdTopicKey, ReventlessCore.CommandTopic.encodeCommandJson(cmdJson))
   }
 
-  // The ApiFragmentRegistry is a SINGLETON aggregate now (not a DCB slice): the
-  // whole registry lives on one aggregate instance keyed by a fixed id, so a
-  // fragment change reads the whole registry from one consistency boundary. Its
-  // commands ride the aggregate command topic (name-derived, like the Plugin
-  // aggregate above) and its events its own aggregate event topic.
-  let apiFragmentRegistryId = "registry"
-  let apiFragmentRegistryCmdTopicKey =
-    ReventlessCore.ApiFragmentRegistrySpec.name ++ "Aggr" ++ "CmdTopic"
-  let apiFragmentRegistryEventTopicKey =
-    ReventlessCore.ApiFragmentRegistrySpec.name ++ "Aggr" ++ "EventTopic"
-
-  // Dispatch an ApiFragmentRegistry aggregate command in-process. On the real
-  // platform the deploy is the caller (SigV4 Platform_ApiFragmentRegistry_*
-  // mutation); locally we dispatch straight to the aggregate command topic. The
-  // aggregate id is the fixed singleton constant — `pluginId` is a payload field.
-  let dispatchApiFragmentCommand = (~command: ReventlessCore.ApiFragmentRegistrySpec.command) => {
-    let cmdJson: Reventless.Message.commandJson = {
-      id: apiFragmentRegistryId,
-      meta: ReventlessCore.Message.generateMeta(
-        ~service=ReventlessCore.ApiFragmentRegistrySpec.name,
-      ),
-      commandJson: command->S.reverseConvertToJsonOrThrow(
-        ReventlessCore.ApiFragmentRegistrySpec.commandSchema,
-      ),
-    }
-    Bus.dispatchCommand(
-      apiFragmentRegistryCmdTopicKey,
-      ReventlessCore.CommandTopic.encodeCommandJson(cmdJson),
-    )
-  }
-
-  // Platform_ApiFragments status-query resolver — scans the ApiFragments read
-  // model (populated by the ApiFragmentRegistry aggregate's projection) and
-  // encodes via the shared Platform_ApiFragmentsApi encoder, so the deploy-facing
-  // status shape matches AWS. Keyed by bare plugin name (one row per plugin).
-  // Registered at each admin server site below.
-  let apiFragmentsQueryResolver = async (_root, _args, _ctx): JSON.t => {
-    let items = switch Bus.getQueryDbScan(ReventlessCore.ApiFragmentsReadModelSpec.name) {
-    | Some(scanAll) => scanAll()
-    | None => []
-    }
-    items
-    ->Array.filterMap(item =>
-      switch item->S.parseOrThrow(ReventlessCore.ApiFragmentsReadModelSpec.stateSchema) {
-      | state => Some(ReventlessCore.Platform_ApiFragmentsApi.encodeApiFragmentEntry(state))
-      | exception _ => None
-      }
-    )
-    ->JSON.Encode.array
-  }
-
   // Subscription topics for the admin live-update channels.
   let pluginStatusSubTopic = "onPluginStatusChange"
   let uiFragmentSubTopic = "onUIFragmentChange"
@@ -1097,33 +996,6 @@ module MakeWithConfig = (
           }
         }
       )
-      // Local single writer for the API-schema fragment registry — the analogue of
-      // the AWS ApiSchemaPush SideEffect. Sourced from the ApiFragmentRegistry
-      // aggregate's own event topic (the registry is an aggregate now). On AWS the
-      // SideEffect stitches + pushes the schema then records the outcome; on local
-      // the plugin's fields are already served by resolver registration, so the
-      // "push" is a no-op and we simply record success — the honest status for an
-      // in-process schema. Only Registered/Updated trigger a record (never
-      // PushRecorded — no re-entrant loop; ApiSchemaComputed is the AWS push trigger
-      // and is a no-op here).
-      Bus.subscribeToEvents(apiFragmentRegistryEventTopicKey, async (_service, _meta, eventJson) =>
-        switch decodeApiFragmentRegistryEventEnvelope(eventJson) {
-        | Some(ApiFragmentRegistered({pluginId}))
-        | Some(ApiFragmentUpdated({pluginId})) =>
-          let _ = dispatchApiFragmentCommand(
-            ~command=ReventlessCore.ApiFragmentRegistrySpec.RecordApiFragmentPush({
-              pluginId,
-              ok: true,
-              message: "",
-              at: Date.make()->Date.toISOString,
-            }),
-          )
-        | Some(ApiFragmentDeregistered(_))
-        | Some(ApiFragmentPushRecorded(_))
-        | Some(ApiSchemaComputed(_))
-        | None => ()
-        }
-      )
     }
 
   // Drive the admin Plugin read models the same way AWS does: build a
@@ -1217,24 +1089,6 @@ module MakeWithConfig = (
             )
           | None => ()
           }
-          // Register the API-schema fragment with the ApiFragmentRegistry aggregate.
-          // On the real platform the deploy sends this as a SigV4 caller; locally
-          // connect stands in. apiTarget is Domain (mirrors pluginDefinition.kind
-          // = Domain / apiTarget = None above — the local platform has no
-          // Platform-target plugins). The subscriber below records the push as ok,
-          // since the fields are already served in-process by resolver registration.
-          switch apiSchemaFragment {
-          | Some(fragment) =>
-            let _ = dispatchApiFragmentCommand(
-              ~command=ReventlessCore.ApiFragmentRegistrySpec.RegisterApiFragment({
-                pluginId: pluginName,
-                fragment,
-                apiTarget: Domain,
-                at: Date.make()->Date.toISOString,
-              }),
-            )
-          | None => ()
-          }
         })
     })
   }
@@ -1500,8 +1354,8 @@ module MakeWithConfig = (
     let admin = Admin.construct(
       ~version,
       ~extensionPoints=[],
-      ~aggregates=[module(LocalPluginAggregate), module(LocalApiFragmentRegistryAggregate)],
-      ~readModels=[module(PluginsReadModel), module(ApiFragmentsReadModel)],
+      ~aggregates=[module(LocalPluginAggregate)],
+      ~readModels=[module(PluginsReadModel)],
       ~scheduler,
       ~resourceNaming=LocalPluginSpec.resourceNaming,
       ~api=(),
@@ -1531,10 +1385,12 @@ module MakeWithConfig = (
       builtInfos.contents->Array.push(info)
     })
 
-    // Build each plugin.
+    // Build each plugin inside its own DomainGraphQL_Server scope so its
+    // GraphQL registrations form a standalone subgraph (plugin=subgraph,
+    // platform=merge — mirrors the AWS source-API model).
     let plugins = plugins->Array.map(plugin => {
       module P = unpack(plugin)
-      P.make()
+      buildPluginInScope(~makePlugin=P.make, ~builtInfos)
     })
 
     // Restore original hook and fire deployed hooks synchronously.
@@ -1823,8 +1679,6 @@ module MakeWithConfig = (
         ->JSON.Encode.array
       },
     )
-    queryResolvers->Dict.set("Platform_ApiFragments", apiFragmentsQueryResolver)
-
     // Composite-key / index admin query fields. Live loads from the seeded QueryDb stores.
     registerAdminItemsAndIndexResolvers(~queryResolvers, ~live=true)
 
@@ -2066,8 +1920,8 @@ module MakeWithConfig = (
     let _admin = Admin.construct(
       ~version,
       ~extensionPoints=[],
-      ~aggregates=[module(LocalApiFragmentRegistryAggregate)],
-      ~readModels=[module(ApiFragmentsReadModel)],
+      ~aggregates=[],
+      ~readModels=[],
       ~scheduler,
       ~resourceNaming=LocalPluginSpec.resourceNaming,
       ~api=(),
@@ -2105,7 +1959,6 @@ module MakeWithConfig = (
       "Platform_UIFragments",
       async (_root, _args, _ctx): JSON.t => JSON.Encode.array([]),
     )
-    queryResolvers->Dict.set("Platform_ApiFragments", apiFragmentsQueryResolver)
     // Composite-key / index admin query fields — empty stubs in the platform-only
     // path (no plugins connected → no QueryDb seeded).
     registerAdminItemsAndIndexResolvers(~queryResolvers, ~live=false)
@@ -2233,8 +2086,8 @@ module MakeWithConfig = (
     let admin = Admin.construct(
       ~version="",
       ~extensionPoints=[],
-      ~aggregates=[module(LocalPluginAggregate), module(LocalApiFragmentRegistryAggregate)],
-      ~readModels=[module(PluginsReadModel), module(ApiFragmentsReadModel)],
+      ~aggregates=[module(LocalPluginAggregate)],
+      ~readModels=[module(PluginsReadModel)],
       ~scheduler,
       ~resourceNaming=LocalPluginSpec.resourceNaming,
       ~api=(),
@@ -2258,8 +2111,12 @@ module MakeWithConfig = (
       builtInfos.contents->Array.push(info)
     })
 
+    // Construct the plugin inside its own DomainGraphQL_Server scope
+    // (plugin=subgraph — see buildPluginInScope). Registrations targeting the
+    // platform server (apiTarget=Platform in split mode) are unaffected:
+    // scopes only exist on DomainGraphQL_Server.
     module P = unpack(plugin)
-    let pluginComponent = P.make()
+    let pluginComponent = buildPluginInScope(~makePlugin=P.make, ~builtInfos)
 
     ReventlessCore.Plugin_Helpers.onPluginBuiltHook.contents = existingBuiltHook
 
@@ -2301,7 +2158,6 @@ module MakeWithConfig = (
           ->JSON.Encode.array
         },
       )
-      queryResolvers->Dict.set("Platform_ApiFragments", apiFragmentsQueryResolver)
       // Platform_ComponentDefinitions resolver — SDL is already stitched into baseParts via
       // AdminApi.baseFragment so we register only the resolver here. Uses the shared
       // encoder so the dynamic-plugin admin server emits the same canonical shape as