removing fragile build time default theme

Author: kevinkhill

.gitignore

@@ -1,3 +1,5 @@
 node_modules
-*.log
 .DS_Store
+
+*.log
+.env*

src/core/options.ts

@@ -1,44 +1,50 @@
 import { env } from "node:process";
 import z from "zod";
 import { autoBinPath } from "./scad-bin";
-import { BUILD_TIME_DEFAULT_THEME, THEMES } from "./themes";
+import { THEMES, theme } from "./themes";
 import type { PluginTheme } from "./themes";
 
 const StringBoolSchema = z.union([z.boolean(), z.stringbool()]);
 
-const envvar = (e: string) => String(env[e]);
+const createStringBoolSchema = (opts: { envvar: string; default: boolean }) => {
+	return z
+		.preprocess((val) => val ?? env[opts.envvar], StringBoolSchema)
+		.default(opts.default);
+};
 
 export const PluginOptionsSchema = z.object({
 	launchPath: z.preprocess((val) => {
 		if (val === null || val === "auto" || val === "nightly") {
-			return autoBinPath(val);
+			return autoBinPath(val ?? "auto");
 		}
 		return val;
-	}, z.string()),
+	}, z.string().optional()),
 	layout: z.string().nullish(),
 	theme: z
 		.enum(THEMES)
-		// .prefault(env.ELEVENTY_SCAD_THEME)
 		.optional()
-		.default(
-			parseStringEnv<PluginTheme>("ELEVENTY_SCAD_THEME") ??
-				BUILD_TIME_DEFAULT_THEME,
-		),
-	collectionPage: z
-		.prefault(StringBoolSchema, envvar("ELEVENTY_SCAD_COLLECTION_PAGE"))
-		.default(true),
-	verbose: z
-		.prefault(StringBoolSchema, envvar("ELEVENTY_SCAD_VERBOSE"))
-		.default(false),
-	silent: z
-		.prefault(StringBoolSchema, envvar("ELEVENTY_SCAD_VERBOSE"))
-		.default(false),
-	noSTL: z
-		.prefault(StringBoolSchema, envvar("ELEVENTY_SCAD_NO_STL"))
-		.default(false),
-	checkLaunchPath: z
-		.prefault(StringBoolSchema, envvar("ELEVENTY_SCAD_CHECK_LAUNCH_PATH"))
-		.default(true),
+		.prefault(parseStringEnv<PluginTheme>("ELEVENTY_SCAD_THEME"))
+		.default(theme("Midnight")),
+	collectionPage: createStringBoolSchema({
+		envvar: "ELEVENTY_SCAD_COLLECTION_PAGE",
+		default: true,
+	}),
+	verbose: createStringBoolSchema({
+		envvar: "ELEVENTY_SCAD_VERBOSE",
+		default: false,
+	}),
+	silent: createStringBoolSchema({
+		envvar: "ELEVENTY_SCAD_SILENT",
+		default: false,
+	}),
+	noSTL: createStringBoolSchema({
+		envvar: "ELEVENTY_SCAD_NO_STL",
+		default: false,
+	}),
+	checkLaunchPath: createStringBoolSchema({
+		envvar: "ELEVENTY_SCAD_CHECK_LAUNCH_PATH",
+		default: true,
+	}),
 });
 
 function parseStringEnv<T>(envvar: string): T | undefined {

src/core/themes.ts

@@ -9,7 +9,6 @@ export const THEMES = [
 	"Ultramarine",
 ] as const;
 
-export type PluginTheme = (typeof THEMES)[number];
+export const theme = (t: PluginTheme) => t;
 
-// This is defined in `tsdown.config.js` and will be replaced during build
-export const BUILD_TIME_DEFAULT_THEME = "__DEFAULT_THEME__" as PluginTheme;
+export type PluginTheme = (typeof THEMES)[number];

src/lib/home.ts

@@ -3,5 +3,4 @@ export * from "./debug";
 export * from "./logger";
 export * from "./register";
 export * from "./resolve";
-export * from "./theme";
 export * from "./timer";

src/lib/index.ts

@@ -15,8 +15,6 @@ export type ParsedPluginOptions = z.output<typeof PluginOptionsSchema>;
 
 export type PluginOptions = z.infer<typeof PluginOptionsSchema>;
 
-export type StlViewerThemes = PluginOptions["theme"];
-
 export type ScadTemplateData = {
 	layout: string;
 	title: string;

src/lib/theme.ts

@@ -0,0 +1,17 @@
+import { describe, expect, it } from "vitest";
+import { PluginOptionsSchema } from "../../src/core/options";
+
+describe("PluginOptionsSchema", () => {
+	it("has sane defaults with no options set", () => {
+		const o = PluginOptionsSchema.parse({});
+
+		expect(o).toMatchObject({
+			checkLaunchPath: true,
+			collectionPage: true,
+			noSTL: false,
+			silent: false,
+			theme: "Midnight",
+			verbose: false,
+		});
+	});
+});

src/types.ts

@@ -1,9 +1,5 @@
-import replace from "@rollup/plugin-replace";
 import copy from "rollup-plugin-copy";
 import { defineConfig } from "tsdown";
-import type { StlViewerThemes } from "./src/lib/types";
-
-const DEFAULT_THEME: StlViewerThemes = "Midnight";
 
 export default defineConfig([
 	{
@@ -12,12 +8,6 @@ export default defineConfig([
 		platform: "node",
 		dts: true,
 		plugins: [
-			replace({
-				preventAssignment: true,
-				values: {
-					__DEFAULT_THEME__: DEFAULT_THEME,
-				},
-			}),
 			copy({
 				targets: [
 					{