cache/hash system is working. STLs do not regenerate if the underlying scad file has not changed

Author: kevinkhill

dist/index.js

@@ -6,10 +6,10 @@ import { addOpenSCADPlugin } from "./dist/index.js";
  *  @param {import("@11ty/eleventy/UserConfig").default} eleventyConfig
  */
 export default function (eleventyConfig) {
-  eleventyConfig.setQuietMode(false);
   eleventyConfig.setInputDirectory("test/_11ty/input");
   eleventyConfig.setOutputDirectory("test/_11ty/output");
   eleventyConfig.addWatchTarget("dist/**/*");
+  eleventyConfig.setQuietMode(false);
 
   addOpenSCADPlugin(eleventyConfig, {
     launchPath: "nightly",

eleventy.config.mjs

@@ -35,7 +35,8 @@
     "dev": "pnpm build --watch ./src",
     "bump": "bumpp",
     "release": "bumpp && npm publish",
-    "start": "DEBUG=eleventy:scad* eleventy --serve",
+    "start": "eleventy --serve",
+    "debug": "DEBUG=eleventy:scad* pnpm start",
     "test": "vitest",
     "typecheck": "tsc --noEmit"
   },

package.json

@@ -1,6 +1,6 @@
 import { readFile } from "node:fs/promises";
+import { md5 } from "../lib";
 import Debug from "../lib/debug";
-import { md5 } from "../lib/hash";
 
 const debug = Debug.extend("cache");
 const cache = new Map<string, string>();
@@ -11,8 +11,7 @@ export function getFileHash(key: string) {
 
 export function isFileRegistered(file: string) {
 	const status = cache.has(file);
-	debug("file: %o", file);
-	debug("registered: %o", status);
+	debug({ file, registered: status });
 	return status;
 }
 
@@ -21,21 +20,29 @@ export function fileNeedsRegistration(file: string) {
 }
 
 export async function fileHashesMatch(key: string) {
-	const currHash = getFileHash(key);
+	const cachedHash = getFileHash(key);
 	const scadContent = await readFile(key, "utf8");
 	const newHash = md5(scadContent);
-	return newHash === currHash;
+	const hashMatch = newHash === cachedHash;
+	// debug("comparing hashes: %O", { cached: cachedHash, current: newHash });
+	debug("fileHashesMatch: %o", hashMatch);
+	return hashMatch;
 }
 
 export async function fileHashesDiffer(key: string) {
 	return (await fileHashesMatch(key)) !== true;
 }
 
-export async function registerFile(key: string) {
+export async function updateHash(key: string) {
 	const scadContent = await readFile(key, "utf8");
 	const hash = md5(scadContent);
 	cache.set(key, hash);
-	isFileRegistered(key);
+	debug("hashed %o", key);
+}
+
+export async function registerFile(key: string) {
+	updateHash(key);
+	debug({ registered: key });
 }
 
 export async function ensureFileRegistered(file: string) {

src/core/cache.ts

@@ -25,4 +25,16 @@ export function registerEventHandlers(eleventyConfig: EleventyConfig) {
 
 		// eleventyConfig.addTemplate;
 	});
+
+	// biome-ignore lint/suspicious/noExplicitAny: merp
+	eleventyConfig.on("eleventy.contentMap", (_event: any) => {
+		logger.logWithOptions({
+			message: "eleventy.after",
+			color: "magenta",
+			prefix: "🪵\n\t",
+			force: true,
+		});
+
+		// eleventyConfig.addTemplate;
+	});
 }

src/core/events.ts

@@ -0,0 +1,63 @@
+import { spawn } from "node:child_process";
+import Debug from "../lib/debug";
+import Timer from "../lib/timer";
+
+const timer = new Timer();
+const debug = Debug.extend("generator");
+
+/**
+ * Generate an `.stl` from a given `.scad` file
+ */
+export async function scad2stl(
+	launchPath: string,
+	files: { in: string; out: string },
+): Promise<ScadExportResult> {
+	return new Promise<ScadExportResult>((resolve, reject) => {
+		const lines: string[] = [];
+		const input = normalPath(files.in);
+		const output = normalPath(files.out);
+
+		debug("input: %o", input);
+		debug("output: %o", output);
+
+		const scad = spawn(launchPath, ["--o", output, input]);
+
+		scad.on("spawn", () => timer.start());
+
+		scad.stdout.on("data", (data) => {
+			debug("[stdout] %s", data.toString());
+		});
+
+		scad.stderr.on("data", (data) => {
+			// const lines = String(data).split("\n");
+			// lines.forEach((line) => void debug("[stderr] %s", line));
+			lines.push(data.toString());
+		});
+
+		scad.on("error", (err) => {
+			reject({ output: err, ok: false });
+		});
+
+		scad.on("close", (exitCode) => {
+			const result: ScadExportResult = {
+				ok: exitCode === 0,
+				output: lines,
+				duration: timer.duration,
+				exitCode,
+			};
+			debug("result: %O", result);
+			resolve(result);
+		});
+	});
+}
+
+type ScadExportResult = {
+	ok: boolean;
+	output: string[];
+	exitCode: number | null;
+	duration: number;
+};
+
+function normalPath(path: string) {
+	return `./${path.replace(/^\.?\/?/, "")}`;
+}

src/core/generator.ts

@@ -1,11 +1,11 @@
 export * as cache from "./cache";
 export * from "./const";
 export * from "./events";
+export * from "./generator";
 export * from "./global-data";
 export * from "./highlighters";
 export * from "./options";
 export * from "./scad-bin";
-export * from "./scad2stl";
 export * from "./shortcodes";
 export * from "./templates";
 export * from "./transformer";

src/core/index.ts

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { getLogger } from "../lib/logger";
 import { DOT_SCAD, DOT_STL } from "./const";
-import { scad2stl } from "./scad2stl";
+import { scad2stl } from "./generator";
 import type { EleventyConfig, EleventyScope } from "../types";
 
 /**

src/core/scad2stl.ts

@@ -6,8 +6,7 @@ const debug = Debug.extend("fs");
 
 export function fileExist(file: string) {
 	const state = existsSync(file);
-	debug("file: %o", file);
-	debug("exists: %o", state);
+	debug({ file, exists: state });
 	return state;
 }