@adonisjs/assembler 8.0.0-next.17 → 8.0.0-next.19

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

@@ -3,7 +3,7 @@ import {
   debug_default,
   removeExtension,
   throttle
-} from "./chunk-HRE5L24F.js";
+} from "./chunk-JFBQ4OEM.js";
 
 // src/index_generator/source.ts
 import string from "@poppinss/utils/string";

package/build/{chunk-RSWZKA6F.js → chunk-CSRLGGAO.js}

@@ -10,7 +10,7 @@ import {
   VirtualFileSystem,
   debug_default,
   isRelative
-} from "./chunk-HRE5L24F.js";
+} from "./chunk-JFBQ4OEM.js";
 
 // src/code_scanners/routes_scanner/main.ts
 import { cliui } from "@poppinss/cliui";
@@ -64,7 +64,7 @@ var PathsResolver = class {
    * const path = resolver.resolve('#app/models/user')
    * const path2 = resolver.resolve('@/utils/helper')
    */
-  resolve(specifier) {
+  resolve(specifier, rewriteAliasImportExtension = false) {
     if (isRelative(specifier)) {
       throw new Error("Cannot resolve relative paths using PathsResolver");
     }
@@ -73,7 +73,11 @@ var PathsResolver = class {
     if (cached) {
       return cached;
     }
-    this.#resolvedPaths[cacheKey] = fileURLToPath(this.#resolver(specifier, this.#appRoot));
+    let resolvedPath = fileURLToPath(this.#resolver(specifier, this.#appRoot));
+    if (rewriteAliasImportExtension && specifier.startsWith("#") && resolvedPath.endsWith(".js")) {
+      resolvedPath = resolvedPath.replace(/\.js$/, ".ts");
+    }
+    this.#resolvedPaths[cacheKey] = resolvedPath;
     return this.#resolvedPaths[cacheKey];
   }
 };
@@ -264,7 +268,7 @@ var RoutesScanner = class {
     return {
       name,
       method: method ?? "handle",
-      path: string2.toUnixSlash(this.pathsResolver.resolve(specifier)),
+      path: string2.toUnixSlash(this.pathsResolver.resolve(specifier, true)),
       import: {
         specifier,
         type: "default",

package/build/{chunk-HRE5L24F.js → chunk-JFBQ4OEM.js}

@@ -73,14 +73,15 @@ function readTsConfig(cwd) {
     const tsConfig = parseTsconfig(tsConfigPath);
     if (tsConfig.include) {
       tsConfig.include = tsConfig.include.map((resolvedPath) => {
-        return resolvedPath.replace(`${cwd}/`, "");
+        return resolvedPath.replace(cwd, "");
       });
     }
     if (tsConfig.exclude) {
       tsConfig.exclude = tsConfig.exclude.map((resolvedPath) => {
-        return resolvedPath.replace(`${cwd}/`, "");
+        return resolvedPath.replace(cwd, "");
       });
     }
+    debug_default("read tsconfig %O", tsConfig);
     return {
       path: tsConfigPath,
       config: tsConfig
@@ -268,30 +269,6 @@ var VirtualFileSystem = class {
     };
     this.#matcher = picomatch(this.#options.glob ?? DEFAULT_GLOB, this.#picoMatchOptions);
   }
-  /**
-   * Currently the PathsResolver relies on a non-standard way of resolving
-   * absolute paths or paths with subpath imports. Because of which, the
-   * on-disk file could be TypeScript, while the resolved filepath is
-   * JavaScript.
-   *
-   * To overcome this limitation, we start by first looking for a `.ts` file
-   * (because of high probability) and then look for `.js` file
-   */
-  async #readTSOrJSFile(filePath) {
-    if (filePath.endsWith(".js")) {
-      try {
-        const contents = await readFile(filePath.replace(/\.js$/, ".ts"), "utf-8");
-        debug_default('read as TypeScript file "%s"', filePath);
-        return contents;
-      } catch (error) {
-        if (error.code === "ENOENT") {
-          return readFile(filePath, "utf-8");
-        }
-        throw error;
-      }
-    }
-    return readFile(filePath, "utf-8");
-  }
   /**
    * Scans the filesystem to collect the files. Newly files must
    * be added via the ".add" method.
@@ -406,7 +383,7 @@ var VirtualFileSystem = class {
       debug_default('returning AST nodes from cache "%s"', filePath);
       return cached;
     }
-    const fileContents = await this.#readTSOrJSFile(filePath);
+    const fileContents = await readFile(filePath, "utf-8");
     debug_default('parsing "%s" file to AST', filePath);
     this.#astCache.set(filePath, parse(Lang.TypeScript, fileContents).root());
     return this.#astCache.get(filePath);

package/build/index.js

@@ -1,10 +1,10 @@
 import {
   FileBuffer,
   IndexGenerator
-} from "./chunk-YFDLKKOA.js";
+} from "./chunk-4452KFDQ.js";
 import {
   RoutesScanner
-} from "./chunk-RSWZKA6F.js";
+} from "./chunk-CSRLGGAO.js";
 import "./chunk-TIKQQRMX.js";
 import {
   VirtualFileSystem,
@@ -19,7 +19,7 @@ import {
   runNode,
   throttle,
   watch
-} from "./chunk-HRE5L24F.js";
+} from "./chunk-JFBQ4OEM.js";
 
 // src/bundler.ts
 import dedent from "dedent";
@@ -998,7 +998,7 @@ var DevServer = class _DevServer {
       this.#handleFileChange(relativePath, absolutePath, "add");
     });
     this.#hooks.add("fileChanged", (relativePath, absolutePath, info) => {
-      if (info.hotReloaded) {
+      if (info.hotReloaded || !info.hotReloaded && !info.fullReload) {
         this.#reScanRoutes(absolutePath);
       }
       this.#handleFileChange(relativePath, absolutePath, "update", info);
@@ -1091,20 +1091,23 @@ 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);
-          const absolutePath = message.path ? string3.toUnixSlash(message.path) : "";
-          const relativePath = relative3(this.cwdPath, absolutePath);
           if (message.type === "hot-hook:file-changed") {
-            const { action } = message;
-            if (action === "add") {
+            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 (action === "change") {
+            } else if (message.action === "change") {
               this.#hooks.runner("fileChanged").run(relativePath, absolutePath, _DevServer.#HOT_HOOK_CHANGE_INFO, this);
-            } else if (action === "unlink") {
+            } else if (message.action === "unlink") {
               this.#hooks.runner("fileRemoved").run(relativePath, absolutePath, this);
             }
           } else 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);
           } else if (message.type === "hot-hook:invalidated") {
+            const absolutePath = message.paths[0] ? string3.toUnixSlash(message.paths[0]) : "";
+            const relativePath = relative3(this.cwdPath, absolutePath);
             this.#hooks.runner("fileChanged").run(relativePath, absolutePath, _DevServer.#HOT_HOOK_INVALIDATED_INFO, this);
           }
         }

package/build/src/code_scanners/routes_scanner/main.js

@@ -1,8 +1,8 @@
 import {
   RoutesScanner
-} from "../../../chunk-RSWZKA6F.js";
+} from "../../../chunk-CSRLGGAO.js";
 import "../../../chunk-TIKQQRMX.js";
-import "../../../chunk-HRE5L24F.js";
+import "../../../chunk-JFBQ4OEM.js";
 export {
   RoutesScanner
 };

package/build/src/index_generator/main.js

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

package/build/src/paths_resolver.d.ts

@@ -37,5 +37,5 @@ export declare class PathsResolver {
      * const path = resolver.resolve('#app/models/user')
      * const path2 = resolver.resolve('@/utils/helper')
      */
-    resolve(specifier: string): string;
+    resolve(specifier: string, rewriteAliasImportExtension?: boolean): string;
 }

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

@@ -343,3 +343,26 @@ export interface ShortcutsManagerOptions {
     /** Callback functions for different shortcut actions */
     callbacks: KeyboardShortcutsCallbacks;
 }
+export type AdonisJSServerReadyMessage = {
+    isAdonisJS: true;
+    environment: 'web';
+    port: number;
+    host: string;
+    duration?: [number, number];
+};
+export type AdonisJSRoutesSharedMessage = {
+    isAdonisJS: true;
+    routesFileLocation: string;
+};
+export type HotHookMessage = {
+    type: 'hot-hook:full-reload';
+    path: string;
+    shouldBeReloadable?: boolean;
+} | {
+    type: 'hot-hook:invalidated';
+    paths: string[];
+} | {
+    type: 'hot-hook:file-changed';
+    path: string;
+    action: 'change' | 'add' | 'unlink';
+};

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.17",
+  "version": "8.0.0-next.19",
   "engines": {
     "node": ">=24.0.0"
   },