signalium 1.2.2 → 2.0.1

package/dist/cjs/internals/config.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runBatch = exports.scheduleFlush = void 0;
+exports.setConfig = setConfig;
+let scheduleFlush = flushWatchers => {
+    setTimeout(() => {
+        flushWatchers();
+    }, 0);
+};
+exports.scheduleFlush = scheduleFlush;
+let runBatch = fn => fn();
+exports.runBatch = runBatch;
+function setConfig(cfg) {
+    exports.scheduleFlush = cfg.scheduleFlush ?? exports.scheduleFlush;
+    exports.runBatch = cfg.runBatch ?? exports.runBatch;
+}
+//# sourceMappingURL=config.js.map

package/dist/cjs/internals/config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/internals/config.ts"],"names":[],"mappings":";;;AAQA,8BAQC;AAhBM,IAAI,aAAa,GAA6B,aAAa,CAAC,EAAE;IACnE,UAAU,CAAC,GAAG,EAAE;QACd,aAAa,EAAE,CAAC;IAClB,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC,CAAC;AAJS,QAAA,aAAa,iBAItB;AAEK,IAAI,QAAQ,GAA6B,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;AAAhD,QAAA,QAAQ,YAAwC;AAE3D,SAAgB,SAAS,CACvB,GAGE;IAEF,qBAAa,GAAG,GAAG,CAAC,aAAa,IAAI,qBAAa,CAAC;IACnD,gBAAQ,GAAG,GAAG,CAAC,QAAQ,IAAI,gBAAQ,CAAC;AACtC,CAAC"}

package/dist/cjs/internals/consumer.d.ts

@@ -1,6 +1,6 @@
-import { DerivedSignal } from './derived.js';
-export declare let CURRENT_CONSUMER: DerivedSignal<any, any> | undefined;
+import { ReactiveFnSignal } from './reactive.js';
+export declare let CURRENT_CONSUMER: ReactiveFnSignal<any, any> | undefined;
 export declare let IS_WATCHING: boolean;
 export declare const setIsWatching: (isWatching: boolean) => void;
-export declare const setCurrentConsumer: (consumer: DerivedSignal<any, any> | undefined) => void;
+export declare const setCurrentConsumer: (consumer: ReactiveFnSignal<any, any> | undefined) => void;
 //# sourceMappingURL=consumer.d.ts.map

package/dist/cjs/internals/consumer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consumer.d.ts","sourceRoot":"","sources":["../../../src/internals/consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,eAAO,IAAI,gBAAgB,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;AAEjE,eAAO,IAAI,WAAW,SAAQ,CAAC;AAE/B,eAAO,MAAM,aAAa,eAAgB,OAAO,SAEhD,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,SAE/E,CAAC"}
+{"version":3,"file":"consumer.d.ts","sourceRoot":"","sources":["../../../src/internals/consumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,eAAO,IAAI,gBAAgB,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;AAEpE,eAAO,IAAI,WAAW,SAAQ,CAAC;AAE/B,eAAO,MAAM,aAAa,eAAgB,OAAO,SAEhD,CAAC;AAEF,eAAO,MAAM,kBAAkB,aAAc,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,SAElF,CAAC"}

package/dist/cjs/internals/consumer.js.map

@@ -1 +1 @@
-{"version":3,"file":"consumer.js","sourceRoot":"","sources":["../../../src/internals/consumer.ts"],"names":[],"mappings":";;;AAIW,QAAA,WAAW,GAAG,KAAK,CAAC;AAExB,MAAM,aAAa,GAAG,CAAC,UAAmB,EAAE,EAAE;IACnD,mBAAW,GAAG,UAAU,CAAC;AAC3B,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAA6C,EAAE,EAAE;IAClF,wBAAgB,GAAG,QAAQ,CAAC;AAC9B,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B"}
+{"version":3,"file":"consumer.js","sourceRoot":"","sources":["../../../src/internals/consumer.ts"],"names":[],"mappings":";;;AAIW,QAAA,WAAW,GAAG,KAAK,CAAC;AAExB,MAAM,aAAa,GAAG,CAAC,UAAmB,EAAE,EAAE;IACnD,mBAAW,GAAG,UAAU,CAAC;AAC3B,CAAC,CAAC;AAFW,QAAA,aAAa,iBAExB;AAEK,MAAM,kBAAkB,GAAG,CAAC,QAAgD,EAAE,EAAE;IACrF,wBAAgB,GAAG,QAAQ,CAAC;AAC9B,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B"}

package/dist/cjs/internals/contexts.d.ts

@@ -1,6 +1,4 @@
-import { SignalOptionsWithInit } from '../types.js';
-import { DerivedSignal, DerivedSignalDefinition } from './derived.js';
-export declare const CONTEXT_KEY: unique symbol;
+import { ReactiveFnSignal, ReactiveFnDefinition } from './reactive.js';
 export type Context<T> = {
     defaultValue: T;
 };
@@ -13,8 +11,11 @@ export declare class ContextImpl<T> {
     _description: string;
     constructor(defaultValue: T, desc?: string);
 }
-export declare const createContext: <T>(initialValue: T, description?: string) => Context<T>;
+export declare const context: <T>(initialValue: T, description?: string) => Context<T>;
+export declare function withContexts<C extends unknown[], U>(contexts: [...ContextPair<C>], fn: () => U): U;
+export declare const getContext: <T>(context: Context<T>) => T;
 export declare class SignalScope {
+    private parentScope?;
     constructor(contexts: [ContextImpl<unknown>, unknown][], parent?: SignalScope);
     private contexts;
     private children;
@@ -23,18 +24,18 @@ export declare class SignalScope {
     setContexts(contexts: [ContextImpl<unknown>, unknown][]): void;
     getChild(contexts: [ContextImpl<unknown>, unknown][]): SignalScope;
     getContext<T>(_context: Context<T>): T | undefined;
-    get<T, Args extends unknown[]>(def: DerivedSignalDefinition<T, Args>, args: Args, opts?: Partial<SignalOptionsWithInit<T, Args>>): DerivedSignal<T, Args>;
-    markForGc(signal: DerivedSignal<any, any>): void;
-    removeFromGc(signal: DerivedSignal<any, any>): void;
-    forceGc(signal: DerivedSignal<any, any>): void;
+    get<T, Args extends unknown[]>(def: ReactiveFnDefinition<T, Args>, args: Args): ReactiveFnSignal<T, Args>;
+    markForGc(signal: ReactiveFnSignal<any, any>): void;
+    removeFromGc(signal: ReactiveFnSignal<any, any>): void;
+    forceGc(signal: ReactiveFnSignal<any, any>): void;
     sweepGc(): void;
 }
-export declare let ROOT_SCOPE: SignalScope;
-export declare function setRootContexts<C extends unknown[], U>(contexts: [...ContextPair<C>]): void;
-export declare const clearRootContexts: () => void;
+export declare let GLOBAL_SCOPE: SignalScope;
+export declare function setGlobalContexts<C extends unknown[], U>(contexts: [...ContextPair<C>]): void;
+export declare const clearGlobalContexts: () => void;
+export declare let CURRENT_SCOPE: SignalScope | undefined;
+export declare const setCurrentScope: (scope: SignalScope | undefined) => void;
 export declare const getCurrentScope: () => SignalScope;
-export declare function withContexts<C extends unknown[], U>(contexts: [...ContextPair<C>], fn: () => U): U;
-export declare const withScope: <T>(scope: SignalScope, fn: () => T) => T;
-export declare const useContext: <T>(context: Context<T>) => T;
+export declare const getOwner: (owner: object) => SignalScope | undefined;
 export declare function forceGc(_signal: object): void;
 //# sourceMappingURL=contexts.d.ts.map

package/dist/cjs/internals/contexts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../../src/internals/contexts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAuB,MAAM,cAAc,CAAC;AAK3F,eAAO,MAAM,WAAW,eAA8B,CAAC;AAEvD,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,YAAY,EAAE,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI;KAC5C,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAC;AAIF,qBAAa,WAAW,CAAC,CAAC;aAKN,YAAY,EAAE,CAAC;IAJjC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;gBAGH,YAAY,EAAE,CAAC,EAC/B,IAAI,CAAC,EAAE,MAAM;CAKhB;AAED,eAAO,MAAM,aAAa,GAAI,CAAC,gBAAgB,CAAC,gBAAgB,MAAM,KAAG,OAAO,CAAC,CAAC,CAEjF,CAAC;AAEF,qBAAa,WAAW;gBACV,QAAQ,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW;IAM7E,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAA8C;IAC7D,OAAO,CAAC,YAAY,CAAsC;IAE1D,WAAW,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;IAQvD,QAAQ,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;IAapD,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS;IAMlD,GAAG,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAC3B,GAAG,EAAE,uBAAuB,CAAC,CAAC,EAAE,IAAI,CAAC,EACrC,IAAI,EAAE,IAAI,EACV,IAAI,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAC7C,aAAa,CAAC,CAAC,EAAE,IAAI,CAAC;IAazB,SAAS,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC;IAOzC,YAAY,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC;IAI5C,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC;IAIvC,OAAO;CAaR;AAED,eAAO,IAAI,UAAU,aAAsB,CAAC;AAE5C,wBAAgB,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAE3F;AAED,eAAO,MAAM,iBAAiB,YAE7B,CAAC;AAIF,eAAO,MAAM,eAAe,QAAO,WAElC,CAAC;AAEF,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAUlG;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,WAAW,MAAM,MAAM,CAAC,MAS3D,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,WAAW,OAAO,CAAC,CAAC,CAAC,KAAG,CAUnD,CAAC;AAEF,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,QAGtC"}
+{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../../src/internals/contexts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAA0B,MAAM,eAAe,CAAC;AAO/F,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IACvB,YAAY,EAAE,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,SAAS,OAAO,EAAE,IAAI;KAC5C,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAC/C,CAAC;AAIF,qBAAa,WAAW,CAAC,CAAC;aAKN,YAAY,EAAE,CAAC;IAJjC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;gBAGH,YAAY,EAAE,CAAC,EAC/B,IAAI,CAAC,EAAE,MAAM;CAKhB;AAED,eAAO,MAAM,OAAO,GAAI,CAAC,gBAAgB,CAAC,gBAAgB,MAAM,KAAG,OAAO,CAAC,CAAC,CAE3E,CAAC;AAEF,wBAAgB,YAAY,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAUlG;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,WAAW,OAAO,CAAC,CAAC,CAAC,KAAG,CAUnD,CAAC;AAIF,qBAAa,WAAW;IACtB,OAAO,CAAC,WAAW,CAAC,CAAc;gBAEtB,QAAQ,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,EAAE,WAAW;IAO7E,OAAO,CAAC,QAAQ,CAA0B;IAC1C,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAAiD;IAChE,OAAO,CAAC,YAAY,CAAyC;IAE7D,WAAW,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;IAYvD,QAAQ,CAAC,QAAQ,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE;IAapD,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,SAAS;IAMlD,GAAG,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAAE,GAAG,EAAE,oBAAoB,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,GAAG,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC;IAazG,SAAS,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;IAO5C,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;IAI/C,OAAO,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC;IAI1C,OAAO;CASR;AAED,eAAO,IAAI,YAAY,aAAsB,CAAC;AAE9C,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAE7F;AAED,eAAO,MAAM,mBAAmB,YAE/B,CAAC;AAEF,eAAO,IAAI,aAAa,EAAE,WAAW,GAAG,SAAS,CAAC;AAElD,eAAO,MAAM,eAAe,UAAW,WAAW,GAAG,SAAS,SAE7D,CAAC;AAEF,eAAO,MAAM,eAAe,QAAO,WAElC,CAAC;AAMF,eAAO,MAAM,QAAQ,UAAW,MAAM,KAAG,WAAW,GAAG,SAEtD,CAAC;AAIF,wBAAgB,OAAO,CAAC,OAAO,EAAE,MAAM,QAGtC"}

package/dist/cjs/internals/contexts.js

@@ -1,15 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useContext = exports.withScope = exports.getCurrentScope = exports.clearRootContexts = exports.ROOT_SCOPE = exports.SignalScope = exports.createContext = exports.ContextImpl = exports.CONTEXT_KEY = void 0;
-exports.setRootContexts = setRootContexts;
+exports.getOwner = exports.getCurrentScope = exports.setCurrentScope = exports.CURRENT_SCOPE = exports.clearGlobalContexts = exports.GLOBAL_SCOPE = exports.SignalScope = exports.getContext = exports.context = exports.ContextImpl = void 0;
 exports.withContexts = withContexts;
+exports.setGlobalContexts = setGlobalContexts;
 exports.forceGc = forceGc;
-const config_js_1 = require("../config.js");
-const derived_js_1 = require("./derived.js");
-const get_js_1 = require("./get.js");
+const reactive_js_1 = require("./reactive.js");
 const hash_js_1 = require("./utils/hash.js");
 const scheduling_js_1 = require("./scheduling.js");
-exports.CONTEXT_KEY = Symbol('signalium:context');
+const consumer_js_1 = require("./consumer.js");
 let CONTEXT_ID = 0;
 class ContextImpl {
     defaultValue;
@@ -22,12 +20,34 @@ class ContextImpl {
     }
 }
 exports.ContextImpl = ContextImpl;
-const createContext = (initialValue, description) => {
+const context = (initialValue, description) => {
     return new ContextImpl(initialValue, description);
 };
-exports.createContext = createContext;
+exports.context = context;
+function withContexts(contexts, fn) {
+    const prevScope = exports.CURRENT_SCOPE;
+    const currentScope = (0, exports.getCurrentScope)();
+    try {
+        exports.CURRENT_SCOPE = currentScope.getChild(contexts);
+        return fn();
+    }
+    finally {
+        exports.CURRENT_SCOPE = prevScope;
+    }
+}
+const getContext = (context) => {
+    const scope = exports.CURRENT_SCOPE ?? consumer_js_1.CURRENT_CONSUMER?.scope;
+    if (scope === undefined) {
+        throw new Error('getContext must be used within a reactive function, a withContext, or within a framework-specific context provider.');
+    }
+    return scope.getContext(context) ?? context.defaultValue;
+};
+exports.getContext = getContext;
+// ======= Signal Scope =======
 class SignalScope {
+    parentScope;
     constructor(contexts, parent) {
+        this.parentScope = parent;
         this.contexts = Object.create(parent?.contexts || null);
         this.setContexts(contexts);
     }
@@ -38,6 +58,9 @@ class SignalScope {
     setContexts(contexts) {
         for (const [context, value] of contexts) {
             this.contexts[context._key] = value;
+            if (typeof value === 'object' && value !== null) {
+                OWNER_SCOPE_MAP.set(value, this);
+            }
         }
         this.signals.clear();
     }
@@ -54,12 +77,12 @@ class SignalScope {
         const context = _context;
         return this.contexts[context._key];
     }
-    get(def, args, opts) {
-        const paramKey = opts?.paramKey?.(...args);
+    get(def, args) {
+        const paramKey = def.paramKey?.(...args);
         const key = (0, hash_js_1.hashReactiveFn)(def.compute, paramKey ? [paramKey] : args);
         let signal = this.signals.get(key);
         if (signal === undefined) {
-            signal = (0, derived_js_1.createDerivedSignal)(def, args, key, this, opts);
+            signal = (0, reactive_js_1.createReactiveFnSignal)(def, args, key, this);
             this.signals.set(key, signal);
         }
         return signal;
@@ -79,59 +102,36 @@ class SignalScope {
     sweepGc() {
         for (const signal of this.gcCandidates) {
             if (signal.watchCount === 0) {
-                const { shouldGC } = signal.def;
-                if (!shouldGC || shouldGC(signal, signal.value, signal.args)) {
-                    this.signals.delete(signal.key);
-                }
+                this.signals.delete(signal.key);
             }
         }
         this.gcCandidates = new Set();
     }
 }
 exports.SignalScope = SignalScope;
-exports.ROOT_SCOPE = new SignalScope([]);
-function setRootContexts(contexts) {
-    exports.ROOT_SCOPE.setContexts(contexts);
+exports.GLOBAL_SCOPE = new SignalScope([]);
+function setGlobalContexts(contexts) {
+    exports.GLOBAL_SCOPE.setContexts(contexts);
 }
-const clearRootContexts = () => {
-    exports.ROOT_SCOPE = new SignalScope([]);
+const clearGlobalContexts = () => {
+    exports.GLOBAL_SCOPE = new SignalScope([]);
+};
+exports.clearGlobalContexts = clearGlobalContexts;
+const setCurrentScope = (scope) => {
+    exports.CURRENT_SCOPE = scope;
 };
-exports.clearRootContexts = clearRootContexts;
-let OVERRIDE_SCOPE;
+exports.setCurrentScope = setCurrentScope;
 const getCurrentScope = () => {
-    return OVERRIDE_SCOPE ?? get_js_1.CURRENT_CONSUMER?.scope ?? (0, config_js_1.getFrameworkScope)() ?? exports.ROOT_SCOPE;
+    return exports.CURRENT_SCOPE ?? consumer_js_1.CURRENT_CONSUMER?.scope ?? exports.GLOBAL_SCOPE;
 };
 exports.getCurrentScope = getCurrentScope;
-function withContexts(contexts, fn) {
-    const prevScope = OVERRIDE_SCOPE;
-    const currentScope = (0, exports.getCurrentScope)();
-    try {
-        OVERRIDE_SCOPE = currentScope.getChild(contexts);
-        return fn();
-    }
-    finally {
-        OVERRIDE_SCOPE = prevScope;
-    }
-}
-const withScope = (scope, fn) => {
-    const prevScope = OVERRIDE_SCOPE;
-    try {
-        OVERRIDE_SCOPE = scope;
-        return fn();
-    }
-    finally {
-        OVERRIDE_SCOPE = prevScope;
-    }
-};
-exports.withScope = withScope;
-const useContext = (context) => {
-    const scope = OVERRIDE_SCOPE ?? get_js_1.CURRENT_CONSUMER?.scope ?? (0, config_js_1.getFrameworkScope)();
-    if (scope === undefined) {
-        throw new Error('useContext must be used within a signal hook, a withContext, or within a framework-specific context provider.');
-    }
-    return scope.getContext(context) ?? context.defaultValue;
+// ======= Owner =======
+const OWNER_SCOPE_MAP = new Map();
+const getOwner = (owner) => {
+    return OWNER_SCOPE_MAP.get(owner);
 };
-exports.useContext = useContext;
+exports.getOwner = getOwner;
+// ======= Test Helper =======
 function forceGc(_signal) {
     const signal = _signal;
     signal.scope?.forceGc(signal);

package/dist/cjs/internals/contexts.js.map

@@ -1 +1 @@
-{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../../../src/internals/contexts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"contexts.js","sourceRoot":"","sources":["../../../src/internals/contexts.ts"],"names":[],"mappings":"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"}

package/dist/cjs/internals/core-api.d.ts

@@ -0,0 +1,14 @@
+import { ReactiveTask, ReactiveValue, Watcher, ReactiveOptions, RelayActivate, type DiscriminatedReactivePromise, SignalOptions, ReactiveFn } from '../types.js';
+import { ReactiveFnDefinition } from './reactive.js';
+import { Tracer } from './trace.js';
+export declare const DERIVED_DEFINITION_MAP: Map<Function, [(...args: any) => any, ReactiveFnDefinition<any, any>]>;
+export declare function getReactiveFnAndDefinition<T, Args extends unknown[]>(fn: (...args: Args) => T, opts?: ReactiveOptions<T, Args>): [(...args: Args) => ReactiveValue<T>, ReactiveFnDefinition<T, Args>];
+export declare function reactive<T, Args extends unknown[]>(fn: (...args: Args) => T, opts?: ReactiveOptions<T, Args>): ReactiveFn<T, Args>;
+export declare const reactiveMethod: <T, Args extends unknown[]>(owner: object, fn: (...args: Args) => T, opts?: ReactiveOptions<T, Args>) => ReactiveFn<T, Args>;
+export declare function relay<T>(activate: RelayActivate<T>, opts?: SignalOptions<T>): DiscriminatedReactivePromise<T>;
+export declare const task: <T, Args extends unknown[]>(fn: (...args: Args) => Promise<T>, opts?: SignalOptions<T>) => ReactiveTask<T, Args>;
+export declare function watcher<T>(fn: () => T, opts?: SignalOptions<T> & {
+    isolate?: boolean;
+    tracer?: Tracer;
+}): Watcher<T>;
+//# sourceMappingURL=core-api.d.ts.map

package/dist/cjs/internals/core-api.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"core-api.d.ts","sourceRoot":"","sources":["../../../src/internals/core-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EACb,OAAO,EACP,eAAe,EACf,aAAa,EACb,KAAK,4BAA4B,EACjC,aAAa,EACb,UAAU,EACX,MAAM,aAAa,CAAC;AAErB,OAAO,EAA0B,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAIpC,eAAO,MAAM,sBAAsB,2BAAgC,GAAG,KAAK,GAAG,kCAAoC,CAAC;AAEnH,wBAAgB,0BAA0B,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAClE,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,EACxB,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,GAC9B,CAAC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CA2BtE;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EAChD,EAAE,EAAE,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,EACxB,IAAI,CAAC,EAAE,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,GAC9B,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,CAErB;AAED,eAAO,MAAM,cAAc,GAAI,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,SAC/C,MAAM,MACT,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,CAAC,SACjB,eAAe,CAAC,CAAC,EAAE,IAAI,CAAC,KAC9B,UAAU,CAAC,CAAC,EAAE,IAAI,CA0BpB,CAAC;AAEF,wBAAgB,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,4BAA4B,CAAC,CAAC,CAAC,CAI7G;AAED,eAAO,MAAM,IAAI,GAAI,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,MACxC,CAAC,GAAG,IAAI,EAAE,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAC1B,aAAa,CAAC,CAAC,CAAC,KACtB,YAAY,CAAC,CAAC,EAAE,IAAI,CAItB,CAAC;AAEF,wBAAgB,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAcpH"}

package/dist/cjs/internals/core-api.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.task = exports.reactiveMethod = exports.DERIVED_DEFINITION_MAP = void 0;
+exports.getReactiveFnAndDefinition = getReactiveFnAndDefinition;
+exports.reactive = reactive;
+exports.relay = relay;
+exports.watcher = watcher;
+const contexts_js_1 = require("./contexts.js");
+const reactive_js_1 = require("./reactive.js");
+const async_js_1 = require("./async.js");
+const equals_js_1 = require("./utils/equals.js");
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+exports.DERIVED_DEFINITION_MAP = new Map();
+function getReactiveFnAndDefinition(fn, opts) {
+    let fnAndDef = exports.DERIVED_DEFINITION_MAP.get(fn);
+    if (!fnAndDef) {
+        const def = {
+            compute: fn,
+            equals: (0, equals_js_1.equalsFrom)(opts?.equals),
+            isRelay: false,
+            id: opts?.id,
+            desc: opts?.desc,
+            paramKey: opts?.paramKey,
+            tracer: undefined,
+        };
+        const reactiveFn = (...args) => {
+            const scope = (0, contexts_js_1.getCurrentScope)();
+            const signal = scope.get(def, args);
+            return signal.value;
+        };
+        fnAndDef = [reactiveFn, def];
+        exports.DERIVED_DEFINITION_MAP.set(fn, fnAndDef);
+    }
+    return fnAndDef;
+}
+function reactive(fn, opts) {
+    return getReactiveFnAndDefinition(fn, opts)[0];
+}
+const reactiveMethod = (owner, fn, opts) => {
+    const def = {
+        compute: fn,
+        equals: (0, equals_js_1.equalsFrom)(opts?.equals),
+        isRelay: false,
+        id: opts?.id,
+        desc: opts?.desc,
+        paramKey: opts?.paramKey,
+        tracer: undefined,
+    };
+    const reactiveFn = (...args) => {
+        const scope = (0, contexts_js_1.getOwner)(owner);
+        if (scope === undefined) {
+            throw new Error('reactiveMethods must be attached to an owned context object');
+        }
+        const signal = scope.get(def, args);
+        return signal.value;
+    };
+    exports.DERIVED_DEFINITION_MAP.set(reactiveFn, [reactiveFn, def]);
+    return reactiveFn;
+};
+exports.reactiveMethod = reactiveMethod;
+function relay(activate, opts) {
+    const scope = (0, contexts_js_1.getCurrentScope)();
+    return (0, async_js_1.createRelay)(activate, scope, opts);
+}
+const task = (fn, opts) => {
+    const scope = (0, contexts_js_1.getCurrentScope)();
+    return (0, async_js_1.createTask)(fn, scope, opts);
+};
+exports.task = task;
+function watcher(fn, opts) {
+    const def = {
+        compute: fn,
+        equals: (0, equals_js_1.equalsFrom)(opts?.equals),
+        isRelay: false,
+        id: opts?.id,
+        desc: opts?.desc,
+        paramKey: undefined,
+        tracer: opts?.tracer,
+    };
+    const scope = opts?.isolate ? new contexts_js_1.SignalScope([]) : (0, contexts_js_1.getCurrentScope)();
+    return (0, reactive_js_1.createReactiveFnSignal)(def, undefined, undefined, scope);
+}
+//# sourceMappingURL=core-api.js.map

package/dist/cjs/internals/core-api.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"core-api.js","sourceRoot":"","sources":["../../../src/internals/core-api.ts"],"names":[],"mappings":"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"}

package/dist/cjs/internals/dirty.d.ts

@@ -1,5 +1,5 @@
-import { DerivedSignal } from './derived.js';
+import { ReactiveFnSignal } from './reactive.js';
 import { Edge } from './edge.js';
-export declare function dirtySignal(signal: DerivedSignal<any, any>): void;
-export declare function dirtySignalConsumers(map: Map<WeakRef<DerivedSignal<any, any>>, Edge>): void;
+export declare function dirtySignal(signal: ReactiveFnSignal<any, any>): void;
+export declare function dirtySignalConsumers(map: Map<WeakRef<ReactiveFnSignal<any, any>>, Edge>): void;
 //# sourceMappingURL=dirty.d.ts.map

package/dist/cjs/internals/dirty.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dirty.d.ts","sourceRoot":"","sources":["../../../src/internals/dirty.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAA+B,MAAM,cAAc,CAAC;AAE1E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,wBAAgB,WAAW,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,QAY1D;AAyBD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAgDpF"}
+{"version":3,"file":"dirty.d.ts","sourceRoot":"","sources":["../../../src/internals/dirty.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAA4B,MAAM,eAAe,CAAC;AAE3E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,wBAAgB,WAAW,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,QAY7D;AAyBD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,QAgDvF"}

package/dist/cjs/internals/dirty.js

@@ -3,23 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dirtySignal = dirtySignal;
 exports.dirtySignalConsumers = dirtySignalConsumers;
 const scheduling_js_1 = require("./scheduling.js");
-const derived_js_1 = require("./derived.js");
-const get_js_1 = require("./get.js");
+const reactive_js_1 = require("./reactive.js");
+const consumer_js_1 = require("./consumer.js");
 function dirtySignal(signal) {
     const prevState = signal._state;
-    if (prevState === 2 /* SignalState.Dirty */) {
+    if (prevState === 2 /* ReactiveFnState.Dirty */) {
         return;
     }
-    signal._state = 2 /* SignalState.Dirty */;
-    if (prevState !== 3 /* SignalState.MaybeDirty */) {
+    signal._state = 2 /* ReactiveFnState.Dirty */;
+    if (prevState !== 3 /* ReactiveFnState.MaybeDirty */) {
         propagateDirty(signal);
     }
 }
 function propagateDirty(signal) {
-    if (get_js_1.CURRENT_CONSUMER === signal) {
+    if (consumer_js_1.CURRENT_CONSUMER === signal) {
         throw new Error('A signal was dirtied after it was consumed by the current function. This can cause race conditions and infinite rerenders and is not allowed.');
     }
-    if ((0, derived_js_1.isSubscription)(signal)) {
+    if ((0, reactive_js_1.isRelay)(signal)) {
         if (signal.watchCount > 0) {
             (0, scheduling_js_1.scheduleAsyncPull)(signal);
         }
@@ -40,25 +40,25 @@ function dirtySignalConsumers(map) {
             continue;
         const dirtyState = sub._state;
         switch (dirtyState) {
-            case 0 /* SignalState.Clean */:
-                sub._state = 3 /* SignalState.MaybeDirty */;
+            case 0 /* ReactiveFnState.Clean */:
+                sub._state = 3 /* ReactiveFnState.MaybeDirty */;
                 sub.dirtyHead = edge;
                 edge.nextDirty = undefined;
                 propagateDirty(sub);
                 break;
-            case 1 /* SignalState.Pending */:
-            case 3 /* SignalState.MaybeDirty */: {
+            case 1 /* ReactiveFnState.Pending */:
+            case 3 /* ReactiveFnState.MaybeDirty */: {
                 let subEdge = sub.dirtyHead;
                 const ord = edge.ord;
                 if (subEdge.ord > ord) {
                     sub.dirtyHead = edge;
                     edge.nextDirty = subEdge;
-                    if (dirtyState === 1 /* SignalState.Pending */) {
+                    if (dirtyState === 1 /* ReactiveFnState.Pending */) {
                         // If the signal is pending, the first edge is the halt edge. If the
                         // new dirty edge is BEFORE the halt edge, then it means that something
                         // changed before the current halt, so we need to cancel the current computation
                         // and recompute.
-                        sub._state = 3 /* SignalState.MaybeDirty */;
+                        sub._state = 3 /* ReactiveFnState.MaybeDirty */;
                         propagateDirty(sub);
                     }
                 }

package/dist/cjs/internals/dirty.js.map

@@ -1 +1 @@
-{"version":3,"file":"dirty.js","sourceRoot":"","sources":["../../../src/internals/dirty.ts"],"names":[],"mappings":";;AAKA,kCAYC;AAyBD,oDAgDC;AA1FD,mDAAkE;AAClE,6CAA0E;AAC1E,qCAA4C;AAG5C,SAAgB,WAAW,CAAC,MAA+B;IACzD,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IAEhC,IAAI,SAAS,8BAAsB,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IAED,MAAM,CAAC,MAAM,4BAAoB,CAAC;IAElC,IAAI,SAAS,mCAA2B,EAAE,CAAC;QACzC,cAAc,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,MAA+B;IACrD,IAAI,yBAAgB,KAAK,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IAED,IAAI,IAAA,2BAAc,EAAC,MAAM,CAAC,EAAE,CAAC;QAC3B,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAA,iCAAiB,EAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QAED,8CAA8C;IAChD,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAED,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,GAAgD;IACnF,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,aAAa,KAAK,IAAI,CAAC,UAAU;YAAE,SAAS;QAEzE,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC;QAE9B,QAAQ,UAAU,EAAE,CAAC;YACnB;gBACE,GAAG,CAAC,MAAM,iCAAyB,CAAC;gBACpC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;gBACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3B,cAAc,CAAC,GAAG,CAAC,CAAC;gBACpB,MAAM;YAER,iCAAyB;YACzB,mCAA2B,CAAC,CAAC,CAAC;gBAC5B,IAAI,OAAO,GAAG,GAAG,CAAC,SAAU,CAAC;gBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;gBAErB,IAAI,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;oBACtB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;oBACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;oBAEzB,IAAI,UAAU,gCAAwB,EAAE,CAAC;wBACvC,oEAAoE;wBACpE,uEAAuE;wBACvE,gFAAgF;wBAChF,iBAAiB;wBACjB,GAAG,CAAC,MAAM,iCAAyB,CAAC;wBACpC,cAAc,CAAC,GAAG,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;oBAElC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;wBACtD,OAAO,GAAG,SAAS,CAAC;wBACpB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;oBAChC,CAAC;oBAED,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC3B,OAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;gBAC5B,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
+{"version":3,"file":"dirty.js","sourceRoot":"","sources":["../../../src/internals/dirty.ts"],"names":[],"mappings":";;AAKA,kCAYC;AAyBD,oDAgDC;AA1FD,mDAAkE;AAClE,+CAA2E;AAC3E,+CAAiD;AAGjD,SAAgB,WAAW,CAAC,MAAkC;IAC5D,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IAEhC,IAAI,SAAS,kCAA0B,EAAE,CAAC;QACxC,OAAO;IACT,CAAC;IAED,MAAM,CAAC,MAAM,gCAAwB,CAAC;IAEtC,IAAI,SAAS,uCAA+B,EAAE,CAAC;QAC7C,cAAc,CAAC,MAAM,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,MAAkC;IACxD,IAAI,8BAAgB,KAAK,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IAED,IAAI,IAAA,qBAAO,EAAC,MAAM,CAAC,EAAE,CAAC;QACpB,IAAI,MAAM,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;YAC1B,IAAA,iCAAiB,EAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;QAED,8CAA8C;IAChD,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACvB,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC;QACvB,CAAC;QAED,oBAAoB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,CAAC,IAAI,GAAG,IAAI,GAAG,EAAE,CAAC;IAC1B,CAAC;AACH,CAAC;AAED,SAAgB,oBAAoB,CAAC,GAAmD;IACtF,KAAK,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,GAAG,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;QAE3B,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,CAAC,aAAa,KAAK,IAAI,CAAC,UAAU;YAAE,SAAS;QAEzE,MAAM,UAAU,GAAG,GAAG,CAAC,MAAM,CAAC;QAE9B,QAAQ,UAAU,EAAE,CAAC;YACnB;gBACE,GAAG,CAAC,MAAM,qCAA6B,CAAC;gBACxC,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;gBACrB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3B,cAAc,CAAC,GAAG,CAAC,CAAC;gBACpB,MAAM;YAER,qCAA6B;YAC7B,uCAA+B,CAAC,CAAC,CAAC;gBAChC,IAAI,OAAO,GAAG,GAAG,CAAC,SAAU,CAAC;gBAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;gBAErB,IAAI,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;oBACtB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC;oBACrB,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC;oBAEzB,IAAI,UAAU,oCAA4B,EAAE,CAAC;wBAC3C,oEAAoE;wBACpE,uEAAuE;wBACvE,gFAAgF;wBAChF,iBAAiB;wBACjB,GAAG,CAAC,MAAM,qCAA6B,CAAC;wBACxC,cAAc,CAAC,GAAG,CAAC,CAAC;oBACtB,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;oBAElC,OAAO,SAAS,KAAK,SAAS,IAAI,SAAS,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;wBACtD,OAAO,GAAG,SAAS,CAAC;wBACpB,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;oBAChC,CAAC;oBAED,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;oBAC3B,OAAQ,CAAC,SAAS,GAAG,IAAI,CAAC;gBAC5B,CAAC;gBACD,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}

package/dist/cjs/internals/edge.d.ts

@@ -1,11 +1,11 @@
 import { ReactivePromise } from './async.js';
-import type { DerivedSignal } from './derived.js';
+import type { ReactiveFnSignal } from './reactive.js';
 export declare const enum EdgeType {
     Signal = 0,
     Promise = 1
 }
 export interface EdgeTypeDep {
-    [EdgeType.Signal]: DerivedSignal<any, any>;
+    [EdgeType.Signal]: ReactiveFnSignal<any, any>;
     [EdgeType.Promise]: ReactivePromise<any>;
 }
 interface BaseEdge {
@@ -18,7 +18,7 @@ interface BaseEdge {
 }
 export interface SignalEdge extends BaseEdge {
     type: EdgeType.Signal;
-    dep: DerivedSignal<any, any>;
+    dep: ReactiveFnSignal<any, any>;
 }
 export interface PromiseEdge extends BaseEdge {
     type: EdgeType.Promise;
@@ -26,7 +26,7 @@ export interface PromiseEdge extends BaseEdge {
 }
 export type Edge = SignalEdge | PromiseEdge;
 export declare function createEdge<T extends EdgeType, R extends T extends EdgeType.Signal ? SignalEdge : PromiseEdge>(prevEdge: Edge | undefined, type: T, dep: EdgeTypeDep[T], updatedAt: number, consumedAt: number): R;
-export declare function insertDirty(node: DerivedSignal<any, any>, edge: Edge): void;
-export declare function findAndRemoveDirty(sub: DerivedSignal<any, any>, dep: DerivedSignal<any, any> | ReactivePromise<any>): Edge | undefined;
+export declare function insertDirty(node: ReactiveFnSignal<any, any>, edge: Edge): void;
+export declare function findAndRemoveDirty(sub: ReactiveFnSignal<any, any>, dep: ReactiveFnSignal<any, any> | ReactivePromise<any>): Edge | undefined;
 export {};
 //# sourceMappingURL=edge.d.ts.map

package/dist/cjs/internals/edge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge.d.ts","sourceRoot":"","sources":["../../../src/internals/edge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAIlD,0BAAkB,QAAQ;IACxB,MAAM,IAAI;IACV,OAAO,IAAI;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC3C,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;CAC1C;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC;CAC7B;AAED,MAAM,WAAW,UAAW,SAAQ,QAAQ;IAC1C,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;IACtB,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CAC9B;AAED,MAAM,WAAW,WAAY,SAAQ,QAAQ;IAC3C,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;IACvB,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;CAC3B;AAED,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC;AAE5C,wBAAgB,UAAU,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,CAAC,SAAS,QAAQ,CAAC,MAAM,GAAG,UAAU,GAAG,WAAW,EAC3G,QAAQ,EAAE,IAAI,GAAG,SAAS,EAC1B,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,CAAC,CAiBH;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,QAgBpE;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,EAC5B,GAAG,EAAE,aAAa,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,GAClD,IAAI,GAAG,SAAS,CAyBlB"}
+{"version":3,"file":"edge.d.ts","sourceRoot":"","sources":["../../../src/internals/edge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAItD,0BAAkB,QAAQ;IACxB,MAAM,IAAI;IACV,OAAO,IAAI;CACZ;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;CAC1C;AAED,UAAU,QAAQ;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,GAAG,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC3B,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IAEnB,SAAS,EAAE,IAAI,GAAG,SAAS,CAAC;CAC7B;AAED,MAAM,WAAW,UAAW,SAAQ,QAAQ;IAC1C,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC;IACtB,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,WAAY,SAAQ,QAAQ;IAC3C,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC;IACvB,GAAG,EAAE,eAAe,CAAC,GAAG,CAAC,CAAC;CAC3B;AAED,MAAM,MAAM,IAAI,GAAG,UAAU,GAAG,WAAW,CAAC;AAE5C,wBAAgB,UAAU,CAAC,CAAC,SAAS,QAAQ,EAAE,CAAC,SAAS,CAAC,SAAS,QAAQ,CAAC,MAAM,GAAG,UAAU,GAAG,WAAW,EAC3G,QAAQ,EAAE,IAAI,GAAG,SAAS,EAC1B,IAAI,EAAE,CAAC,EACP,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,GACjB,CAAC,CAiBH;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,QAgBvE;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAC/B,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,GACrD,IAAI,GAAG,SAAS,CAyBlB"}

package/dist/cjs/internals/edge.js.map

@@ -1 +1 @@
-{"version":3,"file":"edge.js","sourceRoot":"","sources":["../../../src/internals/edge.ts"],"names":[],"mappings":";;AAqCA,gCAuBC;AAED,kCAgBC;AAED,gDA4BC;AAzGD,IAAI,WAAW,GAAG,CAAC,CAAC;AAkCpB,SAAgB,UAAU,CACxB,QAA0B,EAC1B,IAAO,EACP,GAAmB,EACnB,SAAiB,EACjB,UAAkB;IAElB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;YACL,IAAI;YACJ,GAAG;YACH,GAAG,EAAE,WAAW,EAAE;YAClB,SAAS;YACT,UAAU;YACV,SAAS,EAAE,SAAS;SAChB,CAAC;IACT,CAAC;IAED,QAAQ,CAAC,GAAG,GAAG,WAAW,EAAE,CAAC;IAC7B,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,OAAO,QAAa,CAAC;AACvB,CAAC;AAED,SAAgB,WAAW,CAAC,IAA6B,EAAE,IAAU;IACnE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACrB,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;IAEjC,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC;QAErC,OAAO,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;YACpD,WAAW,GAAG,QAAQ,CAAC;YACvB,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC;QACnC,CAAC;QAED,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAChC,GAA4B,EAC5B,GAAmD;IAEnD,IAAI,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;IAEzB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACrB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IAE9B,OAAO,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9B,IAAI,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;YACpC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,GAAG,QAAQ,CAAC;QAChB,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IAC5B,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}
+{"version":3,"file":"edge.js","sourceRoot":"","sources":["../../../src/internals/edge.ts"],"names":[],"mappings":";;AAqCA,gCAuBC;AAED,kCAgBC;AAED,gDA4BC;AAzGD,IAAI,WAAW,GAAG,CAAC,CAAC;AAkCpB,SAAgB,UAAU,CACxB,QAA0B,EAC1B,IAAO,EACP,GAAmB,EACnB,SAAiB,EACjB,UAAkB;IAElB,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC3B,OAAO;YACL,IAAI;YACJ,GAAG;YACH,GAAG,EAAE,WAAW,EAAE;YAClB,SAAS;YACT,UAAU;YACV,SAAS,EAAE,SAAS;SAChB,CAAC;IACT,CAAC;IAED,QAAQ,CAAC,GAAG,GAAG,WAAW,EAAE,CAAC;IAC7B,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,QAAQ,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,QAAQ,CAAC,SAAS,GAAG,SAAS,CAAC;IAC/B,OAAO,QAAa,CAAC;AACvB,CAAC;AAED,SAAgB,WAAW,CAAC,IAAgC,EAAE,IAAU;IACtE,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACrB,IAAI,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC;IAEjC,IAAI,WAAW,KAAK,SAAS,IAAI,WAAW,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;QACvD,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;SAAM,CAAC;QACN,IAAI,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC;QAErC,OAAO,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC;YACpD,WAAW,GAAG,QAAQ,CAAC;YACvB,QAAQ,GAAG,WAAW,CAAC,SAAS,CAAC;QACnC,CAAC;QAED,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,SAAgB,kBAAkB,CAChC,GAA+B,EAC/B,GAAsD;IAEtD,IAAI,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC;IAEzB,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;QACrB,GAAG,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IAE9B,OAAO,QAAQ,KAAK,SAAS,EAAE,CAAC;QAC9B,IAAI,QAAQ,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC;YACzB,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;YACpC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,GAAG,QAAQ,CAAC;QAChB,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;IAC5B,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/cjs/internals/generators.d.ts

@@ -0,0 +1,5 @@
+import { SignalScope } from './contexts.js';
+import { ReactiveFnSignal } from './reactive.js';
+export declare function generatorResultToPromiseWithConsumer<T>(generator: Generator<any, T>, savedConsumer: ReactiveFnSignal<any, any> | undefined): Promise<T>;
+export declare function generatorResultToPromiseWithScope<T, Args extends unknown[]>(generator: Generator<any, T>, savedScope: SignalScope | undefined): Promise<T>;
+//# sourceMappingURL=generators.d.ts.map

package/dist/cjs/internals/generators.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"generators.d.ts","sourceRoot":"","sources":["../../../src/internals/generators.ts"],"names":[],"mappings":"AAEA,OAAO,EAAkC,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,wBAAgB,oCAAoC,CAAC,CAAC,EACpD,SAAS,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAC5B,aAAa,EAAE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG,SAAS,GACpD,OAAO,CAAC,CAAC,CAAC,CAuCZ;AAED,wBAAgB,iCAAiC,CAAC,CAAC,EAAE,IAAI,SAAS,OAAO,EAAE,EACzE,SAAS,EAAE,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,EAC5B,UAAU,EAAE,WAAW,GAAG,SAAS,GAClC,OAAO,CAAC,CAAC,CAAC,CAuCZ"}