@ryanatkn/gro 0.141.1 → 0.142.0

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

@@ -1 +1 @@
-{"version":3,"file":"changeset.task.d.ts","sourceRoot":"../src/lib/","sources":["changeset.task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAQtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAchD,eAAO,MAAM,IAAI;IAEf;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBK,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC;;;;;;;;GAQG;AACH,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAiF3B,CAAC"}
+{"version":3,"file":"changeset.task.d.ts","sourceRoot":"../src/lib/","sources":["changeset.task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,CAAC,EAAC,MAAM,KAAK,CAAC;AAQtB,OAAO,EAAa,KAAK,IAAI,EAAC,MAAM,WAAW,CAAC;AAchD,eAAO,MAAM,IAAI;IAEf;;OAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAkBK,CAAC;AACX,MAAM,MAAM,IAAI,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC;AAExC;;;;;;;;GAQG;AACH,eAAO,MAAM,IAAI,EAAE,IAAI,CAAC,IAAI,CAkF3B,CAAC"}

package/dist/changeset.task.js

@@ -44,7 +44,7 @@ export const task = {
     summary: 'call changeset with gro patterns',
     Args,
     run: async (ctx) => {
-        const { invoke_task, args: { _, minor, major, dir, access: access_arg, changelog, dep, origin, changeset_cli }, log, sveltekit_config, } = ctx;
+        const { invoke_task, args: { _, minor, major, dir, access: access_arg, changelog, dep, origin, changeset_cli }, log, sveltekit_config, config, } = ctx;
         const message = _.join(' ');
         if (!message && (minor || major))
             throw new Task_Error('cannot bump version without a message');
@@ -79,7 +79,7 @@ export const task = {
             }
             await spawn('git', ['add', dir]);
             if (dep) {
-                await spawn('npm', ['i', '-D', changelog]);
+                await spawn(config.pm_cli, ['i', '-D', changelog]);
             }
         }
         // TODO small problem here where generated files don't get committed

package/dist/filer.d.ts

@@ -1,6 +1,7 @@
 import type { Omit_Strict } from '@ryanatkn/belt/types.js';
 import type { Path_Id } from './path.js';
 import { watch_dir, type Watcher_Change, type Options as Watch_Dir_Options } from './watch_dir.js';
+import type { Package_Json } from './package_json.js';
 export interface Source_File {
     id: Path_Id;
     /**
@@ -8,6 +9,11 @@ export interface Source_File {
      * We create the file in memory to track its dependents regardless of its existence on disk.
      */
     contents: string | null;
+    /**
+     * Is the source file outside of the `root_dir` or excluded by `watch_dir_options.filter`?
+     */
+    external: boolean;
+    ctime: number | null;
     mtime: number | null;
     dependents: Map<Path_Id, Source_File>;
     dependencies: Map<Path_Id, Source_File>;
@@ -17,6 +23,7 @@ export type On_Filer_Change = (change: Watcher_Change, source_file: Source_File)
 export interface Options {
     watch_dir?: typeof watch_dir;
     watch_dir_options?: Partial<Omit_Strict<Watch_Dir_Options, 'on_change'>>;
+    package_json_cache?: Record<string, Package_Json>;
 }
 export declare class Filer {
     #private;

package/dist/filer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAGzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,OAAO,IAAI,iBAAiB,EAEjC,MAAM,gBAAgB,CAAC;AAYxB,MAAM,WAAW,WAAW;IAC3B,EAAE,EAAE,OAAO,CAAC;IAEZ;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;AAEzF,MAAM,WAAW,OAAO;IACvB,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;CACzE;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAa;gBAK1C,OAAO,GAAE,OAAsB;IAW3C,SAAS,OAAQ,OAAO,KAAG,WAAW,GAAG,SAAS,CAEhD;IAEF,aAAa,OAAQ,OAAO,KAAG,WAAW,CAYxC;IA+II,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ5B"}
+{"version":3,"file":"filer.d.ts","sourceRoot":"../src/lib/","sources":["filer.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,yBAAyB,CAAC;AAGzD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AACvC,OAAO,EACN,SAAS,EAET,KAAK,cAAc,EACnB,KAAK,OAAO,IAAI,iBAAiB,EAEjC,MAAM,gBAAgB,CAAC;AAQxB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAMpD,MAAM,WAAW,WAAW;IAC3B,EAAE,EAAE,OAAO,CAAC;IAEZ;;;OAGG;IACH,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;CACxC;AAED,MAAM,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,WAAW,KAAK,IAAI,CAAC;AAEzF,MAAM,WAAW,OAAO;IACvB,SAAS,CAAC,EAAE,OAAO,SAAS,CAAC;IAC7B,iBAAiB,CAAC,EAAE,OAAO,CAAC,WAAW,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC,CAAC;IACzE,kBAAkB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;CAClD;AAED,qBAAa,KAAK;;IACjB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAE3B,QAAQ,CAAC,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,WAAW,CAAC,CAAa;gBAO1C,OAAO,GAAE,OAAsB;IAY3C,SAAS,OAAQ,OAAO,KAAG,WAAW,GAAG,SAAS,CAEhD;IAEF,aAAa,OAAQ,OAAO,KAAG,WAAW,CAkBxC;IAmII,KAAK,CAAC,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,aAAa,CAAC;IAKxD,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAa5B"}

package/dist/filer.js

@@ -9,6 +9,7 @@ import { resolve_specifier } from './resolve_specifier.js';
 import { default_sveltekit_config } from './sveltekit_config.js';
 import { map_sveltekit_aliases } from './sveltekit_helpers.js';
 import { Unreachable_Error } from '@ryanatkn/belt/error.js';
+import { resolve_node_specifier } from './resolve_node_specifier.js';
 // TODO see below
 // import {resolve_node_specifier} from './resolve_node_specifier.js';
 const aliases = Object.entries(default_sveltekit_config.alias);
@@ -17,10 +18,12 @@ export class Filer {
     files = new Map();
     #watch_dir;
     #watch_dir_options;
+    #package_json_cache;
     constructor(options = EMPTY_OBJECT) {
         this.#watch_dir = options.watch_dir ?? watch_dir;
         this.#watch_dir_options = options.watch_dir_options ?? EMPTY_OBJECT;
         this.root_dir = resolve(options.watch_dir_options?.dir ?? paths.source);
+        this.#package_json_cache = options.package_json_cache ?? {};
     }
     #watching;
     #listeners = new Set();
@@ -35,18 +38,23 @@ export class Filer {
         const file = {
             id,
             contents: null,
+            external: this.#is_external(id), // TODO maybe filter externals by default? the user needs to configure the filer then
+            ctime: null,
             mtime: null,
             dependents: new Map(),
             dependencies: new Map(),
         };
         this.files.set(id, file);
+        // TODO this may need to be batched/deferred
+        if (file.external) {
+            this.#on_change({ type: 'add', path: file.id, is_directory: false });
+        }
         return file;
     };
     #update(id) {
         const file = this.get_or_create(id);
         const stats = existsSync(id) ? statSync(id) : null;
-        // const mtime_prev = file.mtime;
-        // const mtime_changed = mtime_prev !== (stats?.mtimeMs ?? null);
+        file.ctime = stats?.ctimeMs ?? null;
         file.mtime = stats?.mtimeMs ?? null;
         const new_contents = stats ? readFileSync(id, 'utf8') : null;
         if (file.contents === new_contents) {
@@ -61,37 +69,24 @@ export class Filer {
             // TODO logic is duplicated from loader
             const path = map_sveltekit_aliases(specifier, aliases);
             // The specifier `path` has now been mapped to its final form, so we can inspect it.
-            if (path[0] === '.' || path[0] === '/') {
-                const { path_id } = resolve_specifier(path, dir);
-                dependencies_removed.delete(path_id);
-                if (!dependencies_before.has(path_id)) {
-                    const d = this.get_or_create(path_id);
-                    file.dependencies.set(d.id, d);
-                    d.dependents.set(file.id, file);
-                }
+            const resolved = path[0] === '.' || path[0] === '/'
+                ? resolve_specifier(path, dir)
+                : resolve_node_specifier(path, undefined, file.id, this.#package_json_cache, false);
+            if (!resolved)
+                continue; // ignore any missing imports like Node identifiers
+            const { path_id } = resolved;
+            dependencies_removed.delete(path_id);
+            if (!dependencies_before.has(path_id)) {
+                const d = this.get_or_create(path_id);
+                file.dependencies.set(d.id, d);
+                d.dependents.set(file.id, file);
             }
-            // TODO this doesn't work
-            // const resolved =
-            // 	path[0] === '.' || path[0] === '/'
-            // 		? resolve_specifier(path, dir)
-            // 		: resolve_node_specifier(path, dir);
-            // const {path_id} = resolved;
-            // dependencies_removed.delete(path_id);
-            // if (!dependencies_before.has(path_id)) {
-            // 	const d = this.get_or_create(path_id);
-            // 	file.dependencies.set(d.id, d);
-            // 	d.dependents.set(file.id, file);
-            // }
         }
         // update any removed dependencies
         for (const dependency_removed of dependencies_removed) {
-            const deleted1 = file.dependencies.delete(dependency_removed);
-            if (!deleted1)
-                throw Error('expected to delete1 ' + file.id); // TODO @many delete if correct
+            file.dependencies.delete(dependency_removed);
             const dependency_removed_file = this.get_or_create(dependency_removed);
-            const deleted2 = dependency_removed_file.dependents.delete(file.id);
-            if (!deleted2)
-                throw Error('expected to delete2 ' + file.id); // TODO @many delete if correct
+            dependency_removed_file.dependents.delete(file.id);
         }
         return file;
     }
@@ -151,7 +146,7 @@ export class Filer {
     }
     #on_change = (change) => {
         if (change.is_directory)
-            return;
+            return; // TODO manage directories?
         let source_file;
         switch (change.type) {
             case 'add':
@@ -182,4 +177,8 @@ export class Filer {
             this.#watching = undefined;
         }
     }
+    #is_external(id) {
+        const { filter } = this.#watch_dir_options;
+        return !id.startsWith(this.root_dir + '/') || (!!filter && !filter(id, false));
+    }
 }

package/dist/gro_config.d.ts

@@ -27,6 +27,10 @@ export interface Gro_Config {
      * directories and files are included if they pass all of these filters.
      */
     search_filters: Path_Filter[];
+    /**
+     * The CLI to use that's compatible with `npm install` and `npm link`. Defaults to `'npm'`.
+     */
+    pm_cli: string;
 }
 /**
  * The relaxed variant of `Gro_Config` that users can provide via `gro.config.ts`.
@@ -38,6 +42,7 @@ export interface Raw_Gro_Config {
     map_package_json?: Map_Package_Json | null;
     task_root_dirs?: string[];
     search_filters?: Path_Filter | Path_Filter[] | null;
+    pm_cli?: string;
 }
 export type Create_Gro_Config = (base_config: Gro_Config) => Raw_Gro_Config | Promise<Raw_Gro_Config>;
 export declare const create_empty_gro_config: () => Gro_Config;

package/dist/gro_config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gro_config.d.ts","sourceRoot":"../src/lib/","sources":["gro_config.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AAEpD;;;;GAIG;AACH,MAAM,WAAW,UAAU;IAC1B;;OAEG;IACH,OAAO,EAAE,qBAAqB,CAAC;IAC/B;;;;OAIG;IACH,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C;;;OAGG;IACH,cAAc,EAAE,OAAO,EAAE,CAAC;IAC1B;;;OAGG;IACH,cAAc,EAAE,WAAW,EAAE,CAAC;CAC9B;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC9B,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC;CACpD;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC/B,WAAW,EAAE,UAAU,KACnB,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE9C,eAAO,MAAM,uBAAuB,QAAO,UAUzC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAUnC,CAAC;AAWF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAE9F;;;GAGG;AACH,eAAO,MAAM,oBAAoB,eAAgB,cAAc,KAAG,UAoBjE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAAC;CACrD;AAED,eAAO,MAAM,eAAe,oBAA6B,OAAO,CAAC,UAAU,CAiB1E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,CACxC,aAAa,EAAE,GAAG,EAClB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,aAAa,IAAI,iBAS7B,CAAC"}
+{"version":3,"file":"gro_config.d.ts","sourceRoot":"../src/lib/","sources":["gro_config.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,aAAa,CAAC;AACvD,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACxD,OAAO,KAAK,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,WAAW,CAAC;AAEpD;;;;GAIG;AACH,MAAM,WAAW,UAAU;IAC1B;;OAEG;IACH,OAAO,EAAE,qBAAqB,CAAC;IAC/B;;;;OAIG;IACH,gBAAgB,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC1C;;;OAGG;IACH,cAAc,EAAE,OAAO,EAAE,CAAC;IAC1B;;;OAGG;IACH,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC9B,OAAO,CAAC,EAAE,qBAAqB,CAAC;IAChC,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC3C,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,cAAc,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,GAAG,IAAI,CAAC;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC/B,WAAW,EAAE,UAAU,KACnB,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;AAE9C,eAAO,MAAM,uBAAuB,QAAO,UAWzC,CAAC;AAEH;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,QAUnC,CAAC;AAWF,eAAO,MAAM,wBAAwB,QAAwD,CAAC;AAE9F;;;GAGG;AACH,eAAO,MAAM,oBAAoB,eAAgB,cAAc,KAAG,UAsBjE,CAAC;AAEF,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,OAAO,EAAE,cAAc,GAAG,iBAAiB,CAAC;CACrD;AAED,eAAO,MAAM,eAAe,oBAA6B,OAAO,CAAC,UAAU,CAiB1E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,CACxC,aAAa,EAAE,GAAG,EAClB,WAAW,EAAE,MAAM,KACf,OAAO,CAAC,aAAa,IAAI,iBAS7B,CAAC"}

package/dist/gro_config.js

@@ -13,6 +13,7 @@ export const create_empty_gro_config = () => ({
         IS_THIS_GRO ? null : GRO_DIST_DIR,
     ].filter((v) => v !== null),
     search_filters: [(id) => !DEFAULT_SEARCH_EXCLUDER.test(id)],
+    pm_cli: 'npm',
 });
 /**
  * The regexp used by default to exclude directories and files
@@ -42,7 +43,7 @@ export const normalize_gro_config = (raw_config) => {
     const empty_config = create_empty_gro_config();
     // All of the raw config properties are optional,
     // so fall back to the empty values when `undefined`.
-    const { plugins = empty_config.plugins, map_package_json = empty_config.map_package_json, task_root_dirs = empty_config.task_root_dirs, search_filters = empty_config.search_filters, } = raw_config;
+    const { plugins = empty_config.plugins, map_package_json = empty_config.map_package_json, task_root_dirs = empty_config.task_root_dirs, search_filters = empty_config.search_filters, pm_cli = empty_config.pm_cli, } = raw_config;
     return {
         plugins,
         map_package_json,
@@ -52,6 +53,7 @@ export const normalize_gro_config = (raw_config) => {
             : search_filters
                 ? [search_filters]
                 : [],
+        pm_cli,
     };
 };
 export const load_gro_config = async (dir = paths.root) => {

package/dist/gro_plugin_sveltekit_library.js

@@ -10,22 +10,22 @@ export const gro_plugin_sveltekit_library = ({ svelte_package_options, svelte_pa
                 await run_svelte_package(svelte_package_options, svelte_package_cli, log);
             }
         },
-        adapt: async ({ log, timings }) => {
+        adapt: async ({ log, timings, config }) => {
             const package_json = load_package_json();
             // `npm link`
             if (package_json.bin) {
-                const timing_to_npm_link = timings.start('npm link');
+                const timing_to_link = timings.start(`${config.pm_cli} link`);
                 await Promise.all(Object.values(package_json.bin).map(async (bin_path) => {
                     const chmod_result = await spawn('chmod', ['+x', bin_path]);
                     if (!chmod_result.ok)
                         log.error(`chmod on bin path ${bin_path} failed with code ${chmod_result.code}`);
                 }));
                 log.info(`linking`);
-                const link_result = await spawn('npm', ['link', '-f']); // TODO don't use `-f` unless necessary or at all?
+                const link_result = await spawn(config.pm_cli, ['link', '-f']); // TODO don't use `-f` unless necessary or at all?
                 if (!link_result.ok) {
                     throw new Task_Error(`Failed to link. ${print_spawn_result(link_result)}`);
                 }
-                timing_to_npm_link();
+                timing_to_link();
             }
         },
     };

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"../src/lib/","sources":["loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AAgFvD,eAAO,MAAM,IAAI,EAAE,QAwFlB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,WAoDrB,CAAC"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"../src/lib/","sources":["loader.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,QAAQ,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AAgFvD,eAAO,MAAM,IAAI,EAAE,QAwFlB,CAAC;AAEF,eAAO,MAAM,OAAO,EAAE,WA4DrB,CAAC"}

package/dist/loader.js

@@ -8,7 +8,7 @@ import { render_env_shim_module } from './sveltekit_shim_env.js';
 import { render_sveltekit_shim_app_environment, render_sveltekit_shim_app_paths, SVELTEKIT_SHIM_APP_ENVIRONMENT_MATCHER, SVELTEKIT_SHIM_APP_PATHS_MATCHER, sveltekit_shim_app_specifiers, } from './sveltekit_shim_app.js';
 import { default_sveltekit_config } from './sveltekit_config.js';
 import { SVELTE_MATCHER, SVELTE_RUNES_MATCHER } from './svelte_helpers.js';
-import { paths } from './paths.js';
+import { IS_THIS_GRO, paths } from './paths.js';
 import { JSON_MATCHER, NODE_MODULES_DIRNAME, TS_MATCHER } from './path_constants.js';
 import { to_define_import_meta_env, default_ts_transform_options } from './esbuild_helpers.js';
 import { resolve_specifier } from './resolve_specifier.js';
@@ -132,34 +132,40 @@ export const load = async (url, context, nextLoad) => {
     return nextLoad(url, context);
 };
 export const resolve = async (specifier, context, nextResolve) => {
-    if (specifier === '$env/static/public' ||
-        specifier === '$env/static/private' ||
-        specifier === '$env/dynamic/public' ||
-        specifier === '$env/dynamic/private') {
+    let s = specifier;
+    // Support SvelteKit `$env` imports
+    if (s === '$env/static/public' ||
+        s === '$env/static/private' ||
+        s === '$env/dynamic/public' ||
+        s === '$env/dynamic/private') {
         // The returned `url` is validated before `load` is called,
         // so we need a slightly roundabout strategy to pass through the specifier for virtual files.
         return {
-            url: pathToFileURL(join(dir, 'src/lib', specifier)).href,
+            url: pathToFileURL(join(dir, 'src/lib', s)).href,
             format: 'module',
             shortCircuit: true,
         };
     }
+    // Special case for Gro's dependencies that import into Gro.
+    // Without this, we'd need to add a dev dep to Gro for Gro, which causes problems.
+    if (IS_THIS_GRO && s.startsWith('@ryanatkn/gro')) {
+        s = join(dir, 'dist', s.substring(13));
+    }
     const parent_url = context.parentURL;
     if (!parent_url || NODE_MODULES_MATCHER.test(parent_url)) {
-        return nextResolve(specifier, context);
+        return nextResolve(s, context);
     }
-    const shimmed = sveltekit_shim_app_specifiers.get(specifier);
+    const shimmed = sveltekit_shim_app_specifiers.get(s);
     if (shimmed !== undefined) {
         return nextResolve(shimmed, context);
     }
-    const path = map_sveltekit_aliases(specifier, aliases);
-    // The specifier `path` has now been mapped to its final form, so we can inspect it.
-    if (path[0] !== '.' && path[0] !== '/') {
+    s = map_sveltekit_aliases(s, aliases);
+    // The specifier has now been mapped to its final form, so we can inspect it.
+    if (s[0] !== '.' && s[0] !== '/') {
         // Resolve to `node_modules`.
-        if (SVELTE_MATCHER.test(path) || JSON_MATCHER.test(path)) {
+        if (SVELTE_MATCHER.test(s) || JSON_MATCHER.test(s)) {
             // Match the behavior of Vite and esbuild for Svelte and JSON imports.
-            // TODO `.ts` too
-            const resolved = resolve_node_specifier(path, dir, parent_url, package_json_cache);
+            const resolved = resolve_node_specifier(s, dir, parent_url, package_json_cache); // `node:` specifiers shouldn't reach this point, so the assertion is safe
             return {
                 url: pathToFileURL(resolved.path_id_with_querystring).href,
                 format: 'module',
@@ -167,10 +173,10 @@ export const resolve = async (specifier, context, nextResolve) => {
             };
         }
         else {
-            return nextResolve(path, context);
+            return nextResolve(s, context);
         }
     }
-    const resolved = resolve_specifier(path, dirname(fileURLToPath(parent_url)));
+    const resolved = resolve_specifier(s, dirname(fileURLToPath(parent_url)));
     return {
         url: pathToFileURL(resolved.path_id_with_querystring).href,
         format: 'module',

package/dist/moss_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moss_helpers.d.ts","sourceRoot":"../src/lib/","sources":["moss_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,kBACb,YAAY,0EAIzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CA4B3D,CAAC"}
+{"version":3,"file":"moss_helpers.d.ts","sourceRoot":"../src/lib/","sources":["moss_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAIrD,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAG7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAGtD,eAAO,MAAM,gBAAgB,kBACb,YAAY,0EAIzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CA4B3D,CAAC"}

package/dist/moss_helpers.js

@@ -1,9 +1,10 @@
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
 import { has_dep } from './package_json.js';
+import { NODE_MODULES_DIRNAME } from './path_constants.js';
 export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
 // TODO plugin type?
-export const load_moss_plugin = async (package_json, dep_name = MOSS_PACKAGE_DEP_NAME, plugin_path = `node_modules/${dep_name}/dist/gro_plugin_moss.js`, // TODO maybe lookup from its `package_json.exports`? kinda unnecessary
+export const load_moss_plugin = async (package_json, dep_name = MOSS_PACKAGE_DEP_NAME, plugin_path = `${NODE_MODULES_DIRNAME}/${dep_name}/dist/gro_plugin_moss.js`, // TODO maybe lookup from its `package_json.exports`? kinda unnecessary
 local_plugin_path = 'src/lib/gro_plugin_moss.ts') => {
     if (!has_dep(dep_name, package_json)) {
         return {