@vercube/nitro 1.0.0-beta.2 → 1.1.0

package/dist/index.mjs

@@ -1,11 +1,10 @@
 import { createNitroApp } from "./runtime/App.mjs";
 import { destroyContainer } from "@vercube/di";
 import { defu } from "defu";
-import { join, relative, resolve } from "pathe";
+import { join, resolve } from "pathe";
 import { watch } from "chokidar";
 import { readFileSync } from "node:fs";
-import { glob } from "tinyglobby";
-import { parseSync } from "oxc-parser";
+import { IMPORT_SOURCE, MIDDLEWARE_IMPORT_SOURCE, SERVICE_IMPORT_SOURCE, scanFiles, transformMiddleware, transformRoute, transformService } from "@vercube/scan";
 //#region src/helpers/helpers.ts
 function useVercubeApp() {
 	return globalThis.__vercubeApp__;
@@ -38,208 +37,14 @@ function validateTypescript(nitro) {
 }
 //#endregion
 //#region src/_internal/scan.ts
-const GLOB_SCAN_PATTERN = "**/*.{js,mjs,cjs,ts,mts,cts,tsx,jsx}";
-async function scanFiles(nitro, name) {
-	return await Promise.all(nitro.options.scanDirs.map((dir) => scanDir(nitro, dir, name))).then((r) => r.flat());
-}
-async function scanDir(nitro, dir, name) {
-	return (await glob(join(name, GLOB_SCAN_PATTERN), {
-		cwd: dir,
-		dot: true,
-		absolute: true
-	}).catch((error) => {
-		if (error?.code === "ENOTDIR") {
-			nitro.logger.warn(`Ignoring \`${join(dir, name)}\`. It must be a directory.`);
-			return [];
-		}
-		throw error;
-	})).map((fullPath) => {
-		return {
-			fullPath,
-			path: relative(join(dir, name), fullPath)
-		};
-	}).sort((a, b) => a.path.localeCompare(b.path));
-}
-//#endregion
-//#region src/build/Routes.ts
-/**
-* Mapping of decorator names to their corresponding uppercase HTTP method strings.
-* Used for O(1) lookup and simultaneous method name resolution.
-*/
-const HTTP_METHODS = {
-	Get: "GET",
-	Post: "POST",
-	Put: "PUT",
-	Delete: "DELETE",
-	Patch: "PATCH",
-	Options: "OPTIONS",
-	Head: "HEAD"
-};
-/**
-* Pre-compiled regular expression for extracting named route parameters.
-* Matches path segments prefixed with ':' (e.g. ':id', ':slug').
-* Uses the global flag for iterative matching via `exec`.
-*/
-const PARAM_RE = /:([^/]+)/g;
-/**
-* Internal module path used for generated import statements.
-*/
-const IMPORT_SOURCE = "#internal/vercube-route-plugin";
-/**
-* Reads a controller file from disk and returns all routes defined in classes
-* decorated with `Controller` and methods decorated with HTTP decorators (Get, Post, etc.).
-* @param route - File info (path and fullPath) to analyze.
-* @returns List of `RouteInfo` for every route in the file.
-*/
-async function transformRoute(route) {
-	return extractRoutes(readFileSync(route.fullPath, "utf8")).map((parsedRoute) => ({
-		...parsedRoute,
-		...route
-	}));
-}
-/**
-* Extracts all route definitions from the given TypeScript/JavaScript source code.
-*
-* Parses the source using `oxc-parser` and traverses the resulting AST to find
-* classes decorated with `@Controller(path)`. For each such class, it inspects
-* method definitions for HTTP method decorators (`@Get`, `@Post`, `@Put`, `@Delete`,
-* `@Patch`, `@Options`, `@Head`) and constructs full route paths by concatenating
-* the controller base path with the method-level path.
-*
-* Generates appropriate import statements based on the export style:
-* - `export default class Foo` → `import Foo from '...'`
-* - `export class Foo` → `import { Foo } from '...'`
-*
-* Supports classes declared via `export class`, `export default class`,
-* and plain `class` declarations.
-*
-* @param code - The raw TypeScript or JavaScript source code string to analyze.
-* @returns An array of {@link RouteInfo} objects representing all discovered routes.
-*/
-function extractRoutes(code) {
-	const ast = parseSync("file.ts", code).program;
-	const routes = [];
-	for (const node of ast.body) {
-		const classInfo = getClassNode$2(node);
-		if (!classInfo) continue;
-		const { classNode, isDefault } = classInfo;
-		const basePath = extractDecoratorArg(classNode.decorators, "Controller");
-		if (basePath === null) continue;
-		const className = classNode.id?.name;
-		if (!className) continue;
-		const importStatement = isDefault ? `import ${className} from '${IMPORT_SOURCE}';` : `import { ${className} } from '${IMPORT_SOURCE}';`;
-		for (const member of classNode.body?.body ?? []) {
-			if (member.type !== "MethodDefinition") continue;
-			for (const decorator of member.decorators ?? []) {
-				const expr = decorator.expression;
-				if (expr?.type !== "CallExpression") continue;
-				const method = HTTP_METHODS[expr.callee?.name];
-				if (!method) continue;
-				const arg = expr.arguments?.[0];
-				const fullRoute = normalizePath(basePath + (arg?.type === "Literal" && typeof arg.value === "string" ? arg.value : ""));
-				routes.push({
-					import: importStatement,
-					importClassName: className,
-					route: fullRoute,
-					method,
-					fullPath: "",
-					path: "",
-					params: extractParams(fullRoute)
-				});
-			}
-		}
-	}
-	return routes;
-}
 /**
-* Unwraps export declarations to retrieve the underlying class node,
-* along with metadata about the export style.
-*
-* Handles the following AST patterns:
-* - `ExportDefaultDeclaration` wrapping a `ClassDeclaration` → `isDefault: true`
-* - `ExportNamedDeclaration` wrapping a `ClassDeclaration` → `isDefault: false`
-* - Direct `ClassDeclaration` or `Class` nodes → `isDefault: false`
-*
-* @param node - An AST node from the program body to inspect.
-* @returns An object containing the class AST node and whether it is a default export, or `null` if not a class.
+* Scans every configured Nitro scan directory for files inside `name`.
+* @param nitro - The nitro instance (provides `options.scanDirs` and `logger`).
+* @param name - The subdirectory to scan within each scan dir.
+* @returns The discovered files.
 */
-function getClassNode$2(node) {
-	if (node.type === "ExportDefaultDeclaration") {
-		const decl = node.declaration;
-		if (decl?.type === "ClassDeclaration" || decl?.type === "Class") return {
-			classNode: decl,
-			isDefault: true
-		};
-	}
-	if (node.type === "ExportNamedDeclaration") {
-		const decl = node.declaration;
-		if (decl?.type === "ClassDeclaration" || decl?.type === "Class") return {
-			classNode: decl,
-			isDefault: false
-		};
-	}
-	if (node?.type === "ClassDeclaration" || node?.type === "Class") return {
-		classNode: node,
-		isDefault: false
-	};
-	return null;
-}
-/**
-* Searches a list of decorators for a `CallExpression` matching the given name
-* and extracts its first string argument.
-*
-* This is used to retrieve the path argument from decorators like `@Controller('/api/foo')`.
-* If the decorator is found but has no string argument, an empty string is returned.
-* If no matching decorator is found, `null` is returned.
-*
-* @param decorators - The array of decorator AST nodes to search, or `undefined` if none exist.
-* @param name - The decorator function name to match against (e.g. 'Controller').
-* @returns The string argument value, an empty string if no argument is provided, or `null` if the decorator is not found.
-*/
-function extractDecoratorArg(decorators, name) {
-	if (!decorators) return null;
-	for (const dec of decorators) {
-		const expr = dec.expression;
-		if (expr?.type === "CallExpression" && expr.callee?.name === name) {
-			const arg = expr.arguments?.[0];
-			if (arg?.type === "Literal" && typeof arg.value === "string") return arg.value;
-			return "";
-		}
-	}
-	return null;
-}
-/**
-* Normalizes a route path by removing duplicate slashes and ensuring
-* the path starts with a single leading slash.
-*
-* Splits the path on '/' separators, filters out empty segments,
-* and rejoins with single '/' separators.
-*
-* @param path - The raw concatenated path string to normalize.
-* @returns A cleaned path string with a leading slash and no duplicate separators.
-*/
-function normalizePath(path) {
-	return "/" + path.split("/").filter(Boolean).join("/");
-}
-/**
-* Extracts named route parameters from a path string.
-*
-* Scans the path for segments prefixed with ':' using a pre-compiled
-* regular expression and returns an array of parameter names with
-* the ':' prefix stripped.
-*
-* Resets the regex `lastIndex` after each invocation to ensure
-* consistent behavior across repeated calls.
-*
-* @param route - The normalized route path to scan for parameters.
-* @returns An array of parameter name strings, empty if none are found.
-*/
-function extractParams(route) {
-	const params = [];
-	let match;
-	while (match = PARAM_RE.exec(route)) params.push(match[1]);
-	PARAM_RE.lastIndex = 0;
-	return params;
+async function scanFiles$1(nitro, name) {
+	return scanFiles(nitro.options.scanDirs, name, nitro.logger);
 }
 //#endregion
 //#region src/setup/Routes.ts
@@ -257,7 +62,7 @@ async function setupRoutes(nitro) {
 		handler: `@vercube/nitro/runtime/handler`,
 		lazy: true
 	})));
-	nitro.options.ignore = [...new Set([...nitro.options.ignore ?? [], ...routes.map((route) => route.fullPath.replace(nitro.options.rootDir, "").replace(String(nitro.options?.serverDir), "").replace("src/", ""))])];
+	nitro.options.ignore = [.../* @__PURE__ */ new Set([...nitro.options.ignore ?? [], ...routes.map((route) => route.fullPath.replace(nitro.options.rootDir, "").replace(String(nitro.options?.serverDir), "").replace("src/", ""))])];
 	nitro.routing.sync();
 }
 /**
@@ -278,7 +83,7 @@ async function getTransformedRoutes(nitro) {
 * @returns The file info of the routes
 */
 async function scanRoutes(nitro) {
-	return Promise.all([scanFiles(nitro, nitro.options.apiDir || "api"), scanFiles(nitro, nitro.options.routesDir || "routes")]).then((r) => r.flat());
+	return Promise.all([scanFiles$1(nitro, nitro.options.apiDir || "api"), scanFiles$1(nitro, nitro.options.routesDir || "routes")]).then((r) => r.flat());
 }
 /**
 * Clears the routes from the handlers
@@ -335,83 +140,6 @@ function setupHooks(nitro, options) {
 	});
 }
 //#endregion
-//#region src/build/Middleware.ts
-/**
-* Internal module path used as a placeholder in generated import statements.
-* Replaced with the actual file path during setup.
-*/
-const MIDDLEWARE_IMPORT_SOURCE = "#internal/vercube-middleware-source";
-/**
-* Reads a file from disk and returns all classes extending `BaseMiddleware` found within it.
-*/
-async function transformMiddleware(file) {
-	return extractMiddlewares(readFileSync(file.fullPath, "utf8")).map((m) => ({
-		...m,
-		...file
-	}));
-}
-/**
-* Extracts all class definitions that extend `BaseMiddleware` from the given source code.
-*
-* Parses the source using `oxc-parser` and traverses the AST to find classes
-* whose `superClass` resolves to the identifier `BaseMiddleware`. Generates
-* appropriate import statements based on whether the class is a default or named export.
-*
-* @param code - The raw TypeScript or JavaScript source code string to analyze.
-* @returns An array of {@link MiddlewareInfo} objects for all discovered middleware classes.
-*/
-function extractMiddlewares(code) {
-	const ast = parseSync("file.ts", code).program;
-	const middlewares = [];
-	for (const node of ast.body) {
-		const classInfo = getClassNode$1(node);
-		if (!classInfo) continue;
-		const { classNode, isDefault } = classInfo;
-		if (!extendsBaseMiddleware(classNode)) continue;
-		const className = classNode.id?.name;
-		if (!className) continue;
-		const importStatement = isDefault ? `import ${className} from '${MIDDLEWARE_IMPORT_SOURCE}';` : `import { ${className} } from '${MIDDLEWARE_IMPORT_SOURCE}';`;
-		middlewares.push({
-			import: importStatement,
-			importClassName: className,
-			fullPath: "",
-			path: ""
-		});
-	}
-	return middlewares;
-}
-/**
-* Returns true if the class node extends `BaseMiddleware`.
-*/
-function extendsBaseMiddleware(classNode) {
-	return classNode.superClass?.type === "Identifier" && classNode.superClass.name === "BaseMiddleware";
-}
-/**
-* Unwraps export declarations to retrieve the underlying class node,
-* along with metadata about the export style.
-*/
-function getClassNode$1(node) {
-	if (node.type === "ExportDefaultDeclaration") {
-		const decl = node.declaration;
-		if (decl?.type === "ClassDeclaration" || decl?.type === "Class") return {
-			classNode: decl,
-			isDefault: true
-		};
-	}
-	if (node.type === "ExportNamedDeclaration") {
-		const decl = node.declaration;
-		if (decl?.type === "ClassDeclaration" || decl?.type === "Class") return {
-			classNode: decl,
-			isDefault: false
-		};
-	}
-	if (node?.type === "ClassDeclaration" || node?.type === "Class") return {
-		classNode: node,
-		isDefault: false
-	};
-	return null;
-}
-//#endregion
 //#region src/setup/Middleware.ts
 /**
 * Gets the transformed middleware from the middleware directory.
@@ -428,95 +156,11 @@ async function getTransformedMiddlewares(nitro) {
 * excludes those files from Nitro's native middleware handling.
 */
 async function scanMiddlewares(nitro) {
-	const files = await scanFiles(nitro, "middleware");
-	nitro.options.ignore = [...new Set([...nitro.options.ignore ?? [], ...files.map((file) => file.fullPath.replace(nitro.options.rootDir, "").replace(String(nitro.options?.serverDir), "").replace("src/", ""))])];
+	const files = await scanFiles$1(nitro, "middleware");
+	nitro.options.ignore = [.../* @__PURE__ */ new Set([...nitro.options.ignore ?? [], ...files.map((file) => file.fullPath.replace(nitro.options.rootDir, "").replace(String(nitro.options?.serverDir), "").replace("src/", ""))])];
 	return files;
 }
 //#endregion
-//#region src/build/Services.ts
-/**
-* Internal module path used as a placeholder in generated import statements.
-* Replaced with the actual file path during setup.
-*/
-const SERVICE_IMPORT_SOURCE = "#internal/vercube-service-source";
-/**
-* Reads a file from disk and returns all `@Injectable`-decorated classes found within it.
-*/
-async function transformService(file) {
-	return extractServices(readFileSync(file.fullPath, "utf8")).map((s) => ({
-		...s,
-		...file
-	}));
-}
-/**
-* Extracts all `@Injectable`-decorated class definitions from the given source code.
-*
-* Parses the source using `oxc-parser` and traverses the AST to find classes
-* annotated with `@Injectable()`. Generates appropriate import statements based
-* on whether the class is a default or named export.
-*
-* @param code - The raw TypeScript or JavaScript source code string to analyze.
-* @returns An array of {@link ServiceInfo} objects for all discovered injectable classes.
-*/
-function extractServices(code) {
-	const ast = parseSync("file.ts", code).program;
-	const services = [];
-	for (const node of ast.body) {
-		const classInfo = getClassNode(node);
-		if (!classInfo) continue;
-		const { classNode, isDefault } = classInfo;
-		if (!hasDecorator(classNode.decorators, "Injectable")) continue;
-		const className = classNode.id?.name;
-		if (!className) continue;
-		const importStatement = isDefault ? `import ${className} from '${SERVICE_IMPORT_SOURCE}';` : `import { ${className} } from '${SERVICE_IMPORT_SOURCE}';`;
-		services.push({
-			import: importStatement,
-			importClassName: className,
-			fullPath: "",
-			path: ""
-		});
-	}
-	return services;
-}
-/**
-* Unwraps export declarations to retrieve the underlying class node,
-* along with metadata about the export style.
-*/
-function getClassNode(node) {
-	if (node.type === "ExportDefaultDeclaration") {
-		const decl = node.declaration;
-		if (decl?.type === "ClassDeclaration" || decl?.type === "Class") return {
-			classNode: decl,
-			isDefault: true
-		};
-	}
-	if (node.type === "ExportNamedDeclaration") {
-		const decl = node.declaration;
-		if (decl?.type === "ClassDeclaration" || decl?.type === "Class") return {
-			classNode: decl,
-			isDefault: false
-		};
-	}
-	if (node?.type === "ClassDeclaration" || node?.type === "Class") return {
-		classNode: node,
-		isDefault: false
-	};
-	return null;
-}
-/**
-* Returns true if the given decorators array contains a decorator matching `name`.
-* Supports both `@Name` identifier and `@Name()` call expression styles.
-*/
-function hasDecorator(decorators, name) {
-	if (!decorators) return false;
-	for (const dec of decorators) {
-		const expr = dec.expression;
-		if (expr?.type === "CallExpression" && expr.callee?.name === name) return true;
-		if (expr?.type === "Identifier" && expr.name === name) return true;
-	}
-	return false;
-}
-//#endregion
 //#region src/setup/Services.ts
 /**
 * Scans the project source directory for `@Injectable`-decorated classes and returns
@@ -535,7 +179,7 @@ async function getTransformedServices(nitro, scanDirs) {
 * from `.` to cover all subdirectories without adding an extra path segment.
 */
 async function scanServices(nitro, scanDirs) {
-	return Promise.all(scanDirs?.map((dir) => scanFiles(nitro, dir)) ?? [scanFiles(nitro, ".")]).then((r) => r.flat());
+	return Promise.all(scanDirs?.map((dir) => scanFiles$1(nitro, dir)) ?? [scanFiles$1(nitro, ".")]).then((r) => r.flat());
 }
 //#endregion
 //#region src/plugin/VercubePlugin.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercube/nitro",
-  "version": "1.0.0-beta.2",
+  "version": "1.1.0",
   "description": "Nitro module for Vercube framework",
   "repository": {
     "type": "git",
@@ -31,12 +31,13 @@
     "chokidar": "5.0.0",
     "defu": "6.1.7",
     "nitro": "3.0.260610-beta",
-    "oxc-parser": "0.135.0",
+    "oxc-parser": "0.138.0",
     "pathe": "2.0.3",
     "tinyglobby": "0.2.17",
-    "@vercube/core": "1.0.0-beta.2",
-    "@vercube/storage": "1.0.0-beta.2",
-    "@vercube/di": "1.0.0-beta.2"
+    "@vercube/core": "1.1.0",
+    "@vercube/scan": "1.1.0",
+    "@vercube/di": "1.1.0",
+    "@vercube/storage": "1.1.0"
   },
   "publishConfig": {
     "access": "public"