@ryanatkn/gro 0.118.0 → 0.119.0

package/dist/gro_plugin_gen.js

@@ -32,7 +32,7 @@ export const plugin = () => {
             void flush_gen_queue();
         }
     }, FLUSH_DEBOUNCE_DELAY);
-    const gen = (files = []) => spawn('npx', ['gro', 'gen', ...files]);
+    const gen = (files = []) => spawn_cli('gro', ['gen', ...files]);
     return {
         name: 'gro_plugin_gen',
         setup: async ({ args: { watch }, dev, log }) => {

package/dist/gro_plugin_server.d.ts

@@ -1,8 +1,11 @@
 import * as esbuild from 'esbuild';
 import type { Config as SvelteKitConfig } from '@sveltejs/kit';
+import type { Result } from '@ryanatkn/belt/result.js';
 import type { Plugin, Plugin_Context } from './plugin.js';
 export declare const SERVER_SOURCE_ID: Flavored<string, "Source_Id">;
-export declare const has_server: (path?: Flavored<string, "Source_Id">) => Promise<boolean>;
+export declare const has_server: (path?: Flavored<string, "Source_Id">) => Promise<Result<object, {
+    message: string;
+}>>;
 export interface Options {
     /**
      * same as esbuild's `entryPoints`

package/dist/gro_plugin_server.js

@@ -19,7 +19,12 @@ 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
 export const SERVER_SOURCE_ID = base_path_to_source_id(LIB_DIRNAME + '/server/server.ts');
-export const has_server = (path = SERVER_SOURCE_ID) => exists(path);
+export const has_server = async (path = SERVER_SOURCE_ID) => {
+    if (!(await exists(path))) {
+        return { ok: false, message: `no server file found at ${path}` };
+    }
+    return { ok: true };
+};
 export const gro_plugin_server = ({ entry_points = [SERVER_SOURCE_ID], dir = process.cwd(), outpaths = (dev) => ({
     outdir: join(dir, dev ? GRO_DEV_DIRNAME : SERVER_DIST_PATH),
     outbase: paths.lib,

package/dist/gro_plugin_sveltekit_library.js

@@ -3,16 +3,21 @@ import { Task_Error } from './task.js';
 import { load_package_json } from './package_json.js';
 import { print_command_args, serialize_args, to_forwarded_args } from './args.js';
 import { find_cli, spawn_cli } from './cli.js';
+import { SVELTE_PACKAGE_CLI, has_sveltekit_library } from './sveltekit_helpers.js';
 export const gro_plugin_sveltekit_library = () => {
     return {
         name: 'gro_plugin_sveltekit_library',
         setup: async ({ log }) => {
-            if ((await find_cli('svelte-package')) !== 'local') {
-                throw new Task_Error('Failed to find svelte-package, run `npm i -D @sveltejs/package`');
+            const has_sveltekit_library_result = await has_sveltekit_library();
+            if (!has_sveltekit_library_result.ok) {
+                throw new Task_Error('Failed to find SvelteKit library: ' + has_sveltekit_library_result.message);
             }
-            const serialized_args = serialize_args(to_forwarded_args('svelte-package'));
+            if ((await find_cli(SVELTE_PACKAGE_CLI)) !== 'local') {
+                throw new Task_Error(`Failed to find ${SVELTE_PACKAGE_CLI}, run \`npm i\``);
+            }
+            const serialized_args = serialize_args(to_forwarded_args(SVELTE_PACKAGE_CLI));
             log.info(print_command_args(serialized_args));
-            await spawn_cli('svelte-package', serialized_args);
+            await spawn_cli(SVELTE_PACKAGE_CLI, serialized_args);
         },
         adapt: async ({ log, timings }) => {
             const package_json = await load_package_json();

package/dist/index.d.ts

@@ -1,4 +1,4 @@
 export type { Gro_Config, Create_Gro_Config } from './config.js';
 export { type Plugin, replace_plugin } from './plugin.js';
-export { type Gen, type Gen_Context } from './gen.js';
+export type { Gen, Gen_Context } from './gen.js';
 export { type Task, type Task_Context, Task_Error } from './task.js';

package/dist/index.js

@@ -1,3 +1,2 @@
 export { replace_plugin } from './plugin.js';
-export {} from './gen.js';
 export { Task_Error } from './task.js';

package/dist/invoke.js

@@ -2,6 +2,7 @@ import { attach_process_error_handlers } from '@ryanatkn/belt/process.js';
 import { invoke_task } from './invoke_task.js';
 import { to_task_args } from './args.js';
 import { load_config } from './config.js';
+import { sveltekit_sync_if_obviously_needed } from './sveltekit_helpers.js';
 /*
 
 This module invokes the Gro CLI which in turn invokes tasks.
@@ -14,5 +15,6 @@ and the rest of the args are forwarded to the task's `run` function.
 */
 // handle uncaught errors
 attach_process_error_handlers((err) => err?.constructor?.name === 'Task_Error' ? 'Task_Error' : null);
+await sveltekit_sync_if_obviously_needed();
 const { task_name, args } = to_task_args();
 await invoke_task(task_name, args, await load_config());

package/dist/invoke_task.d.ts

@@ -17,4 +17,4 @@ import type { Gro_Config } from './config.js';
  * there are some subtle differences in the complex logical branches.
  * The comments describe each condition.
  */
-export declare const invoke_task: (task_name: Flavored<string, "Raw_Input_Path">, args: Args, config: Gro_Config, timings?: any) => Promise<void>;
+export declare const invoke_task: (task_name: Flavored<string, "Raw_Input_Path">, args: Args | undefined, config: Gro_Config, timings?: any) => Promise<void>;

package/dist/invoke_task.js

@@ -36,7 +36,7 @@ export const invoke_task = async (task_name, args, config, timings = new Timings
         log.info(`🕒 ${print_ms(total_timing())}`);
     };
     // Check if the caller just wants to see the version.
-    if (!task_name && (args.version || args.v)) {
+    if (!task_name && (args?.version || args?.v)) {
         const gro_package_json = await load_gro_package_json();
         log.info(`${gray('v')}${cyan(gro_package_json.version)}`);
         finish();

package/dist/package.d.ts

@@ -314,6 +314,10 @@ export declare const package_json: {
             default: string;
             types: string;
         };
+        './reinstall.task.js': {
+            default: string;
+            types: string;
+        };
         './release.task.js': {
             default: string;
             types: string;
@@ -809,6 +813,13 @@ export declare const src_json: {
             path: string;
             declarations: never[];
         };
+        './reinstall.task.js': {
+            path: string;
+            declarations: {
+                name: string;
+                kind: string;
+            }[];
+        };
         './release.task.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.118.0',
+    version: '0.119.0',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     icon: '🌰',
@@ -54,7 +54,7 @@ export const package_json = {
         '@ryanatkn/fuz': '^0.102.1',
         '@ryanatkn/moss': '^0.4.0',
         '@sveltejs/adapter-static': '^3.0.2',
-        '@sveltejs/kit': '^2.5.15',
+        '@sveltejs/kit': '^2.5.16',
         '@sveltejs/package': '^2.3.2',
         '@sveltejs/vite-plugin-svelte': '^3.1.1',
         '@types/fs-extra': '^11.0.4',
@@ -63,7 +63,7 @@ export const package_json = {
         '@typescript-eslint/parser': '^7.13.0',
         esbuild: '^0.20.2',
         eslint: '^8.57.0',
-        'eslint-plugin-svelte': '^2.39.3',
+        'eslint-plugin-svelte': '^2.39.4',
         svelte: '^5.0.0-next.155',
         'svelte-check': '^3.8.0',
         typescript: '^5.4.5',
@@ -180,6 +180,10 @@ export const package_json = {
         './plugin.js': { default: './dist/plugin.js', types: './dist/plugin.d.ts' },
         './publish.task.js': { default: './dist/publish.task.js', types: './dist/publish.task.d.ts' },
         './register.js': { default: './dist/register.js', types: './dist/register.d.ts' },
+        './reinstall.task.js': {
+            default: './dist/reinstall.task.js',
+            types: './dist/reinstall.task.d.ts',
+        },
         './release.task.js': { default: './dist/release.task.js', types: './dist/release.task.d.ts' },
         './resolve_node_specifier.js': {
             default: './dist/resolve_node_specifier.js',
@@ -254,7 +258,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.118.0',
+    version: '0.119.0',
     modules: {
         '.': {
             path: 'index.ts',
@@ -454,9 +458,6 @@ export const src_json = {
                 { name: 'Gen_Module_Meta', kind: 'type' },
                 { name: 'Basic_Gen_Module_Meta', kind: 'type' },
                 { name: 'load_gen_module', kind: 'function' },
-                { name: 'Check_Gen_Module_Result', kind: 'type' },
-                { name: 'check_gen_modules', kind: 'function' },
-                { name: 'check_gen_module', kind: 'function' },
                 { name: 'find_gen_modules', kind: 'function' },
             ],
         },
@@ -483,6 +484,10 @@ export const src_json = {
                 { name: 'Gen_Module_Result_Failure', kind: 'type' },
                 { name: 'to_gen_result', kind: 'function' },
                 { name: 'to_output_file_name', kind: 'function' },
+                { name: 'Analyzed_Gen_Result', kind: 'type' },
+                { name: 'analyze_gen_results', kind: 'function' },
+                { name: 'analyze_gen_result', kind: 'function' },
+                { name: 'write_gen_results', kind: 'function' },
             ],
         },
         './git.js': {
@@ -494,6 +499,7 @@ export const src_json = {
                 { name: 'git_remote_branch_exists', kind: 'function' },
                 { name: 'git_local_branch_exists', kind: 'function' },
                 { name: 'git_check_clean_workspace', kind: 'function' },
+                { name: 'git_check_fully_staged_workspace', kind: 'function' },
                 { name: 'git_fetch', kind: 'function' },
                 { name: 'git_checkout', kind: 'function' },
                 { name: 'git_pull', kind: 'function' },
@@ -662,6 +668,7 @@ export const src_json = {
                 { name: 'SVELTEKIT_CONFIG_FILENAME', kind: 'variable' },
                 { name: 'VITE_CONFIG_FILENAME', kind: 'variable' },
                 { name: 'NODE_MODULES_DIRNAME', kind: 'variable' },
+                { name: 'LOCKFILE_FILENAME', kind: 'variable' },
                 { name: 'SVELTEKIT_DEV_DIRNAME', kind: 'variable' },
                 { name: 'SVELTEKIT_BUILD_DIRNAME', kind: 'variable' },
                 { name: 'SVELTEKIT_DIST_DIRNAME', kind: 'variable' },
@@ -728,6 +735,13 @@ export const src_json = {
             ],
         },
         './register.js': { path: 'register.ts', declarations: [] },
+        './reinstall.task.js': {
+            path: 'reinstall.task.ts',
+            declarations: [
+                { name: 'Args', kind: 'variable' },
+                { name: 'task', kind: 'variable' },
+            ],
+        },
         './release.task.js': {
             path: 'release.task.ts',
             declarations: [
@@ -814,8 +828,13 @@ export const src_json = {
         './sveltekit_helpers.js': {
             path: 'sveltekit_helpers.ts',
             declarations: [
+                { name: 'SVELTEKIT_CLI', kind: 'variable' },
+                { name: 'SVELTE_PACKAGE_CLI', kind: 'variable' },
+                { name: 'SVELTE_PACKAGE_DEP_NAME', kind: 'variable' },
                 { name: 'has_sveltekit_app', kind: 'function' },
                 { name: 'has_sveltekit_library', kind: 'function' },
+                { name: 'sveltekit_sync', kind: 'function' },
+                { name: 'sveltekit_sync_if_obviously_needed', kind: 'function' },
             ],
         },
         './sveltekit_shim_app_environment.js': {
@@ -884,7 +903,6 @@ export const src_json = {
             declarations: [
                 { name: 'Args', kind: 'variable' },
                 { name: 'task', kind: 'variable' },
-                { name: 'sveltekit_sync', kind: 'function' },
             ],
         },
         './task_logging.js': {

package/dist/package_json.js

@@ -112,7 +112,7 @@ export const sync_package_json = async (map_package_json, log, check = false, di
     const exported_files = await search_fs(exports_dir);
     const exported_paths = Array.from(exported_files.keys());
     const updated = await update_package_json(dir, async (package_json) => {
-        if (await has_sveltekit_library(package_json)) {
+        if ((await has_sveltekit_library(package_json)).ok) {
             const exports = to_package_exports(exported_paths);
             package_json.exports = exports;
         }

package/dist/path_constants.d.ts

@@ -11,6 +11,7 @@ export declare const README_FILENAME = "README.md";
 export declare const SVELTEKIT_CONFIG_FILENAME = "svelte.config.js";
 export declare const VITE_CONFIG_FILENAME = "vite.config.ts";
 export declare const NODE_MODULES_DIRNAME = "node_modules";
+export declare const LOCKFILE_FILENAME = "package-lock.json";
 export declare const SVELTEKIT_DEV_DIRNAME = ".svelte-kit";
 export declare const SVELTEKIT_BUILD_DIRNAME = "build";
 export declare const SVELTEKIT_DIST_DIRNAME = "dist";

package/dist/path_constants.js

@@ -18,6 +18,7 @@ export const README_FILENAME = 'README.md';
 export const SVELTEKIT_CONFIG_FILENAME = 'svelte.config.js';
 export const VITE_CONFIG_FILENAME = 'vite.config.ts';
 export const NODE_MODULES_DIRNAME = 'node_modules';
+export const LOCKFILE_FILENAME = 'package-lock.json';
 export const SVELTEKIT_DEV_DIRNAME = '.svelte-kit'; // TODO use Svelte config value `outDir`
 export const SVELTEKIT_BUILD_DIRNAME = 'build';
 export const SVELTEKIT_DIST_DIRNAME = 'dist';

package/dist/publish.task.d.ts

@@ -5,37 +5,40 @@ export declare const Args: z.ZodObject<{
     origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
     changelog: z.ZodDefault<z.ZodString>;
     preserve_changelog: z.ZodDefault<z.ZodBoolean>;
+    optional: z.ZodDefault<z.ZodBoolean>;
     dry: z.ZodDefault<z.ZodBoolean>;
     check: z.ZodDefault<z.ZodBoolean>;
     'no-check': z.ZodDefault<z.ZodBoolean>;
-    install: z.ZodDefault<z.ZodBoolean>;
-    'no-install': z.ZodDefault<z.ZodBoolean>;
     build: z.ZodDefault<z.ZodBoolean>;
     'no-build': z.ZodDefault<z.ZodBoolean>;
+    pull: z.ZodDefault<z.ZodBoolean>;
+    'no-pull': z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     build: boolean;
-    install: boolean;
     origin: string & z.BRAND<"Git_Origin">;
+    pull: boolean;
     branch: string & z.BRAND<"Git_Branch">;
     changelog: string;
-    'no-install': boolean;
     check: boolean;
     dry: boolean;
     'no-build': boolean;
     preserve_changelog: boolean;
+    optional: boolean;
     'no-check': boolean;
+    'no-pull': boolean;
 }, {
     build?: boolean | undefined;
-    install?: boolean | undefined;
     origin?: string | undefined;
+    pull?: boolean | undefined;
     branch?: string | undefined;
     changelog?: string | undefined;
-    'no-install'?: boolean | undefined;
     check?: boolean | undefined;
     dry?: boolean | undefined;
     'no-build'?: boolean | undefined;
     preserve_changelog?: boolean | undefined;
+    optional?: boolean | undefined;
     'no-check'?: boolean | undefined;
+    'no-pull'?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/publish.task.js

@@ -9,7 +9,7 @@ import { IS_THIS_GRO } from './paths.js';
 import { has_sveltekit_library } from './sveltekit_helpers.js';
 import { update_changelog } from './changelog.js';
 import { load_from_env } from './env.js';
-import { Git_Branch, Git_Origin, git_checkout, git_fetch, git_pull } from './git.js';
+import { Git_Branch, Git_Origin, git_check_clean_workspace, git_checkout, git_fetch, git_pull, } from './git.js';
 // publish.task.ts
 // - usage: `gro publish patch`
 // - forwards args to `npm version`: https://docs.npmjs.com/v6/commands/npm-version
@@ -28,6 +28,7 @@ export const Args = z
         description: 'opt out of linkifying and formatting the changelog from @changesets/changelog-git',
     })
         .default(false),
+    optional: z.boolean({ description: 'exit gracefully if there are no changesets' }).default(false),
     dry: z
         .boolean({ description: 'build and prepare to publish without actually publishing' })
         .default(false),
@@ -35,24 +36,23 @@ export const Args = z
     'no-check': z
         .boolean({ description: 'opt out of npm checking before publishing' })
         .default(false),
-    install: z.boolean({ description: 'dual of no-install' }).default(true),
-    'no-install': z
-        .boolean({ description: 'opt out of npm installing before building' })
-        .default(false),
     build: z.boolean({ description: 'dual of no-build' }).default(true),
     'no-build': z.boolean({ description: 'opt out of building' }).default(false),
+    pull: z.boolean({ description: 'dual of no-pull' }).default(true),
+    'no-pull': z.boolean({ description: 'opt out of git pull' }).default(false),
 })
     .strict();
 export const task = {
     summary: 'bump version, publish to npm, and git push',
     Args,
     run: async ({ args, log, invoke_task }) => {
-        const { branch, origin, changelog, preserve_changelog, dry, check, install, build } = args;
+        const { branch, origin, changelog, preserve_changelog, dry, check, build, pull, optional } = args;
         if (dry) {
             log.info(green('dry run!'));
         }
-        if (!(await has_sveltekit_library())) {
-            throw new Task_Error('gro publish failed to detect a library, run `npm i -D @sveltejs/package` to enable it');
+        const has_sveltekit_library_result = await has_sveltekit_library();
+        if (!has_sveltekit_library_result.ok) {
+            throw new Task_Error('Failed to find SvelteKit library: ' + has_sveltekit_library_result.message);
         }
         // TODO hacky, ensures Gro bootstraps itself
         if (IS_THIS_GRO) {
@@ -60,12 +60,17 @@ export const task = {
         }
         const changelog_exists = await exists(changelog);
         if (!(await find_cli('changeset'))) {
-            throw new Task_Error('changeset command not found: install @changesets/cli locally or globally');
+            throw new Task_Error('changeset command not found, install @changesets/cli locally or globally');
         }
         // Make sure we're on the right branch:
         await git_fetch(origin, branch);
         await git_checkout(branch);
-        await git_pull(origin, branch);
+        if (pull) {
+            if (await git_check_clean_workspace()) {
+                throw new Task_Error('The git workspace is not clean, pass --no-pull to bypass git pull');
+            }
+            await git_pull(origin, branch);
+        }
         // Check before proceeding.
         if (check) {
             await invoke_task('check', { workspace: true });
@@ -82,7 +87,7 @@ export const task = {
         else {
             const package_json_before = await load_package_json();
             if (typeof package_json_before.version !== 'string') {
-                throw new Task_Error('failed to find package.json version');
+                throw new Task_Error('Failed to find package.json version');
             }
             const parsed_repo_url = parse_repo_url(package_json_before);
             if (!parsed_repo_url) {
@@ -105,11 +110,18 @@ export const task = {
             const package_json_after = await load_package_json();
             version = package_json_after.version;
             if (package_json_before.version === version) {
-                throw new Task_Error('changeset version failed: are there any changes?');
+                // The version didn't change.
+                // For now this is the best detection we have for a no-op `changeset version`.
+                if (optional) {
+                    return; // exit gracefully
+                }
+                else {
+                    throw new Task_Error('changeset version failed: are there any changes?');
+                }
             }
         }
         if (build) {
-            await invoke_task('build', { install });
+            await invoke_task('build');
         }
         if (dry) {
             log.info('publishing branch ' + branch);

package/dist/reinstall.task.d.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+import { type Task } from './task.js';
+export declare const Args: z.ZodObject<{}, "strict", z.ZodTypeAny, {}, {}>;
+export type Args = z.infer<typeof Args>;
+export declare const task: Task<Args>;

package/dist/reinstall.task.js

@@ -0,0 +1,32 @@
+import { z } from 'zod';
+import { spawn } from '@ryanatkn/belt/process.js';
+import { rm } from 'fs/promises';
+import { Task_Error } from './task.js';
+import { LOCKFILE_FILENAME, NODE_MODULES_DIRNAME } from './path_constants.js';
+export const Args = z.object({}).strict();
+export const task = {
+    summary: `refreshes ${LOCKFILE_FILENAME} with the latest and cleanest deps`,
+    Args,
+    run: async ({ log }) => {
+        log.info('running the initial npm install');
+        const initial_install_result = await spawn('npm', ['i']);
+        if (!initial_install_result.ok) {
+            throw new Task_Error('Failed initial npm install');
+        }
+        // Deleting both the lockfile and node_modules upgrades to the latest minor/patch versions.
+        await Promise.all([rm(LOCKFILE_FILENAME), rm(NODE_MODULES_DIRNAME, { recursive: true })]);
+        log.info(`running npm install after deleting ${LOCKFILE_FILENAME} and ${NODE_MODULES_DIRNAME}, this can take a while...`);
+        const second_install_result = await spawn('npm', ['i']);
+        if (!second_install_result.ok) {
+            throw new Task_Error(`Failed npm install after deleting ${LOCKFILE_FILENAME} and ${NODE_MODULES_DIRNAME}`);
+        }
+        // Deleting the lockfile and reinstalling cleans the lockfile of unnecessary dep noise,
+        // like esbuild's many packages for each platform.
+        await rm(LOCKFILE_FILENAME);
+        log.info(`running npm install one last time to clean ${LOCKFILE_FILENAME}`);
+        const final_install_result = await spawn('npm', ['i']);
+        if (!final_install_result.ok) {
+            throw new Task_Error('Failed npm install');
+        }
+    },
+};

package/dist/release.task.js

@@ -5,13 +5,12 @@ export const task = {
     summary: 'publish and deploy',
     Args,
     run: async ({ invoke_task }) => {
-        const publish = await has_sveltekit_library();
+        const publish = (await has_sveltekit_library()).ok;
         if (publish) {
-            await invoke_task('publish'); // TODO use `to_forwarded_args`
+            await invoke_task('publish', { optional: true });
         }
-        const deploy = await has_sveltekit_app();
-        if (deploy) {
-            await invoke_task('deploy', { build: !publish }); // TODO use `to_forwarded_args`
+        if ((await has_sveltekit_app()).ok) {
+            await invoke_task('deploy', { build: !publish });
         }
     },
 };

package/dist/run.task.js

@@ -20,7 +20,7 @@ export const task = {
             return;
         }
         if (!(await exists(path))) {
-            throw new Task_Error('cannot find file to run at path: ' + path);
+            throw new Task_Error('Cannot find file to run at path: ' + path);
         }
         const loader_path = await resolve_gro_module_path('loader.js');
         const spawned = await spawn_with_loader(loader_path, path, argv);

package/dist/run_task.js

@@ -28,7 +28,7 @@ export const run_task = async (task_meta, unparsed_args, invoke_task, config, ti
             config,
             log,
             timings,
-            invoke_task: (invoked_task_name, invoked_args = {}, invoked_config) => invoke_task(invoked_task_name, invoked_args, invoked_config || config, timings),
+            invoke_task: (invoked_task_name, invoked_args, invoked_config) => invoke_task(invoked_task_name, invoked_args, invoked_config || config, timings),
         });
     }
     catch (err) {

package/dist/sveltekit_helpers.d.ts

@@ -1,4 +1,17 @@
+import type { Result } from '@ryanatkn/belt/result.js';
 import { Package_Json } from './package_json.js';
 import type { Parsed_Sveltekit_Config } from './sveltekit_config.js';
-export declare const has_sveltekit_app: () => Promise<boolean>;
-export declare const has_sveltekit_library: (package_json?: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config) => Promise<boolean>;
+export declare const SVELTEKIT_CLI = "svelte-kit";
+export declare const SVELTE_PACKAGE_CLI = "svelte-package";
+export declare const SVELTE_PACKAGE_DEP_NAME = "@sveltejs/package";
+export declare const has_sveltekit_app: () => Promise<Result<object, {
+    message: string;
+}>>;
+export declare const has_sveltekit_library: (package_json?: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config) => Promise<Result<object, {
+    message: string;
+}>>;
+export declare const sveltekit_sync: () => Promise<void>;
+/**
+ * If the SvelteKit CLI is found and its `.svelte-kit` directory is not, run `svelte-kit sync`.
+ */
+export declare const sveltekit_sync_if_obviously_needed: () => Promise<void>;

package/dist/sveltekit_helpers.js

@@ -1,12 +1,54 @@
 import { Package_Json, load_package_json } from './package_json.js';
 import { exists } from './fs.js';
 import { sveltekit_config_global } from './sveltekit_config_global.js';
-import { SVELTEKIT_CONFIG_FILENAME } from './path_constants.js';
-export const has_sveltekit_app = () => exists(SVELTEKIT_CONFIG_FILENAME);
+import { SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME } from './path_constants.js';
+import { find_cli, spawn_cli } from './cli.js';
+import { Task_Error } from './task.js';
+export const SVELTEKIT_CLI = 'svelte-kit';
+export const SVELTE_PACKAGE_CLI = 'svelte-package';
+export const SVELTE_PACKAGE_DEP_NAME = '@sveltejs/package';
+export const has_sveltekit_app = async () => {
+    if (!(await exists(SVELTEKIT_CONFIG_FILENAME))) {
+        return { ok: false, message: `no SvelteKit config found at ${SVELTEKIT_CONFIG_FILENAME}` };
+    }
+    // TODO check for routes?
+    return { ok: true };
+};
 export const has_sveltekit_library = async (package_json, sveltekit_config = sveltekit_config_global) => {
-    if (!(await has_sveltekit_app()) || !(await exists(sveltekit_config.lib_path))) {
-        return false;
+    const has_sveltekit_app_result = await has_sveltekit_app();
+    if (!has_sveltekit_app_result.ok) {
+        return has_sveltekit_app_result;
+    }
+    if (!(await exists(sveltekit_config.lib_path))) {
+        return { ok: false, message: `no SvelteKit lib directory found at ${sveltekit_config.lib_path}` };
+    }
+    const pkg = package_json ?? (await load_package_json());
+    if (!(pkg.devDependencies?.[SVELTE_PACKAGE_DEP_NAME] || pkg.dependencies?.[SVELTE_PACKAGE_DEP_NAME])) {
+        return {
+            ok: false,
+            message: `no dependency found in package.json for ${SVELTE_PACKAGE_DEP_NAME}, install it with \`npm i -D ${SVELTE_PACKAGE_DEP_NAME}\``,
+        };
+    }
+    return { ok: true };
+};
+export const sveltekit_sync = async () => {
+    if (!(await find_cli(SVELTEKIT_CLI))) {
+        throw new Task_Error(`Failed to find ${SVELTEKIT_CLI} CLI - do you need to run \`npm i\`?`);
+    }
+    const result = await spawn_cli(SVELTEKIT_CLI, ['sync']);
+    if (!result?.ok) {
+        throw new Task_Error(`Failed ${SVELTEKIT_CLI} sync`);
+    }
+};
+/**
+ * If the SvelteKit CLI is found and its `.svelte-kit` directory is not, run `svelte-kit sync`.
+ */
+export const sveltekit_sync_if_obviously_needed = async () => {
+    if (await exists(SVELTEKIT_DEV_DIRNAME)) {
+        return;
+    }
+    if (!(await find_cli(SVELTEKIT_CLI))) {
+        return;
     }
-    const p = package_json ?? (await load_package_json());
-    return !!p.devDependencies?.['@sveltejs/package'] || !!p.dependencies?.['@sveltejs/package'];
+    return sveltekit_sync();
 };

package/dist/sync.task.d.ts

@@ -27,4 +27,3 @@ export declare const Args: z.ZodObject<{
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;
-export declare const sveltekit_sync: () => Promise<void>;

package/dist/sync.task.js

@@ -2,7 +2,7 @@ import { z } from 'zod';
 import { spawn } from '@ryanatkn/belt/process.js';
 import { Task_Error } from './task.js';
 import { sync_package_json } from './package_json.js';
-import { find_cli, spawn_cli } from './cli.js';
+import { sveltekit_sync } from './sveltekit_helpers.js';
 export const Args = z
     .object({
     sveltekit: z.boolean({ description: 'dual of no-sveltekit' }).default(true),
@@ -22,7 +22,7 @@ export const task = {
         if (install) {
             const result = await spawn('npm', ['i']);
             if (!result.ok) {
-                throw new Task_Error('failed npm install');
+                throw new Task_Error('Failed npm install');
             }
         }
         if (sveltekit) {
@@ -37,12 +37,3 @@ export const task = {
         }
     },
 };
-export const sveltekit_sync = async () => {
-    if (!(await find_cli('svelte-kit'))) {
-        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) {
-        throw new Task_Error(`failed svelte-kit sync`);
-    }
-};