@reventlessdev/reventless-core 3.0.0-alpha.238 → 3.0.0-alpha.240

package/src/plugin/component/SchemaWalker.res

@@ -10,7 +10,7 @@ open Plugin_BuiltHook
 
 // ---------------------------------------------------------------------------
 // Type description — maps a sury schema node to a human-readable string.
-// Optional fields in sury are Union({anyOf}) containing Null or Undefined.
+// Optional fields in sury are AnyOf({anyOf}) containing Null or Undefined.
 // ---------------------------------------------------------------------------
 let rec describeSchema = (schema: S.t<unknown>): string =>
   switch schema {
@@ -20,7 +20,7 @@ let rec describeSchema = (schema: S.t<unknown>): string =>
   | Boolean(_) => "bool"
   | BigInt(_) => "bigint"
   | Null(_) => "null"
-  | Union({anyOf}) =>
+  | AnyOf({anyOf}) =>
     // Nullable/optional field: Union of Null/Undefined + one real type.
     let nonNull = anyOf->Array.filter(v =>
       switch v {
@@ -58,7 +58,7 @@ let rec describeSchema = (schema: S.t<unknown>): string =>
 // (Union containing Null or Undefined).
 let isOptionalSchema = (schema: S.t<unknown>): bool =>
   switch schema {
-  | Union({anyOf}) =>
+  | AnyOf({anyOf}) =>
     anyOf->Array.some(v =>
       switch v {
       | Null(_) | Undefined(_) => true
@@ -112,11 +112,11 @@ let hashConstructors = (ctors: array<constructorSchema>): string => {
 // ---------------------------------------------------------------------------
 // TAG item helper — extracts the const string value from a TAG schema item.
 // ---------------------------------------------------------------------------
-let tagConstOf = (items: array<S.item>): option<string> =>
-  items
-  ->Array.find(item => item.location == "TAG")
-  ->Option.flatMap(item =>
-    switch item.schema {
+let tagConstOf = (properties: dict<S.t<unknown>>): option<string> =>
+  properties
+  ->Dict.get("TAG")
+  ->Option.flatMap(schema =>
+    switch schema {
     | String({const: ?Some(v)}) => Some(v)
     | _ => None
     }
@@ -135,7 +135,7 @@ let walkSchema = (typeName: string, schema: S.t<unknown>): typeSchema =>
       fields,
       structuralHash: hashFields(fields),
     }
-  | Union({anyOf}) =>
+  | AnyOf({anyOf}) =>
     // Check if this is a nullable scalar vs. a true variant union.
     let hasNullLike = anyOf->Array.some(v =>
       switch v {
@@ -150,8 +150,8 @@ let walkSchema = (typeName: string, schema: S.t<unknown>): typeSchema =>
       let constructors =
         anyOf->Array.filterMap(variantSchema =>
           switch variantSchema {
-          | Object({items, properties}) =>
-            tagConstOf(items)->Option.map(name => {
+          | Object({properties}) =>
+            tagConstOf(properties)->Option.map(name => {
               name,
               fields: extractFields(properties),
             })

package/src/plugin/component/SchemaWalker.res.mjs

@@ -25,7 +25,7 @@ function describeSchema(schema) {
     case "object" :
       let inner = Object.entries(schema.properties).filter(param => param[0] !== "TAG").toSorted((param, param$1) => Primitive_string.compare(param[0], param$1[0])).map(param => param[0] + ":" + describeSchema(param[1])).join(",");
       return "{" + inner + "}";
-    case "union" :
+    case "anyOf" :
       let nonNull = schema.anyOf.filter(v => {
         switch (v.type) {
           case "null" :
@@ -47,7 +47,7 @@ function describeSchema(schema) {
 }
 
 function isOptionalSchema(schema) {
-  if (schema.type === "union") {
+  if (schema.type === "anyOf") {
     return schema.anyOf.some(v => {
       switch (v.type) {
         case "null" :
@@ -100,13 +100,12 @@ function hashConstructors(ctors) {
   });
 }
 
-function tagConstOf(items) {
-  return Stdlib_Option.flatMap(items.find(item => item.location === "TAG"), item => {
-    let match = item.schema;
-    if (match.type !== "string") {
+function tagConstOf(properties) {
+  return Stdlib_Option.flatMap(properties["TAG"], schema => {
+    if (schema.type !== "string") {
       return;
     }
-    let v = match.const;
+    let v = schema.const;
     if (v !== undefined) {
       return v;
     }
@@ -123,7 +122,7 @@ function walkSchema(typeName, schema) {
         fields: fields,
         structuralHash: hashFields(fields)
       };
-    case "union" :
+    case "anyOf" :
       let anyOf = schema.anyOf;
       let hasNullLike = anyOf.some(v => {
         switch (v.type) {
@@ -147,7 +146,7 @@ function walkSchema(typeName, schema) {
           return;
         }
         let properties = variantSchema.properties;
-        return Stdlib_Option.map(tagConstOf(variantSchema.items), name => ({
+        return Stdlib_Option.map(tagConstOf(properties), name => ({
           name: name,
           fields: extractFields(properties)
         }));

package/src/plugin/connect/PluginExtensionPoint_Plugin.res.mjs

@@ -1,6 +1,6 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_JsExn from "@rescript/runtime/lib/es6/Stdlib_JsExn.js";
 import * as Id$Reventless from "@reventlessdev/reventless-spec/src/types/Id.res.mjs";
 import * as Primitive_int from "@rescript/runtime/lib/es6/Primitive_int.js";
@@ -79,19 +79,6 @@ function Make(Spec) {
   };
   let directiveHandler = async (createSchedule, deleteSchedule, queryEngine, directive) => {
     switch (directive.TAG) {
-      case "CreateDisconnectSchedule" :
-        let id = directive._0;
-        return await createSchedule({
-          name: disconnectScheduleName(id),
-          rate: ScheduleOps$ReventlessCore.minutesFromNow(directive._1),
-          payload: JSON.stringify(Message$ReventlessCore.encodeCommand$p({
-            id: id,
-            meta: Message$ReventlessCore.generateMeta(PluginExtensionPointSpec$ReventlessInfra.name, undefined, "Scheduler", undefined, undefined, undefined, undefined, undefined),
-            command: "DisconnectPlugin"
-          }, S.string, PluginExtensionPointSpec$ReventlessInfra.commandSchema))
-        });
-      case "DeleteDisconnectSchedule" :
-        return await deleteSchedule(disconnectScheduleName(directive._0));
       case "DoConnectPlugin" :
         let fn = Spec.manageSubscriptions;
         if (fn !== undefined) {
@@ -117,6 +104,19 @@ function Make(Spec) {
       case "ForwardCommand" :
         let match = directive._0;
         return await forwardCommand(match.id, match.command, match.extensionPointName, queryEngine);
+      case "CreateDisconnectSchedule" :
+        let id = directive._0;
+        return await createSchedule({
+          name: disconnectScheduleName(id),
+          rate: ScheduleOps$ReventlessCore.minutesFromNow(directive._1),
+          payload: JSON.stringify(Message$ReventlessCore.encodeCommand$p({
+            id: id,
+            meta: Message$ReventlessCore.generateMeta(PluginExtensionPointSpec$ReventlessInfra.name, undefined, "Scheduler", undefined, undefined, undefined, undefined, undefined),
+            command: "DisconnectPlugin"
+          }, Sury.string, PluginExtensionPointSpec$ReventlessInfra.commandSchema))
+        });
+      case "DeleteDisconnectSchedule" :
+        return await deleteSchedule(disconnectScheduleName(directive._0));
     }
   };
   let mapIncomingCommand = (id, cmd, _meta) => {
@@ -380,4 +380,4 @@ export {
   Make,
   moduleUrl,
 }
-/* S Not a pure module */
+/* sury Not a pure module */

package/src/plugin/lifecycle/PluginBehavior.res.mjs

@@ -1,26 +1,26 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Stdlib_Array from "@rescript/runtime/lib/es6/Stdlib_Array.js";
 import * as Primitive_object from "@rescript/runtime/lib/es6/Primitive_object.js";
 import * as Plugin$Reventless from "@reventlessdev/reventless-spec/src/components/Plugin.res.mjs";
 import * as Plugin$ReventlessCore from "../component/Plugin.res.mjs";
 
-let versionStatusSchema = S.union([
-  S.literal("Connected"),
-  S.literal("Disconnected"),
-  S.literal("Inactive"),
-  S.literal("Retired")
+let versionStatusSchema = Sury.union([
+  Sury.literal("Connected"),
+  Sury.literal("Disconnected"),
+  Sury.literal("Inactive"),
+  Sury.literal("Retired")
 ]);
 
-let knownVersionSchema = S.schema(s => ({
+let knownVersionSchema = Sury.$schema(s => ({
   definition: s.m(Plugin$Reventless.pluginDefinitionSchema),
   status: s.m(versionStatusSchema)
 }));
 
-let stateSchema = S.schema(s => ({
-  current: s.m(S.option(Plugin$Reventless.versionSchema)),
-  known: s.m(S.dict(knownVersionSchema))
+let stateSchema = Sury.$schema(s => ({
+  current: s.m(Sury.$option(Plugin$Reventless.versionSchema)),
+  known: s.m(Sury.dict(knownVersionSchema))
 }));
 
 let initialState_known = {};
@@ -119,23 +119,56 @@ function promoteEvents(state, v) {
 
 function decide(state, command) {
   switch (command.TAG) {
-    case "Heartbeat" :
-      let v = command._0;
+    case "Connect" :
+      let def = command._0;
+      let v = def.version;
       let match = state.known[v];
-      if (match === undefined) {
+      if (match !== undefined && match.status === "Connected") {
+        if (Primitive_object.equal(match.definition, def)) {
+          return {
+            TAG: "Ok",
+            _0: []
+          };
+        } else {
+          return {
+            TAG: "Ok",
+            _0: [{
+                TAG: "VersionConnected",
+                _0: def
+              }]
+          };
+        }
+      } else {
+        return {
+          TAG: "Ok",
+          _0: connectEvents(state, v, def)
+        };
+      }
+    case "ReportIncompatibility" :
+      return {
+        TAG: "Ok",
+        _0: [{
+            TAG: "IncompatiblePluginDetected",
+            _0: command._0
+          }]
+      };
+    case "Heartbeat" :
+      let v$1 = command._0;
+      let match$1 = state.known[v$1];
+      if (match$1 === undefined) {
         return {
           TAG: "Ok",
           _0: [{
               TAG: "VersionDetected",
-              _0: v
+              _0: v$1
             }]
         };
       }
-      switch (match.status) {
+      switch (match$1.status) {
         case "Disconnected" :
           return {
             TAG: "Ok",
-            _0: connectEvents(state, v, match.definition)
+            _0: connectEvents(state, v$1, match$1.definition)
           };
         case "Connected" :
         case "Inactive" :
@@ -146,25 +179,25 @@ function decide(state, command) {
           };
       }
     case "Redetect" :
-      let v$1 = command._0;
-      let match$1 = state.known[v$1];
-      if (match$1 === undefined) {
+      let v$2 = command._0;
+      let match$2 = state.known[v$2];
+      if (match$2 === undefined) {
         return {
           TAG: "Ok",
           _0: [{
               TAG: "VersionDetected",
-              _0: v$1
+              _0: v$2
             }]
         };
       }
-      switch (match$1.status) {
+      switch (match$2.status) {
         case "Connected" :
         case "Disconnected" :
           return {
             TAG: "Ok",
             _0: [{
                 TAG: "VersionDetected",
-                _0: v$1
+                _0: v$2
               }]
           };
         case "Inactive" :
@@ -174,31 +207,6 @@ function decide(state, command) {
             _0: []
           };
       }
-    case "Connect" :
-      let def = command._0;
-      let v$2 = def.version;
-      let match$2 = state.known[v$2];
-      if (match$2 !== undefined && match$2.status === "Connected") {
-        if (Primitive_object.equal(match$2.definition, def)) {
-          return {
-            TAG: "Ok",
-            _0: []
-          };
-        } else {
-          return {
-            TAG: "Ok",
-            _0: [{
-                TAG: "VersionConnected",
-                _0: def
-              }]
-          };
-        }
-      } else {
-        return {
-          TAG: "Ok",
-          _0: connectEvents(state, v$2, def)
-        };
-      }
     case "Disconnect" :
       let v$3 = command._0;
       let match$3 = state.known[v$3];
@@ -309,14 +317,6 @@ function decide(state, command) {
           }].concat(promoteEvents(state, v$5))
       };
       break;
-    case "ReportIncompatibility" :
-      return {
-        TAG: "Ok",
-        _0: [{
-            TAG: "IncompatiblePluginDetected",
-            _0: command._0
-          }]
-      };
     case "Retire" :
       let v$6 = command._0;
       let match$7 = state.known[v$6];

package/src/plugin/lifecycle/PluginSpec.res

@@ -2,29 +2,44 @@
 
 open Reventless.Plugin
 
+// Alias, not `open`: the PPX strips `@transition` before the typechecker, so the
+// state constructors never reach it and an `open` would warn as unused.
+module Plugins = PluginsReadModelSpec
+
 // The Plugin aggregate is keyed by plugin **name** (not name@version). One
 // instance owns the whole lifecycle of every version of that name, deciding
 // supersession synchronously. Version-scoped commands carry the `version`
 // the transition targets; the ExtensionPoint→Plugin mapping supplies it
 // (translated from the transport-level `name@version` id — Approach 1).
+// Order is load-bearing: sury strands constructors declared after a run of two or
+// more same-shaped ones, so the `pluginDefinition` pair must lead (DZakh/sury#392).
 @schema
 type command =
+  // The handshake brings the version's row into being, so it runs from no state
+  // — `decide` accepts it against an unknown version and against every status
+  // but `Connected`, where it is a definition refresh rather than a move.
+  | @noApi @transition(() => Plugins.Connected) Connect(pluginDefinition)
+  // Records a protocol-version incompatibility without changing connection state.
+  | @noApi ReportIncompatibility(pluginDefinition)
   | @noApi Heartbeat(version)
   // Deploy-time re-detect (from RedetectPlugin). Forces the connect handshake to
   // re-run for an already-connected version so its definition is refreshed on the
   // row — unlike Heartbeat, which no-ops a connected keep-alive.
   | @noApi Redetect(version)
-  | @noApi Connect(pluginDefinition)
-  | @noApi Disconnect(version)
+  // A heartbeat timing out is the only way a row reaches `Disconnected`, and
+  // `decide` moves the row for exactly one status — anything else is a stray
+  // disconnect it tolerates without emitting.
+  | @noApi @transition(([Plugins.Connected]) => Plugins.Disconnected) Disconnect(version)
   // Admin lifecycle commands — API-exposed (auto-derived admin mutations,
   // Cognito group-gated). `version` selects which known version to act on.
-  | Activate(version)
-  | Deactivate(version)
-  // Records a protocol-version incompatibility without changing connection state.
-  | @noApi ReportIncompatibility(pluginDefinition)
+  // The `@transition` edges must agree with `decide` below; `Platform_Admin_Structure`
+  // reads them off this schema rather than restating them.
+  | @transition(([Plugins.Inactive, Plugins.Retired]) => Plugins.Connected) Activate(version)
+  | @transition(([Plugins.Connected, Plugins.Disconnected]) => Plugins.Inactive) Deactivate(version)
   // Manual admin retirement of a specific version (archive). Distinct from the
   // automatic `Superseded` transition (which is decided, not commanded).
-  | Retire(version)
+  | @transition(([Plugins.Connected, Plugins.Disconnected, Plugins.Inactive]) => Plugins.Retired)
+  Retire(version)
 
 // Carries both the superseded and the superseding version's full definition —
 // a deterministic trigger for version-to-version schema/data migrations

package/src/plugin/lifecycle/PluginSpec.res.mjs

@@ -1,103 +1,155 @@
 // Generated by ReScript, PLEASE EDIT WITH CARE
 
-import * as S from "sury/src/S.res.mjs";
+import * as Sury from "sury";
 import * as Plugin$Reventless from "@reventlessdev/reventless-spec/src/components/Plugin.res.mjs";
 import * as Api$ReventlessInfra from "@reventlessdev/reventless-infra/src/components/Api.res.mjs";
 
-let commandSchema = S.union([
-  S.schema(s => ({
+let commandSchema = Sury.union([
+  Sury.$schema(s => ({
+    TAG: "Connect",
+    _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
+  })),
+  Sury.$schema(s => ({
+    TAG: "ReportIncompatibility",
+    _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
+  })),
+  Sury.$schema(s => ({
     TAG: "Heartbeat",
     _0: s.m(Plugin$Reventless.versionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Redetect",
     _0: s.m(Plugin$Reventless.versionSchema)
   })),
-  S.schema(s => ({
-    TAG: "Connect",
-    _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
-  })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Disconnect",
     _0: s.m(Plugin$Reventless.versionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Activate",
     _0: s.m(Plugin$Reventless.versionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Deactivate",
     _0: s.m(Plugin$Reventless.versionSchema)
   })),
-  S.schema(s => ({
-    TAG: "ReportIncompatibility",
-    _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
-  })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "Retire",
     _0: s.m(Plugin$Reventless.versionSchema)
   }))
 ]);
 
-let versionSupersededDataSchema = S.schema(s => ({
+let versionSupersededDataSchema = Sury.$schema(s => ({
   supersededVersion: s.m(Plugin$Reventless.versionSchema),
   supersededDefinition: s.m(Plugin$Reventless.pluginDefinitionSchema),
   newVersion: s.m(Plugin$Reventless.versionSchema),
   newDefinition: s.m(Plugin$Reventless.pluginDefinitionSchema)
 }));
 
-let eventSchema = S.union([
-  S.schema(s => ({
+let eventSchema = Sury.union([
+  Sury.$schema(s => ({
     TAG: "VersionDetected",
     _0: s.m(Plugin$Reventless.versionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionConnected",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionSuperseded",
     _0: s.m(versionSupersededDataSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionPromoted",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionDisconnected",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionActivated",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionDeactivated",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "VersionRetired",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   })),
-  S.schema(s => ({
+  Sury.$schema(s => ({
     TAG: "IncompatiblePluginDetected",
     _0: s.m(Plugin$Reventless.pluginDefinitionSchema)
   }))
 ]);
 
-let errorSchema = S.union([
-  S.literal("UnknownVersion"),
-  S.literal("AlreadyConnected"),
-  S.literal("IsDisconnected"),
-  S.literal("IsInactive")
+let errorSchema = Sury.union([
+  Sury.literal("UnknownVersion"),
+  Sury.literal("AlreadyConnected"),
+  Sury.literal("IsDisconnected"),
+  Sury.literal("IsInactive")
 ]);
 
 let commandSchema$1 = Api$ReventlessInfra.markNoApiVariants(commandSchema, [
+  "Connect",
+  "ReportIncompatibility",
   "Heartbeat",
   "Redetect",
-  "Connect",
-  "Disconnect",
-  "ReportIncompatibility"
+  "Disconnect"
+]);
+
+let commandSchema$2 = Api$ReventlessInfra.markAllowedStates(commandSchema$1, [
+  [
+    "Disconnect",
+    ["Connected"]
+  ],
+  [
+    "Activate",
+    [
+      "Inactive",
+      "Retired"
+    ]
+  ],
+  [
+    "Deactivate",
+    [
+      "Connected",
+      "Disconnected"
+    ]
+  ],
+  [
+    "Retire",
+    [
+      "Connected",
+      "Disconnected",
+      "Inactive"
+    ]
+  ]
+]);
+
+let commandSchema$3 = Api$ReventlessInfra.markTargetState(commandSchema$2, [
+  [
+    "Connect",
+    "Connected"
+  ],
+  [
+    "Disconnect",
+    "Disconnected"
+  ],
+  [
+    "Activate",
+    "Connected"
+  ],
+  [
+    "Deactivate",
+    "Inactive"
+  ],
+  [
+    "Retire",
+    "Retired"
+  ]
 ]);
 
 function commandAuthorization(param) {
@@ -108,15 +160,18 @@ let name = "Plugin";
 
 let Id;
 
+let Plugins;
+
 let moduleUrl = "@reventlessdev/reventless-core/src/plugin/lifecycle/PluginSpec.res.mjs";
 
 export {
   name,
   Id,
+  Plugins,
   versionSupersededDataSchema,
   eventSchema,
   errorSchema,
-  commandSchema$1 as commandSchema,
+  commandSchema$3 as commandSchema,
   moduleUrl,
   commandAuthorization,
 }