@ryanatkn/gro 0.139.0 → 0.139.2

package/dist/gro.config.default.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["gro.config.default.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAOvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBAeb,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"gro.config.default.d.ts","sourceRoot":"../src/lib/","sources":["gro.config.default.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,iBAAiB,CAAC;AAQvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBA0Bb,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/gro.config.default.js

@@ -3,6 +3,7 @@ import { has_server, gro_plugin_server } from './gro_plugin_server.js';
 import { gro_plugin_sveltekit_app } from './gro_plugin_sveltekit_app.js';
 import { has_sveltekit_app, has_sveltekit_library } from './sveltekit_helpers.js';
 import { gro_plugin_gen } from './gro_plugin_gen.js';
+import { load_moss_plugin } from './moss_helpers.js';
 /**
  * This is the default config that's passed to `gro.config.ts`
  * if it exists in the current project, and if not, this is the final config.
@@ -13,14 +14,21 @@ import { gro_plugin_gen } from './gro_plugin_gen.js';
  * - if `src/lib/server/server.ts`, assumes a Node server
  */
 const config = async (cfg) => {
-    const [has_sveltekit_library_result, has_server_result, has_sveltekit_app_result] = await Promise.all([has_sveltekit_library(), has_server(), has_sveltekit_app()]);
+    const [moss_plugin_result, has_sveltekit_library_result, has_server_result, has_sveltekit_app_result,] = await Promise.all([
+        load_moss_plugin(),
+        has_sveltekit_library(),
+        has_server(),
+        has_sveltekit_app(),
+    ]);
     cfg.plugins = () => [
-        has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
+        // put things that generate files before SvelteKit so it can see them
+        moss_plugin_result.ok ? moss_plugin_result.gro_plugin_moss() : null,
+        gro_plugin_gen(),
         has_server_result.ok ? gro_plugin_server() : null,
+        has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
         has_sveltekit_app_result.ok
             ? gro_plugin_sveltekit_app({ host_target: has_server_result.ok ? 'node' : 'github_pages' })
             : null,
-        gro_plugin_gen(),
     ].filter((v) => v !== null);
     return cfg;
 };

package/dist/moss_helpers.d.ts

@@ -0,0 +1,9 @@
+import type { Result } from '@ryanatkn/belt/result.js';
+import { type Package_Json } from './package_json.js';
+export declare const MOSS_PACKAGE_DEP_NAME = "@ryanatkn/moss";
+export declare const load_moss_plugin: (package_json?: Package_Json, dep_name?: string, plugin_path?: string) => Promise<Result<{
+    gro_plugin_moss: any;
+}, {
+    message: string;
+}>>;
+//# sourceMappingURL=moss_helpers.d.ts.map

package/dist/moss_helpers.d.ts.map

@@ -0,0 +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,8CAGzB,OAAO,CAAC,MAAM,CAAC;IAAC,eAAe,EAAE,GAAG,CAAA;CAAC,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAAC,CAmB3D,CAAC"}

package/dist/moss_helpers.js

@@ -0,0 +1,23 @@
+import { existsSync } from 'node:fs';
+import { resolve } from 'node:path';
+import { has_dep } from './package_json.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`) => {
+    if (!has_dep(dep_name, package_json)) {
+        return {
+            ok: false,
+            message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
+        };
+    }
+    const path = resolve(plugin_path);
+    if (!existsSync(path)) {
+        return {
+            ok: false,
+            // TODO warn?
+            message: `dependency on ${dep_name} detected but plugin not found at ${path}`,
+        };
+    }
+    const mod = await import(path);
+    return { ok: true, gro_plugin_moss: mod.gro_plugin_moss };
+};

package/dist/package.d.ts

@@ -277,6 +277,10 @@ export declare const package_json: {
             types: string;
             default: string;
         };
+        './moss_helpers.js': {
+            types: string;
+            default: string;
+        };
         './package_json.js': {
             types: string;
             default: string;
@@ -755,6 +759,13 @@ export declare const src_json: {
                 kind: string;
             }[];
         };
+        './moss_helpers.js': {
+            path: string;
+            declarations: {
+                name: string;
+                kind: string;
+            }[];
+        };
         './package_json.js': {
             path: string;
             declarations: {

package/dist/package.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package.d.ts","sourceRoot":"../src/lib/","sources":["package.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAsQD,CAAC;AAEzB,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6vBD,CAAC"}
+{"version":3,"file":"package.d.ts","sourceRoot":"../src/lib/","sources":["package.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuQD,CAAC;AAEzB,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuwBD,CAAC"}

package/dist/package.js

@@ -1,7 +1,7 @@
 // generated by src/lib/package.gen.ts
 export const package_json = {
     name: '@ryanatkn/gro',
-    version: '0.139.0',
+    version: '0.139.2',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     glyph: '🌰',
@@ -57,7 +57,7 @@ export const package_json = {
         '@changesets/types': '^6.0.0',
         '@ryanatkn/eslint-config': '^0.5.4',
         '@ryanatkn/fuz': '^0.129.0',
-        '@ryanatkn/moss': '^0.16.1',
+        '@ryanatkn/moss': '^0.18.0',
         '@sveltejs/adapter-static': '^3.0.5',
         '@sveltejs/kit': '^2.6.1',
         '@sveltejs/package': '^2.3.5',
@@ -176,6 +176,7 @@ export const package_json = {
         './loader.js': { types: './dist/loader.d.ts', default: './dist/loader.js' },
         './module.js': { types: './dist/module.d.ts', default: './dist/module.js' },
         './modules.js': { types: './dist/modules.d.ts', default: './dist/modules.js' },
+        './moss_helpers.js': { types: './dist/moss_helpers.d.ts', default: './dist/moss_helpers.js' },
         './package_json.js': { types: './dist/package_json.d.ts', default: './dist/package_json.js' },
         './package_meta.js': { types: './dist/package_meta.d.ts', default: './dist/package_meta.js' },
         './package.gen.js': { types: './dist/package.gen.d.ts', default: './dist/package.gen.js' },
@@ -263,7 +264,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.139.0',
+    version: '0.139.2',
     modules: {
         '.': {
             path: 'index.ts',
@@ -651,6 +652,13 @@ export const src_json = {
                 { name: 'load_modules', kind: 'function' },
             ],
         },
+        './moss_helpers.js': {
+            path: 'moss_helpers.ts',
+            declarations: [
+                { name: 'MOSS_PACKAGE_DEP_NAME', kind: 'variable' },
+                { name: 'load_moss_plugin', kind: 'function' },
+            ],
+        },
         './package_json.js': {
             path: 'package_json.ts',
             declarations: [
@@ -672,6 +680,9 @@ export const src_json = {
                 { name: 'update_package_json', kind: 'function' },
                 { name: 'to_package_exports', kind: 'function' },
                 { name: 'parse_repo_url', kind: 'function' },
+                { name: 'has_dep', kind: 'function' },
+                { name: 'Package_Json_Dep', kind: 'type' },
+                { name: 'extract_deps', kind: 'function' },
             ],
         },
         './package_meta.js': {

package/dist/package_json.d.ts

@@ -377,4 +377,10 @@ export declare const parse_repo_url: (package_json: Package_Json) => {
     owner: string;
     repo: string;
 } | undefined;
+export declare const has_dep: (dep_name: string, package_json?: Package_Json) => boolean;
+export interface Package_Json_Dep {
+    name: string;
+    version: string;
+}
+export declare const extract_deps: (package_json: Package_Json) => Package_Json_Dep[];
 //# sourceMappingURL=package_json.d.ts.map

package/dist/package_json.d.ts.map

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

package/dist/package_json.js

@@ -260,3 +260,23 @@ const parse_or_throw_formatted_error = (name, schema, value) => {
     }
     return parsed.data;
 };
+export const has_dep = (dep_name, package_json = load_package_json()) => !!package_json.devDependencies?.[dep_name] ||
+    !!package_json.dependencies?.[dep_name] ||
+    !!package_json.peerDependencies?.[dep_name];
+export const extract_deps = (package_json) => {
+    const deps_by_name = new Map();
+    // Earlier versions override later ones, so peer deps goes last.
+    const add_deps = (deps) => {
+        if (!deps)
+            return;
+        for (const [name, version] of Object.entries(deps)) {
+            if (!deps_by_name.has(name)) {
+                deps_by_name.set(name, { name, version });
+            }
+        }
+    };
+    add_deps(package_json.dependencies);
+    add_deps(package_json.devDependencies);
+    add_deps(package_json.peerDependencies);
+    return Array.from(deps_by_name.values());
+};

package/dist/sveltekit_helpers.d.ts

@@ -12,7 +12,7 @@ export declare const SVELTEKIT_ENV_MATCHER: RegExp;
 export declare const has_sveltekit_app: () => Result<object, {
     message: string;
 }>;
-export declare const has_sveltekit_library: (package_json?: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config) => Result<object, {
+export declare const has_sveltekit_library: (package_json?: Package_Json, sveltekit_config?: Parsed_Sveltekit_Config, dep_name?: string) => Result<object, {
     message: string;
 }>;
 export declare const sveltekit_sync: (sveltekit_cli?: string | Cli) => Promise<void>;

package/dist/sveltekit_helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAGlD,OAAO,EAAC,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AAClE,OAAO,EAA2B,KAAK,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAmC,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAIpE,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AAEnF,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBAClB,YAAY,qBACT,uBAAuB,KACvC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAqBlC,CAAC;AAEF,eAAO,MAAM,cAAc,mBACX,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CASd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,2BAA2B,mBACxB,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,mBAC/B,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACtC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,kBAAkB,YACrB,sBAAsB,GAAG,SAAS,OACtC,MAAM,GAAG,GAAG,OACZ,MAAM,KACT,OAAO,CAAC,IAAI,CAmBd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,qBAAqB,cACtB,MAAM,WACR,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC9B,MASF,CAAC"}
+{"version":3,"file":"sveltekit_helpers.d.ts","sourceRoot":"../src/lib/","sources":["sveltekit_helpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAGlD,OAAO,EAAC,YAAY,EAAU,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAA2B,KAAK,uBAAuB,EAAC,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAmC,KAAK,GAAG,EAAC,MAAM,UAAU,CAAC;AAIpE,eAAO,MAAM,aAAa,eAAe,CAAC;AAE1C,eAAO,MAAM,gBAAgB,iBAAiB,CAAC;AAE/C,eAAO,MAAM,kBAAkB,mBAAmB,CAAC;AACnD,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAE3D,eAAO,MAAM,QAAQ,SAAS,CAAC;AAE/B,eAAO,MAAM,qBAAqB,QAAgD,CAAC;AAEnF,eAAO,MAAM,iBAAiB,QAAO,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAMpE,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBAClB,YAAY,qBACT,uBAAuB,wBAEvC,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CAkBlC,CAAC;AAEF,eAAO,MAAM,cAAc,mBACX,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CASd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,2BAA2B,mBACxB,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,kCAAkC,mBAC/B,MAAM,GAAG,GAAG,KACzB,OAAO,CAAC,IAAI,CAUd,CAAC;AAEF;;;GAGG;AACH,MAAM,WAAW,sBAAsB;IACtC;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,MAAM,CAAC;IACX;;;;OAIG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,kBAAkB,YACrB,sBAAsB,GAAG,SAAS,OACtC,MAAM,GAAG,GAAG,OACZ,MAAM,KACT,OAAO,CAAC,IAAI,CAmBd,CAAC;AAGF;;GAEG;AACH,eAAO,MAAM,qBAAqB,cACtB,MAAM,WACR,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,KAC9B,MASF,CAAC"}

package/dist/sveltekit_helpers.js

@@ -1,6 +1,6 @@
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { Package_Json, load_package_json } from './package_json.js';
+import { Package_Json, has_dep } from './package_json.js';
 import { default_sveltekit_config } from './sveltekit_config.js';
 import { SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME } from './path_constants.js';
 import { find_cli, spawn_cli, to_cli_name } from './cli.js';
@@ -19,7 +19,7 @@ export const has_sveltekit_app = () => {
     // TODO check for routes?
     return { ok: true };
 };
-export const has_sveltekit_library = (package_json, sveltekit_config = default_sveltekit_config) => {
+export const has_sveltekit_library = (package_json, sveltekit_config = default_sveltekit_config, dep_name = SVELTE_PACKAGE_DEP_NAME) => {
     const has_sveltekit_app_result = has_sveltekit_app();
     if (!has_sveltekit_app_result.ok) {
         return has_sveltekit_app_result;
@@ -27,11 +27,10 @@ export const has_sveltekit_library = (package_json, sveltekit_config = default_s
     if (!existsSync(sveltekit_config.lib_path)) {
         return { ok: false, message: `no SvelteKit lib directory found at ${sveltekit_config.lib_path}` };
     }
-    const pkg = package_json ?? load_package_json();
-    if (!(pkg.devDependencies?.[SVELTE_PACKAGE_DEP_NAME] || pkg.dependencies?.[SVELTE_PACKAGE_DEP_NAME])) {
+    if (!has_dep(dep_name, package_json)) {
         return {
             ok: false,
-            message: `no dependency found in package.json for ${SVELTE_PACKAGE_DEP_NAME}, install it with \`npm i -D ${SVELTE_PACKAGE_DEP_NAME}\``,
+            message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
         };
     }
     return { ok: true };

package/dist/upgrade.task.js

@@ -1,7 +1,7 @@
 import { spawn } from '@ryanatkn/belt/process.js';
 import { z } from 'zod';
 import { Task_Error } from './task.js';
-import { load_package_json } from './package_json.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';
 export const Args = z
@@ -33,12 +33,12 @@ export const task = {
             await git_pull(origin);
         }
         const package_json = load_package_json();
-        const all_deps = to_deps(package_json);
+        const all_deps = extract_deps(package_json);
         const deps = only.length
-            ? all_deps.filter((d) => only.includes(d.key))
-            : all_deps.filter((d) => !_.includes(d.key));
+            ? all_deps.filter((d) => only.includes(d.name))
+            : all_deps.filter((d) => !_.includes(d.name));
         if (only.length && only.length !== deps.length) {
-            throw new Task_Error(`Some deps to upgrade were not found: ${only.filter((o) => !deps.find((d) => d.key === o)).join(', ')}`);
+            throw new Task_Error(`Some deps to upgrade were not found: ${only.filter((o) => !deps.find((d) => d.name === o)).join(', ')}`);
         }
         const upgrade_items = to_upgrade_items(deps);
         log.info(`upgrading:`, upgrade_items.join(' '));
@@ -55,26 +55,17 @@ export const task = {
         await spawn_cli('gro', ['sync', '--no-install']); // don't install because we do above
     },
 };
-const to_deps = (package_json) => {
-    const prod_deps = package_json.dependencies
-        ? Object.entries(package_json.dependencies).map(([key, value]) => ({ key, value }))
-        : [];
-    const dev_deps = package_json.devDependencies
-        ? Object.entries(package_json.devDependencies).map(([key, value]) => ({ key, value }))
-        : [];
-    return prod_deps.concat(dev_deps);
-};
 const EXACT_VERSION_MATCHER = /^..*@.+/;
 const CUSTOM_TAG_MATCHER = /^[\^~><=]*.+-(.+)/;
 // TODO hacky and limited
 // TODO probably want to pass through exact deps as well, e.g. @foo/bar@1
 const to_upgrade_items = (deps) => deps.map((dep) => {
-    if (EXACT_VERSION_MATCHER.test(dep.key)) {
-        return dep.key;
+    if (EXACT_VERSION_MATCHER.test(dep.name)) {
+        return dep.name;
     }
-    const custom_tag_matches = CUSTOM_TAG_MATCHER.exec(dep.value);
+    const custom_tag_matches = CUSTOM_TAG_MATCHER.exec(dep.version);
     if (custom_tag_matches) {
-        return dep.key + '@' + custom_tag_matches[1].split('.')[0]; // I tried adding `\.?` to the end but doesn't work and I'm being lazy so I'm just splitting
+        return dep.name + '@' + custom_tag_matches[1].split('.')[0]; // I tried adding `\.?` to the end but doesn't work and I'm being lazy so I'm just splitting
     }
-    return dep.key + '@latest';
+    return dep.name + '@latest';
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.139.0",
+  "version": "0.139.2",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -70,7 +70,7 @@
     "@changesets/types": "^6.0.0",
     "@ryanatkn/eslint-config": "^0.5.4",
     "@ryanatkn/fuz": "^0.129.0",
-    "@ryanatkn/moss": "^0.16.1",
+    "@ryanatkn/moss": "^0.18.0",
     "@sveltejs/adapter-static": "^3.0.5",
     "@sveltejs/kit": "^2.6.1",
     "@sveltejs/package": "^2.3.5",
@@ -298,6 +298,10 @@
       "types": "./dist/modules.d.ts",
       "default": "./dist/modules.js"
     },
+    "./moss_helpers.js": {
+      "types": "./dist/moss_helpers.d.ts",
+      "default": "./dist/moss_helpers.js"
+    },
     "./package_json.js": {
       "types": "./dist/package_json.d.ts",
       "default": "./dist/package_json.js"

package/src/lib/gro.config.default.ts

@@ -4,6 +4,7 @@ import {has_server, gro_plugin_server} from './gro_plugin_server.js';
 import {gro_plugin_sveltekit_app} from './gro_plugin_sveltekit_app.js';
 import {has_sveltekit_app, has_sveltekit_library} from './sveltekit_helpers.js';
 import {gro_plugin_gen} from './gro_plugin_gen.js';
+import {load_moss_plugin} from './moss_helpers.js';
 
 /**
  * This is the default config that's passed to `gro.config.ts`
@@ -15,17 +16,28 @@ import {gro_plugin_gen} from './gro_plugin_gen.js';
  * - if `src/lib/server/server.ts`, assumes a Node server
  */
 const config: Create_Gro_Config = async (cfg) => {
-	const [has_sveltekit_library_result, has_server_result, has_sveltekit_app_result] =
-		await Promise.all([has_sveltekit_library(), has_server(), has_sveltekit_app()]);
+	const [
+		moss_plugin_result,
+		has_sveltekit_library_result,
+		has_server_result,
+		has_sveltekit_app_result,
+	] = await Promise.all([
+		load_moss_plugin(),
+		has_sveltekit_library(),
+		has_server(),
+		has_sveltekit_app(),
+	]);
 
 	cfg.plugins = () =>
 		[
-			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
+			// put things that generate files before SvelteKit so it can see them
+			moss_plugin_result.ok ? moss_plugin_result.gro_plugin_moss() : null,
+			gro_plugin_gen(),
 			has_server_result.ok ? gro_plugin_server() : null,
+			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,
 			has_sveltekit_app_result.ok
 				? gro_plugin_sveltekit_app({host_target: has_server_result.ok ? 'node' : 'github_pages'})
 				: null,
-			gro_plugin_gen(),
 		].filter((v) => v !== null);
 
 	return cfg;

package/src/lib/moss_helpers.ts

@@ -0,0 +1,33 @@
+import type {Result} from '@ryanatkn/belt/result.js';
+import {existsSync} from 'node:fs';
+import {resolve} from 'node:path';
+
+import {has_dep, type Package_Json} from './package_json.js';
+
+export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
+
+// TODO plugin type?
+export const load_moss_plugin = async (
+	package_json?: 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
+): Promise<Result<{gro_plugin_moss: any}, {message: string}>> => {
+	if (!has_dep(dep_name, package_json)) {
+		return {
+			ok: false,
+			message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
+		};
+	}
+
+	const path = resolve(plugin_path);
+	if (!existsSync(path)) {
+		return {
+			ok: false,
+			// TODO warn?
+			message: `dependency on ${dep_name} detected but plugin not found at ${path}`,
+		};
+	}
+
+	const mod = await import(path);
+	return {ok: true, gro_plugin_moss: mod.gro_plugin_moss};
+};

package/src/lib/package.ts

@@ -5,7 +5,7 @@ import type {Src_Json} from './src_json.js';
 
 export const package_json = {
 	name: '@ryanatkn/gro',
-	version: '0.139.0',
+	version: '0.139.2',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -62,7 +62,7 @@ export const package_json = {
 		'@changesets/types': '^6.0.0',
 		'@ryanatkn/eslint-config': '^0.5.4',
 		'@ryanatkn/fuz': '^0.129.0',
-		'@ryanatkn/moss': '^0.16.1',
+		'@ryanatkn/moss': '^0.18.0',
 		'@sveltejs/adapter-static': '^3.0.5',
 		'@sveltejs/kit': '^2.6.1',
 		'@sveltejs/package': '^2.3.5',
@@ -181,6 +181,7 @@ export const package_json = {
 		'./loader.js': {types: './dist/loader.d.ts', default: './dist/loader.js'},
 		'./module.js': {types: './dist/module.d.ts', default: './dist/module.js'},
 		'./modules.js': {types: './dist/modules.d.ts', default: './dist/modules.js'},
+		'./moss_helpers.js': {types: './dist/moss_helpers.d.ts', default: './dist/moss_helpers.js'},
 		'./package_json.js': {types: './dist/package_json.d.ts', default: './dist/package_json.js'},
 		'./package_meta.js': {types: './dist/package_meta.d.ts', default: './dist/package_meta.js'},
 		'./package.gen.js': {types: './dist/package.gen.d.ts', default: './dist/package.gen.js'},
@@ -269,7 +270,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.139.0',
+	version: '0.139.2',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -657,6 +658,13 @@ export const src_json = {
 				{name: 'load_modules', kind: 'function'},
 			],
 		},
+		'./moss_helpers.js': {
+			path: 'moss_helpers.ts',
+			declarations: [
+				{name: 'MOSS_PACKAGE_DEP_NAME', kind: 'variable'},
+				{name: 'load_moss_plugin', kind: 'function'},
+			],
+		},
 		'./package_json.js': {
 			path: 'package_json.ts',
 			declarations: [
@@ -678,6 +686,9 @@ export const src_json = {
 				{name: 'update_package_json', kind: 'function'},
 				{name: 'to_package_exports', kind: 'function'},
 				{name: 'parse_repo_url', kind: 'function'},
+				{name: 'has_dep', kind: 'function'},
+				{name: 'Package_Json_Dep', kind: 'type'},
+				{name: 'extract_deps', kind: 'function'},
 			],
 		},
 		'./package_meta.js': {

package/src/lib/package_json.ts

@@ -328,3 +328,33 @@ const parse_or_throw_formatted_error = <T extends z.ZodTypeAny>(
 	}
 	return parsed.data;
 };
+
+export const has_dep = (
+	dep_name: string,
+	package_json: Package_Json = load_package_json(),
+): boolean =>
+	!!package_json.devDependencies?.[dep_name] ||
+	!!package_json.dependencies?.[dep_name] ||
+	!!package_json.peerDependencies?.[dep_name];
+
+export interface Package_Json_Dep {
+	name: string;
+	version: string;
+}
+
+export const extract_deps = (package_json: Package_Json): Package_Json_Dep[] => {
+	const deps_by_name: Map<string, Package_Json_Dep> = new Map();
+	// Earlier versions override later ones, so peer deps goes last.
+	const add_deps = (deps: Record<string, string> | undefined) => {
+		if (!deps) return;
+		for (const [name, version] of Object.entries(deps)) {
+			if (!deps_by_name.has(name)) {
+				deps_by_name.set(name, {name, version});
+			}
+		}
+	};
+	add_deps(package_json.dependencies);
+	add_deps(package_json.devDependencies);
+	add_deps(package_json.peerDependencies);
+	return Array.from(deps_by_name.values());
+};

package/src/lib/sveltekit_helpers.ts

@@ -3,7 +3,7 @@ import {existsSync} from 'node:fs';
 import type {Logger} from '@ryanatkn/belt/log.js';
 import {join} from 'node:path';
 
-import {Package_Json, load_package_json} from './package_json.js';
+import {Package_Json, has_dep} from './package_json.js';
 import {default_sveltekit_config, type Parsed_Sveltekit_Config} from './sveltekit_config.js';
 import {SVELTEKIT_CONFIG_FILENAME, SVELTEKIT_DEV_DIRNAME} from './path_constants.js';
 import {find_cli, spawn_cli, to_cli_name, type Cli} from './cli.js';
@@ -32,6 +32,7 @@ export const has_sveltekit_app = (): Result<object, {message: string}> => {
 export const has_sveltekit_library = (
 	package_json?: Package_Json,
 	sveltekit_config: Parsed_Sveltekit_Config = default_sveltekit_config,
+	dep_name = SVELTE_PACKAGE_DEP_NAME,
 ): Result<object, {message: string}> => {
 	const has_sveltekit_app_result = has_sveltekit_app();
 	if (!has_sveltekit_app_result.ok) {
@@ -42,13 +43,10 @@ export const has_sveltekit_library = (
 		return {ok: false, message: `no SvelteKit lib directory found at ${sveltekit_config.lib_path}`};
 	}
 
-	const pkg = package_json ?? load_package_json();
-	if (
-		!(pkg.devDependencies?.[SVELTE_PACKAGE_DEP_NAME] || pkg.dependencies?.[SVELTE_PACKAGE_DEP_NAME])
-	) {
+	if (!has_dep(dep_name, package_json)) {
 		return {
 			ok: false,
-			message: `no dependency found in package.json for ${SVELTE_PACKAGE_DEP_NAME}, install it with \`npm i -D ${SVELTE_PACKAGE_DEP_NAME}\``,
+			message: `no dependency found in package.json for ${dep_name}, install it with \`npm i -D ${dep_name}\``,
 		};
 	}
 

package/src/lib/upgrade.task.ts

@@ -2,7 +2,7 @@ import {spawn} from '@ryanatkn/belt/process.js';
 import {z} from 'zod';
 
 import {Task_Error, type Task} from './task.js';
-import {load_package_json, type Package_Json} from './package_json.js';
+import {extract_deps, load_package_json, type Package_Json_Dep} from './package_json.js';
 import {Git_Origin, git_pull} from './git.js';
 import {spawn_cli} from './cli.js';
 
@@ -41,15 +41,15 @@ export const task: Task<Args> = {
 
 		const package_json = load_package_json();
 
-		const all_deps = to_deps(package_json);
+		const all_deps = extract_deps(package_json);
 
 		const deps = only.length
-			? all_deps.filter((d) => only.includes(d.key))
-			: all_deps.filter((d) => !_.includes(d.key));
+			? all_deps.filter((d) => only.includes(d.name))
+			: all_deps.filter((d) => !_.includes(d.name));
 
 		if (only.length && only.length !== deps.length) {
 			throw new Task_Error(
-				`Some deps to upgrade were not found: ${only.filter((o) => !deps.find((d) => d.key === o)).join(', ')}`,
+				`Some deps to upgrade were not found: ${only.filter((o) => !deps.find((d) => d.name === o)).join(', ')}`,
 			);
 		}
 
@@ -72,34 +72,19 @@ export const task: Task<Args> = {
 	},
 };
 
-interface Dep {
-	key: string;
-	value: string;
-}
-
-const to_deps = (package_json: Package_Json): Dep[] => {
-	const prod_deps: Dep[] = package_json.dependencies
-		? Object.entries(package_json.dependencies).map(([key, value]) => ({key, value}))
-		: [];
-	const dev_deps: Dep[] = package_json.devDependencies
-		? Object.entries(package_json.devDependencies).map(([key, value]) => ({key, value}))
-		: [];
-	return prod_deps.concat(dev_deps);
-};
-
 const EXACT_VERSION_MATCHER = /^..*@.+/;
 const CUSTOM_TAG_MATCHER = /^[\^~><=]*.+-(.+)/;
 
 // TODO hacky and limited
 // TODO probably want to pass through exact deps as well, e.g. @foo/bar@1
-const to_upgrade_items = (deps: Dep[]): string[] =>
+const to_upgrade_items = (deps: Package_Json_Dep[]): string[] =>
 	deps.map((dep) => {
-		if (EXACT_VERSION_MATCHER.test(dep.key)) {
-			return dep.key;
+		if (EXACT_VERSION_MATCHER.test(dep.name)) {
+			return dep.name;
 		}
-		const custom_tag_matches = CUSTOM_TAG_MATCHER.exec(dep.value);
+		const custom_tag_matches = CUSTOM_TAG_MATCHER.exec(dep.version);
 		if (custom_tag_matches) {
-			return dep.key + '@' + custom_tag_matches[1].split('.')[0]; // I tried adding `\.?` to the end but doesn't work and I'm being lazy so I'm just splitting
+			return dep.name + '@' + custom_tag_matches[1].split('.')[0]; // I tried adding `\.?` to the end but doesn't work and I'm being lazy so I'm just splitting
 		}
-		return dep.key + '@latest';
+		return dep.name + '@latest';
 	});