@ryanatkn/gro 0.164.0 → 0.165.0

package/dist/src_json.js

@@ -1,11 +1,12 @@
-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';
 import { Src_Json, Src_Modules } from '@ryanatkn/belt/src_json.js';
 import { paths, replace_extension } from "./paths.js";
 import { parse_exports } from "./parse_exports.js";
-import { TS_MATCHER } from "./constants.js";
+import { TS_MATCHER, SVELTE_MATCHER, JSON_MATCHER, CSS_MATCHER } from "./constants.js";
+import { search_fs } from "./search_fs.js";
 export const create_src_json = (package_json, lib_path) => Src_Json.parse({
     name: package_json.name,
     version: package_json.version,
@@ -18,27 +19,7 @@ export const serialize_src_json = (src_json) => {
 export const to_src_modules = (exports, lib_path = paths.lib) => {
     if (!exports)
         return;
-    // Prepare a list of files to analyze
-    const file_paths = [];
-    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
         .filter(({ file_path }) => TS_MATCHER.test(file_path))
@@ -71,3 +52,95 @@ export const to_src_modules = (exports, lib_path = paths.lib) => {
     }
     return result;
 };
+const collect_file_paths = (exports, lib_path) => {
+    const file_paths = [];
+    // 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;
+                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, lib_path) => {
+    // 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;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.164.0",
+  "version": "0.165.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -77,7 +77,7 @@
     }
   },
   "optionalDependencies": {
-    "@ryanatkn/moss": ">=0.31.0",
+    "@ryanatkn/moss": ">=0.33.0",
     "vitest": "^3"
   },
   "devDependencies": {
@@ -85,7 +85,7 @@
     "@changesets/types": "^6.1.0",
     "@ryanatkn/eslint-config": "^0.8.0",
     "@ryanatkn/fuz": "^0.145.0",
-    "@ryanatkn/moss": "^0.32.0",
+    "@ryanatkn/moss": "^0.33.0",
     "@sveltejs/adapter-static": "^3.0.9",
     "@sveltejs/kit": "^2.37.1",
     "@sveltejs/package": "^2.5.0",
@@ -127,350 +127,14 @@
     "!dist/**/*.test.*"
   ],
   "exports": {
+    "./package.json": "./package.json",
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./package.json": "./package.json",
-    "./args.js": {
-      "types": "./dist/args.d.ts",
-      "default": "./dist/args.js"
-    },
-    "./build.task.js": {
-      "types": "./dist/build.task.d.ts",
-      "default": "./dist/build.task.js"
-    },
-    "./changelog.js": {
-      "types": "./dist/changelog.d.ts",
-      "default": "./dist/changelog.js"
-    },
-    "./changeset_helpers.js": {
-      "types": "./dist/changeset_helpers.d.ts",
-      "default": "./dist/changeset_helpers.js"
-    },
-    "./changeset.task.js": {
-      "types": "./dist/changeset.task.d.ts",
-      "default": "./dist/changeset.task.js"
-    },
-    "./check.task.js": {
-      "types": "./dist/check.task.d.ts",
-      "default": "./dist/check.task.js"
-    },
-    "./child_process_logging.js": {
-      "types": "./dist/child_process_logging.d.ts",
-      "default": "./dist/child_process_logging.js"
-    },
-    "./clean_fs.js": {
-      "types": "./dist/clean_fs.d.ts",
-      "default": "./dist/clean_fs.js"
-    },
-    "./clean.task.js": {
-      "types": "./dist/clean.task.d.ts",
-      "default": "./dist/clean.task.js"
-    },
-    "./cli.js": {
-      "types": "./dist/cli.d.ts",
-      "default": "./dist/cli.js"
-    },
-    "./commit.task.js": {
-      "types": "./dist/commit.task.d.ts",
-      "default": "./dist/commit.task.js"
-    },
-    "./constants.js": {
-      "types": "./dist/constants.d.ts",
-      "default": "./dist/constants.js"
-    },
-    "./deploy.task.js": {
-      "types": "./dist/deploy.task.d.ts",
-      "default": "./dist/deploy.task.js"
-    },
-    "./dev.task.js": {
-      "types": "./dist/dev.task.d.ts",
-      "default": "./dist/dev.task.js"
-    },
-    "./disknode.js": {
-      "types": "./dist/disknode.d.ts",
-      "default": "./dist/disknode.js"
-    },
-    "./env.js": {
-      "types": "./dist/env.d.ts",
-      "default": "./dist/env.js"
-    },
-    "./esbuild_helpers.js": {
-      "types": "./dist/esbuild_helpers.d.ts",
-      "default": "./dist/esbuild_helpers.js"
-    },
-    "./esbuild_plugin_external_worker.js": {
-      "types": "./dist/esbuild_plugin_external_worker.d.ts",
-      "default": "./dist/esbuild_plugin_external_worker.js"
-    },
-    "./esbuild_plugin_svelte.js": {
-      "types": "./dist/esbuild_plugin_svelte.d.ts",
-      "default": "./dist/esbuild_plugin_svelte.js"
-    },
-    "./esbuild_plugin_sveltekit_local_imports.js": {
-      "types": "./dist/esbuild_plugin_sveltekit_local_imports.d.ts",
-      "default": "./dist/esbuild_plugin_sveltekit_local_imports.js"
-    },
-    "./esbuild_plugin_sveltekit_shim_alias.js": {
-      "types": "./dist/esbuild_plugin_sveltekit_shim_alias.d.ts",
-      "default": "./dist/esbuild_plugin_sveltekit_shim_alias.js"
-    },
-    "./esbuild_plugin_sveltekit_shim_app.js": {
-      "types": "./dist/esbuild_plugin_sveltekit_shim_app.d.ts",
-      "default": "./dist/esbuild_plugin_sveltekit_shim_app.js"
-    },
-    "./esbuild_plugin_sveltekit_shim_env.js": {
-      "types": "./dist/esbuild_plugin_sveltekit_shim_env.d.ts",
-      "default": "./dist/esbuild_plugin_sveltekit_shim_env.js"
-    },
-    "./filer.js": {
-      "types": "./dist/filer.d.ts",
-      "default": "./dist/filer.js"
-    },
-    "./format_directory.js": {
-      "types": "./dist/format_directory.d.ts",
-      "default": "./dist/format_directory.js"
-    },
-    "./format_file.js": {
-      "types": "./dist/format_file.d.ts",
-      "default": "./dist/format_file.js"
-    },
-    "./format.task.js": {
-      "types": "./dist/format.task.d.ts",
-      "default": "./dist/format.task.js"
-    },
-    "./fs.js": {
-      "types": "./dist/fs.d.ts",
-      "default": "./dist/fs.js"
-    },
-    "./gen.task.js": {
-      "types": "./dist/gen.task.d.ts",
-      "default": "./dist/gen.task.js"
-    },
-    "./gen.js": {
-      "types": "./dist/gen.d.ts",
-      "default": "./dist/gen.js"
-    },
-    "./git.js": {
-      "types": "./dist/git.d.ts",
-      "default": "./dist/git.js"
-    },
-    "./github.js": {
-      "types": "./dist/github.d.ts",
-      "default": "./dist/github.js"
-    },
-    "./gro_config.js": {
-      "types": "./dist/gro_config.d.ts",
-      "default": "./dist/gro_config.js"
-    },
-    "./gro_helpers.js": {
-      "types": "./dist/gro_helpers.d.ts",
-      "default": "./dist/gro_helpers.js"
-    },
-    "./gro_plugin_gen.js": {
-      "types": "./dist/gro_plugin_gen.d.ts",
-      "default": "./dist/gro_plugin_gen.js"
-    },
-    "./gro_plugin_server.js": {
-      "types": "./dist/gro_plugin_server.d.ts",
-      "default": "./dist/gro_plugin_server.js"
-    },
-    "./gro_plugin_sveltekit_app.js": {
-      "types": "./dist/gro_plugin_sveltekit_app.d.ts",
-      "default": "./dist/gro_plugin_sveltekit_app.js"
-    },
-    "./gro_plugin_sveltekit_library.js": {
-      "types": "./dist/gro_plugin_sveltekit_library.d.ts",
-      "default": "./dist/gro_plugin_sveltekit_library.js"
-    },
-    "./gro.config.default.js": {
-      "types": "./dist/gro.config.default.d.ts",
-      "default": "./dist/gro.config.default.js"
-    },
-    "./gro.js": {
-      "types": "./dist/gro.d.ts",
-      "default": "./dist/gro.js"
-    },
-    "./hash.js": {
-      "types": "./dist/hash.d.ts",
-      "default": "./dist/hash.js"
-    },
-    "./input_path.js": {
-      "types": "./dist/input_path.d.ts",
-      "default": "./dist/input_path.js"
-    },
-    "./invoke_task.js": {
-      "types": "./dist/invoke_task.d.ts",
-      "default": "./dist/invoke_task.js"
-    },
-    "./invoke.js": {
-      "types": "./dist/invoke.d.ts",
-      "default": "./dist/invoke.js"
-    },
-    "./lint.task.js": {
-      "types": "./dist/lint.task.d.ts",
-      "default": "./dist/lint.task.js"
-    },
-    "./loader.js": {
-      "types": "./dist/loader.d.ts",
-      "default": "./dist/loader.js"
-    },
-    "./module.js": {
-      "types": "./dist/module.d.ts",
-      "default": "./dist/module.js"
-    },
-    "./modules.js": {
-      "types": "./dist/modules.d.ts",
-      "default": "./dist/modules.js"
-    },
-    "./package_json.js": {
-      "types": "./dist/package_json.d.ts",
-      "default": "./dist/package_json.js"
-    },
-    "./package.gen.js": {
-      "types": "./dist/package.gen.d.ts",
-      "default": "./dist/package.gen.js"
-    },
-    "./package.js": {
-      "types": "./dist/package.d.ts",
-      "default": "./dist/package.js"
-    },
-    "./parse_exports_context.js": {
-      "types": "./dist/parse_exports_context.d.ts",
-      "default": "./dist/parse_exports_context.js"
-    },
-    "./parse_exports.js": {
-      "types": "./dist/parse_exports.d.ts",
-      "default": "./dist/parse_exports.js"
-    },
-    "./parse_imports.js": {
-      "types": "./dist/parse_imports.d.ts",
-      "default": "./dist/parse_imports.js"
-    },
-    "./path.js": {
-      "types": "./dist/path.d.ts",
-      "default": "./dist/path.js"
-    },
-    "./paths.js": {
-      "types": "./dist/paths.d.ts",
-      "default": "./dist/paths.js"
-    },
-    "./plugin.js": {
-      "types": "./dist/plugin.d.ts",
-      "default": "./dist/plugin.js"
-    },
-    "./publish.task.js": {
-      "types": "./dist/publish.task.d.ts",
-      "default": "./dist/publish.task.js"
-    },
-    "./register.js": {
-      "types": "./dist/register.d.ts",
-      "default": "./dist/register.js"
-    },
-    "./reinstall.task.js": {
-      "types": "./dist/reinstall.task.d.ts",
-      "default": "./dist/reinstall.task.js"
-    },
-    "./release.task.js": {
-      "types": "./dist/release.task.d.ts",
-      "default": "./dist/release.task.js"
-    },
-    "./resolve_specifier.js": {
-      "types": "./dist/resolve_specifier.d.ts",
-      "default": "./dist/resolve_specifier.js"
-    },
-    "./resolve.task.js": {
-      "types": "./dist/resolve.task.d.ts",
-      "default": "./dist/resolve.task.js"
-    },
-    "./run_gen.js": {
-      "types": "./dist/run_gen.d.ts",
-      "default": "./dist/run_gen.js"
-    },
-    "./run_task.js": {
-      "types": "./dist/run_task.d.ts",
-      "default": "./dist/run_task.js"
-    },
-    "./run.task.js": {
-      "types": "./dist/run.task.d.ts",
-      "default": "./dist/run.task.js"
-    },
-    "./search_fs.js": {
-      "types": "./dist/search_fs.d.ts",
-      "default": "./dist/search_fs.js"
-    },
-    "./src_json.js": {
-      "types": "./dist/src_json.d.ts",
-      "default": "./dist/src_json.js"
-    },
-    "./svelte_config.js": {
-      "types": "./dist/svelte_config.d.ts",
-      "default": "./dist/svelte_config.js"
-    },
-    "./sveltekit_helpers.js": {
-      "types": "./dist/sveltekit_helpers.d.ts",
-      "default": "./dist/sveltekit_helpers.js"
-    },
-    "./sveltekit_shim_app_environment.js": {
-      "types": "./dist/sveltekit_shim_app_environment.d.ts",
-      "default": "./dist/sveltekit_shim_app_environment.js"
-    },
-    "./sveltekit_shim_app_forms.js": {
-      "types": "./dist/sveltekit_shim_app_forms.d.ts",
-      "default": "./dist/sveltekit_shim_app_forms.js"
-    },
-    "./sveltekit_shim_app_navigation.js": {
-      "types": "./dist/sveltekit_shim_app_navigation.d.ts",
-      "default": "./dist/sveltekit_shim_app_navigation.js"
-    },
-    "./sveltekit_shim_app_paths.js": {
-      "types": "./dist/sveltekit_shim_app_paths.d.ts",
-      "default": "./dist/sveltekit_shim_app_paths.js"
-    },
-    "./sveltekit_shim_app_state.js": {
-      "types": "./dist/sveltekit_shim_app_state.d.ts",
-      "default": "./dist/sveltekit_shim_app_state.js"
-    },
-    "./sveltekit_shim_app.js": {
-      "types": "./dist/sveltekit_shim_app.d.ts",
-      "default": "./dist/sveltekit_shim_app.js"
-    },
-    "./sveltekit_shim_env.js": {
-      "types": "./dist/sveltekit_shim_env.d.ts",
-      "default": "./dist/sveltekit_shim_env.js"
-    },
-    "./sync.task.js": {
-      "types": "./dist/sync.task.d.ts",
-      "default": "./dist/sync.task.js"
-    },
-    "./task_logging.js": {
-      "types": "./dist/task_logging.d.ts",
-      "default": "./dist/task_logging.js"
-    },
-    "./task.js": {
-      "types": "./dist/task.d.ts",
-      "default": "./dist/task.js"
-    },
-    "./test_helpers.js": {
-      "types": "./dist/test_helpers.d.ts",
-      "default": "./dist/test_helpers.js"
-    },
-    "./test.task.js": {
-      "types": "./dist/test.task.d.ts",
-      "default": "./dist/test.task.js"
-    },
-    "./typecheck.task.js": {
-      "types": "./dist/typecheck.task.d.ts",
-      "default": "./dist/typecheck.task.js"
-    },
-    "./upgrade.task.js": {
-      "types": "./dist/upgrade.task.d.ts",
-      "default": "./dist/upgrade.task.js"
-    },
-    "./watch_dir.js": {
-      "types": "./dist/watch_dir.d.ts",
-      "default": "./dist/watch_dir.js"
+    "./*.js": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
     }
   }
 }

package/src/lib/constants.ts

@@ -38,6 +38,7 @@ export const JS_MATCHER = /\.(js|mjs|cjs)$/;
 export const JSON_MATCHER = /\.json$/;
 export const SVELTE_MATCHER = /\.svelte$/;
 export const SVELTE_RUNES_MATCHER = /\.svelte\.(js|ts)$/; // TODO probably let `.svelte.` appear anywhere - https://github.com/sveltejs/svelte/issues/11536
+export const CSS_MATCHER = /\.css$/;
 /** Extracts the script content from Svelte files. */
 export const SVELTE_SCRIPT_MATCHER = /<script(?:\s+[^>]*)?>([\s\S]*?)<\/script>/gim; // TODO maybe this shouldnt be global? or make a getter?
 export const SVELTEKIT_ENV_MATCHER = /^\$env\/(static|dynamic)\/(public|private)$/;

package/src/lib/gro.config.default.ts

@@ -1,13 +1,10 @@
-import {resolve} from 'node:path';
-
 import type {Create_Gro_Config} from './gro_config.ts';
 import {gro_plugin_sveltekit_library} from './gro_plugin_sveltekit_library.ts';
 import {has_server, gro_plugin_server} from './gro_plugin_server.ts';
 import {gro_plugin_sveltekit_app} from './gro_plugin_sveltekit_app.ts';
 import {has_sveltekit_app, has_sveltekit_library} from './sveltekit_helpers.ts';
 import {gro_plugin_gen} from './gro_plugin_gen.ts';
-import {has_dep, load_package_json} from './package_json.ts';
-import {find_first_existing_file} from './search_fs.ts';
+import {load_package_json} from './package_json.ts';
 
 // TODO hacky, maybe extract utils?
 
@@ -23,29 +20,16 @@ import {find_first_existing_file} from './search_fs.ts';
 const config: Create_Gro_Config = async (cfg, svelte_config) => {
 	const package_json = load_package_json(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
 
-	const [has_moss_dep, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] =
+	const [has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] =
 		await Promise.all([
-			has_dep('@ryanatkn/moss', package_json),
 			has_server(),
 			has_sveltekit_library(package_json, svelte_config),
 			has_sveltekit_app(),
 		]);
 
-	const local_moss_plugin_path = find_first_existing_file([
-		'./src/lib/gro_plugin_moss.ts',
-		'./src/gro_plugin_moss.ts',
-		'./src/routes/gro_plugin_moss.ts', // TODO probably remove this
-	]);
-
 	// put things that generate files before SvelteKit so it can see them
-	cfg.plugins = async () =>
+	cfg.plugins = () =>
 		[
-			// TODO probably belongs in the gen system
-			local_moss_plugin_path
-				? (await import(resolve(local_moss_plugin_path))).gro_plugin_moss()
-				: has_moss_dep
-					? (await import('@ryanatkn/moss/gro_plugin_moss.js')).gro_plugin_moss()
-					: null, // lazy load to avoid errors if it's not installed
 			gro_plugin_gen(),
 			has_server_result.ok ? gro_plugin_server() : null,
 			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,

package/src/lib/gro_config.ts

@@ -1,5 +1,6 @@
 import {join, resolve} from 'node:path';
 import {existsSync} from 'node:fs';
+import {identity} from '@ryanatkn/belt/function.js';
 
 import {GRO_DIST_DIR, IS_THIS_GRO, paths} from './paths.ts';
 import {
@@ -76,7 +77,7 @@ export type Create_Gro_Config = (
 
 export const create_empty_gro_config = (): Gro_Config => ({
 	plugins: () => [],
-	map_package_json: default_map_package_json,
+	map_package_json: identity,
 	task_root_dirs: [
 		// TODO maybe disable if no SvelteKit `lib` directory? or other detection to improve defaults
 		paths.lib,
@@ -106,15 +107,6 @@ export const SEARCH_EXCLUDER_DEFAULT = new RegExp(
 	'u',
 );
 
-const default_map_package_json: Map_Package_Json = (package_json) => {
-	if (package_json.exports) {
-		package_json.exports = Object.fromEntries(
-			Object.entries(package_json.exports).filter(([k]) => !EXPORTS_EXCLUDER_DEFAULT.test(k)),
-		);
-	}
-	return package_json;
-};
-
 export const EXPORTS_EXCLUDER_DEFAULT = /(\.md|\.(test|ignore)\.|\/(test|fixtures|ignore)\/)/;
 
 /**