@ryanatkn/gro 0.164.1 → 0.165.0

package/src/lib/package_json.ts

@@ -6,8 +6,16 @@ import type {Logger} from '@ryanatkn/belt/log.js';
 import {styleText as st} from 'node:util';
 import {Package_Json, Package_Json_Exports} from '@ryanatkn/belt/package_json.js';
 
-import {paths, gro_paths, IS_THIS_GRO, replace_extension} from './paths.ts';
-import {PACKAGE_JSON_FILENAME, SVELTEKIT_DIST_DIRNAME} from './constants.ts';
+import {paths, gro_paths, IS_THIS_GRO} from './paths.ts';
+import {
+	PACKAGE_JSON_FILENAME,
+	SVELTEKIT_DIST_DIRNAME,
+	TS_MATCHER,
+	JS_MATCHER,
+	SVELTE_MATCHER,
+	JSON_MATCHER,
+	CSS_MATCHER,
+} from './constants.ts';
 import {search_fs} from './search_fs.ts';
 import {has_sveltekit_library} from './sveltekit_helpers.ts';
 import {GITHUB_REPO_MATCHER} from './github.ts';
@@ -55,8 +63,7 @@ export const sync_package_json = async (
 	const updated = await update_package_json(
 		async (package_json) => {
 			if (has_sveltekit_library(package_json).ok) {
-				const exports = to_package_exports(exported_paths);
-				package_json.exports = exports;
+				package_json.exports = to_package_exports(exported_paths);
 			}
 			const mapped = await map_package_json(package_json);
 			return mapped ? parse_package_json(Package_Json, mapped) : mapped;
@@ -115,53 +122,52 @@ export const update_package_json = async (
 
 const is_index = (path: string): boolean => path === 'index.ts' || path === 'index.js';
 
-// TODO support subpath patterns as the main concise way to do things
-// https://nodejs.org/api/packages.html#subpath-patterns
-
 export const to_package_exports = (paths: Array<string>): Package_Json_Exports => {
-	const sorted = paths
-		.slice()
-		.sort((a, b) => (is_index(a) ? -1 : is_index(b) ? 1 : a.localeCompare(b)));
-	// Add the package.json after the index, if one exists.
-	// Including the `./` here ensures we don't conflict with any potential `$lib/package.json`.
-	const final_sorted = is_index(sorted[0])
-		? [sorted[0]].concat('./package.json', sorted.slice(1))
-		: ['./package.json'].concat(sorted);
-	const exports: Package_Json_Exports = {};
-	for (const path of final_sorted) {
-		if (path === './package.json') {
-			exports['./package.json'] = './package.json';
-		} else if (path.endsWith('.json.d.ts')) {
-			const json_path = path.substring(0, path.length - 5);
-			exports['./' + json_path] = {
-				types: IMPORT_PREFIX + path,
-				default: IMPORT_PREFIX + json_path, // assuming a matching json file
-			};
-		} else if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
-			const js_path = replace_extension(path, '.js');
-			const key = is_index(path) ? '.' : './' + js_path;
-			exports[key] = {
-				types: IMPORT_PREFIX + replace_extension(path, '.d.ts'),
-				default: IMPORT_PREFIX + js_path,
-			};
-		} else if (path.endsWith('.js')) {
-			const key = is_index(path) ? '.' : './' + path;
-			exports[key] = {
-				types: IMPORT_PREFIX + replace_extension(path, '.d.ts'), // assuming JSDoc types
-				default: IMPORT_PREFIX + path,
-			};
-		} else if (path.endsWith('.svelte')) {
-			exports['./' + path] = {
-				types: IMPORT_PREFIX + path + '.d.ts',
-				svelte: IMPORT_PREFIX + path,
-				default: IMPORT_PREFIX + path, // needed for loader imports
-			};
-		} else {
-			exports['./' + path] = {
-				default: IMPORT_PREFIX + path,
-			};
-		}
+	const has_index = paths.some(is_index);
+	const has_js = paths.some((p) => TS_MATCHER.test(p) || JS_MATCHER.test(p));
+	const has_svelte = paths.some((p) => SVELTE_MATCHER.test(p));
+	const has_json = paths.some((p) => JSON_MATCHER.test(p));
+	const has_css = paths.some((p) => CSS_MATCHER.test(p));
+
+	const exports: Package_Json_Exports = {
+		'./package.json': './package.json',
+	};
+
+	if (has_index) {
+		exports['.'] = {
+			types: IMPORT_PREFIX + 'index.d.ts',
+			default: IMPORT_PREFIX + 'index.js',
+		};
 	}
+
+	if (has_js) {
+		exports['./*.js'] = {
+			types: IMPORT_PREFIX + '*.d.ts',
+			default: IMPORT_PREFIX + '*.js',
+		};
+	}
+
+	if (has_svelte) {
+		exports['./*.svelte'] = {
+			types: IMPORT_PREFIX + '*.svelte.d.ts',
+			svelte: IMPORT_PREFIX + '*.svelte',
+			default: IMPORT_PREFIX + '*.svelte',
+		};
+	}
+
+	if (has_json) {
+		exports['./*.json'] = {
+			types: IMPORT_PREFIX + '*.json.d.ts',
+			default: IMPORT_PREFIX + '*.json',
+		};
+	}
+
+	if (has_css) {
+		exports['./*.css'] = {
+			default: IMPORT_PREFIX + '*.css',
+		};
+	}
+
 	return parse_or_throw_formatted_error('package.json#exports', Package_Json_Exports, exports);
 };
 

package/src/lib/src_json.ts

@@ -1,4 +1,4 @@
-import {join, extname} from 'node:path';
+import {join} from 'node:path';
 import {ensure_end, strip_start} from '@ryanatkn/belt/string.js';
 import {existsSync} from 'node:fs';
 import ts from 'typescript';
@@ -7,7 +7,8 @@ import {Src_Json, Src_Modules} from '@ryanatkn/belt/src_json.js';
 
 import {paths, replace_extension} from './paths.ts';
 import {parse_exports} from './parse_exports.ts';
-import {TS_MATCHER} from './constants.ts';
+import {TS_MATCHER, SVELTE_MATCHER, JSON_MATCHER, CSS_MATCHER} from './constants.ts';
+import {search_fs} from './search_fs.ts';
 
 export type Map_Src_Json = (src_json: Src_Json) => Src_Json | null | Promise<Src_Json | null>;
 
@@ -29,34 +30,7 @@ export const to_src_modules = (
 ): Src_Modules | undefined => {
 	if (!exports) return;
 
-	// Prepare a list of files to analyze
-	const file_paths: Array<{export_key: string; file_path: string}> = [];
-	for (const [k, _v] of Object.entries(exports)) {
-		// Handle different file types
-		const source_file_path =
-			k === '.' || k === './'
-				? 'index.ts'
-				: strip_start(k.endsWith('.js') ? replace_extension(k, '.ts') : k, './');
-
-		const source_file_id = join(lib_path, source_file_path);
-
-		// Check if file exists
-		if (!existsSync(source_file_id)) {
-			// Handle non-TypeScript files (Svelte, CSS, JSON)
-			const extension = extname(source_file_id);
-			if (extension === '.svelte' || extension === '.css' || extension === '.json') {
-				file_paths.push({export_key: k, file_path: source_file_id});
-				continue;
-			}
-
-			// TODO still an error for unknown files running `gro gen`, can it use the filer to invalidate correctly?
-			throw Error(
-				`Failed to infer source file from package.json export path ${k} - the inferred file ${source_file_id} does not exist`,
-			);
-		}
-
-		file_paths.push({export_key: k, file_path: source_file_id});
-	}
+	const file_paths = collect_file_paths(exports, lib_path);
 
 	// Create a TypeScript program for all TypeScript files
 	const ts_files = file_paths
@@ -98,3 +72,101 @@ export const to_src_modules = (
 
 	return result;
 };
+
+const collect_file_paths = (
+	exports: Package_Json_Exports,
+	lib_path: string,
+): Array<{export_key: string; file_path: string}> => {
+	const file_paths: Array<{export_key: string; file_path: string}> = [];
+
+	// Handle string exports (single default export)
+	if (typeof exports === 'string') {
+		const source_file = infer_source_from_export(exports, lib_path);
+		if (source_file) {
+			file_paths.push({export_key: '.', file_path: source_file});
+		} else {
+			throw Error(
+				`Failed to infer source file from package.json string export "${exports}" - no matching file found in ${lib_path}`,
+			);
+		}
+		return file_paths;
+	}
+
+	// Handle object exports
+	for (const k in exports) {
+		// Skip package.json
+		if (k === './package.json') continue;
+
+		// Check if this is a pattern export
+		if (k.includes('*')) {
+			// Handle pattern exports by finding matching files in lib
+			const matching_files = search_fs(lib_path, {
+				file_filter: (path) => {
+					const p = path.replace(ensure_end(lib_path, '/'), '');
+					// Only match files in the root directory (no subdirectories)
+					if (p.includes('/')) return false;
+
+					// Match based on the export pattern
+					if (k === './*.js') {
+						return TS_MATCHER.test(p) && !p.endsWith('.d.ts') && !p.endsWith('.test.ts');
+					} else if (k === './*.svelte') {
+						return SVELTE_MATCHER.test(p);
+					} else if (k === './*.json') {
+						return JSON_MATCHER.test(p);
+					} else if (k === './*.css') {
+						return CSS_MATCHER.test(p);
+					}
+					return false;
+				},
+			});
+
+			// Add each matching file
+			for (const file of matching_files) {
+				let export_path: string;
+				if (file.path.endsWith('.ts')) {
+					export_path = './' + file.path.replace('.ts', '.js');
+				} else {
+					export_path = './' + file.path;
+				}
+				file_paths.push({export_key: export_path, file_path: file.id});
+			}
+		} else {
+			// Handle explicit exports (non-patterns)
+			const source_file = infer_source_from_export(k, lib_path);
+			if (source_file) {
+				file_paths.push({export_key: k, file_path: source_file});
+			} else {
+				throw Error(
+					`Failed to infer source file from package.json export path ${k} - no matching file found in ${lib_path}`,
+				);
+			}
+		}
+	}
+
+	return file_paths;
+};
+
+const infer_source_from_export = (export_path: string, lib_path: string): string | null => {
+	// Handle index specially
+	if (export_path === '.' || export_path === './') {
+		const index_ts = join(lib_path, 'index.ts');
+		if (existsSync(index_ts)) return index_ts;
+		const index_js = join(lib_path, 'index.js');
+		if (existsSync(index_js)) return index_js;
+		return null;
+	}
+
+	const clean_path = strip_start(export_path, './');
+
+	// For .js exports, try .ts first
+	if (clean_path.endsWith('.js')) {
+		const ts_path = join(lib_path, replace_extension(clean_path, '.ts'));
+		if (existsSync(ts_path)) return ts_path;
+	}
+
+	// Try the exact path
+	const exact_path = join(lib_path, clean_path);
+	if (existsSync(exact_path)) return exact_path;
+
+	return null;
+};