@ryanatkn/gro 0.115.3 → 0.116.0

package/dist/changeset.task.d.ts

@@ -27,14 +27,14 @@ export declare const Args: z.ZodObject<{
     access?: "public" | "restricted" | undefined;
 }, {
     _?: string[] | undefined;
+    dir?: string | undefined;
+    install?: boolean | undefined;
+    origin?: string | undefined;
     minor?: boolean | undefined;
     major?: boolean | undefined;
-    dir?: string | undefined;
     access?: "public" | "restricted" | undefined;
     changelog?: string | undefined;
-    install?: boolean | undefined;
     'no-install'?: boolean | undefined;
-    origin?: string | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 /**

package/dist/check.task.d.ts

@@ -29,15 +29,15 @@ export declare const Args: z.ZodObject<{
     'no-lint': boolean;
     workspace: boolean;
 }, {
+    package_json?: boolean | undefined;
+    format?: boolean | undefined;
     typecheck?: boolean | undefined;
     'no-typecheck'?: boolean | undefined;
     test?: boolean | undefined;
     'no-test'?: boolean | undefined;
     gen?: boolean | undefined;
     'no-gen'?: boolean | undefined;
-    format?: boolean | undefined;
     'no-format'?: boolean | undefined;
-    package_json?: boolean | undefined;
     'no-package_json'?: boolean | undefined;
     lint?: boolean | undefined;
     'no-lint'?: boolean | undefined;

package/dist/clean_fs.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
 import type { RmOptions } from 'node:fs';
 export declare const clean_fs: ({ build, build_dev, build_dist, sveltekit, nodemodules, }: {
-    build?: boolean | undefined;
-    build_dev?: boolean | undefined;
-    build_dist?: boolean | undefined;
-    sveltekit?: boolean | undefined;
-    nodemodules?: boolean | undefined;
+    build?: boolean;
+    build_dev?: boolean;
+    build_dist?: boolean;
+    sveltekit?: boolean;
+    nodemodules?: boolean;
 }, rm_options?: RmOptions) => Promise<void>;

package/dist/deploy.task.d.ts

@@ -29,18 +29,18 @@ export declare const Args: z.ZodObject<{
     dangerous: boolean;
     'no-build': boolean;
 }, {
-    source?: string | undefined;
+    build?: boolean | undefined;
     target?: string | undefined;
+    install?: boolean | undefined;
     origin?: string | undefined;
+    reset?: boolean | undefined;
+    'no-install'?: boolean | undefined;
+    source?: string | undefined;
     deploy_dir?: string | undefined;
     build_dir?: string | undefined;
     dry?: boolean | undefined;
     force?: boolean | undefined;
     dangerous?: boolean | undefined;
-    reset?: boolean | undefined;
-    install?: boolean | undefined;
-    'no-install'?: boolean | undefined;
-    build?: boolean | undefined;
     'no-build'?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;

package/dist/dev.task.d.ts

@@ -13,8 +13,8 @@ export declare const Args: z.ZodObject<{
     'no-sync': boolean;
 }, {
     watch?: boolean | undefined;
-    'no-watch'?: boolean | undefined;
     sync?: boolean | undefined;
+    'no-watch'?: boolean | undefined;
     'no-sync'?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;

package/dist/esbuild_plugin_svelte.d.ts

@@ -1,9 +1,10 @@
 /// <reference types="svelte" />
 import type * as esbuild from 'esbuild';
-import { type CompileOptions, type PreprocessorGroup } from 'svelte/compiler';
+import { type CompileOptions, type ModuleCompileOptions, type PreprocessorGroup } from 'svelte/compiler';
 export interface Options {
     dir?: string;
     svelte_compile_options?: CompileOptions;
+    svelte_compile_module_options?: ModuleCompileOptions;
     svelte_preprocessors?: PreprocessorGroup | PreprocessorGroup[];
 }
-export declare const esbuild_plugin_svelte: ({ dir, svelte_compile_options, svelte_preprocessors, }: Options) => esbuild.Plugin;
+export declare const esbuild_plugin_svelte: (options?: Options) => esbuild.Plugin;

package/dist/esbuild_plugin_svelte.js

@@ -1,38 +1,63 @@
-import { compile, preprocess } from 'svelte/compiler';
+import { compile, compileModule, preprocess, } from 'svelte/compiler';
 import { readFile } from 'node:fs/promises';
 import { relative } from 'node:path';
 import { cwd } from 'node:process';
-export const esbuild_plugin_svelte = ({ dir = cwd(), svelte_compile_options, svelte_preprocessors, }) => ({
-    name: 'svelte',
-    setup: (build) => {
-        build.onLoad({ filter: /\.svelte$/u }, async ({ path }) => {
-            let source = await readFile(path, 'utf8');
-            try {
-                const filename = relative(dir, path);
-                const preprocessed = svelte_preprocessors
-                    ? await preprocess(source, svelte_preprocessors, { filename })
-                    : null;
-                // TODO handle preprocessor sourcemaps, same as in loader - merge?
-                if (preprocessed?.code)
-                    source = preprocessed?.code;
-                const { js, warnings } = compile(source, svelte_compile_options);
-                const contents = js.map ? js.code + '//# sourceMappingURL=' + js.map.toUrl() : js.code;
-                return {
-                    contents,
-                    warnings: warnings.map((w) => to_sveltekit_message(filename, source, w)),
-                };
-            }
-            catch (err) {
-                return { errors: [to_sveltekit_message(path, source, err)] };
-            }
-        });
-    },
-});
+import { SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from './svelte_helpers.js';
+export const esbuild_plugin_svelte = (options = {}) => {
+    const { dir = cwd(), svelte_compile_options = {}, svelte_compile_module_options = {}, svelte_preprocessors, } = options;
+    return {
+        name: 'svelte',
+        setup: (build) => {
+            build.onLoad({ filter: SVELTE_RUNES_MATCHER }, async ({ path }) => {
+                const source = await readFile(path, 'utf8');
+                try {
+                    const filename = relative(dir, path);
+                    const { js, warnings } = compileModule(source, {
+                        filename,
+                        ...svelte_compile_module_options,
+                    });
+                    const contents = js.map ? js.code + '//# sourceMappingURL=' + js.map.toUrl() : js.code;
+                    return {
+                        contents,
+                        warnings: warnings.map((w) => convert_svelte_message_to_esbuild(filename, source, w)),
+                    };
+                }
+                catch (err) {
+                    return { errors: [convert_svelte_message_to_esbuild(path, source, err)] };
+                }
+            });
+            build.onLoad({ filter: SVELTE_MATCHER }, async ({ path }) => {
+                let source = await readFile(path, 'utf8');
+                try {
+                    const filename = relative(dir, path);
+                    const preprocessed = svelte_preprocessors
+                        ? await preprocess(source, svelte_preprocessors, { filename })
+                        : null;
+                    // TODO handle preprocessor sourcemaps, same as in loader - merge?
+                    if (preprocessed?.code)
+                        source = preprocessed?.code;
+                    const { js, warnings } = compile(source, {
+                        filename,
+                        ...svelte_compile_options,
+                    });
+                    const contents = js.map ? js.code + '//# sourceMappingURL=' + js.map.toUrl() : js.code;
+                    return {
+                        contents,
+                        warnings: warnings.map((w) => convert_svelte_message_to_esbuild(filename, source, w)),
+                    };
+                }
+                catch (err) {
+                    return { errors: [convert_svelte_message_to_esbuild(path, source, err)] };
+                }
+            });
+        },
+    };
+};
 /**
  * Following the example in the esbuild docs:
  * https://esbuild.github.io/plugins/#svelte-plugin
  */
-const to_sveltekit_message = (path, source, { message, start, end }) => {
+const convert_svelte_message_to_esbuild = (path, source, { message, start, end }) => {
     let location = null;
     if (start && end) {
         const lineText = source.split(/\r\n|\r|\n/gu)[start.line - 1];

package/dist/esbuild_plugin_svelte.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/esbuild_plugin_svelte.test.js

@@ -0,0 +1,74 @@
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+import * as esbuild from 'esbuild';
+import { readFile, rm } from 'node:fs/promises';
+import { esbuild_plugin_svelte } from './esbuild_plugin_svelte.js';
+test('build for the client', async () => {
+    const outfile = './src/fixtures/modules/some_test_server_bundle_DELETEME.js';
+    const built = await esbuild.build({
+        entryPoints: ['./src/fixtures/modules/some_test_server.ts'],
+        plugins: [esbuild_plugin_svelte()],
+        outfile,
+        format: 'esm',
+        platform: 'node',
+        packages: 'external',
+        bundle: true,
+        target: 'esnext',
+    });
+    assert.is(built.errors.length, 0);
+    assert.is(built.warnings.length, 0);
+    const built_output = await readFile(outfile, 'utf8');
+    assert.is(built_output, `// src/fixtures/modules/some_test_svelte_ts.svelte.ts
+import * as $ from "svelte/internal/client";
+var Some_Test_Svelte_Ts = class {
+  #a = $.source("ok");
+  get a() {
+    return $.get(this.#a);
+  }
+  set a(value) {
+    $.set(this.#a, $.proxy(value));
+  }
+};
+
+// src/fixtures/modules/some_test_server.ts
+var some_test_server = "some_test_server";
+var Rexported_Some_Test_Svelte_Ts = Some_Test_Svelte_Ts;
+export {
+  Rexported_Some_Test_Svelte_Ts,
+  some_test_server
+};
+`);
+    await rm(outfile); // TODO could be cleaner
+});
+test('build for the server', async () => {
+    const outfile = './src/fixtures/modules/some_test_client_bundle_DELETEME.js';
+    const built = await esbuild.build({
+        entryPoints: ['./src/fixtures/modules/some_test_server.ts'],
+        plugins: [esbuild_plugin_svelte({ svelte_compile_module_options: { generate: 'server' } })],
+        outfile,
+        format: 'esm',
+        platform: 'node',
+        packages: 'external',
+        bundle: true,
+        target: 'esnext',
+    });
+    assert.is(built.errors.length, 0);
+    assert.is(built.warnings.length, 0);
+    const built_output = await readFile(outfile, 'utf8');
+    assert.is(built_output, `// src/fixtures/modules/some_test_svelte_ts.svelte.ts
+import * as $ from "svelte/internal/server";
+var Some_Test_Svelte_Ts = class {
+  a = "ok";
+};
+
+// src/fixtures/modules/some_test_server.ts
+var some_test_server = "some_test_server";
+var Rexported_Some_Test_Svelte_Ts = Some_Test_Svelte_Ts;
+export {
+  Rexported_Some_Test_Svelte_Ts,
+  some_test_server
+};
+`);
+    await rm(outfile); // TODO could be cleaner
+});
+test.run();

package/dist/esbuild_plugin_sveltekit_local_imports.js

@@ -23,7 +23,6 @@ export const esbuild_plugin_sveltekit_local_imports = () => ({
         }));
         build.onLoad({ filter: /.*/u, namespace: 'sveltekit_local_imports_js' }, async ({ path }) => ({
             contents: await readFile(path),
-            loader: 'js',
             resolveDir: dirname(path),
         }));
     },

package/dist/esbuild_plugin_sveltekit_shim_app.js

@@ -8,7 +8,6 @@ export const esbuild_plugin_sveltekit_shim_app = ({ dev, base_url, assets_url, }
             namespace: 'sveltekit_shim_app_paths',
         }));
         build.onLoad({ filter: /.*/u, namespace: 'sveltekit_shim_app_paths' }, () => ({
-            loader: 'js',
             contents: render_sveltekit_shim_app_paths(base_url, assets_url),
         }));
         build.onResolve({ filter: /^\$app\/environment$/u }, ({ path }) => ({
@@ -16,7 +15,6 @@ export const esbuild_plugin_sveltekit_shim_app = ({ dev, base_url, assets_url, }
             namespace: 'sveltekit_shim_app_environment',
         }));
         build.onLoad({ filter: /.*/u, namespace: 'sveltekit_shim_app_environment' }, () => ({
-            loader: 'js',
             contents: render_sveltekit_shim_app_environment(dev),
         }));
     },

package/dist/fs.d.ts

@@ -4,4 +4,4 @@ export declare const exists: (path: string) => Promise<boolean>;
 /**
  * Empties a directory with an optional `filter`.
  */
-export declare const empty_dir: (dir: string, filter?: ((path: string) => boolean) | undefined, options?: RmOptions) => Promise<void>;
+export declare const empty_dir: (dir: string, filter?: (path: string) => boolean, options?: RmOptions) => Promise<void>;

package/dist/gro_plugin_server.js

@@ -33,6 +33,10 @@ export const gro_plugin_server = ({ entry_points = [SERVER_SOURCE_ID], dir = cwd
         name: 'gro_plugin_server',
         setup: async ({ dev, watch, timings, log }) => {
             const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_preprocessors, } = await init_sveltekit_config(sveltekit_config ?? dir);
+            // TODO feels hacky
+            if (svelte_compile_options.generate === undefined) {
+                svelte_compile_options.generate = 'server';
+            }
             const { outbase, outdir, outname } = outpaths(dev);
             const server_outpath = join(outdir, outname);
             const timing_to_esbuild_create_context = timings.start('create build context');

package/dist/input_path.d.ts

@@ -33,7 +33,7 @@ export declare const get_possible_source_ids: (input_path: string, extensions: s
  * and stopping at the first match.
  * Parameterized by `exists` and `stat` so it's fs-agnostic.
  */
-export declare const load_source_path_data_by_input_path: (input_paths: string[], get_possible_source_ids_for_input_path?: ((input_path: string) => string[]) | undefined) => Promise<{
+export declare const load_source_path_data_by_input_path: (input_paths: string[], get_possible_source_ids_for_input_path?: (input_path: string) => string[]) => Promise<{
     source_id_path_data_by_input_path: Map<string, Path_Data>;
     unmapped_input_paths: string[];
 }>;

package/dist/loader.js

@@ -1,11 +1,12 @@
 import * as esbuild from 'esbuild';
-import { compile, preprocess } from 'svelte/compiler';
+import { compile, compileModule, preprocess } from 'svelte/compiler';
 import { fileURLToPath, pathToFileURL } from 'node:url';
-import { dirname, join, relative } from 'node:path';
+import { dirname, join } from 'node:path';
 import { escape_regexp } from '@ryanatkn/belt/regexp.js';
 import { render_env_shim_module } from './sveltekit_shim_env.js';
 import { render_sveltekit_shim_app_environment, render_sveltekit_shim_app_paths, sveltekit_shim_app_environment_matcher, sveltekit_shim_app_paths_matcher, sveltekit_shim_app_specifiers, } from './sveltekit_shim_app.js';
 import { init_sveltekit_config } from './sveltekit_config.js';
+import { SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from './svelte_helpers.js';
 import { paths, NODE_MODULES_DIRNAME } from './paths.js';
 import { to_define_import_meta_env, ts_transform_options } from './esbuild_helpers.js';
 import { resolve_specifier } from './resolve_specifier.js';
@@ -27,12 +28,13 @@ node --import 'data:text/javascript,import {register} from "node:module"; import
 TODO how to improve that gnarly import line? was originally designed for the now-deprecated `--loader`
 
 */
+// TODO support `?raw` import variants
 // TODO sourcemaps for svelte and the svelte preprocessors
 // TODO `import.meta.resolve` wasn't available in loaders when this was first implemented, but might be now
 // dev is always true in the loader
 const dev = true;
 const dir = paths.root;
-const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_preprocessors, } = await init_sveltekit_config(dir); // always load it to keep things simple ahead
+const { alias, base_url, assets_url, env_dir, private_prefix, public_prefix, svelte_compile_options, svelte_compile_module_options, svelte_preprocessors, } = await init_sveltekit_config(dir); // always load it to keep things simple ahead
 const final_ts_transform_options = {
     ...ts_transform_options,
     define: to_define_import_meta_env(dev, base_url),
@@ -40,14 +42,14 @@ const final_ts_transform_options = {
 };
 const aliases = Object.entries({ $lib: 'src/lib', ...alias });
 const ts_matcher = /\.(ts|tsx|mts|cts)$/u;
-const svelte_matcher = /\.(svelte)$/u;
 const json_matcher = /\.(json)$/u;
+const noop_matcher = /\.(css|svg)$/u; // TODO others? configurable?
 const env_matcher = /src\/lib\/\$env\/(static|dynamic)\/(public|private)$/u;
 const node_modules_matcher = new RegExp(escape_regexp('/' + NODE_MODULES_DIRNAME + '/'), 'u');
 const package_json_cache = {};
 export const load = async (url, context, nextLoad) => {
     if (sveltekit_shim_app_paths_matcher.test(url)) {
-        // $app/paths shim
+        // SvelteKit `$app/paths` shim
         return {
             format: 'module',
             shortCircuit: true,
@@ -55,13 +57,22 @@ export const load = async (url, context, nextLoad) => {
         };
     }
     else if (sveltekit_shim_app_environment_matcher.test(url)) {
-        // $app/environment shim
+        // SvelteKit `$app/environment` shim
         return {
             format: 'module',
             shortCircuit: true,
             source: render_sveltekit_shim_app_environment(dev),
         };
     }
+    else if (SVELTE_RUNES_MATCHER.test(url)) {
+        // Svelte runes in js/ts
+        // TODO support sourcemaps
+        const loaded = await nextLoad(url, context.format === 'module' ? context : { ...context, format: 'module' });
+        const filename = fileURLToPath(url);
+        const source = loaded.source.toString(); // eslint-disable-line @typescript-eslint/no-base-to-string
+        const transformed = compileModule(source, { ...svelte_compile_module_options, filename });
+        return { format: 'module', shortCircuit: true, source: transformed.js.code };
+    }
     else if (ts_matcher.test(url)) {
         // ts
         const loaded = await nextLoad(url, context.format === 'module' ? context : { ...context, format: 'module' });
@@ -69,18 +80,17 @@ export const load = async (url, context, nextLoad) => {
         { ...final_ts_transform_options, sourcefile: url });
         return { format: 'module', shortCircuit: true, source: transformed.code };
     }
-    else if (svelte_matcher.test(url)) {
-        // svelte
+    else if (SVELTE_MATCHER.test(url)) {
+        // Svelte
         // TODO support sourcemaps
         const loaded = await nextLoad(url, context.format === 'module' ? context : { ...context, format: 'module' });
+        const filename = fileURLToPath(url);
         const raw_source = loaded.source.toString(); // eslint-disable-line @typescript-eslint/no-base-to-string
         const preprocessed = svelte_preprocessors
-            ? await preprocess(raw_source, svelte_preprocessors, {
-                filename: relative(dir, fileURLToPath(url)),
-            })
+            ? await preprocess(raw_source, svelte_preprocessors, { filename })
             : null;
         const source = preprocessed?.code ?? raw_source;
-        const transformed = compile(source, svelte_compile_options);
+        const transformed = compile(source, { ...svelte_compile_options, filename });
         return { format: 'module', shortCircuit: true, source: transformed.js.code };
     }
     else if (json_matcher.test(url)) {
@@ -91,10 +101,15 @@ export const load = async (url, context, nextLoad) => {
         const source = `export default ` + raw_source;
         return { format: 'module', shortCircuit: true, source };
     }
+    else if (noop_matcher.test(url)) {
+        // no-ops like `.css` and `.svg`
+        const source = `export default 'no-op import from ${url}'`;
+        return { format: 'module', shortCircuit: true, source };
+    }
     else {
-        // neither ts nor svelte
         const matched_env = env_matcher.exec(url);
         if (matched_env) {
+            // SvelteKit `$env`
             const mode = matched_env[1];
             const visibility = matched_env[2];
             return {
@@ -104,6 +119,7 @@ export const load = async (url, context, nextLoad) => {
             };
         }
     }
+    // fallback to default behavior
     return nextLoad(url, context);
 };
 export const resolve = async (specifier, context, nextResolve) => {
@@ -138,7 +154,7 @@ export const resolve = async (specifier, context, nextResolve) => {
     // The specifier `path` has now been mapped to its final form, so we can inspect it.
     if (path[0] !== '.' && path[0] !== '/') {
         // Resolve to `node_modules`.
-        if (svelte_matcher.test(path) || json_matcher.test(path)) {
+        if (SVELTE_MATCHER.test(path) || json_matcher.test(path)) {
             // Match the behavior of Vite and esbuild for Svelte and JSON imports.
             // TODO maybe `.ts` too
             const source_id = await resolve_node_specifier(path, dir, parent_url, package_json_cache);

package/dist/loader.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/loader.test.js

@@ -0,0 +1,41 @@
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+import { resolve } from 'node:path';
+test('import js', async () => {
+    const imported = await import(resolve('src/fixtures/modules/some_test_ts.js'));
+    assert.ok(imported);
+    assert.is(imported.a, 'ok');
+});
+test('import ts', async () => {
+    const imported = await import(resolve('src/fixtures/modules/some_test_ts.ts'));
+    assert.ok(imported);
+    assert.is(imported.a, 'ok');
+});
+test('import json', async () => {
+    const imported = await import(resolve('src/fixtures/modules/some_test_json.json'));
+    assert.ok(imported);
+    assert.is(imported.default.a, 'ok');
+});
+test('import css as a no-op', async () => {
+    const imported = await import(resolve('src/fixtures/modules/some_test_css.css'));
+    assert.is(typeof imported.default, 'string');
+    assert.ok(imported);
+});
+test('import svelte', async () => {
+    const imported = await import(resolve('src/fixtures/modules/Some_Test_Svelte.svelte'));
+    assert.ok(imported);
+    assert.is(imported.a, 'ok');
+});
+test('import svelte.js', async () => {
+    const imported = await import(resolve('src/fixtures/modules/some_test_svelte_js.svelte.js'));
+    assert.ok(imported.Some_Test_Svelte_Js);
+    const instance = new imported.Some_Test_Svelte_Js();
+    assert.is(instance.a, 'ok');
+});
+test('import svelte.ts', async () => {
+    const imported = await import(resolve('src/fixtures/modules/some_test_svelte_ts.svelte.ts'));
+    assert.ok(imported.Some_Test_Svelte_Ts);
+    const instance = new imported.Some_Test_Svelte_Ts();
+    assert.is(instance.a, 'ok');
+});
+test.run();

package/dist/modules.d.ts

@@ -20,7 +20,7 @@ export type Load_Module_Failure = {
     mod: Record<string, any>;
     validation: string;
 };
-export declare const load_module: <T extends Record<string, any>>(id: string, validate?: ((mod: Record<string, any>) => mod is T) | undefined) => Promise<Load_Module_Result<Module_Meta<T>>>;
+export declare const load_module: <T extends Record<string, any>>(id: string, validate?: (mod: Record<string, any>) => mod is T) => Promise<Load_Module_Result<Module_Meta<T>>>;
 export type Find_Modules_Result = Result<{
     source_ids_by_input_path: Map<string, string[]>;
     source_id_path_data_by_input_path: Map<string, Path_Data>;
@@ -45,5 +45,5 @@ export type Load_Modules_Result<T_Module_Meta extends Module_Meta> = Result<{
     reasons: string[];
     modules: T_Module_Meta[];
 }>;
-export declare const find_modules: (input_paths: string[], custom_search_fs?: (dir: string, options?: import("./search_fs.js").Search_Fs_Options) => Promise<Map<string, import("./path.js").Path_Stats>>, get_possible_source_ids?: ((input_path: string) => string[]) | undefined, timings?: any) => Promise<Find_Modules_Result>;
-export declare const load_modules: <Module_Type extends Record<string, any>, T_Module_Meta extends Module_Meta<Module_Type>>(source_ids_by_input_path: Map<string, string[]>, load_module_by_id: (source_id: Flavored<string, "Source_Id">) => Promise<Load_Module_Result<T_Module_Meta>>, timings?: any) => Promise<Load_Modules_Result<T_Module_Meta>>;
+export declare const find_modules: (input_paths: string[], custom_search_fs?: (dir: string, options?: import("./search_fs.js").Search_Fs_Options) => Promise<Map<string, import("./path.js").Path_Stats>>, get_possible_source_ids?: (input_path: string) => string[], timings?: any) => Promise<Find_Modules_Result>;
+export declare const load_modules: <Module_Type extends Record<string, any>, T_Module_Meta extends Module_Meta<Module_Type>>(source_ids_by_input_path: Map<string, string[]>, load_module_by_id: (source_id: Source_Id) => Promise<Load_Module_Result<T_Module_Meta>>, timings?: any) => Promise<Load_Modules_Result<T_Module_Meta>>;

package/dist/package.d.ts

@@ -55,6 +55,7 @@ export declare const package_json: {
         '@changesets/types': string;
         '@ryanatkn/eslint-config': string;
         '@ryanatkn/fuz': string;
+        '@ryanatkn/moss': string;
         '@sveltejs/adapter-static': string;
         '@sveltejs/kit': string;
         '@sveltejs/package': string;
@@ -341,6 +342,10 @@ export declare const package_json: {
             default: string;
             types: string;
         };
+        './svelte_helpers.js': {
+            default: string;
+            types: string;
+        };
         './sveltekit_config.js': {
             default: string;
             types: string;
@@ -840,6 +845,13 @@ export declare const src_json: {
                 kind: string;
             }[];
         };
+        './svelte_helpers.js': {
+            path: string;
+            declarations: {
+                name: string;
+                kind: string;
+            }[];
+        };
         './sveltekit_config.js': {
             path: string;
             declarations: {

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.115.3',
+    version: '0.116.0',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -16,7 +16,7 @@ export const package_json = {
     type: 'module',
     engines: { node: '>=20.10' },
     scripts: {
-        build: 'rm -rf .gro dist && svelte-package && chmod +x ./dist/gro.js && npm link -f',
+        build: 'rm -rf .gro dist && svelte-kit sync && svelte-package && chmod +x ./dist/gro.js && npm link -f',
         start: 'gro dev',
         test: 'gro test',
     },
@@ -36,36 +36,37 @@ export const package_json = {
         '@ryanatkn/belt': '^0.20.10',
         chokidar: '^3.6.0',
         dotenv: '^16.4.5',
-        'es-module-lexer': '^1.5.0',
+        'es-module-lexer': '^1.5.3',
         kleur: '^4.1.5',
         mri: '^1.2.0',
         prettier: '^3.2.5',
-        'prettier-plugin-svelte': '^3.2.2',
+        'prettier-plugin-svelte': '^3.2.3',
         'tiny-glob': '^0.2.9',
         'ts-morph': '^22.0.0',
         tslib: '^2.6.2',
-        zod: '^3.22.4',
+        zod: '^3.23.8',
     },
-    peerDependencies: { esbuild: '^0.19', svelte: '*' },
+    peerDependencies: { esbuild: '^0.20', svelte: '^5.0.0-next.0' },
     devDependencies: {
         '@changesets/changelog-git': '^0.2.0',
         '@changesets/types': '^6.0.0',
-        '@ryanatkn/eslint-config': '^0.1.0',
-        '@ryanatkn/fuz': '^0.92.0',
+        '@ryanatkn/eslint-config': '^0.1.2',
+        '@ryanatkn/fuz': '^0.101.2',
+        '@ryanatkn/moss': '^0.3.0',
         '@sveltejs/adapter-static': '^3.0.1',
-        '@sveltejs/kit': '^2.5.4',
-        '@sveltejs/package': '^2.3.0',
-        '@sveltejs/vite-plugin-svelte': '^3.0.2',
+        '@sveltejs/kit': '^2.5.10',
+        '@sveltejs/package': '^2.3.1',
+        '@sveltejs/vite-plugin-svelte': '^3.1.0',
         '@types/fs-extra': '^11.0.4',
-        '@types/node': '^20.11.30',
-        '@typescript-eslint/eslint-plugin': '^7.4.0',
-        '@typescript-eslint/parser': '^7.4.0',
-        esbuild: '^0.19.0',
+        '@types/node': '^20.12.12',
+        '@typescript-eslint/eslint-plugin': '^7.10.0',
+        '@typescript-eslint/parser': '^7.10.0',
+        esbuild: '^0.20.2',
         eslint: '^8.57.0',
-        'eslint-plugin-svelte': '^2.35.1',
-        svelte: '^4.2.12',
-        'svelte-check': '^3.6.8',
-        typescript: '^5.4.3',
+        'eslint-plugin-svelte': '^2.39.0',
+        svelte: '^5.0.0-next.141',
+        'svelte-check': '^3.7.1',
+        typescript: '^5.4.5',
         uvu: '^0.5.6',
     },
     eslintConfig: { root: true, extends: '@ryanatkn', rules: { 'no-console': 1 } },
@@ -189,6 +190,10 @@ export const package_json = {
         './run.task.js': { default: './dist/run.task.js', types: './dist/run.task.d.ts' },
         './search_fs.js': { default: './dist/search_fs.js', types: './dist/search_fs.d.ts' },
         './src_json.js': { default: './dist/src_json.js', types: './dist/src_json.d.ts' },
+        './svelte_helpers.js': {
+            default: './dist/svelte_helpers.js',
+            types: './dist/svelte_helpers.d.ts',
+        },
         './sveltekit_config.js': {
             default: './dist/sveltekit_config.js',
             types: './dist/sveltekit_config.d.ts',
@@ -236,7 +241,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.115.3',
+    version: '0.116.0',
     modules: {
         '.': {
             path: 'index.ts',
@@ -778,6 +783,13 @@ export const src_json = {
                 { name: 'to_src_modules', kind: 'function' },
             ],
         },
+        './svelte_helpers.js': {
+            path: 'svelte_helpers.ts',
+            declarations: [
+                { name: 'SVELTE_MATCHER', kind: 'variable' },
+                { name: 'SVELTE_RUNES_MATCHER', kind: 'variable' },
+            ],
+        },
         './sveltekit_config.js': {
             path: 'sveltekit_config.ts',
             declarations: [

package/dist/publish.task.d.ts

@@ -25,17 +25,17 @@ export declare const Args: z.ZodObject<{
     preserve_changelog: boolean;
     'no-check': boolean;
 }, {
-    branch?: string | undefined;
+    build?: boolean | undefined;
+    install?: boolean | undefined;
     origin?: string | undefined;
+    branch?: string | undefined;
     changelog?: string | undefined;
-    preserve_changelog?: boolean | undefined;
-    dry?: boolean | undefined;
-    check?: boolean | undefined;
-    'no-check'?: boolean | undefined;
-    install?: boolean | undefined;
     'no-install'?: boolean | undefined;
-    build?: boolean | undefined;
+    check?: boolean | undefined;
+    dry?: boolean | undefined;
     'no-build'?: boolean | undefined;
+    preserve_changelog?: boolean | undefined;
+    'no-check'?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/search_fs.test.js

@@ -31,7 +31,11 @@ test__search_fs('basic behavior', async () => {
         'some_test_exports.ts',
         'modules/some_test_ts.ts',
         'modules/Some_Test_Svelte.svelte',
+        'modules/some_test_svelte_ts.svelte.ts',
+        'modules/some_test_svelte_js.svelte.js',
+        'modules/some_test_server.ts',
         'modules/some_test_json.json',
+        'modules/some_test_js.js',
         'modules/some_test_css.css',
         'changelog_example.md',
         'changelog_cache.json',

package/dist/src_json.test.js

@@ -26,26 +26,12 @@ test('to_package_modules', async () => {
         './fixtures/modules/some_test_ts.js': {
             path: 'fixtures/modules/some_test_ts.ts',
             declarations: [
-                {
-                    name: 'some_test_ts',
-                    kind: 'variable',
-                },
-                {
-                    name: 'some_test_fn',
-                    kind: 'function',
-                },
-                {
-                    name: 'Some_Test_Type',
-                    kind: 'type',
-                },
-                {
-                    name: 'Some_Test_Interface',
-                    kind: 'type',
-                },
-                {
-                    name: 'Some_Test_Class',
-                    kind: 'class',
-                },
+                { name: 'a', kind: 'variable' },
+                { name: 'some_test_ts', kind: 'variable' },
+                { name: 'some_test_fn', kind: 'function' },
+                { name: 'Some_Test_Type', kind: 'type' },
+                { name: 'Some_Test_Interface', kind: 'type' },
+                { name: 'Some_Test_Class', kind: 'class' },
             ],
         },
     });

package/dist/svelte_helpers.d.ts

@@ -0,0 +1,2 @@
+export declare const SVELTE_MATCHER: RegExp;
+export declare const SVELTE_RUNES_MATCHER: RegExp;

package/dist/svelte_helpers.js

@@ -0,0 +1,2 @@
+export const SVELTE_MATCHER = /\.svelte$/u;
+export const SVELTE_RUNES_MATCHER = /\.svelte\.(js|ts)$/u; // TODO probably let `.svelte.` appear anywhere - https://github.com/sveltejs/svelte/issues/11536

package/dist/sveltekit_config.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="svelte" />
 import type { Config as SveltekitConfig } from '@sveltejs/kit';
-import type { CompileOptions, PreprocessorGroup } from 'svelte/compiler';
+import type { CompileOptions, PreprocessorGroup, ModuleCompileOptions } from 'svelte/compiler';
 /**
  * Loads a SvelteKit config at `dir`.
  * @returns
@@ -25,7 +25,8 @@ export interface Parsed_Sveltekit_Config {
     env_dir: string | undefined;
     private_prefix: string | undefined;
     public_prefix: string | undefined;
-    svelte_compile_options: CompileOptions | undefined;
+    svelte_compile_options: CompileOptions;
+    svelte_compile_module_options: ModuleCompileOptions;
     svelte_preprocessors: PreprocessorGroup | PreprocessorGroup[] | undefined;
 }
 /**

package/dist/sveltekit_config.js

@@ -32,7 +32,8 @@ export const init_sveltekit_config = async (dir_or_config = cwd()) => {
     const env_dir = kit?.env?.dir;
     const private_prefix = kit?.env?.privatePrefix;
     const public_prefix = kit?.env?.publicPrefix;
-    const svelte_compile_options = sveltekit_config?.compilerOptions;
+    const svelte_compile_options = sveltekit_config?.compilerOptions ?? {};
+    const svelte_compile_module_options = {}; // TODO from `kit`? or subset of `svelte_compile_options`?
     const svelte_preprocessors = sveltekit_config?.preprocess;
     return {
         sveltekit_config,
@@ -46,6 +47,7 @@ export const init_sveltekit_config = async (dir_or_config = cwd()) => {
         private_prefix,
         public_prefix,
         svelte_compile_options,
+        svelte_compile_module_options,
         svelte_preprocessors,
     };
 };

package/dist/sync.task.d.ts

@@ -17,13 +17,13 @@ export declare const Args: z.ZodObject<{
     'no-package_json': boolean;
     'no-sveltekit': boolean;
 }, {
-    sveltekit?: boolean | undefined;
-    'no-sveltekit'?: boolean | undefined;
     package_json?: boolean | undefined;
-    'no-package_json'?: boolean | undefined;
+    sveltekit?: boolean | undefined;
+    install?: boolean | undefined;
     gen?: boolean | undefined;
     'no-gen'?: boolean | undefined;
-    install?: boolean | undefined;
+    'no-package_json'?: boolean | undefined;
+    'no-sveltekit'?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/sync.task.js

@@ -36,7 +36,7 @@ export const task = {
 };
 export const sveltekit_sync = async () => {
     if (!(await find_cli('svelte-kit'))) {
-        return;
+        throw new Task_Error('failed to find svelte-kit CLI - do you need to run `npm i`?');
     }
     const result = await spawn_cli('svelte-kit', ['sync']);
     if (!result?.ok) {

package/dist/test.task.d.ts

@@ -12,9 +12,9 @@ export declare const Args: z.ZodObject<{
     ignore?: string | string[] | undefined;
 }, {
     _?: string[] | undefined;
-    bail?: boolean | undefined;
     cwd?: string | undefined;
     ignore?: string | string[] | undefined;
+    bail?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/upgrade.task.d.ts

@@ -17,10 +17,10 @@ export declare const Args: z.ZodObject<{
 }, {
     _?: string[] | undefined;
     origin?: string | undefined;
-    force?: boolean | undefined;
     pull?: boolean | undefined;
-    'no-pull'?: boolean | undefined;
     dry?: boolean | undefined;
+    force?: boolean | undefined;
+    'no-pull'?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.115.3",
+  "version": "0.116.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "icon": "🌰",
@@ -26,7 +26,7 @@
     "node": ">=20.10"
   },
   "scripts": {
-    "build": "rm -rf .gro dist && svelte-package && chmod +x ./dist/gro.js && npm link -f",
+    "build": "rm -rf .gro dist && svelte-kit sync && svelte-package && chmod +x ./dist/gro.js && npm link -f",
     "start": "gro dev",
     "test": "gro test"
   },
@@ -48,39 +48,40 @@
     "@ryanatkn/belt": "^0.20.10",
     "chokidar": "^3.6.0",
     "dotenv": "^16.4.5",
-    "es-module-lexer": "^1.5.0",
+    "es-module-lexer": "^1.5.3",
     "kleur": "^4.1.5",
     "mri": "^1.2.0",
     "prettier": "^3.2.5",
-    "prettier-plugin-svelte": "^3.2.2",
+    "prettier-plugin-svelte": "^3.2.3",
     "tiny-glob": "^0.2.9",
     "ts-morph": "^22.0.0",
     "tslib": "^2.6.2",
-    "zod": "^3.22.4"
+    "zod": "^3.23.8"
   },
   "peerDependencies": {
-    "esbuild": "^0.19",
-    "svelte": "*"
+    "esbuild": "^0.20",
+    "svelte": "^5.0.0-next.0"
   },
   "devDependencies": {
     "@changesets/changelog-git": "^0.2.0",
     "@changesets/types": "^6.0.0",
-    "@ryanatkn/eslint-config": "^0.1.0",
-    "@ryanatkn/fuz": "^0.92.0",
+    "@ryanatkn/eslint-config": "^0.1.2",
+    "@ryanatkn/fuz": "^0.101.2",
+    "@ryanatkn/moss": "^0.3.0",
     "@sveltejs/adapter-static": "^3.0.1",
-    "@sveltejs/kit": "^2.5.4",
-    "@sveltejs/package": "^2.3.0",
-    "@sveltejs/vite-plugin-svelte": "^3.0.2",
+    "@sveltejs/kit": "^2.5.10",
+    "@sveltejs/package": "^2.3.1",
+    "@sveltejs/vite-plugin-svelte": "^3.1.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.11.30",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
-    "esbuild": "^0.19.0",
+    "@types/node": "^20.12.12",
+    "@typescript-eslint/eslint-plugin": "^7.10.0",
+    "@typescript-eslint/parser": "^7.10.0",
+    "esbuild": "^0.20.2",
     "eslint": "^8.57.0",
-    "eslint-plugin-svelte": "^2.35.1",
-    "svelte": "^4.2.12",
-    "svelte-check": "^3.6.8",
-    "typescript": "^5.4.3",
+    "eslint-plugin-svelte": "^2.39.0",
+    "svelte": "^5.0.0-next.141",
+    "svelte-check": "^3.7.1",
+    "typescript": "^5.4.5",
     "uvu": "^0.5.6"
   },
   "eslintConfig": {
@@ -357,6 +358,10 @@
       "default": "./dist/src_json.js",
       "types": "./dist/src_json.d.ts"
     },
+    "./svelte_helpers.js": {
+      "default": "./dist/svelte_helpers.js",
+      "types": "./dist/svelte_helpers.d.ts"
+    },
     "./sveltekit_config.js": {
       "default": "./dist/sveltekit_config.js",
       "types": "./dist/sveltekit_config.d.ts"