foldkit 0.148.1 → 0.148.2-canary.85e5fda4e854

package/dist/runtime/runtime.js

@@ -206,13 +206,10 @@ const hydrationForRoot = (root, isFlagsRequired) => {
 // id (a descendant `id="root"`) and `getElementById` returned that inner element
 // instead of the stamped root above it. That inner element resolves to the app
 // root only when the page has exactly one stamped root and this container sits
-// inside it, so a sibling widget (a stamped root the container is not inside) or
-// an outer application's root (when a nested page carries more than one stamped
-// root) is never wrongly adopted; those fall through to a fresh boot or a hard
-// failure instead. A null container is the replace-parity case, where the server
-// root took the placeholder's place and `getElementById` no longer finds it, so
-// the stamp is the only handle; more than one stamped root is then ambiguous and
-// a hard error rather than a silent wrong-DOM adoption.
+// inside it. A container outside that root is a refused handoff, not a fresh
+// application beside server markup that remains live. A null container is the
+// replace-parity case, where the server root took the placeholder's place and
+// `getElementById` no longer finds it, so the stamp is the only handle.
 // A runtime id names one application for the whole page: it pairs a root with
 // its Flags payload, and it keys the Model and scroll position hot reloading
 // preserves. Two roots sharing one are not two applications but one claimed
@@ -227,18 +224,42 @@ const assertRuntimeIdsAreUnique = (stampedRoots) => {
     const seen = new Set();
     for (const root of stampedRoots) {
         const runtimeId = root.getAttribute(FOLDKIT_APP_ATTRIBUTE) ?? '';
+        if (runtimeId === '') {
+            containRefusedPage(root.ownerDocument);
+            throw new Error('[foldkit] Found a server-rendered root with an empty ' +
+                `\`${FOLDKIT_APP_ATTRIBUTE}\` stamp. A hydratable root must carry ` +
+                'a nonempty runtime id so the runtime can pair it with its Flags ' +
+                'payload and preserved HMR state.');
+        }
+        if (!root.ownerDocument.body?.contains(root)) {
+            containRefusedPage(root.ownerDocument);
+            throw new Error('[foldkit] Found a server-rendered root outside the document body. ' +
+                'Runtime.hydrate supports one page-owning application in the ' +
+                'document light DOM. Do not hydrate a root in the head, a shadow ' +
+                'tree, or a detached subtree.');
+        }
         if (seen.has(runtimeId)) {
             containRefusedPage(root.ownerDocument);
             throw new Error(`[foldkit] Found more than one server-rendered root stamped ` +
                 `"${runtimeId}". A runtime id names one application for the whole ` +
                 'page: it pairs a root with its Flags payload and keys the Model and ' +
                 'scroll position hot reloading preserves, so two roots sharing one ' +
-                "would take each other's state. Render each application with its " +
-                'own `runtimeId`.');
+                "would take each other's state. Remove the duplicate root. Foldkit " +
+                'hydrates one page-owning application per document.');
         }
         seen.add(runtimeId);
     }
 };
+const assertSinglePageApplication = (stampedRoots) => {
+    if (stampedRoots.length > 1) {
+        containRefusedPage(document);
+        throw new Error('[foldkit] Found more than one page-owning application stamped with ' +
+            `\`${FOLDKIT_APP_ATTRIBUTE}\`. Hydrating multiple applications in ` +
+            'one document is not supported: each application owns the document ' +
+            'metadata and installs document-wide navigation listeners. Render ' +
+            'one application per page.');
+    }
+};
 // The reason this page cannot be adopted by this client, or `undefined` when
 // the two name the same deployment.
 //
@@ -290,16 +311,28 @@ const preventRefusalShieldInteraction = (event) => {
     event.preventDefault();
     event.stopImmediatePropagation();
 };
+// NOTE: `showModal` throws when the owning document is not fully active. A
+// foreign or detached document still needs the original Foldkit refusal rather
+// than a browser exception from its containment UI.
+const tryOpenRefusalShieldAsModal = (shield) => {
+    if (typeof shield.showModal !== 'function') {
+        return false;
+    }
+    try {
+        shield.showModal();
+        return true;
+    }
+    catch {
+        return false;
+    }
+};
 const openRefusalShield = (shield) => {
     shield.inert = true;
     shield.setAttribute('inert', '');
     if (shield.open && typeof shield.close === 'function') {
         shield.close();
     }
-    if (typeof shield.showModal === 'function') {
-        shield.showModal();
-    }
-    else {
+    if (!tryOpenRefusalShieldAsModal(shield)) {
         shield.setAttribute('open', '');
     }
     shield.inert = false;
@@ -373,28 +406,46 @@ const hasServerRenderedMarkup = (ownerDocument) => ownerDocument.querySelector(`
 const findDocumentHydration = (container, isFlagsRequired) => {
     const stampedRoots = Array.fromIterable(document.querySelectorAll(`[${FOLDKIT_APP_ATTRIBUTE}]`));
     assertRuntimeIdsAreUnique(stampedRoots);
+    assertSinglePageApplication(stampedRoots);
     if (container !== null) {
+        const stampedAncestor = container.closest(`[${FOLDKIT_APP_ATTRIBUTE}]`);
         if (container.hasAttribute(FOLDKIT_APP_ATTRIBUTE)) {
+            const isDocumentRoot = Option.match(Array.head(stampedRoots), {
+                onNone: () => false,
+                onSome: root => root === container,
+            });
+            if (!isDocumentRoot) {
+                containRefusedPage(container.ownerDocument);
+                throw new Error('[foldkit] Runtime.hydrate received a stamped container that is ' +
+                    'not the single server root in the document light DOM. Hydration ' +
+                    'supports one page-owning application under the document body. ' +
+                    'Do not hydrate a root in a shadow tree or detached subtree.');
+            }
             return hydrationForRoot(container, isFlagsRequired);
         }
         return Array.match(stampedRoots, {
-            onEmpty: () => undefined,
+            onEmpty: () => {
+                if (stampedAncestor === null) {
+                    return undefined;
+                }
+                containRefusedPage(container.ownerDocument);
+                throw new Error('[foldkit] Runtime.hydrate received a container under a stamped ' +
+                    'root outside the document body light DOM. Do not hydrate a root ' +
+                    'in a shadow tree, detached subtree, or another document.');
+            },
             onNonEmpty: roots => {
                 const onlyRoot = Array.headNonEmpty(roots);
-                return roots.length === 1 &&
-                    container.closest(`[${FOLDKIT_APP_ATTRIBUTE}]`) === onlyRoot
-                    ? hydrationForRoot(onlyRoot, isFlagsRequired)
-                    : undefined;
+                if (stampedAncestor === onlyRoot) {
+                    return hydrationForRoot(onlyRoot, isFlagsRequired);
+                }
+                containRefusedPage(container.ownerDocument);
+                throw new Error('[foldkit] Runtime.hydrate received a container outside the ' +
+                    "document's server-rendered application root. A page-owning " +
+                    'application must adopt that single root rather than boot beside ' +
+                    'server markup it does not own.');
             },
         });
     }
-    if (stampedRoots.length > 1) {
-        containRefusedPage(document);
-        throw new Error('[foldkit] Found multiple server-rendered roots stamped with ' +
-            `\`${FOLDKIT_APP_ATTRIBUTE}\` but no container to disambiguate them. ` +
-            'Give each app its own container element so the runtime can tell ' +
-            'which root to hydrate.');
-    }
     return Option.match(Array.head(stampedRoots), {
         onNone: () => undefined,
         onSome: root => hydrationForRoot(root, isFlagsRequired),
@@ -2087,10 +2138,11 @@ export function run(program, options) {
  *  of building it fresh. Use this as the client entry for a page served by
  *  `renderToString`: the first render attaches to the stamped root, keeps the
  *  existing nodes, and reconstructs the Model from the Flags the server
- *  embedded. The handoff is strict: a missing server root, a root stamped more
- *  than once, more than one root with no container to choose between them, a
- *  missing Flags payload, an undecodable payload, or a page from another
- *  deployment terminates startup. Every one of those contains the page first:
+ *  embedded. The handoff is strict: a missing server root, an empty or
+ *  duplicated root stamp, more than one stamped root, a requested root outside
+ *  the document body light DOM, a missing Flags payload, an undecodable
+ *  payload, or a page from another deployment terminates startup. Every one of
+ *  those contains the page first:
  *  the document's body is marked `inert` and a nondismissable modal shield is
  *  opened above existing top-layer content, so pointer and physical keyboard
  *  input do not activate same-document native links, forms, or controls.

package/dist/schema/index.d.ts

@@ -5,21 +5,65 @@ export type CallableTaggedStruct<Tag extends string, Fields extends S.Struct.Fie
 } & Fields>> : (value: Parameters<S.TaggedStruct<Tag, Fields>['make']>[0]) => Types.Simplify<S.Struct.Type<{
     readonly _tag: S.tag<Tag>;
 } & Fields>>);
+type TaggedUnionProperty = keyof S.TaggedUnion<{}>;
+type MessageVariantNameCollision<Name extends PropertyKey> = Readonly<{
+    'Message variant names must not conflict with Schema.TaggedUnion properties': Name;
+}>;
+type ValidateMessageVariantNames<CasesByTag extends Record<string, S.Struct.Fields>> = Extract<keyof CasesByTag, TaggedUnionProperty> extends infer Name ? [Name] extends [never] ? unknown : MessageVariantNameCollision<Name & PropertyKey> : never;
+type TaggedMessageUnion<CasesByTag extends Record<string, S.Struct.Fields>> = S.TaggedUnion<{
+    readonly [Tag in keyof CasesByTag & string]: S.TaggedStruct<Tag, CasesByTag[Tag]>;
+}>;
+interface MessageSchema<CasesByTag extends Record<string, S.Struct.Fields>> extends S.BottomLazy<TaggedMessageUnion<CasesByTag>['ast'], MessageSchema<CasesByTag>> {
+    readonly Type: TaggedMessageUnion<CasesByTag>['Type'];
+    readonly Encoded: TaggedMessageUnion<CasesByTag>['Encoded'];
+    readonly DecodingServices: TaggedMessageUnion<CasesByTag>['DecodingServices'];
+    readonly EncodingServices: TaggedMessageUnion<CasesByTag>['EncodingServices'];
+    readonly '~type.make.in': TaggedMessageUnion<CasesByTag>['~type.make.in'];
+    readonly '~type.make': TaggedMessageUnion<CasesByTag>['~type.make'];
+    readonly Iso: TaggedMessageUnion<CasesByTag>['Iso'];
+    readonly match: TaggedMessageUnion<CasesByTag>['match'];
+}
+/** The union `defineMessageUnion` returns. A Schema with exhaustive matching
+ * and one callable constructor per variant, reachable by tag. */
+export type MessageUnion<CasesByTag extends Record<string, S.Struct.Fields>> = MessageSchema<CasesByTag> & {
+    readonly [Tag in keyof CasesByTag & string]: CallableTaggedStruct<Tag, CasesByTag[Tag]>;
+};
 /**
- * Wraps `Schema.TaggedStruct` to create a message variant you can call directly as a constructor.
- * Use `m` for message types — enabling `ClickedReset()` instead of `ClickedReset.make()`.
+ * Declares a whole Message union from one record of fields per variant, naming
+ * each variant once instead of once per constructor and once in the union list.
+ *
+ * The result is a Schema, so it decodes and nests in a Model. Its focused
+ * Message surface is exhaustive `match` plus one callable constructor per
+ * variant. Each constructor is itself a schema, which is what `Command.define`
+ * needs for its `messages` list.
+ *
+ * Use `Message.match` for exhaustive dispatch. The values are ordinary tagged
+ * objects, so Effect `Match` remains available for partial matching, one
+ * handler over several tags, and fallbacks.
+ *
+ * A Submodel's OutMessage is declared the same way, with variants of its own. A
+ * Message is a fact the Submodel handles; an OutMessage is a fact it reports to
+ * its parent. Sharing one variant between the two unions puts the child's
+ * internal vocabulary in the parent's contract, so declare them separately even
+ * when a pair happens to carry the same fields.
+ *
+ * A variant may not be named after the schema surface it would shadow, such as
+ * `make`, `match`, `cases`, or `ast`. TypeScript reports the conflicting names,
+ * and untyped calls fail with a runtime error.
  *
  * @example
  * ```typescript
- * const ClickedReset = m('ClickedReset')
- * ClickedReset() // { _tag: 'ClickedReset' }
+ * export const Message = defineMessageUnion({
+ *   ClickedReset: {},
+ *   ChangedCount: { count: S.Number },
+ * })
+ * export type Message = typeof Message.Type
  *
- * const ChangedCount = m('ChangedCount', { count: S.Number })
- * ChangedCount({ count: 1 }) // { _tag: 'ChangedCount', count: 1 }
+ * Message.ClickedReset() // { _tag: 'ClickedReset' }
+ * Message.ChangedCount({ count: 1 }) // { _tag: 'ChangedCount', count: 1 }
  * ```
  */
-export declare function m<Tag extends string>(tag: Tag): CallableTaggedStruct<Tag, {}>;
-export declare function m<Tag extends string, Fields extends S.Struct.Fields>(tag: Tag, fields: Fields): CallableTaggedStruct<Tag, Fields>;
+export declare function defineMessageUnion<const CasesByTag extends Record<string, S.Struct.Fields>>(casesByTag: CasesByTag & ValidateMessageVariantNames<CasesByTag>): MessageUnion<CasesByTag>;
 /**
  * Wraps `Schema.TaggedStruct` to create a route variant you can call directly as a constructor.
  * Use `r` for route types — enabling `Home()` instead of `Home.make()`.
@@ -51,4 +95,5 @@ export declare function r<Tag extends string, Fields extends S.Struct.Fields>(ta
  */
 export declare function ts<Tag extends string>(tag: Tag): CallableTaggedStruct<Tag, {}>;
 export declare function ts<Tag extends string, Fields extends S.Struct.Fields>(tag: Tag, fields: Fields): CallableTaggedStruct<Tag, Fields>;
+export {};
 //# sourceMappingURL=index.d.ts.map

package/dist/schema/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAE3C,qIAAqI;AACrI,MAAM,MAAM,oBAAoB,CAC9B,GAAG,SAAS,MAAM,EAClB,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,IAC5B,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,GAC7B,CAAC,MAAM,MAAM,SAAS,KAAK,GACvB,CACE,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,KAC9D,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,CAAC,GAC1E,CACE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KACtD,KAAK,CAAC,QAAQ,CACjB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,CACtD,CAAC,CAAA;AAqBR;;;;;;;;;;;;GAYG;AACH,wBAAgB,CAAC,CAAC,GAAG,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAC9E,wBAAgB,CAAC,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EAClE,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAKpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,CAAC,CAAC,GAAG,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAC9E,wBAAgB,CAAC,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EAClE,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAKpC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,EAAE,CAAC,GAAG,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAC/E,wBAAgB,EAAE,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EACnE,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/schema/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,MAAM,IAAI,CAAC,EAAa,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEzE,qIAAqI;AACrI,MAAM,MAAM,oBAAoB,CAC9B,GAAG,SAAS,MAAM,EAClB,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,IAC5B,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,GAC7B,CAAC,MAAM,MAAM,SAAS,KAAK,GACvB,CACE,KAAK,CAAC,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,KAC9D,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,CAAC,GAC1E,CACE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KACtD,KAAK,CAAC,QAAQ,CACjB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;IAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,MAAM,CAAC,CACtD,CAAC,CAAA;AAwJR,KAAK,mBAAmB,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;AAmBlD,KAAK,2BAA2B,CAAC,IAAI,SAAS,WAAW,IAAI,QAAQ,CAAC;IACpE,4EAA4E,EAAE,IAAI,CAAA;CACnF,CAAC,CAAA;AAEF,KAAK,2BAA2B,CAC9B,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAElD,OAAO,CAAC,MAAM,UAAU,EAAE,mBAAmB,CAAC,SAAS,MAAM,IAAI,GAC7D,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GACpB,OAAO,GACP,2BAA2B,CAAC,IAAI,GAAG,WAAW,CAAC,GACjD,KAAK,CAAA;AAEX,KAAK,kBAAkB,CAAC,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IACxE,CAAC,CAAC,WAAW,CAAC;IACZ,QAAQ,EAAE,GAAG,IAAI,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,CAAC,YAAY,CACzD,GAAG,EACH,UAAU,CAAC,GAAG,CAAC,CAChB;CACF,CAAC,CAAA;AAEJ,UAAU,aAAa,CACrB,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAClD,SAAQ,CAAC,CAAC,UAAU,CACpB,kBAAkB,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,EACrC,aAAa,CAAC,UAAU,CAAC,CAC1B;IACC,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAA;IACrD,QAAQ,CAAC,OAAO,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAA;IAC3D,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC7E,QAAQ,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,CAAA;IAC7E,QAAQ,CAAC,eAAe,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,CAAA;IACzE,QAAQ,CAAC,YAAY,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,YAAY,CAAC,CAAA;IACnE,QAAQ,CAAC,GAAG,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,CAAA;IACnD,QAAQ,CAAC,KAAK,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAA;CACxD;AAED;iEACiE;AACjE,MAAM,MAAM,YAAY,CAAC,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IACzE,aAAa,CAAC,UAAU,CAAC,GAAG;IAC1B,QAAQ,EAAE,GAAG,IAAI,MAAM,UAAU,GAAG,MAAM,GAAG,oBAAoB,CAC/D,GAAG,EACH,UAAU,CAAC,GAAG,CAAC,CAChB;CACF,CAAA;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAgB,kBAAkB,CAChC,KAAK,CAAC,UAAU,SAAS,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAExD,UAAU,EAAE,UAAU,GAAG,2BAA2B,CAAC,UAAU,CAAC,GAC/D,YAAY,CAAC,UAAU,CAAC,CAqB1B;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,CAAC,CAAC,GAAG,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAC9E,wBAAgB,CAAC,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EAClE,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;AAKpC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,EAAE,CAAC,GAAG,SAAS,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,oBAAoB,CAAC,GAAG,EAAE,EAAE,CAAC,CAAA;AAC/E,wBAAgB,EAAE,CAAC,GAAG,SAAS,MAAM,EAAE,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,EACnE,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,MAAM,GACb,oBAAoB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA"}

package/dist/schema/index.js

@@ -1,26 +1,184 @@
-import { Schema as S } from 'effect';
-const makeCallable = (schema) => 
-/* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
-new Proxy(function () { }, {
-    apply(_target, _thisArg, argumentsList) {
-        return schema.make(argumentsList[0] ?? {});
-    },
-    get(_target, property, receiver) {
-        return Reflect.get(schema, property, receiver);
-    },
-    has(_target, property) {
-        return Reflect.has(schema, property);
-    },
-    getPrototypeOf() {
-        return Reflect.getPrototypeOf(schema);
-    },
-});
-export function m(tag, fields = {}) {
-    return makeCallable(S.TaggedStruct(tag, fields));
+import { Array, Match as M, Schema as S, SchemaAST } from 'effect';
+const assignPlainProperty = (output, name, value) => {
+    if (name === '__proto__') {
+        Object.defineProperty(output, name, {
+            value,
+            writable: true,
+            enumerable: true,
+            configurable: true,
+        });
+    }
+    else {
+        output[name] = value;
+    }
+};
+const isDirectlyCopyable = (ast) => {
+    if (ast.checks !== undefined ||
+        ast.encoding !== undefined ||
+        ast.context !== undefined ||
+        ast.annotations?.['parseOptions'] !== undefined) {
+        return false;
+    }
+    return M.value(ast).pipe(M.withReturnType(), M.tagsExhaustive({
+        Declaration: () => false,
+        Null: () => true,
+        Undefined: () => true,
+        Void: () => true,
+        Never: () => true,
+        Unknown: () => true,
+        Any: () => true,
+        String: () => true,
+        Number: () => true,
+        Boolean: () => true,
+        BigInt: () => true,
+        Symbol: () => true,
+        Literal: () => true,
+        UniqueSymbol: () => true,
+        ObjectKeyword: () => true,
+        Enum: () => true,
+        TemplateLiteral: ({ parts }) => parts.every(isDirectlyCopyable),
+        Arrays: () => false,
+        Objects: () => false,
+        Union: ({ mode, types }) => mode !== 'oneOf' && types.every(isDirectlyCopyable),
+        Suspend: () => false,
+    }));
+};
+const getDirectPropertyNames = (propertySignatures) => {
+    const names = [];
+    for (const { name, type } of propertySignatures) {
+        if (name !== '_tag' && !isDirectlyCopyable(SchemaAST.toType(type))) {
+            return undefined;
+        }
+        names.push(name);
+    }
+    return names;
+};
+const makeCallable = (tag, fields) => {
+    const schema = S.TaggedStruct(tag, fields);
+    const propertyNames = Object.hasOwn(fields, '_tag')
+        ? undefined
+        : getDirectPropertyNames(schema.ast.propertySignatures);
+    const make = (value) => schema.make(
+    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+    (value ?? {}));
+    const construct = propertyNames !== undefined
+        ? (value) => {
+            /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+            const input = (value ?? {});
+            if (Object(input) !== input) {
+                return make(value);
+            }
+            const output = {};
+            for (const name of propertyNames) {
+                const descriptor = Object.getOwnPropertyDescriptor(input, name);
+                if (name !== '_tag' &&
+                    descriptor === undefined &&
+                    Reflect.has(input, name)) {
+                    return make(value);
+                }
+                if (descriptor !== undefined && !('value' in descriptor)) {
+                    return make(value);
+                }
+                const inputValue = descriptor === undefined ? undefined : input[name];
+                if (name === '_tag') {
+                    if (inputValue !== undefined && inputValue !== tag) {
+                        return make(value);
+                    }
+                    if (descriptor !== undefined && inputValue === undefined) {
+                        assignPlainProperty(output, name, inputValue);
+                    }
+                    assignPlainProperty(output, name, tag);
+                }
+                else {
+                    assignPlainProperty(output, name, inputValue);
+                }
+            }
+            return output;
+        }
+        : make;
+    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+    return new Proxy(function () { }, {
+        apply(_target, _thisArg, argumentsList) {
+            return construct(argumentsList[0]);
+        },
+        get(_target, property, receiver) {
+            return Reflect.get(schema, property, receiver);
+        },
+        has(_target, property) {
+            return Reflect.has(schema, property);
+        },
+        getPrototypeOf() {
+            return Reflect.getPrototypeOf(schema);
+        },
+    });
+};
+const taggedUnionTypeOnlyPropertyNames = new Set([
+    'Rebuild',
+    '~type.parameters',
+    'Type',
+    'Encoded',
+    'DecodingServices',
+    'EncodingServices',
+    '~type.make.in',
+    '~type.make',
+    '~type.constructor.default',
+    'Iso',
+    '~type.mutability',
+    '~type.optionality',
+    '~encoded.mutability',
+    '~encoded.optionality',
+]);
+/**
+ * Declares a whole Message union from one record of fields per variant, naming
+ * each variant once instead of once per constructor and once in the union list.
+ *
+ * The result is a Schema, so it decodes and nests in a Model. Its focused
+ * Message surface is exhaustive `match` plus one callable constructor per
+ * variant. Each constructor is itself a schema, which is what `Command.define`
+ * needs for its `messages` list.
+ *
+ * Use `Message.match` for exhaustive dispatch. The values are ordinary tagged
+ * objects, so Effect `Match` remains available for partial matching, one
+ * handler over several tags, and fallbacks.
+ *
+ * A Submodel's OutMessage is declared the same way, with variants of its own. A
+ * Message is a fact the Submodel handles; an OutMessage is a fact it reports to
+ * its parent. Sharing one variant between the two unions puts the child's
+ * internal vocabulary in the parent's contract, so declare them separately even
+ * when a pair happens to carry the same fields.
+ *
+ * A variant may not be named after the schema surface it would shadow, such as
+ * `make`, `match`, `cases`, or `ast`. TypeScript reports the conflicting names,
+ * and untyped calls fail with a runtime error.
+ *
+ * @example
+ * ```typescript
+ * export const Message = defineMessageUnion({
+ *   ClickedReset: {},
+ *   ChangedCount: { count: S.Number },
+ * })
+ * export type Message = typeof Message.Type
+ *
+ * Message.ClickedReset() // { _tag: 'ClickedReset' }
+ * Message.ChangedCount({ count: 1 }) // { _tag: 'ChangedCount', count: 1 }
+ * ```
+ */
+export function defineMessageUnion(casesByTag) {
+    const union = S.TaggedUnion(casesByTag);
+    const conflictingNames = Array.filter(Object.keys(casesByTag), name => Reflect.has(union, name) || taggedUnionTypeOnlyPropertyNames.has(name));
+    if (Array.isArrayNonEmpty(conflictingNames)) {
+        throw new Error(`Message variant names conflict with Schema.TaggedUnion properties: ${conflictingNames.join(', ')}`);
+    }
+    const callables = {};
+    for (const [tag, fields] of Object.entries(casesByTag)) {
+        callables[tag] = makeCallable(tag, fields);
+    }
+    /* eslint-disable-next-line @typescript-eslint/consistent-type-assertions */
+    return Object.assign(union, callables);
 }
 export function r(tag, fields = {}) {
-    return makeCallable(S.TaggedStruct(tag, fields));
+    return makeCallable(tag, fields);
 }
 export function ts(tag, fields = {}) {
-    return makeCallable(S.TaggedStruct(tag, fields));
+    return makeCallable(tag, fields);
 }

package/dist/subscription/subscription.d.ts

@@ -225,7 +225,7 @@ type PerEntryGatedLiftedSubscriptions<ParentModel, ParentMessage, Subscriptions,
  *
  * const roomSubscriptions = Subscription.lift(Room.subscriptions)({
  *   toChildModel: (model: Model) => model.room,
- *   toParentMessage: (message: Room.Message.Message): Message =>
+ *   toParentMessage: (message: Room.Message): Message =>
  *     GotRoomMessage({ message }),
  *   when: { roomKeyboard: ({ route }) => route._tag === 'Room' },
  * })

package/dist/subscription/subscription.js

@@ -164,7 +164,7 @@ const toGatedEntry = (subscription, config, when) => {
  *
  * const roomSubscriptions = Subscription.lift(Room.subscriptions)({
  *   toChildModel: (model: Model) => model.room,
- *   toParentMessage: (message: Room.Message.Message): Message =>
+ *   toParentMessage: (message: Room.Message): Message =>
  *     GotRoomMessage({ message }),
  *   when: { roomKeyboard: ({ route }) => route._tag === 'Room' },
  * })

package/dist/test/apps/attributes.d.ts

@@ -1,13 +1,16 @@
-import { Schema as S } from 'effect';
 import type { Attribute, Html, HtmlBuilder } from '../../html/index.js';
-export declare const IgnoredInteraction: import("../../schema/index.js").CallableTaggedStruct<"IgnoredInteraction", {}>;
-export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"IgnoredInteraction", {}>]>;
+export declare const Message: import("../../schema/index.js").MessageUnion<{
+    readonly IgnoredInteraction: {};
+}>;
 export type Message = typeof Message.Type;
 export type Model = Readonly<{
     attribute: Attribute<Message>;
     tagName?: string;
 }>;
-export declare const update: (model: Model, message: Message) => readonly [Model, ReadonlyArray<never>];
+export declare const update: (model: Model, message: Message) => readonly [Readonly<{
+    attribute: Attribute<Message>;
+    tagName?: string;
+}>, readonly never[]];
 export declare const testId = "attribute-host";
 export declare const view: (model: Model, h: HtmlBuilder<Message>) => Html;
 //# sourceMappingURL=attributes.d.ts.map

package/dist/test/apps/attributes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attributes.d.ts","sourceRoot":"","sources":["../../../src/test/apps/attributes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAGhD,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAKvE,eAAO,MAAM,kBAAkB,gFAA0B,CAAA;AAEzD,eAAO,MAAM,OAAO,oGAAgC,CAAA;AACpD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,MAAM,MAAM,KAAK,GAAG,QAAQ,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAC,CAAA;AAIF,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAMrC,CAAA;AAMH,eAAO,MAAM,MAAM,mBAAU,CAAA;AAE7B,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAO5D,CAAA"}
+{"version":3,"file":"attributes.d.ts","sourceRoot":"","sources":["../../../src/test/apps/attributes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAKvE,eAAO,MAAM,OAAO;;EAElB,CAAA;AAEF,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIzC,MAAM,MAAM,KAAK,GAAG,QAAQ,CAAC;IAC3B,SAAS,EAAE,SAAS,CAAC,OAAO,CAAC,CAAA;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,CAAC,CAAA;AAIF,eAAO,MAAM,MAAM,GAAI,OAAO,KAAK,EAAE,SAAS,OAAO;eANxC,SAAS,CAAC,OAAO,CAAC;cACnB,MAAM;qBAQd,CAAA;AAMJ,eAAO,MAAM,MAAM,mBAAU,CAAA;AAE7B,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAO5D,CAAA"}

package/dist/test/apps/attributes.js

@@ -1,13 +1,13 @@
-import { Match as M, Schema as S } from 'effect';
 import { customElement } from '../../html/index.js';
-import { m } from '../../message/index.js';
+import { defineMessageUnion } from '../../message/index.js';
 // MESSAGE
-export const IgnoredInteraction = m('IgnoredInteraction');
-export const Message = S.Union([IgnoredInteraction]);
+export const Message = defineMessageUnion({
+    IgnoredInteraction: {},
+});
 // UPDATE
-export const update = (model, message) => M.value(message).pipe(M.withReturnType(), M.tagsExhaustive({
+export const update = (model, message) => Message.match(message, {
     IgnoredInteraction: () => [model, []],
-}));
+});
 // VIEW
 const TEST_ID = 'attribute-host';
 export const testId = TEST_ID;

package/dist/test/apps/bubbling.d.ts

@@ -5,10 +5,16 @@ export declare const Model: S.Struct<{
     readonly doubleClicks: S.Number;
 }>;
 export type Model = typeof Model.Type;
-declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ClickedContainer", {}>, import("../../schema/index.js").CallableTaggedStruct<"DoubleClickedContainer", {}>]>;
+declare const Message: import("../../schema/index.js").MessageUnion<{
+    readonly ClickedContainer: {};
+    readonly DoubleClickedContainer: {};
+}>;
 type Message = typeof Message.Type;
 export declare const initialModel: Model;
-export declare const update: (model: Model, message: Message) => readonly [Model, ReadonlyArray<never>];
+export declare const update: (model: Model, message: Message) => readonly [{
+    readonly clicks: number;
+    readonly doubleClicks: number;
+}, readonly never[]];
 export declare const view: (model: Model, h: HtmlBuilder<Message>) => Html;
 export {};
 //# sourceMappingURL=bubbling.d.ts.map

package/dist/test/apps/bubbling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bubbling.d.ts","sourceRoot":"","sources":["../../../src/test/apps/bubbling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEhD,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAK5D,eAAO,MAAM,KAAK;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAOrC,QAAA,MAAM,OAAO,sLAAsD,CAAA;AACnE,KAAK,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIlC,eAAO,MAAM,YAAY,EAAE,KAG1B,CAAA;AAID,eAAO,MAAM,MAAM,GACjB,OAAO,KAAK,EACZ,SAAS,OAAO,KACf,SAAS,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAUrC,CAAA;AAIH,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAc5D,CAAA"}
+{"version":3,"file":"bubbling.d.ts","sourceRoot":"","sources":["../../../src/test/apps/bubbling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEpC,OAAO,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAK5D,eAAO,MAAM,KAAK;;;EAGhB,CAAA;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAA;AAIrC,QAAA,MAAM,OAAO;;;EAGX,CAAA;AACF,KAAK,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAIlC,eAAO,MAAM,YAAY,EAAE,KAG1B,CAAA;AAID,eAAO,MAAM,MAAM,GAAI,OAAO,KAAK,EAAE,SAAS,OAAO;;;oBAOjD,CAAA;AAIJ,eAAO,MAAM,IAAI,GAAI,OAAO,KAAK,EAAE,GAAG,WAAW,CAAC,OAAO,CAAC,KAAG,IAc5D,CAAA"}

package/dist/test/apps/bubbling.js

@@ -1,31 +1,32 @@
-import { Match as M, Schema as S } from 'effect';
-import { m } from '../../message/index.js';
+import { Schema as S } from 'effect';
+import { defineMessageUnion } from '../../message/index.js';
 // MODEL
 export const Model = S.Struct({
     clicks: S.Number,
     doubleClicks: S.Number,
 });
 // MESSAGE
-const ClickedContainer = m('ClickedContainer');
-const DoubleClickedContainer = m('DoubleClickedContainer');
-const Message = S.Union([ClickedContainer, DoubleClickedContainer]);
+const Message = defineMessageUnion({
+    ClickedContainer: {},
+    DoubleClickedContainer: {},
+});
 // INIT
 export const initialModel = {
     clicks: 0,
     doubleClicks: 0,
 };
 // UPDATE
-export const update = (model, message) => M.value(message).pipe(M.withReturnType(), M.tagsExhaustive({
+export const update = (model, message) => Message.match(message, {
     ClickedContainer: () => [{ ...model, clicks: model.clicks + 1 }, []],
     DoubleClickedContainer: () => [
         { ...model, doubleClicks: model.doubleClicks + 1 },
         [],
     ],
-}));
+});
 // VIEW
 export const view = (model, h) => {
     return h.div([], [
-        h.div([h.Role('option'), h.OnClick(ClickedContainer())], [h.span([], [`clicks=${model.clicks}`])]),
-        h.div([h.Role('listitem'), h.OnDoubleClick(DoubleClickedContainer())], [h.span([], [`dbl=${model.doubleClicks}`])]),
+        h.div([h.Role('option'), h.OnClick(Message.ClickedContainer())], [h.span([], [`clicks=${model.clicks}`])]),
+        h.div([h.Role('listitem'), h.OnDoubleClick(Message.DoubleClickedContainer())], [h.span([], [`dbl=${model.doubleClicks}`])]),
     ]);
 };

package/dist/test/apps/colorPicker.d.ts

@@ -12,17 +12,18 @@ export declare const Model: S.Struct<{
     readonly color: S.String;
 }>;
 export type Model = typeof Model.Type;
-export declare const ChangedColor: import("../../schema/index.js").CallableTaggedStruct<"ChangedColor", {
-    value: S.String;
+export declare const Message: import("../../schema/index.js").MessageUnion<{
+    readonly ChangedColor: {
+        readonly value: S.String;
+    };
 }>;
-export declare const Message: S.Union<readonly [import("../../schema/index.js").CallableTaggedStruct<"ChangedColor", {
-    value: S.String;
-}>]>;
 export type Message = typeof Message.Type;
 export declare const initialModel: {
     readonly color: string;
 };
-export declare const update: (model: Model, message: Message) => readonly [Model, ReadonlyArray<never>];
+export declare const update: (model: Model, message: Message) => readonly [{
+    readonly color: string;
+}, readonly never[]];
 export declare const view: (model: Model, h: HtmlBuilder<Message>) => Html;
 export declare const viewWithoutHandler: (model: Model, h: HtmlBuilder<Message>) => Html;
 //# sourceMappingURL=colorPicker.d.ts.map