@intent-framework/core 0.1.0-alpha.7 → 0.1.0-alpha.8

package/dist/index.d.ts

@@ -7,7 +7,7 @@ export type { AskNode, AnyAskNode, AskKind, AskBuilder } from "./ask.js";
 export type { ActNode, ActCondition, ActStatus, FeedbackConfig, ActBuilder, NavigationService, ActionExecutionContext, DefaultScreenServices } from "./act.js";
 export type { FlowNode, FlowStep, FlowBuilder } from "./flow.js";
 export type { SurfaceNode, SurfaceBuilder } from "./surface.js";
-export type { ResourceNode, ResourceConfig, ResourceLoadContext, ResourceStatus, AnyResourceNode } from "./resource.js";
+export type { ResourceNode, ResourceConfig, ResourceCacheOptions, ResourceLoadContext, ResourceStatus, AnyResourceNode } from "./resource.js";
 export { ResourceRef, createResourceNode } from "./resource.js";
 export { createScreenRuntime } from "./runtime.js";
 export type { ScreenRuntime } from "./runtime.js";

package/dist/index.js

@@ -37,7 +37,7 @@ function signal(initial) {
 
 //#endregion
 //#region src/resource.ts
-function createResourceNode(id, name, loader, autoLoad = true) {
+function createResourceNode(id, name, loader, autoLoad = true, cache) {
 	const statusSignal = signal(0);
 	const staleSignal = signal(0);
 	let currentStatus = "idle";
@@ -45,8 +45,11 @@ function createResourceNode(id, name, loader, autoLoad = true) {
 	let currentError = void 0;
 	let currentStale = false;
 	let lastContext = void 0;
+	let _staleTimer = null;
+	let _inFlightPromise = null;
 	const notify = () => statusSignal.set(statusSignal.get() + 1);
 	const staleNotify = () => staleSignal.set(staleSignal.get() + 1);
+	const shouldDeduplicate = cache ? cache.deduplicate !== false : false;
 	let _ready;
 	let _pending;
 	let _failed;
@@ -67,7 +70,23 @@ function createResourceNode(id, name, loader, autoLoad = true) {
 		if (!_stale) _stale = createCondition(() => currentStale, (notify$1) => staleSignal.subscribe(() => notify$1()));
 		return _stale;
 	}
-	async function executeLoad(context) {
+	function _clearStaleTimer() {
+		if (_staleTimer != null) {
+			clearTimeout(_staleTimer);
+			_staleTimer = null;
+		}
+	}
+	function _startStaleTimer() {
+		_clearStaleTimer();
+		if (cache?.staleTime != null && isFinite(cache.staleTime)) _staleTimer = setTimeout(() => {
+			if (!currentStale) {
+				currentStale = true;
+				staleNotify();
+			}
+		}, cache.staleTime);
+	}
+	function executeLoad(context) {
+		if (shouldDeduplicate && _inFlightPromise) return _inFlightPromise;
 		currentStale = false;
 		staleNotify();
 		currentStatus = "pending";
@@ -76,20 +95,27 @@ function createResourceNode(id, name, loader, autoLoad = true) {
 		notify();
 		if (context !== void 0) lastContext = context;
 		const loadContext = context ?? lastContext ?? {};
-		try {
-			const result = await Promise.resolve(loader(loadContext));
-			currentValue = result;
-			currentStatus = "ready";
-			currentStale = false;
-			notify();
-			staleNotify();
-		} catch (e) {
-			currentError = e;
-			currentStatus = "failed";
-			currentStale = false;
-			notify();
-			staleNotify();
-		}
+		const promise = (async () => {
+			try {
+				const result = await Promise.resolve(loader(loadContext));
+				currentValue = result;
+				currentStatus = "ready";
+				currentStale = false;
+				notify();
+				staleNotify();
+				_startStaleTimer();
+			} catch (e) {
+				currentError = e;
+				currentStatus = "failed";
+				currentStale = false;
+				notify();
+				staleNotify();
+			} finally {
+				_inFlightPromise = null;
+			}
+		})();
+		_inFlightPromise = promise;
+		return promise;
 	}
 	function invalidate() {
 		if (!currentStale) {
@@ -97,6 +123,10 @@ function createResourceNode(id, name, loader, autoLoad = true) {
 			staleNotify();
 		}
 	}
+	function dispose() {
+		_clearStaleTimer();
+		_inFlightPromise = null;
+	}
 	const node = {
 		id,
 		name,
@@ -127,7 +157,8 @@ function createResourceNode(id, name, loader, autoLoad = true) {
 		invalidate,
 		subscribe(fn) {
 			return statusSignal.subscribe(fn);
-		}
+		},
+		dispose
 	};
 	return node;
 }
@@ -683,6 +714,7 @@ function screen(name, fn) {
 				name: n,
 				autoLoad: config.autoLoad ?? true,
 				loader: config.load,
+				cache: config.cache,
 				ref
 			});
 			return ref;
@@ -907,7 +939,7 @@ var ScreenRuntime = class {
 		this._started = true;
 		const nodeMap = /* @__PURE__ */ new Map();
 		for (const config of this._screen.resourceConfigs) {
-			const node = createResourceNode(config.id, config.name, config.loader, false);
+			const node = createResourceNode(config.id, config.name, config.loader, false, config.cache);
 			this._resourceNodes.push(node);
 			nodeMap.set(config.id, node);
 		}
@@ -929,6 +961,7 @@ var ScreenRuntime = class {
 		this._disposed = true;
 		for (const unsub of this._unsubscribers) unsub();
 		this._unsubscribers = [];
+		for (const node of this._resourceNodes) node.dispose();
 		for (const config of this._screen.resourceConfigs) if (config.ref && this._resourceNodeMap) {
 			const node = this._resourceNodeMap.get(config.id);
 			if (node) config.ref._disconnect(node);

package/dist/resource.d.ts

@@ -18,17 +18,23 @@ export type ResourceNode<TValue, TServices extends object = DefaultScreenService
     reload: (context?: ResourceLoadContext<TServices>) => Promise<void>;
     invalidate: () => void;
     subscribe: (fn: () => void) => () => void;
+    dispose: () => void;
 };
 export type AnyResourceNode = ResourceNode<unknown, any>;
+export type ResourceCacheOptions = {
+    staleTime?: number;
+    deduplicate?: boolean;
+};
 export type ResourceConfig<TValue = unknown, TServices extends object = DefaultScreenServices> = {
     id: string;
     name: string;
     autoLoad: boolean;
     loader: ResourceLoader<TValue, TServices>;
+    cache?: ResourceCacheOptions;
     ref?: ResourceRef<TValue, TServices>;
 };
 export declare function createResourceConfig<TValue, TServices extends object = DefaultScreenServices>(id: string, name: string, loader: ResourceLoader<TValue, TServices>, autoLoad?: boolean): ResourceConfig<TValue, TServices>;
-export declare function createResourceNode<TValue, TServices extends object = DefaultScreenServices>(id: string, name: string, loader: ResourceLoader<TValue, TServices>, autoLoad?: boolean): ResourceNode<TValue, TServices>;
+export declare function createResourceNode<TValue, TServices extends object = DefaultScreenServices>(id: string, name: string, loader: ResourceLoader<TValue, TServices>, autoLoad?: boolean, cache?: ResourceCacheOptions): ResourceNode<TValue, TServices>;
 export declare class ResourceRef<TValue, TServices extends object = DefaultScreenServices> {
     readonly id: string;
     readonly name: string;

package/dist/screen.d.ts

@@ -2,7 +2,7 @@ import type { AnyAskNode } from "./ask.js";
 import type { ActNode, DefaultScreenServices } from "./act.js";
 import type { FlowNode } from "./flow.js";
 import type { SurfaceNode } from "./surface.js";
-import type { ResourceConfig, ResourceLoadContext } from "./resource.js";
+import type { ResourceCacheOptions, ResourceConfig, ResourceLoadContext } from "./resource.js";
 import { ResourceRef } from "./resource.js";
 import { type TextState, type BooleanState, type ChoiceState } from "./state.js";
 import { AskBuilder } from "./ask.js";
@@ -31,6 +31,7 @@ export type ScreenBuilder<TServices extends object = DefaultScreenServices> = {
     resource: <T>(name: string, config: {
         load: (() => Promise<T>) | ((context: ResourceLoadContext<TServices>) => Promise<T>);
         autoLoad?: boolean;
+        cache?: ResourceCacheOptions;
     }) => ResourceRef<T, TServices>;
 };
 export type ScreenDefinition<TServices extends object = DefaultScreenServices> = {

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.8",
   "description": "Platformless semantic graph and runtime for Intent applications",
   "license": "MIT",
   "repository": {