@esportsplus/reactivity 0.23.1 → 0.23.3

package/build/transformer/index.d.ts

@@ -1,10 +1,9 @@
-import type { TransformOptions, TransformResult } from '../types.js';
+import type { TransformResult } from '../types.js';
 import { mightNeedTransform } from './detector.js';
 import ts from 'typescript';
-declare const createTransformer: (options?: TransformOptions) => ts.TransformerFactory<ts.SourceFile>;
-declare const transform: (sourceFile: ts.SourceFile, options?: TransformOptions) => TransformResult;
+declare const createTransformer: () => ts.TransformerFactory<ts.SourceFile>;
+declare const transform: (sourceFile: ts.SourceFile) => TransformResult;
 export { createTransformer, mightNeedTransform, transform };
-export { injectAutoDispose } from './transforms/auto-dispose.js';
-export { transformReactiveArrays } from './transforms/reactive-array.js';
-export { transformReactiveObjects } from './transforms/reactive-object.js';
-export { transformReactivePrimitives } from './transforms/reactive-primitives.js';
+export { transformReactiveArrays } from './transforms/array.js';
+export { transformReactiveObjects } from './transforms/object.js';
+export { transformReactivePrimitives } from './transforms/primitives.js';

package/build/transformer/index.js

@@ -1,18 +1,17 @@
-import { injectAutoDispose } from './transforms/auto-dispose.js';
 import { mightNeedTransform } from './detector.js';
-import { transformReactiveArrays } from './transforms/reactive-array.js';
-import { transformReactiveObjects } from './transforms/reactive-object.js';
-import { transformReactivePrimitives } from './transforms/reactive-primitives.js';
+import { transformReactiveArrays } from './transforms/array.js';
+import { transformReactiveObjects } from './transforms/object.js';
+import { transformReactivePrimitives } from './transforms/primitives.js';
 import ts from 'typescript';
-const createTransformer = (options) => {
+const createTransformer = () => {
     return () => {
         return (sourceFile) => {
-            let result = transform(sourceFile, options);
+            let result = transform(sourceFile);
             return result.transformed ? result.sourceFile : sourceFile;
         };
     };
 };
-const transform = (sourceFile, options) => {
+const transform = (sourceFile) => {
     let bindings = new Map(), code = sourceFile.getFullText(), current = sourceFile, original = code, result;
     if (!mightNeedTransform(code)) {
         return { code, sourceFile, transformed: false };
@@ -32,13 +31,6 @@ const transform = (sourceFile, options) => {
         current = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
         code = result;
     }
-    if (options?.autoDispose) {
-        result = injectAutoDispose(current);
-        if (result !== code) {
-            current = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
-            code = result;
-        }
-    }
     if (code === original) {
         return { code, sourceFile, transformed: false };
     }
@@ -49,7 +41,6 @@ const transform = (sourceFile, options) => {
     };
 };
 export { createTransformer, mightNeedTransform, transform };
-export { injectAutoDispose } from './transforms/auto-dispose.js';
-export { transformReactiveArrays } from './transforms/reactive-array.js';
-export { transformReactiveObjects } from './transforms/reactive-object.js';
-export { transformReactivePrimitives } from './transforms/reactive-primitives.js';
+export { transformReactiveArrays } from './transforms/array.js';
+export { transformReactiveObjects } from './transforms/object.js';
+export { transformReactivePrimitives } from './transforms/primitives.js';

package/build/transformer/plugins/esbuild.d.ts

@@ -1,5 +1,3 @@
 import type { Plugin } from 'esbuild';
-import type { TransformOptions } from '../../types.js';
-declare const _default: (options?: TransformOptions) => Plugin;
+declare const _default: () => Plugin;
 export default _default;
-export type { TransformOptions as PluginOptions };

package/build/transformer/plugins/esbuild.js

@@ -2,7 +2,7 @@ import { TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
 import { mightNeedTransform, transform } from '../../transformer/index.js';
 import fs from 'fs';
 import ts from 'typescript';
-export default (options) => {
+export default () => {
     return {
         name: '@esportsplus/reactivity/plugin-esbuild',
         setup(build) {
@@ -12,7 +12,7 @@ export default (options) => {
                     return null;
                 }
                 try {
-                    let sourceFile = ts.createSourceFile(args.path, code, ts.ScriptTarget.Latest, true), result = transform(sourceFile, options);
+                    let sourceFile = ts.createSourceFile(args.path, code, ts.ScriptTarget.Latest, true), result = transform(sourceFile);
                     if (!result.transformed) {
                         return null;
                     }

package/build/transformer/plugins/vite.d.ts

@@ -1,5 +1,3 @@
 import type { Plugin } from 'vite';
-import type { TransformOptions } from '../../types.js';
-declare const _default: (options?: TransformOptions) => Plugin;
+declare const _default: () => Plugin;
 export default _default;
-export type { TransformOptions as PluginOptions };

package/build/transformer/plugins/vite.js

@@ -1,7 +1,7 @@
 import { TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
 import { mightNeedTransform, transform } from '../../transformer/index.js';
 import ts from 'typescript';
-export default (options) => {
+export default () => {
     return {
         enforce: 'pre',
         name: '@esportsplus/reactivity/plugin-vite',
@@ -13,7 +13,7 @@ export default (options) => {
                 return null;
             }
             try {
-                let sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true), result = transform(sourceFile, options);
+                let sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true), result = transform(sourceFile);
                 if (!result.transformed) {
                     return null;
                 }

package/build/transformer/transforms/{reactive-object.js → object.js}

@@ -48,14 +48,13 @@ function buildClassCode(className, properties) {
             disposeStatements.push(`if (this.#${key}) dispose(this.#${key});`);
         }
     }
-    let disposeBody = disposeStatements.length > 0 ? disposeStatements.join('\n') : '';
     return `
         class ${className} {
             ${fields.join('\n')}
             ${accessors.join('\n')}
 
             dispose() {
-                ${disposeBody}
+                ${disposeStatements.length > 0 ? disposeStatements.join('\n') : ''}
             }
         }
     `;

package/build/types.d.ts

@@ -31,12 +31,9 @@ type Signal<T> = {
     type: typeof SIGNAL;
     value: T;
 };
-interface TransformOptions {
-    autoDispose?: boolean;
-}
 interface TransformResult {
     code: string;
     sourceFile: ts.SourceFile;
     transformed: boolean;
 }
-export type { BindingType, Bindings, Computed, Link, ReactiveArray, ReactiveObject, Signal, TransformOptions, TransformResult };
+export type { BindingType, Bindings, Computed, Link, ReactiveArray, ReactiveObject, Signal, TransformResult };

package/package.json

@@ -4,7 +4,7 @@
     "@esportsplus/utilities": "^0.27.2"
   },
   "devDependencies": {
-    "@esportsplus/typescript": "^0.12.2",
+    "@esportsplus/typescript": "^0.13.0",
     "@types/node": "^25.0.3",
     "esbuild": "^0.27.2",
     "typescript": "^5.9.3",
@@ -41,7 +41,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.23.1",
+  "version": "0.23.3",
   "scripts": {
     "build": "tsc && tsc-alias",
     "build:test": "pnpm build && vite build --config test/vite.config.ts",

package/readme.md

@@ -147,30 +147,6 @@ For direct TypeScript compilation using `ttsc` or `ts-patch`:
 }
 ```
 
-## Plugin Options
-
-All plugins accept the same options:
-
-```typescript
-interface TransformOptions {
-    // Inject automatic disposal tracking (experimental)
-    autoDispose?: boolean;
-}
-```
-
-Example with options:
-
-```typescript
-// vite.config.ts
-import { plugin as reactivity } from '@esportsplus/reactivity/plugins/vite';
-
-export default defineConfig({
-    plugins: [
-        reactivity({ autoDispose: true })
-    ]
-});
-```
-
 ## How It Works
 
 The transformer converts your code at compile time:

package/src/transformer/index.ts

@@ -1,23 +1,22 @@
-import type { Bindings, TransformOptions, TransformResult } from '~/types';
-import { injectAutoDispose } from './transforms/auto-dispose';
+import type { Bindings, TransformResult } from '~/types';
 import { mightNeedTransform } from './detector';
-import { transformReactiveArrays } from './transforms/reactive-array';
-import { transformReactiveObjects } from './transforms/reactive-object';
-import { transformReactivePrimitives } from './transforms/reactive-primitives';
+import { transformReactiveArrays } from './transforms/array';
+import { transformReactiveObjects } from './transforms/object';
+import { transformReactivePrimitives } from './transforms/primitives';
 import ts from 'typescript';
 
 
-const createTransformer = (options?: TransformOptions): ts.TransformerFactory<ts.SourceFile> => {
+const createTransformer = (): ts.TransformerFactory<ts.SourceFile> => {
     return () => {
         return (sourceFile: ts.SourceFile): ts.SourceFile => {
-            let result = transform(sourceFile, options);
+            let result = transform(sourceFile);
 
             return result.transformed ? result.sourceFile : sourceFile;
         };
     };
 };
 
-const transform = (sourceFile: ts.SourceFile, options?: TransformOptions): TransformResult => {
+const transform = (sourceFile: ts.SourceFile): TransformResult => {
     let bindings: Bindings = new Map(),
         code = sourceFile.getFullText(),
         current = sourceFile,
@@ -50,15 +49,6 @@ const transform = (sourceFile: ts.SourceFile, options?: TransformOptions): Trans
         code = result;
     }
 
-    if (options?.autoDispose) {
-        result = injectAutoDispose(current);
-
-        if (result !== code) {
-            current = ts.createSourceFile(sourceFile.fileName, result, sourceFile.languageVersion, true);
-            code = result;
-        }
-    }
-
     if (code === original) {
         return { code, sourceFile, transformed: false };
     }
@@ -72,7 +62,6 @@ const transform = (sourceFile: ts.SourceFile, options?: TransformOptions): Trans
 
 
 export { createTransformer, mightNeedTransform, transform };
-export { injectAutoDispose } from './transforms/auto-dispose';
-export { transformReactiveArrays } from './transforms/reactive-array';
-export { transformReactiveObjects } from './transforms/reactive-object';
-export { transformReactivePrimitives } from './transforms/reactive-primitives';
+export { transformReactiveArrays } from './transforms/array';
+export { transformReactiveObjects } from './transforms/object';
+export { transformReactivePrimitives } from './transforms/primitives';

package/src/transformer/plugins/esbuild.ts

@@ -1,12 +1,11 @@
 import { TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
 import { mightNeedTransform, transform } from '~/transformer';
 import type { OnLoadArgs, Plugin, PluginBuild } from 'esbuild';
-import type { TransformOptions } from '~/types';
 import fs from 'fs';
 import ts from 'typescript';
 
 
-export default (options?: TransformOptions): Plugin => {
+export default (): Plugin => {
     return {
         name: '@esportsplus/reactivity/plugin-esbuild',
 
@@ -25,7 +24,7 @@ export default (options?: TransformOptions): Plugin => {
                             ts.ScriptTarget.Latest,
                             true
                         ),
-                        result = transform(sourceFile, options);
+                        result = transform(sourceFile);
 
                     if (!result.transformed) {
                         return null;
@@ -44,4 +43,3 @@ export default (options?: TransformOptions): Plugin => {
         }
     };
 };
-export type { TransformOptions as PluginOptions };

package/src/transformer/plugins/vite.ts

@@ -1,11 +1,10 @@
 import { TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
 import { mightNeedTransform, transform } from '~/transformer';
 import type { Plugin } from 'vite';
-import type { TransformOptions } from '~/types';
 import ts from 'typescript';
 
 
-export default (options?: TransformOptions): Plugin => {
+export default (): Plugin => {
     return {
         enforce: 'pre',
         name: '@esportsplus/reactivity/plugin-vite',
@@ -21,7 +20,7 @@ export default (options?: TransformOptions): Plugin => {
 
             try {
                 let sourceFile = ts.createSourceFile(id, code, ts.ScriptTarget.Latest, true),
-                    result = transform(sourceFile, options);
+                    result = transform(sourceFile);
 
                 if (!result.transformed) {
                     return null;
@@ -36,4 +35,3 @@ export default (options?: TransformOptions): Plugin => {
         }
     };
 };
-export type { TransformOptions as PluginOptions };

package/src/transformer/transforms/{reactive-object.ts → object.ts}

@@ -94,15 +94,13 @@ function buildClassCode(className: string, properties: AnalyzedProperty[]): stri
         }
     }
 
-    let disposeBody = disposeStatements.length > 0 ? disposeStatements.join('\n') : '';
-
     return `
         class ${className} {
             ${fields.join('\n')}
             ${accessors.join('\n')}
 
             dispose() {
-                ${disposeBody}
+                ${disposeStatements.length > 0 ? disposeStatements.join('\n') : ''}
             }
         }
     `;

package/src/types.ts

@@ -43,10 +43,6 @@ type Signal<T> = {
     value: T;
 };
 
-interface TransformOptions {
-    autoDispose?: boolean;
-}
-
 interface TransformResult {
     code: string;
     sourceFile: ts.SourceFile;
@@ -62,6 +58,5 @@ export type {
     ReactiveArray,
     ReactiveObject,
     Signal,
-    TransformOptions,
     TransformResult
 };

package/build/transformer/transforms/auto-dispose.d.ts

@@ -1,3 +0,0 @@
-import ts from 'typescript';
-declare const injectAutoDispose: (sourceFile: ts.SourceFile) => string;
-export { injectAutoDispose };

package/build/transformer/transforms/auto-dispose.js

@@ -1,119 +0,0 @@
-import { uid, TRAILING_SEMICOLON } from '@esportsplus/typescript/transformer';
-import { applyReplacements } from './utilities.js';
-import ts from 'typescript';
-function processFunction(node, sourceFile, edits) {
-    if (!node.body || !ts.isBlock(node.body)) {
-        return;
-    }
-    let ctx = {
-        disposables: [],
-        effectsToCapture: [],
-        parentBody: node.body,
-        returnStatement: null
-    };
-    visitBody(ctx, node.body);
-    if (ctx.disposables.length === 0 || !ctx.returnStatement || !ctx.returnStatement.expression) {
-        return;
-    }
-    let cleanupFn = ctx.returnStatement.expression;
-    if (!cleanupFn.body) {
-        return;
-    }
-    let disposeStatements = [];
-    for (let i = ctx.disposables.length - 1; i >= 0; i--) {
-        let d = ctx.disposables[i];
-        if (d.type === 'reactive') {
-            disposeStatements.push(`${d.name}.dispose();`);
-        }
-        else {
-            disposeStatements.push(`${d.name}();`);
-        }
-    }
-    let disposeCode = disposeStatements.join('\n');
-    if (ts.isBlock(cleanupFn.body)) {
-        edits.push({
-            cleanupBodyEnd: cleanupFn.body.statements[0]?.pos ?? cleanupFn.body.end - 1,
-            cleanupBodyStart: cleanupFn.body.pos + 1,
-            disposeCode,
-            effectsToCapture: ctx.effectsToCapture
-        });
-    }
-    else {
-        edits.push({
-            cleanupBodyEnd: cleanupFn.body.end,
-            cleanupBodyStart: cleanupFn.body.pos,
-            disposeCode: `{ ${disposeCode}\n return ${cleanupFn.body.getText(sourceFile)}; }`,
-            effectsToCapture: ctx.effectsToCapture
-        });
-    }
-}
-function visitBody(ctx, node) {
-    if (ts.isVariableDeclaration(node) &&
-        ts.isIdentifier(node.name) &&
-        node.initializer &&
-        ts.isCallExpression(node.initializer) &&
-        ts.isIdentifier(node.initializer.expression) &&
-        node.initializer.expression.text === 'reactive') {
-        ctx.disposables.push({ name: node.name.text, type: 'reactive' });
-    }
-    if (ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        node.expression.text === 'effect') {
-        if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
-            ctx.disposables.push({ name: node.parent.name.text, type: 'effect' });
-        }
-        else if (ts.isExpressionStatement(node.parent)) {
-            let name = uid('effect');
-            ctx.effectsToCapture.push({
-                end: node.parent.end,
-                name,
-                start: node.parent.pos
-            });
-            ctx.disposables.push({ name, type: 'effect' });
-        }
-    }
-    if (ts.isReturnStatement(node) &&
-        node.expression &&
-        (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) &&
-        node.parent === ctx.parentBody) {
-        ctx.returnStatement = node;
-    }
-    ts.forEachChild(node, n => visitBody(ctx, n));
-}
-function visitMain(ctx, node) {
-    if (ts.isFunctionDeclaration(node) ||
-        ts.isFunctionExpression(node) ||
-        ts.isArrowFunction(node)) {
-        processFunction(node, ctx.sourceFile, ctx.edits);
-    }
-    ts.forEachChild(node, n => visitMain(ctx, n));
-}
-const injectAutoDispose = (sourceFile) => {
-    let code = sourceFile.getFullText(), ctx = {
-        edits: [],
-        sourceFile
-    };
-    visitMain(ctx, sourceFile);
-    if (ctx.edits.length === 0) {
-        return code;
-    }
-    let replacements = [];
-    for (let i = 0, n = ctx.edits.length; i < n; i++) {
-        let edit = ctx.edits[i], effects = edit.effectsToCapture;
-        for (let j = 0, m = effects.length; j < m; j++) {
-            let effect = effects[j], original = code.substring(effect.start, effect.end).trim();
-            replacements.push({
-                end: effect.end,
-                newText: `const ${effect.name} = ${original.replace(TRAILING_SEMICOLON, '')}`,
-                start: effect.start
-            });
-        }
-        replacements.push({
-            end: edit.cleanupBodyEnd,
-            newText: `\n${edit.disposeCode}`,
-            start: edit.cleanupBodyStart
-        });
-    }
-    return applyReplacements(code, replacements);
-};
-export { injectAutoDispose };

package/src/transformer/transforms/auto-dispose.ts

@@ -1,191 +0,0 @@
-import { uid, TRAILING_SEMICOLON } from '@esportsplus/typescript/transformer';
-import { applyReplacements, Replacement } from './utilities';
-import ts from 'typescript';
-
-
-interface BodyContext {
-    disposables: Disposable[];
-    effectsToCapture: { end: number; name: string; start: number }[];
-    parentBody: ts.Node;
-    returnStatement: ts.ReturnStatement | null;
-}
-
-interface Disposable {
-    name: string;
-    type: 'effect' | 'reactive';
-}
-
-interface FunctionEdit {
-    cleanupBodyEnd: number;
-    cleanupBodyStart: number;
-    disposeCode: string;
-    effectsToCapture: { end: number; name: string; start: number }[];
-}
-
-interface MainContext {
-    edits: FunctionEdit[];
-    sourceFile: ts.SourceFile;
-}
-
-
-function processFunction(
-    node: ts.ArrowFunction | ts.FunctionDeclaration | ts.FunctionExpression,
-    sourceFile: ts.SourceFile,
-    edits: FunctionEdit[]
-): void {
-    if (!node.body || !ts.isBlock(node.body)) {
-        return;
-    }
-
-    let ctx: BodyContext = {
-            disposables: [],
-            effectsToCapture: [],
-            parentBody: node.body,
-            returnStatement: null
-        };
-
-    visitBody(ctx, node.body);
-
-    if (ctx.disposables.length === 0 || !ctx.returnStatement || !ctx.returnStatement.expression) {
-        return;
-    }
-
-    let cleanupFn = ctx.returnStatement.expression as ts.ArrowFunction | ts.FunctionExpression;
-
-    if (!cleanupFn.body) {
-        return;
-    }
-
-    let disposeStatements: string[] = [];
-
-    for (let i = ctx.disposables.length - 1; i >= 0; i--) {
-        let d = ctx.disposables[i];
-
-        if (d.type === 'reactive') {
-            disposeStatements.push(`${d.name}.dispose();`);
-        }
-        else {
-            disposeStatements.push(`${d.name}();`);
-        }
-    }
-
-    let disposeCode = disposeStatements.join('\n');
-
-    if (ts.isBlock(cleanupFn.body)) {
-        edits.push({
-            cleanupBodyEnd: cleanupFn.body.statements[0]?.pos ?? cleanupFn.body.end - 1,
-            cleanupBodyStart: cleanupFn.body.pos + 1,
-            disposeCode,
-            effectsToCapture: ctx.effectsToCapture
-        });
-    }
-    else {
-        edits.push({
-            cleanupBodyEnd: cleanupFn.body.end,
-            cleanupBodyStart: cleanupFn.body.pos,
-            disposeCode: `{ ${disposeCode}\n return ${cleanupFn.body.getText(sourceFile)}; }`,
-            effectsToCapture: ctx.effectsToCapture
-        });
-    }
-}
-
-function visitBody(ctx: BodyContext, node: ts.Node): void {
-    if (
-        ts.isVariableDeclaration(node) &&
-        ts.isIdentifier(node.name) &&
-        node.initializer &&
-        ts.isCallExpression(node.initializer) &&
-        ts.isIdentifier(node.initializer.expression) &&
-        node.initializer.expression.text === 'reactive'
-    ) {
-        ctx.disposables.push({ name: node.name.text, type: 'reactive' });
-    }
-
-    if (
-        ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        node.expression.text === 'effect'
-    ) {
-        if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
-            ctx.disposables.push({ name: node.parent.name.text, type: 'effect' });
-        }
-        else if (ts.isExpressionStatement(node.parent)) {
-            let name = uid('effect');
-
-            ctx.effectsToCapture.push({
-                end: node.parent.end,
-                name,
-                start: node.parent.pos
-            });
-
-            ctx.disposables.push({ name, type: 'effect' });
-        }
-    }
-
-    if (
-        ts.isReturnStatement(node) &&
-        node.expression &&
-        (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) &&
-        node.parent === ctx.parentBody
-    ) {
-        ctx.returnStatement = node;
-    }
-
-    ts.forEachChild(node, n => visitBody(ctx, n));
-}
-
-function visitMain(ctx: MainContext, node: ts.Node): void {
-    if (
-        ts.isFunctionDeclaration(node) ||
-        ts.isFunctionExpression(node) ||
-        ts.isArrowFunction(node)
-    ) {
-        processFunction(node, ctx.sourceFile, ctx.edits);
-    }
-
-    ts.forEachChild(node, n => visitMain(ctx, n));
-}
-
-
-const injectAutoDispose = (sourceFile: ts.SourceFile): string => {
-    let code = sourceFile.getFullText(),
-        ctx: MainContext = {
-            edits: [],
-            sourceFile
-        };
-
-    visitMain(ctx, sourceFile);
-
-    if (ctx.edits.length === 0) {
-        return code;
-    }
-
-    let replacements: Replacement[] = [];
-
-    for (let i = 0, n = ctx.edits.length; i < n; i++) {
-        let edit = ctx.edits[i],
-            effects = edit.effectsToCapture;
-
-        for (let j = 0, m = effects.length; j < m; j++) {
-            let effect = effects[j],
-                original = code.substring(effect.start, effect.end).trim();
-
-            replacements.push({
-                end: effect.end,
-                newText: `const ${effect.name} = ${original.replace(TRAILING_SEMICOLON, '')}`,
-                start: effect.start
-            });
-        }
-
-        replacements.push({
-            end: edit.cleanupBodyEnd,
-            newText: `\n${edit.disposeCode}`,
-            start: edit.cleanupBodyStart
-        });
-    }
-
-    return applyReplacements(code, replacements);
-};
-
-
-export { injectAutoDispose };