@pajh/buldng 0.0.5 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pajh/buldng",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "main": "./src/buldng-lib.js",
   "files": [

package/src/buldng-files.js

@@ -1,6 +1,6 @@
 // buldng-files.js
 // file handling functions for buldng
-import { getDest, setSource, setDest, assertDestWrite, assertSourceRead, getInputs, looksLikeFilename, looksLikeHTML,
+import { getDest, setSource, setDest, assertDestWrite, assertSourceRead, getInputs, trackInput, looksLikeFilename, looksLikeHTML,
          looksLikeCSS, looksLikeJS } from "./buldng-validate.js";
 import fs from "node:fs";
 import path from "node:path";
@@ -49,10 +49,11 @@ export function deepCopy(from, to) {
           copyRecursive(path.join(src, entry), path.join(dst, entry));
         }
       } else {
+        trackInput(src);
         fs.mkdirSync(path.dirname(dst), { recursive: true });
         fs.copyFileSync(src, dst);
       }
     }
     
     copyRecursive(absFrom, absTo);
-  }
+  }

package/src/buldng-lib.js

@@ -2,11 +2,12 @@
 import esbuild from "esbuild";
 import { fileURLToPath } from "node:url";
 import { dirname, join } from "node:path";
+import fs from "node:fs";
 import { readFileSync } from "node:fs";
 import { createRequire } from "node:module";
 import { WorkFile } from "./workfile.js";
 import {
-  getDest, setSource, setDest, assertDestWrite, assertSourceRead, getInputs, looksLikeFilename, looksLikeHTML,
+  getDest, setSource, setDest, assertDestWrite, assertSourceRead, getInputs, trackInput, looksLikeFilename, looksLikeHTML,
   looksLikeCSS, looksLikeJS, ensureLeadingSlash, ensureWorkFile
 } from "./buldng-validate.js";
 import { file, literal, wrap, append, replace, compile, materialise }
@@ -15,7 +16,8 @@ export { file, literal, wrap, append, replace, compile, materialise }
   from "./buldng-ops.js";
 export {
   assertSourceRead, assertDestWrite, setSource, setDest, looksLikeFilename,
-  looksLikeHTML, looksLikeCSS, looksLikeJS, ensureWorkFile, ensureLeadingSlash
+  looksLikeHTML, looksLikeCSS, looksLikeJS, ensureWorkFile, ensureLeadingSlash,
+  trackInput
 } from "./buldng-validate.js";
 import { task, parallel, finalise } from "./buldng-async.js";
 import { typescriptCheck } from "./buldng-typescript.js";
@@ -52,7 +54,8 @@ export default {
   buldngHTMLWrapper,
   reg,
   printHeader,
-  typescriptCheck
+  typescriptCheck,
+  writeBuildInputsManifest
 };
 
 const here = dirname(fileURLToPath(import.meta.url));
@@ -78,13 +81,41 @@ export function header() {
 }
 
 // --------------------------------------------------
-// build-inputs.json manifest
+// Development input manifest
 // --------------------------------------------------
-process.on("exit", () => {
-  if (process.env.BULDNG_HOT !== "1") return;
-  let DEST = getDest();
-  let INPUTS = getInputs();
-  const manifest = Array.from(INPUTS);
-  const out = path.join(DEST, "build-inputs.json");
+export function writeBuildInputsManifest(additionalInputs = []) {
+  for (const input of additionalInputs) {
+    trackInput(input);
+  }
+
+  const manifest = Array.from(getInputs())
+    .filter(input => fs.existsSync(input) && fs.statSync(input).isFile())
+    .sort();
+  const out = assertDestWrite("build-inputs.json");
+
   fs.writeFileSync(out, JSON.stringify(manifest, null, 2));
+  fs.chmodSync(out, 0o444);
+  console.log(`build-inputs.json: ${manifest.length} files recorded`);
+
+  return manifest;
+}
+
+function requestedBuildInputsManifest() {
+  return process.argv.slice(2).includes("--manifest");
+}
+
+function projectRootInputs() {
+  const buildScript = process.argv[1];
+  const projectRoot = dirname(buildScript);
+  return [
+    buildScript,
+    join(projectRoot, "package.json"),
+    join(projectRoot, "tsconfig.json"),
+    join(projectRoot, "safe_clean.sh")
+  ].filter(input => fs.existsSync(input));
+}
+
+process.on("exit", exitCode => {
+  if (exitCode !== 0 || !requestedBuildInputsManifest()) return;
+  writeBuildInputsManifest(projectRootInputs());
 });

package/src/buldng-ops.js

@@ -5,7 +5,7 @@ import fs from "node:fs";
 import path from "node:path";
 import esbuild from "esbuild";
 
-import { assertSourceRead, assertDestWrite, looksLikeFilename, ensureWorkFile } from "./buldng-validate.js";
+import { assertSourceRead, assertDestWrite, trackInput, looksLikeFilename, ensureWorkFile } from "./buldng-validate.js";
 export const OPS = {
     file: op_file,
     literal: op_literal,
@@ -107,10 +107,13 @@ export function op_compile(config, children) {
         const result = esbuild.buildSync({
             entryPoints: [entry],
             bundle: true,
+            metafile: true,
             ...compileOptions,
             write: false
         });
 
+        trackEsbuildInputs(result);
+
         if (result.errors?.length) {
             throw new Error("Build failed:\n" + result.errors.map(e => e.text).join("\n"));
         }
@@ -121,16 +124,19 @@ export function op_compile(config, children) {
     // Otherwise compile from stdin
     const srcText = child.execute();
 
-    const result = esbuild.buildSync({
+        const result = esbuild.buildSync({
         stdin: {
             contents: srcText,
             resolveDir: process.cwd(),
             sourcefile: "input.ts"
         },
-        bundle: true,
-        ...compileOptions,
-        write: false
-    });
+            bundle: true,
+            metafile: true,
+            ...compileOptions,
+            write: false
+        });
+
+        trackEsbuildInputs(result);
 
     if (result.errors?.length) {
         throw new Error("Build failed:\n" + result.errors.map(e => e.text).join("\n"));
@@ -139,6 +145,15 @@ export function op_compile(config, children) {
     return result.outputFiles[0].text;
 }
 
+function trackEsbuildInputs(result) {
+    for (const input of Object.keys(result.metafile?.inputs ?? {})) {
+        const abs = path.resolve(input);
+        if (fs.existsSync(abs) && fs.statSync(abs).isFile()) {
+            trackInput(abs);
+        }
+    }
+}
+
 // --------------------------------------------------
 // MATERIALISE — write file if identical or new
 // --------------------------------------------------

package/src/buldng-validate.js

@@ -158,10 +158,17 @@ export function getInputs() {
 }
 
 export function trackInput(absPath) {
-  if (!SRC || !DEST) return;
-  if (absPath.startsWith(SRC) && !absPath.startsWith(DEST)) {
-    INPUTS.add(absPath);
+  const abs = path.resolve(absPath);
+
+  if (DEST) {
+    const relativeToDest = path.relative(DEST, abs);
+    const isInsideDest = relativeToDest === "" ||
+      (!relativeToDest.startsWith("..") && !path.isAbsolute(relativeToDest));
+
+    if (isInsideDest) return;
   }
+
+  INPUTS.add(abs);
 }
 
 export function looksLikeFilename(s) {
@@ -204,4 +211,4 @@ export function ensureWorkFile(x, fieldName = "value") {
   }
 
   throw new Error(`${fieldName} must be WorkFile or string`);
-}
+}

package/src/serve-lib.js

@@ -6,8 +6,8 @@ import { exec, spawn } from "node:child_process";
 
 export const VALID_FLAGS = {
   "log": { type: "boolean" },
-  "hot": { type: "boolean" },
   "dev-errors": { type: "boolean" },
+  "no-hot": { type: "boolean" },
   "map": { type: "value" },
   "root": { type: "value" },
   "port": { type: "value" },
@@ -18,15 +18,15 @@ export const VALID_FLAGS = {
 // STATE CREATION
 // --------------------------------------------------
 
-export function createState({ ROOT, PORT, MAPPINGS, MIME, LOG_ALL, HOT_REQUESTED, DEV_ERRORS }) {
+export function createState({ ROOT, PORT, MAPPINGS, MIME, LOG_ALL, DEV_ERRORS, NO_HOT }) {
   return {
     ROOT,
     PORT,
     MAPPINGS,
     MIME,
     LOG_ALL,
-    HOT_REQUESTED,
     DEV_ERRORS,
+    NO_HOT,
     hotEnabled: false,
     injections: { html: [] },
     running: false,
@@ -354,6 +354,16 @@ function stopWatching(state) {
   state.watchers = [];
 }
 
+export function stopHotReload(state) {
+  state.hotEnabled = false;
+  stopWatching(state);
+
+  for (const response of state.sseClients) {
+    if (!response.writableEnded) response.end();
+  }
+  state.sseClients = [];
+}
+
 function startWatching(files, state) {
   stopWatching(state);
 
@@ -382,7 +392,7 @@ function rebuild(state) {
   if (!state.hotEnabled) return;
 
   console.log("[hot] rebuilding…");
-  const child = spawn("npm", ["run", "build"], { stdio: "inherit" });
+  const child = spawn("npm", ["run", "build:dev"], { stdio: "inherit" });
 
   child.on("exit", (code) => {
     if (code !== 0) {
@@ -405,7 +415,7 @@ function rebuild(state) {
       return;
     }
 
-    console.log(`[hot] active — watching ${watched} files`);
+    console.log(`[hot] hot reloading enabled — ${watched} files being monitored`);
   });
 }
 
@@ -416,26 +426,25 @@ function sendSSE(state, msg) {
 }
 
 export function initHotReload(state) {
-  if (!state.HOT_REQUESTED) {
-    console.log("[hot] off — pass --hot to enable");
+  if (state.NO_HOT) {
+    console.log("[hot] disabled by --no-hot");
     return;
   }
 
-  console.log("[hot] requested");
   const files = loadManifest(state);
   if (!files) {
-    console.warn("[hot] no build-inputs.json; disabled");
+    console.log("[hot] no manifest found — hot reloading disabled");
     return;
   }
 
   const watched = startWatching(files, state);
   if (watched === 0) {
-    console.warn("[hot] no watchable files; disabled");
+    console.log("[hot] manifest has no watchable files — hot reloading disabled");
     return;
   }
 
   state.hotEnabled = true;
-  console.log(`[hot] active — watching ${watched} files`);
+  console.log(`[hot] hot reloading enabled — ${watched} files being monitored`);
 }
 
 // --------------------------------------------------
@@ -563,5 +572,3 @@ try {
 }
 
 }
-
-

package/src/serve.js

@@ -15,6 +15,7 @@ import {
   registerInject,
   sanitiseRoot,
   sanitisePort,
+  stopHotReload,
   local,
   ARGS
 } from "./serve-lib.js";
@@ -92,8 +93,8 @@ function init() {
     MAPPINGS: [],
     MIME: MIME,
     LOG_ALL: ARGS.get("log"),
-    HOT_REQUESTED: ARGS.get("hot"),
-    DEV_ERRORS: ARGS.get("dev-errors")
+    DEV_ERRORS: ARGS.get("dev-errors"),
+    NO_HOT: ARGS.get("no-hot")
   });
 
   loadMappings(state);
@@ -147,18 +148,17 @@ function serve(state) {
     response.send(res);
   });
 
-  process.on("SIGTERM", () => {
-    // clean shutdown logic
-    server.close(() => {
-        process.exit(0);
-    });
-  });
-
-  // Optional graceful shutdown
-  process.on("SIGINT", () => {
+  let shuttingDown = false;
+  const shutdown = () => {
+    if (shuttingDown) return;
+    shuttingDown = true;
     teardown(state);
     server.close(() => process.exit(0));
-  });
+    server.closeAllConnections();
+  };
+
+  process.once("SIGTERM", shutdown);
+  process.once("SIGINT", shutdown);
 
   server.listen(state.PORT, () => {
     console.log(`[serve] root: ${state.ROOT} at http://localhost:${state.PORT}`);
@@ -176,6 +176,7 @@ function serve(state) {
 
 function teardown(state) {
   state.running = false;
+  stopHotReload(state);
   console.log("Server shutting down.");
 }
 
@@ -190,4 +191,4 @@ function main() {
 
 }
 
-main();
+main();