@ryanatkn/gro 0.113.0 → 0.114.0

package/dist/changeset.task.d.ts

@@ -14,12 +14,12 @@ export declare const Args: z.ZodObject<{
     changelog: z.ZodDefault<z.ZodString>;
     install: z.ZodDefault<z.ZodBoolean>;
     'no-install': z.ZodDefault<z.ZodBoolean>;
-    origin: z.ZodDefault<z.ZodString>;
+    origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
 }, "strict", z.ZodTypeAny, {
     _: string[];
     dir: string;
     install: boolean;
-    origin: string;
+    origin: string & z.BRAND<"Git_Origin">;
     minor: boolean;
     major: boolean;
     changelog: string;

package/dist/changeset.task.js

@@ -9,6 +9,7 @@ import { exists } from './fs.js';
 import { load_package_json } from './package_json.js';
 import { find_cli, spawn_cli } from './cli.js';
 import { Git_Origin, git_push_to_create } from './git.js';
+import { has_sveltekit_library } from './gro_plugin_sveltekit_library.js';
 const RESTRICTED_ACCESS = 'restricted';
 const PUBLIC_ACCESS = 'public';
 const CHANGESET_DIR = '.changeset';
@@ -60,9 +61,12 @@ export const task = {
         if (!(await find_cli('changeset'))) {
             throw new Task_Error('changeset command not found: install @changesets/cli locally or globally');
         }
+        const package_json = await load_package_json();
+        if (!(await has_sveltekit_library(package_json))) {
+            throw new Task_Error('no SvelteKit library detected');
+        }
         const path = join(dir, 'config.json');
         const inited = await exists(path);
-        const package_json = await load_package_json();
         if (!inited) {
             await spawn_cli('changeset', ['init']);
             const access = access_arg ?? package_json.private ? RESTRICTED_ACCESS : PUBLIC_ACCESS;

package/dist/clean.task.d.ts

@@ -6,14 +6,14 @@ export declare const Args: z.ZodObject<{
     sveltekit: z.ZodDefault<z.ZodBoolean>;
     nodemodules: z.ZodDefault<z.ZodBoolean>;
     git: z.ZodDefault<z.ZodBoolean>;
-    git_origin: z.ZodDefault<z.ZodString>;
+    git_origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
 }, "strict", z.ZodTypeAny, {
     build_dev: boolean;
     build_dist: boolean;
     sveltekit: boolean;
     nodemodules: boolean;
     git: boolean;
-    git_origin: string;
+    git_origin: string & z.BRAND<"Git_Origin">;
 }, {
     build_dev?: boolean | undefined;
     build_dist?: boolean | undefined;

package/dist/clean.task.js

@@ -1,6 +1,7 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
 import { clean_fs } from './clean_fs.js';
+import { Git_Origin } from './git.js';
 export const Args = z
     .object({
     build_dev: z.boolean({ description: 'delete the Gro build dev directory' }).default(false),
@@ -14,11 +15,7 @@ export const Args = z
         description: 'run "git remote prune" to delete local branches referencing nonexistent remote branches',
     })
         .default(false),
-    git_origin: z
-        .string({
-        description: 'the origin to "git remote prune"',
-    })
-        .default('origin'),
+    git_origin: Git_Origin.describe('the origin to "git remote prune"').default('origin'),
 })
     .strict();
 export const task = {

package/dist/commit.task.d.ts

@@ -2,10 +2,13 @@ import { z } from 'zod';
 import type { Task } from './task.js';
 export declare const Args: z.ZodObject<{
     _: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+    origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
 }, "strict", z.ZodTypeAny, {
     _: string[];
+    origin: string & z.BRAND<"Git_Origin">;
 }, {
     _?: string[] | undefined;
+    origin?: string | undefined;
 }>;
 export type Args = z.infer<typeof Args>;
 export declare const task: Task<Args>;

package/dist/commit.task.js

@@ -1,6 +1,6 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
-import { git_current_branch_name } from './git.js';
+import { Git_Origin, git_current_branch_name, git_push } from './git.js';
 export const Args = z
     .object({
     _: z
@@ -8,15 +8,16 @@ export const Args = z
         description: 'the git commit message, the same as git commit -m or --message',
     })
         .default([]),
+    origin: Git_Origin.describe('git origin to commit to').default('origin'),
 })
     .strict();
 export const task = {
     summary: 'commit and push to a new branch',
     Args,
     run: async ({ args }) => {
-        const { _: [message], } = args;
+        const { _: [message], origin, } = args;
         const branch = await git_current_branch_name();
         await spawn('git', ['commit', '-a', '-m', message]);
-        await spawn(`git push -u origin ${branch}`, [], { shell: true });
+        await git_push(origin, branch, undefined, true);
     },
 };

package/dist/deploy.task.d.ts

@@ -1,9 +1,9 @@
 import { z } from 'zod';
 import { type Task } from './task.js';
 export declare const Args: z.ZodObject<{
-    source: z.ZodDefault<z.ZodString>;
-    target: z.ZodDefault<z.ZodString>;
-    origin: z.ZodDefault<z.ZodString>;
+    source: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Branch">>;
+    target: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Branch">>;
+    origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
     deploy_dir: z.ZodDefault<z.ZodString>;
     build_dir: z.ZodDefault<z.ZodString>;
     dry: z.ZodDefault<z.ZodBoolean>;
@@ -16,12 +16,12 @@ export declare const Args: z.ZodObject<{
     'no-build': z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     build: boolean;
-    target: string;
+    target: string & z.BRAND<"Git_Branch">;
     install: boolean;
-    origin: string;
+    origin: string & z.BRAND<"Git_Origin">;
     reset: boolean;
     'no-install': boolean;
-    source: string;
+    source: string & z.BRAND<"Git_Branch">;
     deploy_dir: string;
     build_dir: string;
     dry: boolean;

package/dist/deploy.task.js

@@ -120,7 +120,7 @@ export const task = {
             // It may not exist, or it may have been deleted after failing to sync above.
             if (!(await exists(resolved_deploy_dir))) {
                 const local_deploy_branch_exists = await git_local_branch_exists(target);
-                await git_fetch(origin, '+' + target + ':' + target); // fetch+merge and allow non-fastforward updates with the +
+                await git_fetch(origin, ('+' + target + ':' + target)); // fetch+merge and allow non-fastforward updates with the +
                 await git_clone_locally(origin, target, cwd, resolved_deploy_dir);
                 // Clean up if we created the target branch in the cwd
                 if (!local_deploy_branch_exists) {

package/dist/docs/README.gen.md.js

@@ -22,13 +22,13 @@ export const gen = async ({ origin_id }) => {
     const output_file_name = to_output_file_name(origin_base);
     // TODO this is GitHub-specific
     const root_link = `[${root_path}](/../..)`;
-    const docFiles = await search_fs(origin_dir);
-    const docPaths = [];
-    for (const path of docFiles.keys()) {
+    const doc_files = await search_fs(origin_dir);
+    const doc_paths = [];
+    for (const path of doc_files.keys()) {
         if (path === output_file_name || !path.endsWith('.md')) {
             continue;
         }
-        docPaths.push(path);
+        doc_paths.push(path);
     }
     // TODO do we want to use absolute paths instead of relative paths,
     // because GitHub works with them and it simplifies the code?
@@ -45,7 +45,7 @@ export const gen = async ({ origin_id }) => {
 
 ${breadcrumbs}
 
-${docPaths.reduce((docList, doc) => docList + `- [${basename(doc, '.md')}](${doc})\n`, '')}
+${doc_paths.reduce((docList, doc) => docList + `- [${basename(doc, '.md')}](${doc})\n`, '')}
 ${breadcrumbs}
 
 > <sub>generated by [${origin_base}](${origin_base})</sub>

package/dist/docs/README.md

@@ -7,7 +7,7 @@
 - [deploy](deploy.md)
 - [dev](dev.md)
 - [gen](gen.md)
-- [gro_plugin_sveltekit_frontend](gro_plugin_sveltekit_frontend.md)
+- [gro_plugin_sveltekit_app](gro_plugin_sveltekit_app.md)
 - [package_json](package_json.md)
 - [plugin](plugin.md)
 - [publish](publish.md)

package/dist/docs/{gro_plugin_sveltekit_frontend.md → gro_plugin_sveltekit_app.md}

@@ -15,7 +15,7 @@ const config: Gro_ConfigCreator = async (cfg) => {
 			// host_target?: Host_Target;
 			// well_known_package_json?: boolean | Map_Package_Json;
 			// well_known_src_json?: boolean | Map_Src_Json;
-			// filter_well_known_src?: (source: string, destination: string) => boolean | Promise<boolean>;
+			// well_known_src?: boolean | Copy_File_Filter;
 		}),
 	];
 	return cfg;
@@ -26,9 +26,19 @@ export default config;
 // src/lib/gro_plugin_sveltekit_app.ts
 export type Host_Target = 'github_pages' | 'static' | 'node';
 
+export interface Copy_File_Filter {
+	(file_path: string): boolean | Promise<boolean>;
+}
+
+// src/lib/package_json.ts
 export interface Map_Package_Json {
 	(package_json: Package_Json): Package_Json | null | Promise<Package_Json | null>;
 }
+
+// src/lib/src_json.ts
+export interface Map_Src_Json {
+	(src_json: Src_Json): Src_Json | null | Promise<Src_Json | null>;
+}
 ```
 
 ## `host_target`
@@ -92,6 +102,12 @@ The `.well-known/src.json` file contains more details about
 the `package.json`'s `exports`, like exported identifier names and types.
 It maps each export to a source file in `.well-known/src/`.
 
-The contents of your `src/` directory are copied to `.well-known/src/`
-using the same filter as `exports` in `package.json` by default,
-and this can be customized with `filter_well_known_src`.
+## `well_known_src`
+
+The contents of your `src/` directory can be included in the output
+if you want your app's source code to be available the same as the built files.
+This is disabled by default.
+If `well_known_src` is truthy,
+the plugin copies `src/` to `static/.well-known/src/` during `vite build`.
+Passing `true` uses the same filter as `exports` in `package.json` by default,
+and it also accepts a custom filter function.

package/dist/docs/package_json.md

@@ -12,18 +12,21 @@ behavior designed for public open source projects:
   copies `package.json` from your project root to your
   SvelteKit static directory at `.well-known/package.json` during `vite build`,
   mapping it with the optional
-  [`well_known_package_json` option](./gro_plugin_sveltekit_app.md#well_known_package_json)
+  [`well_known_package_json` option](./gro_plugin_sveltekit_app.md#well_known_package_json).
 - `gro_plugin_sveltekit_app` outputs `.well-known/src.json`
   using the `exports` property of `package.json` during `vite build`,
   containing additional information about the source modules,
   mapping it with the optional
-  [`well_known_src_json` option](./gro_plugin_sveltekit_app.md#well_known_src_json)
-- `gro_plugin_sveltekit_app` outputs `.well-known/src/` by
-  copying over `src/` filtered by `filter_well_known_src` during `vite build` -
-  this is costly (usually more than doubling the final output size
+  [`well_known_src_json` option](./gro_plugin_sveltekit_app.md#well_known_src_json).
+- If you opt in with `well_known_src`,
+  `gro_plugin_sveltekit_app` outputs `.well-known/src/` by
+  copying over `src/` during `vite build`, filtered by `well_known_src` if it's a function.
+  This is costly (usually more than doubling the final output size
   of the code files in bytes, not counting images and such),
-  and it slows the build because it copies your entire source tree (sorry to hard drives),
-  but the UX is not affected
+  it slows the build because it copies your entire source tree (sorry to hard drives),
+  and it exposes your source code the same as the built files.
 
-> ⚠️ Setting `"public": true` in `package.json` exposes your source code at your deployed endpoint!
-> If that's the public web, that means your source code is public.
+> ⚠️ Setting `"public": true` in `package.json` exposes your `package.json`
+> and `src.json` metadata with your other built files by default!
+> Further opting in with `well_known_src` exposes your actual source files.
+> If your built files are public, that means these additional files are also public.

package/dist/git.d.ts

@@ -1,23 +1,22 @@
 /// <reference types="node" />
-import type { Flavored } from '@ryanatkn/belt/types.js';
 import type { SpawnOptions } from 'child_process';
 import { z } from 'zod';
-export declare const Git_Origin: z.ZodString;
-export type Git_Origin = Flavored<z.infer<typeof Git_Origin>, 'Git_Origin'>;
-export declare const Git_Branch: z.ZodString;
-export type Git_Branch = Flavored<z.infer<typeof Git_Branch>, 'Git_Branch'>;
+export declare const Git_Origin: z.ZodBranded<z.ZodString, "Git_Origin">;
+export type Git_Origin = z.infer<typeof Git_Origin>;
+export declare const Git_Branch: z.ZodBranded<z.ZodString, "Git_Branch">;
+export type Git_Branch = z.infer<typeof Git_Branch>;
 /**
  * Returns the current git branch name or throws if something goes wrong.
  */
-export declare const git_current_branch_name: (options?: SpawnOptions) => Promise<string>;
+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?: Flavored<string, "Git_Origin">, branch?: any, options?: SpawnOptions) => Promise<boolean>;
+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: Flavored<string, "Git_Branch">, options?: SpawnOptions) => Promise<boolean>;
+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
@@ -26,36 +25,36 @@ export declare const git_check_clean_workspace: (options?: SpawnOptions) => Prom
 /**
  * Calls `git fetch` and throws if anything goes wrong.
  */
-export declare const git_fetch: (origin?: Flavored<string, "Git_Origin">, branch?: any, options?: SpawnOptions) => Promise<void>;
+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: Flavored<string, "Git_Branch">, options?: SpawnOptions) => Promise<Git_Branch | null>;
+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?: Flavored<string, "Git_Origin">, branch?: any, options?: SpawnOptions) => Promise<void>;
+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: Flavored<string, "Git_Origin">, branch: Flavored<string, "Git_Branch">, options?: SpawnOptions) => Promise<void>;
+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?: Flavored<string, "Git_Origin">, branch?: any, options?: SpawnOptions) => Promise<void>;
+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: Flavored<string, "Git_Branch">, options?: SpawnOptions) => Promise<void>;
+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: Flavored<string, "Git_Origin">, branch: Flavored<string, "Git_Branch">, options?: SpawnOptions) => Promise<void>;
+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: Flavored<string, "Git_Origin">, branch: Flavored<string, "Git_Branch">, options?: SpawnOptions) => Promise<void>;
+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.
  */
@@ -73,4 +72,4 @@ export declare const git_check_setting_pull_rebase: (options?: SpawnOptions) =>
 /**
  * Clones a branch locally to another directory and updates the origin to match the source.
  */
-export declare const git_clone_locally: (origin: Flavored<string, "Git_Origin">, branch: Flavored<string, "Git_Branch">, source_dir: string, target_dir: string, options?: SpawnOptions) => Promise<void>;
+export declare const git_clone_locally: (origin: Git_Origin, branch: Git_Branch, source_dir: string, target_dir: string, options?: SpawnOptions) => Promise<void>;

package/dist/git.js

@@ -3,8 +3,8 @@ import { z } from 'zod';
 import { exists } from './fs.js';
 import { to_file_path } from './path.js';
 // TODO maybe extract to `util-git`
-export const Git_Origin = z.string();
-export const Git_Branch = z.string();
+export const Git_Origin = z.string().brand('Git_Origin');
+export const Git_Branch = z.string().brand('Git_Branch');
 /**
  * Returns the current git branch name or throws if something goes wrong.
  */
@@ -105,9 +105,12 @@ export const git_pull = async (origin = 'origin', branch, options) => {
 /**
  * Calls `git push` and throws if anything goes wrong.
  */
-export const git_push = async (origin, branch, options) => {
+export const git_push = async (origin, branch, options, set_upstream = false) => {
     const final_branch = branch ?? (await git_current_branch_name(options));
-    const result = await spawn('git', ['push', origin, final_branch], options);
+    const args = ['push', origin, final_branch];
+    if (set_upstream)
+        args.push('-u');
+    const result = await spawn('git', args, options);
     if (!result.ok) {
         throw Error(`git_push failed for branch '${final_branch}' with code ${result.code}`);
     }

package/dist/gro_plugin_sveltekit_app.d.ts

@@ -19,9 +19,13 @@ export interface Options {
      */
     well_known_src_json?: boolean | Map_Src_Json;
     /**
-     * Filter what's copied from `src/` to `.well-known/src/`.
+     * If truthy, copies `src/` to `/.well-known/src/` to the static output.
+     * Pass a function to customize which files get copied.
      */
-    filter_well_known_src?: (source: string, destination: string) => boolean | Promise<boolean>;
+    well_known_src?: boolean | Copy_File_Filter;
 }
 export type Host_Target = 'github_pages' | 'static' | 'node';
-export declare const gro_plugin_sveltekit_app: ({ host_target, well_known_package_json, well_known_src_json, filter_well_known_src, }?: Options) => Plugin<Plugin_Context>;
+export interface Copy_File_Filter {
+    (file_path: string): boolean | Promise<boolean>;
+}
+export declare const gro_plugin_sveltekit_app: ({ host_target, well_known_package_json, well_known_src_json, well_known_src, }?: Options) => Plugin<Plugin_Context>;

package/dist/gro_plugin_sveltekit_app.js

@@ -11,7 +11,7 @@ import { serialize_src_json, create_src_json } from './src_json.js';
 import { DEFAULT_EXPORTS_EXCLUDER } from './config.js';
 import { SVELTEKIT_CONFIG_FILENAME } from './paths.js';
 export const has_sveltekit_app = () => exists(SVELTEKIT_CONFIG_FILENAME);
-export const gro_plugin_sveltekit_app = ({ host_target = 'github_pages', well_known_package_json, well_known_src_json, filter_well_known_src = (source) => !DEFAULT_EXPORTS_EXCLUDER.test(source), } = {}) => {
+export const gro_plugin_sveltekit_app = ({ host_target = 'github_pages', well_known_package_json, well_known_src_json, well_known_src, } = {}) => {
     let sveltekit_process = null;
     return {
         name: 'gro_plugin_sveltekit_app',
@@ -65,8 +65,10 @@ export const gro_plugin_sveltekit_app = ({ host_target = 'github_pages', well_kn
                     serialized_src_json
                         ? await create_temporarily(join(assets_path, '.well-known/src.json'), serialized_src_json)
                         : null,
-                    serialized_src_json
-                        ? await copy_temporarily('src', assets_path, '.well-known', filter_well_known_src)
+                    serialized_src_json && well_known_src
+                        ? await copy_temporarily('src', assets_path, '.well-known', well_known_src === true
+                            ? (file_path) => !DEFAULT_EXPORTS_EXCLUDER.test(file_path)
+                            : well_known_src)
                         : null,
                     /**
                      * GitHub pages processes everything with Jekyll by default,

package/dist/package.d.ts

@@ -95,6 +95,7 @@ export declare const package_json: {
             default: string;
             types: string;
         };
+        './package.json': string;
         './args.js': {
             default: string;
             types: string;
@@ -416,6 +417,10 @@ export declare const src_json: {
                 kind: string;
             }[];
         };
+        './package.json': {
+            path: string;
+            declarations: never[];
+        };
         './args.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.113.0',
+    version: '0.114.0',
     description: 'task runner and toolkit extending SvelteKit',
     icon: '🌰',
     public: true,
@@ -78,6 +78,7 @@ export const package_json = {
     },
     exports: {
         '.': { default: './dist/index.js', types: './dist/index.d.ts' },
+        './package.json': './package.json',
         './args.js': { default: './dist/args.js', types: './dist/args.d.ts' },
         './build.task.js': { default: './dist/build.task.js', types: './dist/build.task.d.ts' },
         './changelog.js': { default: './dist/changelog.js', types: './dist/changelog.d.ts' },
@@ -234,7 +235,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.113.0',
+    version: '0.114.0',
     modules: {
         '.': {
             path: 'index.ts',
@@ -250,6 +251,7 @@ export const src_json = {
                 { name: 'Task_Error', kind: 'class' },
             ],
         },
+        './package.json': { path: 'package.json', declarations: [] },
         './args.js': {
             path: 'args.ts',
             declarations: [
@@ -525,6 +527,7 @@ export const src_json = {
                 { name: 'has_sveltekit_app', kind: 'function' },
                 { name: 'Options', kind: 'type' },
                 { name: 'Host_Target', kind: 'type' },
+                { name: 'Copy_File_Filter', kind: 'type' },
                 { name: 'gro_plugin_sveltekit_app', kind: 'function' },
             ],
         },

package/dist/package_json.d.ts

@@ -39,7 +39,7 @@ export declare const Package_Json_Funding: z.ZodUnion<[z.ZodString, z.ZodObject<
     url: z.ZodString;
 }, z.ZodTypeAny, "passthrough">>]>;
 export type Package_Json_Funding = z.infer<typeof Package_Json_Funding>;
-export declare const Package_Json_Exports: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>;
+export declare const Package_Json_Exports: z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>>;
 export type Package_Json_Exports = z.infer<typeof Package_Json_Exports>;
 /**
  * @see https://docs.npmjs.com/cli/v10/configuring-npm/package-json
@@ -125,7 +125,7 @@ export declare const Package_Json: z.ZodIntersection<z.ZodRecord<z.ZodString, z.
     scripts: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     bin: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     files: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    exports: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>, any, Record<string, Record<string, string> | undefined>>>;
+    exports: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>>, any, Record<string, string | Record<string, string> | undefined>>>;
     dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     peerDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
@@ -215,7 +215,7 @@ export declare const Package_Json: z.ZodIntersection<z.ZodRecord<z.ZodString, z.
     scripts: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     bin: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     files: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    exports: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>, any, Record<string, Record<string, string> | undefined>>>;
+    exports: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>>, any, Record<string, string | Record<string, string> | undefined>>>;
     dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     peerDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
@@ -305,7 +305,7 @@ export declare const Package_Json: z.ZodIntersection<z.ZodRecord<z.ZodString, z.
     scripts: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     bin: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     files: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
-    exports: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>>, any, Record<string, Record<string, string> | undefined>>>;
+    exports: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodRecord<z.ZodString, z.ZodString>]>>>, any, Record<string, string | Record<string, string> | undefined>>>;
     dependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     devDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
     peerDependencies: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;

package/dist/package_json.js

@@ -42,7 +42,7 @@ export const Package_Json_Funding = z.union([
     })
         .passthrough(),
 ]);
-export const Package_Json_Exports = z.record(z.record(z.string()).optional());
+export const Package_Json_Exports = z.record(z.union([z.string(), z.record(z.string())]).optional());
 /**
  * @see https://docs.npmjs.com/cli/v10/configuring-npm/package-json
  */
@@ -149,13 +149,22 @@ export const update_package_json = async (dir = paths.root, update, write = true
         await write_package_json(updated_contents);
     return { package_json: updated, changed: true };
 };
+const is_index = (path) => path === 'index.ts' || path === 'index.js';
 export const to_package_exports = (paths) => {
     const sorted = paths
         .slice()
-        .sort((a, b) => (a === 'index.ts' ? -1 : b === 'index.ts' ? 1 : a.localeCompare(b)));
+        .sort((a, b) => (is_index(a) ? -1 : is_index(b) ? 1 : a.localeCompare(b)));
+    // Add the package.json after the index, if one exists.
+    // Including the `./` here ensures we don't conflict with any potential `$lib/package.json`.
+    const final_sorted = is_index(sorted[0])
+        ? [sorted[0]].concat('./package.json', sorted.slice(1))
+        : ['./package.json'].concat(sorted);
     const exports = {};
-    for (const path of sorted) {
-        if (path.endsWith('.json.d.ts')) {
+    for (const path of final_sorted) {
+        if (path === './package.json') {
+            exports['./package.json'] = './package.json';
+        }
+        else if (path.endsWith('.json.d.ts')) {
             const json_path = path.substring(0, path.length - 5);
             exports['./' + json_path] = {
                 default: IMPORT_PREFIX + json_path, // assuming a matching json file
@@ -164,14 +173,14 @@ export const to_package_exports = (paths) => {
         }
         else if (path.endsWith('.ts') && !path.endsWith('.d.ts')) {
             const js_path = replace_extension(path, '.js');
-            const key = path === 'index.ts' ? '.' : './' + js_path;
+            const key = is_index(path) ? '.' : './' + js_path;
             exports[key] = {
                 default: IMPORT_PREFIX + js_path,
                 types: IMPORT_PREFIX + replace_extension(path, '.d.ts'),
             };
         }
         else if (path.endsWith('.js')) {
-            const key = path === 'index.js' ? '.' : './' + path;
+            const key = is_index(path) ? '.' : './' + path;
             exports[key] = {
                 default: IMPORT_PREFIX + path,
                 types: IMPORT_PREFIX + replace_extension(path, '.d.ts'), // assuming JSDoc types

package/dist/package_json.test.js

@@ -45,6 +45,7 @@ test('serialize_package_json fails with bad data', async () => {
 });
 test('to_package_exports', async () => {
     assert.equal(to_package_exports(['a/b.ts']), {
+        './package.json': './package.json',
         './a/b.js': {
             default: './dist/a/b.js',
             types: './dist/a/b.d.ts',
@@ -54,7 +55,13 @@ test('to_package_exports', async () => {
         'a/b/Some_Test_Svelte.svelte',
         'a/b/some_test_ts.ts',
         'a/b/some_test_json.json',
+        'index.ts',
     ]), {
+        '.': {
+            default: './dist/index.js',
+            types: './dist/index.d.ts',
+        },
+        './package.json': './package.json',
         './a/b/some_test_json.json': {
             default: './dist/a/b/some_test_json.json',
         },

package/dist/publish.task.d.ts

@@ -1,7 +1,8 @@
 import { z } from 'zod';
 import { type Task } from './task.js';
 export declare const Args: z.ZodObject<{
-    branch: z.ZodDefault<z.ZodString>;
+    branch: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Branch">>;
+    origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
     changelog: z.ZodDefault<z.ZodString>;
     preserve_changelog: z.ZodDefault<z.ZodBoolean>;
     dry: z.ZodDefault<z.ZodBoolean>;
@@ -11,7 +12,8 @@ export declare const Args: z.ZodObject<{
     'no-install': z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     install: boolean;
-    branch: string;
+    origin: string & z.BRAND<"Git_Origin">;
+    branch: string & z.BRAND<"Git_Branch">;
     changelog: string;
     'no-install': boolean;
     check: boolean;
@@ -20,6 +22,7 @@ export declare const Args: z.ZodObject<{
     'no-check': boolean;
 }, {
     branch?: string | undefined;
+    origin?: string | undefined;
     changelog?: string | undefined;
     preserve_changelog?: boolean | undefined;
     dry?: boolean | undefined;

package/dist/publish.task.js

@@ -9,6 +9,7 @@ import { is_this_project_gro } from './paths.js';
 import { has_sveltekit_library } from './gro_plugin_sveltekit_library.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';
 // publish.task.ts
 // - usage: `gro publish patch`
 // - forwards args to `npm version`: https://docs.npmjs.com/v6/commands/npm-version
@@ -17,7 +18,8 @@ import { load_from_env } from './env.js';
 // - syncs commits and tags to the configured main branch
 export const Args = z
     .object({
-    branch: z.string({ description: 'branch to publish from' }).default('main'),
+    branch: Git_Branch.describe('branch to publish from').default('main'),
+    origin: Git_Origin.describe('git origin to publish from').default('origin'),
     changelog: z
         .string({ description: 'file name and path of the changelog' })
         .default('CHANGELOG.md'),
@@ -43,7 +45,7 @@ export const task = {
     summary: 'bump version, publish to npm, and git push',
     Args,
     run: async ({ args, log, invoke_task }) => {
-        const { branch, changelog, preserve_changelog, dry, check, install } = args;
+        const { branch, changelog, preserve_changelog, dry, check, install, origin } = args;
         if (dry) {
             log.info(green('dry run!'));
         }
@@ -59,9 +61,9 @@ export const task = {
             throw new Task_Error('changeset command not found: install @changesets/cli locally or globally');
         }
         // Make sure we're on the right branch:
-        await spawn('git', ['fetch', 'origin', branch]);
-        await spawn('git', ['checkout', branch]);
-        await spawn('git', ['pull', 'origin', branch]);
+        await git_fetch(origin, branch);
+        await git_checkout(branch);
+        await git_pull(origin, branch);
         // Check before proceeding.
         if (check) {
             await invoke_task('check', { workspace: true });

package/dist/src_json.test.js

@@ -10,6 +10,7 @@ test('to_package_modules', async () => {
         'fixtures/modules/some_test_ts.ts',
         'fixtures/modules/some_test_json.json',
     ]), undefined, paths.source), {
+        './package.json': { path: 'package.json', declarations: [] },
         './fixtures/modules/some_test_css.css': {
             path: 'fixtures/modules/some_test_css.css',
             declarations: [],

package/dist/upgrade.task.d.ts

@@ -2,12 +2,18 @@ import { z } from 'zod';
 import type { Task } from './task.js';
 export declare const Args: z.ZodObject<{
     _: z.ZodDefault<z.ZodArray<z.ZodString, "many">>;
+    origin: z.ZodDefault<z.ZodBranded<z.ZodString, "Git_Origin">>;
+    force: z.ZodDefault<z.ZodBoolean>;
     dry: z.ZodDefault<z.ZodBoolean>;
 }, "strict", z.ZodTypeAny, {
     _: string[];
+    origin: string & z.BRAND<"Git_Origin">;
     dry: boolean;
+    force: boolean;
 }, {
     _?: string[] | undefined;
+    origin?: string | undefined;
+    force?: boolean | undefined;
     dry?: boolean | undefined;
 }>;
 export type Args = z.infer<typeof Args>;

package/dist/upgrade.task.js

@@ -1,9 +1,12 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
 import { load_package_json } from './package_json.js';
+import { Git_Origin, git_pull } from './git.js';
 export const Args = z
     .object({
     _: z.array(z.string(), { description: 'names of deps to exclude from the upgrade' }).default([]),
+    origin: Git_Origin.describe('git origin to deploy to').default('origin'),
+    force: z.boolean({ description: 'if true, print out the planned upgrades' }).default(false),
     dry: z.boolean({ description: 'if true, print out the planned upgrades' }).default(false),
 })
     .strict();
@@ -11,17 +14,22 @@ export const task = {
     summary: 'upgrade deps',
     Args,
     run: async ({ args, log, invoke_task }) => {
-        const { _, dry } = args;
+        const { _, origin, force, dry } = args;
+        // TODO maybe a different task that pulls and does other things, like `gro ready`
+        await git_pull(origin);
         const package_json = await load_package_json();
         const deps = to_deps(package_json).filter((d) => !_.includes(d.key));
         const upgrade_items = to_upgrade_items(deps);
+        log.info(`upgrading:`, upgrade_items.join(' '));
+        const install_args = ['install'].concat(upgrade_items);
         if (dry) {
+            install_args.push('--dry-run');
             log.info(`deps`, deps);
-            log.info(`upgrade_items`, upgrade_items);
-            return;
         }
-        log.info(`upgrading:`, upgrade_items.join(' '));
-        await spawn('npm', ['i'].concat(upgrade_items));
+        if (force) {
+            install_args.push('--force');
+        }
+        await spawn('npm', install_args);
         await invoke_task('sync');
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.113.0",
+  "version": "0.114.0",
   "description": "task runner and toolkit extending SvelteKit",
   "icon": "🌰",
   "public": true,
@@ -111,6 +111,7 @@
       "default": "./dist/index.js",
       "types": "./dist/index.d.ts"
     },
+    "./package.json": "./package.json",
     "./args.js": {
       "default": "./dist/args.js",
       "types": "./dist/args.d.ts"