@ryanatkn/gro 0.133.2 → 0.133.3

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from './src_json.js';
 
 export const package_json = {
 	name: '@ryanatkn/gro',
-	version: '0.133.2',
+	version: '0.133.3',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -216,10 +216,6 @@ export const package_json = {
 			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',
@@ -272,7 +268,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.133.2',
+	version: '0.133.3',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -397,7 +393,7 @@ export const src_json = {
 			declarations: [
 				{name: 'print_build_result', kind: 'function'},
 				{name: 'to_define_import_meta_env', kind: 'function'},
-				{name: 'ts_transform_options', kind: 'variable'},
+				{name: 'default_ts_transform_options', kind: 'variable'},
 			],
 		},
 		'./esbuild_plugin_external_worker.js': {
@@ -712,6 +708,9 @@ export const src_json = {
 				{name: 'GITHUB_DIRNAME', kind: 'variable'},
 				{name: 'GIT_DIRNAME', kind: 'variable'},
 				{name: 'TSCONFIG_FILENAME', kind: 'variable'},
+				{name: 'TS_MATCHER', kind: 'variable'},
+				{name: 'JSON_MATCHER', kind: 'variable'},
+				{name: 'EVERYTHING_MATCHER', kind: 'variable'},
 			],
 		},
 		'./path.js': {
@@ -850,16 +849,14 @@ export const src_json = {
 				{name: 'SVELTE_RUNES_MATCHER', kind: 'variable'},
 			],
 		},
-		'./sveltekit_config_global.js': {
-			path: 'sveltekit_config_global.ts',
-			declarations: [{name: 'sveltekit_config_global', kind: 'variable'}],
-		},
 		'./sveltekit_config.js': {
 			path: 'sveltekit_config.ts',
 			declarations: [
 				{name: 'load_sveltekit_config', kind: 'function'},
 				{name: 'Parsed_Sveltekit_Config', kind: 'type'},
 				{name: 'init_sveltekit_config', kind: 'function'},
+				{name: 'to_default_compile_module_options', kind: 'function'},
+				{name: 'default_sveltekit_config', kind: 'variable'},
 			],
 		},
 		'./sveltekit_helpers.js': {
@@ -870,6 +867,7 @@ export const src_json = {
 				{name: 'SVELTE_PACKAGE_CLI', kind: 'variable'},
 				{name: 'SVELTE_PACKAGE_DEP_NAME', kind: 'variable'},
 				{name: 'VITE_CLI', kind: 'variable'},
+				{name: 'SVELTEKIT_ENV_MATCHER', kind: 'variable'},
 				{name: 'has_sveltekit_app', kind: 'function'},
 				{name: 'has_sveltekit_library', kind: 'function'},
 				{name: 'sveltekit_sync', kind: 'function'},

package/src/lib/path_constants.ts

@@ -28,3 +28,7 @@ export const SVELTEKIT_VITE_CACHE_PATH = NODE_MODULES_DIRNAME + '/.vite';
 export const GITHUB_DIRNAME = '.github';
 export const GIT_DIRNAME = '.git';
 export const TSCONFIG_FILENAME = 'tsconfig.json';
+
+export const TS_MATCHER = /\.(ts|tsx|mts|cts)$/;
+export const JSON_MATCHER = /\.(json)$/;
+export const EVERYTHING_MATCHER = /.*/;

package/src/lib/paths.ts

@@ -10,7 +10,7 @@ import {
 	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';
 import type {Path_Id} from './path.js';
 
 /*
@@ -20,10 +20,10 @@ 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 interface Paths {
 	root: string;

package/src/lib/run_gen.ts

@@ -14,7 +14,7 @@ import {
 import {print_path} from './paths.js';
 import type {format_file as base_format_file} from './format_file.js';
 import type {Gro_Config} from './gro_config.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';
 
@@ -37,7 +37,7 @@ export const run_gen = async (
 			// Perform code generation by calling `gen` on the module.
 			const gen_ctx: Gen_Context = {
 				config,
-				sveltekit_config: sveltekit_config_global,
+				sveltekit_config: default_sveltekit_config,
 				origin_id: id,
 				log,
 			};

package/src/lib/run_task.ts

@@ -7,7 +7,7 @@ import type {invoke_task as base_invoke_task} from './invoke_task.js';
 import {log_task_help} from './task_logging.js';
 import type {Gro_Config} from './gro_config.js';
 import {Task_Error, type Task_Module_Meta} from './task.js';
-import {sveltekit_config_global} from './sveltekit_config_global.js';
+import {default_sveltekit_config} from './sveltekit_config.js';
 
 export type Run_Task_Result =
 	| {
@@ -52,7 +52,7 @@ export const run_task = async (
 		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) =>

package/src/lib/sveltekit_config.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';
 import {join} from 'node:path';
 
 import {SVELTEKIT_CONFIG_FILENAME} from './path_constants.js';
@@ -57,7 +57,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;
 }
 
@@ -88,8 +88,13 @@ export const init_sveltekit_config = async (
 	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`?
+	const svelte_compile_options: CompileOptions = sveltekit_config?.compilerOptions ?? {};
+	// 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 {
@@ -108,3 +113,15 @@ export const init_sveltekit_config = async (
 		svelte_preprocessors,
 	};
 };
+
+export const to_default_compile_module_options = ({
+	dev,
+	generate,
+	filename,
+	rootDir,
+}: CompileOptions): ModuleCompileOptions => ({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/src/lib/sveltekit_helpers.ts

@@ -2,8 +2,7 @@ import type {Result} from '@ryanatkn/belt/result.js';
 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 type {Parsed_Sveltekit_Config} from './sveltekit_config.js';
+import {default_sveltekit_config, type Parsed_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, type Cli} from './cli.js';
 import {Task_Error} from './task.js';
@@ -17,6 +16,8 @@ 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 = (): Result<object, {message: string}> => {
 	if (!existsSync(SVELTEKIT_CONFIG_FILENAME)) {
 		return {ok: false, message: `no SvelteKit config found at ${SVELTEKIT_CONFIG_FILENAME}`};
@@ -27,7 +28,7 @@ export const has_sveltekit_app = (): Result<object, {message: string}> => {
 
 export const has_sveltekit_library = (
 	package_json?: Package_Json,
-	sveltekit_config: Parsed_Sveltekit_Config = sveltekit_config_global,
+	sveltekit_config: Parsed_Sveltekit_Config = default_sveltekit_config,
 ): Result<object, {message: string}> => {
 	const has_sveltekit_app_result = has_sveltekit_app();
 	if (!has_sveltekit_app_result.ok) {

package/src/lib/task_logging.ts

@@ -35,7 +35,7 @@ export const log_tasks = (log: Logger, loaded_tasks: Loaded_Tasks, log_intro = t
 		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)),
+				'\n' + cyan(meta.name.padEnd(longest_task_name)),
 				'  ',
 				meta.mod.task.summary ?? '',
 			);
@@ -75,9 +75,9 @@ export const log_task_help = (log: Logger, meta: Task_Module_Meta): void => {
 		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) + ' ',
+				`\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)',
 			);
 		}
@@ -115,8 +115,6 @@ const to_arg_properties = (def: ZodTypeDef, meta: Task_Module_Meta): Arg_Schema_
 	return properties;
 };
 
-// quick n dirty padding logic
-const pad = (s: string, n: number): string => s + ' '.repeat(n - s.length);
 const to_max_length = <T>(items: T[], toString: (item: T) => string) =>
 	items.reduce((max, m) => Math.max(toString(m).length, max), 0);
 

package/dist/sveltekit_config_global.d.ts

@@ -1,5 +0,0 @@
-/**
- * The parsed SvelteKit config for the cwd, cached globally at the module level.
- */
-export declare const sveltekit_config_global: import("./sveltekit_config.js").Parsed_Sveltekit_Config;
-//# sourceMappingURL=sveltekit_config_global.d.ts.map

package/dist/sveltekit_config_global.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"sveltekit_config_global.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_config_global.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,uBAAuB,yDAAgC,CAAC"}

package/dist/sveltekit_config_global.js

@@ -1,5 +0,0 @@
-import { init_sveltekit_config } from './sveltekit_config.js';
-/**
- * The parsed SvelteKit config for the cwd, cached globally at the module level.
- */
-export const sveltekit_config_global = await init_sveltekit_config(); // always load it to keep things simple ahead

package/src/lib/sveltekit_config_global.ts

@@ -1,6 +0,0 @@
-import {init_sveltekit_config} from './sveltekit_config.js';
-
-/**
- * The parsed SvelteKit config for the cwd, cached globally at the module level.
- */
-export const sveltekit_config_global = await init_sveltekit_config(); // always load it to keep things simple ahead