@supacloud/compiler 0.1.0 → 0.2.0

package/README.md

@@ -47,7 +47,7 @@ interface ApplicationGraph {
 `<outDir>/application.ts`（头注释 `// GENERATED BY @supacloud/compiler — do not edit`）：
 
 - 文件顶部本地声明 `CompiledRoute` / `CompiledController` / `CompiledModule` 接口，不 import 任何外部包。
-- `createCompiledModules(deps)` 按 imports 拓扑序返回模块描述：`{ name, createServices, createRequestScope?, createJobScope?, controllers }`。
+- `createCompiledModules()` 按 imports 拓扑序返回模块描述：`{ name, createServices, createRequestScope?, createJobScope?, controllers, commands }`。平台依赖统一由 `createApplication({ deps })` 传入生成工厂。
 - 每个模块一个 `create<Name>Services(deps, imported)`：实例化 application 级 provider；dep 解析顺序为本模块 services > imports 模块导出的 services（`imported.<module>.<key>`）> 平台注入（`deps.<camelName>`）。
 - 含 request 级 provider/controller 的模块额外生成 `create<Name>RequestScope(services, ctx)`：依赖 `REQUEST_CONTEXT`（或 token name `supacloud.request-context`）的参数传 `ctx`，其余经 `services` 解析（运行期负责把 imports 模块导出的 application 服务合并进 `services`）；job 级同理生成 `create<Name>JobScope`。
 - services 对象的 key 为 token 名的 camelCase：`CaseService → caseService`、`CASE_REPOSITORY → caseRepository`、`LOGGER → logger`。
@@ -64,7 +64,11 @@ interface ApplicationGraph {
 | `module-boundary` | error | 依赖的 token 由未 import 的模块提供 |
 | `unresolved-token` | error | 依赖的 token 无法解析且不属于平台注入 |
 | `duplicate-token` | error | 同一 token 在同模块重复注册 |
-| `command-missing-permission` | warn（strict 时 error） | `@Command` 未声明 permission |
+| `duplicate-module` | error | 应用中存在重复模块名 |
+| `duplicate-command` | error | 应用中存在重复业务 command 名 |
+| `duplicate-route` | error | 规范化后 HTTP method + path 冲突 |
+| `route-command-unresolved` | error | 路由绑定了本模块未声明的 command 类 |
+| `command-missing-permission` | error | `@Command` 未声明 permission |
 | `missing-deps` | warn（strict 时 error） | 构造/工厂依赖无法静态解析 |
 
 依赖的 token 全图都无 provider 时不报错，记入 `externalTokens`（平台注入）。

package/dist/index.js

@@ -201,9 +201,9 @@ function parseModule(candidate, nameByNode, ctx) {
           className: cls.getName() ?? "<anonymous>",
           name: stringLiteralProp(meta, "name") ?? cls.getName() ?? "<anonymous>",
           permission: stringLiteralProp(meta, "permission"),
-          transaction: stringLiteralProp(meta, "transaction"),
+          transaction: commandModeProp(meta, "transaction") ?? "none",
           audit: stringLiteralProp(meta, "audit"),
-          idempotency: stringLiteralProp(meta, "idempotency")
+          idempotency: commandModeProp(meta, "idempotency") ?? "none"
         });
       }
     }
@@ -231,6 +231,10 @@ function parseModule(candidate, nameByNode, ctx) {
     exports
   };
 }
+function commandModeProp(object, name) {
+  const value = stringLiteralProp(object, name);
+  return value === "required" || value === "none" ? value : undefined;
+}
 function parseProvider(el, exportsSet, ctx) {
   const file = sourcePath(ctx.rootDir, el.getSourceFile().getFilePath());
   const line = el.getStartLineNumber();
@@ -383,6 +387,11 @@ function parseController(el, ctx) {
               schemaImports[schemaExpr.getText()] = importPath;
           }
         }
+        const commandExpr = getProp(optionsArg, "command");
+        if (commandExpr && Node.isIdentifier(commandExpr)) {
+          const commandDecl = resolveDeclaration(commandExpr)[0];
+          route.command = commandDecl && Node.isClassDeclaration(commandDecl) ? commandDecl.getName() ?? commandExpr.getText() : commandExpr.getText();
+        }
       }
       routes.push(route);
     }
@@ -625,6 +634,16 @@ var INTERFACES = `export interface CompiledRoute {
   params?: unknown;
   query?: unknown;
   response?: unknown;
+  command?: string;
+}
+
+export interface CompiledCommand {
+  className: string;
+  name: string;
+  permission: string;
+  transaction: "required" | "none";
+  audit?: string;
+  idempotency: "required" | "none";
 }
 
 export interface CompiledController {
@@ -643,12 +662,15 @@ export interface CompiledModule {
   createRequestScope?(
     services: Record<string, unknown>,
     ctx: unknown,
+    imported?: Record<string, Record<string, unknown>>,
   ): Record<string, unknown>;
   createJobScope?(
     services: Record<string, unknown>,
     ctx: unknown,
+    imported?: Record<string, Record<string, unknown>>,
   ): Record<string, unknown>;
   controllers: CompiledController[];
+  commands: CompiledCommand[];
 }`;
 async function generateApplication(graph, options) {
   const modules = topoSortModules(graph.modules);
@@ -667,7 +689,7 @@ async function generateApplication(graph, options) {
     ...imports.size > 0 ? [""] : [],
     INTERFACES,
     "",
-    "export function createCompiledModules(deps: Record<string, unknown>): CompiledModule[] {",
+    "export function createCompiledModules(): CompiledModule[] {",
     "  return [",
     ...descriptorEntries.map((entry) => indent(entry, 4) + ","),
     "  ];",
@@ -798,6 +820,7 @@ class ModuleGenerator {
       lines.push(`  createJobScope: create${this.pascal}JobScope,`);
     }
     lines.push(`  controllers: ${this.renderControllers()},`);
+    lines.push(`  commands: ${JSON.stringify(this.module.commands)},`);
     lines.push(`}`);
     return lines.join(`
 `);
@@ -822,6 +845,8 @@ class ModuleGenerator {
             fields.push(`${field}: ${local}`);
           }
         }
+        if (route.command)
+          fields.push(`command: ${JSON.stringify(route.command)}`);
         return `{ ${fields.join(", ")} }`;
       });
       return [
@@ -855,6 +880,7 @@ ${indent(item, 2)}`).join(",")}
       `function create${this.pascal}${suffix}(`,
       `  services: Record<string, unknown>,`,
       `  ctx: unknown,`,
+      `  imported: Record<string, Record<string, unknown>> = {},`,
       `): Record<string, unknown> {`,
       indent(this.renderFactoryBody(kind), 2),
       `}`
@@ -953,7 +979,7 @@ ${indent(item, 2)}`).join(",")}
         continue;
       if (kind === "services")
         return `imported.${importName}.${camelName(token)}`;
-      return `services.${camelName(token)}`;
+      return `imported.${importName}.${camelName(token)}`;
     }
     if (kind === "services")
       return `deps.${camelName(token)}`;
@@ -1016,6 +1042,42 @@ function validateGraph(graph, strict = false) {
   const warn2 = (code, message, file, line) => {
     diagnostics.push({ severity: strict ? "error" : "warn", code, message, file, line });
   };
+  const modulesByName = new Map;
+  const commandsByName = new Map;
+  const routesByKey = new Map;
+  for (const module of graph.modules) {
+    const previousModule = modulesByName.get(module.name);
+    if (previousModule) {
+      error("duplicate-module", `模块名 ${module.name} 重复（首次声明于 ${previousModule.file}:${previousModule.line}）`, module.file, module.line);
+    } else {
+      modulesByName.set(module.name, module);
+    }
+    for (const command of module.commands) {
+      const previousName = commandsByName.get(command.name);
+      if (previousName) {
+        error("duplicate-command", `command 名 ${command.name} 重复（首次由模块 ${previousName.module.name} 的 ${previousName.className} 声明）`, module.file, module.line);
+      } else {
+        commandsByName.set(command.name, { module, className: command.className });
+      }
+    }
+  }
+  for (const module of graph.modules) {
+    for (const controller of module.controllers) {
+      for (const route of controller.routes) {
+        const fullPath = joinRoutePaths(controller.path, route.path);
+        const key = `${route.method} ${fullPath}`;
+        const previous = routesByKey.get(key);
+        if (previous) {
+          error("duplicate-route", `路由 ${key} 重复（首次声明于模块 ${previous.module.name} 的 ${previous.controller.className}）`, controller.file);
+        } else {
+          routesByKey.set(key, { module, controller });
+        }
+        if (route.command && !module.commands.some((command) => command.className === route.command)) {
+          error("route-command-unresolved", `路由 ${key} 绑定的 command 类 ${route.command} 未在模块 ${module.name} 声明`, controller.file);
+        }
+      }
+    }
+  }
   for (const module of graph.modules) {
     const seen = new Map;
     for (const provider of module.providers) {
@@ -1047,13 +1109,18 @@ function validateGraph(graph, strict = false) {
     }
     for (const command of module.commands) {
       if (!command.permission) {
-        warn2("command-missing-permission", `模块 ${module.name} 的 command ${command.name} (${command.className}) 未声明 permission`, module.file, module.line);
+        error("command-missing-permission", `模块 ${module.name} 的 command ${command.name} (${command.className}) 未声明 permission`, module.file, module.line);
       }
     }
   }
   diagnostics.push(...detectCycles(graph, resolveDep));
   return diagnostics;
 }
+function joinRoutePaths(prefix, path) {
+  const joined = `${prefix}/${path}`.replace(/\/{2,}/g, "/");
+  const normalized = joined.length > 1 ? joined.replace(/\/+$/, "") : joined;
+  return normalized.replace(/:[^/]+/g, ":param");
+}
 function detectCycles(graph, resolveDep) {
   const diagnostics = [];
   const nodeId = (ref) => `${ref.module.name}:${ref.provider.token}`;

package/dist/types.d.ts

@@ -38,6 +38,8 @@ export interface RouteNode {
     params?: string;
     query?: string;
     response?: string;
+    /** @Command-decorated class explicitly bound by the route. */
+    command?: string;
 }
 export interface ControllerNode {
     className: string;
@@ -54,9 +56,9 @@ export interface CommandNode {
     className: string;
     name: string;
     permission?: string;
-    transaction?: string;
+    transaction: "required" | "none";
     audit?: string;
-    idempotency?: string;
+    idempotency: "required" | "none";
 }
 export interface QueryNode {
     className: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/compiler",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Static compiler for @supacloud/app metadata: builds the application graph from AST, validates it, and generates reflection-free factory code",
   "type": "module",
   "main": "./dist/index.js",