@ryanatkn/gro 0.167.1 → 0.169.0

package/dist/paths.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paths.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/paths.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AASvC,eAAO,MAAM,WAAW,QAA2C,CAAC;AACpE,eAAO,MAAM,QAAQ,QAA2B,CAAC;AACjD,sBAAsB;AACtB,eAAO,MAAM,OAAO,QAAiB,CAAC;AACtC,eAAO,MAAM,cAAc,QAA8C,CAAC;AAE1E,MAAM,WAAW,KAAK;IACrB,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,sBAAsB;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,KAAG,KAW/C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,OAAO,KAAG,KAA4C,CAAC;AAEvF,eAAO,MAAM,SAAS,GAAI,IAAI,OAAO,KAAG,OACgC,CAAC;AAGzE,eAAO,MAAM,YAAY,GAAI,IAAI,OAAO,EAAE,SAAmB,KAAG,MACnC,CAAC;AAG9B,eAAO,MAAM,oBAAoB,GAAI,SAAS,OAAO,EAAE,SAAwB,KAAG,MACtD,CAAC;AAI7B,eAAO,MAAM,oBAAoB,GAAI,WAAW,MAAM,EAAE,SAA0B,KAAG,OAC3D,CAAC;AAE3B,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,SAAqB,KAAG,MAMhE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,eAAe,MAAM,KAAG,MAGvE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,OAA8B,CAAC;AAEjD,sBAAsB;AACtB,eAAO,MAAM,eAAe,SAAS,CAAC;AAYtC,eAAO,MAAM,WAAW,SAAsC,CAAC;AAC/D;;GAEG;AACH,eAAO,MAAM,SAAS,OAA2D,CAAC;AAClF,sBAAsB;AACtB,eAAO,MAAM,YAAY,QAAgD,CAAC"}
+{"version":3,"file":"paths.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/paths.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAkBpD,eAAO,MAAM,WAAW,QAA2C,CAAC;AACpE,eAAO,MAAM,QAAQ,QAA2B,CAAC;AACjD,sBAAsB;AACtB,eAAO,MAAM,OAAO,QAAiB,CAAC;AACtC,eAAO,MAAM,cAAc,QAA8C,CAAC;AAE1E,MAAM,WAAW,KAAK;IACrB,sBAAsB;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB;IACtB,GAAG,EAAE,MAAM,CAAC;IACZ,sBAAsB;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,sBAAsB;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,YAAY,GAAI,UAAU,MAAM,KAAG,KAW/C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,IAAI,OAAO,KAAG,KAA4C,CAAC;AAEvF,eAAO,MAAM,SAAS,GAAI,IAAI,OAAO,KAAG,OACgC,CAAC;AAGzE,eAAO,MAAM,YAAY,GAAI,IAAI,OAAO,EAAE,SAAmB,KAAG,MACnC,CAAC;AAG9B,eAAO,MAAM,oBAAoB,GAAI,SAAS,OAAO,EAAE,SAAwB,KAAG,MACtD,CAAC;AAI7B,eAAO,MAAM,oBAAoB,GAAI,WAAW,MAAM,EAAE,SAA0B,KAAG,OAC3D,CAAC;AAE3B,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,SAAqB,KAAG,MAMhE,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,EAAE,eAAe,MAAM,KAAG,MAGvE,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,KAAK,OAA8B,CAAC;AAEjD,sBAAsB;AACtB,eAAO,MAAM,eAAe,SAAS,CAAC;AAYtC,eAAO,MAAM,WAAW,SAAsC,CAAC;AAC/D;;GAEG;AACH,eAAO,MAAM,SAAS,OAA2D,CAAC;AAClF,sBAAsB;AACtB,eAAO,MAAM,YAAY,QAAgD,CAAC"}

package/dist/publish.task.d.ts

@@ -1,8 +1,8 @@
 import { z } from 'zod';
 import { type Task } from './task.ts';
 export declare const Args: z.ZodObject<{
-    branch: z.ZodDefault<z.ZodString>;
-    origin: z.ZodDefault<z.ZodString>;
+    branch: any;
+    origin: any;
     changelog: z.ZodDefault<z.ZodString>;
     preserve_changelog: z.ZodDefault<z.ZodBoolean>;
     optional: z.ZodDefault<z.ZodBoolean>;

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

@@ -1 +1 @@
-{"version":3,"file":"publish.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/publish.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAItB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAgBhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;kBAgCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA2I3B,CAAC"}
+{"version":3,"file":"publish.task.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/publish.task.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAYtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAQhD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;kBAgCf,CAAC;AACH,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CA2I3B,CAAC"}

package/dist/publish.task.js

@@ -2,13 +2,13 @@ import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
 import { styleText as st } from 'node:util';
 import { existsSync } from 'node:fs';
+import { Git_Branch, Git_Origin, git_check_clean_workspace, git_checkout, git_fetch, git_pull, } from '@ryanatkn/belt/git.js';
 import { Task_Error } from "./task.js";
 import { load_package_json, parse_repo_url } from "./package_json.js";
 import { find_cli, spawn_cli } from "./cli.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_check_clean_workspace, git_checkout, git_fetch, git_pull, } from "./git.js";
 import { CHANGESET_CLI } from "./changeset_helpers.js";
 export const Args = z.strictObject({
     branch: Git_Branch.describe('branch to publish from').default('main'),

package/dist/resolve_specifier.d.ts

@@ -1,4 +1,4 @@
-import type { Path_Id } from './path.ts';
+import type { Path_Id } from '@ryanatkn/belt/path.js';
 export interface Resolved_Specifier {
     /**
      * The resolved filesystem path for the specifier.

package/dist/resolve_specifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve_specifier.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/resolve_specifier.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIvC,MAAM,WAAW,kBAAkB;IAClC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,wBAAwB,EAAE,MAAM,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,SAAS,GAAG,4BAA4B,GAAG,4BAA4B,CAAC;IACnF,GAAG,EAAE,OAAO,CAAC;CACb;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,WAAW,MAAM,EAAE,KAAK,MAAM,KAAG,kBAgDlE,CAAC"}
+{"version":3,"file":"resolve_specifier.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/resolve_specifier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAC;AAMpD,MAAM,WAAW,kBAAkB;IAClC;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,wBAAwB,EAAE,MAAM,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,SAAS,EAAE,SAAS,GAAG,4BAA4B,GAAG,4BAA4B,CAAC;IACnF,GAAG,EAAE,OAAO,CAAC;CACb;AAED;;;;GAIG;AACH,eAAO,MAAM,iBAAiB,GAAI,WAAW,MAAM,EAAE,KAAK,MAAM,KAAG,kBAgDlE,CAAC"}

package/dist/run_task.js

@@ -1,7 +1,7 @@
 import { styleText as st } from 'node:util';
 import { print_log_label } from '@ryanatkn/belt/print.js';
 import { System_Logger } from '@ryanatkn/belt/log.js';
-import z from 'zod';
+import { z } from 'zod';
 import { parse_args } from "./args.js";
 import { log_task_help } from "./task_logging.js";
 import { Task_Error } from "./task.js";

package/dist/search_fs.d.ts

@@ -1,4 +1,4 @@
-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 {
     /**
      * One or more filter functions, any of which can short-circuit the search by returning `false`.

package/dist/search_fs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search_fs.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/search_fs.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,WAAW,CAAC;AAEvE,MAAM,WAAW,iBAAiB;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC;IACzE;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,GACrB,KAAK,MAAM,EACX,UAAS,iBAAgC,KACvC,KAAK,CAAC,aAAa,CAwBrB,CAAC;AAmCF,eAAO,MAAM,wBAAwB,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAG,MAAM,GAAG,IAOxE,CAAC"}
+{"version":3,"file":"search_fs.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/search_fs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,WAAW,EAAE,aAAa,EAAE,WAAW,EAAC,MAAM,wBAAwB,CAAC;AAEpF,MAAM,WAAW,iBAAiB;IACjC;;OAEG;IACH,MAAM,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC1C;;OAEG;IACH,WAAW,CAAC,EAAE,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC;IAC/C;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,aAAa,KAAK,MAAM,CAAC,CAAC;IACzE;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpB;AAED,eAAO,MAAM,SAAS,GACrB,KAAK,MAAM,EACX,UAAS,iBAAgC,KACvC,KAAK,CAAC,aAAa,CAwBrB,CAAC;AAmCF,eAAO,MAAM,wBAAwB,GAAI,OAAO,KAAK,CAAC,MAAM,CAAC,KAAG,MAAM,GAAG,IAOxE,CAAC"}

package/dist/src_json.d.ts

@@ -1,7 +1,8 @@
 import type { Package_Json, Package_Json_Exports } from '@ryanatkn/belt/package_json.js';
 import { Src_Json, Src_Modules } from '@ryanatkn/belt/src_json.js';
+import type { Logger } from '@ryanatkn/belt/log.js';
 export type Map_Src_Json = (src_json: Src_Json) => Src_Json | null | Promise<Src_Json | null>;
-export declare const create_src_json: (package_json: Package_Json, lib_path?: string) => Src_Json;
+export declare const create_src_json: (package_json: Package_Json, lib_path?: string, log?: Logger) => Src_Json;
 export declare const serialize_src_json: (src_json: Src_Json) => string;
-export declare const to_src_modules: (exports: Package_Json_Exports | undefined, lib_path?: string) => Src_Modules | undefined;
+export declare const to_src_modules: (exports: Package_Json_Exports | undefined, lib_path?: string, log?: Logger) => Src_Modules | undefined;
 //# sourceMappingURL=src_json.d.ts.map

package/dist/src_json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"src_json.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/src_json.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACvF,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,4BAA4B,CAAC;AAOjE,MAAM,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAE9F,eAAO,MAAM,eAAe,GAAI,cAAc,YAAY,EAAE,WAAW,MAAM,KAAG,QAK7E,CAAC;AAEJ,eAAO,MAAM,kBAAkB,GAAI,UAAU,QAAQ,KAAG,MAGvD,CAAC;AAEF,eAAO,MAAM,cAAc,GAC1B,SAAS,oBAAoB,GAAG,SAAS,EACzC,iBAAoB,KAClB,WAAW,GAAG,SA4ChB,CAAC"}
+{"version":3,"file":"src_json.d.ts","sourceRoot":"../src/lib/","sources":["../src/lib/src_json.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,YAAY,EAAE,oBAAoB,EAAC,MAAM,gCAAgC,CAAC;AACvF,OAAO,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,4BAA4B,CAAC;AACjE,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAOlD,MAAM,MAAM,YAAY,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,QAAQ,GAAG,IAAI,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAE9F,eAAO,MAAM,eAAe,GAC3B,cAAc,YAAY,EAC1B,WAAW,MAAM,EACjB,MAAM,MAAM,KACV,QAKA,CAAC;AAEJ,eAAO,MAAM,kBAAkB,GAAI,UAAU,QAAQ,KAAG,MAGvD,CAAC;AAEF,eAAO,MAAM,cAAc,GAC1B,SAAS,oBAAoB,GAAG,SAAS,EACzC,iBAAoB,EACpB,MAAM,MAAM,KACV,WAAW,GAAG,SA+ChB,CAAC"}

package/dist/src_json.js

@@ -7,16 +7,16 @@ import { paths, replace_extension } from "./paths.js";
 import { parse_exports } from "./parse_exports.js";
 import { TS_MATCHER, SVELTE_MATCHER, JSON_MATCHER, CSS_MATCHER } from "./constants.js";
 import { search_fs } from "./search_fs.js";
-export const create_src_json = (package_json, lib_path) => Src_Json.parse({
+export const create_src_json = (package_json, lib_path, log) => Src_Json.parse({
     name: package_json.name,
     version: package_json.version,
-    modules: to_src_modules(package_json.exports, lib_path),
+    modules: to_src_modules(package_json.exports, lib_path, log),
 });
 export const serialize_src_json = (src_json) => {
     const parsed = Src_Json.parse(src_json); // TODO can parse do the logic that normalize does? see `.transform`
     return JSON.stringify(parsed, null, 2) + '\n';
 };
-export const to_src_modules = (exports, lib_path = paths.lib) => {
+export const to_src_modules = (exports, lib_path = paths.lib, log) => {
     if (!exports)
         return;
     const file_paths = collect_file_paths(exports, lib_path);
@@ -40,7 +40,10 @@ export const to_src_modules = (exports, lib_path = paths.lib) => {
     // Process each file
     for (const { export_key, file_path } of file_paths) {
         const relative_path = file_path.replace(ensure_end(lib_path, '/'), '');
-        const declarations = parse_exports(file_path, program).map(({ name, kind }) => ({ name, kind }));
+        const declarations = parse_exports(file_path, program, undefined, log).map(({ name, kind }) => ({
+            name,
+            kind,
+        }));
         result[export_key] = declarations.length
             ? {
                 path: relative_path,

package/dist/task.d.ts

@@ -2,8 +2,8 @@ import type { Logger } from '@ryanatkn/belt/log.js';
 import type { z } from 'zod';
 import type { Timings } from '@ryanatkn/belt/timings.js';
 import type { Result } from '@ryanatkn/belt/result.js';
+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 { type Input_Path, type Resolved_Input_File, type Resolved_Input_Path } from './input_path.ts';

package/dist/task.d.ts.map

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

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 } from 'chokidar';
-import type { Path_Filter } from './path.ts';
+import { type ChokidarOptions, type Matcher } from 'chokidar';
+import type { Path_Filter } from '@ryanatkn/belt/path.js';
 export interface Watch_Node_Fs {
     init: () => Promise<void>;
     close: () => Promise<void>;
@@ -21,9 +21,16 @@ export interface Watch_Dir_Options {
      * @default true
      */
     absolute?: boolean;
+    /**
+     * Pattern to ignore files, merged into `chokidar.ignored` if also provided.
+     * - `undefined` (default) ignores files matching `.tmp.` pattern
+     * - `null` sets no default ignore pattern
+     * - or some custom pattern
+     */
+    ignored?: Matcher | null;
 }
 /**
  * Watch for changes on the filesystem using chokidar.
  */
-export declare const watch_dir: ({ dir, on_change, filter, absolute, chokidar, }: Watch_Dir_Options) => Watch_Node_Fs;
+export declare const watch_dir: ({ dir, on_change, filter, absolute, chokidar, ignored, }: Watch_Dir_Options) => Watch_Node_Fs;
 //# sourceMappingURL=watch_dir.d.ts.map

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,EAAiB,MAAM,UAAU,CAAC;AAKrE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAI3C,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;CACnB;AAED;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,iDAMvB,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/dist/watch_dir.js

@@ -2,10 +2,12 @@ import { watch } from 'chokidar';
 import { relative } from 'node:path';
 import { statSync } from 'node:fs';
 import { create_deferred } from '@ryanatkn/belt/async.js';
+import { EMPTY_OBJECT } from '@ryanatkn/belt/object.js';
+const TMP_FILE_PATTERN = /\.tmp\./;
 /**
  * Watch for changes on the filesystem using chokidar.
  */
-export const watch_dir = ({ dir, on_change, filter, absolute = true, chokidar, }) => {
+export const watch_dir = ({ dir, on_change, filter, absolute = true, chokidar, ignored = TMP_FILE_PATTERN, }) => {
     let watcher;
     let initing;
     return {
@@ -13,7 +15,7 @@ export const watch_dir = ({ dir, on_change, filter, absolute = true, chokidar, }
             if (initing)
                 return initing.promise;
             initing = create_deferred();
-            watcher = watch(dir, { ...chokidar });
+            watcher = watch(dir, resolve_chokidar_options(chokidar, ignored));
             watcher.on('add', (path) => {
                 const final_path = absolute ? path : relative(dir, path);
                 if (filter && !filter(final_path, false))
@@ -58,3 +60,10 @@ export const watch_dir = ({ dir, on_change, filter, absolute = true, chokidar, }
         },
     };
 };
+const resolve_chokidar_options = (options, ignored) => {
+    if (ignored === null)
+        return options;
+    const { ignored: i, ...rest } = options ?? EMPTY_OBJECT;
+    const resolved_ignored = i === undefined ? ignored : Array.isArray(i) ? [...i, ignored] : [i, ignored];
+    return { ...rest, ignored: resolved_ignored };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.167.1",
+  "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",
@@ -83,8 +83,8 @@
     "@changesets/changelog-git": "^0.2.1",
     "@changesets/types": "^6.1.0",
     "@ryanatkn/eslint-config": "^0.8.0",
-    "@ryanatkn/fuz": "^0.146.0",
-    "@ryanatkn/moss": "^0.35.0",
+    "@ryanatkn/fuz": "^0.147.0",
+    "@ryanatkn/moss": "^0.36.0",
     "@sveltejs/adapter-static": "^3.0.9",
     "@sveltejs/kit": "^2.37.1",
     "@sveltejs/package": "^2.5.0",
@@ -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/env.ts

@@ -18,6 +18,22 @@ export const load_env = (
 	return merge_envs(envs, visibility, public_prefix, private_prefix);
 };
 
+/**
+ * Loads a single env value without merging it into `process.env`.
+ * By default searches process.env, then a local `.env` if one exists, then `../.env` if it exists.
+ * Empty strings are semantically the same as `undefined` for more ergonomic fallbacks.
+ */
+export const load_from_env = (key: string, paths = ['.env', '../.env']): string | undefined => {
+	let v = process.env[key];
+	if (v) return v;
+	for (const path of paths) {
+		const env = load(path);
+		v = env?.[key];
+		if (v) return v;
+	}
+	return undefined;
+};
+
 const load = (path: string): Record<string, string> | undefined => {
 	if (!existsSync(path)) return;
 	const loaded = readFileSync(path, 'utf8');
@@ -60,16 +76,3 @@ export const is_public_env = (
 	private_prefix: string,
 ): boolean =>
 	key.startsWith(public_prefix) && (private_prefix === '' || !key.startsWith(private_prefix));
-
-/**
- * Loads a single env value without merging it into `process.env`.
- * By default searches process.env, then a local `.env` if one exists, then `../.env` if it exists.
- */
-export const load_from_env = (key: string, paths = ['.env', '../.env']): string | undefined => {
-	if (process.env[key]) return process.env[key];
-	for (const path of paths) {
-		const env = load(path);
-		if (env?.[key]) return env[key];
-	}
-	return undefined;
-};

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/gro_plugin_sveltekit_app.ts

@@ -91,7 +91,7 @@ export const gro_plugin_sveltekit_app = ({
 
 				// `.well-known/src.json` and `.well-known/src/`
 				const final_package_json = mapped_package_json ?? package_json;
-				const src_json = create_src_json(final_package_json, undefined);
+				const src_json = create_src_json(final_package_json, undefined, log);
 				if (well_known_src_json === undefined) {
 					well_known_src_json = final_package_json.public; // eslint-disable-line no-param-reassign
 				}

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.gen.ts

@@ -11,13 +11,13 @@ import type {Gen} from './gen.ts';
  * which mirrors `package.json` but in TypeScript,
  * allowing apps to import typesafe data from their own `package.json`.
  */
-export const gen: Gen = ({origin_path}) => {
+export const gen: Gen = ({origin_path, log}) => {
 	const package_json = load_package_json();
 	// TODO this can error with bad json data, do we need to update the package.json here first?
 	// similarly do this in other places too?
 	// part of the problem is that the package_json actually has a dependency on each of its exports and their deps,
 	// but only when they're added/removed right? see gro_plugin_gen for details
-	const src_json = create_src_json(package_json, undefined);
+	const src_json = create_src_json(package_json, undefined, log);
 
 	const is_this_belt = package_json.name === '@ryanatkn/belt'; // TODO more robust?