@ryanatkn/gro 0.145.0 → 0.146.1

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;AASvD;;;;;;;;GAQG;AACH,QAAA,MAAM,MAAM,EAAE,iBA4Bb,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,iBAwBb,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/gro.config.default.js

@@ -3,8 +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 { gro_plugin_moss, has_moss_dep } from './gro_plugin_moss.js';
-import { load_package_json } from './package_json.js';
+import { has_dep, load_package_json } from './package_json.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.
@@ -16,15 +15,15 @@ import { load_package_json } from './package_json.js';
  */
 const config = async (cfg) => {
     const package_json = load_package_json(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
-    const [moss_plugin_result, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result,] = await Promise.all([
-        has_moss_dep(package_json),
+    const [has_moss_dep, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] = await Promise.all([
+        has_dep('@ryanatkn/moss', package_json),
         has_server(),
         has_sveltekit_library(package_json),
         has_sveltekit_app(),
     ]);
-    cfg.plugins = () => [
+    cfg.plugins = async () => [
         // put things that generate files before SvelteKit so it can see them
-        moss_plugin_result.ok ? gro_plugin_moss() : null,
+        has_moss_dep ? (await import('./gro_plugin_moss.js')).gro_plugin_moss() : null, // lazy load to avoid errors if it's not installed
         gro_plugin_gen(),
         has_server_result.ok ? gro_plugin_server() : null,
         has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,

package/dist/gro_plugin_moss.d.ts

@@ -1,22 +1,15 @@
-import type { Result } from '@ryanatkn/belt/result.js';
 import type { Plugin } from './plugin.js';
 import type { Args } from './args.js';
 import type { File_Filter } from './path.js';
-import { type Package_Json } from './package_json.js';
-export declare const MOSS_PACKAGE_DEP_NAME = "@ryanatkn/moss";
-export declare const has_moss_dep: (package_json: Package_Json, dep_name?: string) => Result<object, {
-    message: string;
-}>;
-export declare const generate_classes_css: (classes: Iterable<string>) => string;
 export interface Task_Args extends Args {
     watch?: boolean;
 }
-export interface Options {
+export interface Gro_Plugin_Moss_Options {
     include_classes?: string[] | Set<string> | null;
     outfile?: string;
     filter_file?: File_Filter | null;
     flush_debounce_delay?: number;
     banner?: string;
 }
-export declare const gro_plugin_moss: ({ include_classes, outfile, filter_file, flush_debounce_delay, banner, }?: Options) => Plugin;
+export declare const gro_plugin_moss: ({ include_classes, outfile, filter_file, flush_debounce_delay, banner, }?: Gro_Plugin_Moss_Options) => Plugin;
 //# sourceMappingURL=gro_plugin_moss.d.ts.map

package/dist/gro_plugin_moss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gro_plugin_moss.d.ts","sourceRoot":"../src/lib/","sources":["gro_plugin_moss.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,0BAA0B,CAAC;AAErD,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAGpC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAC3C,OAAO,EAAU,KAAK,YAAY,EAAC,MAAM,mBAAmB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,mBAAmB,CAAC;AAEtD,eAAO,MAAM,YAAY,iBACV,YAAY,wBAExB,MAAM,CAAC,MAAM,EAAE;IAAC,OAAO,EAAE,MAAM,CAAA;CAAC,CASlC,CAAC;AAEF,eAAO,MAAM,oBAAoB,YAAa,QAAQ,CAAC,MAAM,CAAC,KAAG,MAmBhE,CAAC;AAIF,MAAM,WAAW,SAAU,SAAQ,IAAI;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,OAAO;IACvB,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,eAAe,8EAMzB,OAAO,KAAkB,MAmE3B,CAAC"}
+{"version":3,"file":"gro_plugin_moss.d.ts","sourceRoot":"../src/lib/","sources":["gro_plugin_moss.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,WAAW,CAAC;AAGpC,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAC;AAI3C,MAAM,WAAW,SAAU,SAAQ,IAAI;IACtC,KAAK,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,uBAAuB;IACvC,eAAe,CAAC,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,GAAG,IAAI,CAAC;IACjC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,eAAe,8EAMzB,uBAAuB,KAAkB,MAmE3C,CAAC"}

package/dist/gro_plugin_moss.js

@@ -2,40 +2,9 @@ import { EMPTY_OBJECT } from '@ryanatkn/belt/object.js';
 import { throttle } from '@ryanatkn/belt/throttle.js';
 import { Unreachable_Error } from '@ryanatkn/belt/error.js';
 import { writeFileSync } from 'node:fs';
-import { collect_css_classes, Css_Classes } from '@ryanatkn/moss/css_class_helpers.js';
+import { collect_css_classes, Css_Classes, generate_classes_css, } from '@ryanatkn/moss/css_class_helpers.js';
 import { css_classes_by_name } from '@ryanatkn/moss/css_classes.js';
 import { format_file } from './format_file.js';
-import { has_dep } from './package_json.js';
-export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
-export const has_moss_dep = (package_json, dep_name = MOSS_PACKAGE_DEP_NAME) => {
-    if (!has_dep(dep_name, package_json)) {
-        return {
-            ok: false,
-            message: `no dependency found in package.json for ${dep_name}`,
-        };
-    }
-    return { ok: true };
-};
-export const generate_classes_css = (classes) => {
-    let css = '';
-    for (const c of classes) {
-        const v = css_classes_by_name[c];
-        if (!v) {
-            // diagnostic
-            // if (!/^[a-z_0-9]+$/.test(c)) {
-            // 	console.error('invalid class detected, fix the regexps', c);
-            // }
-            continue;
-        }
-        if ('declaration' in v) {
-            css += `.${c} { ${v.declaration} }\n`;
-        }
-        else {
-            css += v.ruleset + '\n';
-        }
-    }
-    return css;
-};
 const FLUSH_DEBOUNCE_DELAY = 500;
 export const gro_plugin_moss = ({ include_classes = null, outfile = 'src/routes/moss.css', // TODO maybe support multiple files using file filters to check where to collect them?
 filter_file = (p) => !p.includes('.test.') && !p.includes('/test/'), flush_debounce_delay = FLUSH_DEBOUNCE_DELAY, banner = 'generated by gro_plugin_moss', } = EMPTY_OBJECT) => {
@@ -51,7 +20,7 @@ filter_file = (p) => !p.includes('.test.') && !p.includes('/test/'), flush_debou
         }
     };
     const flush_gen_queue = throttle(async () => {
-        const css = generate_classes_css(css_classes.get_sorted_array());
+        const css = generate_classes_css(css_classes.get_sorted_array(), css_classes_by_name);
         const contents = `/* ${banner} */\n\n${css}\n\n/* ${banner} */`;
         const output = await format_file(contents, { filepath: outfile });
         // TODO think about using gen to implement this, would have some nice benefits like automatic change detection

package/dist/package.d.ts

@@ -42,9 +42,9 @@ export declare const package_json: {
         '@ryanatkn/belt': string;
         chokidar: string;
         dotenv: string;
-        'es-module-lexer': string;
         'esm-env': string;
         mri: string;
+        'oxc-parser': string;
         prettier: string;
         'prettier-plugin-svelte': string;
         'ts-morph': string;
@@ -742,13 +742,10 @@ export declare const src_json: {
             path: string;
             declarations: ({
                 name: string;
-                kind: "variable";
+                kind: "type";
             } | {
                 name: string;
                 kind: "function";
-            } | {
-                name: string;
-                kind: "type";
             })[];
         };
         './gro_plugin_server.js': {
@@ -901,10 +898,10 @@ export declare const src_json: {
             path: string;
             declarations: ({
                 name: string;
-                kind: "function";
+                kind: "type";
             } | {
                 name: string;
-                kind: "type";
+                kind: "function";
             })[];
         };
         './path.js': {

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuQD,CAAC;AAEzB,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8wBD,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0wBD,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.145.0',
+    version: '0.146.1',
     description: 'task runner and toolkit extending SvelteKit',
     motto: 'generate, run, optimize',
     glyph: '🌰',
@@ -42,9 +42,9 @@ export const package_json = {
         '@ryanatkn/belt': '^0.26.0',
         chokidar: '^4.0.1',
         dotenv: '^16.4.5',
-        'es-module-lexer': '^1.5.4',
         'esm-env': '^1.1.4',
         mri: '^1.2.0',
+        'oxc-parser': '^0.34.0',
         prettier: '^3.3.3',
         'prettier-plugin-svelte': '^3.2.7',
         'ts-morph': '^24.0.0',
@@ -55,22 +55,22 @@ export const package_json = {
     devDependencies: {
         '@changesets/changelog-git': '^0.2.0',
         '@changesets/types': '^6.0.0',
-        '@ryanatkn/eslint-config': '^0.5.5',
+        '@ryanatkn/eslint-config': '^0.5.6',
         '@ryanatkn/fuz': '^0.130.3',
-        '@ryanatkn/moss': '^0.19.0',
+        '@ryanatkn/moss': '^0.20.0',
         '@sveltejs/adapter-static': '^3.0.6',
         '@sveltejs/kit': '^2.7.3',
         '@sveltejs/package': '^2.3.7',
         '@sveltejs/vite-plugin-svelte': '^4.0.0',
         '@types/fs-extra': '^11.0.4',
-        '@types/node': '^22.8.4',
+        '@types/node': '^22.8.5',
         esbuild: '^0.21.5',
         eslint: '^9.13.0',
         'eslint-plugin-svelte': '^2.46.0',
-        svelte: '^5.1.5',
+        svelte: '^5.1.6',
         'svelte-check': '^4.0.5',
         typescript: '^5.6.3',
-        'typescript-eslint': '^8.12.1',
+        'typescript-eslint': '^8.12.2',
         uvu: '^0.5.6',
     },
     prettier: {
@@ -264,7 +264,7 @@ export const package_json = {
 };
 export const src_json = {
     name: '@ryanatkn/gro',
-    version: '0.145.0',
+    version: '0.146.1',
     modules: {
         '.': {
             path: 'index.ts',
@@ -599,11 +599,8 @@ export const src_json = {
         './gro_plugin_moss.js': {
             path: 'gro_plugin_moss.ts',
             declarations: [
-                { name: 'MOSS_PACKAGE_DEP_NAME', kind: 'variable' },
-                { name: 'has_moss_dep', kind: 'function' },
-                { name: 'generate_classes_css', kind: 'function' },
                 { name: 'Task_Args', kind: 'type' },
-                { name: 'Options', kind: 'type' },
+                { name: 'Gro_Plugin_Moss_Options', kind: 'type' },
                 { name: 'gro_plugin_moss', kind: 'function' },
             ],
         },
@@ -743,7 +740,6 @@ export const src_json = {
         './parse_imports.js': {
             path: 'parse_imports.ts',
             declarations: [
-                { name: 'init_lexer', kind: 'function' },
                 { name: 'Import_Specifier', kind: 'type' },
                 { name: 'parse_imports', kind: 'function' },
             ],

package/dist/parse_imports.d.ts

@@ -1,6 +1,5 @@
 import type { Flavored } from '@ryanatkn/belt/types.js';
 import type { Path_Id } from './path.js';
-export declare const init_lexer: () => Promise<void>;
 export type Import_Specifier = Flavored<string, 'Import_Specifier'>;
 export declare const parse_imports: (id: Path_Id, contents: string, ignore_types?: boolean) => Import_Specifier[];
 //# sourceMappingURL=parse_imports.d.ts.map

package/dist/parse_imports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse_imports.d.ts","sourceRoot":"../src/lib/","sources":["parse_imports.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIvC,eAAO,MAAM,UAAU,QAAO,OAAO,CAAC,IAAI,CAAS,CAAC;AAEpD,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAIpE,eAAO,MAAM,aAAa,OACrB,OAAO,YACD,MAAM,6BAEd,gBAAgB,EA0BlB,CAAC"}
+{"version":3,"file":"parse_imports.d.ts","sourceRoot":"../src/lib/","sources":["parse_imports.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAEtD,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,WAAW,CAAC;AAIvC,MAAM,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;AAIpE,eAAO,MAAM,aAAa,OACrB,OAAO,YACD,MAAM,6BAEd,gBAAgB,EA4BlB,CAAC"}

package/dist/parse_imports.js

@@ -1,13 +1,13 @@
-import { init, parse } from 'es-module-lexer';
+import { moduleLexerSync } from 'oxc-parser';
 import { SVELTE_MATCHER } from './svelte_helpers.js';
 import { JS_MATCHER, TS_MATCHER } from './constants.js';
-export const init_lexer = () => init;
 const script_matcher = /<script.*?>(.*?)<\/script>/gimsu;
 export const parse_imports = (id, contents, ignore_types = true) => {
     const specifiers = [];
+    const is_svelte = SVELTE_MATCHER.test(id);
     const parse_from = (s) => {
-        const parsed = parse(s);
-        for (const p of parsed[0]) {
+        const parsed = moduleLexerSync(s, { sourceFilename: is_svelte ? id + '.ts' : id });
+        for (const p of parsed.imports) {
             if (ignore_types) {
                 const import_statement = s.slice(p.ss, p.se);
                 if (import_statement.startsWith('import type')) {
@@ -18,7 +18,7 @@ export const parse_imports = (id, contents, ignore_types = true) => {
                 specifiers.push(p.n);
         }
     };
-    if (SVELTE_MATCHER.test(id)) {
+    if (is_svelte) {
         const matches = contents.matchAll(script_matcher);
         for (const m of matches) {
             parse_from(m[1]);

package/dist/resolve_node_specifier.d.ts

@@ -1,6 +1,8 @@
 import { Package_Json } from './package_json.js';
 import type { Resolved_Specifier } from './resolve_specifier.js';
 /**
+ * Ideally Gro would just use `import.meta.resolve`, but it can't be used in custom loaders,
+ * which Gro relies on for TypeScript.
  * This likely has differences from Node - they should be fixed on a case-by-case basis.
  */
 export declare const resolve_node_specifier: (specifier: string, dir?: string, parent_path?: string, package_json_cache?: Record<string, Package_Json>, throw_on_missing_package?: boolean, exports_conditions?: string[]) => Resolved_Specifier | null;

package/dist/resolve_node_specifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolve_node_specifier.d.ts","sourceRoot":"../src/lib/","sources":["resolve_node_specifier.ts"],"names":[],"mappings":"AAIA,OAAO,EAAe,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AAGhF,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAG/D;;GAEG;AACH,eAAO,MAAM,sBAAsB,cACvB,MAAM,8BAEH,MAAM,uBACC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,wEAG/C,kBAAkB,GAAG,IA6FvB,CAAC"}
+{"version":3,"file":"resolve_node_specifier.d.ts","sourceRoot":"../src/lib/","sources":["resolve_node_specifier.ts"],"names":[],"mappings":"AAKA,OAAO,EAAe,YAAY,EAAoB,MAAM,mBAAmB,CAAC;AAGhF,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,wBAAwB,CAAC;AAE/D;;;;GAIG;AACH,eAAO,MAAM,sBAAsB,cACvB,MAAM,8BAEH,MAAM,uBACC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,wEAG/C,kBAAkB,GAAG,IAsFvB,CAAC"}

package/dist/resolve_node_specifier.js

@@ -1,34 +1,25 @@
 import { join, extname } from 'node:path';
 import { existsSync } from 'node:fs';
 import { DEV } from 'esm-env';
+import { escape_regexp } from '@ryanatkn/belt/regexp.js';
 import { Export_Value, Package_Json, load_package_json } from './package_json.js';
 import { paths } from './paths.js';
 import { NODE_MODULES_DIRNAME } from './constants.js';
-import { escape_regexp } from '@ryanatkn/belt/regexp.js';
 /**
+ * Ideally Gro would just use `import.meta.resolve`, but it can't be used in custom loaders,
+ * which Gro relies on for TypeScript.
  * This likely has differences from Node - they should be fixed on a case-by-case basis.
  */
 export const resolve_node_specifier = (specifier, dir = paths.root, parent_path, package_json_cache, throw_on_missing_package = true, exports_conditions = DEV ? ['development', 'node', 'import'] : ['production', 'node', 'import']) => {
     const raw = specifier.endsWith('?raw');
     const mapped_specifier = raw ? specifier.substring(0, specifier.length - 4) : specifier;
-    // Parse the specifier
-    let idx = -1;
-    if (mapped_specifier[0] === '@') {
-        let count = 0;
-        for (let i = 0; i < mapped_specifier.length; i++) {
-            if (mapped_specifier[i] === '/')
-                count++;
-            if (count === 2) {
-                idx = i;
-                break;
-            }
-        }
-    }
-    else {
-        idx = mapped_specifier.indexOf('/');
-    }
-    const pkg_name = idx === -1 ? mapped_specifier : mapped_specifier.substring(0, idx);
-    const module_path = idx === -1 ? '' : mapped_specifier.substring(idx + 1);
+    const specifier_slash_path_index = get_specifier_slash_path_index(mapped_specifier);
+    const pkg_name = specifier_slash_path_index === -1
+        ? mapped_specifier
+        : mapped_specifier.substring(0, specifier_slash_path_index);
+    const module_path = specifier_slash_path_index === -1
+        ? ''
+        : mapped_specifier.substring(specifier_slash_path_index + 1);
     const subpath = module_path ? './' + module_path : '.';
     const package_dir = join(dir, NODE_MODULES_DIRNAME, pkg_name);
     // Check package_json cache first
@@ -117,6 +108,7 @@ const resolve_subpath = (package_json, subpath) => {
         if (subpath in exports) {
             return exports[subpath];
         }
+        // TODO some of this may be wrong, will just need to patch as we go
         // Sort patterns by specificity
         const patterns = Object.entries(exports)
             .filter(([pattern]) => pattern.includes('*'))
@@ -207,8 +199,7 @@ const resolve_exported_value = (exported, conditions) => {
         return undefined;
     }
     const exported_obj = exported;
-    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-    let default_value;
+    let default_value; // eslint-disable-line @typescript-eslint/no-redundant-type-constituents
     // For each key in exported_obj, in order
     for (const [condition, value] of Object.entries(exported_obj)) {
         // Skip invalid conditions
@@ -295,3 +286,21 @@ const validate_export_target = (target, throw_on_missing_package) => {
         }
     }
 };
+const get_specifier_slash_path_index = (mapped_specifier) => {
+    let index = -1;
+    if (mapped_specifier[0] === '@') {
+        let count = 0;
+        for (let i = 0; i < mapped_specifier.length; i++) {
+            if (mapped_specifier[i] === '/')
+                count++;
+            if (count === 2) {
+                index = i;
+                break;
+            }
+        }
+    }
+    else {
+        index = mapped_specifier.indexOf('/');
+    }
+    return index;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ryanatkn/gro",
-  "version": "0.145.0",
+  "version": "0.146.1",
   "description": "task runner and toolkit extending SvelteKit",
   "motto": "generate, run, optimize",
   "glyph": "🌰",
@@ -52,9 +52,9 @@
     "@ryanatkn/belt": "^0.26.0",
     "chokidar": "^4.0.1",
     "dotenv": "^16.4.5",
-    "es-module-lexer": "^1.5.4",
     "esm-env": "^1.1.4",
     "mri": "^1.2.0",
+    "oxc-parser": "^0.34.0",
     "prettier": "^3.3.3",
     "prettier-plugin-svelte": "^3.2.7",
     "ts-morph": "^24.0.0",
@@ -68,22 +68,22 @@
   "devDependencies": {
     "@changesets/changelog-git": "^0.2.0",
     "@changesets/types": "^6.0.0",
-    "@ryanatkn/eslint-config": "^0.5.5",
+    "@ryanatkn/eslint-config": "^0.5.6",
     "@ryanatkn/fuz": "^0.130.3",
-    "@ryanatkn/moss": "^0.19.0",
+    "@ryanatkn/moss": "^0.20.0",
     "@sveltejs/adapter-static": "^3.0.6",
     "@sveltejs/kit": "^2.7.3",
     "@sveltejs/package": "^2.3.7",
     "@sveltejs/vite-plugin-svelte": "^4.0.0",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.8.4",
+    "@types/node": "^22.8.5",
     "esbuild": "^0.21.5",
     "eslint": "^9.13.0",
     "eslint-plugin-svelte": "^2.46.0",
-    "svelte": "^5.1.5",
+    "svelte": "^5.1.6",
     "svelte-check": "^4.0.5",
     "typescript": "^5.6.3",
-    "typescript-eslint": "^8.12.1",
+    "typescript-eslint": "^8.12.2",
     "uvu": "^0.5.6"
   },
   "prettier": {

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

@@ -4,8 +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 {gro_plugin_moss, has_moss_dep} from './gro_plugin_moss.js';
-import {load_package_json} from './package_json.js';
+import {has_dep, load_package_json} from './package_json.js';
 
 /**
  * This is the default config that's passed to `gro.config.ts`
@@ -19,22 +18,18 @@ import {load_package_json} from './package_json.js';
 const config: Create_Gro_Config = async (cfg) => {
 	const package_json = load_package_json(); // TODO gets wastefully loaded by some plugins, maybe put in plugin/task context? how does that interact with `map_package_json`?
 
-	const [
-		moss_plugin_result,
-		has_server_result,
-		has_sveltekit_library_result,
-		has_sveltekit_app_result,
-	] = await Promise.all([
-		has_moss_dep(package_json),
-		has_server(),
-		has_sveltekit_library(package_json),
-		has_sveltekit_app(),
-	]);
+	const [has_moss_dep, has_server_result, has_sveltekit_library_result, has_sveltekit_app_result] =
+		await Promise.all([
+			has_dep('@ryanatkn/moss', package_json),
+			has_server(),
+			has_sveltekit_library(package_json),
+			has_sveltekit_app(),
+		]);
 
-	cfg.plugins = () =>
+	cfg.plugins = async () =>
 		[
 			// put things that generate files before SvelteKit so it can see them
-			moss_plugin_result.ok ? gro_plugin_moss() : null,
+			has_moss_dep ? (await import('./gro_plugin_moss.js')).gro_plugin_moss() : null, // lazy load to avoid errors if it's not installed
 			gro_plugin_gen(),
 			has_server_result.ok ? gro_plugin_server() : null,
 			has_sveltekit_library_result.ok ? gro_plugin_sveltekit_library() : null,

package/src/lib/gro_plugin_moss.ts

@@ -2,53 +2,18 @@ import {EMPTY_OBJECT} from '@ryanatkn/belt/object.js';
 import {throttle} from '@ryanatkn/belt/throttle.js';
 import {Unreachable_Error} from '@ryanatkn/belt/error.js';
 import {writeFileSync} from 'node:fs';
-import {collect_css_classes, Css_Classes} from '@ryanatkn/moss/css_class_helpers.js';
+import {
+	collect_css_classes,
+	Css_Classes,
+	generate_classes_css,
+} from '@ryanatkn/moss/css_class_helpers.js';
 import {css_classes_by_name} from '@ryanatkn/moss/css_classes.js';
-import type {Result} from '@ryanatkn/belt/result.js';
 
 import type {Plugin} from './plugin.js';
 import type {Args} from './args.js';
 import type {Cleanup_Watch} from './filer.js';
 import {format_file} from './format_file.js';
 import type {File_Filter} from './path.js';
-import {has_dep, type Package_Json} from './package_json.js';
-
-export const MOSS_PACKAGE_DEP_NAME = '@ryanatkn/moss';
-
-export const has_moss_dep = (
-	package_json: Package_Json,
-	dep_name = MOSS_PACKAGE_DEP_NAME,
-): Result<object, {message: string}> => {
-	if (!has_dep(dep_name, package_json)) {
-		return {
-			ok: false,
-			message: `no dependency found in package.json for ${dep_name}`,
-		};
-	}
-
-	return {ok: true};
-};
-
-export const generate_classes_css = (classes: Iterable<string>): string => {
-	let css = '';
-	for (const c of classes) {
-		const v = css_classes_by_name[c];
-		if (!v) {
-			// diagnostic
-			// if (!/^[a-z_0-9]+$/.test(c)) {
-			// 	console.error('invalid class detected, fix the regexps', c);
-			// }
-			continue;
-		}
-		if ('declaration' in v) {
-			css += `.${c} { ${v.declaration} }\n`;
-		} else {
-			css += v.ruleset + '\n';
-		}
-	}
-
-	return css;
-};
 
 const FLUSH_DEBOUNCE_DELAY = 500;
 
@@ -56,7 +21,7 @@ export interface Task_Args extends Args {
 	watch?: boolean;
 }
 
-export interface Options {
+export interface Gro_Plugin_Moss_Options {
 	include_classes?: string[] | Set<string> | null;
 	outfile?: string;
 	filter_file?: File_Filter | null;
@@ -70,7 +35,7 @@ export const gro_plugin_moss = ({
 	filter_file = (p) => !p.includes('.test.') && !p.includes('/test/'),
 	flush_debounce_delay = FLUSH_DEBOUNCE_DELAY,
 	banner = 'generated by gro_plugin_moss',
-}: Options = EMPTY_OBJECT): Plugin => {
+}: Gro_Plugin_Moss_Options = EMPTY_OBJECT): Plugin => {
 	const css_classes = new Css_Classes(
 		Array.isArray(include_classes) ? new Set(include_classes) : include_classes,
 	);
@@ -88,7 +53,7 @@ export const gro_plugin_moss = ({
 	};
 	const flush_gen_queue = throttle(
 		async () => {
-			const css = generate_classes_css(css_classes.get_sorted_array());
+			const css = generate_classes_css(css_classes.get_sorted_array(), css_classes_by_name);
 			const contents = `/* ${banner} */\n\n${css}\n\n/* ${banner} */`;
 			const output = await format_file(contents, {filepath: outfile});
 			// TODO think about using gen to implement this, would have some nice benefits like automatic change detection

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.145.0',
+	version: '0.146.1',
 	description: 'task runner and toolkit extending SvelteKit',
 	motto: 'generate, run, optimize',
 	glyph: '🌰',
@@ -47,9 +47,9 @@ export const package_json = {
 		'@ryanatkn/belt': '^0.26.0',
 		chokidar: '^4.0.1',
 		dotenv: '^16.4.5',
-		'es-module-lexer': '^1.5.4',
 		'esm-env': '^1.1.4',
 		mri: '^1.2.0',
+		'oxc-parser': '^0.34.0',
 		prettier: '^3.3.3',
 		'prettier-plugin-svelte': '^3.2.7',
 		'ts-morph': '^24.0.0',
@@ -60,22 +60,22 @@ export const package_json = {
 	devDependencies: {
 		'@changesets/changelog-git': '^0.2.0',
 		'@changesets/types': '^6.0.0',
-		'@ryanatkn/eslint-config': '^0.5.5',
+		'@ryanatkn/eslint-config': '^0.5.6',
 		'@ryanatkn/fuz': '^0.130.3',
-		'@ryanatkn/moss': '^0.19.0',
+		'@ryanatkn/moss': '^0.20.0',
 		'@sveltejs/adapter-static': '^3.0.6',
 		'@sveltejs/kit': '^2.7.3',
 		'@sveltejs/package': '^2.3.7',
 		'@sveltejs/vite-plugin-svelte': '^4.0.0',
 		'@types/fs-extra': '^11.0.4',
-		'@types/node': '^22.8.4',
+		'@types/node': '^22.8.5',
 		esbuild: '^0.21.5',
 		eslint: '^9.13.0',
 		'eslint-plugin-svelte': '^2.46.0',
-		svelte: '^5.1.5',
+		svelte: '^5.1.6',
 		'svelte-check': '^4.0.5',
 		typescript: '^5.6.3',
-		'typescript-eslint': '^8.12.1',
+		'typescript-eslint': '^8.12.2',
 		uvu: '^0.5.6',
 	},
 	prettier: {
@@ -270,7 +270,7 @@ export const package_json = {
 
 export const src_json = {
 	name: '@ryanatkn/gro',
-	version: '0.145.0',
+	version: '0.146.1',
 	modules: {
 		'.': {
 			path: 'index.ts',
@@ -605,11 +605,8 @@ export const src_json = {
 		'./gro_plugin_moss.js': {
 			path: 'gro_plugin_moss.ts',
 			declarations: [
-				{name: 'MOSS_PACKAGE_DEP_NAME', kind: 'variable'},
-				{name: 'has_moss_dep', kind: 'function'},
-				{name: 'generate_classes_css', kind: 'function'},
 				{name: 'Task_Args', kind: 'type'},
-				{name: 'Options', kind: 'type'},
+				{name: 'Gro_Plugin_Moss_Options', kind: 'type'},
 				{name: 'gro_plugin_moss', kind: 'function'},
 			],
 		},
@@ -749,7 +746,6 @@ export const src_json = {
 		'./parse_imports.js': {
 			path: 'parse_imports.ts',
 			declarations: [
-				{name: 'init_lexer', kind: 'function'},
 				{name: 'Import_Specifier', kind: 'type'},
 				{name: 'parse_imports', kind: 'function'},
 			],

package/src/lib/parse_imports.ts

@@ -1,12 +1,10 @@
-import {init, parse} from 'es-module-lexer';
+import {moduleLexerSync} from 'oxc-parser';
 import type {Flavored} from '@ryanatkn/belt/types.js';
 
 import type {Path_Id} from './path.js';
 import {SVELTE_MATCHER} from './svelte_helpers.js';
 import {JS_MATCHER, TS_MATCHER} from './constants.js';
 
-export const init_lexer = (): Promise<void> => init;
-
 export type Import_Specifier = Flavored<string, 'Import_Specifier'>;
 
 const script_matcher = /<script.*?>(.*?)<\/script>/gimsu;
@@ -18,9 +16,11 @@ export const parse_imports = (
 ): Import_Specifier[] => {
 	const specifiers: string[] = [];
 
+	const is_svelte = SVELTE_MATCHER.test(id);
+
 	const parse_from = (s: string): void => {
-		const parsed = parse(s);
-		for (const p of parsed[0]) {
+		const parsed = moduleLexerSync(s, {sourceFilename: is_svelte ? id + '.ts' : id});
+		for (const p of parsed.imports) {
 			if (ignore_types) {
 				const import_statement = s.slice(p.ss, p.se);
 				if (import_statement.startsWith('import type')) {
@@ -31,7 +31,7 @@ export const parse_imports = (
 		}
 	};
 
-	if (SVELTE_MATCHER.test(id)) {
+	if (is_svelte) {
 		const matches = contents.matchAll(script_matcher);
 		for (const m of matches) {
 			parse_from(m[1]);

package/src/lib/resolve_node_specifier.ts

@@ -1,14 +1,16 @@
 import {join, extname} from 'node:path';
 import {existsSync} from 'node:fs';
 import {DEV} from 'esm-env';
+import {escape_regexp} from '@ryanatkn/belt/regexp.js';
 
 import {Export_Value, Package_Json, load_package_json} from './package_json.js';
 import {paths} from './paths.js';
 import {NODE_MODULES_DIRNAME} from './constants.js';
 import type {Resolved_Specifier} from './resolve_specifier.js';
-import {escape_regexp} from '@ryanatkn/belt/regexp.js';
 
 /**
+ * Ideally Gro would just use `import.meta.resolve`, but it can't be used in custom loaders,
+ * which Gro relies on for TypeScript.
  * This likely has differences from Node - they should be fixed on a case-by-case basis.
  */
 export const resolve_node_specifier = (
@@ -22,23 +24,16 @@ export const resolve_node_specifier = (
 	const raw = specifier.endsWith('?raw');
 	const mapped_specifier = raw ? specifier.substring(0, specifier.length - 4) : specifier;
 
-	// Parse the specifier
-	let idx: number = -1;
-	if (mapped_specifier[0] === '@') {
-		let count = 0;
-		for (let i = 0; i < mapped_specifier.length; i++) {
-			if (mapped_specifier[i] === '/') count++;
-			if (count === 2) {
-				idx = i;
-				break;
-			}
-		}
-	} else {
-		idx = mapped_specifier.indexOf('/');
-	}
+	const specifier_slash_path_index = get_specifier_slash_path_index(mapped_specifier);
 
-	const pkg_name = idx === -1 ? mapped_specifier : mapped_specifier.substring(0, idx);
-	const module_path = idx === -1 ? '' : mapped_specifier.substring(idx + 1);
+	const pkg_name =
+		specifier_slash_path_index === -1
+			? mapped_specifier
+			: mapped_specifier.substring(0, specifier_slash_path_index);
+	const module_path =
+		specifier_slash_path_index === -1
+			? ''
+			: mapped_specifier.substring(specifier_slash_path_index + 1);
 	const subpath = module_path ? './' + module_path : '.';
 	const package_dir = join(dir, NODE_MODULES_DIRNAME, pkg_name);
 
@@ -144,6 +139,7 @@ const resolve_subpath = (package_json: Package_Json, subpath: string): unknown =
 			return exports[subpath];
 		}
 
+		// TODO some of this may be wrong, will just need to patch as we go
 		// Sort patterns by specificity
 		const patterns = Object.entries(exports)
 			.filter(([pattern]) => pattern.includes('*'))
@@ -255,8 +251,7 @@ const resolve_exported_value = (
 
 	const exported_obj = exported as Record<string, unknown>;
 
-	// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
-	let default_value: Export_Value | undefined;
+	let default_value: Export_Value | undefined; // eslint-disable-line @typescript-eslint/no-redundant-type-constituents
 
 	// For each key in exported_obj, in order
 	for (const [condition, value] of Object.entries(exported_obj)) {
@@ -354,3 +349,21 @@ const validate_export_target = (target: string, throw_on_missing_package: boolea
 		}
 	}
 };
+
+const get_specifier_slash_path_index = (mapped_specifier: string): number => {
+	let index: number = -1;
+	if (mapped_specifier[0] === '@') {
+		let count = 0;
+		for (let i = 0; i < mapped_specifier.length; i++) {
+			if (mapped_specifier[i] === '/') count++;
+			if (count === 2) {
+				index = i;
+				break;
+			}
+		}
+	} else {
+		index = mapped_specifier.indexOf('/');
+	}
+
+	return index;
+};