@esportsplus/reactivity 0.25.8 → 0.25.9

package/build/transformer/index.d.ts

@@ -1,5 +1,5 @@
 import { ts } from '@esportsplus/typescript';
 import type { TransformResult } from '../types.js';
-import { contains } from './detector.js';
+declare function contains(code: string): boolean;
 declare const transform: (sourceFile: ts.SourceFile) => TransformResult;
 export { contains, transform };

package/build/transformer/index.js

@@ -1,10 +1,44 @@
 import { ts } from '@esportsplus/typescript';
-import { COMPILER_NAMESPACE } from '../constants.js';
-import { contains } from './detector.js';
+import { code as c } from '@esportsplus/typescript/transformer';
+import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REGEX, COMPILER_NAMESPACE } from '../constants.js';
 import array from './transforms/array.js';
 import object from './transforms/object.js';
 import primitives from './transforms/primitives.js';
 let transforms = [object, array, primitives];
+function contains(code) {
+    if (!c.contains(code, { regex: COMPILER_ENTRYPOINT_REGEX })) {
+        return false;
+    }
+    let ctx = {
+        imported: false,
+        used: false
+    };
+    visit(ctx, ts.createSourceFile('detect.ts', code, ts.ScriptTarget.Latest, false));
+    return ctx.imported && ctx.used;
+}
+function visit(ctx, node) {
+    if (ctx.imported && ctx.used) {
+        return;
+    }
+    if (ts.isImportDeclaration(node) &&
+        node.importClause?.namedBindings &&
+        ts.isNamedImports(node.importClause.namedBindings)) {
+        let elements = node.importClause.namedBindings.elements;
+        for (let i = 0, n = elements.length; i < n; i++) {
+            let element = elements[i];
+            if ((element.propertyName?.text ?? element.name.text) === COMPILER_ENTRYPOINT) {
+                ctx.imported = true;
+                break;
+            }
+        }
+    }
+    if (ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === COMPILER_ENTRYPOINT) {
+        ctx.used = true;
+    }
+    ts.forEachChild(node, n => visit(ctx, n));
+}
 const transform = (sourceFile) => {
     let bindings = new Map(), code = sourceFile.getFullText(), current = sourceFile, result, transformed = false;
     if (!contains(code)) {

package/build/transformer/plugins/vite.js

@@ -1,13 +1,13 @@
 import { ts } from '@esportsplus/typescript';
 import { TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
-import { contains, transform } from '../../transformer/index.js';
+import { transform } from '../../transformer/index.js';
 import { PACKAGE } from '../../constants.js';
 export default () => {
     return {
         enforce: 'pre',
         name: `${PACKAGE}/plugin-vite`,
         transform(code, id) {
-            if (!TRANSFORM_PATTERN.test(id) || id.includes('node_modules') || !contains(code)) {
+            if (!TRANSFORM_PATTERN.test(id) || id.includes('node_modules')) {
                 return null;
             }
             try {

package/package.json

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

package/src/transformer/index.ts

@@ -1,7 +1,7 @@
 import { ts } from '@esportsplus/typescript';
-import { COMPILER_NAMESPACE } from '~/constants.js';
+import { code as c } from '@esportsplus/typescript/transformer';
+import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REGEX, COMPILER_NAMESPACE } from '~/constants';
 import type { Bindings, TransformResult } from '~/types';
-import { contains } from './detector';
 import array from './transforms/array';
 import object from './transforms/object';
 import primitives from './transforms/primitives';
@@ -10,6 +10,55 @@ import primitives from './transforms/primitives';
 let transforms = [object, array, primitives];
 
 
+function contains(code: string): boolean {
+    if (!c.contains(code, { regex: COMPILER_ENTRYPOINT_REGEX })) {
+        return false;
+    }
+
+    let ctx = {
+            imported: false,
+            used: false
+        };
+
+    visit(ctx, ts.createSourceFile('detect.ts', code, ts.ScriptTarget.Latest, false));
+
+    return ctx.imported && ctx.used;
+}
+
+function visit(ctx: { imported: boolean; used: boolean; }, node: ts.Node): void {
+    if (ctx.imported && ctx.used) {
+        return;
+    }
+
+    if (
+        ts.isImportDeclaration(node) &&
+        node.importClause?.namedBindings &&
+        ts.isNamedImports(node.importClause.namedBindings)
+    ) {
+        let elements = node.importClause.namedBindings.elements;
+
+        for (let i = 0, n = elements.length; i < n; i++) {
+            let element = elements[i];
+
+            if ((element.propertyName?.text ?? element.name.text) === COMPILER_ENTRYPOINT) {
+                ctx.imported = true;
+                break;
+            }
+        }
+    }
+
+    if (
+        ts.isCallExpression(node) &&
+        ts.isIdentifier(node.expression) &&
+        node.expression.text === COMPILER_ENTRYPOINT
+    ) {
+        ctx.used = true;
+    }
+
+    ts.forEachChild(node, n => visit(ctx, n));
+}
+
+
 const transform = (sourceFile: ts.SourceFile): TransformResult => {
     let bindings: Bindings = new Map(),
         code = sourceFile.getFullText(),

package/src/transformer/plugins/vite.ts

@@ -1,7 +1,7 @@
 import type { Plugin } from 'vite';
 import { ts } from '@esportsplus/typescript';
 import { TRANSFORM_PATTERN } from '@esportsplus/typescript/transformer';
-import { contains, transform } from '~/transformer';
+import { transform } from '~/transformer';
 import { PACKAGE } from '~/constants';
 
 
@@ -10,7 +10,7 @@ export default (): Plugin => {
         enforce: 'pre',
         name: `${PACKAGE}/plugin-vite`,
         transform(code: string, id: string) {
-            if (!TRANSFORM_PATTERN.test(id) || id.includes('node_modules') || !contains(code)) {
+            if (!TRANSFORM_PATTERN.test(id) || id.includes('node_modules')) {
                 return null;
             }
 

package/build/transformer/detector.d.ts

@@ -1,2 +0,0 @@
-declare const contains: (code: string) => boolean;
-export { contains };

package/build/transformer/detector.js

@@ -1,38 +0,0 @@
-import { code as c } from '@esportsplus/typescript/transformer';
-import { ts } from '@esportsplus/typescript';
-import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REGEX } from '../constants.js';
-function visit(ctx, node) {
-    if (ctx.imported && ctx.used) {
-        return;
-    }
-    if (ts.isImportDeclaration(node) &&
-        node.importClause?.namedBindings &&
-        ts.isNamedImports(node.importClause.namedBindings)) {
-        let elements = node.importClause.namedBindings.elements;
-        for (let i = 0, n = elements.length; i < n; i++) {
-            let element = elements[i];
-            if ((element.propertyName?.text ?? element.name.text) === COMPILER_ENTRYPOINT) {
-                ctx.imported = true;
-                break;
-            }
-        }
-    }
-    if (ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        node.expression.text === COMPILER_ENTRYPOINT) {
-        ctx.used = true;
-    }
-    ts.forEachChild(node, n => visit(ctx, n));
-}
-const contains = (code) => {
-    if (!c.contains(code, { regex: COMPILER_ENTRYPOINT_REGEX })) {
-        return false;
-    }
-    let ctx = {
-        imported: false,
-        used: false
-    };
-    visit(ctx, ts.createSourceFile('detect.ts', code, ts.ScriptTarget.Latest, false));
-    return ctx.imported && ctx.used;
-};
-export { contains };

package/src/transformer/detector.ts

@@ -1,56 +0,0 @@
-import { code as c } from '@esportsplus/typescript/transformer';
-import { ts } from '@esportsplus/typescript';
-import { COMPILER_ENTRYPOINT, COMPILER_ENTRYPOINT_REGEX } from '~/constants';
-
-
-function visit(ctx: { imported: boolean; used: boolean; }, node: ts.Node): void {
-    if (ctx.imported && ctx.used) {
-        return;
-    }
-
-    if (
-        ts.isImportDeclaration(node) &&
-        node.importClause?.namedBindings &&
-        ts.isNamedImports(node.importClause.namedBindings)
-    ) {
-        let elements = node.importClause.namedBindings.elements;
-
-        for (let i = 0, n = elements.length; i < n; i++) {
-            let element = elements[i];
-
-            if ((element.propertyName?.text ?? element.name.text) === COMPILER_ENTRYPOINT) {
-                ctx.imported = true;
-                break;
-            }
-        }
-    }
-
-    if (
-        ts.isCallExpression(node) &&
-        ts.isIdentifier(node.expression) &&
-        node.expression.text === COMPILER_ENTRYPOINT
-    ) {
-        ctx.used = true;
-    }
-
-    ts.forEachChild(node, n => visit(ctx, n));
-}
-
-
-const contains = (code: string): boolean => {
-    if (!c.contains(code, { regex: COMPILER_ENTRYPOINT_REGEX })) {
-        return false;
-    }
-
-    let ctx = {
-            imported: false,
-            used: false
-        };
-
-    visit(ctx, ts.createSourceFile('detect.ts', code, ts.ScriptTarget.Latest, false));
-
-    return ctx.imported && ctx.used;
-};
-
-
-export { contains };