@untestutils/solidstart 0.5.2 → 0.5.3

package/dist/index.d.mts

@@ -1,15 +1,24 @@
-import { type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
+import { type Driver, type FrameworkBaseOptions, type Recipe } from "@untestutils/core";
 export type SolidStartRun = "preview" | "server" | "dev";
+export type SolidAppConfigOverride = Record<string, unknown>;
 export interface SolidStartOptions extends FrameworkBaseOptions {
 	run?: SolidStartRun;
 	/** Nitro-style output entry (default `.output/server/index.mjs`). */
 	serverEntry?: string;
+	/**
+	* Merged onto `app.config.*` via backup/restore (`withMergedConfigOverride`).
+	* Same role as Nuxt `nuxtConfig`.
+	*/
+	appConfig?: SolidAppConfigOverride;
 }
+export type SolidStartMatrixVariant = Partial<Pick<SolidStartOptions, "env" | "hashInputs" | "run" | "serverEntry" | "readyPath" | "readyTimeoutMs" | "workspaceDeps" | "appConfig">>;
 /**
 * SolidStart (Vinxi) Recipe factory.
 * `run: 'preview'` (default) — `vinxi build` + `vinxi start` / preview
 * `run: 'server'` — build + `node .output/server/index.mjs`
 * `run: 'dev'` — `vinxi dev`
 */
-export declare function solidstart(opts: SolidStartOptions): Recipe;
+export declare const solidstart: Driver<SolidStartOptions>;
+/** Expand one SolidStart recipe base into many recipes with distinct ids. */
+export declare function matrix(base: SolidStartOptions, variants: Record<string, SolidStartMatrixVariant>): Record<string, Recipe>;
 export default solidstart;

package/dist/index.d.ts

@@ -1,16 +1,25 @@
-import { type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
+import { type Driver, type FrameworkBaseOptions, type Recipe } from '@untestutils/core';
 export type SolidStartRun = 'preview' | 'server' | 'dev';
+export type SolidAppConfigOverride = Record<string, unknown>;
 export interface SolidStartOptions extends FrameworkBaseOptions {
     run?: SolidStartRun;
     /** Nitro-style output entry (default `.output/server/index.mjs`). */
     serverEntry?: string;
+    /**
+     * Merged onto `app.config.*` via backup/restore (`withMergedConfigOverride`).
+     * Same role as Nuxt `nuxtConfig`.
+     */
+    appConfig?: SolidAppConfigOverride;
 }
+export type SolidStartMatrixVariant = Partial<Pick<SolidStartOptions, 'env' | 'hashInputs' | 'run' | 'serverEntry' | 'readyPath' | 'readyTimeoutMs' | 'workspaceDeps' | 'appConfig'>>;
 /**
  * SolidStart (Vinxi) Recipe factory.
  * `run: 'preview'` (default) — `vinxi build` + `vinxi start` / preview
  * `run: 'server'` — build + `node .output/server/index.mjs`
  * `run: 'dev'` — `vinxi dev`
  */
-export declare function solidstart(opts: SolidStartOptions): Recipe;
+export declare const solidstart: Driver<SolidStartOptions>;
+/** Expand one SolidStart recipe base into many recipes with distinct ids. */
+export declare function matrix(base: SolidStartOptions, variants: Record<string, SolidStartMatrixVariant>): Record<string, Recipe>;
 export default solidstart;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEzD,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC7D,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAYD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,iBAAiB,GAAG,MAAM,CA8E1D;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAYL,KAAK,MAAM,EACX,KAAK,oBAAoB,EACzB,KAAK,MAAM,EACZ,MAAM,mBAAmB,CAAC;AAE3B,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,QAAQ,GAAG,KAAK,CAAC;AAEzD,MAAM,MAAM,sBAAsB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAE7D,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC7D,GAAG,CAAC,EAAE,aAAa,CAAC;IACpB,qEAAqE;IACrE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;OAGG;IACH,SAAS,CAAC,EAAE,sBAAsB,CAAC;CACpC;AAED,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAC3C,IAAI,CACF,iBAAiB,EACf,KAAK,GACL,YAAY,GACZ,KAAK,GACL,aAAa,GACb,WAAW,GACX,gBAAgB,GAChB,eAAe,GACf,WAAW,CACd,CACF,CAAC;AAuCF;;;;;GAKG;AACH,eAAO,MAAM,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAmIhD,CAAC;AAEF,6EAA6E;AAC7E,wBAAgB,MAAM,CACpB,IAAI,EAAE,iBAAiB,EACvB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAChD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAkBxB;AAED,eAAe,UAAU,CAAC"}

package/dist/index.mjs

@@ -1,6 +1,13 @@
 import { existsSync } from "node:fs";
 import { join, resolve } from "pathe";
-import { cliFrameworkRecipe, frameworkRoots, resolveBin } from "@untestutils/core";
+import { cliFrameworkRecipe, configOverrideHashInput, deepMergePlain, defineDriver, findFirstExistingConfig, frameworkRoots, installMergedConfigOverride, matrixRecipe, resolveBin, runCommand, withMergedConfigOverride } from "@untestutils/core";
+const APP_CONFIG_NAMES = [
+	"app.config.ts",
+	"app.config.mjs",
+	"app.config.js",
+	"app.config.mts",
+	"app.config.cjs"
+];
 function resolveVinxiBin(root) {
 	return resolveBin({
 		label: "solidstart",
@@ -10,34 +17,58 @@ function resolveVinxiBin(root) {
 		binRelative: ["bin/cli.mjs", "bin/cli.js"]
 	});
 }
+function hashInputsFor(opts, root, extra) {
+	const inputs = [...opts.hashInputs ?? [root], ...extra];
+	if (opts.appConfig) inputs.push(configOverrideHashInput("appConfig", opts.appConfig));
+	return inputs;
+}
+function resolveAppConfigPath(root) {
+	return findFirstExistingConfig(root, APP_CONFIG_NAMES) ?? join(root, "app.config.ts");
+}
+async function withAppConfigOverride(root, overrides, fn) {
+	if (!overrides || !Object.keys(overrides).length) return fn();
+	return withMergedConfigOverride(resolveAppConfigPath(root), overrides, fn);
+}
 
-export function solidstart(opts) {
+export const solidstart = defineDriver((opts) => {
 	const root = resolve(opts.root);
 	const runMode = opts.run ?? "preview";
 	const id = opts.id ?? `solidstart-${runMode}-${root.split("/").pop()}`;
 	const bin = () => resolveVinxiBin(root);
 	const serverEntry = opts.serverEntry ?? join(".output", "server", "index.mjs");
+	const hasOverrides = Boolean(opts.appConfig && Object.keys(opts.appConfig).length);
 	if (runMode === "dev") {
+		let restore;
 		return cliFrameworkRecipe({
 			id,
 			root,
 			label: "solidstart",
 			share: "never",
 			env: opts.env,
-			hashInputs: opts.hashInputs ?? [root, "run:dev"],
+			hashInputs: hashInputsFor(opts, root, ["run:dev"]),
 			readyPath: opts.readyPath,
 			readyTimeoutMs: opts.readyTimeoutMs,
-			start: ({ port }) => ({
-				command: process.execPath,
-				args: [
-					bin(),
-					"dev",
-					"--port",
-					String(port)
-				],
-				cwd: root,
-				env: { PORT: String(port) }
-			})
+			workspaceDeps: opts.workspaceDeps,
+			start: async ({ port }) => {
+				if (hasOverrides) {
+					restore = await installMergedConfigOverride(resolveAppConfigPath(root), opts.appConfig);
+				}
+				return {
+					command: process.execPath,
+					args: [
+						bin(),
+						"dev",
+						"--port",
+						String(port)
+					],
+					cwd: root,
+					env: { PORT: String(port) }
+				};
+			},
+			afterStop: async () => {
+				await restore?.();
+				restore = undefined;
+			}
 		});
 	}
 	if (runMode === "server") {
@@ -47,18 +78,33 @@ export function solidstart(opts) {
 			label: "solidstart",
 			share: "always",
 			env: opts.env,
-			hashInputs: opts.hashInputs ?? [
-				root,
-				"run:server",
-				serverEntry
-			],
+			hashInputs: hashInputsFor(opts, root, ["run:server", serverEntry]),
 			readyPath: opts.readyPath,
 			readyTimeoutMs: opts.readyTimeoutMs,
-			prepare: () => ({
-				command: process.execPath,
-				args: [bin(), "build"],
-				cwd: root
-			}),
+			workspaceDeps: opts.workspaceDeps,
+			prepare: async () => {
+				if (!hasOverrides) {
+					return {
+						command: process.execPath,
+						args: [bin(), "build"],
+						cwd: root
+					};
+				}
+				const vinxi = bin();
+				await withAppConfigOverride(root, opts.appConfig, async () => {
+					const result = await runCommand(process.execPath, [vinxi, "build"], {
+						cwd: root,
+						env: {
+							...process.env,
+							...opts.env
+						},
+						timeoutMs: opts.readyTimeoutMs ?? 3e5
+					});
+					if (result.exitCode !== 0) {
+						throw new Error(`[untestutils/solidstart] prepare failed (${result.exitCode}):\n${result.stderr.slice(-2e3)}\n${result.stdout.slice(-1e3)}`);
+					}
+				});
+			},
 			verifyAfterPrepare: () => {
 				const entry = join(root, serverEntry);
 				if (!existsSync(entry)) {
@@ -83,14 +129,33 @@ export function solidstart(opts) {
 		label: "solidstart",
 		share: "always",
 		env: opts.env,
-		hashInputs: opts.hashInputs ?? [root, "run:preview"],
+		hashInputs: hashInputsFor(opts, root, ["run:preview"]),
 		readyPath: opts.readyPath,
 		readyTimeoutMs: opts.readyTimeoutMs,
-		prepare: () => ({
-			command: process.execPath,
-			args: [bin(), "build"],
-			cwd: root
-		}),
+		workspaceDeps: opts.workspaceDeps,
+		prepare: async () => {
+			if (!hasOverrides) {
+				return {
+					command: process.execPath,
+					args: [bin(), "build"],
+					cwd: root
+				};
+			}
+			const vinxi = bin();
+			await withAppConfigOverride(root, opts.appConfig, async () => {
+				const result = await runCommand(process.execPath, [vinxi, "build"], {
+					cwd: root,
+					env: {
+						...process.env,
+						...opts.env
+					},
+					timeoutMs: opts.readyTimeoutMs ?? 3e5
+				});
+				if (result.exitCode !== 0) {
+					throw new Error(`[untestutils/solidstart] prepare failed (${result.exitCode}):\n${result.stderr.slice(-2e3)}\n${result.stdout.slice(-1e3)}`);
+				}
+			});
+		},
 		start: ({ port }) => ({
 			command: process.execPath,
 			args: [
@@ -103,5 +168,26 @@ export function solidstart(opts) {
 			env: { PORT: String(port) }
 		})
 	});
+});
+
+export function matrix(base, variants) {
+	return matrixRecipe(solidstart, base, variants, {
+		label: "solidstart",
+		merge: (b, patch, id, name) => ({
+			...b,
+			...patch,
+			id,
+			env: {
+				...b.env ?? {},
+				...patch.env ?? {}
+			},
+			appConfig: b.appConfig || patch.appConfig ? deepMergePlain(b.appConfig ?? {}, patch.appConfig ?? {}) : undefined,
+			hashInputs: [
+				...b.hashInputs ?? [b.root],
+				...patch.hashInputs ?? [],
+				`variant:${name}`
+			]
+		})
+	});
 }
 export default solidstart;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@untestutils/solidstart",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "homepage": "https://s00d.github.io/untestutils/",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
   },
   "dependencies": {
     "pathe": "^2.0.3",
-    "@untestutils/core": "0.5.2"
+    "@untestutils/core": "0.5.3"
   },
   "devDependencies": {
     "@types/node": "^26.6.1",