@esportsplus/reactivity 0.25.2 → 0.25.4

package/src/transformer/transforms/object.ts

@@ -1,15 +1,7 @@
-import { uid } from '@esportsplus/typescript/transformer';
-import type { Bindings } from '~/types';
-import { addMissingImports, applyReplacements, ExtraImport, Replacement } from './utilities';
 import { ts } from '@esportsplus/typescript';
-
-
-const CLASS_NAME_REGEX = /class (\w+)/;
-
-const EXTRA_IMPORTS: ExtraImport[] = [
-    { module: '@esportsplus/reactivity/constants', specifier: 'REACTIVE_OBJECT' },
-    { module: '@esportsplus/reactivity/reactive/array', specifier: 'ReactiveArray' }
-];
+import { code as c, type Replacement } from '@esportsplus/typescript/transformer';
+import { COMPILATION_TYPE_ARRAY, COMPILATION_TYPE_COMPUTED, COMPILATION_TYPE_SIGNAL, PACKAGE } from '~/constants';
+import type { Bindings } from '~/types';
 
 
 interface AnalyzedProperty {
@@ -19,19 +11,20 @@ interface AnalyzedProperty {
 }
 
 interface ReactiveObjectCall {
+    className: string;
     end: number;
-    generatedClass: string;
-    needsImports: Set<string>;
+    properties: AnalyzedProperty[];
     start: number;
     varName: string | null;
 }
 
 interface TransformContext {
-    allNeededImports: Set<string>;
     bindings: Bindings;
     calls: ReactiveObjectCall[];
+    classCounter: number;
     hasReactiveImport: boolean;
     lastImportEnd: number;
+    ns: string;
     sourceFile: ts.SourceFile;
 }
 
@@ -54,43 +47,53 @@ function analyzeProperty(prop: ts.ObjectLiteralElementLike, sourceFile: ts.Sourc
         valueText = value.getText(sourceFile);
 
     if (ts.isArrowFunction(value) || ts.isFunctionExpression(value)) {
-        return { key, type: 'computed', valueText };
+        return { key, type: COMPILATION_TYPE_COMPUTED, valueText };
     }
 
     if (ts.isArrayLiteralExpression(value)) {
-        return { key, type: 'array', valueText };
+        let elements = value.elements,
+            elementsText = '';
+
+        for (let i = 0, n = elements.length; i < n; i++) {
+            if (i > 0) {
+                elementsText += ', ';
+            }
+
+            elementsText += elements[i].getText(sourceFile);
+        }
+
+        return { key, type: COMPILATION_TYPE_ARRAY, valueText: elementsText };
     }
 
-    return { key, type: 'signal', valueText };
+    return { key, type: COMPILATION_TYPE_SIGNAL, valueText };
 }
 
-function buildClassCode(className: string, properties: AnalyzedProperty[]): string {
+function buildClassCode(className: string, properties: AnalyzedProperty[], ns: string): string {
     let accessors: string[] = [],
         disposeStatements: string[] = [],
-        fields: string[] = [];
+        fields: string[] = [],
+        paramCounter = 0;
 
-    fields.push(`[REACTIVE_OBJECT] = true;`);
+    fields.push(`[${ns}.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');
+        if (type === COMPILATION_TYPE_SIGNAL) {
+            let param = `_v${paramCounter++}`;
 
-            fields.push(`#${key} = signal(${valueText});`);
-            accessors.push(`get ${key}() { return read(this.#${key}); }`);
-            accessors.push(`set ${key}(${param}) { set(this.#${key}, ${param}); }`);
+            fields.push(`#${key} = ${ns}.signal(${valueText});`);
+            accessors.push(`get ${key}() { return ${ns}.read(this.#${key}); }`);
+            accessors.push(`set ${key}(${param}) { ${ns}.write(this.#${key}, ${param}); }`);
         }
-        else if (type === 'array') {
-            let elements = valueText.slice(1, -1);
-
-            fields.push(`${key} = new ReactiveArray(${elements});`);
+        else if (type === COMPILATION_TYPE_ARRAY) {
+            fields.push(`${key} = new ${ns}.ReactiveArray(${valueText});`);
             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});`);
+        else if (type === COMPILATION_TYPE_COMPUTED) {
+            fields.push(`#${key} = null;`);
+            accessors.push(`get ${key}() { return ${ns}.read(this.#${key} ??= ${ns}.computed(${valueText})); }`);
+            disposeStatements.push(`if (this.#${key}) ${ns}.dispose(this.#${key});`);
         }
     }
 
@@ -112,7 +115,7 @@ function visit(ctx: TransformContext, node: ts.Node): void {
 
         if (
             ts.isStringLiteral(node.moduleSpecifier) &&
-            node.moduleSpecifier.text.includes('@esportsplus/reactivity')
+            node.moduleSpecifier.text.includes(PACKAGE)
         ) {
             let clause = node.importClause;
 
@@ -138,20 +141,15 @@ function visit(ctx: TransformContext, node: ts.Node): void {
         let arg = node.arguments[0];
 
         if (arg && ts.isObjectLiteralExpression(arg)) {
-            let varName: string | null = null;
+            let properties: AnalyzedProperty[] = [],
+                props = arg.properties,
+                varName: string | null = null;
 
-            if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            if (node.parent && ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
                 varName = node.parent.name.text;
                 ctx.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];
 
@@ -169,31 +167,15 @@ function visit(ctx: TransformContext, node: ts.Node): void {
 
                 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) {
-                        ctx.bindings.set(`${varName}.${analyzed.key}`, 'array');
-                    }
-                }
-                else if (analyzed.type === 'computed') {
-                    needsImports.add('computed');
-                    needsImports.add('dispose');
-                    needsImports.add('read');
+                if (analyzed.type === COMPILATION_TYPE_ARRAY && varName) {
+                    ctx.bindings.set(`${varName}.${analyzed.key}`, COMPILATION_TYPE_ARRAY);
                 }
             }
 
-            needsImports.forEach(imp => ctx.allNeededImports.add(imp));
-
             ctx.calls.push({
+                className: `_RO${ctx.classCounter++}`,
                 end: node.end,
-                generatedClass: buildClassCode(uid('ReactiveObject'), properties),
-                needsImports,
+                properties,
                 start: node.pos,
                 varName
             });
@@ -204,14 +186,15 @@ function visit(ctx: TransformContext, node: ts.Node): void {
 }
 
 
-const transformReactiveObjects = (sourceFile: ts.SourceFile, bindings: Bindings): string => {
+export default (sourceFile: ts.SourceFile, bindings: Bindings, ns: string): string => {
     let code = sourceFile.getFullText(),
         ctx: TransformContext = {
-            allNeededImports: new Set<string>(),
             bindings,
             calls: [],
+            classCounter: 0,
             hasReactiveImport: false,
             lastImportEnd: 0,
+            ns,
             sourceFile
         };
 
@@ -221,31 +204,24 @@ const transformReactiveObjects = (sourceFile: ts.SourceFile, bindings: Bindings)
         return code;
     }
 
-    let replacements: Replacement[] = [];
+    let classes = ctx.calls.map(c => buildClassCode(c.className, c.properties, ns)).join('\n'),
+        replacements: Replacement[] = [];
 
     replacements.push({
         end: ctx.lastImportEnd,
-        newText: code.substring(0, ctx.lastImportEnd) + '\n' + ctx.calls.map(c => c.generatedClass).join('\n') + '\n',
+        newText: code.substring(0, ctx.lastImportEnd) + '\n' + classes + '\n',
         start: 0
     });
 
     for (let i = 0, n = ctx.calls.length; i < n; i++) {
-        let call = ctx.calls[i],
-            classMatch = call.generatedClass.match(CLASS_NAME_REGEX);
+        let call = ctx.calls[i];
 
         replacements.push({
             end: call.end,
-            newText: ` new ${classMatch ? classMatch[1] : 'ReactiveObject'}()`,
+            newText: ` new ${call.className}()`,
             start: call.start
         });
     }
 
-    return addMissingImports(
-        applyReplacements(code, replacements),
-        ctx.allNeededImports,
-        EXTRA_IMPORTS
-    );
-};
-
-
-export { transformReactiveObjects };
+    return c.replace(code, replacements);
+};

package/src/transformer/transforms/primitives.ts

@@ -1,13 +1,13 @@
-import { uid, type Range } from '@esportsplus/typescript/transformer';
-import type { BindingType, Bindings } from '~/types';
-import { addMissingImports, applyReplacements, Replacement } from './utilities';
 import { ts } from '@esportsplus/typescript';
+import { code as c, type Range, type Replacement } from '@esportsplus/typescript/transformer';
+import type { BindingType, Bindings } from '~/types';
+import { COMPILATION_TYPE_COMPUTED, COMPILATION_ENTRYPOINT, COMPILATION_TYPE_SIGNAL, PACKAGE } from '~/constants';
 
 
 interface ArgContext {
     argStart: number;
     innerReplacements: Replacement[];
-    neededImports: Set<string>;
+    ns: string;
     scopedBindings: ScopeBinding[];
     sourceFile: ts.SourceFile;
 }
@@ -22,23 +22,43 @@ interface TransformContext {
     bindings: Bindings;
     computedArgRanges: Range[];
     hasReactiveImport: boolean;
-    neededImports: Set<string>;
+    ns: string;
     replacements: Replacement[];
     scopedBindings: ScopeBinding[];
     sourceFile: ts.SourceFile;
+    tmpCounter: number;
 }
 
 
-function classifyReactiveArg(arg: ts.Expression): 'computed' | 'signal' | null {
+let COMPOUND_OPERATORS = new Map<ts.SyntaxKind, string>([
+        [ts.SyntaxKind.AmpersandAmpersandEqualsToken, '&&'],
+        [ts.SyntaxKind.AmpersandEqualsToken, '&'],
+        [ts.SyntaxKind.AsteriskAsteriskEqualsToken, '**'],
+        [ts.SyntaxKind.AsteriskEqualsToken, '*'],
+        [ts.SyntaxKind.BarBarEqualsToken, '||'],
+        [ts.SyntaxKind.BarEqualsToken, '|'],
+        [ts.SyntaxKind.CaretEqualsToken, '^'],
+        [ts.SyntaxKind.GreaterThanGreaterThanEqualsToken, '>>'],
+        [ts.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken, '>>>'],
+        [ts.SyntaxKind.LessThanLessThanEqualsToken, '<<'],
+        [ts.SyntaxKind.MinusEqualsToken, '-'],
+        [ts.SyntaxKind.PercentEqualsToken, '%'],
+        [ts.SyntaxKind.PlusEqualsToken, '+'],
+        [ts.SyntaxKind.QuestionQuestionEqualsToken, '??'],
+        [ts.SyntaxKind.SlashEqualsToken, '/']
+    ]);
+
+
+function classifyReactiveArg(arg: ts.Expression): BindingType | null {
     if (ts.isArrowFunction(arg) || ts.isFunctionExpression(arg)) {
-        return 'computed';
+        return COMPILATION_TYPE_COMPUTED;
     }
 
     if (ts.isObjectLiteralExpression(arg) || ts.isArrayLiteralExpression(arg)) {
         return null;
     }
 
-    return 'signal';
+    return COMPILATION_TYPE_SIGNAL;
 }
 
 function findBinding(bindings: ScopeBinding[], name: string, node: ts.Node): ScopeBinding | undefined {
@@ -76,57 +96,6 @@ function findEnclosingScope(node: ts.Node): ts.Node {
     return node.getSourceFile();
 }
 
-function getCompoundOperator(kind: ts.SyntaxKind): string {
-    if (kind === ts.SyntaxKind.PlusEqualsToken) {
-        return '+';
-    }
-    else if (kind === ts.SyntaxKind.MinusEqualsToken) {
-        return '-';
-    }
-    else if (kind === ts.SyntaxKind.AsteriskEqualsToken) {
-        return '*';
-    }
-    else if (kind === ts.SyntaxKind.SlashEqualsToken) {
-        return '/';
-    }
-    else if (kind === ts.SyntaxKind.PercentEqualsToken) {
-        return '%';
-    }
-    else if (kind === ts.SyntaxKind.AsteriskAsteriskEqualsToken) {
-        return '**';
-    }
-    else if (kind === ts.SyntaxKind.AmpersandEqualsToken) {
-        return '&';
-    }
-    else if (kind === ts.SyntaxKind.BarEqualsToken) {
-        return '|';
-    }
-    else if (kind === ts.SyntaxKind.CaretEqualsToken) {
-        return '^';
-    }
-    else if (kind === ts.SyntaxKind.LessThanLessThanEqualsToken) {
-        return '<<';
-    }
-    else if (kind === ts.SyntaxKind.GreaterThanGreaterThanEqualsToken) {
-        return '>>';
-    }
-    else if (kind === ts.SyntaxKind.GreaterThanGreaterThanGreaterThanEqualsToken) {
-        return '>>>';
-    }
-    else if (kind === ts.SyntaxKind.AmpersandAmpersandEqualsToken) {
-        return '&&';
-    }
-    else if (kind === ts.SyntaxKind.BarBarEqualsToken) {
-        return '||';
-    }
-    else if (kind === ts.SyntaxKind.QuestionQuestionEqualsToken) {
-        return '??';
-    }
-    else {
-        return '+';
-    }
-}
-
 function isInComputedRange(ranges: Range[], start: number, end: number): boolean {
     for (let i = 0, n = ranges.length; i < n; i++) {
         let r = ranges[i];
@@ -142,11 +111,7 @@ function isInComputedRange(ranges: Range[], start: number, end: number): boolean
 function isInDeclarationInit(node: ts.Node): boolean {
     let parent = node.parent;
 
-    if (ts.isVariableDeclaration(parent) && parent.initializer === node) {
-        return true;
-    }
-
-    return false;
+    return ts.isVariableDeclaration(parent) && parent.initializer === node;
 }
 
 function isInScope(reference: ts.Node, binding: ScopeBinding): boolean {
@@ -172,7 +137,7 @@ function isReactiveReassignment(node: ts.Node): boolean {
         parent.right === node &&
         ts.isCallExpression(node) &&
         ts.isIdentifier((node as ts.CallExpression).expression) &&
-        ((node as ts.CallExpression).expression as ts.Identifier).text === 'reactive'
+        ((node as ts.CallExpression).expression as ts.Identifier).text === COMPILATION_ENTRYPOINT
     ) {
         return true;
     }
@@ -190,15 +155,7 @@ function isWriteContext(node: ts.Identifier): 'simple' | 'compound' | 'increment
             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
-        ) {
+        if (COMPOUND_OPERATORS.has(op)) {
             return 'compound';
         }
     }
@@ -218,13 +175,13 @@ function visit(ctx: TransformContext, node: ts.Node): void {
     if (
         ts.isImportDeclaration(node) &&
         ts.isStringLiteral(node.moduleSpecifier) &&
-        node.moduleSpecifier.text.includes('@esportsplus/reactivity')
+        node.moduleSpecifier.text.includes(PACKAGE)
     ) {
         let clause = node.importClause;
 
         if (clause?.namedBindings && ts.isNamedImports(clause.namedBindings)) {
             for (let i = 0, n = clause.namedBindings.elements.length; i < n; i++) {
-                if (clause.namedBindings.elements[i].name.text === 'reactive') {
+                if (clause.namedBindings.elements[i].name.text === COMPILATION_ENTRYPOINT) {
                     ctx.hasReactiveImport = true;
                     break;
                 }
@@ -236,7 +193,7 @@ function visit(ctx: TransformContext, node: ts.Node): void {
         ctx.hasReactiveImport &&
         ts.isCallExpression(node) &&
         ts.isIdentifier(node.expression) &&
-        node.expression.text === 'reactive' &&
+        node.expression.text === COMPILATION_ENTRYPOINT &&
         node.arguments.length > 0
     ) {
         let arg = node.arguments[0],
@@ -245,10 +202,11 @@ function visit(ctx: TransformContext, node: ts.Node): void {
         if (classification) {
             let varName: string | null = null;
 
-            if (ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
+            if (node.parent && ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
                 varName = node.parent.name.text;
             }
             else if (
+                node.parent &&
                 ts.isBinaryExpression(node.parent) &&
                 node.parent.operatorToken.kind === ts.SyntaxKind.EqualsToken &&
                 ts.isIdentifier(node.parent.left)
@@ -263,47 +221,40 @@ function visit(ctx: TransformContext, node: ts.Node): void {
                 ctx.bindings.set(varName, classification);
             }
 
-            if (classification === 'computed') {
-                ctx.computedArgRanges.push({
-                    end: arg.end,
-                    start: arg.getStart(ctx.sourceFile)
-                });
+            if (classification === COMPILATION_TYPE_COMPUTED) {
+                let argStart = arg.getStart(ctx.sourceFile);
+
+                ctx.computedArgRanges.push({ end: arg.end, start: argStart });
 
                 let argCtx: ArgContext = {
-                    argStart: arg.getStart(ctx.sourceFile),
+                    argStart,
                     innerReplacements: [],
-                    neededImports: ctx.neededImports,
+                    ns: ctx.ns,
                     scopedBindings: ctx.scopedBindings,
                     sourceFile: ctx.sourceFile
                 };
 
                 visitArg(argCtx, arg);
 
-                let argText = applyReplacements(arg.getText(ctx.sourceFile), argCtx.innerReplacements);
+                let argText = c.replace(arg.getText(ctx.sourceFile), argCtx.innerReplacements);
 
                 ctx.replacements.push({
                     end: node.end,
-                    newText: `computed(${argText})`,
+                    newText: `${ctx.ns}.computed(${argText})`,
                     start: node.pos
                 });
-
-                ctx.neededImports.add('computed');
             }
             else {
-                let argText = arg.getText(ctx.sourceFile);
-
                 ctx.replacements.push({
                     end: node.end,
-                    newText: `signal(${argText})`,
+                    newText: `${ctx.ns}.signal(${arg.getText(ctx.sourceFile)})`,
                     start: node.pos
                 });
-
-                ctx.neededImports.add('signal');
             }
         }
     }
 
-    if (ts.isIdentifier(node) && !isInDeclarationInit(node.parent)) {
+    if (ts.isIdentifier(node) && node.parent && !isInDeclarationInit(node.parent)) {
         if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
             ts.forEachChild(node, n => visit(ctx, n));
             return;
@@ -319,7 +270,7 @@ function visit(ctx: TransformContext, node: ts.Node): void {
         let binding = findBinding(ctx.scopedBindings, node.text, node),
             name = node.text;
 
-        if (binding) {
+        if (binding && node.parent) {
             if (
                 !isReactiveReassignment(node.parent) &&
                 !(ts.isTypeOfExpression(node.parent) && node.parent.expression === node)
@@ -327,55 +278,49 @@ function visit(ctx: TransformContext, node: ts.Node): void {
                 let writeCtx = isWriteContext(node);
 
                 if (writeCtx) {
-                    if (binding.type !== 'computed') {
-                        ctx.neededImports.add('set');
-
+                    if (binding.type !== COMPILATION_TYPE_COMPUTED) {
                         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})`,
+                                newText: `${ctx.ns}.write(${name}, ${parent.right.getText(ctx.sourceFile)})`,
                                 start: parent.pos
                             });
                         }
                         else if (writeCtx === 'compound' && ts.isBinaryExpression(parent)) {
-                            let op = getCompoundOperator(parent.operatorToken.kind),
-                                valueText = parent.right.getText(ctx.sourceFile);
+                            let op = COMPOUND_OPERATORS.get(parent.operatorToken.kind) ?? '+';
 
                             ctx.replacements.push({
                                 end: parent.end,
-                                newText: `set(${name}, ${name}.value ${op} ${valueText})`,
+                                newText: `${ctx.ns}.write(${name}, ${name}.value ${op} ${parent.right.getText(ctx.sourceFile)})`,
                                 start: parent.pos
                             });
                         }
                         else if (writeCtx === 'increment') {
-                            let isPrefix = ts.isPrefixUnaryExpression(parent),
-                                op = (parent as ts.PrefixUnaryExpression | ts.PostfixUnaryExpression).operator,
-                                delta = op === ts.SyntaxKind.PlusPlusToken ? '+ 1' : '- 1';
+                            let delta = (parent as ts.PrefixUnaryExpression | ts.PostfixUnaryExpression).operator === ts.SyntaxKind.PlusPlusToken ? '+ 1' : '- 1',
+                                isPrefix = ts.isPrefixUnaryExpression(parent);
 
                             if (ts.isExpressionStatement(parent.parent)) {
                                 ctx.replacements.push({
                                     end: parent.end,
-                                    newText: `set(${name}, ${name}.value ${delta})`,
+                                    newText: `${ctx.ns}.write(${name}, ${name}.value ${delta})`,
                                     start: parent.pos
                                 });
                             }
                             else if (isPrefix) {
                                 ctx.replacements.push({
                                     end: parent.end,
-                                    newText: `(set(${name}, ${name}.value ${delta}), ${name}.value)`,
+                                    newText: `(${ctx.ns}.write(${name}, ${name}.value ${delta}), ${name}.value)`,
                                     start: parent.pos
                                 });
                             }
                             else {
-                                let tmp = uid('tmp');
+                                let tmp = `_t${ctx.tmpCounter++}`;
 
                                 ctx.replacements.push({
                                     end: parent.end,
-                                    newText: `((${tmp}) => (set(${name}, ${tmp} ${delta}), ${tmp}))(${name}.value)`,
+                                    newText: `((${tmp}) => (${ctx.ns}.write(${name}, ${tmp} ${delta}), ${tmp}))(${name}.value)`,
                                     start: parent.pos
                                 });
                             }
@@ -383,11 +328,9 @@ function visit(ctx: TransformContext, node: ts.Node): void {
                     }
                 }
                 else {
-                    ctx.neededImports.add('read');
-
                     ctx.replacements.push({
                         end: node.end,
-                        newText: `read(${name})`,
+                        newText: `${ctx.ns}.read(${name})`,
                         start: node.pos
                     });
                 }
@@ -399,25 +342,19 @@ function visit(ctx: TransformContext, node: ts.Node): void {
 }
 
 function visitArg(ctx: ArgContext, node: ts.Node): void {
-    if (ts.isIdentifier(node)) {
-        if (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) {
-            ts.forEachChild(node, n => visitArg(ctx, n));
-            return;
-        }
-
-        if (ts.isCallExpression(node.parent) && node.parent.expression === node) {
+    if (ts.isIdentifier(node) && node.parent) {
+        if (
+            (ts.isPropertyAccessExpression(node.parent) && node.parent.name === node) ||
+            (ts.isCallExpression(node.parent) && node.parent.expression === node)
+        ) {
             ts.forEachChild(node, n => visitArg(ctx, n));
             return;
         }
 
-        let binding = findBinding(ctx.scopedBindings, node.text, node);
-
-        if (binding) {
-            ctx.neededImports.add('read');
-
+        if (findBinding(ctx.scopedBindings, node.text, node)) {
             ctx.innerReplacements.push({
                 end: node.end - ctx.argStart,
-                newText: `read(${node.text})`,
+                newText: `${ctx.ns}.read(${node.text})`,
                 start: node.getStart(ctx.sourceFile) - ctx.argStart
             });
         }
@@ -427,19 +364,17 @@ function visitArg(ctx: ArgContext, node: ts.Node): void {
 }
 
 
-const transformReactivePrimitives = (
-    sourceFile: ts.SourceFile,
-    bindings: Bindings
-): string => {
+export default (sourceFile: ts.SourceFile, bindings: Bindings, ns: string): string => {
     let code = sourceFile.getFullText(),
         ctx: TransformContext = {
             bindings,
             computedArgRanges: [],
             hasReactiveImport: false,
-            neededImports: new Set<string>(),
+            ns,
             replacements: [],
             scopedBindings: [],
-            sourceFile
+            sourceFile,
+            tmpCounter: 0
         };
 
     visit(ctx, sourceFile);
@@ -448,14 +383,5 @@ const transformReactivePrimitives = (
         return code;
     }
 
-    let result = applyReplacements(code, ctx.replacements);
-
-    if (ctx.neededImports.size > 0) {
-        result = addMissingImports(result, ctx.neededImports);
-    }
-
-    return result;
+    return c.replace(code, ctx.replacements);
 };
-
-
-export { transformReactivePrimitives };

package/src/types.ts

@@ -1,5 +1,4 @@
 import { COMPUTED, SIGNAL, STATE_CHECK, STATE_DIRTY, STATE_IN_HEAP, STATE_NONE, STATE_RECOMPUTING } from './constants';
-import { ReactiveArray, ReactiveObject } from './reactive';
 import { ts } from '@esportsplus/typescript';
 
 
@@ -36,6 +35,10 @@ interface Link {
     version: number;
 }
 
+// If we expose internals optimizing compiler may break api.
+// Instead we will use this as a shim.
+type Reactive<T> = T;
+
 type Signal<T> = {
     subs: Link | null;
     subsTail: Link | null;
@@ -55,8 +58,7 @@ export type {
     Bindings,
     Computed,
     Link,
-    ReactiveArray,
-    ReactiveObject,
+    Reactive,
     Signal,
     TransformResult
 };