ngx-json-render 0.8.1 → 0.8.2

package/README.md

@@ -8,7 +8,7 @@ Built on `@json-render/core` (the same spec format, expressions, state store, ac
 
 This is an Angular **adapter over the official core**, not a second implementation of it — `@json-render/core` is a peer dependency, and the spec your model emits is the same one the React, Vue, Solid and Svelte renderers consume. A catalog and a spec written here move to another framework unchanged.
 
-**[Live demo](https://shteynu.github.io/ngx-json-render/)** — interactive spec (bindings, repeat, confirm, watch), a SpecStream rendering progressively that you can stop mid-generation, and a chat where prose and UI patches arrive in one reply; both streaming tabs replay a recording, or call a real model on your own key ([source](https://github.com/shteynu/ngx-json-render/tree/main/projects/demo)) — or [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/shteynu/ngx-json-render)
+**[Live demo](https://shteynu.github.io/ngx-json-render/)** — opens on a sales dashboard streaming in patch by patch, which you can stop mid-generation; plus a playground, an interactive spec (bindings, repeat, confirm, watch), and a chat where prose and UI patches arrive in one reply. Both streaming tabs replay a recording, or call a real model on your own key ([source](https://github.com/shteynu/ngx-json-render/tree/main/projects/demo)) — or [![Open in StackBlitz](https://developer.stackblitz.com/img/open_in_stackblitz.svg)](https://stackblitz.com/github/shteynu/ngx-json-render)
 
 ![A SpecStream of RFC 6902 patches rendering progressively into an Angular dashboard](https://raw.githubusercontent.com/shteynu/ngx-json-render/main/docs/streaming.gif)
 

package/fesm2022/ngx-json-render.mjs

@@ -3166,6 +3166,39 @@ function notifyStreamObservers(event, ...args) {
         }
     }
 }
+/**
+ * The start and end of one hook's generations, as observers see them.
+ *
+ * A superseded or stopped request only settles once its abort has gone
+ * through, after the next generation may already have started. Reporting its
+ * end from there would close the new generation instead of the old one, so a
+ * generation ends here the moment it is superseded or stopped, and its own
+ * late end is dropped.
+ */
+function createObservedRuns() {
+    let endOpen = null;
+    return {
+        start() {
+            endOpen?.();
+            let ended = false;
+            const end = (ok) => {
+                if (ended)
+                    return;
+                ended = true;
+                if (endOpen === stop)
+                    endOpen = null;
+                notifyStreamObservers('onEnd', ok);
+            };
+            const stop = () => end(true);
+            endOpen = stop;
+            notifyStreamObservers('onStart');
+            return end;
+        },
+        stop() {
+            endOpen?.();
+        },
+    };
+}
 
 /**
  * Convert a flat element list to a Spec.
@@ -3463,9 +3496,11 @@ function injectUIStream(options) {
         catalog: options.catalog ?? null,
     };
     const session = createStreamSession();
+    const runs = createObservedRuns();
     inject(DestroyRef).onDestroy(() => session.cancel());
     const stop = () => {
         session.cancel();
+        runs.stop();
         isStreaming.set(false);
     };
     const clear = () => {
@@ -3490,7 +3525,7 @@ function injectUIStream(options) {
             ? { ...previousSpec, elements: { ...previousSpec.elements } }
             : { root: '', elements: {} };
         spec.set(currentSpec);
-        notifyStreamObservers('onStart');
+        const end = runs.start();
         let failed = false;
         const handleLine = (line) => {
             const parsed = parseLine(line);
@@ -3556,7 +3591,7 @@ function injectUIStream(options) {
         }
         finally {
             gate.commit(() => isStreaming.set(false));
-            notifyStreamObservers('onEnd', !failed);
+            end(!failed);
         }
     };
     return {
@@ -3600,9 +3635,11 @@ function injectChatUI(options) {
         catalog: options.catalog ?? null,
     };
     const session = createStreamSession();
+    const runs = createObservedRuns();
     inject(DestroyRef).onDestroy(() => session.cancel());
     const stop = () => {
         session.cancel();
+        runs.stop();
         isStreaming.set(false);
     };
     const clear = () => {
@@ -3657,7 +3694,7 @@ function injectChatUI(options) {
         messages.update((prev) => [...prev, userMessage, assistantMessage]);
         isStreaming.set(true);
         error.set(null);
-        notifyStreamObservers('onStart');
+        const end = runs.start();
         let failed = false;
         // Mutable state for accumulating the assistant response
         let accumulatedText = '';
@@ -3740,7 +3777,7 @@ function injectChatUI(options) {
         }
         finally {
             gate.commit(() => isStreaming.set(false));
-            notifyStreamObservers('onEnd', !failed);
+            end(!failed);
         }
     };
     return {