@esportsplus/reactivity 0.23.0 → 0.23.2

package/build/transformer/core/transforms/utilities.js

@@ -1,57 +0,0 @@
-import { applyReplacements } from '@esportsplus/typescript/transformer';
-const BRACES_CONTENT_REGEX = /\{([^}]*)\}/;
-const REACTIVITY_IMPORT_REGEX = /(import\s*\{[^}]*\}\s*from\s*['"]@esportsplus\/reactivity['"])/;
-const addMissingImports = (code, needed, extraImports) => {
-    let reactivityImportMatch = code.match(REACTIVITY_IMPORT_REGEX);
-    if (!reactivityImportMatch) {
-        return code;
-    }
-    let bracesMatch = reactivityImportMatch[1].match(BRACES_CONTENT_REGEX), existing = new Set(), existingImport = reactivityImportMatch[1], extraSpecifiers = new Set(), toAdd = [];
-    if (bracesMatch?.[1]) {
-        let parts = bracesMatch[1].split(',');
-        for (let i = 0, n = parts.length; i < n; i++) {
-            let trimmed = parts[i].trim();
-            if (trimmed) {
-                existing.add(trimmed);
-            }
-        }
-    }
-    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) && !existing.has(imp)) {
-            toAdd.push(imp);
-        }
-    }
-    if (toAdd.length > 0) {
-        let combined = [];
-        for (let item of existing) {
-            if (item) {
-                combined.push(item);
-            }
-        }
-        for (let i = 0, n = toAdd.length; i < n; i++) {
-            if (toAdd[i]) {
-                combined.push(toAdd[i]);
-            }
-        }
-        combined.sort();
-        code = code.replace(existingImport, existingImport.replace(BRACES_CONTENT_REGEX, `{ ${combined.join(', ')} }`));
-    }
-    if (extraImports) {
-        for (let i = 0, n = extraImports.length; i < n; i++) {
-            let extra = extraImports[i];
-            if (needed.has(extra.specifier) && !code.includes(extra.module)) {
-                let insertPos = code.indexOf('import');
-                code = code.substring(0, insertPos) +
-                    `import { ${extra.specifier} } from '${extra.module}';\n` +
-                    code.substring(insertPos);
-            }
-        }
-    }
-    return code;
-};
-export { addMissingImports, applyReplacements };

package/src/transformer/core/detector.ts

@@ -1,12 +0,0 @@
-import { mightNeedTransform as checkTransform } from '@esportsplus/typescript/transformer';
-
-
-let regex = /import\s*\{[^}]*\breactive\b[^}]*\}\s*from\s*['"]@esportsplus\/reactivity/;
-
-
-const mightNeedTransform = (code: string): boolean => {
-    return checkTransform(code, { regex });
-};
-
-
-export { mightNeedTransform };

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

@@ -1,194 +0,0 @@
-import { uid } from '@esportsplus/typescript/transformer';
-import ts from 'typescript';
-import { applyReplacements, Replacement } from './utilities';
-
-
-const TRAILING_SEMICOLON = /;$/;
-
-
-interface Disposable {
-    name: string;
-    type: 'effect' | 'reactive';
-}
-
-interface FunctionEdit {
-    cleanupBodyEnd: number;
-    cleanupBodyStart: number;
-    disposeCode: string;
-    effectsToCapture: { end: number; name: string; start: number }[];
-}
-
-interface VisitResult {
-    disposables: Disposable[];
-    effectsToCapture: { end: number; name: string; start: number }[];
-    returnStatement: ts.ReturnStatement | null;
-}
-
-
-function visitFunctionBody(
-    body: ts.Block,
-    parentBody: ts.Node
-): VisitResult {
-    let disposables: Disposable[] = [],
-        effectsToCapture: { end: number; name: string; start: number }[] = [],
-        returnStatement: ts.ReturnStatement | null = null;
-
-    function visit(n: ts.Node): void {
-        if (
-            ts.isVariableDeclaration(n) &&
-            ts.isIdentifier(n.name) &&
-            n.initializer &&
-            ts.isCallExpression(n.initializer) &&
-            ts.isIdentifier(n.initializer.expression) &&
-            n.initializer.expression.text === 'reactive'
-        ) {
-            disposables.push({ name: n.name.text, type: 'reactive' });
-        }
-
-        if (
-            ts.isCallExpression(n) &&
-            ts.isIdentifier(n.expression) &&
-            n.expression.text === 'effect'
-        ) {
-            if (ts.isVariableDeclaration(n.parent) && ts.isIdentifier(n.parent.name)) {
-                disposables.push({ name: n.parent.name.text, type: 'effect' });
-            }
-            else if (ts.isExpressionStatement(n.parent)) {
-                let name = uid('effect');
-
-                effectsToCapture.push({
-                    end: n.parent.end,
-                    name,
-                    start: n.parent.pos
-                });
-
-                disposables.push({ name, type: 'effect' });
-            }
-        }
-
-        if (
-            ts.isReturnStatement(n) &&
-            n.expression &&
-            (ts.isArrowFunction(n.expression) || ts.isFunctionExpression(n.expression)) &&
-            n.parent === parentBody
-        ) {
-            returnStatement = n;
-        }
-
-        ts.forEachChild(n, visit);
-    }
-
-    visit(body);
-
-    return { disposables, effectsToCapture, returnStatement };
-}
-
-function processFunction(
-    node: ts.ArrowFunction | ts.FunctionDeclaration | ts.FunctionExpression,
-    sourceFile: ts.SourceFile,
-    edits: FunctionEdit[]
-): void {
-    if (!node.body || !ts.isBlock(node.body)) {
-        return;
-    }
-
-    let result = visitFunctionBody(node.body, node.body),
-        disposables = result.disposables,
-        effectsToCapture = result.effectsToCapture,
-        returnStatement = result.returnStatement;
-
-    if (disposables.length === 0 || !returnStatement || !returnStatement.expression) {
-        return;
-    }
-
-    let cleanupFn = returnStatement.expression as ts.ArrowFunction | ts.FunctionExpression;
-
-    if (!cleanupFn.body) {
-        return;
-    }
-
-    let disposeStatements: string[] = [];
-
-    for (let i = disposables.length - 1; i >= 0; i--) {
-        let d = 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
-        });
-    }
-    else {
-        edits.push({
-            cleanupBodyEnd: cleanupFn.body.end,
-            cleanupBodyStart: cleanupFn.body.pos,
-            disposeCode: `{ ${disposeCode}\n return ${cleanupFn.body.getText(sourceFile)}; }`,
-            effectsToCapture
-        });
-    }
-}
-
-
-const injectAutoDispose = (sourceFile: ts.SourceFile): string => {
-    let code = sourceFile.getFullText(),
-        edits: FunctionEdit[] = [];
-
-    function visit(node: ts.Node): void {
-        if (
-            ts.isFunctionDeclaration(node) ||
-            ts.isFunctionExpression(node) ||
-            ts.isArrowFunction(node)
-        ) {
-            processFunction(node, sourceFile, edits);
-        }
-
-        ts.forEachChild(node, visit);
-    }
-
-    visit(sourceFile);
-
-    if (edits.length === 0) {
-        return code;
-    }
-
-    let replacements: Replacement[] = [];
-
-    for (let i = 0, n = edits.length; i < n; i++) {
-        let edit = 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/core/transforms/reactive-array.ts

@@ -1,140 +0,0 @@
-import type { Bindings } from '~/types';
-import ts from 'typescript';
-import { applyReplacements, Replacement } from './utilities';
-
-
-function getPropertyPath(node: ts.PropertyAccessExpression): string | null {
-    let current: ts.Node = node,
-        parts: string[] = [];
-
-    while (ts.isPropertyAccessExpression(current)) {
-        parts.unshift(current.name.text);
-        current = current.expression;
-    }
-
-    if (ts.isIdentifier(current)) {
-        parts.unshift(current.text);
-        return parts.join('.');
-    }
-
-    return null;
-}
-
-function getExpressionName(node: ts.Expression): string | null {
-    if (ts.isIdentifier(node)) {
-        return node.text;
-    }
-
-    if (ts.isPropertyAccessExpression(node)) {
-        return getPropertyPath(node);
-    }
-
-    return null;
-}
-
-function isAssignmentTarget(node: ts.Node): boolean {
-    let parent = node.parent;
-
-    if (
-        (ts.isBinaryExpression(parent) && parent.left === node) ||
-        ts.isPostfixUnaryExpression(parent) ||
-        ts.isPrefixUnaryExpression(parent)
-    ) {
-        return true;
-    }
-
-    return false;
-}
-
-
-const transformReactiveArrays = (
-    sourceFile: ts.SourceFile,
-    bindings: Bindings
-): string => {
-    let code = sourceFile.getFullText(),
-        replacements: Replacement[] = [];
-
-    // Single-pass visitor: collect bindings and find replacements together
-    function visit(node: ts.Node): void {
-        // Collect array bindings from variable declarations
-        if (ts.isVariableDeclaration(node) && ts.isIdentifier(node.name) && node.initializer) {
-            if (ts.isIdentifier(node.initializer) && bindings.get(node.initializer.text) === 'array') {
-                bindings.set(node.name.text, 'array');
-            }
-
-            if (ts.isPropertyAccessExpression(node.initializer)) {
-                let path = getPropertyPath(node.initializer);
-
-                if (path && bindings.get(path) === 'array') {
-                    bindings.set(node.name.text, 'array');
-                }
-            }
-        }
-
-        // Collect array bindings from function parameters
-        if ((ts.isFunctionDeclaration(node) || ts.isArrowFunction(node)) && node.parameters) {
-            for (let i = 0, n = node.parameters.length; i < n; i++) {
-                let param = node.parameters[i];
-
-                if (
-                    (ts.isIdentifier(param.name) && param.type) &&
-                    ts.isTypeReferenceNode(param.type) &&
-                    ts.isIdentifier(param.type.typeName) &&
-                    param.type.typeName.text === 'ReactiveArray'
-                ) {
-                    bindings.set(param.name.text, 'array');
-                }
-            }
-        }
-
-        // Find .length access replacements
-        if (
-            ts.isPropertyAccessExpression(node) &&
-            node.name.text === 'length' &&
-            !isAssignmentTarget(node)
-        ) {
-            let objName = getExpressionName(node.expression);
-
-            if (objName && bindings.get(objName) === 'array') {
-                let objText = node.expression.getText(sourceFile);
-
-                replacements.push({
-                    end: node.end,
-                    newText: `${objText}.$length()`,
-                    start: node.pos
-                });
-            }
-        }
-
-        // Find array[i] = value replacements
-        if (
-            ts.isBinaryExpression(node) &&
-            node.operatorToken.kind === ts.SyntaxKind.EqualsToken &&
-            ts.isElementAccessExpression(node.left)
-        ) {
-            let elemAccess = node.left,
-                objName = getExpressionName(elemAccess.expression);
-
-            if (objName && bindings.get(objName) === 'array') {
-                let indexText = elemAccess.argumentExpression.getText(sourceFile),
-                    objText = elemAccess.expression.getText(sourceFile),
-                    valueText = node.right.getText(sourceFile);
-
-                replacements.push({
-                    end: node.end,
-                    newText: `${objText}.$set(${indexText}, ${valueText})`,
-                    start: node.pos
-                });
-            }
-        }
-
-        ts.forEachChild(node, visit);
-    }
-
-    visit(sourceFile);
-
-    return applyReplacements(code, replacements);
-};
-
-
-export { transformReactiveArrays };

package/src/transformer/core/transforms/reactive-object.ts

@@ -1,244 +0,0 @@
-import type { Bindings } from '~/types';
-import { uid } from '@esportsplus/typescript/transformer';
-import ts from 'typescript';
-import { addMissingImports, applyReplacements, ExtraImport, Replacement } from './utilities';
-
-
-const CLASS_NAME_REGEX = /class (\w+)/;
-
-const EXTRA_IMPORTS: ExtraImport[] = [
-    { module: '@esportsplus/reactivity/constants', specifier: 'REACTIVE_OBJECT' },
-    { module: '@esportsplus/reactivity/reactive/array', specifier: 'ReactiveArray' }
-];
-
-
-interface AnalyzedProperty {
-    key: string;
-    type: 'array' | 'computed' | 'signal';
-    valueText: string;
-}
-
-interface ReactiveObjectCall {
-    end: number;
-    generatedClass: string;
-    needsImports: Set<string>;
-    start: number;
-    varName: string | null;
-}
-
-
-
-function analyzeProperty(prop: ts.ObjectLiteralElementLike, sourceFile: ts.SourceFile): AnalyzedProperty | null {
-    if (!ts.isPropertyAssignment(prop)) {
-        return null;
-    }
-
-    let key: string;
-
-    if (ts.isIdentifier(prop.name) || ts.isStringLiteral(prop.name)) {
-        key = prop.name.text;
-    }
-    else {
-        return null;
-    }
-
-    let value = prop.initializer,
-        valueText = value.getText(sourceFile);
-
-    if (ts.isArrowFunction(value) || ts.isFunctionExpression(value)) {
-        return { key, type: 'computed', valueText };
-    }
-
-    if (ts.isArrayLiteralExpression(value)) {
-        return { key, type: 'array', valueText };
-    }
-
-    return { key, type: 'signal', valueText };
-}
-
-function buildClassCode(className: string, properties: AnalyzedProperty[]): string {
-    let accessors: string[] = [],
-        disposeStatements: string[] = [],
-        fields: string[] = [];
-
-    fields.push(`[REACTIVE_OBJECT] = true;`);
-
-    for (let i = 0, n = properties.length; i < n; i++) {
-        let { key, type, valueText } = properties[i];
-
-        if (type === 'signal') {
-            let param = uid('v');
-
-            fields.push(`#${key} = signal(${valueText});`);
-            accessors.push(`get ${key}() { return read(this.#${key}); }`);
-            accessors.push(`set ${key}(${param}) { set(this.#${key}, ${param}); }`);
-        }
-        else if (type === 'array') {
-            let elements = valueText.slice(1, -1);
-
-            fields.push(`${key} = new ReactiveArray(${elements});`);
-            disposeStatements.push(`this.${key}.dispose();`);
-        }
-        else if (type === 'computed') {
-            fields.push(`#${key}: Computed<unknown> | null = null;`);
-            accessors.push(`get ${key}() { return read(this.#${key} ??= computed(${valueText})); }`);
-            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}
-            }
-        }
-    `;
-}
-
-
-const transformReactiveObjects = (sourceFile: ts.SourceFile, bindings: Bindings): string => {
-    let allNeededImports = new Set<string>(),
-        calls: ReactiveObjectCall[] = [],
-        code = sourceFile.getFullText(),
-        hasReactiveImport = false,
-        lastImportEnd = 0;
-
-    function visit(node: ts.Node): void {
-        // Track imports (always at top of file)
-        if (ts.isImportDeclaration(node)) {
-            lastImportEnd = node.end;
-
-            if (
-                ts.isStringLiteral(node.moduleSpecifier) &&
-                node.moduleSpecifier.text.includes('@esportsplus/reactivity')
-            ) {
-                let clause = node.importClause;
-
-                if (clause?.namedBindings && ts.isNamedImports(clause.namedBindings)) {
-                    let elements = clause.namedBindings.elements;
-
-                    for (let i = 0, n = elements.length; i < n; i++) {
-                        if (elements[i].name.text === 'reactive') {
-                            hasReactiveImport = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-
-        // Process reactive() calls (only if import was found)
-        if (
-            hasReactiveImport &&
-            ts.isCallExpression(node) &&
-            ts.isIdentifier(node.expression) &&
-            node.expression.text === 'reactive'
-        ) {
-
-            let arg = node.arguments[0];
-
-            if (arg && ts.isObjectLiteralExpression(arg)) {
-                let varName: string | null = null;
-
-                if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
-                    varName = node.parent.name.text;
-                    bindings.set(varName, 'object');
-                }
-
-                let needsImports = new Set<string>(),
-                    properties: AnalyzedProperty[] = [];
-
-                needsImports.add('REACTIVE_OBJECT');
-
-                let props = arg.properties;
-
-                for (let i = 0, n = props.length; i < n; i++) {
-                    let prop = props[i];
-
-                    if (ts.isSpreadAssignment(prop)) {
-                        return;
-                    }
-
-                    let analyzed = analyzeProperty(prop, sourceFile);
-
-                    if (!analyzed) {
-                        return;
-                    }
-
-                    properties.push(analyzed);
-
-                    if (analyzed.type === 'signal') {
-                        needsImports.add('read');
-                        needsImports.add('set');
-                        needsImports.add('signal');
-                    }
-                    else if (analyzed.type === 'array') {
-                        needsImports.add('ReactiveArray');
-
-                        if (varName) {
-                            bindings.set(`${varName}.${analyzed.key}`, 'array');
-                        }
-                    }
-                    else if (analyzed.type === 'computed') {
-                        needsImports.add('computed');
-                        needsImports.add('dispose');
-                        needsImports.add('read');
-                    }
-                }
-
-                needsImports.forEach(imp => allNeededImports.add(imp));
-
-                calls.push({
-                    end: node.end,
-                    generatedClass: buildClassCode(uid('ReactiveObject'), properties),
-                    needsImports,
-                    start: node.pos,
-                    varName
-                });
-            }
-        }
-
-        ts.forEachChild(node, visit);
-    }
-
-    visit(sourceFile);
-
-    if (calls.length === 0) {
-        return code;
-    }
-
-    let replacements: Replacement[] = [];
-
-    // Insert generated classes after imports
-    replacements.push({
-        end: lastImportEnd,
-        newText: code.substring(0, lastImportEnd) + '\n' + calls.map(c => c.generatedClass).join('\n') + '\n',
-        start: 0
-    });
-
-    // Replace each reactive() call with new ClassName()
-    for (let i = 0, n = calls.length; i < n; i++) {
-        let call = calls[i],
-            classMatch = call.generatedClass.match(CLASS_NAME_REGEX);
-
-        replacements.push({
-            end: call.end,
-            newText: ` new ${classMatch ? classMatch[1] : 'ReactiveObject'}()`,
-            start: call.start
-        });
-    }
-
-    return addMissingImports(
-        applyReplacements(code, replacements),
-        allNeededImports,
-        EXTRA_IMPORTS
-    );
-};
-
-
-export { transformReactiveObjects };