@faasjs/dev 8.0.0-beta.7 → 8.0.0-beta.9

package/dist/{typegen-C6t9LIyi.cjs → typegen-HX5QyuhP.cjs}

@@ -1,4 +1,3 @@
-let _faasjs_logger = require("@faasjs/logger");
 let _faasjs_node_utils = require("@faasjs/node-utils");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
@@ -15,24 +14,24 @@ function resolveServerConfig(root, logger, defaultBase = "/") {
 	const config = (0, _faasjs_node_utils.loadConfig)(srcRoot, (0, node_path.join)(srcRoot, "index.func.ts"), staging, logger);
 	const server = config && typeof config === "object" ? config.server : void 0;
 	return {
-		root: server && typeof server.root === "string" && server.root.length ? (0, node_path.resolve)(projectRoot, server.root) : projectRoot,
-		base: server && typeof server.base === "string" && server.base.length ? server.base : defaultBase,
+		root: typeof server?.root === "string" && server.root.length ? (0, node_path.resolve)(projectRoot, server.root) : projectRoot,
+		base: typeof server?.base === "string" && server.base.length ? server.base : defaultBase,
 		staging
 	};
 }
 
 //#endregion
 //#region src/typegen.ts
-function normalizeSlashes(path) {
-	return path.replace(/\\/g, "/");
-}
 function normalizeRoute(path) {
-	const normalized = path.replace(/\/+/g, "/");
+	const normalized = path.replace(/\\/g, "/").replace(/\/+/g, "/");
 	if (!normalized.length || normalized === "/") return "/";
 	return normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
 }
+function toTypegenRoute(route) {
+	return route === "/" ? "/" : route.replace(/^\/+/, "");
+}
 function toRoute(srcRoot, file) {
-	const noTsPath = normalizeSlashes((0, node_path.relative)(srcRoot, file)).replace(/\.ts$/, "");
+	const noTsPath = (0, node_path.relative)(srcRoot, file).replace(/\\/g, "/").replace(/\.ts$/, "");
 	if (noTsPath === "index.func") return {
 		route: "/",
 		priority: 2
@@ -53,10 +52,10 @@ function toRoute(srcRoot, file) {
 		route: normalizeRoute(`/${noTsPath.slice(0, -5)}`),
 		priority: 3
 	};
-	throw Error(`[faas-types] Invalid func filename: ${file}`);
+	throw Error(`[faas types] Invalid func filename: ${file}`);
 }
 function toImportPath(fromFile, targetFile) {
-	const importPath = normalizeSlashes((0, node_path.relative)((0, node_path.dirname)(fromFile), targetFile)).replace(/\.ts$/, "");
+	const importPath = (0, node_path.relative)((0, node_path.dirname)(fromFile), targetFile).replace(/\\/g, "/").replace(/\.ts$/, "");
 	if (importPath.startsWith(".")) return importPath;
 	return `./${importPath}`;
 }
@@ -81,35 +80,36 @@ function parsePluginTypes(config) {
 }
 async function readFuncFiles(dir) {
 	const result = [];
-	async function walk(currentDir) {
+	const pendingDirs = [dir];
+	while (pendingDirs.length) {
+		const currentDir = pendingDirs.pop();
 		const entries = await (0, node_fs_promises.readdir)(currentDir, { withFileTypes: true });
 		for (const entry of entries) {
 			if (entry.name === ".faasjs" || entry.name === "node_modules") continue;
 			const filePath = (0, node_path.join)(currentDir, entry.name);
 			if (entry.isDirectory()) {
-				await walk(filePath);
+				pendingDirs.push(filePath);
 				continue;
 			}
 			if (entry.isFile() && entry.name.endsWith(".func.ts")) result.push(filePath);
 		}
 	}
-	await walk(dir);
 	return result.sort((a, b) => a.localeCompare(b));
 }
 function formatTypes(items) {
 	const actionLines = items.map((item) => {
-		return `    ${JSON.stringify(item.route)}: InferFaasAction<InferFaasFunc<typeof import(${JSON.stringify(item.importPath)})>>`;
+		return `    ${JSON.stringify(toTypegenRoute(item.route))}: InferFaasAction<InferFaasFunc<typeof import(${JSON.stringify(item.importPath)})>>`;
 	});
 	const eventLines = items.map((item) => {
 		const plugins = item.pluginTypes.length ? `[${item.pluginTypes.map((type) => JSON.stringify(type)).join(", ")}]` : "[]";
-		return `    ${JSON.stringify(item.route)}: InferPluginEvent<${plugins}>`;
+		return `    ${JSON.stringify(toTypegenRoute(item.route))}: InferPluginEvent<${plugins}>`;
 	});
 	return `/**
  * Generated by @faasjs/dev.
  *
  * Do not edit this file manually.
  */
-import type { Func, InferPluginEvent } from '@faasjs/func'
+import type { Func, InferPluginEvent } from '@faasjs/core'
 import type { InferFaasAction, InferFaasFunc } from '@faasjs/types'
 
 declare module '@faasjs/types' {
@@ -122,25 +122,24 @@ ${eventLines.length ? `${eventLines.join("\n")}\n` : ""}  }
 `;
 }
 function isTypegenSourceFile(filePath) {
-	return /\.func\.ts$/.test(filePath) || /(^|[\\/])faas\.ya?ml$/.test(filePath);
+	return filePath.endsWith(".func.ts") || /(^|[\\/])faas\.ya?ml$/.test(filePath);
 }
 async function generateFaasTypes(options = {}) {
-	const logger = options.logger || new _faasjs_logger.Logger("FaasJs:Typegen");
-	const { root: projectRoot, staging } = resolveServerConfig(options.root || process.cwd(), logger);
+	const logger = options.logger ?? new _faasjs_node_utils.Logger("FaasJs:Typegen");
+	const { root: projectRoot, staging } = resolveServerConfig(options.root ?? process.cwd(), logger);
 	const srcRoot = (0, node_path.join)(projectRoot, "src");
 	const output = (0, node_path.join)(srcRoot, ".faasjs", "types.d.ts");
-	if (!(0, node_fs.existsSync)(srcRoot)) throw Error(`[faas-types] Source directory not found: ${srcRoot}`);
+	if (!(0, node_fs.existsSync)(srcRoot)) throw Error(`[faas types] Source directory not found: ${srcRoot}`);
 	const files = await readFuncFiles(srcRoot);
 	const routeMap = /* @__PURE__ */ new Map();
 	for (const file of files) {
 		const { route, priority } = toRoute(srcRoot, file);
-		const pluginTypes = parsePluginTypes((0, _faasjs_node_utils.loadConfig)(srcRoot, file, staging, logger));
-		const importPath = toImportPath(output, file);
 		const prev = routeMap.get(route);
-		if (!prev || priority > prev.priority) routeMap.set(route, {
+		if (prev && priority <= prev.priority) continue;
+		routeMap.set(route, {
 			route,
-			importPath,
-			pluginTypes,
+			importPath: toImportPath(output, file),
+			pluginTypes: parsePluginTypes((0, _faasjs_node_utils.loadConfig)(srcRoot, file, staging, logger)),
 			priority
 		});
 	}
@@ -149,7 +148,7 @@ async function generateFaasTypes(options = {}) {
 	let changed = true;
 	try {
 		if (await (0, node_fs_promises.readFile)(output, "utf8") === content) changed = false;
-	} catch (_error) {}
+	} catch {}
 	if (changed) {
 		await (0, node_fs_promises.mkdir)((0, node_path.dirname)(output), { recursive: true });
 		await (0, node_fs_promises.writeFile)(output, content);

package/faas.mjs

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+import { main } from './dist/cli/index.mjs'
+
+main(process.argv).then((code) => {
+  if (code !== 0) process.exit(code)
+})

package/package.json

@@ -1,14 +1,29 @@
 {
   "name": "@faasjs/dev",
-  "version": "8.0.0-beta.7",
+  "version": "8.0.0-beta.9",
+  "homepage": "https://faasjs.com/doc/dev",
+  "bugs": {
+    "url": "https://github.com/faasjs/faasjs/issues"
+  },
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/faasjs/faasjs.git",
+    "directory": "packages/dev"
+  },
+  "funding": "https://github.com/sponsors/faasjs",
+  "bin": {
+    "faas": "faas.mjs"
+  },
+  "files": [
+    "dist",
+    "faas.mjs",
+    "configs"
+  ],
   "type": "module",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
-  "bin": {
-    "faas-types": "faas-types.mjs"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -16,44 +31,26 @@
       "require": "./dist/index.cjs"
     }
   },
-  "homepage": "https://faasjs.com/doc/dev",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/faasjs/faasjs.git",
-    "directory": "packages/dev"
-  },
-  "bugs": {
-    "url": "https://github.com/faasjs/faasjs/issues"
-  },
-  "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsdown --entry src/index.ts --entry src/cli.ts --config ../../tsdown.config.ts"
+    "build": "tsdown --entry src/index.ts --entry src/cli/index.ts --config ../../tsdown.config.ts"
   },
-  "files": [
-    "dist",
-    "faas-types.mjs"
-  ],
-  "peerDependencies": {
-    "@faasjs/func": ">=8.0.0-beta.7",
-    "@faasjs/http": ">=8.0.0-beta.7",
-    "@faasjs/knex": ">=8.0.0-beta.7",
-    "@faasjs/logger": ">=8.0.0-beta.7",
-    "@faasjs/node-utils": ">=8.0.0-beta.7",
-    "@faasjs/server": ">=8.0.0-beta.7",
+  "devDependencies": {
+    "@faasjs/core": ">=8.0.0-beta.9",
+    "@faasjs/node-utils": ">=8.0.0-beta.9",
     "@types/node": "*",
     "knex": "*",
+    "oxfmt": "*",
+    "oxlint": "*",
     "vite": "*",
     "vitest": "*"
   },
-  "devDependencies": {
-    "@faasjs/func": ">=8.0.0-beta.7",
-    "@faasjs/http": ">=8.0.0-beta.7",
-    "@faasjs/knex": ">=8.0.0-beta.7",
-    "@faasjs/logger": ">=8.0.0-beta.7",
-    "@faasjs/node-utils": ">=8.0.0-beta.7",
-    "@faasjs/server": ">=8.0.0-beta.7",
+  "peerDependencies": {
+    "@faasjs/core": ">=8.0.0-beta.9",
+    "@faasjs/node-utils": ">=8.0.0-beta.9",
     "@types/node": "*",
     "knex": "*",
+    "oxfmt": "*",
+    "oxlint": "*",
     "vite": "*",
     "vitest": "*"
   },

package/dist/cli.cjs

@@ -1,67 +0,0 @@
-Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-const require_typegen = require('./typegen-C6t9LIyi.cjs');
-
-//#region package.json
-var version = "8.0.0-beta.6";
-
-//#endregion
-//#region src/cli.ts
-const HelpText = `Generate FaasJS API/event type declarations.
-
-Usage:
-  faas-types [options]
-
-Options:
-  --root <path>      Project root path (default: process.cwd())
-  -h, --help         Show help
-  -v, --version      Show version
-`;
-function parseCliArgs(argv) {
-	const args = argv.slice(2);
-	const options = {};
-	const readValue = (index, name) => {
-		const value = args[index + 1];
-		if (!value || value.startsWith("-")) throw Error(`[faas-types] Missing value for ${name}`);
-		return value;
-	};
-	for (let i = 0; i < args.length; i++) {
-		const arg = args[i];
-		if (arg === "-h" || arg === "--help") return {
-			showHelp: true,
-			options
-		};
-		if (arg === "-v" || arg === "--version") return {
-			showVersion: true,
-			options
-		};
-		if (arg === "--root") {
-			options.root = readValue(i, arg);
-			i++;
-			continue;
-		}
-		throw Error(`[faas-types] Unknown option: ${arg}`);
-	}
-	return { options };
-}
-async function main(argv = process.argv) {
-	try {
-		const parsed = parseCliArgs(argv);
-		if (parsed.showHelp) {
-			console.log(HelpText);
-			return 0;
-		}
-		if (parsed.showVersion) {
-			console.log(version);
-			return 0;
-		}
-		const result = await require_typegen.generateFaasTypes(parsed.options);
-		console.log(`[faas-types] ${result.changed ? "Generated" : "Up to date"} ${result.output} (${result.routeCount} routes from ${result.fileCount} files)`);
-		return 0;
-	} catch (error) {
-		console.error(error?.message || error);
-		return 1;
-	}
-}
-
-//#endregion
-exports.main = main;

package/dist/cli.d.ts

@@ -1,4 +0,0 @@
-//#region src/cli.d.ts
-declare function main(argv?: string[]): Promise<number>;
-//#endregion
-export { main };

package/dist/cli.mjs

@@ -1,66 +0,0 @@
-import { t as generateFaasTypes } from "./typegen-D5s91_xL.mjs";
-
-//#region package.json
-var version = "8.0.0-beta.6";
-
-//#endregion
-//#region src/cli.ts
-const HelpText = `Generate FaasJS API/event type declarations.
-
-Usage:
-  faas-types [options]
-
-Options:
-  --root <path>      Project root path (default: process.cwd())
-  -h, --help         Show help
-  -v, --version      Show version
-`;
-function parseCliArgs(argv) {
-	const args = argv.slice(2);
-	const options = {};
-	const readValue = (index, name) => {
-		const value = args[index + 1];
-		if (!value || value.startsWith("-")) throw Error(`[faas-types] Missing value for ${name}`);
-		return value;
-	};
-	for (let i = 0; i < args.length; i++) {
-		const arg = args[i];
-		if (arg === "-h" || arg === "--help") return {
-			showHelp: true,
-			options
-		};
-		if (arg === "-v" || arg === "--version") return {
-			showVersion: true,
-			options
-		};
-		if (arg === "--root") {
-			options.root = readValue(i, arg);
-			i++;
-			continue;
-		}
-		throw Error(`[faas-types] Unknown option: ${arg}`);
-	}
-	return { options };
-}
-async function main(argv = process.argv) {
-	try {
-		const parsed = parseCliArgs(argv);
-		if (parsed.showHelp) {
-			console.log(HelpText);
-			return 0;
-		}
-		if (parsed.showVersion) {
-			console.log(version);
-			return 0;
-		}
-		const result = await generateFaasTypes(parsed.options);
-		console.log(`[faas-types] ${result.changed ? "Generated" : "Up to date"} ${result.output} (${result.routeCount} routes from ${result.fileCount} files)`);
-		return 0;
-	} catch (error) {
-		console.error(error?.message || error);
-		return 1;
-	}
-}
-
-//#endregion
-export { main };

package/faas-types.mjs

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-import { main } from './dist/cli.mjs'
-
-main(process.argv).then(code => {
-  if (code !== 0) process.exit(code)
-})