@esportsplus/reactivity 0.24.4 → 0.25.0

package/build/transformer/transforms/primitives.js

@@ -1,5 +1,5 @@
 import { uid } from '@esportsplus/typescript/transformer';
-import { createCommaExpr, createComputedCall, createPostfixIncrementExpr, createReadCall, createSetCall, createSignalCall } from '../factory.js';
+import { addMissingImports, applyReplacements } from './utilities.js';
 import { ts } from '@esportsplus/typescript';
 function classifyReactiveArg(arg) {
     if (ts.isArrowFunction(arg) || ts.isFunctionExpression(arg)) {
@@ -22,14 +22,14 @@ function findBinding(bindings, name, node) {
 function findEnclosingScope(node) {
     let current = node.parent;
     while (current) {
-        if (ts.isArrowFunction(current) ||
-            ts.isBlock(current) ||
-            ts.isForInStatement(current) ||
-            ts.isForOfStatement(current) ||
-            ts.isForStatement(current) ||
+        if (ts.isBlock(current) ||
+            ts.isSourceFile(current) ||
             ts.isFunctionDeclaration(current) ||
             ts.isFunctionExpression(current) ||
-            ts.isSourceFile(current)) {
+            ts.isArrowFunction(current) ||
+            ts.isForStatement(current) ||
+            ts.isForInStatement(current) ||
+            ts.isForOfStatement(current)) {
             return current;
         }
         current = current.parent;
@@ -38,72 +38,64 @@ function findEnclosingScope(node) {
 }
 function getCompoundOperator(kind) {
     if (kind === ts.SyntaxKind.PlusEqualsToken) {
-        return ts.SyntaxKind.PlusToken;
+        return '+';
     }
     else if (kind === ts.SyntaxKind.MinusEqualsToken) {
-        return ts.SyntaxKind.MinusToken;
+        return '-';
     }
     else if (kind === ts.SyntaxKind.AsteriskEqualsToken) {
-        return ts.SyntaxKind.AsteriskToken;
+        return '*';
     }
     else if (kind === ts.SyntaxKind.SlashEqualsToken) {
-        return ts.SyntaxKind.SlashToken;
+        return '/';
     }
     else if (kind === ts.SyntaxKind.PercentEqualsToken) {
-        return ts.SyntaxKind.PercentToken;
+        return '%';
     }
     else if (kind === ts.SyntaxKind.AsteriskAsteriskEqualsToken) {
-        return ts.SyntaxKind.AsteriskAsteriskToken;
+        return '**';
     }
     else if (kind === ts.SyntaxKind.AmpersandEqualsToken) {
-        return ts.SyntaxKind.AmpersandToken;
+        return '&';
     }
     else if (kind === ts.SyntaxKind.BarEqualsToken) {
-        return ts.SyntaxKind.BarToken;
+        return '|';
     }
     else if (kind === ts.SyntaxKind.CaretEqualsToken) {
-        return ts.SyntaxKind.CaretToken;
+        return '^';
     }
     else if (kind === ts.SyntaxKind.LessThanLessThanEqualsToken) {
-        return ts.SyntaxKind.LessThanLessThanToken;
+        return '<<';
     }
     else if (kind === ts.SyntaxKind.GreaterThanGreaterThanEqualsToken) {
-        return ts.SyntaxKind.GreaterThanGreaterThanToken;
+        return '>>';
     }
     else if (kind === ts.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken) {
-        return ts.SyntaxKind.GreaterThanGreaterThanGreaterThanToken;
+        return '>>>';
     }
     else if (kind === ts.SyntaxKind.AmpersandAmpersandEqualsToken) {
-        return ts.SyntaxKind.AmpersandAmpersandToken;
+        return '&&';
     }
     else if (kind === ts.SyntaxKind.BarBarEqualsToken) {
-        return ts.SyntaxKind.BarBarToken;
+        return '||';
     }
     else if (kind === ts.SyntaxKind.QuestionQuestionEqualsToken) {
-        return ts.SyntaxKind.QuestionQuestionToken;
+        return '??';
     }
     else {
-        return ts.SyntaxKind.PlusToken;
+        return '+';
     }
 }
-function isAssignmentOperator(kind) {
-    if (kind === ts.SyntaxKind.EqualsToken) {
-        return 'simple';
-    }
-    if (kind >= ts.SyntaxKind.PlusEqualsToken && kind <= ts.SyntaxKind.CaretEqualsToken) {
-        return 'compound';
-    }
-    if (kind === ts.SyntaxKind.AmpersandAmpersandEqualsToken ||
-        kind === ts.SyntaxKind.BarBarEqualsToken ||
-        kind === ts.SyntaxKind.QuestionQuestionEqualsToken) {
-        return 'compound';
+function isInComputedRange(ranges, start, end) {
+    for (let i = 0, n = ranges.length; i < n; i++) {
+        let r = ranges[i];
+        if (start >= r.start && end <= r.end) {
+            return true;
+        }
     }
     return false;
 }
 function isInDeclarationInit(node) {
-    if (!node || !node.parent) {
-        return false;
-    }
     let parent = node.parent;
     if (ts.isVariableDeclaration(parent) && parent.initializer === node) {
         return true;
@@ -121,14 +113,41 @@ function isInScope(reference, binding) {
     return false;
 }
 function isReactiveReassignment(node) {
-    let right = node.right;
-    if (ts.isCallExpression(right) &&
-        ts.isIdentifier(right.expression) &&
-        right.expression.text === 'reactive') {
+    let parent = node.parent;
+    if (ts.isBinaryExpression(parent) &&
+        parent.operatorToken.kind === ts.SyntaxKind.EqualsToken &&
+        parent.right === node &&
+        ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === 'reactive') {
         return true;
     }
     return false;
 }
+function isWriteContext(node) {
+    let parent = node.parent;
+    if (ts.isBinaryExpression(parent) && parent.left === node) {
+        let op = parent.operatorToken.kind;
+        if (op === ts.SyntaxKind.EqualsToken) {
+            return 'simple';
+        }
+        if (op >= ts.SyntaxKind.PlusEqualsToken && op <= ts.SyntaxKind.CaretEqualsToken) {
+            return 'compound';
+        }
+        if (op === ts.SyntaxKind.AmpersandAmpersandEqualsToken ||
+            op === ts.SyntaxKind.BarBarEqualsToken ||
+            op === ts.SyntaxKind.QuestionQuestionEqualsToken) {
+            return 'compound';
+        }
+    }
+    if (ts.isPostfixUnaryExpression(parent) || ts.isPrefixUnaryExpression(parent)) {
+        let op = parent.operator;
+        if (op === ts.SyntaxKind.PlusPlusToken || op === ts.SyntaxKind.MinusMinusToken) {
+            return 'increment';
+        }
+    }
+    return false;
+}
 function visit(ctx, node) {
     if (ts.isImportDeclaration(node) &&
         ts.isStringLiteral(node.moduleSpecifier) &&
@@ -151,132 +170,166 @@ function visit(ctx, node) {
         let arg = node.arguments[0], classification = classifyReactiveArg(arg);
         if (classification) {
             let varName = null;
-            if (node.parent && ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
                 varName = node.parent.name.text;
             }
-            else if (node.parent &&
-                ts.isBinaryExpression(node.parent) &&
+            else if (ts.isBinaryExpression(node.parent) &&
                 node.parent.operatorToken.kind === ts.SyntaxKind.EqualsToken &&
                 ts.isIdentifier(node.parent.left)) {
                 varName = node.parent.left.text;
             }
             if (varName) {
                 let scope = findEnclosingScope(node);
-                ctx.bindings.set(varName, classification);
                 ctx.scopedBindings.push({ name: varName, scope, type: classification });
+                ctx.bindings.set(varName, classification);
             }
             if (classification === 'computed') {
+                ctx.computedArgRanges.push({
+                    end: arg.end,
+                    start: arg.getStart(ctx.sourceFile)
+                });
+                let argCtx = {
+                    argStart: arg.getStart(ctx.sourceFile),
+                    innerReplacements: [],
+                    neededImports: ctx.neededImports,
+                    scopedBindings: ctx.scopedBindings,
+                    sourceFile: ctx.sourceFile
+                };
+                visitArg(argCtx, arg);
+                let argText = applyReplacements(arg.getText(ctx.sourceFile), argCtx.innerReplacements);
+                ctx.replacements.push({
+                    end: node.end,
+                    newText: `computed(${argText})`,
+                    start: node.pos
+                });
                 ctx.neededImports.add('computed');
-                let transformedArg = ts.visitEachChild(arg, n => visitComputedArg(ctx, n), ctx.context);
-                return createComputedCall(ctx.factory, ctx.ns.reactivity, transformedArg);
             }
             else {
+                let argText = arg.getText(ctx.sourceFile);
+                ctx.replacements.push({
+                    end: node.end,
+                    newText: `signal(${argText})`,
+                    start: node.pos
+                });
                 ctx.neededImports.add('signal');
-                return createSignalCall(ctx.factory, ctx.ns.reactivity, arg);
             }
         }
     }
-    if (ts.isBinaryExpression(node) && ts.isIdentifier(node.left)) {
-        let assignType = isAssignmentOperator(node.operatorToken.kind);
-        if (assignType) {
-            let binding = findBinding(ctx.scopedBindings, node.left.text, node.left);
-            if (binding && binding.type !== 'computed' && !isReactiveReassignment(node)) {
-                ctx.neededImports.add('set');
-                let factory = ctx.factory, name = node.left.text, signalIdent = factory.createIdentifier(name), transformedRight = ts.visitEachChild(node.right, n => visit(ctx, n), ctx.context);
-                if (assignType === 'simple') {
-                    return createSetCall(factory, ctx.ns.reactivity, signalIdent, transformedRight);
-                }
-                else {
-                    let op = getCompoundOperator(node.operatorToken.kind), valueAccess = factory.createPropertyAccessExpression(signalIdent, 'value');
-                    return createSetCall(factory, ctx.ns.reactivity, signalIdent, factory.createBinaryExpression(valueAccess, op, transformedRight));
-                }
-            }
+    if (ts.isIdentifier(node) && !isInDeclarationInit(node.parent)) {
+        if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
+            ts.forEachChild(node, n => visit(ctx, n));
+            return;
         }
-    }
-    if (ts.isPrefixUnaryExpression(node) && ts.isIdentifier(node.operand)) {
-        let op = node.operator;
-        if (op === ts.SyntaxKind.PlusPlusToken || op === ts.SyntaxKind.MinusMinusToken) {
-            let binding = findBinding(ctx.scopedBindings, node.operand.text, node.operand);
-            if (binding && binding.type !== 'computed') {
-                ctx.neededImports.add('set');
-                let delta = op === ts.SyntaxKind.PlusPlusToken ? ts.SyntaxKind.PlusToken : ts.SyntaxKind.MinusToken, factory = ctx.factory, name = node.operand.text, signalIdent = factory.createIdentifier(name), valueAccess = factory.createPropertyAccessExpression(signalIdent, 'value');
-                if (node.parent && ts.isExpressionStatement(node.parent)) {
-                    return createSetCall(factory, ctx.ns.reactivity, signalIdent, factory.createBinaryExpression(valueAccess, delta, factory.createNumericLiteral(1)));
-                }
-                else {
-                    return createCommaExpr(factory, createSetCall(factory, ctx.ns.reactivity, signalIdent, factory.createBinaryExpression(valueAccess, delta, factory.createNumericLiteral(1))), factory.createPropertyAccessExpression(factory.createIdentifier(name), 'value'));
-                }
-            }
+        let nodeStart = node.getStart(ctx.sourceFile);
+        if (isInComputedRange(ctx.computedArgRanges, nodeStart, node.end)) {
+            ts.forEachChild(node, n => visit(ctx, n));
+            return;
         }
-    }
-    if (ts.isPostfixUnaryExpression(node) && ts.isIdentifier(node.operand)) {
-        let op = node.operator;
-        if (op === ts.SyntaxKind.PlusPlusToken || op === ts.SyntaxKind.MinusMinusToken) {
-            let binding = findBinding(ctx.scopedBindings, node.operand.text, node.operand);
-            if (binding && binding.type !== 'computed') {
-                ctx.neededImports.add('set');
-                let delta = op === ts.SyntaxKind.PlusPlusToken ? ts.SyntaxKind.PlusToken : ts.SyntaxKind.MinusToken, factory = ctx.factory, name = node.operand.text, signalIdent = factory.createIdentifier(name), valueAccess = factory.createPropertyAccessExpression(signalIdent, 'value');
-                if (node.parent && ts.isExpressionStatement(node.parent)) {
-                    return createSetCall(factory, ctx.ns.reactivity, signalIdent, factory.createBinaryExpression(valueAccess, delta, factory.createNumericLiteral(1)));
+        let binding = findBinding(ctx.scopedBindings, node.text, node), name = node.text;
+        if (binding) {
+            if (!isReactiveReassignment(node.parent) &&
+                !(ts.isTypeOfExpression(node.parent) && node.parent.expression === node)) {
+                let writeCtx = isWriteContext(node);
+                if (writeCtx) {
+                    if (binding.type !== 'computed') {
+                        ctx.neededImports.add('set');
+                        let parent = node.parent;
+                        if (writeCtx === 'simple' && ts.isBinaryExpression(parent)) {
+                            let valueText = parent.right.getText(ctx.sourceFile);
+                            ctx.replacements.push({
+                                end: parent.end,
+                                newText: `set(${name}, ${valueText})`,
+                                start: parent.pos
+                            });
+                        }
+                        else if (writeCtx === 'compound' && ts.isBinaryExpression(parent)) {
+                            let op = getCompoundOperator(parent.operatorToken.kind), valueText = parent.right.getText(ctx.sourceFile);
+                            ctx.replacements.push({
+                                end: parent.end,
+                                newText: `set(${name}, ${name}.value ${op} ${valueText})`,
+                                start: parent.pos
+                            });
+                        }
+                        else if (writeCtx === 'increment') {
+                            let isPrefix = ts.isPrefixUnaryExpression(parent), op = parent.operator, delta = op === ts.SyntaxKind.PlusPlusToken ? '+ 1' : '- 1';
+                            if (ts.isExpressionStatement(parent.parent)) {
+                                ctx.replacements.push({
+                                    end: parent.end,
+                                    newText: `set(${name}, ${name}.value ${delta})`,
+                                    start: parent.pos
+                                });
+                            }
+                            else if (isPrefix) {
+                                ctx.replacements.push({
+                                    end: parent.end,
+                                    newText: `(set(${name}, ${name}.value ${delta}), ${name}.value)`,
+                                    start: parent.pos
+                                });
+                            }
+                            else {
+                                let tmp = uid('tmp');
+                                ctx.replacements.push({
+                                    end: parent.end,
+                                    newText: `((${tmp}) => (set(${name}, ${tmp} ${delta}), ${tmp}))(${name}.value)`,
+                                    start: parent.pos
+                                });
+                            }
+                        }
+                    }
                 }
                 else {
-                    return createPostfixIncrementExpr(factory, ctx.ns.reactivity, uid('tmp'), name, delta);
+                    ctx.neededImports.add('read');
+                    ctx.replacements.push({
+                        end: node.end,
+                        newText: `read(${name})`,
+                        start: node.pos
+                    });
                 }
             }
         }
     }
-    if (ts.isIdentifier(node) && node.parent && !isInDeclarationInit(node.parent)) {
-        if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-            return ts.visitEachChild(node, n => visit(ctx, n), ctx.context);
-        }
-        if (ts.isBinaryExpression(node.parent) && node.parent.left === node) {
-            return ts.visitEachChild(node, n => visit(ctx, n), ctx.context);
-        }
-        if ((ts.isPrefixUnaryExpression(node.parent) || ts.isPostfixUnaryExpression(node.parent)) &&
-            node.parent.operand === node) {
-            return ts.visitEachChild(node, n => visit(ctx, n), ctx.context);
-        }
-        if (ts.isTypeOfExpression(node.parent) && node.parent.expression === node) {
-            return ts.visitEachChild(node, n => visit(ctx, n), ctx.context);
-        }
-        let binding = findBinding(ctx.scopedBindings, node.text, node);
-        if (binding) {
-            ctx.neededImports.add('read');
-            return createReadCall(ctx.factory, ctx.ns.reactivity, ctx.factory.createIdentifier(node.text));
-        }
-    }
-    return ts.visitEachChild(node, n => visit(ctx, n), ctx.context);
+    ts.forEachChild(node, n => visit(ctx, n));
 }
-function visitComputedArg(ctx, node) {
-    if (ts.isIdentifier(node) && node.parent) {
+function visitArg(ctx, node) {
+    if (ts.isIdentifier(node)) {
         if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-            return ts.visitEachChild(node, n => visitComputedArg(ctx, n), ctx.context);
+            ts.forEachChild(node, n => visitArg(ctx, n));
+            return;
         }
         if (ts.isCallExpression(node.parent) && node.parent.expression === node) {
-            return ts.visitEachChild(node, n => visitComputedArg(ctx, n), ctx.context);
+            ts.forEachChild(node, n => visitArg(ctx, n));
+            return;
         }
         let binding = findBinding(ctx.scopedBindings, node.text, node);
         if (binding) {
             ctx.neededImports.add('read');
-            return createReadCall(ctx.factory, ctx.ns.reactivity, ctx.factory.createIdentifier(node.text));
+            ctx.innerReplacements.push({
+                end: node.end - ctx.argStart,
+                newText: `read(${node.text})`,
+                start: node.getStart(ctx.sourceFile) - ctx.argStart
+            });
         }
     }
-    return ts.visitEachChild(node, n => visitComputedArg(ctx, n), ctx.context);
+    ts.forEachChild(node, n => visitArg(ctx, n));
 }
-const createPrimitivesTransformer = (bindings, neededImports, ns) => {
-    return (context) => {
-        return (sourceFile) => {
-            let ctx = {
-                bindings,
-                context,
-                factory: context.factory,
-                hasReactiveImport: false,
-                neededImports,
-                ns,
-                scopedBindings: []
-            };
-            return ts.visitNode(sourceFile, n => visit(ctx, n));
-        };
+const transformReactivePrimitives = (sourceFile, bindings) => {
+    let code = sourceFile.getFullText(), ctx = {
+        bindings,
+        computedArgRanges: [],
+        hasReactiveImport: false,
+        neededImports: new Set(),
+        replacements: [],
+        scopedBindings: [],
+        sourceFile
     };
+    visit(ctx, sourceFile);
+    if (ctx.replacements.length === 0) {
+        return code;
+    }
+    let result = applyReplacements(code, ctx.replacements);
+    if (ctx.neededImports.size > 0) {
+        result = addMissingImports(result, ctx.neededImports);
+    }
+    return result;
 };
-export { createPrimitivesTransformer };
+export { transformReactivePrimitives };

package/build/transformer/transforms/utilities.d.ts

@@ -0,0 +1,8 @@
+import { applyReplacements, type Replacement } from '@esportsplus/typescript/transformer';
+type ExtraImport = {
+    module: string;
+    specifier: string;
+};
+declare const addMissingImports: (code: string, needed: Set<string>, extraImports?: ExtraImport[]) => string;
+export { addMissingImports, applyReplacements };
+export type { ExtraImport, Replacement };

package/build/transformer/transforms/utilities.js

@@ -0,0 +1,27 @@
+import { addImport, applyReplacements } from '@esportsplus/typescript/transformer';
+const addMissingImports = (code, needed, extraImports) => {
+    let extraSpecifiers = new Set(), reactivitySpecifiers = [];
+    if (extraImports) {
+        for (let i = 0, n = extraImports.length; i < n; i++) {
+            extraSpecifiers.add(extraImports[i].specifier);
+        }
+    }
+    for (let imp of needed) {
+        if (!extraSpecifiers.has(imp)) {
+            reactivitySpecifiers.push(imp);
+        }
+    }
+    if (reactivitySpecifiers.length > 0) {
+        code = addImport(code, '@esportsplus/reactivity', reactivitySpecifiers);
+    }
+    if (extraImports) {
+        for (let i = 0, n = extraImports.length; i < n; i++) {
+            let extra = extraImports[i];
+            if (needed.has(extra.specifier)) {
+                code = addImport(code, extra.module, [extra.specifier]);
+            }
+        }
+    }
+    return code;
+};
+export { addMissingImports, applyReplacements };

package/build/types.d.ts

@@ -1,12 +1,8 @@
 import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants.js';
 import { ReactiveArray, ReactiveObject } from './reactive/index.js';
+import { ts } from '@esportsplus/typescript';
 type BindingType = 'array' | 'computed' | 'object' | 'signal';
 type Bindings = Map<string, BindingType>;
-interface Namespaces {
-    array: string;
-    constants: string;
-    reactivity: string;
-}
 interface Computed<T> {
     cleanup: VoidFunction | VoidFunction[] | null;
     deps: Link | null;
@@ -35,4 +31,9 @@ type Signal<T> = {
     type: typeof SIGNAL;
     value: T;
 };
-export type { BindingType, Bindings, Computed, Link, Namespaces, ReactiveArray, ReactiveObject, Signal };
+interface TransformResult {
+    code: string;
+    sourceFile: ts.SourceFile;
+    transformed: boolean;
+}
+export type { BindingType, Bindings, Computed, Link, ReactiveArray, ReactiveObject, Signal, TransformResult };

package/package.json

@@ -36,7 +36,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.24.4",
+  "version": "0.25.0",
   "scripts": {
     "build": "tsc",
     "build:test": "pnpm build && vite build --config test/vite.config.ts",

package/src/reactive/index.ts

@@ -1,3 +1,4 @@
+import { Prettify } from '@esportsplus/utilities';
 import { REACTIVE_OBJECT } from '~/constants';
 import { ReactiveArray } from './array';
 
@@ -5,10 +6,28 @@ import { ReactiveArray } from './array';
 // Branded type to prevent assignment to computed values
 declare const READONLY: unique symbol;
 
-type ReactiveObject<T extends Record<PropertyKey, unknown>> = T & {
-    [REACTIVE_OBJECT]: true;
-    dispose(): void;
-};
+type Infer<T> =
+    T extends (...args: unknown[]) => Promise<infer R>
+        ? R | undefined
+        : T extends (...args: any[]) => infer R
+            ? R
+            : T extends (infer U)[]
+                ? ReactiveArray<U>
+                : T extends ReactiveObject<any>
+                    ? T
+                    : T extends Record<PropertyKey, unknown>
+                        ? { [K in keyof T]: T[K] }
+                        : T;
+
+type ReactiveObject<T> =
+    T extends Record<PropertyKey, unknown>
+        ? Prettify<{ [K in keyof T]: Infer<T[K]> } & {
+            [REACTIVE_OBJECT]: true;
+            dispose: VoidFunction
+        }>
+        : T extends (infer U)[]
+            ? ReactiveArray<U>
+            : never;
 
 type ReactiveObjectGuard<T> = T extends { dispose: any } ? { never: '[ dispose ] is a reserved key' } : T;
 
@@ -20,8 +39,7 @@ function reactive<T extends Record<PropertyKey, any>>(_input: ReactiveObjectGuar
 // Array literal → existing ReactiveArray behavior
 function reactive<T>(_input: T[]): ReactiveArray<T>;
 // Everything else → passthrough type (allows assignment)
-function reactive<T>(_input: T): T;
-function reactive(_input: unknown): unknown {
+function reactive<T>(_input: T): T {
     throw new Error(
         '@esportsplus/reactivity: reactive() called at runtime. ' +
         'Ensure vite-plugin-reactivity-compile is configured.'