jssm 5.145.6 → 5.147.0

package/dist/wc/instance.define.js

@@ -48,7 +48,15 @@ function define_with_synonym(canonical_tag, synonym_tag, CanonicalClass, Synonym
         customElements.define(synonym_tag, SynonymClass);
 }
 
-/** Thin subclass so `<jssm-instance>` registers under a distinct constructor. */
+/**
+ * Thin subclass so `<jssm-instance>` registers under a distinct constructor.
+ *
+ * @deprecated The `jssm-*` tag and the `JssmInstance` class alias are
+ * deprecated since v5 in favor of the canonical `<fsl-instance>` /
+ * {@link FslInstance}, for fsl.tools brand alignment. They remain functional
+ * but are slated for removal in v6 (tracked in `v6_breaking_changes.json` on
+ * the `v6` branch). New components are `fsl-*`-only.
+ */
 class JssmInstance extends FslInstance {
 }
 define_with_synonym('fsl-instance', 'jssm-instance', FslInstance, JssmInstance);

package/dist/wc/instance.js

@@ -723,10 +723,16 @@ function resolve_fsl_source(host, fsl_attr) {
  * @cssproperty [--current-state] - The machine's current state name as a CSS string token.
  * @slot title - Heading area for the instance.
  * @slot viz - Visualization slot; fallback is a placeholder string.
- * @slot editor - Editor surface slot.
+ * @slot editor - Editor surface slot (`<fsl-editor>`, #659).
  * @slot actions - Slot for action buttons / UI.
- * @slot toolbar - Slot for toolbar UI.
- * @slot info-panel - Slot for an info / status panel.
+ * @slot toolbar - Slot for toolbar UI (`<fsl-toolbar>`, #660).
+ * @slot info-panel - Slot for an info / status panel (`<fsl-info-panel>`, #661).
+ * @slot history - Slot for the visited-state timeline (`<fsl-history>`, #662).
+ * @slot data-inspector - Slot for the typed-data tree view (`<fsl-data-inspector>`, #663).
+ * @slot hook-log - Slot for the hook-firing log (`<fsl-hook-log>`, #664).
+ * @slot effective-properties - Slot for the resolved-properties panel (`<fsl-effective-properties>`, #665).
+ * @slot simulation - Slot for the random-walk simulation (`<fsl-simulation>`, #668).
+ * @slot export - Slot for the export menu (`<fsl-export>`, #667).
  * @slot footer - Footer slot.
  */
 class FslInstance extends LitElement {
@@ -760,6 +766,20 @@ class FslInstance extends LitElement {
          * `connectedCallback`.  Walked in `disconnectedCallback`.
          */
         this._on_unsubscribes = [];
+        /**
+         * Unsubscribe callbacks for the host-level mechanism-4 re-emission
+         * subscriptions installed in {@link _install_event_reemission}.  Distinct
+         * from {@link _on_unsubscribes} (which belongs to `<jssm-on>` children).
+         */
+        this._reemit_unsubscribes = [];
+        /**
+         * Library events captured during the current transition, awaiting DOM
+         * re-dispatch once Lit commits the next render.  Dispatching here (rather
+         * than synchronously from the machine subscription) guarantees the #639
+         * ordering: mechanism 1/3 reflection and mechanism 2 slot re-pick are all
+         * in place before a mechanism-4 listener runs.
+         */
+        this._pending_dom_events = [];
         /**
          * Per-instance registry of named hook handlers consulted before
          * `globalThis` when resolving `<fsl-hook handler="name">` /
@@ -840,8 +860,9 @@ class FslInstance extends LitElement {
         // Step 4: shadow DOM render is automatic via Lit; requesting an update
         // here ensures the first paint sees the freshly painted attributes.
         this.requestUpdate();
-        // TODO #638: subscribe to machine.on('transition', ...) once available
-        //            and dispatch DOM CustomEvents from this element.
+        // #639 mechanism 4: subscribe to library events and re-emit them as
+        // DOM CustomEvents from this host (#638 supplies the event API).
+        this._install_event_reemission();
         // #641: <jssm-hook> declarative discovery.
         this._install_declarative_hooks();
         // #643: <jssm-on> declarative event observation.
@@ -920,14 +941,87 @@ class FslInstance extends LitElement {
         const host_id = this.getAttribute('id');
         return host_id !== null && host_id.length > 0 ? `${host_id}-` : '';
     }
+    /**
+     * Install the mechanism-4 (#639) re-emission subscriptions: one
+     * `machine.on(name, ...)` per entry in {@link REEMITTED_EVENTS}.  Each
+     * captured library event is queued and re-dispatched as a `fsl-<name>` DOM
+     * event after the next render commit (see {@link updated}).
+     *
+     * Subscribing is also what *enables* the gated observation events: the
+     * library suppresses `transition` / `entry` / `exit` / etc. while no
+     * listeners exist (#670), so this host subscription is the bridge that
+     * turns them on.
+     *
+     * The subscription handler paints state reflection eagerly so that a host
+     * driven directly via `host.machine.action(...)` (bypassing {@link do})
+     * still updates its `current-state` attribute and `--current-state`
+     * property.
+     */
+    _install_event_reemission() {
+        const machine = this._machine;
+        for (const name of FslInstance.REEMITTED_EVENTS) {
+            // `as any` collapses the per-event detail typing — the WC is a
+            // schema-erased entry point; per-event payload typing belongs upstream.
+            const off = machine.on(name, (detail) => {
+                this._pending_dom_events.push({ name, detail });
+                this._paint_state_reflection();
+                this.requestUpdate();
+            });
+            this._reemit_unsubscribes.push(off);
+        }
+    }
+    /**
+     * Lit lifecycle.  After every committed render, flush any library events
+     * captured since the last commit as DOM `CustomEvent`s.  Deferring to this
+     * point is what gives mechanism-4 listeners the #639 ordering guarantee:
+     * host attributes (mechanism 1), CSS custom properties (mechanism 3), and
+     * the state-specific slot (mechanism 2) are all current by the time a
+     * `fsl-*` listener runs.
+     *
+     * @param changed - Lit's changed-property map (forwarded to super).
+     */
+    updated(changed) {
+        super.updated(changed);
+        this._flush_pending_dom_events();
+    }
+    /**
+     * Dispatch and clear the queue of pending DOM events.  The queue is
+     * snapshotted and reset *before* dispatching so that a listener which
+     * re-enters the machine (e.g. calls `host.machine.action(...)`
+     * synchronously) enqueues into a fresh batch handled by the next update
+     * cycle, rather than mutating the array mid-iteration.  This is the
+     * documented re-entrancy behavior: re-entrant transitions are deferred,
+     * not dropped.
+     */
+    _flush_pending_dom_events() {
+        if (this._pending_dom_events.length === 0) {
+            return;
+        }
+        const batch = this._pending_dom_events;
+        this._pending_dom_events = [];
+        for (const ev of batch) {
+            this.dispatchEvent(new CustomEvent(`fsl-${ev.name}`, {
+                detail: ev.detail,
+                bubbles: true,
+                composed: true,
+            }));
+        }
+    }
     /**
      * Lifecycle hook.  Cleans up everything the WC installed at connect: hook
      * registrations from `<jssm-hook>`, event subscriptions from `<jssm-on>`,
-     * and DOM listeners from `<jssm-action>` / `data-jssm-action`.
+     * mechanism-4 re-emission subscriptions, and DOM listeners from
+     * `<jssm-action>` / `data-jssm-action`.
      */
     disconnectedCallback() {
         super.disconnectedCallback();
-        // TODO #638: unsubscribe from any direct machine.on(...) handlers added by host.
+        // #639 mechanism 4: release host-level re-emission subscriptions and drop
+        // any events that were queued but not yet flushed.
+        for (const off of this._reemit_unsubscribes) {
+            off();
+        }
+        this._reemit_unsubscribes = [];
+        this._pending_dom_events = [];
         // #641: remove installed hooks.
         if (this._machine !== undefined) {
             const machine = this._machine;
@@ -1083,6 +1177,24 @@ class FslInstance extends LitElement {
         <section class="info-panel">
           <slot name="info-panel"></slot>
         </section>
+        <section class="history">
+          <slot name="history"></slot>
+        </section>
+        <section class="data-inspector">
+          <slot name="data-inspector"></slot>
+        </section>
+        <section class="hook-log">
+          <slot name="hook-log"></slot>
+        </section>
+        <section class="effective-properties">
+          <slot name="effective-properties"></slot>
+        </section>
+        <section class="simulation">
+          <slot name="simulation"></slot>
+        </section>
+        <section class="export">
+          <slot name="export"></slot>
+        </section>
         <section class="state-section">
           <slot name=${state_slot_name}></slot>
         </section>
@@ -1106,6 +1218,21 @@ FslInstance.styles = css `
       font-style: italic;
     }
   `;
+/**
+ * Library event names this WC re-emits as DOM `CustomEvent`s, fulfilling
+ * mechanism 4 of #639.  Each library `machine.on(name, ...)` is bridged to
+ * a `fsl-<name>` DOM event (`composed`, `bubbling`) so slotted content and
+ * outside consumers can observe machine activity declaratively.
+ *
+ * `fsl-` is the canonical prefix (matching the canonical `<fsl-*>` tag
+ * names); the older `jssm-*` event prose in #639 predates that naming flip.
+ * Events are NOT double-emitted under both prefixes — a symmetric listener
+ * would otherwise run twice per machine event.
+ */
+FslInstance.REEMITTED_EVENTS = [
+    'transition', 'entry', 'exit', 'terminal', 'complete',
+    'action', 'rejection', 'override', 'data-change', 'timeout', 'error',
+];
 /**
  * Lit reactive properties declaration.  We declare `fsl` here (rather
  * than via a decorator) so the attribute observation stays explicit and

package/dist/wc/viz.define.js

@@ -48,7 +48,15 @@ function define_with_synonym(canonical_tag, synonym_tag, CanonicalClass, Synonym
         customElements.define(synonym_tag, SynonymClass);
 }
 
-/** Thin subclass so `<jssm-viz>` registers under a distinct constructor. */
+/**
+ * Thin subclass so `<jssm-viz>` registers under a distinct constructor.
+ *
+ * @deprecated The `jssm-*` tag and the `JssmViz` class alias are deprecated
+ * since v5 in favor of the canonical `<fsl-viz>` / {@link FslViz}, for
+ * fsl.tools brand alignment. They remain functional but are slated for
+ * removal in v6 (tracked in `v6_breaking_changes.json` on the `v6` branch).
+ * New components are `fsl-*`-only.
+ */
 class JssmViz extends FslViz {
 }
 define_with_synonym('fsl-viz', 'jssm-viz', FslViz, JssmViz);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jssm",
-  "version": "5.145.6",
+  "version": "5.147.0",
   "engines": {
     "node": ">=10.0.0"
   },
@@ -66,6 +66,11 @@
       "import": "./dist/wc/instance.define.js",
       "default": "./dist/wc/instance.define.js"
     },
+    "./cm6": {
+      "types": "./dist/es6/cm6/fsl_language.d.ts",
+      "import": "./dist/cm6/fsl_language.js",
+      "default": "./dist/cm6/fsl_language.js"
+    },
     "./cdn/viz": "./dist/cdn/viz.js",
     "./cdn/instance": "./dist/cdn/instance.js",
     "./custom-elements.json": "./custom-elements.json"
@@ -98,6 +103,8 @@
     "dist/wc/viz.define.js",
     "dist/wc/instance.js",
     "dist/wc/instance.define.js",
+    "dist/cm6/fsl_language.js",
+    "dist/es6/cm6/fsl_language.d.ts",
     "dist/cdn/viz.js",
     "dist/cdn/instance.js",
     "dist/cli/lib.cjs",
@@ -145,12 +152,13 @@
     "make_wc_viz_cdn": "rollup -c rollup.config.wc.viz.cdn.js",
     "make_wc_instance_es6": "rollup -c rollup.config.wc.instance.es6.js",
     "make_wc_instance_cdn": "rollup -c rollup.config.wc.instance.cdn.js",
+    "make_cm6": "rollup -c rollup.config.cm6.es6.js",
     "typescript": "tsc --build tsconfig.json",
     "makever": "node src/buildjs/makever.cjs",
     "make_doctests": "node src/buildjs/extract_examples.cjs",
     "prep": "npm run makever && npm run peg",
-    "make": "npm run clean && npm run makever && npm run peg && npm run build:cem && npm run typescript && npm run make_doctests && npm run make_core && npm run make_deno && npm run make_viz && npm run make_wc_viz_es6 && npm run make_wc_viz_cdn && npm run make_wc_instance_es6 && npm run make_wc_instance_cdn && npm run typecheck_cli && npm run make_cli && npm run minify && npm run min_iife && npm run min_es6 && npm run min_cjs && npm run min_deno && npm run min_viz_iife && npm run min_viz_es6 && npm run min_viz_cjs && npm run min_cli && rm ./dist/es6/*.nonmin.js",
-    "make_ci": "npm run clean && npm run makever && npm run peg && npm run build:cem && npm run typescript && npm run make_doctests && npm run make_wc_viz_es6 && npm run make_wc_viz_cdn && npm run make_wc_instance_es6 && npm run make_wc_instance_cdn && npm run typecheck_cli && npm run make_cli",
+    "make": "npm run clean && npm run makever && npm run peg && npm run build:cem && npm run typescript && npm run make_doctests && npm run make_core && npm run make_deno && npm run make_viz && npm run make_wc_viz_es6 && npm run make_wc_viz_cdn && npm run make_wc_instance_es6 && npm run make_wc_instance_cdn && npm run make_cm6 && npm run typecheck_cli && npm run make_cli && npm run minify && npm run min_iife && npm run min_es6 && npm run min_cjs && npm run min_deno && npm run min_viz_iife && npm run min_viz_es6 && npm run min_viz_cjs && npm run min_cli && rm ./dist/es6/*.nonmin.js",
+    "make_ci": "npm run clean && npm run makever && npm run peg && npm run build:cem && npm run typescript && npm run make_doctests && npm run make_wc_viz_es6 && npm run make_wc_viz_cdn && npm run make_wc_instance_es6 && npm run make_wc_instance_cdn && npm run make_cm6 && npm run typecheck_cli && npm run make_cli",
     "eslint": "eslint --color src/ts/jssm.ts src/ts/jssm_types.ts src/ts/tests/*.ts",
     "audit": "text_audit -r -t major MAJOR wasteful WASTEFUL any mixed fixme FIXME checkme CHECKME testme TESTME stochable STOCHABLE todo TODO comeback COMEBACK whargarbl WHARGARBL -g ./src/ts/**/*.{js,ts}",
     "vet": "npm run eslint && npm run audit",
@@ -227,8 +235,11 @@
   },
   "homepage": "https://stonecypher.github.io/jssm/",
   "devDependencies": {
+    "@codemirror/language": "^6.12.3",
+    "@codemirror/state": "^6.6.0",
     "@custom-elements-manifest/analyzer": "^0.10.4",
     "@knodes/typedoc-plugin-pages": "^0.22.5",
+    "@lezer/highlight": "^1.2.3",
     "@playwright/test": "^1.61.0",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
@@ -278,11 +289,23 @@
     "reduce-to-639-1": "^1.1.0"
   },
   "peerDependencies": {
-    "lit": ">=3"
+    "lit": ">=3",
+    "@codemirror/language": ">=6",
+    "@codemirror/state": ">=6",
+    "@lezer/highlight": ">=1"
   },
   "peerDependenciesMeta": {
     "lit": {
       "optional": true
+    },
+    "@codemirror/language": {
+      "optional": true
+    },
+    "@codemirror/state": {
+      "optional": true
+    },
+    "@lezer/highlight": {
+      "optional": true
     }
   },
   "optionalDependencies": {