@esportsplus/typescript 0.25.0 → 0.25.1

package/build/compiler/ast/expression.d.ts

@@ -1,6 +1,4 @@
-import { ts } from '../../index.js';
+import ts from 'typescript';
 declare const getExpressionName: (node: ts.Expression) => string | null;
-declare const getPropertyPath: (node: ts.Expression) => string[] | null;
-declare const getPropertyPathString: (node: ts.Expression) => string | null;
-declare const unwrapParentheses: (expr: ts.Expression) => ts.Expression;
-export { getExpressionName, getPropertyPath, getPropertyPathString, unwrapParentheses };
+declare const getPropertyPath: (node: ts.Expression) => string | null;
+export { getExpressionName, getPropertyPath };

package/build/compiler/ast/expression.js

@@ -1,10 +1,10 @@
-import { ts } from '../../index.js';
+import ts from 'typescript';
 const getExpressionName = (node) => {
     if (ts.isIdentifier(node)) {
         return node.text;
     }
     if (ts.isPropertyAccessExpression(node)) {
-        return getPropertyPathString(node);
+        return getPropertyPath(node);
     }
     return null;
 };
@@ -16,18 +16,8 @@ const getPropertyPath = (node) => {
     }
     if (ts.isIdentifier(current)) {
         parts.push(current.text);
-        return parts.reverse();
+        return parts.reverse().join('.');
     }
     return null;
 };
-const getPropertyPathString = (node) => {
-    let parts = getPropertyPath(node);
-    return parts ? parts.join('.') : null;
-};
-const unwrapParentheses = (expr) => {
-    while (ts.isParenthesizedExpression(expr)) {
-        expr = expr.expression;
-    }
-    return expr;
-};
-export { getExpressionName, getPropertyPath, getPropertyPathString, unwrapParentheses };
+export { getExpressionName, getPropertyPath };

package/build/compiler/ast/range.d.ts

@@ -2,7 +2,6 @@ type Range = {
     end: number;
     start: number;
 };
-declare const containsPosition: (range: Range, pos: number) => boolean;
 declare const inRange: (ranges: Range[], start: number, end: number) => boolean;
-export { containsPosition, inRange };
+export { inRange };
 export type { Range };

package/build/compiler/ast/range.js

@@ -1,6 +1,3 @@
-const containsPosition = (range, pos) => {
-    return pos >= range.start && pos <= range.end;
-};
 const inRange = (ranges, start, end) => {
     for (let i = 0, n = ranges.length; i < n; i++) {
         let r = ranges[i];
@@ -10,4 +7,4 @@ const inRange = (ranges, start, end) => {
     }
     return false;
 };
-export { containsPosition, inRange };
+export { inRange };

package/build/compiler/code.d.ts

@@ -1,7 +1,5 @@
-import type { QuickCheckPattern, Replacement } from './types.js';
+import type { Replacement } from './types.js';
 declare const _default: {
-    contains: (code: string, { regex, patterns }: QuickCheckPattern) => boolean;
-    replace: (code: string, replacements: Replacement[]) => string;
     replaceReverse: (code: string, replacements: Replacement[]) => string;
 };
 export default _default;

package/build/compiler/code.js

@@ -1,35 +1,3 @@
-const contains = (code, { regex, patterns }) => {
-    if (regex) {
-        return regex.test(code);
-    }
-    if (patterns) {
-        for (let i = 0, n = patterns.length; i < n; i++) {
-            if (code.indexOf(patterns[i]) !== -1) {
-                return true;
-            }
-        }
-    }
-    return false;
-};
-const replace = (code, replacements) => {
-    if (replacements.length === 0) {
-        return code;
-    }
-    replacements.sort((a, b) => a.start - b.start);
-    let parts = [], pos = 0;
-    for (let i = 0, n = replacements.length; i < n; i++) {
-        let r = replacements[i];
-        if (r.start > pos) {
-            parts.push(code.substring(pos, r.start));
-        }
-        parts.push(r.newText);
-        pos = r.end;
-    }
-    if (pos < code.length) {
-        parts.push(code.substring(pos));
-    }
-    return parts.join('');
-};
 const replaceReverse = (code, replacements) => {
     if (replacements.length === 0) {
         return code;
@@ -42,4 +10,4 @@ const replaceReverse = (code, replacements) => {
     }
     return result;
 };
-export default { contains, replace, replaceReverse };
+export default { replaceReverse };

package/build/compiler/imports.d.ts

@@ -12,6 +12,7 @@ type ModifyOptions = {
 declare const _default: {
     find: (sourceFile: ts.SourceFile, packageName: string) => ImportInfo[];
     isFromPackage: (node: ts.Identifier, packageName: string, checker?: ts.TypeChecker) => boolean;
+    isSymbolFromPackage: (checker: ts.TypeChecker, node: ts.Node, packageName: string, symbolName?: string) => boolean;
     modify: (sourceCode: string, sourceFile: ts.SourceFile, packageName: string, options: ModifyOptions) => string;
     trace: (node: ts.Identifier, checker: ts.TypeChecker) => string | null;
 };

package/build/compiler/imports.js

@@ -29,6 +29,28 @@ const isFromPackage = (node, packageName, checker) => {
     let origin = trace(node, checker);
     return origin === null || origin.includes(packageName);
 };
+const isSymbolFromPackage = (checker, node, packageName, symbolName) => {
+    let symbol = checker.getSymbolAtLocation(node);
+    if (!symbol) {
+        return false;
+    }
+    if (symbol.flags & ts.SymbolFlags.Alias) {
+        symbol = checker.getAliasedSymbol(symbol);
+    }
+    if (symbolName && symbol.name !== symbolName) {
+        return false;
+    }
+    let declarations = symbol.getDeclarations();
+    if (!declarations || declarations.length === 0) {
+        return false;
+    }
+    for (let i = 0, n = declarations.length; i < n; i++) {
+        if (declarations[i].getSourceFile().fileName.includes(packageName)) {
+            return true;
+        }
+    }
+    return false;
+};
 const modify = (sourceCode, sourceFile, packageName, options) => {
     let { namespace } = options;
     if (!options.add && !options.namespace && !options.remove) {
@@ -92,4 +114,4 @@ const trace = (node, checker) => {
     }
     return declarations[0].getSourceFile().fileName;
 };
-export default { find, isFromPackage, modify, trace };
+export default { find, isFromPackage, isSymbolFromPackage, modify, trace };

package/build/compiler/index.d.ts

@@ -3,6 +3,5 @@ export { default as code } from './code.js';
 export { default as coordinator } from './coordinator.js';
 export { default as imports } from './imports.js';
 export { default as plugin } from './plugins/index.js';
-export { default as program } from './program.js';
 export { default as uid } from './uid.js';
 export type * from './types.js';

package/build/compiler/index.js

@@ -3,5 +3,4 @@ export { default as code } from './code.js';
 export { default as coordinator } from './coordinator.js';
 export { default as imports } from './imports.js';
 export { default as plugin } from './plugins/index.js';
-export { default as program } from './program.js';
 export { default as uid } from './uid.js';

package/build/compiler/plugins/index.d.ts

@@ -1,11 +1,11 @@
 declare const _default: {
-    tsc: (plugins: import("../types.js").Plugin[]) => (program: import("typescript").Program, shared: import("../types.js").SharedContext) => {
+    tsc: (plugins: import("../index.js").Plugin[]) => (program: import("typescript").Program, shared: import("../index.js").SharedContext) => {
         transform: import("typescript").TransformerFactory<import("typescript").SourceFile>;
     };
     vite: ({ name, onWatchChange, plugins }: {
         name: string;
         onWatchChange?: () => void;
-        plugins: import("../types.js").Plugin[];
+        plugins: import("../index.js").Plugin[];
     }) => ({ root }?: {
         root?: string;
     }) => {

package/build/compiler/plugins/tsc.d.ts

@@ -1,7 +1,6 @@
 import type { Plugin, SharedContext } from '../types.js';
 import type ts from 'typescript';
-type PluginInstance = {
+declare const _default: (plugins: Plugin[]) => (program: ts.Program, shared: SharedContext) => {
     transform: ts.TransformerFactory<ts.SourceFile>;
 };
-declare const _default: (plugins: Plugin[]) => (program: ts.Program, shared: SharedContext) => PluginInstance;
 export default _default;

package/build/compiler/types.d.ts

@@ -10,10 +10,6 @@ type Plugin = {
     transform: (ctx: TransformContext) => TransformResult;
 };
 type PluginFactory = (options?: Record<string, unknown>) => Plugin;
-type QuickCheckPattern = {
-    patterns?: string[];
-    regex?: RegExp;
-};
 type Range = {
     end: number;
     start: number;
@@ -38,4 +34,4 @@ type TransformResult = {
     prepend?: string[];
     replacements?: ReplacementIntent[];
 };
-export type { ImportIntent, Plugin, PluginFactory, QuickCheckPattern, Range, Replacement, ReplacementIntent, SharedContext, TransformContext, TransformResult };
+export type { ImportIntent, Plugin, PluginFactory, Range, Replacement, ReplacementIntent, SharedContext, TransformContext, TransformResult };

package/package.json

@@ -37,7 +37,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/ast/expression.ts

@@ -1,4 +1,4 @@
-import { ts } from '../..';
+import ts from 'typescript';
 
 
 const getExpressionName = (node: ts.Expression): string | null => {
@@ -7,13 +7,13 @@ const getExpressionName = (node: ts.Expression): string | null => {
     }
 
     if (ts.isPropertyAccessExpression(node)) {
-        return getPropertyPathString(node);
+        return getPropertyPath(node);
     }
 
     return null;
-}
+};
 
-const getPropertyPath = (node: ts.Expression): string[] | null => {
+const getPropertyPath = (node: ts.Expression): string | null => {
     let current: ts.Node = node,
         parts: string[] = [];
 
@@ -24,25 +24,11 @@ const getPropertyPath = (node: ts.Expression): string[] | null => {
 
     if (ts.isIdentifier(current)) {
         parts.push(current.text);
-        return parts.reverse();
+        return parts.reverse().join('.');
     }
 
     return null;
-}
+};
 
-const getPropertyPathString = (node: ts.Expression): string | null => {
-    let parts = getPropertyPath(node);
 
-    return parts ? parts.join('.') : null;
-}
-
-const unwrapParentheses = (expr: ts.Expression): ts.Expression => {
-    while (ts.isParenthesizedExpression(expr)) {
-        expr = expr.expression;
-    }
-
-    return expr;
-}
-
-
-export { getExpressionName, getPropertyPath, getPropertyPathString, unwrapParentheses };
+export { getExpressionName, getPropertyPath };

package/src/compiler/ast/range.ts

@@ -4,10 +4,6 @@ type Range = {
 };
 
 
-const containsPosition = (range: Range, pos: number): boolean => {
-    return pos >= range.start && pos <= range.end;
-}
-
 const inRange = (ranges: Range[], start: number, end: number): boolean => {
     for (let i = 0, n = ranges.length; i < n; i++) {
         let r = ranges[i];
@@ -18,8 +14,8 @@ const inRange = (ranges: Range[], start: number, end: number): boolean => {
     }
 
     return false;
-}
+};
 
 
-export { containsPosition, inRange };
+export { inRange };
 export type { Range };

package/src/compiler/code.ts

@@ -1,51 +1,7 @@
-import type { QuickCheckPattern, Replacement } from './types.js';
+import type { Replacement } from './types';
 
 
-const contains = (code: string, { regex, patterns }: QuickCheckPattern): boolean => {
-    if (regex) {
-        return regex.test(code);
-    }
-
-    if (patterns) {
-        for (let i = 0, n = patterns.length; i < n; i++) {
-            if (code.indexOf(patterns[i]) !== -1) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-};
-
-const replace = (code: string, replacements: Replacement[]): string => {
-    if (replacements.length === 0) {
-        return code;
-    }
-
-    replacements.sort((a, b) => a.start - b.start);
-
-    let parts: string[] = [],
-        pos = 0;
-
-    for (let i = 0, n = replacements.length; i < n; i++) {
-        let r = replacements[i];
-
-        if (r.start > pos) {
-            parts.push(code.substring(pos, r.start));
-        }
-
-        parts.push(r.newText);
-        pos = r.end;
-    }
-
-    if (pos < code.length) {
-        parts.push(code.substring(pos));
-    }
-
-    return parts.join('');
-};
-
-const replaceReverse =(code: string, replacements: Replacement[]): string => {
+const replaceReverse = (code: string, replacements: Replacement[]): string => {
     if (replacements.length === 0) {
         return code;
     }
@@ -64,4 +20,4 @@ const replaceReverse =(code: string, replacements: Replacement[]): string => {
 };
 
 
-export default { contains, replace, replaceReverse };
+export default { replaceReverse };

package/src/compiler/coordinator.ts

@@ -1,7 +1,7 @@
-import type { ImportIntent, Plugin, ReplacementIntent, SharedContext } from './types.js';
-import { ts } from '~/index.js';
-import code from './code.js';
-import imports from './imports.js';
+import type { ImportIntent, Plugin, ReplacementIntent, SharedContext } from './types';
+import { ts } from '~/index';
+import code from './code';
+import imports from './imports';
 
 
 type CoordinatorResult = {

package/src/compiler/imports.ts

@@ -1,6 +1,6 @@
-import type { Replacement } from './types.js';
-import { ts } from '~/index.js';
-import code from './code.js';
+import type { Replacement } from './types';
+import { ts } from '~/index';
+import code from './code';
 
 
 type ImportInfo = {
@@ -65,6 +65,44 @@ const isFromPackage = (node: ts.Identifier, packageName: string, checker?: ts.Ty
     return origin === null || origin.includes(packageName);
 };
 
+// Check if node's symbol originates from a specific package (with optional symbol name validation)
+const isSymbolFromPackage = (
+    checker: ts.TypeChecker,
+    node: ts.Node,
+    packageName: string,
+    symbolName?: string
+): boolean => {
+    let symbol = checker.getSymbolAtLocation(node);
+
+    if (!symbol) {
+        return false;
+    }
+
+    // Follow aliases to original symbol (handles re-exports and aliased imports)
+    if (symbol.flags & ts.SymbolFlags.Alias) {
+        symbol = checker.getAliasedSymbol(symbol);
+    }
+
+    // Check symbol name if specified
+    if (symbolName && symbol.name !== symbolName) {
+        return false;
+    }
+
+    let declarations = symbol.getDeclarations();
+
+    if (!declarations || declarations.length === 0) {
+        return false;
+    }
+
+    // Check if any declaration is from the expected package
+    for (let i = 0, n = declarations.length; i < n; i++) {
+        if (declarations[i].getSourceFile().fileName.includes(packageName)) {
+            return true;
+        }
+    }
+
+    return false;
+};
 
 // Modify imports: remove specified, add needed, delete if empty
 const modify = (
@@ -166,5 +204,5 @@ const trace = (node: ts.Identifier, checker: ts.TypeChecker): string | null => {
 };
 
 
-export default { find, isFromPackage, modify, trace };
+export default { find, isFromPackage, isSymbolFromPackage, modify, trace };
 export type { ImportInfo, ModifyOptions };

package/src/compiler/index.ts

@@ -1,8 +1,7 @@
-export * as ast from './ast/index.js';
-export { default as code } from './code.js';
-export { default as coordinator } from './coordinator.js';
-export { default as imports } from './imports.js';
-export { default as plugin } from './plugins/index.js';
-export { default as program } from './program.js';
-export { default as uid } from './uid.js';
-export type * from './types.js';
+export * as ast from './ast/index';
+export { default as code } from './code';
+export { default as coordinator } from './coordinator';
+export { default as imports } from './imports';
+export { default as plugin } from './plugins/index';
+export { default as uid } from './uid';
+export type * from './types';

package/src/compiler/plugins/index.ts

@@ -1,5 +1,5 @@
-import tsc from './tsc.js';
-import vite from './vite.js';
+import tsc from './tsc';
+import vite from './vite';
 
 
 export default { tsc, vite };

package/src/compiler/plugins/tsc.ts

@@ -1,15 +1,10 @@
-import type { Plugin, SharedContext } from '../types.js';
+import type { Plugin, SharedContext } from '../types';
 import type ts from 'typescript';
-import coordinator from '../coordinator.js';
-
-
-type PluginInstance = {
-    transform: ts.TransformerFactory<ts.SourceFile>;
-};
+import coordinator from '../coordinator';
 
 
 export default (plugins: Plugin[]) => {
-    return (program: ts.Program, shared: SharedContext): PluginInstance => {
+    return (program: ts.Program, shared: SharedContext) => {
         return {
             transform: (() => {
                 return (sourceFile: ts.SourceFile) => {

package/src/compiler/plugins/vite.ts

@@ -1,8 +1,8 @@
 import type { ResolvedConfig } from 'vite';
-import type { Plugin, SharedContext } from '../types.js';
-import { ts } from '~/index.js';
-import coordinator from '../coordinator.js';
-import program from '../program.js';
+import type { Plugin, SharedContext } from '../types';
+import { ts } from '~/index';
+import coordinator from '../coordinator';
+import program from '../program';
 
 
 type VitePlugin = {

package/src/compiler/program.ts

@@ -51,4 +51,4 @@ const del = (root: string): void => {
 }
 
 
-export default { get, delete: del };
+export default { get, delete: del };

package/src/compiler/types.ts

@@ -24,11 +24,6 @@ type Plugin = {
 
 type PluginFactory = (options?: Record<string, unknown>) => Plugin;
 
-type QuickCheckPattern = {
-    patterns?: string[];
-    regex?: RegExp;
-};
-
 type Range = {
     end: number;
     start: number;
@@ -82,7 +77,6 @@ type TransformResult = {
 export type {
     ImportIntent,
     Plugin, PluginFactory,
-    QuickCheckPattern,
     Range, Replacement, ReplacementIntent,
     SharedContext,
     TransformContext, TransformResult