moving test config up

Author: kevinkhill

dist/index.js

@@ -1,4 +1,4 @@
-import { addOpenSCADPlugin } from "../../dist/index.js";
+import { addOpenSCADPlugin } from "./dist/index.js";
 
 /**
  * Testing & Development Config
@@ -7,13 +7,12 @@ import { addOpenSCADPlugin } from "../../dist/index.js";
  */
 export default function (eleventyConfig) {
   eleventyConfig.setQuietMode(false);
-  eleventyConfig.setInputDirectory("input");
-  eleventyConfig.setOutputDirectory("output");
-  eleventyConfig.addWatchTarget("../../dist/**/*");
+  eleventyConfig.setInputDirectory("test/_11ty/input");
+  eleventyConfig.setOutputDirectory("test/_11ty/output");
+  eleventyConfig.addWatchTarget("dist/**/*");
 
   addOpenSCADPlugin(eleventyConfig, {
     launchPath: "nightly",
     verbose: true,
-    collectionPage: true,
   });
 }

test/_11ty/eleventy.config.mjs eleventy.config.mjstest/_11ty/eleventy.config.mjs renamed to eleventy.config.mjs

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

package.json

@@ -1,6 +1,8 @@
-import debug from "../lib/debug";
+import Debug from "../lib/debug";
 import type { PlatformMap } from "../types";
 
+const debug = Debug.extend("bin");
+
 /**
  * Default OpenSCAD install locations
  *
@@ -47,12 +49,11 @@ export function autoBinPath(
 	platform: NodeJS.Platform,
 	binType: null | "auto" | "nightly" = "auto",
 ) {
-	const log = debug.extend("bin");
 	const binMap = binType === "nightly" ? SCAD_BIN_NIGHTLY : SCAD_BIN;
 	const bin = binMap[platform as keyof PlatformMap];
 	const retVal = typeof bin === "string" ? bin : null;
-	log("platform: %s", platform);
-	log("binType: %s", binType);
-	log("output: %s", retVal);
+	debug("platform: %s", platform);
+	debug("binType: %s", binType);
+	debug("output: %s", retVal);
 	return retVal;
 }

src/core/scad-bin.ts

@@ -1,12 +1,7 @@
 import { spawn } from "node:child_process";
-import { debug } from "../lib";
+import Debug from "../lib/debug";
 
-type ScadExportResult = {
-	output: string[];
-	ok: boolean;
-};
-
-let workerId = 0;
+const debug = Debug.extend("scad2stl");
 
 /**
  * Generate an `.stl` from a given `.scad` file
@@ -15,11 +10,8 @@ export async function scad2stl(
 	launchPath: string,
 	files: { in: string; out: string },
 ): Promise<ScadExportResult> {
-	const debugWorker = debug.extend(`worker${workerId++}`);
-
-	// debugWorker("spawned %s", launchPath);
-	debugWorker("input: %s", files.in);
-	debugWorker("output: %s", files.out);
+	debug("input: %s", files.in);
+	debug("output: %s", files.out);
 
 	const { promise, resolve, reject } =
 		Promise.withResolvers<ScadExportResult>();
@@ -28,12 +20,12 @@ export async function scad2stl(
 	const output: string[] = [];
 
 	scad.stdout.on("data", (data) => {
-		debugWorker("[stdout] %s", data.toString());
+		debug("[stdout] %s", data.toString());
 	});
 
 	scad.stderr.on("data", (data) => {
-		const lines = String(data).split("\n");
-		// lines.forEach((line) => void debugWorker("[stderr] %s", line));
+		// const lines = String(data).split("\n");
+		// lines.forEach((line) => void debug("[stderr] %s", line));
 		output.push(data.toString());
 	});
 
@@ -42,9 +34,14 @@ export async function scad2stl(
 	});
 
 	scad.on("close", (exitCode) => {
-		debugWorker("process closed");
+		// debug("done");
 		resolve({ output, ok: exitCode === 0 });
 	});
 
 	return promise;
 }
+
+type ScadExportResult = {
+	output: string[];
+	ok: boolean;
+};