@lynxwall/cucumber-tsflow 7.3.0 → 7.3.2

package/lib/transpilers/esm/loader-utils.mjs

@@ -79,21 +79,57 @@ export async function resolveWithExtensions(specifier, parentURL, extensions = C
 	return null;
 }
 
-// TSConfig path mapping resolver
+const pathResolutionCache = new Map();
+
 export function resolveTsconfigPaths(specifier) {
+	// Fast path: skip what we know won't match
+	if (
+		specifier.startsWith('.') ||
+		specifier.startsWith('/') ||
+		specifier.startsWith('file:') ||
+		specifier.startsWith('node:')
+	) {
+		return null;
+	}
+
+	// Check cache
+	if (pathResolutionCache.has(specifier)) {
+		return pathResolutionCache.get(specifier);
+	}
+
 	const matchPath = initializeTsconfigPaths();
+	if (!matchPath) {
+		pathResolutionCache.set(specifier, null);
+		return null;
+	}
 
-	if (matchPath && !specifier.startsWith('.') && !specifier.startsWith('/') && !specifier.startsWith('file:')) {
-		const mapped = matchPath(specifier);
+	// Try direct match first
+	const mapped = matchPath(specifier);
+	if (mapped) {
+		const result = {
+			url: pathToFileURL(mapped).href,
+			shortCircuit: true
+		};
+		pathResolutionCache.set(specifier, result);
+		return result;
+	}
 
-		if (mapped) {
-			return {
-				url: pathToFileURL(mapped).href,
-				shortCircuit: true
-			};
+	// Try with extensions if no extension present
+	if (!path.extname(specifier)) {
+		for (const ext of ['.ts', '.js', '.mjs', '.vue']) {
+			const mappedWithExt = matchPath(specifier + ext);
+			if (mappedWithExt) {
+				const result = {
+					url: pathToFileURL(mappedWithExt).href,
+					shortCircuit: true
+				};
+				pathResolutionCache.set(specifier, result);
+				return result;
+			}
 		}
 	}
 
+	pathResolutionCache.set(specifier, null);
 	return null;
 }
 
@@ -118,6 +154,45 @@ export function shouldEnableVueStyle() {
 	);
 }
 
+async function transformImports(code, parentURL) {
+	// Match various import patterns
+	const importRegex =
+		/(?:import|export)\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+|type\s+\{[^}]*\}|type\s+\w+)\s+from\s+)?['"]([^'"]+)['"]/g;
+
+	const matches = [...code.matchAll(importRegex)];
+	let transformed = code;
+
+	for (const match of matches) {
+		const specifier = match[1];
+
+		// Skip if it's already a relative path or absolute URL
+		if (specifier.startsWith('.') || specifier.startsWith('/') || specifier.startsWith('file:')) {
+			continue;
+		}
+
+		// Try to resolve with tsconfig paths
+		const resolved = resolveTsconfigPaths(specifier);
+		if (resolved) {
+			// Convert the resolved path to a relative import from the parent file
+			const parentDir = path.dirname(fileURLToPath(parentURL));
+			const resolvedPath = fileURLToPath(resolved.url);
+			let relativePath = path.relative(parentDir, resolvedPath).replace(/\\/g, '/');
+
+			// Ensure it starts with ./ or ../
+			if (!relativePath.startsWith('.')) {
+				relativePath = './' + relativePath;
+			}
+
+			// Replace the specifier in the import statement
+			const originalImport = match[0];
+			const newImport = originalImport.replace(specifier, relativePath);
+			transformed = transformed.replace(originalImport, newImport);
+		}
+	}
+
+	return transformed;
+}
+
 export async function loadVue(url, context, nextLoad) {
 	const { source } = await nextLoad(url, { ...context, format: 'module' });
 	const code = source.toString();
@@ -127,13 +202,52 @@ export async function loadVue(url, context, nextLoad) {
 		enableStyle: shouldEnableVueStyle()
 	});
 
+	// Transform imports to resolve path aliases
+	const transformed = await transformImports(compiled.code, url);
+
 	return {
 		format: 'module',
-		source: compiled.code,
+		source: transformed,
+		shortCircuit: true
+	};
+}
+
+// Common load handlers
+export async function loadJson(url, context, nextLoad) {
+	const result = await nextLoad(url, {
+		...context,
+		format: 'json',
+		importAttributes: { type: 'json' }
+	});
+
+	return {
+		...result,
+		format: 'json',
 		shortCircuit: true
 	};
 }
 
+// loader-utils.mjs - Add a simple common file handler
+export function handleCommonFileTypes(url, context, nextLoad, loaderName) {
+	// Handle assets
+	const ext = path.extname(url).toLowerCase();
+	if (ASSET_EXTENSIONS.includes(ext)) {
+		return loadAsset(url);
+	}
+
+	// Handle JSON
+	if (url.endsWith('.json')) {
+		try {
+			return loadJson(url, context, nextLoad);
+		} catch (error) {
+			console.error(`>>> ${loaderName}: Failed to compile ${url}:`, error);
+			throw new Error(`Failed to compile ${url}: ${error.message}`);
+		}
+	}
+
+	return null; // Not a common file type
+}
+
 /**
  * Resolves module specifiers with support for TypeScript paths, extensions, and more
  * @param {string} specifier - The module specifier to resolve
@@ -243,11 +357,9 @@ export function createEsbuildLoader(options = {}) {
 		},
 
 		load: async (url, context, nextLoad) => {
-			// Handle asset files
-			const ext = path.extname(url).toLowerCase();
-			if (ASSET_EXTENSIONS.includes(ext)) {
-				return loadAsset(url);
-			}
+			// Check common file types first
+			const commonResult = await handleCommonFileTypes(url, context, nextLoad);
+			if (commonResult) return commonResult;
 
 			// Handle Vue files if enabled
 			if (handleVue && url.endsWith('.vue')) {

package/lib/transpilers/esm/vue-loader.mjs

@@ -37,8 +37,7 @@
  * preprocessor packages to be installed. Missing preprocessors will be skipped
  * with a warning rather than failing the compilation.
  */
-import path from 'path';
-import { ASSET_EXTENSIONS, resolveSpecifier, loadAsset, loadVue } from './loader-utils.mjs';
+import { resolveSpecifier, loadVue, handleCommonFileTypes } from './loader-utils.mjs';
 
 // Cache for the TypeScript loader
 let tsLoader;
@@ -65,11 +64,9 @@ async function getTsLoader() {
 }
 
 export async function load(url, context, nextLoad) {
-	// Handle asset files that Vue compiler turns into imports
-	const ext = path.extname(url).toLowerCase();
-	if (ASSET_EXTENSIONS.includes(ext)) {
-		return loadAsset(url);
-	}
+	// Check common file types first
+	const commonResult = await handleCommonFileTypes(url, context, nextLoad);
+	if (commonResult) return commonResult;
 
 	// Only process .vue files directly
 	if (url.endsWith('.vue')) {

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "7.3.0";
+export declare const version = "7.3.2";

package/lib/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // Generated by genversion.
-exports.version = '7.3.0';
+exports.version = '7.3.2';
 //# sourceMappingURL=version.js.map

package/lib/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,OAAO,GAAG,OAAO,CAAA","sourcesContent":["// Generated by genversion.\nexport const version = '7.3.0'\n"]}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAA,2BAA2B;AACd,QAAA,OAAO,GAAG,OAAO,CAAA","sourcesContent":["// Generated by genversion.\nexport const version = '7.3.2'\n"]}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@lynxwall/cucumber-tsflow",
 	"description": "Provides 'specflow' like bindings for CucumberJS 11.2.0 in TypeScript 5.8+.",
-	"version": "7.3.0",
+	"version": "7.3.2",
 	"author": "Lonnie Wall <lynxdev@lynxwall.com>",
 	"license": "MIT",
 	"keywords": [