@esportsplus/typescript 0.12.2 → 0.13.1

package/build/transformer/index.d.ts

@@ -1,15 +1,10 @@
-import ts from 'typescript';
-import type { ImportModification, NodeMatch, QuickCheckPattern, Replacement, VisitorCallback, VisitorPredicate } from './types.js';
+import type { QuickCheckPattern, Replacement } from './types.js';
 import program from './program.js';
 declare const addImport: (code: string, module: string, specifiers: string[]) => string;
 declare const applyReplacements: (code: string, replacements: Replacement[]) => string;
 declare const applyReplacementsReverse: (code: string, replacements: Replacement[]) => string;
-declare const collectNodes: <T>(sourceFile: ts.SourceFile, predicate: (node: ts.Node) => T | null) => NodeMatch<T>[];
 declare const mightNeedTransform: (code: string, check: QuickCheckPattern) => boolean;
-declare const uid: (prefix?: string) => string;
-declare const updateImports: (code: string, modification: ImportModification) => string;
-declare const visitAst: <T>(sourceFile: ts.SourceFile, callback: VisitorCallback<T>, state: T, predicate?: VisitorPredicate) => T;
-declare const visitAstWithDepth: <T>(sourceFile: ts.SourceFile, callback: (node: ts.Node, depth: number, state: T) => void, state: T, depthTrigger: (node: ts.Node) => boolean) => T;
-export { addImport, applyReplacements, applyReplacementsReverse, collectNodes, mightNeedTransform, program, uid, updateImports, visitAst, visitAstWithDepth };
+declare const uid: (prefix: string, updateUUID?: boolean) => string;
+export { addImport, applyReplacements, applyReplacementsReverse, mightNeedTransform, program, uid };
 export type * from './types.js';
 export * from './constants.js';

package/build/transformer/index.js

@@ -1,7 +1,7 @@
 import { uuid } from '@esportsplus/utilities';
-import ts from 'typescript';
 import { BRACES_CONTENT_REGEX, REGEX_ESCAPE_PATTERN, UUID_DASH_REGEX } from './constants.js';
 import program from './program.js';
+let i = 0, uidSuffix = uuid().replace(UUID_DASH_REGEX, '');
 function buildImportRegex(escapedModule) {
     return new RegExp(`(import\\s*\\{[^}]*\\}\\s*from\\s*['"]${escapedModule}['"])`);
 }
@@ -92,23 +92,6 @@ const applyReplacementsReverse = (code, replacements) => {
     }
     return result;
 };
-const collectNodes = (sourceFile, predicate) => {
-    let matches = [];
-    function visit(node) {
-        let data = predicate(node);
-        if (data !== null) {
-            matches.push({
-                data,
-                end: node.end,
-                node,
-                start: node.getStart(sourceFile)
-            });
-        }
-        ts.forEachChild(node, visit);
-    }
-    visit(sourceFile);
-    return matches;
-};
 const mightNeedTransform = (code, check) => {
     if (check.regex) {
         return check.regex.test(code);
@@ -122,38 +105,8 @@ const mightNeedTransform = (code, check) => {
     }
     return false;
 };
-const uid = (prefix) => {
-    return (prefix ? prefix + '_' : '_') + uuid().replace(UUID_DASH_REGEX, '_');
-};
-const updateImports = (code, modification) => {
-    let { module, specifiers } = modification;
-    if (specifiers.size === 0) {
-        return code;
-    }
-    let escapedModule = module.replace(REGEX_ESCAPE_PATTERN, '\\$&'), importRegex = buildImportRegex(escapedModule);
-    return updateImportsWithRegex(code, specifiers, importRegex);
-};
-const visitAst = (sourceFile, callback, state, predicate) => {
-    function visit(node) {
-        if (!predicate || predicate(node)) {
-            callback(node, state);
-        }
-        ts.forEachChild(node, visit);
-    }
-    visit(sourceFile);
-    return state;
-};
-const visitAstWithDepth = (sourceFile, callback, state, depthTrigger) => {
-    let depthStack = [0];
-    function visit(node) {
-        let depth = depthStack[depthStack.length - 1], nextDepth = depthTrigger(node) ? depth + 1 : depth;
-        callback(node, depth, state);
-        depthStack.push(nextDepth);
-        ts.forEachChild(node, visit);
-        depthStack.pop();
-    }
-    visit(sourceFile);
-    return state;
+const uid = (prefix, updateUUID = false) => {
+    return prefix + '_' + (updateUUID ? uuid().replace(UUID_DASH_REGEX, '') : uidSuffix) + '_' + (i++).toString(36);
 };
-export { addImport, applyReplacements, applyReplacementsReverse, collectNodes, mightNeedTransform, program, uid, updateImports, visitAst, visitAstWithDepth };
+export { addImport, applyReplacements, applyReplacementsReverse, mightNeedTransform, program, uid };
 export * from './constants.js';

package/build/transformer/types.d.ts

@@ -1,12 +1,3 @@
-import ts from 'typescript';
-type ImportModification = {
-    module: string;
-    specifiers: Set<string>;
-};
-type NodeMatch<T> = Range & {
-    data: T;
-    node: ts.Node;
-};
 type QuickCheckPattern = {
     patterns?: string[];
     regex?: RegExp;
@@ -18,6 +9,4 @@ type Range = {
 type Replacement = Range & {
     newText: string;
 };
-type VisitorCallback<T> = (node: ts.Node, state: T) => void;
-type VisitorPredicate = (node: ts.Node) => boolean;
-export type { ImportModification, NodeMatch, QuickCheckPattern, Range, Replacement, VisitorCallback, VisitorPredicate };
+export type { QuickCheckPattern, Range, Replacement };

package/package.json

@@ -34,7 +34,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.12.2",
+  "version": "0.13.1",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/transformer/index.ts

@@ -1,10 +1,13 @@
 import { uuid } from '@esportsplus/utilities';
-import ts from 'typescript';
 import { BRACES_CONTENT_REGEX, REGEX_ESCAPE_PATTERN, UUID_DASH_REGEX } from './constants.js';
-import type { ImportModification, NodeMatch, QuickCheckPattern, Replacement, VisitorCallback, VisitorPredicate } from './types.js';
+import type { QuickCheckPattern, Replacement } from './types.js';
 import program from './program';
 
 
+let i = 0,
+    uidSuffix = uuid().replace(UUID_DASH_REGEX, '');
+
+
 function buildImportRegex(escapedModule: string): RegExp {
     return new RegExp(`(import\\s*\\{[^}]*\\}\\s*from\\s*['"]${escapedModule}['"])`);
 }
@@ -142,29 +145,6 @@ const applyReplacementsReverse = (code: string, replacements: Replacement[]): st
     return result;
 };
 
-const collectNodes = <T>(sourceFile: ts.SourceFile, predicate: (node: ts.Node) => T | null): NodeMatch<T>[] => {
-    let matches: NodeMatch<T>[] = [];
-
-    function visit(node: ts.Node): void {
-        let data = predicate(node);
-
-        if (data !== null) {
-            matches.push({
-                data,
-                end: node.end,
-                node,
-                start: node.getStart(sourceFile)
-            });
-        }
-
-        ts.forEachChild(node, visit);
-    }
-
-    visit(sourceFile);
-
-    return matches;
-};
-
 const mightNeedTransform = (code: string, check: QuickCheckPattern): boolean => {
     if (check.regex) {
         return check.regex.test(code);
@@ -181,73 +161,16 @@ const mightNeedTransform = (code: string, check: QuickCheckPattern): boolean =>
     return false;
 };
 
-const uid = (prefix?: string): string => {
-    return (prefix ? prefix + '_' : '_') + uuid().replace(UUID_DASH_REGEX, '_');
-};
-
-const updateImports = (code: string, modification: ImportModification): string => {
-    let { module, specifiers } = modification;
-
-    if (specifiers.size === 0) {
-        return code;
-    }
-
-    let escapedModule = module.replace(REGEX_ESCAPE_PATTERN, '\\$&'),
-        importRegex = buildImportRegex(escapedModule);
-
-    return updateImportsWithRegex(code, specifiers, importRegex);
-};
-
-const visitAst = <T>(
-    sourceFile: ts.SourceFile,
-    callback: VisitorCallback<T>,
-    state: T,
-    predicate?: VisitorPredicate
-): T => {
-    function visit(node: ts.Node): void {
-        if (!predicate || predicate(node)) {
-            callback(node, state);
-        }
-
-        ts.forEachChild(node, visit);
-    }
-
-    visit(sourceFile);
-
-    return state;
-};
-
-const visitAstWithDepth = <T>(
-    sourceFile: ts.SourceFile,
-    callback: (node: ts.Node, depth: number, state: T) => void,
-    state: T,
-    depthTrigger: (node: ts.Node) => boolean
-): T => {
-    let depthStack: number[] = [0];
-
-    function visit(node: ts.Node): void {
-        let depth = depthStack[depthStack.length - 1],
-            nextDepth = depthTrigger(node) ? depth + 1 : depth;
-
-        callback(node, depth, state);
-        depthStack.push(nextDepth);
-        ts.forEachChild(node, visit);
-        depthStack.pop();
-    }
-
-    visit(sourceFile);
-
-    return state;
+const uid = (prefix: string, updateUUID = false): string => {
+    return prefix + '_' + (updateUUID ? uuid().replace(UUID_DASH_REGEX, '') : uidSuffix) + '_' + (i++).toString(36);
 };
 
 
 export {
     addImport, applyReplacements, applyReplacementsReverse,
-    collectNodes,
     mightNeedTransform,
     program,
-    uid, updateImports,
-    visitAst, visitAstWithDepth
+    uid
 };
 export type * from './types';
-export * from './constants';
+export * from './constants';

package/src/transformer/types.ts

@@ -1,16 +1,3 @@
-import ts from 'typescript';
-
-
-type ImportModification = {
-    module: string;
-    specifiers: Set<string>;
-};
-
-type NodeMatch<T> = Range & {
-    data: T;
-    node: ts.Node;
-};
-
 type QuickCheckPattern = {
     patterns?: string[];
     regex?: RegExp;
@@ -25,15 +12,5 @@ type Replacement = Range & {
     newText: string;
 };
 
-type VisitorCallback<T> = (node: ts.Node, state: T) => void;
-
-type VisitorPredicate = (node: ts.Node) => boolean;
-
 
-export type {
-    ImportModification,
-    NodeMatch,
-    QuickCheckPattern,
-    Range, Replacement,
-    VisitorCallback, VisitorPredicate
-};
+export type { QuickCheckPattern, Range, Replacement };