@ryanatkn/gro 0.182.0 → 0.183.0

package/dist/test.task.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { spawn_cli } from './cli.js';
 import { TaskError } from "./task.js";
 import { find_cli } from "./cli.js";
-import { has_dep, load_package_json } from "./package_json.js";
+import { package_json_has_dependency, package_json_load } from "./package_json.js";
 import { serialize_args, to_implicit_forwarded_args } from "./args.js";
 import { VITEST_CLI } from "./constants.js";
 import { paths } from "./paths.js";
@@ -25,8 +25,8 @@ export const task = {
     Args,
     run: async ({ args }) => {
         const { _: patterns, dir, fail_without_tests, t } = args;
-        const package_json = await load_package_json();
-        if (!has_dep(VITEST_CLI, package_json)) {
+        const package_json = await package_json_load();
+        if (!package_json_has_dependency(VITEST_CLI, package_json)) {
             throw new TaskError('no test runner found, install vitest');
         }
         if (!(await find_cli(VITEST_CLI))) {

package/dist/upgrade.task.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAItB,OAAO,EAAY,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAM/C,cAAc;AACd,eAAO,MAAM,IAAI;;;;;;;;;;;;kBAiCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA4E3B,CAAC"}
+{"version":3,"file":"upgrade.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/upgrade.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAItB,OAAO,EAAY,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAU/C,cAAc;AACd,eAAO,MAAM,IAAI;;;;;;;;;;;;kBAiCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,cAAc;AACd,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA4E3B,CAAC"}

package/dist/upgrade.task.js

@@ -3,7 +3,7 @@ import { z } from 'zod';
 import { rm } from 'node:fs/promises';
 import { GitOrigin, git_pull } from '@fuzdev/fuz_util/git.js';
 import { TaskError } from "./task.js";
-import { extract_deps, load_package_json } from "./package_json.js";
+import { package_json_extract_dependencies, package_json_load, } from "./package_json.js";
 import { spawn_cli } from "./cli.js";
 import { serialize_args, to_forwarded_args } from "./args.js";
 import { NODE_MODULES_DIRNAME } from "./constants.js";
@@ -63,8 +63,8 @@ export const task = {
             log.info(`deleting lockfile at`, lockfile_path);
             await rm(lockfile_path, { force: true });
         }
-        const package_json = await load_package_json();
-        const all_deps = extract_deps(package_json);
+        const package_json = await package_json_load();
+        const all_deps = package_json_extract_dependencies(package_json);
         const deps = only.length
             ? all_deps.filter((d) => only.includes(d.name))
             : all_deps.filter((d) => !_.includes(d.name));

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.182.0",
+  "version": "0.183.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
   "logo": "logo.svg",
   "logo_alt": "a pixelated green oak acorn with a glint of sun",
-  "public": true,
   "license": "MIT",
   "homepage": "https://gro.ryanatkn.com/",
   "author": {
@@ -84,8 +83,8 @@
     "@changesets/types": "^6.1.0",
     "@fuzdev/fuz_code": "^0.38.0",
     "@fuzdev/fuz_css": "^0.42.1",
-    "@fuzdev/fuz_ui": "^0.172.0",
-    "@fuzdev/fuz_util": "^0.43.0",
+    "@fuzdev/fuz_ui": "^0.173.0",
+    "@fuzdev/fuz_util": "^0.45.0",
     "@ryanatkn/eslint-config": "^0.9.0",
     "@sveltejs/adapter-static": "^3.0.10",
     "@sveltejs/kit": "^2.49.1",

package/src/lib/changeset.task.ts

@@ -22,7 +22,7 @@ import {
 	CHANGESET_PUBLIC_ACCESS,
 	CHANGESET_RESTRICTED_ACCESS,
 } from './changeset_helpers.ts';
-import {load_package_json} from './package_json.ts';
+import {package_json_load} from './package_json.ts';
 
 /** @nodocs */
 export const Args = z.strictObject({
@@ -99,7 +99,7 @@ export const task: Task<Args> = {
 			);
 		}
 
-		const package_json = await load_package_json();
+		const package_json = await package_json_load();
 
 		const has_sveltekit_library_result = await has_sveltekit_library(package_json, svelte_config);
 		if (!has_sveltekit_library_result.ok) {

package/src/lib/check.task.ts

@@ -4,7 +4,7 @@ import {styleText as st} from 'node:util';
 import {git_check_clean_workspace} from '@fuzdev/fuz_util/git.js';
 
 import {TaskError, type Task} from './task.ts';
-import {sync_package_json} from './package_json.ts';
+import {package_json_sync} from './package_json.ts';
 
 /** @nodocs */
 export const Args = z.strictObject({
@@ -62,7 +62,7 @@ export const task: Task<Args> = {
 		}
 
 		if (package_json && config.map_package_json) {
-			const {changed} = await sync_package_json(config.map_package_json, log, false);
+			const {changed} = await package_json_sync(config.map_package_json, log, false);
 			if (changed) {
 				throw new TaskError('package.json is out of date, run `gro sync` to update it');
 			} else {

package/src/lib/format_file.ts

@@ -1,7 +1,7 @@
 import prettier from 'prettier';
 import {extname} from 'node:path';
 
-import {load_package_json} from './package_json.ts';
+import {package_json_load} from './package_json.ts';
 
 let cached_base_options: prettier.Options | undefined;
 
@@ -19,7 +19,7 @@ export const format_file = async (
 	const final_base_options =
 		base_options !== undefined
 			? base_options
-			: (cached_base_options = (await load_package_json()).prettier as any);
+			: (cached_base_options = (await package_json_load()).prettier as any);
 	let final_options = options;
 	if (options.filepath && !options.parser) {
 		const {filepath, ...rest} = options;

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

@@ -4,7 +4,7 @@ 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 {load_package_json} from './package_json.ts';
+import {package_json_load} from './package_json.ts';
 
 // TODO hacky, maybe extract utils?
 
@@ -18,7 +18,7 @@ import {load_package_json} from './package_json.ts';
  * - if `src/lib/server/server.ts`, assumes a Node server - needs config
  */
 const config: CreateGroConfig = async (cfg, svelte_config) => {
-	const package_json = await 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 package_json = await package_json_load(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
 
 	const [has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] =
 		await Promise.all([

package/src/lib/gro_plugin_sveltekit_app.ts

@@ -1,64 +1,25 @@
 import type {SpawnedProcess} from '@fuzdev/fuz_util/process.js';
-import {cp, mkdir, rm, writeFile} from 'node:fs/promises';
-import {dirname, join} from 'node:path';
-import {fs_exists} from '@fuzdev/fuz_util/fs.js';
 
 import type {Plugin} from './plugin.ts';
 import {serialize_args, to_forwarded_args} from './args.ts';
-import {serialize_package_json, type PackageJsonMapper, load_package_json} from './package_json.ts';
 import {TaskError} from './task.ts';
 import {find_cli, spawn_cli, spawn_cli_process} from './cli.ts';
-import {type SourceJsonMapper, source_json_serialize, source_json_create} from './source_json.ts';
-import {EXPORTS_EXCLUDER_DEFAULT} from './gro_config.ts';
-import {default_svelte_config} from './svelte_config.ts';
-import {SOURCE_DIRNAME, VITE_CLI} from './constants.ts';
+import {VITE_CLI} from './constants.ts';
 
 export interface GroPluginSveltekitAppOptions {
-	/**
-	 * Whether to include a `.nojekyll` file in the build output.
-	 * GitHub Pages processes files with Jekyll by default, breaking files/dirs prefixed with `_`.
-	 * The `.nojekyll` file tells GitHub Pages to skip Jekyll processing.
-	 *
-	 * @default `true` if the SvelteKit adapter name contains 'static'
-	 */
-	include_nojekyll?: boolean;
-
-	/**
-	 * If truthy, adds `/.well-known/package.json` to the static output.
-	 * If a function, maps the value.
-	 */
-	well_known_package_json?: boolean | PackageJsonMapper;
-
-	/**
-	 * If truthy, adds `/.well-known/source.json` and `/.well-known/src/` to the static output.
-	 * If a function, maps the value.
-	 */
-	well_known_source_json?: boolean | SourceJsonMapper;
-
-	/**
-	 * If truthy, copies `src/` to `/.well-known/src/` to the static output.
-	 * Pass a function to customize which files get copied.
-	 */
-	well_known_src_files?: boolean | CopyFileFilter;
 	/**
 	 * The Vite CLI to use.
 	 */
 	vite_cli?: string;
 }
 
-export type CopyFileFilter = (file_path: string) => boolean;
-
 export const gro_plugin_sveltekit_app = ({
-	include_nojekyll,
-	well_known_package_json,
-	well_known_source_json,
-	well_known_src_files,
 	vite_cli = VITE_CLI,
 }: GroPluginSveltekitAppOptions = {}): Plugin => {
 	let sveltekit_process: SpawnedProcess | undefined = undefined;
 	return {
 		name: 'gro_plugin_sveltekit_app',
-		setup: async ({dev, watch, log, config, svelte_config}) => {
+		setup: async ({dev, watch, log, config}) => {
 			const found_vite_cli = await find_cli(vite_cli);
 			if (!found_vite_cli)
 				throw Error(
@@ -77,87 +38,11 @@ export const gro_plugin_sveltekit_app = ({
 				}
 			} else {
 				// `vite build` in production mode
-
-				// `.well-known/package.json`
-				const package_json = await load_package_json(); // TODO put in plugin context? same with sveltekit config?
-				if (well_known_package_json === undefined) {
-					well_known_package_json = package_json.public; // eslint-disable-line no-param-reassign
-				}
-				const mapped_package_json = !well_known_package_json
-					? null
-					: well_known_package_json === true
-						? package_json
-						: await well_known_package_json(package_json);
-				const serialized_package_json =
-					mapped_package_json && serialize_package_json(mapped_package_json);
-
-				// `.well-known/source.json` and `.well-known/src/`
-				const final_package_json = mapped_package_json ?? package_json;
-				const source_json = await source_json_create(final_package_json, undefined, log);
-				if (well_known_source_json === undefined) {
-					well_known_source_json = final_package_json.public; // eslint-disable-line no-param-reassign
-				}
-				const mapped_source_json = !well_known_source_json
-					? null
-					: well_known_source_json === true
-						? source_json
-						: await well_known_source_json(source_json);
-				const serialized_source_json =
-					mapped_source_json && source_json_serialize(mapped_source_json);
-
-				// TODO this strategy means the files aren't available during development --
-				// maybe a Vite middleware is best? what if this plugin added its plugin to your `vite.config.ts`?
-
-				// 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} = default_svelte_config;
-
-				// detect whether to include .nojekyll based on adapter if not explicitly set
-				const adapter_name = svelte_config.svelte_config?.kit?.adapter?.name;
-				const should_include_nojekyll =
-					include_nojekyll ?? (adapter_name ? adapter_name.includes('static') : false);
-
-				const cleanup_promises = [
-					serialized_package_json
-						? create_temporarily(
-								join(assets_path, '.well-known/package.json'),
-								serialized_package_json,
-							)
-						: null,
-					serialized_source_json
-						? create_temporarily(
-								join(assets_path, '.well-known/source.json'),
-								serialized_source_json,
-							)
-						: null,
-					serialized_source_json && well_known_src_files
-						? copy_temporarily(
-								SOURCE_DIRNAME,
-								assets_path,
-								'.well-known',
-								well_known_src_files === true
-									? (file_path) => !EXPORTS_EXCLUDER_DEFAULT.test(file_path)
-									: well_known_src_files,
-							)
-						: null,
-					should_include_nojekyll ? create_temporarily(join(assets_path, '.nojekyll'), '') : null,
-				].filter((v): v is Promise<AsyncCleanup> => v != null);
-				const cleanups = await Promise.all(cleanup_promises);
-				const cleanup = async () => {
-					// eslint-disable-next-line no-await-in-loop
-					for (const c of cleanups) await c();
-				};
-				try {
-					const serialized_args = ['build', ...serialize_args(to_forwarded_args(vite_cli))];
-					const spawned = await spawn_cli(found_vite_cli, serialized_args, log);
-					if (!spawned?.ok) {
-						throw new TaskError(`${vite_cli} build failed with exit code ${spawned?.code}`);
-					}
-				} catch (error) {
-					await cleanup();
-					throw error;
+				const serialized_args = ['build', ...serialize_args(to_forwarded_args(vite_cli))];
+				const spawned = await spawn_cli(found_vite_cli, serialized_args, log);
+				if (!spawned?.ok) {
+					throw new TaskError(`${vite_cli} build failed with exit code ${spawned?.code}`);
 				}
-				await cleanup();
 			}
 		},
 		teardown: async () => {
@@ -168,98 +53,3 @@ export const gro_plugin_sveltekit_app = ({
 		},
 	};
 };
-
-type AsyncCleanup = () => Promise<void>;
-
-// TODO probably extract these, and create a common helper or merge them
-
-const copy_temporarily = async (
-	source_path: string,
-	dest_dir: string,
-	dest_base_dir = '',
-	filter?: CopyFileFilter,
-): Promise<AsyncCleanup> => {
-	const path = join(dest_dir, dest_base_dir, source_path);
-	const dir = dirname(path);
-
-	const dir_already_exists = await fs_exists(dir);
-	let root_created_dir: string | undefined;
-	if (!dir_already_exists) {
-		root_created_dir = await to_root_dir_that_doesnt_exist(dir);
-		if (!root_created_dir) throw Error();
-		await mkdir(dir, {recursive: true});
-	}
-
-	const path_already_exists = await fs_exists(path);
-	if (!path_already_exists) {
-		await cp(source_path, path, {recursive: true, filter});
-	}
-
-	return async () => {
-		if (!dir_already_exists) {
-			if (!root_created_dir) throw Error();
-			if (await fs_exists(root_created_dir)) {
-				await rm(root_created_dir, {recursive: true});
-			}
-		} else if (!path_already_exists) {
-			if (await fs_exists(path)) {
-				await rm(path, {recursive: true});
-			}
-		}
-	};
-};
-
-/**
- * Creates a file at `path` with `contents` if it doesn't already exist,
- * and returns a function that deletes the file and any created directories.
- * @param path
- * @param contents
- * @returns cleanup function that deletes the file and any created dirs
- */
-const create_temporarily = async (path: string, contents: string): Promise<AsyncCleanup> => {
-	const dir = dirname(path);
-
-	const dir_already_exists = await fs_exists(dir);
-	let root_created_dir: string | undefined;
-	if (!dir_already_exists) {
-		root_created_dir = await to_root_dir_that_doesnt_exist(dir);
-		if (!root_created_dir) throw Error();
-		await mkdir(dir, {recursive: true});
-	}
-
-	const path_already_exists = await fs_exists(path);
-	if (!path_already_exists) {
-		await writeFile(path, contents, 'utf8');
-	}
-
-	return async () => {
-		if (!dir_already_exists) {
-			if (!root_created_dir) throw Error();
-			if (await fs_exists(root_created_dir)) {
-				await rm(root_created_dir, {recursive: true});
-			}
-		} else if (!path_already_exists) {
-			if (await fs_exists(path)) {
-				await rm(path);
-			}
-		}
-	};
-};
-
-/**
- * Niche and probably needs refactoring,
- * for `/a/b/DOESNT_EXIST/NOR_THIS/ETC` returns `/a/b/DOESNT_EXIST`
- * where `/a/b` does exist on the filesystem and `DOESNT_EXIST` is not one of its subdirectories.
- */
-const to_root_dir_that_doesnt_exist = async (dir: string): Promise<string | undefined> => {
-	let prev: string | undefined;
-	let d = dir;
-	do {
-		// eslint-disable-next-line no-await-in-loop
-		if (await fs_exists(d)) {
-			return prev;
-		}
-		prev = d;
-	} while ((d = dirname(d)));
-	throw Error('no dirs exist for ' + dir);
-};

package/src/lib/gro_plugin_sveltekit_library.ts

@@ -2,7 +2,7 @@ import {print_spawn_result, spawn} from '@fuzdev/fuz_util/process.js';
 
 import type {Plugin} from './plugin.ts';
 import {TaskError} from './task.ts';
-import {load_package_json} from './package_json.ts';
+import {package_json_load} from './package_json.ts';
 import {run_svelte_package, type SveltePackageOptions} from './sveltekit_helpers.ts';
 import {SVELTE_PACKAGE_CLI} from './constants.ts';
 
@@ -27,7 +27,7 @@ export const gro_plugin_sveltekit_library = ({
 		name: 'gro_plugin_sveltekit_library',
 		setup: async ({dev, log, config}) => {
 			if (!dev) {
-				const package_json = await load_package_json();
+				const package_json = await package_json_load();
 				await run_svelte_package(
 					package_json,
 					svelte_package_options,
@@ -38,7 +38,7 @@ export const gro_plugin_sveltekit_library = ({
 			}
 		},
 		adapt: async ({log, timings, config}) => {
-			const package_json = await load_package_json();
+			const package_json = await package_json_load();
 			// link the CLI binaries if they exist
 			if (package_json.bin) {
 				const timing_to_link = timings.start(`${config.pm_cli} link`);

package/src/lib/invoke_task.ts

@@ -7,7 +7,7 @@ import {to_forwarded_args, type Args} from './args.ts';
 import {run_task} from './run_task.ts';
 import {to_input_path, RawInputPath} from './input_path.ts';
 import {find_tasks, load_tasks, SilentError} from './task.ts';
-import {load_gro_package_json} from './package_json.ts';
+import {package_json_load_for_gro} from './package_json.ts';
 import {log_tasks, log_error_reasons} from './task_logging.ts';
 import type {GroConfig} from './gro_config.ts';
 import {Filer} from './filer.ts';
@@ -68,7 +68,7 @@ export const invoke_task = async (
 
 	// Check if the caller just wants to see the version.
 	if (!task_name && (args?.version || args?.v)) {
-		const gro_package_json = await load_gro_package_json();
+		const gro_package_json = await package_json_load_for_gro();
 		log.info(`${st('gray', 'v')}${st('cyan', gro_package_json.version)}`);
 		await finish();
 		return;

package/src/lib/package_json.ts

@@ -24,9 +24,9 @@ export type PackageJsonMapper = (
 	package_json: PackageJson,
 ) => PackageJson | null | Promise<PackageJson | null>;
 
-export const EMPTY_PACKAGE_JSON: PackageJson = {name: '', version: ''};
+export const PACKAGE_JSON_EMPTY: PackageJson = {name: '', version: ''};
 
-export const load_package_json = async (
+export const package_json_load = async (
 	dir = IS_THIS_GRO ? gro_paths.root : paths.root,
 	cache?: Record<string, PackageJson>,
 	parse = true, // TODO pass `false` here in more places, especially anything perf-sensitive like work on startup
@@ -37,10 +37,10 @@ export const load_package_json = async (
 		return cache[dir]!;
 	}
 	try {
-		package_json = JSON.parse(await load_package_json_contents(dir));
+		package_json = JSON.parse(await package_json_load_contents(dir));
 	} catch (error) {
 		log?.error(st('yellow', `Failed to load package.json in ${dir}`), error);
-		return EMPTY_PACKAGE_JSON;
+		return PACKAGE_JSON_EMPTY;
 	}
 	if (parse) {
 		package_json = parse_package_json(PackageJson, package_json);
@@ -51,7 +51,10 @@ export const load_package_json = async (
 	return package_json;
 };
 
-export const sync_package_json = async (
+// TODO remove
+export const load_package_json = package_json_load;
+
+export const package_json_sync = async (
 	map_package_json: PackageJsonMapper,
 	log: Logger,
 	write = true,
@@ -60,10 +63,10 @@ export const sync_package_json = async (
 ): Promise<{package_json: PackageJson | null; changed: boolean}> => {
 	const exported_files = await fs_search(exports_dir);
 	const exported_paths = exported_files.map((f) => f.path);
-	const updated = await update_package_json(
+	const updated = await package_json_update(
 		async (package_json) => {
 			if ((await has_sveltekit_library(package_json)).ok) {
-				package_json.exports = to_package_exports(exported_paths);
+				package_json.exports = package_json_to_exports(exported_paths);
 			}
 			const mapped = await map_package_json(package_json);
 			return mapped ? parse_package_json(PackageJson, mapped) : mapped;
@@ -85,43 +88,44 @@ export const sync_package_json = async (
 	return updated;
 };
 
-export const load_gro_package_json = (): Promise<PackageJson> => load_package_json(gro_paths.root);
+export const package_json_load_for_gro = (): Promise<PackageJson> =>
+	package_json_load(gro_paths.root);
 
 // TODO probably make this nullable and make callers handle failures
-const load_package_json_contents = (dir: string): Promise<string> =>
+const package_json_load_contents = (dir: string): Promise<string> =>
 	readFile(join(dir, PACKAGE_JSON_FILENAME), 'utf8');
 
-export const write_package_json = (serialized_package_json: string): Promise<void> =>
+export const package_json_write = (serialized_package_json: string): Promise<void> =>
 	writeFile(join(paths.root, PACKAGE_JSON_FILENAME), serialized_package_json);
 
-export const serialize_package_json = (package_json: PackageJson): string =>
+export const package_json_serialize = (package_json: PackageJson): string =>
 	JSON.stringify(parse_package_json(PackageJson, package_json), null, 2) + '\n';
 
 /**
  * Updates package.json. Writes to the filesystem only when contents change.
  */
-export const update_package_json = async (
+export const package_json_update = async (
 	update: (package_json: PackageJson) => PackageJson | null | Promise<PackageJson | null>,
 	dir = paths.root,
 	write = true,
 ): Promise<{package_json: PackageJson | null; changed: boolean}> => {
-	const original_contents = await load_package_json_contents(dir);
+	const original_contents = await package_json_load_contents(dir);
 	const original = JSON.parse(original_contents);
 	const updated = await update(original);
 	if (updated === null) {
 		return {package_json: original, changed: false};
 	}
-	const updated_contents = serialize_package_json(updated);
+	const updated_contents = package_json_serialize(updated);
 	if (updated_contents === original_contents) {
 		return {package_json: original, changed: false};
 	}
-	if (write) await write_package_json(updated_contents);
+	if (write) await package_json_write(updated_contents);
 	return {package_json: updated, changed: true};
 };
 
 const is_index = (path: string): boolean => path === 'index.ts' || path === 'index.js';
 
-export const to_package_exports = (paths: Array<string>): PackageJsonExports => {
+export const package_json_to_exports = (paths: Array<string>): PackageJsonExports => {
 	const has_index = paths.some(is_index);
 	const has_js = paths.some((p) => TS_MATCHER.test(p) || JS_MATCHER.test(p));
 	const has_svelte = paths.some((p) => SVELTE_MATCHER.test(p));
@@ -176,7 +180,7 @@ export const to_package_exports = (paths: Array<string>): PackageJsonExports =>
 
 const IMPORT_PREFIX = './' + SVELTEKIT_DIST_DIRNAME + '/';
 
-export const parse_repo_url = (
+export const package_json_parse_repo_url = (
 	package_json: PackageJson,
 ): {owner: string; repo: string} | undefined => {
 	const {repository} = package_json;
@@ -224,7 +228,7 @@ const parse_or_throw_formatted_error = <T extends z.ZodType>(
 	return parsed.data;
 };
 
-export const has_dep = (dep_name: string, package_json: PackageJson): boolean =>
+export const package_json_has_dependency = (dep_name: string, package_json: PackageJson): boolean =>
 	!!package_json.devDependencies?.[dep_name] ||
 	!!package_json.dependencies?.[dep_name] ||
 	!!package_json.peerDependencies?.[dep_name];
@@ -234,7 +238,9 @@ export interface PackageJsonDep {
 	version: string;
 }
 
-export const extract_deps = (package_json: PackageJson): Array<PackageJsonDep> => {
+export const package_json_extract_dependencies = (
+	package_json: PackageJson,
+): Array<PackageJsonDep> => {
 	const deps_by_name: Map<string, PackageJsonDep> = new Map();
 	// Earlier versions override later ones, so peer deps goes last.
 	const add_deps = (deps: Record<string, string> | undefined) => {

package/src/lib/publish.task.ts

@@ -12,7 +12,7 @@ import {
 } from '@fuzdev/fuz_util/git.js';
 
 import {TaskError, type Task} from './task.ts';
-import {load_package_json, parse_repo_url} from './package_json.ts';
+import {package_json_load, package_json_parse_repo_url} from './package_json.ts';
 import {find_cli, spawn_cli} from './cli.ts';
 import {has_sveltekit_library} from './sveltekit_helpers.ts';
 import {update_changelog} from './changelog.ts';
@@ -85,7 +85,7 @@ export const task: Task<Args> = {
 			log.info(st('green', 'dry run!'));
 		}
 
-		const package_json = await load_package_json();
+		const package_json = await package_json_load();
 
 		const has_sveltekit_library_result = await has_sveltekit_library(package_json);
 		if (!has_sveltekit_library_result.ok) {
@@ -140,7 +140,7 @@ export const task: Task<Args> = {
 			if (typeof package_json.version !== 'string') {
 				throw new TaskError('Failed to find package.json version');
 			}
-			const parsed_repo_url = parse_repo_url(package_json);
+			const parsed_repo_url = package_json_parse_repo_url(package_json);
 			if (!parsed_repo_url) {
 				throw new TaskError(
 					'package.json `repository` must contain a repo url (and GitHub only for now, sorry),' +
@@ -178,7 +178,7 @@ export const task: Task<Args> = {
 			// The check above ensures gen is updated.
 			await invoke_task('gen');
 
-			const package_json_after_versioning = await load_package_json();
+			const package_json_after_versioning = await package_json_load();
 			version = package_json_after_versioning.version!;
 			if (package_json.version === version) {
 				// The version didn't change.

package/src/lib/release.task.ts

@@ -2,7 +2,7 @@ import {z} from 'zod';
 
 import type {Task} from './task.ts';
 import {has_sveltekit_library, has_sveltekit_app} from './sveltekit_helpers.ts';
-import {load_package_json} from './package_json.ts';
+import {package_json_load} from './package_json.ts';
 
 /** @nodocs */
 export const Args = z.strictObject({});
@@ -13,7 +13,7 @@ export const task: Task<Args> = {
 	summary: 'publish and deploy',
 	Args,
 	run: async ({invoke_task}) => {
-		const package_json = await load_package_json();
+		const package_json = await package_json_load();
 
 		const publish = (await has_sveltekit_library(package_json)).ok;
 		if (publish) {

package/src/lib/source_json.ts

@@ -25,11 +25,6 @@ export const source_json_create = async (
 		modules: await source_modules_create(package_json.exports, lib_path, log),
 	});
 
-export const source_json_serialize = (source_json: SourceJson): string => {
-	const parsed = SourceJson.parse(source_json);
-	return JSON.stringify(parsed, null, 2) + '\n';
-};
-
 export const source_modules_create = async (
 	exports: PackageJsonExports | undefined,
 	lib_path = paths.lib,

package/src/lib/sveltekit_helpers.ts

@@ -4,7 +4,7 @@ import {join} from 'node:path';
 import type {PackageJson} from '@fuzdev/fuz_util/package_json.js';
 import {fs_exists} from '@fuzdev/fuz_util/fs.js';
 
-import {has_dep} from './package_json.ts';
+import {package_json_has_dependency} from './package_json.ts';
 import {default_svelte_config, type ParsedSvelteConfig} from './svelte_config.ts';
 import {
 	SVELTE_CONFIG_FILENAME,
@@ -41,7 +41,7 @@ export const has_sveltekit_library = async (
 		return {ok: false, message: `no SvelteKit lib directory found at ${svelte_config.lib_path}`};
 	}
 
-	if (!has_dep(dep_name, package_json)) {
+	if (!package_json_has_dependency(dep_name, package_json)) {
 		return {
 			ok: false,
 			message: `no dependency found in package.json for ${dep_name}`,