signalium 0.3.7 → 1.0.0

package/src/trace.ts

@@ -1,23 +1,22 @@
-import { scheduleTracer } from './scheduling.js';
-import { ComputedSignal } from './signals.js';
-import { Signal, Watcher } from './types.js';
+import { scheduleTracer } from './internals/scheduling.js';
+import { DerivedSignal, SignalId } from './internals/derived.js';
+import { Signal } from './types.js';
 
 export let TRACER: TracerProxy | undefined;
 
-export enum VisualizerNodeType {
-  State,
-  Computed,
-  AsyncComputed,
-  Subscription,
-  Watcher,
-}
-
 export interface VisualizerLink {
   connected: boolean;
   version: number;
   node: VisualizerNode;
 }
 
+export interface TracerMeta {
+  id: string | number;
+  desc: string;
+  params: string;
+  tracer?: Tracer;
+}
+
 export enum TracerEventType {
   StartUpdate = 'StartUpdate',
   EndUpdate = 'EndUpdate',
@@ -32,46 +31,46 @@ export enum TracerEventType {
 
 type StartUpdateEvent = {
   type: TracerEventType.StartUpdate;
-  id: string;
+  id: string | number;
 };
 
 type EndUpdateEvent = {
   type: TracerEventType.EndUpdate;
-  id: string;
+  id: string | number;
   value: unknown;
   preserveChildren?: boolean;
 };
 
 type StartLoadingEvent = {
   type: TracerEventType.StartLoading;
-  id: string;
+  id: string | number;
 };
 
 type EndLoadingEvent = {
   type: TracerEventType.EndLoading;
-  id: string;
+  id: string | number;
   value: unknown;
 };
 
 type ConnectedEvent = {
   type: TracerEventType.Connected;
-  id: string;
-  childId: string;
-  nodeType: VisualizerNodeType;
+  id: string | number;
+  childId: string | number;
+  nodeType: SignalType;
   name?: string;
   params?: string;
 };
 
 type DisconnectedEvent = {
   type: TracerEventType.Disconnected;
-  id: string;
-  childId: string;
+  id: string | number;
+  childId: string | number;
 };
 
 type ConsumeStateEvent = {
   type: TracerEventType.ConsumeState;
-  id: string;
-  childId: string;
+  id: string | number;
+  childId: string | number;
   value: unknown;
   setValue: (value: unknown) => void;
 };
@@ -85,6 +84,12 @@ type TracerEvent =
   | DisconnectedEvent
   | ConsumeStateEvent;
 
+export enum SignalType {
+  State = 'state',
+  Reactive = 'reactive',
+  Watcher = 'watcher',
+}
+
 export class VisualizerNode {
   private subscribers: (() => void)[] = [];
 
@@ -102,8 +107,8 @@ export class VisualizerNode {
   constructor(
     private tracer: Tracer,
     public depth: number,
-    public type: VisualizerNodeType,
-    public id: string,
+    public type: SignalType,
+    public id: string | number,
     public value: unknown,
     public name?: string,
     public params?: string,
@@ -125,7 +130,7 @@ export class VisualizerNode {
   }
 
   setValue(value: unknown) {
-    if (this.type !== VisualizerNodeType.State) {
+    if (this.type !== SignalType.State) {
       throw new Error('setValue is only allowed on state nodes');
     }
 
@@ -168,7 +173,7 @@ export class VisualizerNode {
     return shouldSkip;
   }
 
-  disconnectChild(childId: string) {
+  disconnectChild(childId: string | number) {
     const childLink = this.children.find(link => link.node.id === childId);
 
     if (!childLink) {
@@ -208,7 +213,7 @@ export class VisualizerNode {
     this.notify();
   }
 
-  consumeState(id: string, value: unknown, setValue: (value: unknown) => void) {
+  consumeState(id: string | number, value: unknown, setValue: (value: unknown) => void) {
     const existing = this.stateChildren.find(child => child.id === id);
 
     if (existing) {
@@ -219,7 +224,7 @@ export class VisualizerNode {
       const node = new VisualizerNode(
         this.tracer,
         this.depth + 1,
-        VisualizerNodeType.State,
+        SignalType.State,
         id,
         value,
         undefined,
@@ -281,7 +286,7 @@ class TraceFlush {
 }
 
 export class Tracer {
-  private nodeMap = new Map<string, VisualizerNode>();
+  private nodeMap = new Map<string | number, VisualizerNode>();
 
   delay = 200;
   maxDepth = 0;
@@ -289,7 +294,7 @@ export class Tracer {
   private initialized = false;
 
   constructor(
-    id: string,
+    id: string | number,
     immediate = false,
     public showParams = true,
     public showValue = true,
@@ -298,7 +303,7 @@ export class Tracer {
     // If it's immediate, we should run the first flush immediately, skipping animations
     this.initialized = !immediate;
 
-    const node = new VisualizerNode(this, 0, VisualizerNodeType.Watcher, id, '');
+    const node = new VisualizerNode(this, 0, SignalType.Watcher, id, '');
 
     this.rootNode = node;
     this.nodeMap.set(id, node);
@@ -313,14 +318,14 @@ export class Tracer {
     if (event.type === TracerEventType.Connected || event.type === TracerEventType.ConsumeState) {
       const node = this.nodeMap.get(event.id);
 
-      if (!node) {
+      if (!node || (event.type === TracerEventType.Connected && !event.name)) {
         return;
       }
 
       if (!this.nodeMap.has(event.childId)) {
         const name = event.type === TracerEventType.Connected ? event.name : undefined;
         const params = event.type === TracerEventType.Connected ? event.params : undefined;
-        const nodeType = event.type === TracerEventType.Connected ? event.nodeType : VisualizerNodeType.State;
+        const nodeType = event.type === TracerEventType.Connected ? event.nodeType : SignalType.State;
 
         this.nodeMap.set(
           event.childId,
@@ -402,7 +407,7 @@ class TracerProxy {
     this.tracers.forEach(tracer => tracer.emit(event));
   }
 
-  createTracer(id: string, immediate = false): Tracer {
+  createTracer(id: string | number, immediate = false): Tracer {
     const tracer = new Tracer(id, immediate);
 
     this.tracers.push(tracer);
@@ -427,12 +432,12 @@ export function setTracing(enabled: boolean) {
   }
 }
 
-export function createTracer(_signal: Signal<unknown> | Watcher<unknown>, immediate = false) {
-  const signal = _signal as ComputedSignal<unknown>;
-  return createTracerFromId(signal._opts.id, immediate);
+export function createTracer(_signal: Signal<unknown>, immediate = false) {
+  const signal = _signal as unknown as DerivedSignal<unknown, unknown[]>;
+  return createTracerFromId(signal.tracerMeta!.id, immediate);
 }
 
-export function createTracerFromId(id: string, immediate = false) {
+export function createTracerFromId(id: string | number, immediate = false) {
   if (!TRACER) {
     throw new Error('Tracing is not enabled');
   }

package/src/transform.ts

@@ -0,0 +1,113 @@
+import type { NodePath, PluginObj, types as t } from '@babel/core';
+
+export interface SignaliumAsyncTransformOptions {
+  transformedImports: [string, string | RegExp][];
+}
+
+export function signaliumAsyncTransform(opts?: SignaliumAsyncTransformOptions): (api: any) => PluginObj {
+  const transformedImports: Record<string, [string | RegExp]> = {
+    callback: ['signalium'],
+    reactive: ['signalium'],
+    subscription: ['signalium'],
+    task: ['signalium'],
+  };
+
+  for (const [name, path] of opts?.transformedImports ?? []) {
+    const existing = transformedImports[name];
+
+    if (existing) {
+      existing.push(path);
+    } else {
+      transformedImports[name] = [path];
+    }
+  }
+
+  return api => {
+    const t = api.types;
+
+    const isReactiveCall = (path: any) => {
+      if (!t.isCallExpression(path.node)) return false;
+      const callee = path.node.callee;
+
+      const importPath = transformedImports[callee.name];
+
+      if (!importPath) return false;
+
+      // Check if reactive is imported from signalium
+      const binding = path.scope.getBinding(callee.name);
+      if (!binding || !t.isImportSpecifier(binding.path.node)) return false;
+
+      const importDecl = binding.path.parent;
+
+      if (!t.isImportDeclaration(importDecl)) return false;
+
+      return importPath.some(p =>
+        typeof p === 'string' ? importDecl.source.value === p : p.test(importDecl.source.value),
+      );
+    };
+
+    function convertReactiveToGenerator(path: NodePath<t.FunctionExpression | t.ArrowFunctionExpression>) {
+      // Only transform if parent is a reactive() call
+      const parentPath = path.parentPath;
+      if (!isReactiveCall(parentPath)) return;
+      if (!path.node.async) return;
+
+      // Transform all await expressions to yields
+      path.traverse({
+        AwaitExpression(awaitPath) {
+          const funcParent = awaitPath.getFunctionParent();
+          if (funcParent?.node !== path.node) return;
+
+          awaitPath.replaceWith(t.yieldExpression(awaitPath.node.argument));
+        },
+      });
+
+      // Remove async keyword
+      path.node.async = false;
+
+      if (t.isArrowFunctionExpression(path.node)) {
+        // Convert arrow function to regular function expression
+        let hasThis = false;
+
+        // Scan for this keywords
+        path.traverse({
+          ThisExpression() {
+            hasThis = true;
+          },
+        });
+
+        const functionBody = t.isBlockStatement(path.node.body)
+          ? path.node.body
+          : t.blockStatement([t.returnStatement(path.node.body)]);
+
+        const newFunction = t.functionExpression(
+          null,
+          path.node.params,
+          functionBody,
+          true, // generator
+          false, // async
+        );
+
+        // If we found 'this' usage, wrap in bind call
+        if (hasThis) {
+          path.replaceWith(
+            t.callExpression(t.memberExpression(newFunction, t.identifier('bind')), [t.thisExpression()]),
+          );
+        } else {
+          path.replaceWith(newFunction);
+        }
+      } else {
+        // Regular function - just set generator flag
+        path.node.generator = true;
+      }
+    }
+
+    return {
+      name: 'transform-reactive-async',
+      visitor: {
+        FunctionExpression: convertReactiveToGenerator,
+        ArrowFunctionExpression: convertReactiveToGenerator,
+      },
+    };
+  };
+}

package/src/types.ts

@@ -1,91 +1,101 @@
-import type { SignalScope } from './hooks.js';
+import { SignalScope } from './internals/contexts.js';
 
 export interface Signal<T = unknown> {
   get(): T;
+  addListener(listener: SignalListener): () => void;
 }
 
 export interface WriteableSignal<T> extends Signal<T> {
   set(value: T): void;
 }
 
-export type AsyncSignal<T> = Signal<AsyncResult<T>>;
-
-export type SignalCompute<T> = (prev: T | undefined) => T;
-
-export type SignalAsyncCompute<T> = (prev: T | undefined) => T | Promise<T>;
-
 export type SignalEquals<T> = (prev: T, next: T) => boolean;
 
+export type SignalListener = () => void;
+
 export type SignalSubscription = {
   update?(): void;
   unsubscribe?(): void;
 };
 
 export interface SubscriptionState<T> {
-  get: () => T;
-  set: (value: T) => void;
+  get: () => T | undefined;
+  set: (value: T | Promise<T>) => void;
+  setError: (error: unknown) => void;
 }
 
-export type SignalSubscribe<T, Args extends unknown[]> = (
+export type SignalSubscribe<T> = (
   state: SubscriptionState<T>,
-  ...args: Args
 ) => SignalSubscription | (() => unknown) | undefined | void;
 
 export interface SignalOptions<T, Args extends unknown[]> {
   equals?: SignalEquals<T> | false;
   id?: string;
   desc?: string;
-  params?: string;
   scope?: SignalScope;
   paramKey?: (...args: Args) => string;
 }
 
 export interface SignalOptionsWithInit<T, Args extends unknown[]> extends SignalOptions<T, Args> {
-  initValue: T;
-}
-
-export interface AsyncBaseResult<T> {
-  invalidate(): void;
-  await(): T;
+  initValue: T extends Promise<infer U> ? U : T extends Generator<any, infer U, any> ? U : T;
 }
 
-export interface AsyncPending<T> extends AsyncBaseResult<T> {
-  result: undefined;
-  error: unknown;
-  isPending: boolean;
-  isReady: false;
-  isError: boolean;
-  isSuccess: boolean;
-  didResolve: boolean;
+export interface Thenable<T> {
+  then(onfulfilled?: (value: T) => void, onrejected?: (reason: unknown) => void): void;
+  finally: any;
+  catch: any;
+  [Symbol.toStringTag]: string;
 }
 
-export interface AsyncReady<T> extends AsyncBaseResult<T> {
-  result: T;
+export interface BaseReactivePromise<T> extends Promise<T> {
+  value: T | undefined;
   error: unknown;
-  isPending: boolean;
-  isReady: true;
-  isError: boolean;
-  isSuccess: boolean;
-  didResolve: boolean;
-}
-
-export type AsyncResult<T> = AsyncPending<T> | AsyncReady<T>;
 
-export interface AsyncTask<T, RunArgs extends unknown[] = unknown[]> {
-  result: T | undefined;
-  error: unknown;
   isPending: boolean;
-  isSuccess: boolean;
-  isError: boolean;
+  isRejected: boolean;
+  isResolved: boolean;
+  isSettled: boolean;
   isReady: boolean;
 
-  run(...args: RunArgs): Promise<T>;
+  rerun(): void;
 }
 
-export interface WatcherListenerOptions {
-  immediate?: boolean;
+export interface PendingReactivePromise<T> extends BaseReactivePromise<T> {
+  value: undefined;
+  isReady: false;
 }
 
-export interface Watcher<T> {
-  addListener(listener: (value: T) => void, opts?: WatcherListenerOptions): () => void;
+export interface ReadyReactivePromise<T> extends BaseReactivePromise<T> {
+  value: T;
+  isReady: true;
 }
+
+export type ReactivePromise<T> = PendingReactivePromise<T> | ReadyReactivePromise<T>;
+
+export type ReactiveTask<T, Args extends unknown[]> = Omit<ReactivePromise<T>, 'notify'> & {
+  run(...args: Args): ReactivePromise<T>;
+};
+
+export type ReactiveSubscription<T> = Omit<ReactivePromise<T>, 'rerun'>;
+
+export type ReactiveValue<T> =
+  // We have to first check if T is a ReactiveTask, because it will also match Promise<T>
+  T extends ReactiveTask<infer U, infer Args>
+    ? ReactiveTask<U, Args>
+    : T extends Promise<infer U>
+      ? ReactivePromise<U>
+      : T extends Generator<any, infer U>
+        ? ReactivePromise<U>
+        : T;
+
+// This type is used when initial values are provided to async functions and
+// subscriptions. It allows us to skip checking `isReady` when there is always
+// a guaranteed value to return.
+export type ReadyReactiveValue<T> =
+  T extends ReactiveTask<infer U, infer Args>
+    ? ReactiveTask<U, Args>
+    : T extends Promise<infer U>
+      ? ReadyReactivePromise<U>
+      : T extends Generator<any, infer U>
+        ? ReadyReactivePromise<U>
+        : T;

package/transform.js

@@ -0,0 +1,19 @@
+// This file is for backwards compatibility with non-module build systems
+//
+// TODO: Generate this automatically on build/publish
+
+'use strict';
+Object.defineProperty(exports, '__esModule', {
+  value: true,
+});
+var _index = require('./dist/cjs/transform.js');
+Object.keys(_index).forEach(function (key) {
+  if (key === 'default' || key === '__esModule') return;
+  if (key in exports && exports[key] === _index[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _index[key];
+    },
+  });
+});

package/vitest.workspace.ts

@@ -2,9 +2,32 @@
 
 import { defineWorkspace } from 'vitest/config';
 import react from '@vitejs/plugin-react';
+import babel from 'vite-plugin-babel';
+import { signaliumAsyncTransform } from './src/transform.js';
 
 export default defineWorkspace([
   {
+    plugins: [
+      (babel as any)({
+        filter: /\.(j|t)sx?$/,
+        babelConfig: {
+          babelrc: false,
+          configFile: false,
+          sourceMaps: true,
+          plugins: [
+            signaliumAsyncTransform({
+              transformedImports: [
+                ['reactive', /instrumented-hooks.js$/],
+                ['task', /instrumented-hooks.js$/],
+              ],
+            }),
+          ],
+          parserOpts: {
+            plugins: ['typescript'],
+          },
+        },
+      }),
+    ],
     test: {
       include: ['src/__tests__/**/*.test.ts'],
       name: 'unit',
@@ -12,9 +35,22 @@ export default defineWorkspace([
     },
   },
   {
-    plugins: [react()],
+    plugins: [
+      react({
+        babel: {
+          plugins: [
+            signaliumAsyncTransform({
+              transformedImports: [
+                ['reactive', /instrumented-hooks.js$/],
+                ['task', /instrumented-hooks.js$/],
+              ],
+            }),
+          ],
+        },
+      }),
+    ],
     test: {
-      include: ['src/**/*.test.ts'],
+      include: ['src/react/__tests__/**/*.test.ts(x)'],
       browser: {
         enabled: true,
         provider: 'playwright',

package/dist/cjs/scheduling.d.ts

@@ -1,11 +0,0 @@
-import { ComputedSignal } from './signals.js';
-import { Tracer } from './trace.js';
-export declare const scheduleWatcher: (watcher: ComputedSignal<any>) => void;
-export declare const scheduleDirty: (signal: ComputedSignal<any>) => void;
-export declare const schedulePull: (signal: ComputedSignal<any>) => void;
-export declare const scheduleConnect: (connect: ComputedSignal<any>) => void;
-export declare const scheduleDisconnect: (disconnect: ComputedSignal<any>) => void;
-export declare const scheduleEffect: (signal: ComputedSignal<any>) => void;
-export declare const scheduleTracer: (tracer: Tracer) => void;
-export declare const settled: () => Promise<void>;
-//# sourceMappingURL=scheduling.d.ts.map

package/dist/cjs/scheduling.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"scheduling.d.ts","sourceRoot":"","sources":["../../src/scheduling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAyBpC,eAAO,MAAM,eAAe,YAAa,cAAc,CAAC,GAAG,CAAC,SAI3D,CAAC;AAEF,eAAO,MAAM,aAAa,WAAY,cAAc,CAAC,GAAG,CAAC,SAGxD,CAAC;AAEF,eAAO,MAAM,YAAY,WAAY,cAAc,CAAC,GAAG,CAAC,SAGvD,CAAC;AAEF,eAAO,MAAM,eAAe,YAAa,cAAc,CAAC,GAAG,CAAC,SAM3D,CAAC;AAEF,eAAO,MAAM,kBAAkB,eAAgB,cAAc,CAAC,GAAG,CAAC,SAMjE,CAAC;AAEF,eAAO,MAAM,cAAc,WAAY,cAAc,CAAC,GAAG,CAAC,SAGzD,CAAC;AAEF,eAAO,MAAM,cAAc,WAAY,MAAM,SAG5C,CAAC;AA0DF,eAAO,MAAM,OAAO,qBAInB,CAAC"}

package/dist/cjs/scheduling.js

@@ -1,108 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.settled = exports.scheduleTracer = exports.scheduleEffect = exports.scheduleDisconnect = exports.scheduleConnect = exports.schedulePull = exports.scheduleDirty = exports.scheduleWatcher = void 0;
-const config_js_1 = require("./config.js");
-let PENDING_DIRTIES = [];
-let PENDING_PULLS = [];
-let PENDING_WATCHERS = [];
-let PENDING_CONNECTS = new Map();
-let PENDING_DISCONNECTS = new Map();
-let PENDING_EFFECTS = [];
-let PENDING_TRACERS = [];
-const microtask = () => Promise.resolve();
-let currentFlush = null;
-const scheduleFlush = (fn) => {
-    if (currentFlush)
-        return;
-    let resolve;
-    const promise = new Promise(r => (resolve = r));
-    currentFlush = { promise, resolve: resolve };
-    (0, config_js_1.scheduleFlush)(flushWatchers);
-};
-const scheduleWatcher = (watcher) => {
-    PENDING_WATCHERS.push(watcher);
-    scheduleFlush(flushWatchers);
-};
-exports.scheduleWatcher = scheduleWatcher;
-const scheduleDirty = (signal) => {
-    PENDING_DIRTIES.push(signal);
-    scheduleFlush(flushWatchers);
-};
-exports.scheduleDirty = scheduleDirty;
-const schedulePull = (signal) => {
-    PENDING_PULLS.push(signal);
-    scheduleFlush(flushWatchers);
-};
-exports.schedulePull = schedulePull;
-const scheduleConnect = (connect) => {
-    const current = PENDING_CONNECTS.get(connect) ?? 0;
-    PENDING_CONNECTS.set(connect, current + 1);
-    scheduleFlush(flushWatchers);
-};
-exports.scheduleConnect = scheduleConnect;
-const scheduleDisconnect = (disconnect) => {
-    const current = PENDING_DISCONNECTS.get(disconnect) ?? 0;
-    PENDING_DISCONNECTS.set(disconnect, current + 1);
-    scheduleFlush(flushWatchers);
-};
-exports.scheduleDisconnect = scheduleDisconnect;
-const scheduleEffect = (signal) => {
-    PENDING_EFFECTS.push(signal);
-    scheduleFlush(flushWatchers);
-};
-exports.scheduleEffect = scheduleEffect;
-const scheduleTracer = (tracer) => {
-    PENDING_TRACERS.push(tracer);
-    scheduleFlush(flushWatchers);
-};
-exports.scheduleTracer = scheduleTracer;
-const flushWatchers = async () => {
-    const flush = currentFlush;
-    // Flush all the dirty signals and pulls recursively, clearing
-    // the microtask queue until they are all settled
-    while (PENDING_DIRTIES.length > 0 || PENDING_PULLS.length > 0) {
-        for (const dirty of PENDING_DIRTIES) {
-            dirty._dirtyConsumers();
-        }
-        for (const pull of PENDING_PULLS) {
-            pull._check();
-        }
-        PENDING_DIRTIES = [];
-        PENDING_PULLS = [];
-        await microtask();
-    }
-    // Clear the flush so that if any more watchers are scheduled,
-    // they will be flushed in the next tick
-    currentFlush = null;
-    (0, config_js_1.runBatch)(() => {
-        for (const watcher of PENDING_WATCHERS) {
-            watcher._check();
-        }
-        for (const [signal, count] of PENDING_CONNECTS) {
-            signal._check(true, count);
-        }
-        for (const [signal, count] of PENDING_DISCONNECTS) {
-            signal._disconnect(count);
-        }
-        for (const signal of PENDING_EFFECTS) {
-            signal._runEffects();
-        }
-        for (const tracer of PENDING_TRACERS) {
-            tracer.flush();
-        }
-        PENDING_WATCHERS = [];
-        PENDING_CONNECTS.clear();
-        PENDING_DISCONNECTS.clear();
-        PENDING_EFFECTS = [];
-        PENDING_TRACERS = [];
-    });
-    // resolve the flush promise
-    flush.resolve();
-};
-const settled = async () => {
-    while (currentFlush) {
-        await currentFlush.promise;
-    }
-};
-exports.settled = settled;
-//# sourceMappingURL=scheduling.js.map

package/dist/cjs/scheduling.js.map

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