@ryanatkn/gro 0.168.0 → 0.169.0

package/dist/upgrade.task.d.ts

@@ -3,7 +3,7 @@ import { type Task } from './task.ts';
 export declare const Args: z.ZodObject<{
     _: z.ZodDefault<z.ZodArray<z.ZodString>>;
     only: z.ZodPipe<z.ZodDefault<z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodString>]>>, z.ZodTransform<string[], string | string[]>>;
-    origin: z.ZodDefault<z.ZodString>;
+    origin: any;
     force: z.ZodDefault<z.ZodBoolean>;
     pull: z.ZodDefault<z.ZodBoolean>;
     'no-pull': z.ZodDefault<z.ZodBoolean>;

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;AAGtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAOhD,eAAO,MAAM,IAAI;;;;;;;;;;;;kBAiCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,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,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAMhD,eAAO,MAAM,IAAI;;;;;;;;;;;;kBAiCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA4E3B,CAAC"}

package/dist/upgrade.task.js

@@ -1,9 +1,9 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
 import { rmSync } from 'node:fs';
+import { Git_Origin, git_pull } from '@ryanatkn/belt/git.js';
 import { Task_Error } from "./task.js";
 import { extract_deps, load_package_json } from "./package_json.js";
-import { Git_Origin, git_pull } from "./git.js";
 import { spawn_cli } from "./cli.js";
 import { serialize_args, to_forwarded_args } from "./args.js";
 import { NODE_MODULES_DIRNAME } from "./constants.js";

package/dist/watch_dir.d.ts

@@ -1,5 +1,5 @@
 import { type ChokidarOptions, type Matcher } from 'chokidar';
-import type { Path_Filter } from './path.ts';
+import type { Path_Filter } from '@ryanatkn/belt/path.js';
 export interface Watch_Node_Fs {
     init: () => Promise<void>;
     close: () => Promise<void>;

package/dist/watch_dir.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch_dir.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/watch_dir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,eAAe,EAAkB,KAAK,OAAO,EAAC,MAAM,UAAU,CAAC;AAMnF,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAM3C,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAC9D,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,uBAAuB,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,0DAOvB,iBAAiB,KAAG,aA+CtB,CAAC"}
+{"version":3,"file":"watch_dir.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/watch_dir.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,KAAK,eAAe,EAAkB,KAAK,OAAO,EAAC,MAAM,UAAU,CAAC;AAInF,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAOxD,MAAM,WAAW,aAAa;IAC7B,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1B,KAAK,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,MAAM,WAAW,cAAc;IAC9B,IAAI,EAAE,mBAAmB,CAAC;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,OAAO,CAAC;CACtB;AACD,MAAM,MAAM,mBAAmB,GAAG,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAC;AAC9D,MAAM,MAAM,uBAAuB,GAAG,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC,GAAG,EAAE,MAAM,CAAC;IACZ,SAAS,EAAE,uBAAuB,CAAC;IACnC,MAAM,CAAC,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC;CACzB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,0DAOvB,iBAAiB,KAAG,aA+CtB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.168.0",
+  "version": "0.169.0",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -49,7 +49,7 @@
     "typescript"
   ],
   "dependencies": {
-    "@ryanatkn/belt": "^0.34.1",
+    "@ryanatkn/belt": "^0.35.1",
     "chokidar": "^4.0.3",
     "dotenv": "^17.2.2",
     "esm-env": "^1.2.2",
@@ -134,6 +134,10 @@
     "./*.js": {
       "types": "./dist/*.d.ts",
       "default": "./dist/*.js"
+    },
+    "./*.ts": {
+      "types": "./dist/*.d.ts",
+      "default": "./dist/*.js"
     }
   }
 }

package/src/lib/changeset.task.ts

@@ -5,10 +5,14 @@ import type {WrittenConfig} from '@changesets/types';
 import {readFile, writeFile} from 'node:fs/promises';
 import {join} from 'node:path';
 import {existsSync, readdirSync} from 'node:fs';
+import {
+	Git_Origin,
+	git_check_fully_staged_workspace,
+	git_push_to_create,
+} from '@ryanatkn/belt/git.js';
 
 import {Task_Error, type Task} from './task.ts';
 import {find_cli, spawn_cli} from './cli.ts';
-import {Git_Origin, git_check_fully_staged_workspace, git_push_to_create} from './git.ts';
 import {has_sveltekit_library} from './sveltekit_helpers.ts';
 import {
 	CHANGESET_CLI,

package/src/lib/check.task.ts

@@ -1,9 +1,9 @@
 import {z} from 'zod';
 import {spawn} from '@ryanatkn/belt/process.js';
 import {styleText as st} from 'node:util';
+import {git_check_clean_workspace} from '@ryanatkn/belt/git.js';
 
 import {Task_Error, type Task} from './task.ts';
-import {git_check_clean_workspace} from './git.ts';
 import {sync_package_json} from './package_json.ts';
 
 export const Args = z.strictObject({

package/src/lib/clean.task.ts

@@ -1,9 +1,9 @@
 import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
+import {Git_Origin} from '@ryanatkn/belt/git.js';
 
 import type {Task} from './task.ts';
 import {clean_fs} from './clean_fs.ts';
-import {Git_Origin} from './git.ts';
 
 export const Args = z.strictObject({
 	build_dev: z.boolean().meta({description: 'delete the Gro build dev directory'}).default(false),

package/src/lib/cli.ts

@@ -9,9 +9,9 @@ import {join} from 'node:path';
 import {existsSync} from 'node:fs';
 import {fileURLToPath, type URL} from 'node:url';
 import type {Logger} from '@ryanatkn/belt/log.js';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import {NODE_MODULES_DIRNAME} from './constants.ts';
-import type {Path_Id} from './path.ts';
 import {print_command_args} from './args.ts';
 
 // TODO maybe upstream to Belt?

package/src/lib/commit.task.ts

@@ -1,8 +1,8 @@
 import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
+import {Git_Origin, git_current_branch_name, git_push} from '@ryanatkn/belt/git.js';
 
 import type {Task} from './task.ts';
-import {Git_Origin, git_current_branch_name, git_push} from './git.ts';
 
 export const Args = z.strictObject({
 	_: z

package/src/lib/deploy.task.ts

@@ -5,11 +5,6 @@ import {z} from 'zod';
 import {cp, mkdir, rm} from 'node:fs/promises';
 import {join, resolve} from 'node:path';
 import {existsSync, readdirSync} from 'node:fs';
-
-import {Task_Error, type Task} from './task.ts';
-import {print_path} from './paths.ts';
-import {GRO_DIRNAME, GIT_DIRNAME, SVELTEKIT_BUILD_DIRNAME} from './constants.ts';
-import {empty_dir} from './fs.ts';
 import {
 	git_check_clean_workspace,
 	git_checkout,
@@ -25,7 +20,12 @@ import {
 	git_check_setting_pull_rebase,
 	git_clone_locally,
 	git_current_branch_name,
-} from './git.ts';
+} from '@ryanatkn/belt/git.js';
+
+import {Task_Error, type Task} from './task.ts';
+import {print_path} from './paths.ts';
+import {GRO_DIRNAME, GIT_DIRNAME, SVELTEKIT_BUILD_DIRNAME} from './constants.ts';
+import {empty_dir} from './fs.ts';
 
 // docs at ./docs/deploy.md
 

package/src/lib/disknode.ts

@@ -1,4 +1,4 @@
-import type {Path_Id} from './path.ts';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 // TODO extract more here from Filer
 

package/src/lib/esbuild_plugin_external_worker.ts

@@ -2,6 +2,7 @@ import * as esbuild from 'esbuild';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import {basename} from 'node:path';
 import type {CompileOptions, ModuleCompileOptions, PreprocessorGroup} from 'svelte/compiler';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import {print_build_result, to_define_import_meta_env} from './esbuild_helpers.ts';
 import {resolve_specifier} from './resolve_specifier.ts';
@@ -11,7 +12,6 @@ import {esbuild_plugin_sveltekit_shim_app} from './esbuild_plugin_sveltekit_shim
 import {esbuild_plugin_sveltekit_local_imports} from './esbuild_plugin_sveltekit_local_imports.ts';
 import {esbuild_plugin_svelte} from './esbuild_plugin_svelte.ts';
 import type {Parsed_Svelte_Config} from './svelte_config.ts';
-import type {Path_Id} from './path.ts';
 
 export interface Esbuild_Plugin_External_Worker_Options {
 	dev: boolean;

package/src/lib/filer.ts

@@ -7,8 +7,8 @@ import {fileURLToPath, pathToFileURL} from 'node:url';
 import {Unreachable_Error} from '@ryanatkn/belt/error.js';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import type {Package_Json} from '@ryanatkn/belt/package_json.js';
+import type {File_Filter, Path_Id} from '@ryanatkn/belt/path.js';
 
-import type {File_Filter, Path_Id} from './path.ts';
 import {
 	watch_dir,
 	type Watch_Node_Fs,

package/src/lib/gen.ts

@@ -5,9 +5,9 @@ import type {Result} from '@ryanatkn/belt/result.js';
 import type {Timings} from '@ryanatkn/belt/timings.js';
 import {styleText as st} from 'node:util';
 import {existsSync} from 'node:fs';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import {print_path} from './paths.ts';
-import type {Path_Id} from './path.ts';
 import type {Gro_Config} from './gro_config.ts';
 import type {Parsed_Svelte_Config} from './svelte_config.ts';
 import {load_modules, type Load_Modules_Failure, type Module_Meta} from './modules.ts';

package/src/lib/gen_helpers.ts

@@ -1,6 +1,7 @@
 import {resolve} from 'node:path';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import type {Timings} from '@ryanatkn/belt/timings.js';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import type {Gro_Config} from './gro_config.ts';
 import {filter_dependents, type Filer} from './filer.ts';
@@ -14,7 +15,6 @@ import {
 } from './gen.ts';
 import {default_svelte_config} from './svelte_config.ts';
 import {to_root_path} from './paths.ts';
-import type {Path_Id} from './path.ts';
 import {load_module} from './modules.ts';
 
 /**

package/src/lib/gro_config.ts

@@ -1,6 +1,7 @@
 import {join, resolve} from 'node:path';
 import {existsSync} from 'node:fs';
 import {identity} from '@ryanatkn/belt/function.js';
+import type {Path_Filter, Path_Id} from '@ryanatkn/belt/path.js';
 
 import {GRO_DIST_DIR, IS_THIS_GRO, paths} from './paths.ts';
 import {
@@ -15,7 +16,6 @@ import {
 import create_default_config from './gro.config.default.ts';
 import type {Create_Config_Plugins} from './plugin.ts';
 import type {Map_Package_Json} from './package_json.ts';
-import type {Path_Filter, Path_Id} from './path.ts';
 import type {Parsed_Svelte_Config} from './svelte_config.ts';
 
 /**

package/src/lib/gro_plugin_server.ts

@@ -7,10 +7,10 @@ import {strip_before, strip_end} from '@ryanatkn/belt/string.js';
 import type {Result} from '@ryanatkn/belt/result.js';
 import {existsSync} from 'node:fs';
 import {throttle} from '@ryanatkn/belt/throttle.js';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import type {Plugin} from './plugin.ts';
 import {base_path_to_path_id, LIB_DIRNAME, paths} from './paths.ts';
-import type {Path_Id} from './path.ts';
 import {GRO_DEV_DIRNAME, SERVER_DIST_PATH} from './constants.ts';
 import {parse_svelte_config, default_svelte_config} from './svelte_config.ts';
 import {esbuild_plugin_sveltekit_shim_app} from './esbuild_plugin_sveltekit_shim_app.ts';

package/src/lib/input_path.ts

@@ -3,9 +3,9 @@ import {existsSync, statSync} from 'node:fs';
 import {strip_start} from '@ryanatkn/belt/string.js';
 import {z} from 'zod';
 import type {Flavored} from '@ryanatkn/belt/types.js';
+import type {Path_Info, Path_Id, Resolved_Path} from '@ryanatkn/belt/path.js';
 
 import {GRO_PACKAGE_DIR, GRO_DIST_DIR} from './paths.ts';
-import type {Path_Info, Path_Id, Resolved_Path} from './path.ts';
 import {search_fs} from './search_fs.ts';
 import {TASK_FILE_SUFFIX_JS} from './task.ts';
 

package/src/lib/modules.ts

@@ -3,10 +3,10 @@ import {Unreachable_Error} from '@ryanatkn/belt/error.js';
 import type {Result} from '@ryanatkn/belt/result.js';
 import {print_error} from '@ryanatkn/belt/print.js';
 import {pathToFileURL} from 'node:url';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import type {Resolved_Input_File} from './input_path.ts';
 import {print_path} from './paths.ts';
-import type {Path_Id} from './path.ts';
 
 export interface Module_Meta<T_Module extends Record<string, any> = Record<string, any>> {
 	id: Path_Id;

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from '@ryanatkn/belt/src_json.js';
 
 export const package_json: Package_Json = {
 	name: '@ryanatkn/gro',
-	version: '0.168.0',
+	version: '0.169.0',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -44,7 +44,7 @@ export const package_json: Package_Json = {
 		'typescript',
 	],
 	dependencies: {
-		'@ryanatkn/belt': '^0.34.1',
+		'@ryanatkn/belt': '^0.35.1',
 		chokidar: '^4.0.3',
 		dotenv: '^17.2.2',
 		'esm-env': '^1.2.2',
@@ -99,12 +99,13 @@ export const package_json: Package_Json = {
 		'./package.json': './package.json',
 		'.': {types: './dist/index.d.ts', default: './dist/index.js'},
 		'./*.js': {types: './dist/*.d.ts', default: './dist/*.js'},
+		'./*.ts': {types: './dist/*.d.ts', default: './dist/*.js'},
 	},
 } as any;
 
 export const src_json: Src_Json = {
 	name: '@ryanatkn/gro',
-	version: '0.168.0',
+	version: '0.169.0',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -401,30 +402,6 @@ export const src_json: Src_Json = {
 				{name: 'normalize_gen_config', kind: 'function'},
 			],
 		},
-		'./git.js': {
-			path: 'git.ts',
-			declarations: [
-				{name: 'Git_Origin', kind: 'variable'},
-				{name: 'Git_Branch', kind: 'variable'},
-				{name: 'git_current_branch_name', kind: 'function'},
-				{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'},
-				{name: 'git_push', kind: 'function'},
-				{name: 'git_push_to_create', kind: 'function'},
-				{name: 'git_delete_local_branch', kind: 'function'},
-				{name: 'git_delete_remote_branch', kind: 'function'},
-				{name: 'git_reset_branch_to_first_commit', kind: 'function'},
-				{name: 'git_current_commit_hash', kind: 'function'},
-				{name: 'git_current_branch_first_commit_hash', kind: 'function'},
-				{name: 'git_check_setting_pull_rebase', kind: 'function'},
-				{name: 'git_clone_locally', kind: 'function'},
-			],
-		},
 		'./github.js': {
 			path: 'github.ts',
 			declarations: [
@@ -614,17 +591,6 @@ export const src_json: Src_Json = {
 				{name: 'parse_imports', kind: 'function'},
 			],
 		},
-		'./path.js': {
-			path: 'path.ts',
-			declarations: [
-				{name: 'Path_Id', kind: 'type'},
-				{name: 'Path_Info', kind: 'type'},
-				{name: 'Resolved_Path', kind: 'type'},
-				{name: 'Path_Filter', kind: 'type'},
-				{name: 'File_Filter', kind: 'type'},
-				{name: 'to_file_path', kind: 'function'},
-			],
-		},
 		'./paths.js': {
 			path: 'paths.ts',
 			declarations: [

package/src/lib/package_json.ts

@@ -145,6 +145,10 @@ export const to_package_exports = (paths: Array<string>): Package_Json_Exports =
 			types: IMPORT_PREFIX + '*.d.ts',
 			default: IMPORT_PREFIX + '*.js',
 		};
+		exports['./*.ts'] = {
+			types: IMPORT_PREFIX + '*.d.ts',
+			default: IMPORT_PREFIX + '*.js',
+		};
 	}
 
 	if (has_svelte) {

package/src/lib/parse_exports.ts

@@ -3,8 +3,8 @@ import {extname} from 'node:path';
 import type {Flavored} from '@ryanatkn/belt/types.js';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import type {Src_Module_Declaration_Kind} from '@ryanatkn/belt/src_json.js';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
-import type {Path_Id} from './path.ts';
 import {TS_MATCHER} from './constants.ts';
 import {Parse_Exports_Context} from './parse_exports_context.ts';
 

package/src/lib/parse_imports.ts

@@ -1,8 +1,8 @@
 import {parseSync, type ImportDeclaration} from 'oxc-parser';
 import type {Flavored} from '@ryanatkn/belt/types.js';
 import {Unreachable_Error} from '@ryanatkn/belt/error.js';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
-import type {Path_Id} from './path.ts';
 import {JS_MATCHER, TS_MATCHER, SVELTE_MATCHER, SVELTE_SCRIPT_MATCHER} from './constants.ts';
 
 export type Import_Specifier = Flavored<string, 'Import_Specifier'>;

package/src/lib/paths.ts

@@ -2,6 +2,7 @@ import {join, extname, relative, basename} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import {ensure_end, strip_end} from '@ryanatkn/belt/string.js';
 import {styleText as st} from 'node:util';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import {
 	GRO_CONFIG_FILENAME,
@@ -11,7 +12,6 @@ import {
 	SVELTEKIT_DIST_DIRNAME,
 } from './constants.ts';
 import {default_svelte_config} from './svelte_config.ts';
-import type {Path_Id} from './path.ts';
 
 /*
 

package/src/lib/publish.task.ts

@@ -2,13 +2,6 @@ import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
 import {styleText as st} from 'node:util';
 import {existsSync} from 'node:fs';
-
-import {Task_Error, type Task} from './task.ts';
-import {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';
-import {load_from_env} from './env.ts';
 import {
 	Git_Branch,
 	Git_Origin,
@@ -16,7 +9,14 @@ import {
 	git_checkout,
 	git_fetch,
 	git_pull,
-} from './git.ts';
+} from '@ryanatkn/belt/git.js';
+
+import {Task_Error, type Task} from './task.ts';
+import {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';
+import {load_from_env} from './env.ts';
 import {CHANGESET_CLI} from './changeset_helpers.ts';
 
 export const Args = z.strictObject({

package/src/lib/resolve_specifier.ts

@@ -1,8 +1,8 @@
 import {extname, isAbsolute, join, relative} from 'node:path';
 import {existsSync} from 'node:fs';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import {replace_extension} from './paths.ts';
-import type {Path_Id} from './path.ts';
 
 // TODO ideally this module doesnt exist, but import.meta.resolve doesn't work in loaders last I tried
 

package/src/lib/search_fs.ts

@@ -3,8 +3,7 @@ import {to_array} from '@ryanatkn/belt/array.js';
 import {ensure_end} from '@ryanatkn/belt/string.js';
 import {isAbsolute, join} from 'node:path';
 import {existsSync, readdirSync} from 'node:fs';
-
-import type {File_Filter, Resolved_Path, Path_Filter} from './path.ts';
+import type {File_Filter, Resolved_Path, Path_Filter} from '@ryanatkn/belt/path.js';
 
 export interface Search_Fs_Options {
 	/**

package/src/lib/task.ts

@@ -5,9 +5,9 @@ import type {Timings} from '@ryanatkn/belt/timings.js';
 import {styleText as st} from 'node:util';
 import type {Result} from '@ryanatkn/belt/result.js';
 import {isAbsolute, join, relative} from 'node:path';
+import type {Path_Id} from '@ryanatkn/belt/path.js';
 
 import type {Args} from './args.ts';
-import type {Path_Id} from './path.ts';
 import type {Gro_Config} from './gro_config.ts';
 import type {Parsed_Svelte_Config} from './svelte_config.ts';
 import {

package/src/lib/upgrade.task.ts

@@ -1,10 +1,10 @@
 import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
 import {rmSync} from 'node:fs';
+import {Git_Origin, git_pull} from '@ryanatkn/belt/git.js';
 
 import {Task_Error, type Task} from './task.ts';
 import {extract_deps, load_package_json, type Package_Json_Dep} from './package_json.ts';
-import {Git_Origin, git_pull} from './git.ts';
 import {spawn_cli} from './cli.ts';
 import {serialize_args, to_forwarded_args} from './args.ts';
 import {NODE_MODULES_DIRNAME} from './constants.ts';

package/src/lib/watch_dir.ts

@@ -2,10 +2,9 @@ import {watch, type ChokidarOptions, type FSWatcher, type Matcher} from 'chokida
 import {relative} from 'node:path';
 import {statSync} from 'node:fs';
 import {create_deferred, type Deferred} from '@ryanatkn/belt/async.js';
+import type {Path_Filter} from '@ryanatkn/belt/path.js';
 import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
 
-import type {Path_Filter} from './path.ts';
-
 const TMP_FILE_PATTERN = /\.tmp\./;
 
 // TODO pretty hacky

package/dist/git.d.ts

@@ -1,81 +0,0 @@
-import type { SpawnOptions } from 'node:child_process';
-import { z } from 'zod';
-import type { Flavored } from '@ryanatkn/belt/types.js';
-export declare const Git_Origin: z.ZodString;
-export type Git_Origin = Flavored<string, 'Git_Origin'>;
-export declare const Git_Branch: z.ZodString;
-export type Git_Branch = Flavored<string, 'Git_Branch'>;
-/**
- * Returns the current git branch name or throws if something goes wrong.
- */
-export declare const git_current_branch_name: (options?: SpawnOptions) => Promise<Git_Branch>;
-/**
- * @returns a boolean indicating if the remote git branch exists
- */
-export declare const git_remote_branch_exists: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<boolean>;
-/**
- * @returns a boolean indicating if the local git branch exists
- */
-export declare const git_local_branch_exists: (branch: Git_Branch, options?: SpawnOptions) => Promise<boolean>;
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged or uncommitted changes, or `null` if it's clean
- */
-export declare const git_check_clean_workspace: (options?: SpawnOptions) => Promise<string | null>;
-/**
- * TODO make this return an enum and separate the text into a different function
- * @returns an error message if the git workspace has any unstaged stages, or `null` if it's clean
- */
-export declare const git_check_fully_staged_workspace: (options?: SpawnOptions) => Promise<string | null>;
-/**
- * Calls `git fetch` and throws if anything goes wrong.
- */
-export declare const git_fetch: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Calls `git checkout` and throws if anything goes wrong.
- * @returns the previous branch name, if it changed
- */
-export declare const git_checkout: (branch: Git_Branch, options?: SpawnOptions) => Promise<Git_Branch | null>;
-/**
- * Calls `git pull` and throws if anything goes wrong.
- */
-export declare const git_pull: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export declare const git_push: (origin: Git_Origin, branch?: Git_Branch, options?: SpawnOptions, set_upstream?: boolean) => Promise<void>;
-/**
- * Calls `git push` and throws if anything goes wrong.
- */
-export declare const git_push_to_create: (origin?: Git_Origin, branch?: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Deletes a branch locally and throws if anything goes wrong.
- */
-export declare const git_delete_local_branch: (branch: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Deletes a branch remotely and throws if anything goes wrong.
- */
-export declare const git_delete_remote_branch: (origin: Git_Origin, branch: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Resets the `target` branch back to its first commit both locally and remotely.
- */
-export declare const git_reset_branch_to_first_commit: (origin: Git_Origin, branch: Git_Branch, options?: SpawnOptions) => Promise<void>;
-/**
- * Returns the branch's latest commit hash or throws if something goes wrong.
- */
-export declare const git_current_commit_hash: (branch?: string, options?: SpawnOptions) => Promise<string | null>;
-/**
- * Returns the hash of the current branch's first commit or throws if something goes wrong.
- */
-export declare const git_current_branch_first_commit_hash: (options?: SpawnOptions) => Promise<string>;
-/**
- * Returns the global git config setting for `pull.rebase`.
- * Gro is currently written to expect `true`,
- * but the restriction could be loosened with additional work.
- */
-export declare const git_check_setting_pull_rebase: (options?: SpawnOptions) => Promise<boolean>;
-/**
- * Clones a branch locally to another directory and updates the origin to match the source.
- */
-export declare const git_clone_locally: (origin: Git_Origin, branch: Git_Branch, source_dir: string, target_dir: string, options?: SpawnOptions) => Promise<void>;
-//# sourceMappingURL=git.d.ts.map

package/dist/git.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"git.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/git.ts"],"names":[],"mappings":"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"}