@vafast/cli 0.1.2 → 0.1.4

package/dist/cli.js

@@ -1,9 +1,9 @@
-import { syncTypes } from "./sync-DU-mhmR1.js";
+import { syncTypes } from "./sync-Bq9q17kE.js";
 import { cac } from "cac";
 
 //#region src/cli.ts
 const cli = cac("vafast");
-cli.command("sync", "从服务端同步 API 类型定义").option("--url <url>", "服务端地址（必填）").option("--out <path>", "输出文件路径", { default: "src/api.generated.ts" }).option("--endpoint <path>", "API Spec 接口路径", { default: "/api-spec" }).action(async (options) => {
+cli.command("sync", "从服务端同步 API 类型定义").option("--url <url>", "服务端地址（必填）").option("--out <path>", "输出文件路径", { default: "src/api.generated.ts" }).option("--endpoint <path>", "API Spec 接口路径", { default: "/api-spec" }).option("--strip-prefix <prefix>", "从路径中去掉的前缀（如 /billingRestfulApi）").action(async (options) => {
 	if (!options.url) {
 		console.error("❌ 请指定服务端地址：--url <url>");
 		process.exit(1);
@@ -11,7 +11,8 @@ cli.command("sync", "从服务端同步 API 类型定义").option("--url <url>",
 	await syncTypes({
 		url: options.url,
 		output: options.out,
-		endpoint: options.endpoint
+		endpoint: options.endpoint,
+		stripPrefix: options.stripPrefix
 	});
 });
 cli.help();

package/dist/commands/sync.d.ts

@@ -7,6 +7,7 @@ interface SyncOptions {
     url: string;
     output: string;
     endpoint: string;
+    stripPrefix?: string;
 }
 /**
  * 同步 API 类型

package/dist/index.js

@@ -1,3 +1,3 @@
-import { schemaToType, syncTypes } from "./sync-DU-mhmR1.js";
+import { schemaToType, syncTypes } from "./sync-Bq9q17kE.js";
 
 export { schemaToType, syncTypes };

package/dist/{sync-DU-mhmR1.js → sync-Bq9q17kE.js}

@@ -40,13 +40,22 @@ function arrayToType(schema) {
 * 对象类型转换
 */
 function objectToType(schema) {
+	const patternProps = schema.patternProperties;
+	if (patternProps) {
+		const patterns = Object.values(patternProps);
+		if (patterns.length > 0 && patterns[0]) {
+			const valueType = schemaToType(patterns[0]);
+			return `Record<string, ${valueType}>`;
+		}
+		return "Record<string, unknown>";
+	}
 	if (!schema.properties) {
 		if (schema.additionalProperties === true) return "Record<string, unknown>";
 		if (typeof schema.additionalProperties === "object") {
 			const valueType = schemaToType(schema.additionalProperties);
 			return `Record<string, ${valueType}>`;
 		}
-		return "{}";
+		return "Record<string, unknown>";
 	}
 	const required = new Set(schema.required || []);
 	const props = [];
@@ -55,7 +64,7 @@ function objectToType(schema) {
 		const optional = required.has(key) ? "" : "?";
 		props.push(`${key}${optional}: ${propType}`);
 	}
-	if (props.length === 0) return "{}";
+	if (props.length === 0) return "Record<string, unknown>";
 	return `{ ${props.join("; ")} }`;
 }
 
@@ -65,7 +74,7 @@ function objectToType(schema) {
 * 同步 API 类型
 */
 async function syncTypes(options) {
-	const { url, output, endpoint } = options;
+	const { url, output, endpoint, stripPrefix } = options;
 	console.log(`🔄 正在从 ${url}${endpoint} 获取契约...`);
 	const contractUrl = new URL(endpoint, url).toString();
 	let contract;
@@ -79,7 +88,8 @@ async function syncTypes(options) {
 		process.exit(1);
 	}
 	console.log(`✅ 获取到 ${contract.routes.length} 个路由`);
-	const typeContent = generateTypeDefinition(contract);
+	if (stripPrefix) console.log(`🔧 去掉路径前缀: ${stripPrefix}`);
+	const typeContent = generateTypeDefinition(contract, stripPrefix);
 	const outputDir = dirname(output);
 	mkdirSync(outputDir, { recursive: true });
 	writeFileSync(output, typeContent, "utf-8");
@@ -93,7 +103,7 @@ async function syncTypes(options) {
 /**
 * 生成类型定义文件内容
 */
-function generateTypeDefinition(contract) {
+function generateTypeDefinition(contract, stripPrefix) {
 	const lines = [];
 	lines.push("/**");
 	lines.push(" * 自动生成的 API 类型定义");
@@ -103,7 +113,7 @@ function generateTypeDefinition(contract) {
 	lines.push(" * ⚠️ 请勿手动修改此文件，使用 `vafast sync` 重新生成");
 	lines.push(" */");
 	lines.push("");
-	const routeTree = buildRouteTree(contract.routes);
+	const routeTree = buildRouteTree(contract.routes, stripPrefix);
 	lines.push("export type Api = {");
 	lines.push(generateRouteTreeType(routeTree, 1));
 	lines.push("}");
@@ -113,10 +123,14 @@ function generateTypeDefinition(contract) {
 /**
 * 构建路由树
 */
-function buildRouteTree(routes) {
+function buildRouteTree(routes, stripPrefix) {
 	const root = /* @__PURE__ */ new Map();
+	const normalizedPrefix = stripPrefix ? "/" + stripPrefix.replace(/^\/+|\/+$/g, "") : void 0;
 	for (const route of routes) {
-		const segments = route.path.split("/").filter(Boolean);
+		let path = route.path;
+		if (normalizedPrefix && path.startsWith(normalizedPrefix)) path = path.slice(normalizedPrefix.length) || "/";
+		const segments = path.split("/").filter(Boolean);
+		if (segments.length === 0) continue;
 		let current = root;
 		for (let i = 0; i < segments.length; i++) {
 			const segment = segments[i];
@@ -141,8 +155,9 @@ function generateRouteTreeType(tree, indent) {
 	const lines = [];
 	const pad = "  ".repeat(indent);
 	for (const [key, node] of tree) {
-		if (key === ":id") lines.push(`${pad}':id': {`);
-		else lines.push(`${pad}${key}: {`);
+		const needsQuotes = /[^a-zA-Z0-9_$]/.test(key) || /^\d/.test(key);
+		const propName = needsQuotes ? `'${key}'` : key;
+		lines.push(`${pad}${propName}: {`);
 		for (const [method, route] of node.methods) {
 			const methodType = generateMethodType(route);
 			if (route.description) lines.push(`${pad}  /** ${route.description} */`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vafast/cli",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "Vafast CLI - 类型同步和开发工具",
   "type": "module",
   "bin": {