@adonisjs/assembler 8.0.0-next.20 → 8.0.0-next.22

package/build/{chunk-4452KFDQ.js → chunk-NR7VMFWO.js}

@@ -252,8 +252,11 @@ var IndexGeneratorSource = class {
    */
   #createBarrelFileKeyGenerator(config) {
     return function(key) {
-      const paths = key.split("/");
+      let paths = key.split("/");
       let baseName = new StringBuilder(paths.pop());
+      if (config.skipSegments?.length) {
+        paths = paths.filter((p) => !config.skipSegments.includes(p));
+      }
       if (config.computeBaseName) {
         baseName = config.computeBaseName(baseName);
       } else {

package/build/index.js

@@ -1,7 +1,7 @@
 import {
   FileBuffer,
   IndexGenerator
-} from "./chunk-4452KFDQ.js";
+} from "./chunk-NR7VMFWO.js";
 import {
   RoutesScanner
 } from "./chunk-NAASGAFO.js";
@@ -635,14 +635,6 @@ var ShortcutsManager = class {
 
 // src/dev_server.ts
 var DevServer = class _DevServer {
-  /**
-   * Pre-allocated info object for hot-hook change events to avoid repeated object creation
-   */
-  static #HOT_HOOK_CHANGE_INFO = {
-    source: "hot-hook",
-    fullReload: false,
-    hotReloaded: false
-  };
   /**
    * Pre-allocated info object for hot-hook full reload events
    */
@@ -690,6 +682,10 @@ var DevServer = class _DevServer {
    * Reference to the child process
    */
   #httpServer;
+  /**
+   * Flag to track if the HTTP server child process is alive
+   */
+  #isHttpServerAlive = false;
   /**
    * Keyboard shortcuts manager instance
    */
@@ -864,6 +860,56 @@ var DevServer = class _DevServer {
       process.stdout.write("\x1Bc");
     }
   }
+  /**
+   * Creates our file system watcher
+   */
+  #createWatcher(options) {
+    const watcher = watch({
+      usePolling: options?.poll ?? false,
+      cwd: this.cwdPath,
+      ignoreInitial: true,
+      ignored: (file, stats) => {
+        if (!stats) return false;
+        if (file.includes("inertia") && !file.includes("node_modules")) return false;
+        if (stats.isFile()) return !this.#fileSystem.shouldWatchFile(file);
+        return !this.#fileSystem.shouldWatchDirectory(file);
+      }
+    });
+    watcher.on("error", (error) => {
+      this.ui.logger.warning("file system watcher failure");
+      this.ui.logger.fatal(error);
+      this.#onError?.(error);
+      this.#watcher?.close();
+    });
+    watcher.on("ready", () => {
+      this.ui.logger.info("watching file system for changes...");
+    });
+    return watcher;
+  }
+  /**
+   * Handles file change events in HMR mode by forwarding to hot-hook
+   * or restarting the server if dead.
+   */
+  #handleHmrWatcherEvent(options) {
+    const relativePath = string3.toUnixSlash(options.filePath);
+    const absolutePath = join2(this.cwdPath, relativePath);
+    if (this.#isHttpServerAlive === false) {
+      this.#clearScreen();
+      this.ui.logger.log(`${this.ui.colors.green(options.displayLabel)} ${relativePath}`);
+      this.#restartHTTPServer();
+      return;
+    }
+    if (options.action === "add") {
+      this.#hooks.runner("fileAdded").run(relativePath, absolutePath, this);
+    } else if (options.action === "unlink") {
+      this.#hooks.runner("fileRemoved").run(relativePath, absolutePath, this);
+    }
+    this.#httpServer?.send({
+      type: "hot-hook:file-changed",
+      path: absolutePath,
+      action: options.action
+    });
+  }
   /**
    * Handles file change events and triggers appropriate server actions
    *
@@ -1073,7 +1119,7 @@ var DevServer = class _DevServer {
   async #startHTTPServer(port) {
     await this.#hooks.runner("devServerStarting").run(this);
     debug_default('starting http server using "%s" file, options %O', this.scriptFile, this.options);
-    return new Promise(async (resolve) => {
+    return new Promise((resolve) => {
       this.#httpServer = runNode(this.cwd, {
         script: this.scriptFile,
         env: { PORT: port, ...this.options.env },
@@ -1081,6 +1127,7 @@ var DevServer = class _DevServer {
         reject: true,
         scriptArgs: this.options.scriptArgs
       });
+      this.#isHttpServerAlive = true;
       this.#httpServer.on("message", async (message) => {
         if (this.#isAdonisJSReadyMessage(message)) {
           debug_default("received http server ready message %O", message);
@@ -1091,17 +1138,7 @@ var DevServer = class _DevServer {
           await this.#processRoutes(message.routesFileLocation);
         } else if (this.#mode === "hmr" && this.#isHotHookMessage(message)) {
           debug_default("received hot-hook message %O", message);
-          if (message.type === "hot-hook:file-changed") {
-            const absolutePath = message.path ? string3.toUnixSlash(message.path) : "";
-            const relativePath = relative3(this.cwdPath, absolutePath);
-            if (message.action === "add") {
-              this.#hooks.runner("fileAdded").run(relativePath, absolutePath, this);
-            } else if (message.action === "change") {
-              this.#hooks.runner("fileChanged").run(relativePath, absolutePath, _DevServer.#HOT_HOOK_CHANGE_INFO, this);
-            } else if (message.action === "unlink") {
-              this.#hooks.runner("fileRemoved").run(relativePath, absolutePath, this);
-            }
-          } else if (message.type === "hot-hook:full-reload") {
+          if (message.type === "hot-hook:full-reload") {
             const absolutePath = message.path ? string3.toUnixSlash(message.path) : "";
             const relativePath = relative3(this.cwdPath, absolutePath);
             this.#hooks.runner("fileChanged").run(relativePath, absolutePath, _DevServer.#HOT_HOOK_FULL_RELOAD_INFO, this);
@@ -1113,12 +1150,14 @@ var DevServer = class _DevServer {
         }
       });
       this.#httpServer.then((result) => {
+        this.#isHttpServerAlive = false;
         if (!this.#watcher) {
           this.#onClose?.(result.exitCode);
         } else {
           this.ui.logger.info("Underlying HTTP server closed. Still watching for changes");
         }
       }).catch((error) => {
+        this.#isHttpServerAlive = false;
         if (!this.#watcher) {
           this.#onError?.(error);
         } else {
@@ -1205,13 +1244,22 @@ var DevServer = class _DevServer {
       this.options.nodeArgs.push("--import=hot-hook/register");
       this.options.env = {
         ...this.options.env,
-        HOT_HOOK_INCLUDE: this.#fileSystem.includes.join(","),
-        HOT_HOOK_IGNORE: this.#fileSystem.excludes.filter((exclude) => !exclude.includes("inertia")).join(","),
-        HOT_HOOK_RESTART: (this.options.metaFiles ?? []).filter(({ reloadServer }) => !!reloadServer).map(({ pattern }) => pattern).join(",")
+        HOT_HOOK_WATCH: "false"
       };
     }
     this.ui.logger.info("starting HTTP server...");
     await this.#startHTTPServer(this.#stickyPort);
+    if (this.#mode !== "hmr") return;
+    this.#watcher = this.#createWatcher();
+    this.#watcher.on("add", (filePath) => {
+      this.#handleHmrWatcherEvent({ filePath, action: "add", displayLabel: "add" });
+    });
+    this.#watcher.on("change", (filePath) => {
+      this.#handleHmrWatcherEvent({ filePath, action: "change", displayLabel: "update" });
+    });
+    this.#watcher.on("unlink", (filePath) => {
+      this.#handleHmrWatcherEvent({ filePath, action: "unlink", displayLabel: "delete" });
+    });
   }
   /**
    * Starts the development server in watch mode and restarts on file changes
@@ -1235,32 +1283,7 @@ var DevServer = class _DevServer {
     }
     this.ui.logger.info("starting HTTP server...");
     await this.#startHTTPServer(this.#stickyPort);
-    this.#watcher = watch({
-      usePolling: options?.poll ?? false,
-      cwd: this.cwdPath,
-      ignoreInitial: true,
-      ignored: (file, stats) => {
-        if (!stats) {
-          return false;
-        }
-        if (file.includes("inertia") && !file.includes("node_modules")) {
-          return false;
-        }
-        if (stats.isFile()) {
-          return !this.#fileSystem.shouldWatchFile(file);
-        }
-        return !this.#fileSystem.shouldWatchDirectory(file);
-      }
-    });
-    this.#watcher.on("ready", () => {
-      this.ui.logger.info("watching file system for changes...");
-    });
-    this.#watcher.on("error", (error) => {
-      this.ui.logger.warning("file system watcher failure");
-      this.ui.logger.fatal(error);
-      this.#onError?.(error);
-      this.#watcher?.close();
-    });
+    this.#watcher = this.#createWatcher({ poll: options?.poll });
     this.#watcher.on("add", (filePath) => {
       const relativePath = string3.toUnixSlash(filePath);
       const absolutePath = join2(this.cwdPath, relativePath);

package/build/src/index_generator/main.js

@@ -1,6 +1,6 @@
 import {
   IndexGenerator
-} from "../../chunk-4452KFDQ.js";
+} from "../../chunk-NR7VMFWO.js";
 import "../../chunk-JFBQ4OEM.js";
 export {
   IndexGenerator

package/build/src/types/common.d.ts

@@ -38,6 +38,7 @@ export type IndexGeneratorSourceConfig = ({
     glob?: string[];
     importAlias?: string;
     removeSuffix?: string;
+    skipSegments?: string[];
 };
 /**
  * Marks a given optional property as required

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@adonisjs/assembler",
   "description": "Provides utilities to run AdonisJS development server and build project for production",
-  "version": "8.0.0-next.20",
+  "version": "8.0.0-next.22",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -53,7 +53,7 @@
     "cross-env": "^10.1.0",
     "del-cli": "^7.0.0",
     "eslint": "^9.37.0",
-    "hot-hook": "^0.4.1-next.0",
+    "hot-hook": "^0.4.1-next.2",
     "p-event": "^7.0.0",
     "prettier": "^3.6.2",
     "release-it": "^19.0.5",