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

package/dist/typegen-C6t9LIyi.cjs

@@ -0,0 +1,183 @@
+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");
+let node_path = require("node:path");
+
+//#region src/server_config.ts
+function resolveFaasStaging() {
+	return process.env.FaasEnv || "development";
+}
+function resolveServerConfig(root, logger, defaultBase = "/") {
+	const projectRoot = (0, node_path.resolve)(root);
+	const staging = resolveFaasStaging();
+	const srcRoot = (0, node_path.join)(projectRoot, "src");
+	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,
+		staging
+	};
+}
+
+//#endregion
+//#region src/typegen.ts
+function normalizeSlashes(path) {
+	return path.replace(/\\/g, "/");
+}
+function normalizeRoute(path) {
+	const normalized = path.replace(/\/+/g, "/");
+	if (!normalized.length || normalized === "/") return "/";
+	return normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
+}
+function toRoute(srcRoot, file) {
+	const noTsPath = normalizeSlashes((0, node_path.relative)(srcRoot, file)).replace(/\.ts$/, "");
+	if (noTsPath === "index.func") return {
+		route: "/",
+		priority: 2
+	};
+	if (noTsPath === "default.func") return {
+		route: "/*",
+		priority: 1
+	};
+	if (noTsPath.endsWith("/index.func")) return {
+		route: normalizeRoute(`/${noTsPath.slice(0, -11)}`),
+		priority: 2
+	};
+	if (noTsPath.endsWith("/default.func")) return {
+		route: normalizeRoute(`/${noTsPath.slice(0, -13)}/*`),
+		priority: 1
+	};
+	if (noTsPath.endsWith(".func")) return {
+		route: normalizeRoute(`/${noTsPath.slice(0, -5)}`),
+		priority: 3
+	};
+	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$/, "");
+	if (importPath.startsWith(".")) return importPath;
+	return `./${importPath}`;
+}
+function parsePluginTypes(config) {
+	const pluginConfig = config.plugins;
+	if (!pluginConfig || typeof pluginConfig !== "object") return [];
+	const pluginTypes = /* @__PURE__ */ new Set();
+	for (const key in pluginConfig) {
+		const data = pluginConfig[key];
+		if (typeof data === "string" && data.length) {
+			pluginTypes.add(data);
+			continue;
+		}
+		if (data && typeof data === "object") {
+			if (typeof data.type === "string" && data.type.length) pluginTypes.add(data.type);
+			else pluginTypes.add(key);
+			continue;
+		}
+		pluginTypes.add(key);
+	}
+	return Array.from(pluginTypes).sort((a, b) => a.localeCompare(b));
+}
+async function readFuncFiles(dir) {
+	const result = [];
+	async function walk(currentDir) {
+		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);
+				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)})>>`;
+	});
+	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 `/**
+ * Generated by @faasjs/dev.
+ *
+ * Do not edit this file manually.
+ */
+import type { Func, InferPluginEvent } from '@faasjs/func'
+import type { InferFaasAction, InferFaasFunc } from '@faasjs/types'
+
+declare module '@faasjs/types' {
+  interface FaasActions {
+${actionLines.length ? `${actionLines.join("\n")}\n` : ""}  }
+
+  interface FaasEvents {
+${eventLines.length ? `${eventLines.join("\n")}\n` : ""}  }
+}
+`;
+}
+function isTypegenSourceFile(filePath) {
+	return /\.func\.ts$/.test(filePath) || /(^|[\\/])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 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}`);
+	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, {
+			route,
+			importPath,
+			pluginTypes,
+			priority
+		});
+	}
+	const items = Array.from(routeMap.values()).sort((a, b) => a.route.localeCompare(b.route));
+	const content = formatTypes(items);
+	let changed = true;
+	try {
+		if (await (0, node_fs_promises.readFile)(output, "utf8") === content) changed = false;
+	} catch (_error) {}
+	if (changed) {
+		await (0, node_fs_promises.mkdir)((0, node_path.dirname)(output), { recursive: true });
+		await (0, node_fs_promises.writeFile)(output, content);
+	}
+	return {
+		output,
+		changed,
+		fileCount: files.length,
+		routeCount: items.length
+	};
+}
+
+//#endregion
+Object.defineProperty(exports, 'generateFaasTypes', {
+  enumerable: true,
+  get: function () {
+    return generateFaasTypes;
+  }
+});
+Object.defineProperty(exports, 'isTypegenSourceFile', {
+  enumerable: true,
+  get: function () {
+    return isTypegenSourceFile;
+  }
+});
+Object.defineProperty(exports, 'resolveServerConfig', {
+  enumerable: true,
+  get: function () {
+    return resolveServerConfig;
+  }
+});

package/dist/typegen-D5s91_xL.mjs

@@ -0,0 +1,166 @@
+import { Logger } from "@faasjs/logger";
+import { loadConfig } from "@faasjs/node-utils";
+import { existsSync } from "node:fs";
+import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
+import { dirname, join, relative, resolve } from "node:path";
+
+//#region src/server_config.ts
+function resolveFaasStaging() {
+	return process.env.FaasEnv || "development";
+}
+function resolveServerConfig(root, logger, defaultBase = "/") {
+	const projectRoot = resolve(root);
+	const staging = resolveFaasStaging();
+	const srcRoot = join(projectRoot, "src");
+	const config = loadConfig(srcRoot, 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 ? resolve(projectRoot, server.root) : projectRoot,
+		base: server && 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, "/");
+	if (!normalized.length || normalized === "/") return "/";
+	return normalized.endsWith("/") ? normalized.slice(0, -1) : normalized;
+}
+function toRoute(srcRoot, file) {
+	const noTsPath = normalizeSlashes(relative(srcRoot, file)).replace(/\.ts$/, "");
+	if (noTsPath === "index.func") return {
+		route: "/",
+		priority: 2
+	};
+	if (noTsPath === "default.func") return {
+		route: "/*",
+		priority: 1
+	};
+	if (noTsPath.endsWith("/index.func")) return {
+		route: normalizeRoute(`/${noTsPath.slice(0, -11)}`),
+		priority: 2
+	};
+	if (noTsPath.endsWith("/default.func")) return {
+		route: normalizeRoute(`/${noTsPath.slice(0, -13)}/*`),
+		priority: 1
+	};
+	if (noTsPath.endsWith(".func")) return {
+		route: normalizeRoute(`/${noTsPath.slice(0, -5)}`),
+		priority: 3
+	};
+	throw Error(`[faas-types] Invalid func filename: ${file}`);
+}
+function toImportPath(fromFile, targetFile) {
+	const importPath = normalizeSlashes(relative(dirname(fromFile), targetFile)).replace(/\.ts$/, "");
+	if (importPath.startsWith(".")) return importPath;
+	return `./${importPath}`;
+}
+function parsePluginTypes(config) {
+	const pluginConfig = config.plugins;
+	if (!pluginConfig || typeof pluginConfig !== "object") return [];
+	const pluginTypes = /* @__PURE__ */ new Set();
+	for (const key in pluginConfig) {
+		const data = pluginConfig[key];
+		if (typeof data === "string" && data.length) {
+			pluginTypes.add(data);
+			continue;
+		}
+		if (data && typeof data === "object") {
+			if (typeof data.type === "string" && data.type.length) pluginTypes.add(data.type);
+			else pluginTypes.add(key);
+			continue;
+		}
+		pluginTypes.add(key);
+	}
+	return Array.from(pluginTypes).sort((a, b) => a.localeCompare(b));
+}
+async function readFuncFiles(dir) {
+	const result = [];
+	async function walk(currentDir) {
+		const entries = await readdir(currentDir, { withFileTypes: true });
+		for (const entry of entries) {
+			if (entry.name === ".faasjs" || entry.name === "node_modules") continue;
+			const filePath = join(currentDir, entry.name);
+			if (entry.isDirectory()) {
+				await walk(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)})>>`;
+	});
+	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 `/**
+ * Generated by @faasjs/dev.
+ *
+ * Do not edit this file manually.
+ */
+import type { Func, InferPluginEvent } from '@faasjs/func'
+import type { InferFaasAction, InferFaasFunc } from '@faasjs/types'
+
+declare module '@faasjs/types' {
+  interface FaasActions {
+${actionLines.length ? `${actionLines.join("\n")}\n` : ""}  }
+
+  interface FaasEvents {
+${eventLines.length ? `${eventLines.join("\n")}\n` : ""}  }
+}
+`;
+}
+function isTypegenSourceFile(filePath) {
+	return /\.func\.ts$/.test(filePath) || /(^|[\\/])faas\.ya?ml$/.test(filePath);
+}
+async function generateFaasTypes(options = {}) {
+	const logger = options.logger || new Logger("FaasJs:Typegen");
+	const { root: projectRoot, staging } = resolveServerConfig(options.root || process.cwd(), logger);
+	const srcRoot = join(projectRoot, "src");
+	const output = join(srcRoot, ".faasjs", "types.d.ts");
+	if (!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(loadConfig(srcRoot, file, staging, logger));
+		const importPath = toImportPath(output, file);
+		const prev = routeMap.get(route);
+		if (!prev || priority > prev.priority) routeMap.set(route, {
+			route,
+			importPath,
+			pluginTypes,
+			priority
+		});
+	}
+	const items = Array.from(routeMap.values()).sort((a, b) => a.route.localeCompare(b.route));
+	const content = formatTypes(items);
+	let changed = true;
+	try {
+		if (await readFile(output, "utf8") === content) changed = false;
+	} catch (_error) {}
+	if (changed) {
+		await mkdir(dirname(output), { recursive: true });
+		await writeFile(output, content);
+	}
+	return {
+		output,
+		changed,
+		fileCount: files.length,
+		routeCount: items.length
+	};
+}
+
+//#endregion
+export { isTypegenSourceFile as n, resolveServerConfig as r, generateFaasTypes as t };

package/faas-types.mjs

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

package/package.json

@@ -1,11 +1,14 @@
 {
   "name": "@faasjs/dev",
-  "version": "v8.0.0-beta.5",
+  "version": "8.0.0-beta.7",
   "license": "MIT",
   "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",
@@ -24,34 +27,35 @@
   },
   "funding": "https://github.com/sponsors/faasjs",
   "scripts": {
-    "build": "tsup-node src/index.ts --config ../../tsup.config.ts"
+    "build": "tsdown --entry src/index.ts --entry src/cli.ts --config ../../tsdown.config.ts"
   },
   "files": [
-    "dist"
+    "dist",
+    "faas-types.mjs"
   ],
   "peerDependencies": {
-    "@faasjs/deep_merge": ">=v8.0.0-beta.5",
-    "@faasjs/func": ">=v8.0.0-beta.5",
-    "@faasjs/http": ">=v8.0.0-beta.5",
-    "@faasjs/server": ">=v8.0.0-beta.5",
-    "@faasjs/knex": ">=v8.0.0-beta.5",
-    "@faasjs/load": ">=v8.0.0-beta.5",
-    "@faasjs/logger": ">=v8.0.0-beta.5",
+    "@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",
+    "@types/node": "*",
     "knex": "*",
     "vite": "*",
-    "knex-pglite": "*"
+    "vitest": "*"
   },
   "devDependencies": {
-    "@faasjs/deep_merge": ">=v8.0.0-beta.5",
-    "@faasjs/func": ">=v8.0.0-beta.5",
-    "@faasjs/http": ">=v8.0.0-beta.5",
-    "@faasjs/server": ">=v8.0.0-beta.5",
-    "@faasjs/knex": ">=v8.0.0-beta.5",
-    "@faasjs/load": ">=v8.0.0-beta.5",
-    "@faasjs/logger": ">=v8.0.0-beta.5",
+    "@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",
+    "@types/node": "*",
     "knex": "*",
     "vite": "*",
-    "knex-pglite": "*"
+    "vitest": "*"
   },
   "engines": {
     "node": ">=24.0.0",