@steambrew/ttc 3.2.2 → 3.2.3

package/bun.lock

@@ -32,6 +32,7 @@
         "sass": "^1.89.1",
         "terser": "^5.43.1",
         "tslib": "^2.8.1",
+        "typescript": ">=5.0.0",
       },
       "devDependencies": {
         "@types/babel__traverse": "^7.20.7",

package/dist/index.js

@@ -12,6 +12,7 @@ import replace from '@rollup/plugin-replace';
 import terser from '@rollup/plugin-terser';
 import typescript from '@rollup/plugin-typescript';
 import esbuild from 'rollup-plugin-esbuild';
+import ts from 'typescript';
 import url from '@rollup/plugin-url';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 import { watch, rollup } from 'rollup';
@@ -55,7 +56,7 @@ const Logger = {
         if (buildType === 'dev')
             meta.push('no type checking');
         if (sysfsCount)
-            meta.push(`${sysfsCount} constSysfsExpr`);
+            meta.push(`${sysfsCount} bundled file${sysfsCount > 1 ? 's' : ''}`);
         if (envCount)
             meta.push(`${envCount} env var${envCount > 1 ? 's' : ''}`);
         console.log(`${chalk.green('Finished')} ${buildType} in ${elapsed} ` + chalk.dim('(' + meta.join(', ') + ')'));
@@ -605,99 +606,16 @@ function stripPluginPrefix(message) {
 }
 class BuildFailedError extends Error {
 }
-/**
- * tsconfig.json files use JSONC, not regular JSON.
- * JSONC supports comments and trailing commas, while JSON does not.
- * This function sanitizes JSONC into JSON.parse()-able content.
- *
- * @param text input text
- * @returns object
- */
-function parseJsonc(text) {
-    let out = '';
-    let i = 0;
-    const n = text.length;
-    while (i < n) {
-        const ch = text[i];
-        if (ch === '"') {
-            out += ch;
-            i++;
-            while (i < n) {
-                const c = text[i];
-                out += c;
-                if (c === '\\') {
-                    i++;
-                    if (i < n) {
-                        out += text[i];
-                        i++;
-                    }
-                }
-                else if (c === '"') {
-                    i++;
-                    break;
-                }
-                else
-                    i++;
-            }
-        }
-        else if (ch === '/' && i + 1 < n && text[i + 1] === '/') {
-            i += 2;
-            while (i < n && text[i] !== '\n')
-                i++;
-        }
-        else if (ch === '/' && i + 1 < n && text[i + 1] === '*') {
-            i += 2;
-            while (i < n - 1 && !(text[i] === '*' && text[i + 1] === '/'))
-                i++;
-            i += 2;
-        }
-        else if (ch === ',') {
-            let j = i + 1;
-            while (j < n && (text[j] === ' ' || text[j] === '\t' || text[j] === '\n' || text[j] === '\r'))
-                j++;
-            if (j < n && (text[j] === '}' || text[j] === ']')) {
-                i++;
-            }
-            else {
-                out += ch;
-                i++;
-            }
-        }
-        else {
-            out += ch;
-            i++;
-        }
-    }
-    return JSON.parse(out);
-}
 function tsconfigPathsPlugin(tsconfigPath) {
-    function readConfig(cfgPath) {
-        const dir = path.dirname(path.resolve(cfgPath));
-        let raw;
-        try {
-            raw = parseJsonc(fs.readFileSync(cfgPath, 'utf8'));
-        }
-        catch {
-            return { baseUrl: null, entries: [] };
-        }
-        let parentResult = { baseUrl: null, entries: [] };
-        if (raw.extends) {
-            const ext = raw.extends;
-            const parentPath = path.resolve(dir, ext.endsWith('.json') ? ext : `${ext}.json`);
-            parentResult = readConfig(parentPath);
-        }
-        const opts = raw.compilerOptions ?? {};
-        const baseUrl = opts.baseUrl ? path.resolve(dir, opts.baseUrl) : parentResult.baseUrl;
-        const ownEntries = Object.entries(opts.paths ?? {}).map(([pattern, targets]) => ({
-            pattern,
-            targets: targets,
-            configDir: dir,
-        }));
-        const ownPatterns = new Set(ownEntries.map((e) => e.pattern));
-        const parentEntries = parentResult.entries.filter((e) => !ownPatterns.has(e.pattern));
-        return { baseUrl, entries: [...ownEntries, ...parentEntries] };
-    }
-    const { baseUrl, entries } = readConfig(tsconfigPath);
+    const absPath = path.resolve(tsconfigPath);
+    const configDir = path.dirname(absPath);
+    const { config, error } = ts.readConfigFile(absPath, ts.sys.readFile);
+    if (error)
+        return { name: 'tsconfig-paths' };
+    const { options } = ts.parseJsonConfigFileContent(config, ts.sys, configDir);
+    const baseUrl = options.baseUrl ?? null;
+    const pathsBase = options.pathsBasePath ?? configDir;
+    const paths = options.paths ?? {};
     function resolveWithExtensions(base) {
         for (const ext of ['', '.ts', '.tsx', '.js', '.jsx', '/index.ts', '/index.tsx']) {
             if (fs.existsSync(base + ext))
@@ -708,7 +626,7 @@ function tsconfigPathsPlugin(tsconfigPath) {
     return {
         name: 'tsconfig-paths',
         async resolveId(source, importer) {
-            for (const { pattern, targets, configDir } of entries) {
+            for (const [pattern, targets] of Object.entries(paths)) {
                 if (!targets.length)
                     continue;
                 const isWild = pattern.endsWith('/*');
@@ -716,7 +634,7 @@ function tsconfigPathsPlugin(tsconfigPath) {
                     const prefix = pattern.slice(0, -2);
                     if (source === prefix || source.startsWith(prefix + '/')) {
                         const rest = source.startsWith(prefix + '/') ? source.slice(prefix.length + 1) : '';
-                        const targetBase = path.resolve(configDir, targets[0].replace('*', rest));
+                        const targetBase = path.resolve(pathsBase, targets[0].replace('*', rest));
                         const resolved = resolveWithExtensions(targetBase);
                         if (resolved) {
                             const result = await this.resolve(resolved, importer, { skipSelf: true });
@@ -726,7 +644,7 @@ function tsconfigPathsPlugin(tsconfigPath) {
                     }
                 }
                 else if (source === pattern) {
-                    const targetBase = path.resolve(configDir, targets[0]);
+                    const targetBase = path.resolve(pathsBase, targets[0]);
                     const resolved = resolveWithExtensions(targetBase);
                     if (resolved) {
                         const result = await this.resolve(resolved, importer, { skipSelf: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steambrew/ttc",
-  "version": "3.2.2",
+  "version": "3.2.3",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -32,6 +32,7 @@
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.2",
+    "typescript": ">=5.0.0",
     "@rollup/plugin-url": "^8.0.2",
     "@rollup/pluginutils": "^5.1.4",
     "chalk": "^5.4.1",

package/src/logger.ts

@@ -3,9 +3,7 @@ import { readFileSync } from 'fs';
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 
-const version: string = JSON.parse(
-	readFileSync(path.resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8'),
-).version;
+const version: string = JSON.parse(readFileSync(path.resolve(dirname(fileURLToPath(import.meta.url)), '../package.json'), 'utf8')).version;
 
 interface DoneOptions {
 	elapsedMs: number;
@@ -40,7 +38,7 @@ const Logger = {
 		const elapsed = `${(elapsedMs / 1000).toFixed(2)}s`;
 		const meta: string[] = [`ttc v${version}`];
 		if (buildType === 'dev') meta.push('no type checking');
-		if (sysfsCount) meta.push(`${sysfsCount} constSysfsExpr`);
+		if (sysfsCount) meta.push(`${sysfsCount} bundled file${sysfsCount > 1 ? 's' : ''}`);
 		if (envCount) meta.push(`${envCount} env var${envCount > 1 ? 's' : ''}`);
 		console.log(`${chalk.green('Finished')} ${buildType} in ${elapsed} ` + chalk.dim('(' + meta.join(', ') + ')'));
 	},

package/src/transpiler.ts

@@ -6,6 +6,7 @@ import replace from '@rollup/plugin-replace';
 import terser from '@rollup/plugin-terser';
 import typescript from '@rollup/plugin-typescript';
 import esbuild from 'rollup-plugin-esbuild';
+import ts from 'typescript';
 import url from '@rollup/plugin-url';
 import nodePolyfills from 'rollup-plugin-polyfill-node';
 import chalk from 'chalk';
@@ -137,100 +138,17 @@ function stripPluginPrefix(message: string): string {
 
 class BuildFailedError extends Error {}
 
-interface PathEntry {
-	pattern: string;
-	targets: string[];
-	configDir: string;
-}
-
-/**
- * tsconfig.json files use JSONC, not regular JSON.
- * JSONC supports comments and trailing commas, while JSON does not.
- * This function sanitizes JSONC into JSON.parse()-able content.
- *
- * @param text input text
- * @returns object
- */
-function parseJsonc(text: string): any {
-	let out = '';
-	let i = 0;
-	const n = text.length;
-	while (i < n) {
-		const ch = text[i];
-		if (ch === '"') {
-			out += ch;
-			i++;
-			while (i < n) {
-				const c = text[i];
-				out += c;
-				if (c === '\\') {
-					i++;
-					if (i < n) {
-						out += text[i];
-						i++;
-					}
-				} else if (c === '"') {
-					i++;
-					break;
-				} else i++;
-			}
-		} else if (ch === '/' && i + 1 < n && text[i + 1] === '/') {
-			i += 2;
-			while (i < n && text[i] !== '\n') i++;
-		} else if (ch === '/' && i + 1 < n && text[i + 1] === '*') {
-			i += 2;
-			while (i < n - 1 && !(text[i] === '*' && text[i + 1] === '/')) i++;
-			i += 2;
-		} else if (ch === ',') {
-			let j = i + 1;
-			while (j < n && (text[j] === ' ' || text[j] === '\t' || text[j] === '\n' || text[j] === '\r')) j++;
-			if (j < n && (text[j] === '}' || text[j] === ']')) {
-				i++;
-			} else {
-				out += ch;
-				i++;
-			}
-		} else {
-			out += ch;
-			i++;
-		}
-	}
-	return JSON.parse(out);
-}
-
 function tsconfigPathsPlugin(tsconfigPath: string): InputPluginOption {
-	function readConfig(cfgPath: string): { baseUrl: string | null; entries: PathEntry[] } {
-		const dir = path.dirname(path.resolve(cfgPath));
-		let raw: any;
-		try {
-			raw = parseJsonc(fs.readFileSync(cfgPath, 'utf8'));
-		} catch {
-			return { baseUrl: null, entries: [] };
-		}
-
-		let parentResult: { baseUrl: string | null; entries: PathEntry[] } = { baseUrl: null, entries: [] };
-		if (raw.extends) {
-			const ext = raw.extends as string;
-			const parentPath = path.resolve(dir, ext.endsWith('.json') ? ext : `${ext}.json`);
-			parentResult = readConfig(parentPath);
-		}
+	const absPath = path.resolve(tsconfigPath);
+	const configDir = path.dirname(absPath);
 
-		const opts = raw.compilerOptions ?? {};
-		const baseUrl = opts.baseUrl ? path.resolve(dir, opts.baseUrl as string) : parentResult.baseUrl;
-
-		const ownEntries: PathEntry[] = Object.entries(opts.paths ?? {}).map(([pattern, targets]) => ({
-			pattern,
-			targets: targets as string[],
-			configDir: dir,
-		}));
-
-		const ownPatterns = new Set(ownEntries.map((e) => e.pattern));
-		const parentEntries = parentResult.entries.filter((e) => !ownPatterns.has(e.pattern));
-
-		return { baseUrl, entries: [...ownEntries, ...parentEntries] };
-	}
+	const { config, error } = ts.readConfigFile(absPath, ts.sys.readFile);
+	if (error) return { name: 'tsconfig-paths' };
 
-	const { baseUrl, entries } = readConfig(tsconfigPath);
+	const { options } = ts.parseJsonConfigFileContent(config, ts.sys, configDir);
+	const baseUrl = options.baseUrl ?? null;
+	const pathsBase = (options.pathsBasePath as string | undefined) ?? configDir;
+	const paths = options.paths ?? {};
 
 	function resolveWithExtensions(base: string): string | null {
 		for (const ext of ['', '.ts', '.tsx', '.js', '.jsx', '/index.ts', '/index.tsx']) {
@@ -242,14 +160,14 @@ function tsconfigPathsPlugin(tsconfigPath: string): InputPluginOption {
 	return {
 		name: 'tsconfig-paths',
 		async resolveId(source: string, importer: string | undefined) {
-			for (const { pattern, targets, configDir } of entries) {
+			for (const [pattern, targets] of Object.entries(paths)) {
 				if (!targets.length) continue;
 				const isWild = pattern.endsWith('/*');
 				if (isWild) {
 					const prefix = pattern.slice(0, -2);
 					if (source === prefix || source.startsWith(prefix + '/')) {
 						const rest = source.startsWith(prefix + '/') ? source.slice(prefix.length + 1) : '';
-						const targetBase = path.resolve(configDir, targets[0].replace('*', rest));
+						const targetBase = path.resolve(pathsBase, targets[0].replace('*', rest));
 						const resolved = resolveWithExtensions(targetBase);
 						if (resolved) {
 							const result = await this.resolve(resolved, importer, { skipSelf: true });
@@ -257,7 +175,7 @@ function tsconfigPathsPlugin(tsconfigPath: string): InputPluginOption {
 						}
 					}
 				} else if (source === pattern) {
-					const targetBase = path.resolve(configDir, targets[0]);
+					const targetBase = path.resolve(pathsBase, targets[0]);
 					const resolved = resolveWithExtensions(targetBase);
 					if (resolved) {
 						const result = await this.resolve(resolved, importer, { skipSelf: true });