@ryanatkn/gro 0.133.2 → 0.133.3

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"../src/lib/","sources":["paths.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AASvC,eAAO,MAAM,WAAW,QAA6C,CAAC;AACtE,eAAO,MAAM,QAAQ,QAA2B,CAAC;AACjD,eAAO,MAAM,OAAO,QAAiB,CAAC;AACtC,eAAO,MAAM,cAAc,QAAgD,CAAC;AAE5E,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,aAAc,MAAM,KAAG,KAW/C,CAAC;AAEF,eAAO,MAAM,WAAW,OAAQ,OAAO,KAAG,KAA4C,CAAC;AACvF,eAAO,MAAM,SAAS,OAAQ,OAAO,KAAG,OAAwD,CAAC;AAGjG,eAAO,MAAM,YAAY,OAAQ,OAAO,gBAAwB,MACnC,CAAC;AAG9B,eAAO,MAAM,oBAAoB,YAAa,OAAO,gBAA6B,MACtD,CAAC;AAI7B,eAAO,MAAM,oBAAoB,cAAe,MAAM,gBAA+B,OAC3D,CAAC;AAE3B,eAAO,MAAM,UAAU,SAAU,MAAM,gBAA0B,MAMhE,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,iBAAiB,MAAM,KAAG,MAGvE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,OAA8B,CAAC;AAEjD,eAAO,MAAM,eAAe,SAAS,CAAC;AAYtC,eAAO,MAAM,WAAW,SAAsC,CAAC;AAC/D;;GAEG;AACH,eAAO,MAAM,SAAS,OAA2D,CAAC;AAClF,eAAO,MAAM,YAAY,QAAgD,CAAC"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"../src/lib/","sources":["paths.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AASvC,eAAO,MAAM,WAAW,QAA8C,CAAC;AACvE,eAAO,MAAM,QAAQ,QAA2B,CAAC;AACjD,eAAO,MAAM,OAAO,QAAiB,CAAC;AACtC,eAAO,MAAM,cAAc,QAAiD,CAAC;AAE7E,MAAM,WAAW,KAAK;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,aAAc,MAAM,KAAG,KAW/C,CAAC;AAEF,eAAO,MAAM,WAAW,OAAQ,OAAO,KAAG,KAA4C,CAAC;AACvF,eAAO,MAAM,SAAS,OAAQ,OAAO,KAAG,OAAwD,CAAC;AAGjG,eAAO,MAAM,YAAY,OAAQ,OAAO,gBAAwB,MACnC,CAAC;AAG9B,eAAO,MAAM,oBAAoB,YAAa,OAAO,gBAA6B,MACtD,CAAC;AAI7B,eAAO,MAAM,oBAAoB,cAAe,MAAM,gBAA+B,OAC3D,CAAC;AAE3B,eAAO,MAAM,UAAU,SAAU,MAAM,gBAA0B,MAMhE,CAAC;AAEF,eAAO,MAAM,iBAAiB,SAAU,MAAM,iBAAiB,MAAM,KAAG,MAGvE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,OAA8B,CAAC;AAEjD,eAAO,MAAM,eAAe,SAAS,CAAC;AAYtC,eAAO,MAAM,WAAW,SAAsC,CAAC;AAC/D;;GAEG;AACH,eAAO,MAAM,SAAS,OAA2D,CAAC;AAClF,eAAO,MAAM,YAAY,QAAgD,CAAC"}

package/dist/paths.js

@@ -3,17 +3,17 @@ import { fileURLToPath } from 'node:url';
 import { strip_end } from '@ryanatkn/belt/string.js';
 import { gray } from '@ryanatkn/belt/styletext.js';
 import { GRO_CONFIG_PATH, GRO_DEV_DIR, GRO_DIR, SOURCE_DIR, SVELTEKIT_DIST_DIRNAME, } from './path_constants.js';
-import { sveltekit_config_global } from './sveltekit_config_global.js';
+import { default_sveltekit_config } from './sveltekit_config.js';
 /*
 
 A path `id` is an absolute path to the source/.gro/dist directory.
 It's the same name that Rollup uses.
 
 */
-export const LIB_DIRNAME = basename(sveltekit_config_global.lib_path);
+export const LIB_DIRNAME = basename(default_sveltekit_config.lib_path);
 export const LIB_PATH = SOURCE_DIR + LIB_DIRNAME;
 export const LIB_DIR = LIB_PATH + '/';
-export const ROUTES_DIRNAME = basename(sveltekit_config_global.routes_path);
+export const ROUTES_DIRNAME = basename(default_sveltekit_config.routes_path);
 export const create_paths = (root_dir) => {
     // TODO remove reliance on trailing slash towards windows support
     const root = strip_end(root_dir, '/') + '/';

package/dist/run_gen.js

@@ -2,7 +2,7 @@ import { red } from '@ryanatkn/belt/styletext.js';
 import { print_error } from '@ryanatkn/belt/print.js';
 import { to_gen_result, } from './gen.js';
 import { print_path } from './paths.js';
-import { sveltekit_config_global } from './sveltekit_config_global.js';
+import { default_sveltekit_config } from './sveltekit_config.js';
 export const GEN_NO_PROD_MESSAGE = 'gen runs only during development';
 export const run_gen = async (gen_modules, config, log, timings, format_file) => {
     let input_count = 0;
@@ -15,7 +15,7 @@ export const run_gen = async (gen_modules, config, log, timings, format_file) =>
         // Perform code generation by calling `gen` on the module.
         const gen_ctx = {
             config,
-            sveltekit_config: sveltekit_config_global,
+            sveltekit_config: default_sveltekit_config,
             origin_id: id,
             log,
         };

package/dist/run_task.js

@@ -3,7 +3,7 @@ import { print_log_label, System_Logger } from '@ryanatkn/belt/log.js';
 import { parse_args } from './args.js';
 import { log_task_help } from './task_logging.js';
 import { Task_Error } from './task.js';
-import { sveltekit_config_global } from './sveltekit_config_global.js';
+import { default_sveltekit_config } from './sveltekit_config.js';
 export const run_task = async (task_meta, unparsed_args, invoke_task, config, timings) => {
     const { task } = task_meta.mod;
     const log = new System_Logger(print_log_label(task_meta.name));
@@ -27,7 +27,7 @@ export const run_task = async (task_meta, unparsed_args, invoke_task, config, ti
         output = await task.run({
             args,
             config,
-            sveltekit_config: sveltekit_config_global,
+            sveltekit_config: default_sveltekit_config,
             log,
             timings,
             invoke_task: (invoked_task_name, invoked_args, invoked_config) => invoke_task(invoked_task_name, invoked_args, invoked_config ?? config, timings),

package/dist/sveltekit_config.d.ts

@@ -1,5 +1,5 @@
 import type { Config as SveltekitConfig } from '@sveltejs/kit';
-import type { CompileOptions, PreprocessorGroup, ModuleCompileOptions } from 'svelte/compiler';
+import type { CompileOptions, ModuleCompileOptions, PreprocessorGroup } from 'svelte/compiler';
 /**
  * Loads a SvelteKit config at `dir`.
  * @returns `null` if no config is found
@@ -34,7 +34,7 @@ export interface Parsed_Sveltekit_Config {
     private_prefix: string | undefined;
     public_prefix: string | undefined;
     svelte_compile_options: CompileOptions;
-    svelte_compile_module_options: ModuleCompileOptions;
+    svelte_compile_module_options: CompileOptions;
     svelte_preprocessors: PreprocessorGroup | PreprocessorGroup[] | undefined;
 }
 /**
@@ -43,4 +43,9 @@ export interface Parsed_Sveltekit_Config {
  * Needed because SvelteKit doesn't expose its config resolver.
  */
 export declare const init_sveltekit_config: (dir_or_config?: string | SveltekitConfig) => Promise<Parsed_Sveltekit_Config>;
+export declare const to_default_compile_module_options: ({ dev, generate, filename, rootDir, }: CompileOptions) => ModuleCompileOptions;
+/**
+ * The parsed SvelteKit config for the cwd, cached globally at the module level.
+ */
+export declare const default_sveltekit_config: Parsed_Sveltekit_Config;
 //# sourceMappingURL=sveltekit_config.d.ts.map

package/dist/sveltekit_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sveltekit_config.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,eAAe,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,iBAAiB,CAAC;AAW7F;;;GAGG;AACH,eAAO,MAAM,qBAAqB,SAC5B,MAAM,KACT,OAAO,CAAC,eAAe,GAAG,IAAI,CAMhC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,uBAAuB;IAEvC,gBAAgB,EAAE,eAAe,GAAG,IAAI,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAC1C,QAAQ,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,UAAU,EAAE,EAAE,GAAG,UAAU,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,GAAG,SAAS,CAAC;IAGtE;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,sBAAsB,EAAE,cAAc,CAAC;IACvC,6BAA6B,EAAE,oBAAoB,CAAC;IACpD,oBAAoB,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC;CAC1E;AAGD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,mBAClB,MAAM,GAAG,eAAe,KACrC,OAAO,CAAC,uBAAuB,CAsCjC,CAAC"}
+{"version":3,"file":"sveltekit_config.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,IAAI,eAAe,EAAC,MAAM,eAAe,CAAC;AAC7D,OAAO,KAAK,EAAC,cAAc,EAAE,oBAAoB,EAAE,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAW7F;;;GAGG;AACH,eAAO,MAAM,qBAAqB,SAC5B,MAAM,KACT,OAAO,CAAC,eAAe,GAAG,IAAI,CAMhC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,WAAW,uBAAuB;IAEvC,gBAAgB,EAAE,eAAe,GAAG,IAAI,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;IAC1C,QAAQ,EAAE,EAAE,GAAG,IAAI,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,UAAU,EAAE,EAAE,GAAG,UAAU,MAAM,EAAE,GAAG,WAAW,MAAM,EAAE,GAAG,SAAS,CAAC;IAGtE;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,WAAW,EAAE,MAAM,CAAC;IAEpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,sBAAsB,EAAE,cAAc,CAAC;IACvC,6BAA6B,EAAE,cAAc,CAAC;IAC9C,oBAAoB,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAAG,SAAS,CAAC;CAC1E;AAGD;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,mBAClB,MAAM,GAAG,eAAe,KACrC,OAAO,CAAC,uBAAuB,CA2CjC,CAAC;AAEF,eAAO,MAAM,iCAAiC,0CAK3C,cAAc,KAAG,oBAA4D,CAAC;AAEjF;;GAEG;AACH,eAAO,MAAM,wBAAwB,yBAAgC,CAAC"}

package/dist/sveltekit_config.js

@@ -37,7 +37,12 @@ export const init_sveltekit_config = async (dir_or_config = process.cwd()) => {
     const private_prefix = kit?.env?.privatePrefix;
     const public_prefix = kit?.env?.publicPrefix;
     const svelte_compile_options = sveltekit_config?.compilerOptions ?? {};
-    const svelte_compile_module_options = {}; // TODO from `kit`? or subset of `svelte_compile_options`?
+    // Change the default to `generate: 'server'`,
+    // because SvelteKit handles the client in the normal cases.
+    if (svelte_compile_options.generate === undefined) {
+        svelte_compile_options.generate = 'server';
+    }
+    const svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options); // TODO will kit have these separately?
     const svelte_preprocessors = sveltekit_config?.preprocess;
     return {
         sveltekit_config,
@@ -55,3 +60,8 @@ export const init_sveltekit_config = async (dir_or_config = process.cwd()) => {
         svelte_preprocessors,
     };
 };
+export const to_default_compile_module_options = ({ dev, generate, filename, rootDir, }) => ({ dev, generate, filename, rootDir });
+/**
+ * The parsed SvelteKit config for the cwd, cached globally at the module level.
+ */
+export const default_sveltekit_config = await init_sveltekit_config(); // always load it to keep things simple ahead

package/dist/sveltekit_helpers.d.ts

@@ -1,12 +1,13 @@
 import type { Result } from '@ryanatkn/belt/result.js';
 import { Package_Json } from './package_json.js';
-import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
+import { type Parsed_Sveltekit_Config } from './sveltekit_config.js';
 import { type Cli } from './cli.js';
 export declare const SVELTEKIT_CLI = "svelte-kit";
 export declare const SVELTE_CHECK_CLI = "svelte-check";
 export declare const SVELTE_PACKAGE_CLI = "svelte-package";
 export declare const SVELTE_PACKAGE_DEP_NAME = "@sveltejs/package";
 export declare const VITE_CLI = "vite";
+export declare const SVELTEKIT_ENV_MATCHER: RegExp;
 export declare const has_sveltekit_app: () => Result<object, {
     message: string;
 }>;

package/dist/sveltekit_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAGrD,OAAO,EAAC,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AAElE,OAAO,KAAK,EAAC,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAEnE,OAAO,EAAmC,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAGpE,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBAClB,YAAY,qBACT,uBAAuB,KACvC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAqBlC,CAAC;AAEF,eAAO,MAAM,cAAc,mBACX,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CASd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,mBAC/B,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACtC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB"}
+{"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAGrD,OAAO,EAAC,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAA2B,KAAK,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAmC,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAGpE,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AAEnF,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBAClB,YAAY,qBACT,uBAAuB,KACvC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAqBlC,CAAC;AAEF,eAAO,MAAM,cAAc,mBACX,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CASd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,mBAC/B,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACtC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB"}

package/dist/sveltekit_helpers.js

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs';
 import { Package_Json, load_package_json } from './package_json.js';
-import { sveltekit_config_global } from './sveltekit_config_global.js';
+import { default_sveltekit_config } from './sveltekit_config.js';
 import { SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME } from './path_constants.js';
 import { find_cli, spawn_cli, to_cli_name } from './cli.js';
 import { Task_Error } from './task.js';
@@ -9,6 +9,7 @@ export const SVELTE_CHECK_CLI = 'svelte-check';
 export const SVELTE_PACKAGE_CLI = 'svelte-package';
 export const SVELTE_PACKAGE_DEP_NAME = '@sveltejs/package';
 export const VITE_CLI = 'vite';
+export const SVELTEKIT_ENV_MATCHER = /^\$env\/(static|dynamic)\/(public|private)$/;
 export const has_sveltekit_app = () => {
     if (!existsSync(SVELTEKIT_CONFIG_FILENAME)) {
         return { ok: false, message: `no SvelteKit config found at ${SVELTEKIT_CONFIG_FILENAME}` };
@@ -16,7 +17,7 @@ export const has_sveltekit_app = () => {
     // TODO check for routes?
     return { ok: true };
 };
-export const has_sveltekit_library = (package_json, sveltekit_config = sveltekit_config_global) => {
+export const has_sveltekit_library = (package_json, sveltekit_config = default_sveltekit_config) => {
     const has_sveltekit_app_result = has_sveltekit_app();
     if (!has_sveltekit_app_result.ok) {
         return has_sveltekit_app_result;

package/dist/task_logging.js

@@ -20,7 +20,7 @@ export const log_tasks = (log, loaded_tasks, log_intro = true) => {
         const longest_task_name = to_max_length(modules, (m) => m.name);
         for (const resolved_input_file of resolved_input_files) {
             const meta = modules.find((m) => m.id === resolved_input_file.id);
-            logged.push('\n' + cyan(pad(meta.name, longest_task_name)), '  ', meta.mod.task.summary ?? '');
+            logged.push('\n' + cyan(meta.name.padEnd(longest_task_name)), '  ', meta.mod.task.summary ?? '');
         }
     }
     log[log_intro ? 'info' : 'plain'](logged.join('') + '\n');
@@ -43,7 +43,7 @@ export const log_task_help = (log, meta) => {
         const longest_default = to_max_length(properties, (p) => print_value(p.schema.default));
         for (const property of properties) {
             const name = property.name === '_' ? ARGS_PROPERTY_NAME : property.name;
-            logged.push(`\n${green(pad(name, longest_task_name))} `, gray(pad(property.schema.type, longest_type)) + ' ', pad(print_value(property.schema.default), longest_default) + ' ', property.schema.description || '(no description available)');
+            logged.push(`\n${green(name.padEnd(longest_task_name))} `, gray(property.schema.type.padEnd(longest_type)) + ' ', print_value(property.schema.default).padEnd(longest_default) + ' ', property.schema.description || '(no description available)');
         }
         if (!properties.length) {
             logged.push('\n' + gray('this task has no args'));
@@ -71,8 +71,6 @@ const to_arg_properties = (def, meta) => {
     }
     return properties;
 };
-// quick n dirty padding logic
-const pad = (s, n) => s + ' '.repeat(n - s.length);
 const to_max_length = (items, toString) => items.reduce((max, m) => Math.max(toString(m).length, max), 0);
 // The following Zod helpers only need to support single-depth schemas for CLI args,
 // but there's generic recursion to handle things like `ZodOptional` and `ZodDefault`.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.133.2",
+  "version": "0.133.3",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -378,10 +378,6 @@
       "types": "./dist/svelte_helpers.d.ts",
       "default": "./dist/svelte_helpers.js"
     },
-    "./sveltekit_config_global.js": {
-      "types": "./dist/sveltekit_config_global.d.ts",
-      "default": "./dist/sveltekit_config_global.js"
-    },
     "./sveltekit_config.js": {
       "types": "./dist/sveltekit_config.d.ts",
       "default": "./dist/sveltekit_config.js"

package/src/lib/build.task.ts

@@ -6,6 +6,8 @@ import {clean_fs} from './clean_fs.js';
 
 export const Args = z
 	.object({
+		sync: z.boolean({description: 'dual of no-sync'}).default(true),
+		'no-sync': z.boolean({description: 'opt out of gro sync'}).default(false),
 		install: z.boolean({description: 'dual of no-install'}).default(true),
 		'no-install': z // convenience, same as `gro build -- gro sync --no-install` but the latter takes precedence
 			.boolean({description: 'opt out of `npm install` before building'})
@@ -19,10 +21,11 @@ export const task: Task<Args> = {
 	Args,
 	run: async (ctx): Promise<void> => {
 		const {args, invoke_task} = ctx;
-		const {install} = args;
+		const {sync, install} = args;
 
-		// By default `gro build` installs, opposite of `gro sync`, so that arg needs special handling.
-		await invoke_task('sync', {install});
+		if (sync) {
+			await invoke_task('sync', {install});
+		}
 
 		// TODO possibly detect if the git workspace is clean, and ask for confirmation if not,
 		// because we're not doing things like `gro gen` here because that's a dev/CI concern

package/src/lib/esbuild_helpers.ts

@@ -41,7 +41,7 @@ export const to_define_import_meta_env = (
 	[import_meta_env + 'BASE_URL']: JSON.stringify(base_url || '/'), // eslint-disable-line @typescript-eslint/prefer-nullish-coalescing
 });
 
-export const ts_transform_options: esbuild.TransformOptions = {
+export const default_ts_transform_options: esbuild.TransformOptions = {
 	target: 'esnext',
 	format: 'esm',
 	loader: 'ts',

package/src/lib/esbuild_plugin_external_worker.ts

@@ -1,7 +1,7 @@
 import * as esbuild from 'esbuild';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import {basename} from 'node:path';
-import type {CompileOptions, PreprocessorGroup, ModuleCompileOptions} from 'svelte/compiler';
+import type {CompileOptions, ModuleCompileOptions, PreprocessorGroup} from 'svelte/compiler';
 
 import {print_build_result, to_define_import_meta_env} from './esbuild_helpers.js';
 import {resolve_specifier} from './resolve_specifier.js';
@@ -36,8 +36,8 @@ export const esbuild_plugin_external_worker = ({
 	build_options,
 	dir = process.cwd(),
 	svelte_compile_options,
-	svelte_preprocessors,
 	svelte_compile_module_options,
+	svelte_preprocessors,
 	alias,
 	base_url,
 	assets_url,
@@ -67,6 +67,8 @@ export const esbuild_plugin_external_worker = ({
 					}),
 					esbuild_plugin_sveltekit_shim_alias({dir, alias}),
 					esbuild_plugin_svelte({
+						dev,
+						base_url,
 						dir,
 						svelte_compile_options,
 						svelte_compile_module_options,

package/src/lib/esbuild_plugin_svelte.ts

@@ -1,4 +1,4 @@
-import type * as esbuild from 'esbuild';
+import * as esbuild from 'esbuild';
 import {
 	compile,
 	compileModule,
@@ -11,21 +11,43 @@ import {readFile} from 'node:fs/promises';
 import {relative} from 'node:path';
 
 import {SVELTE_MATCHER, SVELTE_RUNES_MATCHER} from './svelte_helpers.js';
+import {to_define_import_meta_env, default_ts_transform_options} from './esbuild_helpers.js';
+import {
+	default_sveltekit_config,
+	to_default_compile_module_options,
+	type Parsed_Sveltekit_Config,
+} from './sveltekit_config.js';
+import {TS_MATCHER} from './path_constants.js';
 
 export interface Options {
+	dev: boolean;
+	base_url: Parsed_Sveltekit_Config['base_url'];
 	dir?: string;
 	svelte_compile_options?: CompileOptions;
 	svelte_compile_module_options?: ModuleCompileOptions;
 	svelte_preprocessors?: PreprocessorGroup | PreprocessorGroup[];
+	ts_transform_options?: esbuild.TransformOptions;
+	is_ts?: (filename: string) => boolean;
 }
 
-export const esbuild_plugin_svelte = (options: Options = {}): esbuild.Plugin => {
+export const esbuild_plugin_svelte = (options: Options): esbuild.Plugin => {
 	const {
+		dev,
+		base_url,
 		dir = process.cwd(),
-		svelte_compile_options = {},
-		svelte_compile_module_options = {},
+		svelte_compile_options = default_sveltekit_config.svelte_compile_options,
+		svelte_compile_module_options = to_default_compile_module_options(svelte_compile_options),
 		svelte_preprocessors,
+		ts_transform_options = default_ts_transform_options,
+		is_ts = (f) => TS_MATCHER.test(f),
 	} = options;
+
+	const final_ts_transform_options: esbuild.TransformOptions = {
+		...ts_transform_options,
+		define: to_define_import_meta_env(dev, base_url),
+		sourcemap: 'inline',
+	};
+
 	return {
 		name: 'svelte',
 		setup: (build) => {
@@ -33,9 +55,17 @@ export const esbuild_plugin_svelte = (options: Options = {}): esbuild.Plugin =>
 				const source = await readFile(path, 'utf8');
 				try {
 					const filename = relative(dir, path);
-					const {js, warnings} = compileModule(source, {
-						filename,
+					const js_source = is_ts(filename)
+						? (
+								await esbuild.transform(source, {
+									...final_ts_transform_options,
+									sourcefile: filename,
+								})
+							).code // TODO @many use warnings? handle not-inline sourcemaps?
+						: source;
+					const {js, warnings} = compileModule(js_source, {
 						...svelte_compile_module_options,
+						filename,
 					});
 					const contents = js.code + '//# sourceMappingURL=' + js.map.toUrl();
 					return {
@@ -46,6 +76,7 @@ export const esbuild_plugin_svelte = (options: Options = {}): esbuild.Plugin =>
 					return {errors: [convert_svelte_message_to_esbuild(path, source, err)]};
 				}
 			});
+
 			build.onLoad({filter: SVELTE_MATCHER}, async ({path}) => {
 				let source = await readFile(path, 'utf8');
 				try {
@@ -53,12 +84,8 @@ export const esbuild_plugin_svelte = (options: Options = {}): esbuild.Plugin =>
 					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 {js, warnings} = compile(source, {...svelte_compile_options, filename});
 					const contents = js.code + '//# sourceMappingURL=' + js.map.toUrl();
 					return {
 						contents,

package/src/lib/esbuild_plugin_sveltekit_local_imports.ts

@@ -3,6 +3,7 @@ import {readFile} from 'node:fs/promises';
 import {dirname} from 'node:path';
 
 import {resolve_specifier} from './resolve_specifier.js';
+import {EVERYTHING_MATCHER} from './path_constants.js';
 
 /**
  * Adds support for imports to both `.ts` and `.js`,
@@ -18,14 +19,20 @@ export const esbuild_plugin_sveltekit_local_imports = (): esbuild.Plugin => ({
 			const {path_id, namespace} = resolve_specifier(path, dirname(importer));
 			return {path: path_id, namespace}; // `namespace` may be `undefined`, but esbuild needs the absolute path for json etc
 		});
-		build.onLoad({filter: /.*/, namespace: 'sveltekit_local_imports_ts'}, async ({path}) => ({
-			contents: await readFile(path),
-			loader: 'ts',
-			resolveDir: dirname(path),
-		}));
-		build.onLoad({filter: /.*/, namespace: 'sveltekit_local_imports_js'}, async ({path}) => ({
-			contents: await readFile(path),
-			resolveDir: dirname(path),
-		}));
+		build.onLoad(
+			{filter: EVERYTHING_MATCHER, namespace: 'sveltekit_local_imports_ts'},
+			async ({path}) => ({
+				contents: await readFile(path),
+				loader: 'ts',
+				resolveDir: dirname(path),
+			}),
+		);
+		build.onLoad(
+			{filter: EVERYTHING_MATCHER, namespace: 'sveltekit_local_imports_js'},
+			async ({path}) => ({
+				contents: await readFile(path),
+				resolveDir: dirname(path),
+			}),
+		);
 	},
 });

package/src/lib/esbuild_plugin_sveltekit_shim_app.ts

@@ -6,6 +6,7 @@ import {
 	sveltekit_shim_app_specifiers,
 } from './sveltekit_shim_app.js';
 import type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import {EVERYTHING_MATCHER} from './path_constants.js';
 
 export interface Options {
 	dev: boolean;
@@ -27,14 +28,14 @@ export const esbuild_plugin_sveltekit_shim_app = ({
 			path: sveltekit_shim_app_specifiers.get(path)!,
 			namespace: 'sveltekit_shim_app_paths',
 		}));
-		build.onLoad({filter: /.*/, namespace: 'sveltekit_shim_app_paths'}, () => ({
+		build.onLoad({filter: EVERYTHING_MATCHER, namespace: 'sveltekit_shim_app_paths'}, () => ({
 			contents: render_sveltekit_shim_app_paths(base_url, assets_url),
 		}));
 		build.onResolve({filter: /^\$app\/environment$/}, ({path}) => ({
 			path: sveltekit_shim_app_specifiers.get(path)!,
 			namespace: 'sveltekit_shim_app_environment',
 		}));
-		build.onLoad({filter: /.*/, namespace: 'sveltekit_shim_app_environment'}, () => ({
+		build.onLoad({filter: EVERYTHING_MATCHER, namespace: 'sveltekit_shim_app_environment'}, () => ({
 			contents: render_sveltekit_shim_app_environment(dev),
 		}));
 	},

package/src/lib/esbuild_plugin_sveltekit_shim_env.ts

@@ -1,6 +1,8 @@
 import type * as esbuild from 'esbuild';
 
 import {render_env_shim_module} from './sveltekit_shim_env.js';
+import {EVERYTHING_MATCHER} from './path_constants.js';
+import {SVELTEKIT_ENV_MATCHER} from './sveltekit_helpers.js';
 
 export interface Options {
 	dev: boolean;
@@ -11,6 +13,8 @@ export interface Options {
 	ambient_env?: Record<string, string>;
 }
 
+const namespace = 'sveltekit_shim_env';
+
 export const esbuild_plugin_sveltekit_shim_env = ({
 	dev,
 	public_prefix,
@@ -21,11 +25,9 @@ export const esbuild_plugin_sveltekit_shim_env = ({
 }: Options): esbuild.Plugin => ({
 	name: 'sveltekit_shim_env',
 	setup: (build) => {
-		const namespace = 'sveltekit_shim_env';
-		const filter = /^\$env\/(static|dynamic)\/(public|private)$/;
-		build.onResolve({filter}, ({path}) => ({path, namespace}));
-		build.onLoad({filter: /.*/, namespace}, ({path}) => {
-			const matches = filter.exec(path);
+		build.onResolve({filter: SVELTEKIT_ENV_MATCHER}, ({path}) => ({path, namespace}));
+		build.onLoad({filter: EVERYTHING_MATCHER, namespace}, ({path}) => {
+			const matches = SVELTEKIT_ENV_MATCHER.exec(path);
 			const mode = matches![1] as 'static' | 'dynamic';
 			const visibility = matches![2] as 'public' | 'private';
 			return {

package/src/lib/gro_plugin_server.ts

@@ -12,7 +12,7 @@ import {base_path_to_path_id, LIB_DIRNAME, paths} from './paths.js';
 import type {Path_Id} from './path.js';
 import {GRO_DEV_DIRNAME, SERVER_DIST_PATH} from './path_constants.js';
 import {watch_dir, type Watch_Node_Fs} from './watch_dir.js';
-import {init_sveltekit_config} from './sveltekit_config.js';
+import {init_sveltekit_config, default_sveltekit_config} from './sveltekit_config.js';
 import {esbuild_plugin_sveltekit_shim_app} from './esbuild_plugin_sveltekit_shim_app.js';
 import {esbuild_plugin_sveltekit_shim_env} from './esbuild_plugin_sveltekit_shim_env.js';
 import {print_build_result, to_define_import_meta_env} from './esbuild_helpers.js';
@@ -21,7 +21,6 @@ import {esbuild_plugin_external_worker} from './esbuild_plugin_external_worker.j
 import {esbuild_plugin_sveltekit_local_imports} from './esbuild_plugin_sveltekit_local_imports.js';
 import {esbuild_plugin_svelte} from './esbuild_plugin_svelte.js';
 import {throttle} from './throttle.js';
-import {sveltekit_config_global} from './sveltekit_config_global.js';
 
 // TODO sourcemap as a hoisted option? disable for production by default - or like `outpaths`, passed a `dev` param
 
@@ -133,7 +132,7 @@ export const gro_plugin_server = ({
 		setup: async ({dev, watch, timings, log}) => {
 			const parsed_sveltekit_config =
 				!sveltekit_config && strip_end(dir, '/') === process.cwd()
-					? sveltekit_config_global
+					? default_sveltekit_config
 					: await init_sveltekit_config(sveltekit_config ?? dir);
 			const {
 				alias,
@@ -147,14 +146,6 @@ export const gro_plugin_server = ({
 				svelte_preprocessors,
 			} = parsed_sveltekit_config;
 
-			// TODO hacky
-			if (svelte_compile_options.generate === undefined) {
-				svelte_compile_options.generate = 'server';
-			}
-			if (svelte_compile_module_options.generate === undefined) {
-				svelte_compile_module_options.generate = 'server';
-			}
-
 			const {outbase, outdir, outname} = outpaths(dev);
 
 			const server_outpath = join(outdir, outname);
@@ -202,6 +193,8 @@ export const gro_plugin_server = ({
 						log,
 					}),
 					esbuild_plugin_svelte({
+						dev,
+						base_url,
 						dir,
 						svelte_compile_options,
 						svelte_compile_module_options,

package/src/lib/gro_plugin_sveltekit_app.ts

@@ -9,7 +9,7 @@ import {Task_Error} from './task.js';
 import {find_cli, spawn_cli, spawn_cli_process} from './cli.js';
 import {type Map_Src_Json, serialize_src_json, create_src_json} from './src_json.js';
 import {DEFAULT_EXPORTS_EXCLUDER} from './gro_config.js';
-import {sveltekit_config_global} from './sveltekit_config_global.js';
+import {default_sveltekit_config} from './sveltekit_config.js';
 import {SOURCE_DIRNAME} from './path_constants.js';
 import {VITE_CLI} from './sveltekit_helpers.js';
 
@@ -106,7 +106,7 @@ export const gro_plugin_sveltekit_app = ({
 
 				// copy files to `static` before building, in such a way
 				// that's non-destructive to existing files and dirs and easy to clean up
-				const {assets_path} = sveltekit_config_global;
+				const {assets_path} = default_sveltekit_config;
 				const cleanups: Cleanup[] = [
 					serialized_package_json
 						? create_temporarily(

package/src/lib/loader.ts

@@ -13,11 +13,11 @@ import {
 	SVELTEKIT_SHIM_APP_PATHS_MATCHER,
 	sveltekit_shim_app_specifiers,
 } from './sveltekit_shim_app.js';
-import {sveltekit_config_global} from './sveltekit_config_global.js';
+import {default_sveltekit_config} from './sveltekit_config.js';
 import {SVELTE_MATCHER, SVELTE_RUNES_MATCHER} from './svelte_helpers.js';
 import {paths} from './paths.js';
-import {NODE_MODULES_DIRNAME} from './path_constants.js';
-import {to_define_import_meta_env, ts_transform_options} from './esbuild_helpers.js';
+import {JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER} from './path_constants.js';
+import {to_define_import_meta_env, default_ts_transform_options} from './esbuild_helpers.js';
 import {resolve_specifier} from './resolve_specifier.js';
 import {resolve_node_specifier} from './resolve_node_specifier.js';
 import type {Package_Json} from './package_json.js';
@@ -65,18 +65,16 @@ const {
 	svelte_compile_options,
 	svelte_compile_module_options,
 	svelte_preprocessors,
-} = sveltekit_config_global;
+} = default_sveltekit_config;
 
-const final_ts_transform_options: esbuild.TransformOptions = {
-	...ts_transform_options,
+const ts_transform_options: esbuild.TransformOptions = {
+	...default_ts_transform_options,
 	define: to_define_import_meta_env(dev, base_url),
 	sourcemap: 'inline',
 };
 
 const aliases = Object.entries({$lib: 'src/lib', ...alias});
 
-const TS_MATCHER = /\.(ts|tsx|mts|cts)$/;
-const JSON_MATCHER = /\.(json)$/;
 const NOOP_MATCHER = /\.(css|svg)$/; // TODO others? configurable?
 const ENV_MATCHER = /src\/lib\/\$env\/(static|dynamic)\/(public|private)$/;
 const NODE_MODULES_MATCHER = new RegExp(escape_regexp('/' + NODE_MODULES_DIRNAME + '/'), 'u');
@@ -100,14 +98,16 @@ export const load: LoadHook = async (url, context, nextLoad) => {
 		};
 	} 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'}, // TODO dunno why this is needed, specifically with tests
 		);
 		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});
+		const js_source = TS_MATCHER.test(url)
+			? (await esbuild.transform(source, {...ts_transform_options, sourcefile: url})).code // TODO @many use warnings? handle not-inline sourcemaps?
+			: source;
+		const transformed = compileModule(js_source, {...svelte_compile_module_options, dev, filename});
 		return {format: 'module', shortCircuit: true, source: transformed.js.code};
 	} else if (TS_MATCHER.test(url)) {
 		// ts
@@ -115,10 +115,8 @@ export const load: LoadHook = async (url, context, nextLoad) => {
 			url,
 			context.format === 'module' ? context : {...context, format: 'module'}, // TODO dunno why this is needed, specifically with tests
 		);
-		const transformed = await esbuild.transform(
-			loaded.source!.toString(), // eslint-disable-line @typescript-eslint/no-base-to-string
-			{...final_ts_transform_options, sourcefile: url},
-		);
+		const source = loaded.source!.toString(); // eslint-disable-line @typescript-eslint/no-base-to-string
+		const transformed = await esbuild.transform(source, {...ts_transform_options, sourcefile: url}); // TODO @many use warnings? handle not-inline sourcemaps?
 		return {format: 'module', shortCircuit: true, source: transformed.code};
 	} else if (SVELTE_MATCHER.test(url)) {
 		// Svelte
@@ -129,11 +127,11 @@ export const load: LoadHook = async (url, context, nextLoad) => {
 		);
 		const filename = fileURLToPath(url);
 		const raw_source = loaded.source!.toString(); // eslint-disable-line @typescript-eslint/no-base-to-string
-		const preprocessed = svelte_preprocessors
+		const preprocessed = svelte_preprocessors // TODO @many use sourcemaps (and diagnostics?)
 			? await preprocess(raw_source, svelte_preprocessors, {filename})
 			: null;
 		const source = preprocessed?.code ?? raw_source;
-		const transformed = compile(source, {...svelte_compile_options, filename});
+		const transformed = compile(source, {...svelte_compile_options, dev, filename});
 		return {format: 'module', shortCircuit: true, source: transformed.js.code};
 	} else if (JSON_MATCHER.test(url)) {
 		// json