openxiangda-cli 2.0.0-alpha.86 → 2.0.0-alpha.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openxiangda-cli",
-  "version": "2.0.0-alpha.86",
+  "version": "2.0.0-alpha.89",
   "description": "Thin application-level CLI for OpenXiangda 2.0.",
   "type": "module",
   "main": "./dist/index.js",
@@ -23,9 +23,9 @@
   ],
   "dependencies": {
     "@oclif/core": "4.13.3",
-    "openxiangda-contracts": "2.0.0-alpha.40",
-    "openxiangda-devkit-core": "2.0.0-alpha.53",
-    "openxiangda-mcp": "2.0.0-alpha.53"
+    "openxiangda-contracts": "2.0.0-alpha.43",
+    "openxiangda-devkit-core": "2.0.0-alpha.56",
+    "openxiangda-mcp": "2.0.0-alpha.56"
   },
   "devDependencies": {
     "tsx": "4.23.12",

package/template/README.md

@@ -8,9 +8,9 @@ pnpm openxiangda dev
 
 当前应用已经把 CLI 和全部 2.0 包精确锁定在 `package.json` 与 lockfile 中。创建另一个应用时使用当前安装的 OpenXiangda 2.0 Skill 给出的精确 CLI 版本，不使用 `latest`、`alpha` 或全局命令。
 
-在 `openxiangda.config.ts` 的 `data.resources` 中只声明资源 `code`、`name`、`fields` 和可选列表/布局/数据策略。每个字段一次写完 type、label、required、列表/筛选标记、reference/file 与 access；不要再写 `schema`、`surface`、资源 capabilities、资源 fieldPolicies 或 `platform/data` 模块。编译器据此生成标准后台列表、筛选、表单、详情、审计、文件上传、独立移动端页面和 AI Schema。
+在 `openxiangda.config.ts` 的 `data.resources` 中只声明资源 `code`、`name`、`fields` 和可选列表/布局/数据策略。每个字段一次写完语义 `type`、`label`、`required`、列表/筛选标记、`options`/`source`/`file` 与 `access`；不要再写 `schema`、`surface`、PostgreSQL 类型、资源 capabilities、资源 fieldPolicies 或 `platform/data` 模块。编译器据此生成标准后台列表、筛选、表单、详情、审计、文件上传、独立移动端页面、Data API 查询计划和 AI Schema。
 
-成员、部门和资源关系分别使用 `reference: { kind: 'directory-user' }`、`directory-department`、`resource`，只保存稳定 ID，不复制目录数据。单选成员字段使用 `string`，单选部门和资源引用使用 `uuid`，多选引用统一使用 `json`。需要目录选择器的业务角色必须显式拥有 `app:<app-code>:directory:read` 能力。用 `resourceCapabilityCodes` 生成资源 CRUD 权限，用 `currentUserDataPolicy` 声明唯一的当前用户行规则。
+成员、部门分别声明 `user.single`/`user.multiple` 和 `department.single`/`department.multiple`；同应用动态资源声明 `resource-ref.single`/`resource-ref.multiple` 及编译期固定的 `source`。这些字段都保存完整 `{label,value,...}` 显示快照，资源引用还保存 `resourceCode` 和声明的 `snapshot` 字段；查询和权限以稳定 `value` 为比较键。需要目录选择器的业务角色必须显式拥有 `app:<app-code>:directory:read` 能力。用 `resourceCapabilityCodes` 生成资源 CRUD 权限，用 `currentUserDataPolicy` 声明唯一的当前用户行规则。
 
 所有 CRUD 位于 `apps/web/src/platform-client.ts` 的 Data API adapter；Nest 只在需要复杂事务或外部集成时增加 App API。选择器显式携带当前环境、使用同源 Cookie。标准客户端在内存中恢复平台 RoleSession，并自动为 Data、Directory、文件和 App API 请求携带 header；业务代码不读取或持久化 Token、RoleSession 标识与授权结果。
 

package/template/apps/server/package.json

@@ -15,7 +15,7 @@
     "@nestjs/common": "11.1.29",
     "@nestjs/core": "11.1.29",
     "@nestjs/platform-fastify": "11.1.29",
-    "openxiangda-nest": "2.0.0-alpha.49",
+    "openxiangda-nest": "2.0.0-alpha.52",
     "reflect-metadata": "0.2.2",
     "rxjs": "7.8.2"
   },

package/template/apps/server/src/app.module.ts

@@ -1,5 +1,13 @@
 import { Module } from '@nestjs/common';
-import { OpenXiangdaModule } from 'openxiangda-nest';
+import {
+  eventHandlerManifest,
+  eventSchemas,
+  eventSubscriptionCodes,
+} from '@app/contracts';
+import {
+  OpenXiangdaModule,
+  eventSigningSecretsFromEnvironment,
+} from 'openxiangda-nest';
 
 @Module({
   imports: [
@@ -24,6 +32,11 @@ import { OpenXiangdaModule } from 'openxiangda-nest';
       version: process.env.OPENXIANGDA_APP_VERSION || '0.1.0-dev',
       connectedDevelopment:
         process.env.OPENXIANGDA_CONNECTED_DEV === 'true',
+      eventHandlerManifest,
+      eventSchemas,
+      eventSigningSecrets: eventSigningSecretsFromEnvironment(
+        eventSubscriptionCodes
+      ),
     }),
   ],
 })

package/template/apps/server/test/smoke.test.ts

@@ -6,9 +6,11 @@ test('the clean server template only owns platform bootstrap', () => {
   const source = readFileSync(new URL('../src/app.module.ts', import.meta.url), 'utf8');
   const main = readFileSync(new URL('../src/main.ts', import.meta.url), 'utf8');
   assert.match(source, /OpenXiangdaModule\.forRoot/);
+  assert.match(source, /eventHandlerManifest/);
+  assert.match(source, /eventSigningSecretsFromEnvironment/);
   assert.match(main, /bootstrapOpenXiangdaApplication\(AppModule\)/);
   assert.doesNotMatch(main, /NestFactory|FastifyAdapter/);
-  const legacyMarkers = ['oauth' + 'Client', 'event' + 'Signing', 'Workflow', 'instrument' + '-context'];
+  const legacyMarkers = ['oauth' + 'Client', 'Workflow', 'instrument' + '-context'];
   assert.doesNotMatch(source, new RegExp(legacyMarkers.join('|')));
   assert.doesNotMatch(source, /createData|updateData|deleteData|queryData/);
 });

package/template/apps/web/package.json

@@ -16,7 +16,7 @@
     "antd": "6.4.3",
     "dayjs": "1.11.18",
     "docx-preview": "0.3.7",
-    "openxiangda-contracts": "2.0.0-alpha.40",
+    "openxiangda-contracts": "2.0.0-alpha.43",
     "react": "19.2.8",
     "react-dom": "19.2.8",
     "react-router-dom": "7.8.2",

package/template/apps/web/src/components/resource/GeneratedResourceCrud.tsx

@@ -932,7 +932,7 @@ function GeneratedResourceFormPage({
       try {
         const result = await transactNativeData(operations);
         const parent = result.items[0];
-        if (!parent) {
+        if (!parent || parent.operation === 'emitEvent') {
           throw new Error('OPENXIANGDA_SUBTABLE_PARENT_RESULT_MISSING');
         }
         message.success(mode === 'create' ? `${name}已创建` : '修改已保存');

package/template/openxiangda.config.ts

@@ -25,6 +25,6 @@ export default defineOpenXiangdaApp({
     authorizationTransitions: [],
   },
   data: { resources: [] },
-  events: { subscriptions: [], timers: [] },
+  events: { schemas: [], subscriptions: [], timers: [], dateTriggers: [] },
   workflows: { definitions: [], bindings: [], activations: [], providers: [], editableParameters: [] },
 });

package/template/package.json

@@ -22,9 +22,9 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda-cli": "2.0.0-alpha.86",
-    "openxiangda-contracts": "2.0.0-alpha.40",
-    "openxiangda-devkit-core": "2.0.0-alpha.53",
+    "openxiangda-cli": "2.0.0-alpha.89",
+    "openxiangda-contracts": "2.0.0-alpha.43",
+    "openxiangda-devkit-core": "2.0.0-alpha.56",
     "typescript": "5.9.3"
   }
 }

package/template/packages/contracts/src/generated.ts

@@ -17,6 +17,13 @@ export const appOperations = {} as const;
 export const appRoutes = {} as const;
 export const eventTypes = [] as const;
 export const eventSubscriptionCodes = [] as const;
+export const eventHandlerManifest = {
+  "schemaVersion": "openxiangda.event-handler-manifest/v2",
+  "appCode": "openxiangda-application",
+  "handlers": []
+} as const;
+export const eventHandlers = {} as const;
+export const eventSchemas = [] as const;
 export const workflowCodes = [] as const;
 
 export type ResourceCode = (typeof resourceCodes)[number];
@@ -25,8 +32,27 @@ export type AppOperation = (typeof appOperations)[keyof typeof appOperations];
 export type AppRoute = (typeof appRoutes)[keyof typeof appRoutes];
 export type EventType = (typeof eventTypes)[number];
 export type EventSubscriptionCode = (typeof eventSubscriptionCodes)[number];
+export type EventTypesForSubscription<TCode extends EventSubscriptionCode> = never;
 export type WorkflowCode = (typeof workflowCodes)[number];
 
+export interface OpenXiangdaCloudEvent<TType extends EventType = EventType, TData extends Record<string, unknown> = Record<string, unknown>> {
+  specversion: "1.0";
+  id: string;
+  source: string;
+  type: TType;
+  subject?: string;
+  time: string;
+  datacontenttype: "application/json";
+  dataschema?: string;
+  data: TData;
+  tenantid: string;
+  appcode: typeof appCode;
+  environment: string;
+  traceid?: string;
+  schemaversion: string;
+}
+export type EventHandlerInput<TCode extends EventSubscriptionCode> = OpenXiangdaCloudEvent<EventTypesForSubscription<TCode>>;
+
 export interface LabeledValue {
   label: string;
   value: string;