@vercel/introspection 0.0.2 → 0.0.4

package/dist/loaders/cjs.cjs

@@ -90,14 +90,22 @@ const handle$1 = (expressModule) => {
 	return expressModule;
 };
 setupCloseHandlers(() => {
-	const routes = extractRoutes();
+	const { routes, additionalFolders, additionalDeps } = extractRoutes();
 	if (routes.length > 0) return {
 		frameworkSlug: "express",
-		routes
+		routes,
+		additionalFolders,
+		additionalDeps
 	};
 });
 const extractRoutes = () => {
-	if (!app) return [];
+	if (!app) return {
+		routes: [],
+		additionalFolders: [],
+		additionalDeps: []
+	};
+	const additionalFolders = [];
+	const additionalDeps = [];
 	const routes = [];
 	const methods = [
 		"all",
@@ -110,6 +118,10 @@ const extractRoutes = () => {
 		"head"
 	];
 	const router = app._router || app.router;
+	if ("settings" in app) {
+		if ("views" in app.settings && typeof app.settings.views === "string") additionalFolders.push(app.settings.views);
+		if ("view engine" in app.settings && typeof app.settings["view engine"] === "string") additionalDeps.push(app.settings["view engine"]);
+	}
 	for (const route of router.stack) if (route.route) {
 		const m = [];
 		for (const method of methods) if (route.route.methods[method]) m.push(method.toUpperCase());
@@ -121,7 +133,11 @@ const extractRoutes = () => {
 			methods: m
 		});
 	}
-	return routes;
+	return {
+		routes,
+		additionalFolders,
+		additionalDeps
+	};
 };
 
 //#endregion

package/dist/loaders/cjs.d.cts

@@ -0,0 +1 @@
+export { };

package/dist/loaders/esm.d.mts

@@ -0,0 +1 @@
+export { };

package/dist/loaders/{esm.js → esm.mjs}

@@ -1,7 +1,7 @@
 import { register } from "node:module";
 
 //#region src/loaders/esm.ts
-register(new URL("./hooks.js", import.meta.url), import.meta.url);
+register(new URL("./hooks.mjs", import.meta.url), import.meta.url);
 
 //#endregion
 export {  };

package/dist/loaders/hooks.d.mts

@@ -0,0 +1,5 @@
+//#region src/loaders/hooks.d.ts
+declare function resolve(specifier: string, context: any, nextResolve: any): Promise<any>;
+declare function load(url: string, context: any, nextLoad: (url: string, context: any) => Promise<any>): Promise<any>;
+//#endregion
+export { load, resolve };

package/dist/loaders/{hooks.js → hooks.mjs}

@@ -10,7 +10,7 @@ async function resolve(specifier, context, nextResolve) {
 async function load(url, context, nextLoad) {
 	const result = await nextLoad(url, context);
 	if (expressUrl === url) {
-		const pathToExpressExtract = new URL("../express.js", import.meta.url);
+		const pathToExpressExtract = new URL("../express.mjs", import.meta.url);
 		return {
 			format: "module",
 			source: `
@@ -26,7 +26,7 @@ export default extendedExpress;
 		};
 	}
 	if (honoUrl === url) {
-		const pathToHonoExtract = new URL("../hono.js", import.meta.url);
+		const pathToHonoExtract = new URL("../hono.mjs", import.meta.url);
 		return {
 			format: "module",
 			source: `

package/package.json

@@ -1,15 +1,17 @@
 {
   "name": "@vercel/introspection",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "license": "Apache-2.0",
-  "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
   "type": "module",
   "publishConfig": {
     "access": "public"
   },
   "exports": {
-    ".": "./dist/index.js",
+    ".": {
+      "import": "./dist/index.mjs",
+      "types": "./dist/index.d.mts"
+    },
     "./loaders/cjs": "./dist/loaders/cjs.js",
     "./loaders/esm": "./dist/loaders/esm.js",
     "./loaders/hooks": "./dist/loaders/hooks.js"
@@ -31,17 +33,17 @@
     "@types/fs-extra": "11",
     "@types/jest": "27.5.1",
     "@vercel/static-config": "3.1.2",
-    "@vercel/nft": "0.30.1",
+    "@vercel/nft": "1.1.0",
     "@types/node": "22",
     "fs-extra": "11.1.0",
-    "@vercel/build-utils": "12.2.4",
+    "@vercel/build-utils": "13.2.0",
     "execa": "3.2.0",
     "hono": "4.10.1",
     "jest-junit": "16.0.0",
-    "tsdown": "0.15.6",
+    "tsdown": "0.16.3",
     "vite": "^5.1.6",
     "vitest": "^2.0.1",
-    "@vercel/cervel": "0.0.3"
+    "@vercel/cervel": "0.0.6"
   },
   "scripts": {
     "build": "tsdown",

package/dist/index.js

@@ -1,103 +0,0 @@
-import { spawn } from "child_process";
-import { existsSync } from "fs";
-import { dirname, join } from "path";
-import { createRequire } from "module";
-import { fileURLToPath } from "url";
-import { z } from "zod";
-
-//#region src/index.ts
-const require = createRequire(import.meta.url);
-const introspectApp = async (args) => {
-	const cjsLoaderPath = fileURLToPath(new URL("loaders/cjs.cjs", import.meta.url));
-	const esmLoaderPath = new URL("loaders/esm.js", import.meta.url).href;
-	const handlerPath = join(args.dir, args.handler);
-	let introspectionResult = {
-		frameworkSlug: "",
-		routes: []
-	};
-	await new Promise((resolvePromise) => {
-		try {
-			const child = spawn("node", [
-				"-r",
-				cjsLoaderPath,
-				"--import",
-				esmLoaderPath,
-				handlerPath
-			], {
-				stdio: [
-					"pipe",
-					"pipe",
-					"pipe"
-				],
-				cwd: args.dir,
-				env: {
-					...process.env,
-					...args.env
-				}
-			});
-			child.stdout?.on("data", (data) => {
-				try {
-					const introspection = JSON.parse(data.toString());
-					introspectionResult = z.object({
-						frameworkSlug: z.string(),
-						routes: z.array(z.object({
-							src: z.string(),
-							dest: z.string(),
-							methods: z.array(z.string())
-						}))
-					}).parse(introspection);
-				} catch (error) {}
-			});
-			const timeout = setTimeout(() => {
-				child.kill("SIGTERM");
-			}, 2e3);
-			const timeout2 = setTimeout(() => {
-				child.kill("SIGKILL");
-			}, 3e3);
-			child.on("error", (err) => {
-				clearTimeout(timeout);
-				clearTimeout(timeout2);
-				console.log(`Loader error: ${err.message}`);
-				resolvePromise(void 0);
-			});
-			child.on("close", () => {
-				clearTimeout(timeout);
-				clearTimeout(timeout2);
-				resolvePromise(void 0);
-			});
-		} catch (error) {
-			resolvePromise(void 0);
-		}
-	});
-	const routes = [
-		{ handle: "filesystem" },
-		...introspectionResult.routes,
-		{
-			src: "/(.*)",
-			dest: "/"
-		}
-	];
-	let version;
-	if (introspectionResult.frameworkSlug) {
-		const frameworkLibPath = require.resolve(`${introspectionResult.frameworkSlug}`, { paths: [args.dir] });
-		const findNearestPackageJson = (dir) => {
-			const packageJsonPath = join(dir, "package.json");
-			if (existsSync(packageJsonPath)) return packageJsonPath;
-			const parentDir = dirname(dir);
-			if (parentDir === dir) return;
-			return findNearestPackageJson(parentDir);
-		};
-		const nearestPackageJsonPath = findNearestPackageJson(frameworkLibPath);
-		if (nearestPackageJsonPath) version = require(nearestPackageJsonPath).version;
-	}
-	return {
-		routes,
-		framework: {
-			slug: introspectionResult.frameworkSlug,
-			version
-		}
-	};
-};
-
-//#endregion
-export { introspectApp };