signalium 0.3.8 → 1.0.1

package/dist/cjs/internals/utils/hash.js

@@ -0,0 +1,181 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCustomHash = void 0;
+exports.hashValue = hashValue;
+exports.getObjectHash = getObjectHash;
+exports.hashReactiveFn = hashReactiveFn;
+const { log, floor, imul, abs } = Math;
+function hashStr(key, seed = 0) {
+    let h = seed ^ key.length;
+    const c1 = 0xcc9e2d51;
+    const c2 = 0x1b873593;
+    let i = 0;
+    while (i + 4 <= key.length) {
+        let k = (key.charCodeAt(i) & 0xff) |
+            ((key.charCodeAt(i + 1) & 0xff) << 8) |
+            ((key.charCodeAt(i + 2) & 0xff) << 16) |
+            ((key.charCodeAt(i + 3) & 0xff) << 24);
+        k = imul(k, c1);
+        k = (k << 15) | (k >>> 17);
+        k = imul(k, c2);
+        h ^= k;
+        h = (h << 13) | (h >>> 19);
+        h = imul(h, 5) + 0xe6546b64;
+        i += 4;
+    }
+    let k = 0;
+    switch (key.length & 3) {
+        case 3:
+            k ^= (key.charCodeAt(i + 2) & 0xff) << 16;
+        // eslint-disable-next-line no-fallthrough
+        case 2:
+            k ^= (key.charCodeAt(i + 1) & 0xff) << 8;
+        // eslint-disable-next-line no-fallthrough
+        case 1:
+            k ^= key.charCodeAt(i) & 0xff;
+            k = imul(k, c1);
+            k = (k << 15) | (k >>> 17);
+            k = imul(k, c2);
+            h ^= k;
+    }
+    h ^= key.length;
+    h ^= h >>> 16;
+    h = imul(h, 0x85ebca6b);
+    h ^= h >>> 13;
+    h = imul(h, 0xc2b2ae35);
+    h ^= h >>> 16;
+    return h >>> 0; // Convert to unsigned 32-bit integer
+}
+function hashNumber(num, seed = 0) {
+    // Handle negative numbers by taking absolute value
+    num = abs(num);
+    let h = seed;
+    const c1 = 0xcc9e2d51;
+    const c2 = 0x1b873593;
+    // Process 4 bytes at a time
+    while (num >= 0xffffffff) {
+        // Extract the lowest 32 bits
+        let k = num & 0xffffffff;
+        num = floor(num / 0x100000000);
+        k = imul(k, c1);
+        k = (k << 15) | (k >>> 17);
+        k = imul(k, c2);
+        h ^= k;
+        h = (h << 13) | (h >>> 19);
+        h = imul(h, 5) + 0xe6546b64;
+    }
+    // Process the remaining bytes (up to 4 bytes)
+    if (num > 0) {
+        let k = num & 0xffffffff;
+        k = imul(k, c1);
+        k = (k << 15) | (k >>> 17);
+        k = imul(k, c2);
+        h ^= k;
+    }
+    // Get the number of bytes in the original number
+    const numBytes = num === 0 ? 1 : floor(log(num) / log(256)) + 1;
+    h ^= numBytes;
+    h ^= h >>> 16;
+    h = imul(h, 0x85ebca6b);
+    h ^= h >>> 13;
+    h = imul(h, 0xc2b2ae35);
+    h ^= h >>> 16;
+    return h >>> 0; // Convert to unsigned 32-bit integer
+}
+function hashArray(arr) {
+    let h = 7 /* HashType.ARRAY */;
+    const c1 = 0xcc9e2d51;
+    const c2 = 0x1b873593;
+    // Process 4 bytes at a time
+    for (const item of arr) {
+        // Extract the lowest 32 bits
+        let k = hashValue(item);
+        k = imul(k, c1);
+        k = (k << 15) | (k >>> 17);
+        k = imul(k, c2);
+        h ^= k;
+        h = (h << 13) | (h >>> 19);
+        h = imul(h, 5) + 0xe6546b64;
+    }
+    h ^= arr.length;
+    h ^= h >>> 16;
+    h = imul(h, 0x85ebca6b);
+    h ^= h >>> 13;
+    h = imul(h, 0xc2b2ae35);
+    h ^= h >>> 16;
+    return h >>> 0; // Convert to unsigned 32-bit integer
+}
+function hashObject(obj) {
+    let sum = OBJECT;
+    const keys = Object.keys(obj);
+    for (const key of keys) {
+        sum += hashValue(key) ^ hashValue(obj[key]);
+    }
+    return sum >>> 0;
+}
+const UNDEFINED = hashStr('undefined', 0 /* HashType.UNDEFINED */);
+const NULL = hashStr('null', 1 /* HashType.NULL */);
+const TRUE = hashStr('true', 2 /* HashType.TRUE */);
+const FALSE = hashStr('false', 3 /* HashType.FALSE */);
+const ARRAY = hashStr('array', 7 /* HashType.ARRAY */);
+const OBJECT = hashStr('object', 8 /* HashType.OBJECT */);
+const getObjectProto = Object.getPrototypeOf;
+const PROTO_TO_HASH = new Map([
+    [Object.prototype, hashObject],
+    [Array.prototype, hashArray],
+]);
+const registerCustomHash = (ctor, hashFn) => {
+    PROTO_TO_HASH.set(ctor.prototype, hashFn);
+};
+exports.registerCustomHash = registerCustomHash;
+function hashValue(node, seen = []) {
+    switch (typeof node) {
+        case 'undefined':
+            return UNDEFINED;
+        case 'boolean':
+            return node ? TRUE : FALSE;
+        case 'number':
+            return hashStr(String(node), 4 /* HashType.NUMBER */);
+        case 'string':
+            return hashStr(node, 5 /* HashType.STRING */);
+        case 'bigint':
+            return hashStr(node.toString(), 6 /* HashType.BIGINT */);
+        case 'object': {
+            if (node === null) {
+                return NULL;
+            }
+            const index = seen.indexOf(node);
+            if (index !== -1) {
+                return hashStr(String(index), 11 /* HashType.CYCLE */);
+            }
+            const hashFn = PROTO_TO_HASH.get(getObjectProto(node));
+            if (hashFn) {
+                seen.push(node);
+                const hash = hashFn(node);
+                seen.pop();
+                return hash;
+            }
+            return getObjectHash(node);
+        }
+        case 'function':
+            return getObjectHash(node);
+        case 'symbol':
+            return hashStr(node.toString(), 10 /* HashType.SYMBOL */);
+    }
+}
+const objectToHashMap = new WeakMap();
+let nextHashMapId = 1;
+function getObjectHash(obj) {
+    let id = objectToHashMap.get(obj);
+    if (id === undefined) {
+        id = hashNumber(nextHashMapId++, 9 /* HashType.REFERENCE */);
+        objectToHashMap.set(obj, id);
+    }
+    return id;
+}
+const EMPTY_ARRAY_HASH = hashArray([]);
+// eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
+function hashReactiveFn(fn, args) {
+    return getObjectHash(fn) ^ (args.length > 0 ? hashArray(args) : EMPTY_ARRAY_HASH);
+}
+//# sourceMappingURL=hash.js.map

package/dist/cjs/internals/utils/hash.js.map

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

package/dist/cjs/internals/utils/stringify.d.ts

@@ -0,0 +1,3 @@
+export declare function getObjectId(obj: object): string;
+export declare function stringifyValue(value: unknown): string;
+//# sourceMappingURL=stringify.d.ts.map

package/dist/cjs/internals/utils/stringify.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stringify.d.ts","sourceRoot":"","sources":["../../../../src/internals/utils/stringify.ts"],"names":[],"mappings":"AAGA,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAO/C;AAWD,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAmCrD"}

package/dist/cjs/{utils.js → internals/utils/stringify.js}

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectId = getObjectId;
-exports.hashValue = hashValue;
-exports.getUnknownSignalFnName = getUnknownSignalFnName;
-const signals_js_1 = require("./signals.js");
+exports.stringifyValue = stringifyValue;
 const objectToIdMap = new WeakMap();
 let nextId = 1;
 function getObjectId(obj) {
@@ -21,7 +19,7 @@ function isPOJO(obj) {
 function isPlainArray(arr) {
     return Array.isArray(arr);
 }
-function hashValue(value) {
+function stringifyValue(value) {
     if (value === null)
         return 'null';
     if (value === undefined)
@@ -40,14 +38,14 @@ function hashValue(value) {
                 return value.toISOString();
             }
             if (isPlainArray(value)) {
-                return `[${value.map(hashValue).join(',')}]`;
+                return `[${value.map(stringifyValue).join(',')}]`;
             }
             if (isPOJO(value)) {
                 const entries = [
                     ...Object.entries(value),
                     ...Object.getOwnPropertySymbols(value).map(sym => [sym, value[sym]]),
                 ].sort(([a], [b]) => (String(a) < String(b) ? -1 : String(a) > String(b) ? 1 : 0));
-                return `{ ${entries.map(([k, v]) => `${String(k)}: ${hashValue(v)}`).join(', ')} }`;
+                return `{ ${entries.map(([k, v]) => `${String(k)}: ${stringifyValue(v)}`).join(', ')} }`;
             }
             return getObjectId(value);
         }
@@ -57,24 +55,4 @@ function hashValue(value) {
             return getObjectId(value);
     }
 }
-let UNKNOWN_SUBSCRIPTION_ID = 0;
-let UNKNOWN_COMPUTED_ID = 0;
-let UNKNOWN_ASYNC_COMPUTED_ID = 0;
-const UNKNOWN_SIGNAL_NAMES = new Map();
-function getUnknownSignalFnName(fn, makeSignal) {
-    let name = UNKNOWN_SIGNAL_NAMES.get(fn);
-    if (name === undefined) {
-        if (makeSignal === signals_js_1.createSubscriptionSignal) {
-            name = `unknownSubscription${UNKNOWN_SUBSCRIPTION_ID++}`;
-        }
-        else if (makeSignal === signals_js_1.createComputedSignal) {
-            name = `unknownComputed${UNKNOWN_COMPUTED_ID++}`;
-        }
-        else {
-            name = `unknownAsyncComputed${UNKNOWN_ASYNC_COMPUTED_ID++}`;
-        }
-        UNKNOWN_SIGNAL_NAMES.set(fn, name);
-    }
-    return name;
-}
-//# sourceMappingURL=utils.js.map
+//# sourceMappingURL=stringify.js.map

package/dist/cjs/internals/utils/stringify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stringify.js","sourceRoot":"","sources":["../../../../src/internals/utils/stringify.ts"],"names":[],"mappings":";;AAGA,kCAOC;AAWD,wCAmCC;AAxDD,MAAM,aAAa,GAAG,IAAI,OAAO,EAAkB,CAAC;AACpD,IAAI,MAAM,GAAG,CAAC,CAAC;AAEf,SAAgB,WAAW,CAAC,GAAW;IACrC,IAAI,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAChC,IAAI,EAAE,KAAK,SAAS,EAAE,CAAC;QACrB,EAAE,GAAG,OAAO,MAAM,EAAE,EAAE,CAAC;QACvB,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,4CAA4C;AAC5C,SAAS,MAAM,CAAC,GAAW;IACzB,OAAO,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,MAAM,CAAC,SAAS,CAAC;AACzD,CAAC;AAED,SAAS,YAAY,CAAC,GAAY;IAChC,OAAO,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,cAAc,CAAC,KAAc;IAC3C,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IAClC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,WAAW,CAAC;IAE5C,QAAQ,OAAO,KAAK,EAAE,CAAC;QACrB,KAAK,QAAQ,CAAC;QACd,KAAK,SAAS,CAAC;QACf,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,KAAK,QAAQ;YACX,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC1B,KAAK,QAAQ;YACX,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,KAAK,QAAQ,CAAC,CAAC,CAAC;YACd,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;gBAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;YAC7B,CAAC;YACD,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;gBACxB,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YACpD,CAAC;YACD,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClB,MAAM,OAAO,GAAG;oBACd,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC;oBACxB,GAAG,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,GAAyB,CAAC,CAAC,CAAC;iBAC3F,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEnF,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;YAC3F,CAAC;YACD,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B,CAAC;QACD,KAAK,UAAU;YACb,OAAO,WAAW,CAAC,KAAK,CAAC,CAAC;QAC5B;YACE,OAAO,WAAW,CAAC,KAAe,CAAC,CAAC;IACxC,CAAC;AACH,CAAC"}

package/dist/cjs/internals/utils/type-utils.d.ts

@@ -0,0 +1,6 @@
+import { ReactivePromise } from '../async.js';
+export declare const unreachable: (value: never) => never;
+export declare function isGeneratorResult(value: object): value is Generator;
+export declare function isPromise(value: object): value is Promise<unknown>;
+export declare function isReactivePromise(value: object): value is ReactivePromise<unknown>;
+//# sourceMappingURL=type-utils.d.ts.map

package/dist/cjs/internals/utils/type-utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../../../../src/internals/utils/type-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAE9C,eAAO,MAAM,WAAW,UAAW,KAAK,UAEvC,CAAC;AAIF,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,SAAS,CAEnE;AAED,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,OAAO,CAAC,OAAO,CAAC,CAElE;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,eAAe,CAAC,OAAO,CAAC,CAElF"}

package/dist/cjs/internals/utils/type-utils.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.unreachable = void 0;
+exports.isGeneratorResult = isGeneratorResult;
+exports.isPromise = isPromise;
+exports.isReactivePromise = isReactivePromise;
+const async_js_1 = require("../async.js");
+const unreachable = (value) => {
+    throw new Error(`Unreachable code: ${value}`);
+};
+exports.unreachable = unreachable;
+const GeneratorResultConstructor = (function* () { })().constructor;
+function isGeneratorResult(value) {
+    return value.constructor === GeneratorResultConstructor;
+}
+function isPromise(value) {
+    return value.constructor === Promise;
+}
+function isReactivePromise(value) {
+    return value.constructor === async_js_1.ReactivePromise;
+}
+//# sourceMappingURL=type-utils.js.map

package/dist/cjs/internals/utils/type-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../../../../src/internals/utils/type-utils.ts"],"names":[],"mappings":";;;AAQA,8CAEC;AAED,8BAEC;AAED,8CAEC;AAlBD,0CAA8C;AAEvC,MAAM,WAAW,GAAG,CAAC,KAAY,EAAE,EAAE;IAC1C,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,EAAE,CAAC,CAAC;AAChD,CAAC,CAAC;AAFW,QAAA,WAAW,eAEtB;AAEF,MAAM,0BAA0B,GAAG,CAAC,QAAQ,CAAC,MAAK,CAAC,CAAC,EAAE,CAAC,WAAW,CAAC;AAEnE,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,OAAO,KAAK,CAAC,WAAW,KAAK,0BAA0B,CAAC;AAC1D,CAAC;AAED,SAAgB,SAAS,CAAC,KAAa;IACrC,OAAO,KAAK,CAAC,WAAW,KAAK,OAAO,CAAC;AACvC,CAAC;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,OAAO,KAAK,CAAC,WAAW,KAAK,0BAAe,CAAC;AAC/C,CAAC"}

package/dist/cjs/react/context.d.ts

@@ -1,4 +1,4 @@
-import { SignalScope } from '../hooks.js';
+import { SignalScope } from '../internals/contexts.js';
 export declare const ScopeContext: import("react").Context<SignalScope | undefined>;
 export declare function useScope(): SignalScope | undefined;
 //# sourceMappingURL=context.d.ts.map

package/dist/cjs/react/context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/react/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C,eAAO,MAAM,YAAY,kDAAoD,CAAC;AAE9E,wBAAgB,QAAQ,4BAEvB"}
+{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../../src/react/context.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvD,eAAO,MAAM,YAAY,kDAAoD,CAAC;AAE9E,wBAAgB,QAAQ,4BAEvB"}

package/dist/cjs/react/provider.d.ts

@@ -1,7 +1,8 @@
-import { SignalStoreMap } from '../hooks.js';
-export declare function ContextProvider({ children, contexts, inherit, }: {
+import { ContextPair } from '../internals/contexts.js';
+export declare function ContextProvider<C extends unknown[]>({ children, contexts, inherit, root, }: {
     children: React.ReactNode;
-    contexts: SignalStoreMap;
+    contexts: [...ContextPair<C>];
     inherit?: boolean;
+    root?: boolean;
 }): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=provider.d.ts.map

package/dist/cjs/react/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/react/provider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAe,cAAc,EAAE,MAAM,aAAa,CAAC;AAG1D,wBAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,OAAc,GACf,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,EAAE,cAAc,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,2CAKA"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../../src/react/provider.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAe,WAAW,EAAe,MAAM,0BAA0B,CAAC;AAEjF,wBAAgB,eAAe,CAAC,CAAC,SAAS,OAAO,EAAE,EAAE,EACnD,QAAQ,EACR,QAAQ,EACR,OAAc,EACd,IAAY,GACb,EAAE;IACD,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;IAC1B,QAAQ,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,2CAWA"}

package/dist/cjs/react/provider.js

@@ -3,11 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContextProvider = ContextProvider;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
-const hooks_js_1 = require("../hooks.js");
 const context_js_1 = require("./context.js");
-function ContextProvider({ children, contexts, inherit = true, }) {
+const contexts_js_1 = require("../internals/contexts.js");
+function ContextProvider({ children, contexts, inherit = true, root = false, }) {
+    // if (root) {
+    //   useEffect(() => )
+    //   return <ScopeContext.Provider value={scope}>{children}</ScopeContext.Provider>;
+    // }
     const parentScope = (0, react_1.useContext)(context_js_1.ScopeContext);
-    const scope = new hooks_js_1.SignalScope(contexts, inherit ? parentScope : undefined);
+    const scope = new contexts_js_1.SignalScope(contexts, inherit ? parentScope : undefined);
     return (0, jsx_runtime_1.jsx)(context_js_1.ScopeContext.Provider, { value: scope, children: children });
 }
 //# sourceMappingURL=provider.js.map

package/dist/cjs/react/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/react/provider.tsx"],"names":[],"mappings":";;AAIA,0CAaC;;AAjBD,iCAAmC;AACnC,0CAA0D;AAC1D,6CAA4C;AAE5C,SAAgB,eAAe,CAAC,EAC9B,QAAQ,EACR,QAAQ,EACR,OAAO,GAAG,IAAI,GAKf;IACC,MAAM,WAAW,GAAG,IAAA,kBAAU,EAAC,yBAAY,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,sBAAW,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAE3E,OAAO,uBAAC,yBAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YAAG,QAAQ,GAAyB,CAAC;AACjF,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/react/provider.tsx"],"names":[],"mappings":";;AAIA,0CAqBC;;AAzBD,iCAAmC;AACnC,6CAA4C;AAC5C,0DAAiF;AAEjF,SAAgB,eAAe,CAAsB,EACnD,QAAQ,EACR,QAAQ,EACR,OAAO,GAAG,IAAI,EACd,IAAI,GAAG,KAAK,GAMb;IACC,cAAc;IACd,sBAAsB;IAEtB,oFAAoF;IACpF,IAAI;IAEJ,MAAM,WAAW,GAAG,IAAA,kBAAU,EAAC,yBAAY,CAAC,CAAC;IAC7C,MAAM,KAAK,GAAG,IAAI,yBAAW,CAAC,QAA6C,EAAE,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAEhH,OAAO,uBAAC,yBAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK,YAAG,QAAQ,GAAyB,CAAC;AACjF,CAAC"}

package/dist/cjs/react/setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/react/setup.ts"],"names":[],"mappings":"AAIA,wBAAgB,UAAU,SAKzB"}
+{"version":3,"file":"setup.d.ts","sourceRoot":"","sources":["../../../src/react/setup.ts"],"names":[],"mappings":"AAIA,wBAAgB,UAAU,SAMzB"}

package/dist/cjs/react/setup.js

@@ -6,7 +6,8 @@ const context_js_1 = require("./context.js");
 const signal_value_js_1 = require("./signal-value.js");
 function setupReact() {
     (0, config_js_1.setConfig)({
-        useSignalValue: signal_value_js_1.useSignalValue,
+        useDerivedSignal: signal_value_js_1.useDerivedSignal,
+        useStateSignal: signal_value_js_1.useStateSignal,
         getFrameworkScope: context_js_1.useScope,
     });
 }

package/dist/cjs/react/setup.js.map

@@ -1 +1 @@
-{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/react/setup.ts"],"names":[],"mappings":";;AAIA,gCAKC;AATD,4CAAyC;AACzC,6CAAwC;AACxC,uDAAmD;AAEnD,SAAgB,UAAU;IACxB,IAAA,qBAAS,EAAC;QACR,cAAc,EAAd,gCAAc;QACd,iBAAiB,EAAE,qBAAQ;KAC5B,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../../src/react/setup.ts"],"names":[],"mappings":";;AAIA,gCAMC;AAVD,4CAAyC;AACzC,6CAAwC;AACxC,uDAAqE;AAErE,SAAgB,UAAU;IACxB,IAAA,qBAAS,EAAC;QACR,gBAAgB,EAAhB,kCAAgB;QAChB,cAAc,EAAd,gCAAc;QACd,iBAAiB,EAAE,qBAAQ;KAC5B,CAAC,CAAC;AACL,CAAC"}

package/dist/cjs/react/signal-value.d.ts

@@ -1,2 +1,6 @@
-export declare function useSignalValue<T>(key: string, fn: () => T): T;
+import type { DerivedSignal } from '../internals/derived.js';
+import type { StateSignal } from '../internals/state.js';
+import type { ReactiveValue } from '../types.js';
+export declare function useStateSignal<T>(signal: StateSignal<T>): T;
+export declare function useDerivedSignal<T>(signal: DerivedSignal<T, unknown[]>): ReactiveValue<T>;
 //# sourceMappingURL=signal-value.d.ts.map

package/dist/cjs/react/signal-value.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signal-value.d.ts","sourceRoot":"","sources":["../../../src/react/signal-value.ts"],"names":[],"mappings":"AAuBA,wBAAgB,cAAc,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC,CAqE7D"}
+{"version":3,"file":"signal-value.d.ts","sourceRoot":"","sources":["../../../src/react/signal-value.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA4BjD,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAU3D;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CA4BzF"}

package/dist/cjs/react/signal-value.js

@@ -33,65 +33,55 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSignalValue = useSignalValue;
+exports.useStateSignal = useStateSignal;
+exports.useDerivedSignal = useDerivedSignal;
 /* eslint-disable react-hooks/rules-of-hooks */
 const react_1 = __importStar(require("react"));
-const context_js_1 = require("./context.js");
-const hooks_js_1 = require("../hooks.js");
+const type_utils_js_1 = require("../internals/utils/type-utils.js");
+const async_js_1 = require("../internals/async.js");
 // This is a private React internal that we need to access to check if we are rendering.
 // There is no other consistent way to check if we are rendering in both development
 // and production, and it doesn't appear that the React team wants to add one. This
 // should be checked on every major React version upgrade.
 const REACT_INTERNALS = react_1.default.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED ||
-    react_1.default.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
+    react_1.default.__CLIENT_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE ||
+    react_1.default.__SERVER_INTERNALS_DO_NOT_USE_OR_WARN_USERS_THEY_CANNOT_UPGRADE;
 const ReactCurrentDispatcher = REACT_INTERNALS.ReactCurrentDispatcher || REACT_INTERNALS;
+const ReactCurrentOwner = REACT_INTERNALS.ReactCurrentOwner || REACT_INTERNALS;
 const getReactCurrentDispatcher = () => {
-    return ReactCurrentDispatcher?.current || ReactCurrentDispatcher?.A || null;
+    return ReactCurrentDispatcher.current || REACT_INTERNALS.H;
+};
+const getReactCurrentOwner = () => {
+    return ReactCurrentOwner.current || REACT_INTERNALS.A;
 };
 function isRendering() {
-    return getReactCurrentDispatcher() !== null;
+    return !!getReactCurrentDispatcher() && !!getReactCurrentOwner();
 }
-function useSignalValue(key, fn) {
+function useStateSignal(signal) {
     if (!isRendering()) {
-        return fn();
+        return signal.peek();
     }
-    const [, setVersion] = (0, react_1.useState)(0);
-    const scope = (0, react_1.useContext)(context_js_1.ScopeContext);
-    const ref = (0, react_1.useRef)({
-        value: undefined,
-        sub: undefined,
-        unsub: undefined,
-        key: undefined,
-    });
-    const currentKey = ref.current.key;
-    if (key !== currentKey) {
-        ref.current.unsub?.();
-        const w = (0, hooks_js_1.watcher)(fn, { scope });
-        let initialized = false;
-        ref.current.sub = () => {
-            if (ref.current.unsub) {
-                return ref.current.unsub;
-            }
-            const unsub = w.addListener(value => {
-                ref.current.value = value;
-                // Trigger an update to the component
-                if (initialized) {
-                    setVersion(v => v + 1);
-                }
-                initialized = true;
-            }, {
-                immediate: true,
-            });
-            ref.current.unsub = () => {
-                ref.current.unsub = undefined;
-                unsub();
-            };
-            return ref.current.unsub;
-        };
-        ref.current.sub();
-        ref.current.key = key;
+    return (0, react_1.useSyncExternalStore)((0, react_1.useCallback)(onStoreChange => signal.addListener(onStoreChange), [signal]), () => signal.peek(), () => signal.peek());
+}
+function useDerivedSignal(signal) {
+    if (!isRendering()) {
+        return signal.get();
+    }
+    const value = (0, react_1.useSyncExternalStore)(signal.addListenerLazy(), () => signal.get(), () => signal.get());
+    // Reactive promises can update their value independently of the signal, since
+    // we reuse the same promise object for each result. We need to entangle the
+    // version of the promise here so that we can trigger a re-render when the
+    // promise value updates.
+    //
+    // If hooks could be called in dynamic order this would not be necessary, we
+    // could entangle the promise when it is used. But, because that is not the
+    // case, we need to eagerly entangle.
+    if (typeof value === 'object' && value !== null && (0, type_utils_js_1.isReactivePromise)(value)) {
+        if ((0, async_js_1.isReactiveSubscription)(value)) {
+            useDerivedSignal(value['_signal']);
+        }
+        useStateSignal(value['_version']);
     }
-    (0, react_1.useSyncExternalStore)(ref.current.sub, () => ref.current.value, () => ref.current.value);
-    return ref.current.value;
+    return value;
 }
 //# sourceMappingURL=signal-value.js.map

package/dist/cjs/react/signal-value.js.map

@@ -1 +1 @@
-{"version":3,"file":"signal-value.js","sourceRoot":"","sources":["../../../src/react/signal-value.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,wCAqEC;AA5FD,+CAA+C;AAC/C,+CAA+F;AAC/F,6CAA4C;AAC5C,0CAAsC;AAEtC,wFAAwF;AACxF,oFAAoF;AACpF,mFAAmF;AACnF,0DAA0D;AAC1D,MAAM,eAAe,GAClB,eAAa,CAAC,kDAAkD;IAChE,eAAa,CAAC,+DAA+D,CAAC;AAEjF,MAAM,sBAAsB,GAAG,eAAe,CAAC,sBAAsB,IAAI,eAAe,CAAC;AAEzF,MAAM,yBAAyB,GAAG,GAAG,EAAE;IACrC,OAAO,sBAAsB,EAAE,OAAO,IAAI,sBAAsB,EAAE,CAAC,IAAI,IAAI,CAAC;AAC9E,CAAC,CAAC;AAEF,SAAS,WAAW;IAClB,OAAO,yBAAyB,EAAE,KAAK,IAAI,CAAC;AAC9C,CAAC;AAED,SAAgB,cAAc,CAAI,GAAW,EAAE,EAAW;IACxD,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACnB,OAAO,EAAE,EAAE,CAAC;IACd,CAAC;IAED,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,IAAA,kBAAU,EAAC,yBAAY,CAAC,CAAC;IACvC,MAAM,GAAG,GAAG,IAAA,cAAM,EAKf;QACD,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;QACd,KAAK,EAAE,SAAS;QAChB,GAAG,EAAE,SAAS;KACf,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC;IAEnC,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;QAEtB,MAAM,CAAC,GAAG,IAAA,kBAAO,EAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAEjC,IAAI,WAAW,GAAG,KAAK,CAAC;QAExB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,EAAE;YACrB,IAAI,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACtB,OAAO,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC;YAC3B,CAAC;YAED,MAAM,KAAK,GAAG,CAAC,CAAC,WAAW,CACzB,KAAK,CAAC,EAAE;gBACN,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;gBAE1B,qCAAqC;gBACrC,IAAI,WAAW,EAAE,CAAC;oBAChB,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;gBACzB,CAAC;gBAED,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC,EACD;gBACE,SAAS,EAAE,IAAI;aAChB,CACF,CAAC;YAEF,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,GAAG,EAAE;gBACvB,GAAG,CAAC,OAAO,CAAC,KAAK,GAAG,SAAS,CAAC;gBAC9B,KAAK,EAAE,CAAC;YACV,CAAC,CAAC;YAEF,OAAO,GAAG,CAAC,OAAO,CAAC,KAAM,CAAC;QAC5B,CAAC,CAAC;QAEF,GAAG,CAAC,OAAO,CAAC,GAAI,EAAE,CAAC;QAEnB,GAAG,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC;IACxB,CAAC;IAED,IAAA,4BAAoB,EAClB,GAAG,CAAC,OAAO,CAAC,GAAI,EAChB,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAM,EACxB,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,KAAM,CACzB,CAAC;IAEF,OAAO,GAAG,CAAC,OAAO,CAAC,KAAM,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"signal-value.js","sourceRoot":"","sources":["../../../src/react/signal-value.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgCA,wCAUC;AAED,4CA4BC;AAxED,+CAA+C;AAC/C,+CAAiE;AAIjE,oEAAqE;AACrE,oDAA+D;AAE/D,wFAAwF;AACxF,oFAAoF;AACpF,mFAAmF;AACnF,0DAA0D;AAC1D,MAAM,eAAe,GAClB,eAAa,CAAC,kDAAkD;IAChE,eAAa,CAAC,+DAA+D;IAC7E,eAAa,CAAC,+DAA+D,CAAC;AAEjF,MAAM,sBAAsB,GAAG,eAAe,CAAC,sBAAsB,IAAI,eAAe,CAAC;AACzF,MAAM,iBAAiB,GAAG,eAAe,CAAC,iBAAiB,IAAI,eAAe,CAAC;AAE/E,MAAM,yBAAyB,GAAG,GAAG,EAAE;IACrC,OAAO,sBAAsB,CAAC,OAAO,IAAI,eAAe,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,GAAG,EAAE;IAChC,OAAO,iBAAiB,CAAC,OAAO,IAAI,eAAe,CAAC,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,SAAS,WAAW;IAClB,OAAO,CAAC,CAAC,yBAAyB,EAAE,IAAI,CAAC,CAAC,oBAAoB,EAAE,CAAC;AACnE,CAAC;AAED,SAAgB,cAAc,CAAI,MAAsB;IACtD,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;IACvB,CAAC;IAED,OAAO,IAAA,4BAAoB,EACzB,IAAA,mBAAW,EAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,aAAa,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,EACzE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,EACnB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CACpB,CAAC;AACJ,CAAC;AAED,SAAgB,gBAAgB,CAAI,MAAmC;IACrE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;QACnB,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC;IACtB,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,4BAAoB,EAChC,MAAM,CAAC,eAAe,EAAE,EACxB,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,EAClB,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,EAAE,CACnB,CAAC;IAEF,8EAA8E;IAC9E,4EAA4E;IAC5E,0EAA0E;IAC1E,yBAAyB;IACzB,EAAE;IACF,4EAA4E;IAC5E,2EAA2E;IAC3E,qCAAqC;IACrC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,IAAA,iCAAiB,EAAC,KAAK,CAAC,EAAE,CAAC;QAC5E,IAAI,IAAA,iCAAsB,EAAC,KAAK,CAAC,EAAE,CAAC;YAClC,gBAAgB,CAAC,KAAK,CAAC,SAAS,CAAkC,CAAC,CAAC;QACtE,CAAC;QAED,cAAc,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,KAAyB,CAAC;AACnC,CAAC"}