@esportsplus/typescript 0.17.3 → 0.17.5

package/build/cli/tsc.js

@@ -1,17 +1,12 @@
 import { spawn } from 'child_process';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
-import fs from 'fs';
 import path from 'path';
 import ts from 'typescript';
-let require = createRequire(import.meta.url), skipFlags = ['--help', '--init', '--noEmit', '--showConfig', '--version', '-h', '-noEmit', '-v'];
-async function build(tsconfig, plugins) {
-    let { config, error } = ts.readConfigFile(tsconfig, ts.sys.readFile), root = path.dirname(path.resolve(tsconfig));
-    if (error) {
-        console.error(ts.flattenDiagnosticMessageText(error.messageText, '\n'));
-        process.exit(1);
-    }
-    let parsed = ts.parseJsonConfigFileContent(config, ts.sys, root);
+const BACKSLASH_REGEX = /\\/g;
+let require = createRequire(import.meta.url), skipFlags = new Set(['--help', '--init', '--noEmit', '--showConfig', '--version', '-h', '-noEmit', '-v']);
+async function build(config, tsconfig, plugins) {
+    let root = path.dirname(path.resolve(tsconfig)), parsed = ts.parseJsonConfigFileContent(config, ts.sys, root);
     if (parsed.errors.length > 0) {
         for (let i = 0, n = parsed.errors.length; i < n; i++) {
             console.error(ts.flattenDiagnosticMessageText(parsed.errors[i].messageText, '\n'));
@@ -28,29 +23,26 @@ async function build(tsconfig, plugins) {
             }
             let result = ts.transform(sourceFile, beforeTransformers), transformed = result.transformed[0];
             if (transformed !== sourceFile) {
-                transformedFiles.set(fileName, printer.printFile(transformed));
+                transformedFiles.set(normalizePath(fileName), printer.printFile(transformed));
             }
             result.dispose();
         }
         if (transformedFiles.size > 0) {
             let customHost = ts.createCompilerHost(parsed.options), originalGetSourceFile = customHost.getSourceFile.bind(customHost), originalReadFile = customHost.readFile.bind(customHost);
-            customHost.readFile = (fileName) => {
-                let transformed = transformedFiles.get(path.resolve(fileName));
-                if (transformed) {
-                    return transformed;
-                }
-                return originalReadFile(fileName);
-            };
             customHost.getSourceFile = (fileName, languageVersion, onError, shouldCreateNewSourceFile) => {
-                let resolved = path.resolve(fileName), transformed = transformedFiles.get(resolved);
+                let transformed = transformedFiles.get(normalizePath(fileName));
                 if (transformed) {
                     return ts.createSourceFile(fileName, transformed, languageVersion, true);
                 }
                 return originalGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
             };
+            customHost.readFile = (fileName) => {
+                return transformedFiles.get(normalizePath(fileName)) ?? originalReadFile(fileName);
+            };
             program = ts.createProgram(parsed.fileNames, parsed.options, customHost);
         }
-        let diagnostics = ts.getPreEmitDiagnostics(program).concat(program.emit().diagnostics);
+        let { diagnostics, emitSkipped } = program.emit();
+        diagnostics = ts.getPreEmitDiagnostics(program).concat(diagnostics);
         if (diagnostics.length > 0) {
             console.error(ts.formatDiagnosticsWithColorAndContext(diagnostics, {
                 getCanonicalFileName: (fileName) => fileName,
@@ -58,58 +50,29 @@ async function build(tsconfig, plugins) {
                 getNewLine: () => '\n'
             }));
         }
-        if (program.emit().emitSkipped) {
+        if (emitSkipped) {
             process.exit(1);
         }
-        if (shouldRunTscAlias(process.argv.slice(2))) {
-            return runTscAlias().then((code) => {
-                if (code !== 0) {
-                    process.exit(code);
-                }
-                process.exit(0);
-            });
-        }
-        process.exit(0);
+        return runTscAlias(process.argv.slice(2)).then((code) => process.exit(code));
     });
 }
-function findPackageJson(moduleName, root) {
-    let nodeModulesPath = path.join(root, 'node_modules', moduleName.startsWith('@') ? moduleName.split('/').slice(0, 2).join('/') : moduleName.split('/')[0], 'package.json');
-    if (fs.existsSync(nodeModulesPath)) {
-        return nodeModulesPath;
-    }
-    return null;
-}
-function findTsconfig(args) {
-    let projectIndex = args.indexOf('-p');
-    if (projectIndex === -1) {
-        projectIndex = args.indexOf('--project');
-    }
-    if (projectIndex !== -1 && args[projectIndex + 1]) {
-        return args[projectIndex + 1];
-    }
-    return ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
-}
-function getPlugins(tsconfig) {
-    let { config, error } = ts.readConfigFile(tsconfig, ts.sys.readFile);
-    if (error) {
-        return [];
-    }
-    return config?.compilerOptions?.plugins?.filter((p) => typeof p === 'object' && p !== null && 'transform' in p) ?? [];
-}
 async function loadTransformers(plugins, root) {
-    let after = [], afterDeclarations = [], before = [], promises = [];
+    let after = [], before = [], promises = [];
     for (let i = 0, n = plugins.length; i < n; i++) {
-        let plugin = plugins[i];
-        promises.push(import(resolvePlugin(plugin.transform, root)).then((module) => {
+        let plugin = plugins[i], pluginPath = plugin.transform;
+        if (pluginPath.startsWith('.')) {
+            pluginPath = pathToFileURL(path.resolve(root, pluginPath)).href;
+        }
+        else {
+            pluginPath = pathToFileURL(require.resolve(pluginPath, { paths: [root] })).href;
+        }
+        promises.push(import(pluginPath).then((module) => {
             let factory = module.default ?? module.createTransformer ?? module;
             if (typeof factory !== 'function') {
                 console.error(`Plugin ${plugin.transform}: no transformer factory found`);
                 return;
             }
-            if (plugin.afterDeclarations) {
-                afterDeclarations.push(factory);
-            }
-            else if (plugin.after) {
+            if (plugin.after) {
                 after.push(factory);
             }
             else {
@@ -117,77 +80,46 @@ async function loadTransformers(plugins, root) {
             }
         }));
     }
-    return Promise.all(promises).then(() => ({ after, afterDeclarations, before }));
+    return Promise.all(promises).then(() => ({ after, before }));
 }
 function main() {
-    let args = process.argv.slice(2), tsconfig = findTsconfig(args);
+    let tsconfig = ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
     if (!tsconfig) {
-        passthrough();
-        return;
+        return passthrough();
     }
-    let plugins = getPlugins(tsconfig);
-    if (plugins.length === 0) {
-        passthrough();
-        return;
+    let { config, error } = ts.readConfigFile(tsconfig, ts.sys.readFile);
+    if (error) {
+        return passthrough();
     }
+    let plugins = config?.compilerOptions?.plugins?.filter((p) => typeof p === 'object' && p !== null && 'transform' in p) ?? [];
     console.log(`Found ${plugins.length} transformer plugin(s), using programmatic build...`);
-    build(tsconfig, plugins).catch((err) => {
+    build(config, tsconfig, plugins).catch((err) => {
         console.error(err);
         process.exit(1);
     });
 }
+function normalizePath(fileName) {
+    return path.resolve(fileName).replace(BACKSLASH_REGEX, '/');
+}
 function passthrough() {
-    let args = process.argv.slice(2), child = spawn(process.execPath, [require.resolve('typescript/lib/tsc.js'), ...args], { stdio: 'inherit' });
-    child.on('exit', (code) => {
-        if (code === 0 && shouldRunTscAlias(args)) {
-            runTscAlias().then((aliasCode) => process.exit(aliasCode ?? 0));
-            return;
+    let args = process.argv.slice(2);
+    spawn(process.execPath, [require.resolve('typescript/lib/tsc.js'), ...args], { stdio: 'inherit' })
+        .on('exit', async (code) => {
+        if (code === 0) {
+            code = await runTscAlias(args);
         }
         process.exit(code ?? 0);
     });
 }
-function resolveExport(exportValue) {
-    if (typeof exportValue === 'string') {
-        return exportValue;
-    }
-    if (exportValue && typeof exportValue === 'object') {
-        return exportValue.import ?? exportValue.default ?? null;
-    }
-    return null;
-}
-function resolvePlugin(modulePath, root) {
-    if (modulePath.startsWith('.')) {
-        return pathToFileURL(path.resolve(root, modulePath)).href;
-    }
-    let packageJsonPath = findPackageJson(modulePath, root);
-    if (!packageJsonPath) {
-        throw new Error(`tsc: cannot find package '${modulePath}' in ${root}`);
-    }
-    let packageDir = path.dirname(packageJsonPath), packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')), parts = modulePath.split('/'), subpath = './' + (modulePath.startsWith('@') ? parts.slice(2) : parts.slice(1)).join('/');
-    if (packageJson.exports) {
-        let exportEntry = subpath === './' ? packageJson.exports['.'] : packageJson.exports[subpath];
-        if (exportEntry) {
-            let resolved = resolveExport(exportEntry);
-            if (resolved) {
-                return pathToFileURL(path.resolve(packageDir, resolved)).href;
-            }
+function runTscAlias(args) {
+    for (let i = 0, n = args.length; i < n; i++) {
+        if (skipFlags.has(args[i])) {
+            return Promise.resolve(0);
         }
-        throw new Error(`tsc: package subpath '${subpath}' is not exported by '${modulePath}'`);
     }
-    return pathToFileURL(path.resolve(packageDir, packageJson.main ?? 'index.js')).href;
-}
-function runTscAlias() {
     return new Promise((resolve) => {
-        let child = spawn(process.execPath, [require.resolve('tsc-alias/dist/bin/index.js'), ...process.argv.slice(2)], { stdio: 'inherit' });
+        let child = spawn(process.execPath, [require.resolve('tsc-alias/dist/bin/index.js'), ...args], { stdio: 'inherit' });
         child.on('exit', (code) => resolve(code ?? 0));
     });
 }
-function shouldRunTscAlias(args) {
-    for (let i = 0, n = skipFlags.length; i < n; i++) {
-        if (args.includes(skipFlags[i])) {
-            return false;
-        }
-    }
-    return true;
-}
 main();

package/build/transformer/code.d.ts

@@ -0,0 +1,7 @@
+import type { QuickCheckPattern, 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/transformer/code.js

@@ -0,0 +1,45 @@
+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;
+    }
+    replacements.sort((a, b) => b.start - a.start);
+    let result = code;
+    for (let i = 0, n = replacements.length; i < n; i++) {
+        let r = replacements[i];
+        result = result.substring(0, r.start) + r.newText + result.substring(r.end);
+    }
+    return result;
+};
+export default { contains, replace, replaceReverse };

package/build/transformer/constants.d.ts

@@ -1,6 +1,4 @@
-declare const BRACES_CONTENT_REGEX: RegExp;
-declare const REGEX_ESCAPE_PATTERN: RegExp;
 declare const TRAILING_SEMICOLON: RegExp;
 declare const TRANSFORM_PATTERN: RegExp;
-declare const UUID_DASH_REGEX: RegExp;
-export { BRACES_CONTENT_REGEX, REGEX_ESCAPE_PATTERN, TRAILING_SEMICOLON, TRANSFORM_PATTERN, UUID_DASH_REGEX, };
+declare const UUID_REGEX: RegExp;
+export { TRAILING_SEMICOLON, TRANSFORM_PATTERN, UUID_REGEX, };

package/build/transformer/constants.js

@@ -1,6 +1,4 @@
-const BRACES_CONTENT_REGEX = /\{([^}]*)\}/;
-const REGEX_ESCAPE_PATTERN = /[.*+?^${}()|[\]\\]/g;
 const TRAILING_SEMICOLON = /;$/;
 const TRANSFORM_PATTERN = /\.[tj]sx?$/;
-const UUID_DASH_REGEX = /-/g;
-export { BRACES_CONTENT_REGEX, REGEX_ESCAPE_PATTERN, TRAILING_SEMICOLON, TRANSFORM_PATTERN, UUID_DASH_REGEX, };
+const UUID_REGEX = /[^A-Za-z0-9_$]/g;
+export { TRAILING_SEMICOLON, TRANSFORM_PATTERN, UUID_REGEX, };

package/build/transformer/index.d.ts

@@ -1,10 +1,5 @@
-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 mightNeedTransform: (code: string, check: QuickCheckPattern) => boolean;
-declare const uid: (prefix: string, updateUUID?: boolean) => string;
-export { addImport, applyReplacements, applyReplacementsReverse, mightNeedTransform, program, uid };
+export { default as code } from './code.js';
+export { default as program } from './program.js';
+export { default as uid } from './uid.js';
 export type * from './types.js';
 export * from './constants.js';

package/build/transformer/index.js

@@ -1,112 +1,4 @@
-import { uuid } from '@esportsplus/utilities';
-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}['"])`);
-}
-function mergeAndSort(a, b) {
-    let combined = new Array(a.length + b.size), idx = 0, n = a.length;
-    for (let i = 0; i < n; i++) {
-        if (a[i]) {
-            combined[idx++] = a[i];
-        }
-    }
-    for (let item of b) {
-        if (item) {
-            combined[idx++] = item;
-        }
-    }
-    combined.length = idx;
-    combined.sort();
-    return combined.join(', ');
-}
-function parseSpecifiers(str) {
-    let parts = str.split(','), result = new Set();
-    for (let i = 0, n = parts.length; i < n; i++) {
-        let trimmed = parts[i].trim();
-        if (trimmed) {
-            result.add(trimmed);
-        }
-    }
-    return result;
-}
-function updateImportsWithRegex(code, specifiers, importRegex) {
-    let match = code.match(importRegex);
-    if (!match) {
-        return code;
-    }
-    let bracesMatch = match[1].match(BRACES_CONTENT_REGEX), existing = bracesMatch?.[1] ? parseSpecifiers(bracesMatch[1]) : new Set(), toAdd = [];
-    for (let spec of specifiers) {
-        if (!existing.has(spec)) {
-            toAdd.push(spec);
-        }
-    }
-    if (toAdd.length === 0) {
-        return code;
-    }
-    return code.replace(match[1], match[1].replace(BRACES_CONTENT_REGEX, `{ ${mergeAndSort(toAdd, existing)} }`));
-}
-const addImport = (code, module, specifiers) => {
-    if (specifiers.length === 0) {
-        return code;
-    }
-    let regex = buildImportRegex(module.replace(REGEX_ESCAPE_PATTERN, '\\$&'));
-    if (regex.test(code)) {
-        return updateImportsWithRegex(code, new Set(specifiers), regex);
-    }
-    let adding = `import { ${specifiers.sort().join(', ')} } from '${module}';\n`, first = code.indexOf('import ');
-    if (first === -1) {
-        return adding + code;
-    }
-    return code.substring(0, first) + adding + code.substring(first);
-};
-const applyReplacements = (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 applyReplacementsReverse = (code, replacements) => {
-    if (replacements.length === 0) {
-        return code;
-    }
-    replacements.sort((a, b) => b.start - a.start);
-    let result = code;
-    for (let i = 0, n = replacements.length; i < n; i++) {
-        let r = replacements[i];
-        result = result.substring(0, r.start) + r.newText + result.substring(r.end);
-    }
-    return result;
-};
-const mightNeedTransform = (code, check) => {
-    if (check.regex) {
-        return check.regex.test(code);
-    }
-    if (check.patterns) {
-        for (let i = 0, n = check.patterns.length; i < n; i++) {
-            if (code.indexOf(check.patterns[i]) !== -1) {
-                return true;
-            }
-        }
-    }
-    return false;
-};
-const uid = (prefix, updateUUID = false) => {
-    return prefix + '_' + (updateUUID ? uuid().replace(UUID_DASH_REGEX, '') : uidSuffix) + '_' + (i++).toString(36);
-};
-export { addImport, applyReplacements, applyReplacementsReverse, mightNeedTransform, program, uid };
+export { default as code } from './code.js';
+export { default as program } from './program.js';
+export { default as uid } from './uid.js';
 export * from './constants.js';

package/build/transformer/uid.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (prefix: string, reset?: boolean) => string;
+export default _default;

package/build/transformer/uid.js

@@ -0,0 +1,6 @@
+import { uuid } from '@esportsplus/utilities';
+import { UUID_REGEX } from './constants.js';
+let cache = uuid().replace(UUID_REGEX, ''), i = 0;
+export default (prefix, reset = false) => {
+    return prefix + '_' + (reset ? uuid().replace(UUID_REGEX, '') : cache) + (i++).toString(36);
+};

package/package.json

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

package/src/cli/tsc.ts

@@ -2,40 +2,34 @@ import { spawn } from 'child_process';
 import { createRequire } from 'module';
 import { pathToFileURL } from 'url';
 
-import fs from 'fs';
 import path from 'path';
 import ts from 'typescript';
 
 
-type ExportValue = string | { default?: string; import?: string; types?: string } | null;
-
 type PluginConfig = {
     after?: boolean;
-    afterDeclarations?: boolean;
     transform: string;
 };
 
 type TransformerCreator = (program: ts.Program) => ts.TransformerFactory<ts.SourceFile>;
 
 
-let require = createRequire(import.meta.url),
-    skipFlags = ['--help', '--init', '--noEmit', '--showConfig', '--version', '-h', '-noEmit', '-v'];
+const BACKSLASH_REGEX = /\\/g;
 
 
-async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
-    let { config, error } = ts.readConfigFile(tsconfig, ts.sys.readFile),
-        root = path.dirname(path.resolve(tsconfig));
+let require = createRequire(import.meta.url),
+    skipFlags = new Set(['--help', '--init', '--noEmit', '--showConfig', '--version', '-h', '-noEmit', '-v']);
 
-    if (error) {
-        console.error(ts.flattenDiagnosticMessageText(error.messageText, '\n'));
-        process.exit(1);
-    }
 
-    let parsed = ts.parseJsonConfigFileContent(config, ts.sys, root);
+async function build(config: object, tsconfig: string, plugins: PluginConfig[]): Promise<void> {
+    let root = path.dirname(path.resolve(tsconfig)),
+        parsed = ts.parseJsonConfigFileContent(config, ts.sys, root);
 
     if (parsed.errors.length > 0) {
         for (let i = 0, n = parsed.errors.length; i < n; i++) {
-            console.error(ts.flattenDiagnosticMessageText(parsed.errors[i].messageText, '\n'));
+            console.error(
+                ts.flattenDiagnosticMessageText(parsed.errors[i].messageText, '\n')
+            );
         }
 
         process.exit(1);
@@ -60,7 +54,7 @@ async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
                 transformed = result.transformed[0];
 
             if (transformed !== sourceFile) {
-                transformedFiles.set(fileName, printer.printFile(transformed));
+                transformedFiles.set(normalizePath(fileName), printer.printFile(transformed));
             }
 
             result.dispose();
@@ -71,24 +65,13 @@ async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
                 originalGetSourceFile = customHost.getSourceFile.bind(customHost),
                 originalReadFile = customHost.readFile.bind(customHost);
 
-            customHost.readFile = (fileName: string): string | undefined => {
-                let transformed = transformedFiles.get(path.resolve(fileName));
-
-                if (transformed) {
-                    return transformed;
-                }
-
-                return originalReadFile(fileName);
-            };
-
             customHost.getSourceFile = (
                 fileName: string,
                 languageVersion: ts.ScriptTarget,
                 onError?: (message: string) => void,
                 shouldCreateNewSourceFile?: boolean
             ): ts.SourceFile | undefined => {
-                let resolved = path.resolve(fileName),
-                    transformed = transformedFiles.get(resolved);
+                let transformed = transformedFiles.get(normalizePath(fileName));
 
                 if (transformed) {
                     return ts.createSourceFile(fileName, transformed, languageVersion, true);
@@ -97,10 +80,16 @@ async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
                 return originalGetSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile);
             };
 
+            customHost.readFile = (fileName: string): string | undefined => {
+                return transformedFiles.get(normalizePath(fileName)) ?? originalReadFile(fileName);
+            };
+
             program = ts.createProgram(parsed.fileNames, parsed.options, customHost);
         }
 
-        let diagnostics = ts.getPreEmitDiagnostics(program).concat(program.emit().diagnostics);
+        let { diagnostics, emitSkipped } = program.emit();
+
+        diagnostics = ts.getPreEmitDiagnostics(program).concat(diagnostics);
 
         if (diagnostics.length > 0) {
             console.error(
@@ -112,75 +101,35 @@ async function build(tsconfig: string, plugins: PluginConfig[]): Promise<void> {
             );
         }
 
-        if (program.emit().emitSkipped) {
+        if (emitSkipped) {
             process.exit(1);
         }
 
-        if (shouldRunTscAlias(process.argv.slice(2))) {
-            return runTscAlias().then((code) => {
-                if (code !== 0) {
-                    process.exit(code);
-                }
-
-                process.exit(0);
-            });
-        }
-
-        process.exit(0);
+        return runTscAlias(process.argv.slice(2)).then((code) => process.exit(code));
     });
 }
 
-function findPackageJson(moduleName: string, root: string): string | null {
-    let nodeModulesPath = path.join(root, 'node_modules', moduleName.startsWith('@') ? moduleName.split('/').slice(0, 2).join('/') : moduleName.split('/')[0], 'package.json');
-
-    if (fs.existsSync(nodeModulesPath)) {
-        return nodeModulesPath;
-    }
-
-    return null;
-}
-
-function findTsconfig(args: string[]): string | undefined {
-    let projectIndex = args.indexOf('-p');
-
-    if (projectIndex === -1) {
-        projectIndex = args.indexOf('--project');
-    }
-
-    if (projectIndex !== -1 && args[projectIndex + 1]) {
-        return args[projectIndex + 1];
-    }
-
-    return ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
-}
-
-function getPlugins(tsconfig: string): PluginConfig[] {
-    let { config, error } = ts.readConfigFile(tsconfig, ts.sys.readFile);
-
-    if (error) {
-        return [];
-    }
-
-    return config?.compilerOptions?.plugins?.filter(
-        (p: unknown) => typeof p === 'object' && p !== null && 'transform' in p
-    ) ?? [];
-}
-
 async function loadTransformers(plugins: PluginConfig[], root: string): Promise<{
     after: TransformerCreator[];
-    afterDeclarations: TransformerCreator[];
     before: TransformerCreator[];
 }> {
     let after: TransformerCreator[] = [],
-        afterDeclarations: TransformerCreator[] = [],
         before: TransformerCreator[] = [],
         promises: Promise<void>[] = [];
 
     for (let i = 0, n = plugins.length; i < n; i++) {
-        let plugin = plugins[i];
+        let plugin = plugins[i],
+            pluginPath = plugin.transform;
+
+        if (pluginPath.startsWith('.')) {
+            pluginPath = pathToFileURL(path.resolve(root, pluginPath)).href;
+        }
+        else {
+            pluginPath = pathToFileURL(require.resolve(pluginPath, { paths: [root] })).href;
+        }
 
         promises.push(
-            import(resolvePlugin(plugin.transform, root)).then((module) => {
+            import(pluginPath).then((module) => {
                 let factory = module.default ?? module.createTransformer ?? module;
 
                 if (typeof factory !== 'function') {
@@ -188,10 +137,7 @@ async function loadTransformers(plugins: PluginConfig[], root: string): Promise<
                     return;
                 }
 
-                if (plugin.afterDeclarations) {
-                    afterDeclarations.push(factory);
-                }
-                else if (plugin.after) {
+                if (plugin.after) {
                     after.push(factory);
                 }
                 else {
@@ -201,109 +147,64 @@ async function loadTransformers(plugins: PluginConfig[], root: string): Promise<
         );
     }
 
-    return Promise.all(promises).then(() => ({ after, afterDeclarations, before }));
+    return Promise.all(promises).then(() => ({ after, before }));
 }
 
 function main(): void {
-    let args = process.argv.slice(2),
-        tsconfig = findTsconfig(args);
+    let tsconfig = ts.findConfigFile(process.cwd(), ts.sys.fileExists, 'tsconfig.json');
 
     if (!tsconfig) {
-        passthrough();
-        return;
+        return passthrough();
     }
 
-    let plugins = getPlugins(tsconfig);
+    let { config, error } = ts.readConfigFile(tsconfig, ts.sys.readFile);
 
-    if (plugins.length === 0) {
-        passthrough();
-        return;
+    if (error) {
+        return passthrough();
     }
 
+    let plugins = config?.compilerOptions?.plugins?.filter(
+            (p: unknown) => typeof p === 'object' && p !== null && 'transform' in p
+        ) ?? [];
+
     console.log(`Found ${plugins.length} transformer plugin(s), using programmatic build...`);
 
-    build(tsconfig, plugins).catch((err) => {
+    build(config, tsconfig, plugins).catch((err) => {
         console.error(err);
         process.exit(1);
     });
 }
 
-function passthrough(): void {
-    let args = process.argv.slice(2),
-        child = spawn(process.execPath, [require.resolve('typescript/lib/tsc.js'), ...args], { stdio: 'inherit' });
-
-    child.on('exit', (code) => {
-        if (code === 0 && shouldRunTscAlias(args)) {
-            runTscAlias().then((aliasCode) => process.exit(aliasCode ?? 0));
-            return;
-        }
-
-        process.exit(code ?? 0);
-    });
+function normalizePath(fileName: string): string {
+    return path.resolve(fileName).replace(BACKSLASH_REGEX, '/');
 }
 
-function resolveExport(exportValue: ExportValue): string | null {
-    if (typeof exportValue === 'string') {
-        return exportValue;
-    }
+function passthrough(): void {
+    let args = process.argv.slice(2);
 
-    if (exportValue && typeof exportValue === 'object') {
-        return exportValue.import ?? exportValue.default ?? null;
-    }
+    spawn(process.execPath, [require.resolve('typescript/lib/tsc.js'), ...args], { stdio: 'inherit' })
+        .on('exit', async (code) => {
+            if (code === 0) {
+                code = await runTscAlias(args);
+            }
 
-    return null;
+            process.exit(code ?? 0);
+        });
 }
 
-function resolvePlugin(modulePath: string, root: string): string {
-    if (modulePath.startsWith('.')) {
-        return pathToFileURL(path.resolve(root, modulePath)).href;
-    }
-
-    let packageJsonPath = findPackageJson(modulePath, root);
-
-    if (!packageJsonPath) {
-        throw new Error(`tsc: cannot find package '${modulePath}' in ${root}`);
-    }
-
-    let packageDir = path.dirname(packageJsonPath),
-        packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')),
-        parts = modulePath.split('/'),
-        subpath = './' + (modulePath.startsWith('@') ? parts.slice(2) : parts.slice(1)).join('/');
-
-    if (packageJson.exports) {
-        let exportEntry = subpath === './' ? packageJson.exports['.'] : packageJson.exports[subpath];
-
-        if (exportEntry) {
-            let resolved = resolveExport(exportEntry);
-
-            if (resolved) {
-                return pathToFileURL(path.resolve(packageDir, resolved)).href;
-            }
+function runTscAlias(args: string[]): Promise<number> {
+    for (let i = 0, n = args.length; i < n; i++) {
+        if (skipFlags.has(args[i])) {
+            return Promise.resolve(0);
         }
-
-        throw new Error(`tsc: package subpath '${subpath}' is not exported by '${modulePath}'`);
     }
 
-    return pathToFileURL(path.resolve(packageDir, packageJson.main ?? 'index.js')).href;
-}
-
-function runTscAlias(): Promise<number> {
     return new Promise((resolve) => {
-        let child = spawn(process.execPath, [require.resolve('tsc-alias/dist/bin/index.js'), ...process.argv.slice(2)], { stdio: 'inherit' });
+        let child = spawn(process.execPath, [require.resolve('tsc-alias/dist/bin/index.js'), ...args], { stdio: 'inherit' });
 
         child.on('exit', (code) => resolve(code ?? 0));
     });
 }
 
-function shouldRunTscAlias(args: string[]): boolean {
-    for (let i = 0, n = skipFlags.length; i < n; i++) {
-        if (args.includes(skipFlags[i])) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
 
 main();

package/src/transformer/code.ts

@@ -0,0 +1,67 @@
+import type { QuickCheckPattern, Replacement } from './types.js';
+
+
+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 => {
+    if (replacements.length === 0) {
+        return code;
+    }
+
+    replacements.sort((a, b) => b.start - a.start);
+
+    let result = code;
+
+    for (let i = 0, n = replacements.length; i < n; i++) {
+        let r = replacements[i];
+
+        result = result.substring(0, r.start) + r.newText + result.substring(r.end);
+    }
+
+    return result;
+};
+
+
+export default { contains, replace, replaceReverse };

package/src/transformer/constants.ts

@@ -1,17 +1,11 @@
-const BRACES_CONTENT_REGEX = /\{([^}]*)\}/;
-
-const REGEX_ESCAPE_PATTERN = /[.*+?^${}()|[\]\\]/g;
-
 const TRAILING_SEMICOLON = /;$/;
 
 const TRANSFORM_PATTERN = /\.[tj]sx?$/;
 
-const UUID_DASH_REGEX = /-/g;
+const UUID_REGEX = /[^A-Za-z0-9_$]/g;
 
 
 export {
-    BRACES_CONTENT_REGEX,
-    REGEX_ESCAPE_PATTERN,
     TRAILING_SEMICOLON, TRANSFORM_PATTERN,
-    UUID_DASH_REGEX,
+    UUID_REGEX,
 };

package/src/transformer/index.ts

@@ -1,176 +1,5 @@
-import { uuid } from '@esportsplus/utilities';
-import { BRACES_CONTENT_REGEX, REGEX_ESCAPE_PATTERN, UUID_DASH_REGEX } from './constants.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}['"])`);
-}
-
-function mergeAndSort(a: string[], b: Set<string>): string {
-    let combined = new Array<string>(a.length + b.size),
-        idx = 0,
-        n = a.length;
-
-    for (let i = 0; i < n; i++) {
-        if (a[i]) {
-            combined[idx++] = a[i];
-        }
-    }
-
-    for (let item of b) {
-        if (item) {
-            combined[idx++] = item;
-        }
-    }
-
-    combined.length = idx;
-    combined.sort();
-
-    return combined.join(', ');
-}
-
-function parseSpecifiers(str: string): Set<string> {
-    let parts = str.split(','),
-        result = new Set<string>();
-
-    for (let i = 0, n = parts.length; i < n; i++) {
-        let trimmed = parts[i].trim();
-
-        if (trimmed) {
-            result.add(trimmed);
-        }
-    }
-
-    return result;
-}
-
-function updateImportsWithRegex(code: string, specifiers: Set<string>, importRegex: RegExp): string {
-    let match = code.match(importRegex);
-
-    if (!match) {
-        return code;
-    }
-
-    let bracesMatch = match[1].match(BRACES_CONTENT_REGEX),
-        existing = bracesMatch?.[1] ? parseSpecifiers(bracesMatch[1]) : new Set<string>(),
-        toAdd: string[] = [];
-
-    for (let spec of specifiers) {
-        if (!existing.has(spec)) {
-            toAdd.push(spec);
-        }
-    }
-
-    if (toAdd.length === 0) {
-        return code;
-    }
-
-    return code.replace(
-        match[1],
-        match[1].replace(BRACES_CONTENT_REGEX, `{ ${mergeAndSort(toAdd, existing)} }`)
-    );
-}
-
-
-const addImport = (code: string, module: string, specifiers: string[]): string => {
-    if (specifiers.length === 0) {
-        return code;
-    }
-
-    let regex = buildImportRegex( module.replace(REGEX_ESCAPE_PATTERN, '\\$&') );
-
-    if (regex.test(code)) {
-        return updateImportsWithRegex(code, new Set(specifiers), regex);
-    }
-
-    let adding = `import { ${specifiers.sort().join(', ')} } from '${module}';\n`,
-        first = code.indexOf('import ');
-
-    if (first === -1) {
-        return adding + code;
-    }
-
-    return code.substring(0, first) + adding + code.substring(first);
-};
-
-const applyReplacements = (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 applyReplacementsReverse = (code: string, replacements: Replacement[]): string => {
-    if (replacements.length === 0) {
-        return code;
-    }
-
-    replacements.sort((a, b) => b.start - a.start);
-
-    let result = code;
-
-    for (let i = 0, n = replacements.length; i < n; i++) {
-        let r = replacements[i];
-
-        result = result.substring(0, r.start) + r.newText + result.substring(r.end);
-    }
-
-    return result;
-};
-
-const mightNeedTransform = (code: string, check: QuickCheckPattern): boolean => {
-    if (check.regex) {
-        return check.regex.test(code);
-    }
-
-    if (check.patterns) {
-        for (let i = 0, n = check.patterns.length; i < n; i++) {
-            if (code.indexOf(check.patterns[i]) !== -1) {
-                return true;
-            }
-        }
-    }
-
-    return false;
-};
-
-const uid = (prefix: string, updateUUID = false): string => {
-    return prefix + '_' + (updateUUID ? uuid().replace(UUID_DASH_REGEX, '') : uidSuffix) + '_' + (i++).toString(36);
-};
-
-
-export {
-    addImport, applyReplacements, applyReplacementsReverse,
-    mightNeedTransform,
-    program,
-    uid
-};
+export { default as code } from './code';
+export { default as program } from './program';
+export { default as uid } from './uid';
 export type * from './types';
 export * from './constants';

package/src/transformer/uid.ts

@@ -0,0 +1,11 @@
+import { uuid } from '@esportsplus/utilities';
+import { UUID_REGEX } from './constants.js';
+
+
+let cache = uuid().replace(UUID_REGEX, ''),
+    i = 0;
+
+
+export default (prefix: string, reset = false): string => {
+    return prefix + '_' + (reset ? uuid().replace(UUID_REGEX, '') : cache) + (i++).toString(36);
+};