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

package/build/{chunk-3GYRM5Y2.js → chunk-HRE5L24F.js}

@@ -26,6 +26,7 @@ import { importDefault } from "@poppinss/utils";
 import { copyFile, mkdir } from "fs/promises";
 import { EnvLoader, EnvParser } from "@adonisjs/env";
 import chokidar from "chokidar";
+import { parseTsconfig } from "get-tsconfig";
 import { basename, dirname, isAbsolute, join, relative } from "path";
 var DEFAULT_NODE_ARGS = ["--import=@poppinss/ts-exec", "--enable-source-maps"];
 function parseConfig(cwd, ts) {
@@ -65,6 +66,29 @@ function parseConfig(cwd, ts) {
   }
   return parsedConfig;
 }
+function readTsConfig(cwd) {
+  const tsConfigPath = join(cwd, "tsconfig.json");
+  debug_default('reading config file from location "%s"', tsConfigPath);
+  try {
+    const tsConfig = parseTsconfig(tsConfigPath);
+    if (tsConfig.include) {
+      tsConfig.include = tsConfig.include.map((resolvedPath) => {
+        return resolvedPath.replace(`${cwd}/`, "");
+      });
+    }
+    if (tsConfig.exclude) {
+      tsConfig.exclude = tsConfig.exclude.map((resolvedPath) => {
+        return resolvedPath.replace(`${cwd}/`, "");
+      });
+    }
+    return {
+      path: tsConfigPath,
+      config: tsConfig
+    };
+  } catch {
+    return null;
+  }
+}
 function runNode(cwd, options) {
   const childProcess = execaNode(options.script, options.scriptArgs, {
     nodeOptions: DEFAULT_NODE_ARGS.concat(options.nodeArgs),
@@ -244,6 +268,30 @@ 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.
@@ -358,7 +406,7 @@ var VirtualFileSystem = class {
       debug_default('returning AST nodes from cache "%s"', filePath);
       return cached;
     }
-    const fileContents = await readFile(filePath, "utf-8");
+    const fileContents = await this.#readTSOrJSFile(filePath);
     debug_default('parsing "%s" file to AST', filePath);
     this.#astCache.set(filePath, parse(Lang.TypeScript, fileContents).root());
     return this.#astCache.get(filePath);
@@ -394,6 +442,7 @@ var VirtualFileSystem = class {
 export {
   debug_default,
   parseConfig,
+  readTsConfig,
   runNode,
   run,
   watch,

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

@@ -10,7 +10,7 @@ import {
   VirtualFileSystem,
   debug_default,
   isRelative
-} from "./chunk-3GYRM5Y2.js";
+} from "./chunk-HRE5L24F.js";
 
 // src/code_scanners/routes_scanner/main.ts
 import { cliui } from "@poppinss/cliui";
@@ -20,6 +20,7 @@ import StringBuilder from "@poppinss/utils/string_builder";
 
 // src/paths_resolver.ts
 import { join } from "path";
+import { resolve } from "import-meta-resolve";
 import { fileURLToPath, pathToFileURL } from "url";
 var PathsResolver = class {
   /**
@@ -34,7 +35,7 @@ var PathsResolver = class {
   /**
    * The resolver function used to resolve import specifiers
    */
-  #resolver = (specifier, parentPath) => import.meta.resolve(specifier, parentPath);
+  #resolver = (specifier, parentPath) => resolve(specifier, parentPath);
   constructor(appRoot) {
     this.#appRoot = pathToFileURL(join(appRoot, "index.js")).href;
   }
@@ -296,7 +297,7 @@ var RoutesScanner = class {
    */
   #processRouteWithoutController(route) {
     if (!route.name) {
-      debug_default(`skipping route "%s" as it does not have a name`, route.name);
+      debug_default(`skipping route "%s" as it does not have a name`, route.pattern);
       return;
     }
     const scannedRoute = {
@@ -315,7 +316,7 @@ var RoutesScanner = class {
    * Scans a route that is using a controller reference
    */
   async #processRouteWithController(route, vfs) {
-    if (!route.handler.importExpression) {
+    if (!route.handler || !route.handler.importExpression) {
       return this.#processRouteWithoutController(route);
     }
     const controller = await this.#inspectControllerSpecifier(

package/build/{chunk-KAOPWBR3.js → chunk-YFDLKKOA.js}

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

package/build/index.js

@@ -1,10 +1,10 @@
 import {
   FileBuffer,
   IndexGenerator
-} from "./chunk-KAOPWBR3.js";
+} from "./chunk-YFDLKKOA.js";
 import {
   RoutesScanner
-} from "./chunk-CX6VPELJ.js";
+} from "./chunk-RSWZKA6F.js";
 import "./chunk-TIKQQRMX.js";
 import {
   VirtualFileSystem,
@@ -14,11 +14,12 @@ import {
   loadHooks,
   memoize,
   parseConfig,
+  readTsConfig,
   run,
   runNode,
   throttle,
   watch
-} from "./chunk-3GYRM5Y2.js";
+} from "./chunk-HRE5L24F.js";
 
 // src/bundler.ts
 import dedent from "dedent";
@@ -393,16 +394,16 @@ var FileSystem = class {
   constructor(cwd, tsConfig, rcFile) {
     this.#cwd = cwd;
     this.#tsConfig = tsConfig;
-    const files = tsConfig.fileNames;
+    const files = tsConfig.config.files ?? [];
     const metaFiles = rcFile.metaFiles ?? [];
     const testSuites = rcFile.suites ?? [];
-    const outDir = tsConfig.raw.compilerOptions?.outDir;
+    const outDir = tsConfig.config.compilerOptions?.outDir;
     for (const file of files) {
       this.#scannedTypeScriptFiles.add(string2.toUnixSlash(file));
     }
-    this.#includes = tsConfig.raw.include || DEFAULT_INCLUDES;
+    this.#includes = tsConfig.config.include || DEFAULT_INCLUDES;
     this.#excludes = ALWAYS_EXCLUDE.concat(
-      tsConfig.raw.exclude || (outDir ? DEFAULT_EXCLUDES.concat(outDir) : DEFAULT_EXCLUDES)
+      tsConfig.config.exclude || (outDir ? DEFAULT_EXCLUDES.concat(outDir) : DEFAULT_EXCLUDES)
     );
     const metaFilesWithReloads = [];
     const metaFilesWithoutReloads = [];
@@ -444,10 +445,10 @@ var FileSystem = class {
     if ((relativePath.endsWith(".ts") || relativePath.endsWith(".tsx")) && !relativePath.endsWith(".d.ts")) {
       return true;
     }
-    if (this.#tsConfig.options.allowJs && relativePath.endsWith(".js")) {
+    if (this.#tsConfig.config.compilerOptions?.allowJs && relativePath.endsWith(".js")) {
       return true;
     }
-    if (this.#tsConfig.options.resolveJsonModule && relativePath.endsWith(".json")) {
+    if (this.#tsConfig.config.compilerOptions?.resolveJsonModule && relativePath.endsWith(".json")) {
       return true;
     }
     return false;
@@ -930,9 +931,14 @@ var DevServer = class _DevServer {
     if (!this.#routesScanner) {
       return;
     }
-    const invalidated = await this.#routesScanner.invalidate(filePath);
-    if (invalidated) {
-      await this.#hooks.runner("routesScanned").run(this, this.#routesScanner);
+    try {
+      const invalidated = await this.#routesScanner.invalidate(filePath);
+      if (invalidated) {
+        await this.#hooks.runner("routesScanned").run(this, this.#routesScanner);
+      }
+    } catch (error) {
+      this.ui.logger.error("Unable to rescan routes because of the following error");
+      this.ui.logger.fatal(error);
     }
   }
   /**
@@ -952,27 +958,32 @@ var DevServer = class _DevServer {
    * })
    */
   #processRoutes = throttle(async (routesFileLocation) => {
-    const scanRoutes = this.#hooks.has("routesScanning") || this.#hooks.has("routesScanned");
-    const shareRoutes = this.#hooks.has("routesCommitted");
-    if (!scanRoutes && !shareRoutes) {
+    try {
+      const scanRoutes = this.#hooks.has("routesScanning") || this.#hooks.has("routesScanned");
+      const shareRoutes = this.#hooks.has("routesCommitted");
+      if (!scanRoutes && !shareRoutes) {
+        unlink(routesFileLocation).catch(() => {
+        });
+        return;
+      }
+      const routesJSON = await readFile(routesFileLocation, "utf-8");
+      const routesList = JSON.parse(routesJSON);
       unlink(routesFileLocation).catch(() => {
       });
-      return;
-    }
-    const routesJSON = await readFile(routesFileLocation, "utf-8");
-    const routesList = JSON.parse(routesJSON);
-    unlink(routesFileLocation).catch(() => {
-    });
-    if (shareRoutes) {
-      await this.#hooks.runner("routesCommitted").run(this, routesList);
-    }
-    if (scanRoutes) {
-      this.#routesScanner = new RoutesScanner(this.cwdPath, []);
-      await this.#hooks.runner("routesScanning").run(this, this.#routesScanner);
-      for (const domain of Object.keys(routesList)) {
-        await this.#routesScanner.scan(routesList[domain]);
+      if (shareRoutes) {
+        await this.#hooks.runner("routesCommitted").run(this, routesList);
       }
-      await this.#hooks.runner("routesScanned").run(this, this.#routesScanner);
+      if (scanRoutes) {
+        this.#routesScanner = new RoutesScanner(this.cwdPath, []);
+        await this.#hooks.runner("routesScanning").run(this, this.#routesScanner);
+        for (const domain of Object.keys(routesList)) {
+          await this.#routesScanner.scan(routesList[domain]);
+        }
+        await this.#hooks.runner("routesScanned").run(this, this.#routesScanner);
+      }
+    } catch (error) {
+      this.ui.logger.error("Unable to process and scan routes because of the following error");
+      this.ui.logger.fatal(error);
     }
   }, "processRoutes");
   /**
@@ -1014,8 +1025,8 @@ var DevServer = class _DevServer {
    *   console.error('Failed to initialize dev server')
    * }
    */
-  async #init(ts, mode) {
-    const tsConfig = parseConfig(this.cwd, ts);
+  async #init(mode) {
+    const tsConfig = readTsConfig(this.cwdPath);
     if (!tsConfig) {
       this.#onError?.(new RuntimeException("Unable to parse tsconfig file"));
       return false;
@@ -1182,8 +1193,8 @@ var DevServer = class _DevServer {
    * const devServer = new DevServer(cwd, { hmr: true, hooks: [] })
    * await devServer.start(ts)
    */
-  async start(ts) {
-    const initiated = await this.#init(ts, this.options.hmr ? "hmr" : "static");
+  async start() {
+    const initiated = await this.#init(this.options.hmr ? "hmr" : "static");
     if (!initiated) {
       return;
     }
@@ -1214,8 +1225,8 @@ var DevServer = class _DevServer {
    * const devServer = new DevServer(cwd, { hooks: [] })
    * await devServer.startAndWatch(ts, { poll: false })
    */
-  async startAndWatch(ts, options) {
-    const initiated = await this.#init(ts, "watch");
+  async startAndWatch(options) {
+    const initiated = await this.#init("watch");
     if (!initiated) {
       return;
     }
@@ -1579,8 +1590,8 @@ var TestRunner = class {
    * @param ts - TypeScript module reference for parsing configuration
    * @param options - Watch options including polling mode for file system monitoring
    */
-  async runAndWatch(ts, options) {
-    const tsConfig = parseConfig(this.cwd, ts);
+  async runAndWatch(options) {
+    const tsConfig = readTsConfig(this.cwdPath);
     if (!tsConfig) {
       this.#onError?.(new RuntimeException2("Unable to parse tsconfig file"));
       return;

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

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

package/build/src/dev_server.d.ts

@@ -1,4 +1,3 @@
-import type tsStatic from 'typescript';
 import type { DevServerOptions } from './types/common.ts';
 /**
  * Exposes the API to start the development server in HMR, watch or static mode
@@ -128,7 +127,7 @@ export declare class DevServer {
      * const devServer = new DevServer(cwd, { hmr: true, hooks: [] })
      * await devServer.start(ts)
      */
-    start(ts: typeof tsStatic): Promise<void>;
+    start(): Promise<void>;
     /**
      * Starts the development server in watch mode and restarts on file changes
      *
@@ -144,7 +143,7 @@ export declare class DevServer {
      * const devServer = new DevServer(cwd, { hooks: [] })
      * await devServer.startAndWatch(ts, { poll: false })
      */
-    startAndWatch(ts: typeof tsStatic, options?: {
+    startAndWatch(options?: {
         poll: boolean;
     }): Promise<void>;
 }

package/build/src/file_system.d.ts

@@ -1,4 +1,4 @@
-import type tsStatic from 'typescript';
+import { type TsConfigResult } from 'get-tsconfig';
 import { type InspectedFile, type AssemblerRcFile } from './types/common.ts';
 /**
  * Exposes an intutive API to run actions when different kind of files
@@ -83,7 +83,7 @@ export declare class FileSystem {
      * @param tsConfig - Parsed TypeScript configuration
      * @param rcFile - AdonisJS RC file configuration
      */
-    constructor(cwd: string, tsConfig: tsStatic.ParsedCommandLine, rcFile: AssemblerRcFile);
+    constructor(cwd: string, tsConfig: TsConfigResult, rcFile: AssemblerRcFile);
     /**
      * Returns true if the file should be watched. Chokidar sends
      * absolute unix paths to the ignored callback.

package/build/src/index_generator/main.js

@@ -1,7 +1,7 @@
 import {
   IndexGenerator
-} from "../../chunk-KAOPWBR3.js";
-import "../../chunk-3GYRM5Y2.js";
+} from "../../chunk-YFDLKKOA.js";
+import "../../chunk-HRE5L24F.js";
 export {
   IndexGenerator
 };

package/build/src/test_runner.d.ts

@@ -1,4 +1,3 @@
-import type tsStatic from 'typescript';
 import type { TestRunnerOptions } from './types/common.ts';
 /**
  * Exposes the API to run Japa tests and optionally watch for file
@@ -111,7 +110,7 @@ export declare class TestRunner {
      * @param ts - TypeScript module reference for parsing configuration
      * @param options - Watch options including polling mode for file system monitoring
      */
-    runAndWatch(ts: typeof tsStatic, options?: {
+    runAndWatch(options?: {
         poll: boolean;
     }): Promise<void>;
 }

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

@@ -174,7 +174,7 @@ export type RoutesListItem = {
     domain: string;
     /** HTTP methods accepted by this route */
     methods: string[];
-    handler: Function | {
+    handler?: {
         method: string;
         importExpression: string | null;
     };

package/build/src/utils.d.ts

@@ -1,6 +1,7 @@
 import Hooks from '@poppinss/hooks';
 import type tsStatic from 'typescript';
 import { type ChokidarOptions } from 'chokidar';
+import { type TsConfigResult } from 'get-tsconfig';
 import type { RunScriptOptions } from './types/common.ts';
 import { type AllHooks, type HookParams } from './types/hooks.ts';
 /**
@@ -10,11 +11,14 @@ import { type AllHooks, type HookParams } from './types/hooks.ts';
  * handling diagnostic errors and returning a parsed configuration that can be
  * used by other TypeScript operations.
  *
+ * @deprecated While we are experimenting with the readTsConfig method
+ *
  * @param cwd - The current working directory URL or string path
  * @param ts - TypeScript module reference
  * @returns Parsed TypeScript configuration or undefined if parsing failed
  */
 export declare function parseConfig(cwd: URL | string, ts: typeof tsStatic): tsStatic.ParsedCommandLine | undefined;
+export declare function readTsConfig(cwd: string): TsConfigResult | null;
 /**
  * Runs a Node.js script as a child process and inherits the stdio streams
  *

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.15",
+  "version": "8.0.0-next.17",
   "engines": {
     "node": ">=24.0.0"
   },
@@ -34,7 +34,7 @@
     "release": "release-it",
     "version": "npm run build",
     "prepublishOnly": "npm run build",
-    "quick:test": "cross-env NODE_DEBUG=adonisjs:assembler node --enable-source-maps --import=@poppinss/ts-exec --experimental-import-meta-resolve bin/test.ts"
+    "quick:test": "cross-env NODE_DEBUG=adonisjs:assembler node --enable-source-maps --import=@poppinss/ts-exec bin/test.ts"
   },
   "devDependencies": {
     "@adonisjs/eslint-config": "^3.0.0-next.0",
@@ -74,6 +74,8 @@
     "fast-glob": "^3.3.3",
     "fdir": "^6.5.0",
     "get-port": "^7.1.0",
+    "get-tsconfig": "^4.13.0",
+    "import-meta-resolve": "^4.2.0",
     "junk": "^4.0.1",
     "open": "^10.2.0",
     "parse-imports": "^3.0.0",