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

package/template/apps/web/src/main.tsx

@@ -1,67 +1,19 @@
-import { Refine } from '@refinedev/core';
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { BrowserRouter, Navigate, Route, Routes } from 'react-router-dom';
-import { resourceDefinitions } from '../../../packages/contracts/src/generated.js';
-import { applicationProvider } from './data-provider';
-import { AppearanceProvider } from './appearance';
-import { GeneratedResourcePage } from './components/resource/GeneratedResourceCrud';
-import { FilePreviewPage } from './FilePreviewPage';
-import { EmptyApplicationPage } from './Shell';
-import { RuntimeBoundary } from './runtime';
-import { applicationBasename } from './runtime-meta';
-import { useGlobalRequestLoading } from './platform-client';
-import './styles.css';
-
-const codes = Object.keys(resourceDefinitions);
-const firstPath = codes[0] ? `/${codes[0]}` : '/';
-const adminEntry = codes.length ? (
-  <Navigate replace to={firstPath} />
-) : (
-  <EmptyApplicationPage />
-);
-
-function GlobalRequestLoading() {
-  const loading = useGlobalRequestLoading();
-  return loading ? (
-    <div
-      aria-label="页面请求进行中"
-      aria-valuetext="正在加载"
-      className="oxa-global-request-loading"
-      role="progressbar"
-    >
-      <span />
-    </div>
-  ) : null;
-}
-
-const resourceRoutes = codes.flatMap(resourceCode => [
-  <Route key={`${resourceCode}-list`} path={`/${resourceCode}`} element={<GeneratedResourcePage resourceCode={resourceCode} />} />,
-  <Route key={`${resourceCode}-new`} path={`/${resourceCode}/new`} element={<GeneratedResourcePage mode="create" resourceCode={resourceCode} />} />,
-  <Route key={`${resourceCode}-detail`} path={`/${resourceCode}/:id`} element={<GeneratedResourcePage mode="detail" resourceCode={resourceCode} />} />,
-  <Route key={`${resourceCode}-edit`} path={`/${resourceCode}/:id/edit`} element={<GeneratedResourcePage mode="edit" resourceCode={resourceCode} />} />,
-  <Route key={`${resourceCode}-mobile-list`} path={`/m/${resourceCode}`} element={<GeneratedResourcePage resourceCode={resourceCode} variant="mobile" />} />,
-  <Route key={`${resourceCode}-mobile-new`} path={`/m/${resourceCode}/new`} element={<GeneratedResourcePage mode="create" resourceCode={resourceCode} variant="mobile" />} />,
-  <Route key={`${resourceCode}-mobile-detail`} path={`/m/${resourceCode}/:id`} element={<GeneratedResourcePage mode="detail" resourceCode={resourceCode} variant="mobile" />} />,
-  <Route key={`${resourceCode}-mobile-edit`} path={`/m/${resourceCode}/:id/edit`} element={<GeneratedResourcePage mode="edit" resourceCode={resourceCode} variant="mobile" />} />,
-]);
+import { OpenXiangdaApplication } from 'openxiangda/react';
+import {
+  appCode,
+  appName,
+  resourceDefinitions,
+} from '../../../packages/contracts/src/generated.js';
+import 'openxiangda/react/styles.css';
 
 ReactDOM.createRoot(document.getElementById('root')!).render(
   <React.StrictMode>
-    <AppearanceProvider>
-      <GlobalRequestLoading />
-      <RuntimeBoundary>
-        <BrowserRouter basename={applicationBasename()}>
-          <Refine dataProvider={applicationProvider} resources={codes.map(code => ({ name: code, list: `/${code}`, create: `/${code}/new`, edit: `/${code}/:id/edit`, show: `/${code}/:id` }))}>
-            <Routes>
-              <Route path="/" element={adminEntry} />
-              <Route path="/admin" element={adminEntry} />
-              <Route path="/files/:resourceCode/:fileId/preview" element={<FilePreviewPage />} />
-              {resourceRoutes}
-            </Routes>
-          </Refine>
-        </BrowserRouter>
-      </RuntimeBoundary>
-    </AppearanceProvider>
+    <OpenXiangdaApplication
+      appCode={appCode}
+      appName={appName}
+      resourceDefinitions={resourceDefinitions}
+    />
   </React.StrictMode>,
 );

package/template/apps/web/test/contracts.test.ts

@@ -1,124 +1,72 @@
 import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
+import { readFileSync, readdirSync } from 'node:fs';
 import test from 'node:test';
-import { resourceDefinitions, resourceCodes } from '../../../packages/contracts/src/generated.js';
-import { readRuntimeMount, resolveApplicationBasename } from '../src/runtime-meta';
+import { readRuntimeMount, resolveApplicationBasename } from 'openxiangda/core';
+import {
+  resourceCodes,
+  resourceDefinitions,
+} from '../../../packages/contracts/src/generated.js';
 
-test('clean template is resource-driven and contains no HGY fixture', () => {
-  const config = readFileSync(new URL('../../../openxiangda.config.ts', import.meta.url), 'utf8');
+test('clean template contains only application declarations and one React entry', () => {
+  const config = readFileSync(
+    new URL('../../../openxiangda.config.ts', import.meta.url),
+    'utf8'
+  );
   const source = readFileSync(new URL('../src/main.tsx', import.meta.url), 'utf8');
+  const productionSources = readdirSync(new URL('../src', import.meta.url), {
+    withFileTypes: true,
+  })
+    .filter(entry => entry.isFile())
+    .map(entry => entry.name)
+    .sort();
+  assert.deepEqual(productionSources, ['main.tsx']);
   assert.deepEqual(Object.keys(resourceDefinitions).sort(), [...resourceCodes].sort());
   assert.match(config, /data:\s*\{\s*resources:/);
-  assert.match(source, /Object\.keys\(resourceDefinitions\)/);
-  const legacyMarkers = ['instruments', 'colleges', '仪器' + '资源管理', '学院' + '字典', 'HGY', 'Instrument'];
+  assert.match(source, /OpenXiangdaApplication/);
+  assert.match(source, /from 'openxiangda\/react'/);
+  assert.match(source, /openxiangda\/react\/styles\.css/);
+  const legacyMarkers = [
+    'instruments',
+    'colleges',
+    '仪器' + '资源管理',
+    '学院' + '字典',
+    'HGY',
+    'Instrument',
+  ];
   assert.doesNotMatch(`${config}\n${source}`, new RegExp(legacyMarkers.join('|')));
 });
 
-test('standard surfaces keep authoritative directory/resource selectors and mobile routes', () => {
-  const surface = readFileSync(new URL('../src/components/resource/SurfaceFields.tsx', import.meta.url), 'utf8');
-  const selector = readFileSync(new URL('../src/AuthoritativeSelector.tsx', import.meta.url), 'utf8');
-  const directoryPicker = readFileSync(new URL('../src/components/platform-fields/PlatformDirectoryPicker.tsx', import.meta.url), 'utf8');
-  const directoryValue = readFileSync(new URL('../src/components/platform-fields/directory-value.ts', import.meta.url), 'utf8');
-  const resourceSelector = readFileSync(new URL('../src/components/platform-fields/ResourceReferenceField.tsx', import.meta.url), 'utf8');
-  const crud = readFileSync(new URL('../src/components/resource/GeneratedResourceCrud.tsx', import.meta.url), 'utf8');
-  assert.match(surface, /PlatformDirectoryPicker/);
-  assert.match(resourceSelector, /source="resource"/);
-  assert.match(resourceSelector, /MobileAuthoritativeSelector/);
-  assert.match(surface, /oxa-mobile-file-field/);
-  assert.match(surface, /mobilePending/);
-  assert.match(surface, /上传中/);
-  assert.match(surface, /重试/);
-  assert.match(surface, /AttachmentFileList files=\{refs\}/);
-  assert.match(selector, /searchResource/);
-  assert.doesNotMatch(selector, /resolveResource/);
-  assert.match(selector, /business fields never use this path/);
-  assert.match(selector, /storedReferenceOptions/);
-  assert.doesNotMatch(directoryPicker, /resolveDirectory/);
-  assert.match(directoryValue, /entry\.snapshot/);
-  assert.match(selector, /ResourceReferenceValue/);
-  assert.match(selector, /role="dialog"/);
-  assert.match(selector, /oxa-mobile-reference-sheet/);
-  assert.match(crud, /MobileResourceListPage/);
-  assert.match(crud, /fieldWritable/);
-  assert.match(crud, /exportResourceRows/);
-  assert.doesNotMatch(crud, /rows\.push|pageSize = 500|csvCell/);
-  assert.match(crud, /数据读取失败/);
-  assert.match(crud, /state\.list\.query\.refetch/);
-  assert.match(crud, /key=\{pageKey\}/);
-  assert.match(crud, /setQuery\(\{\}\)/);
-  const client = readFileSync(new URL('../src/platform-client.ts', import.meta.url), 'utf8');
-  const resourceQuery = readFileSync(new URL('../src/components/platform-fields/resource-query.ts', import.meta.url), 'utf8');
-  assert.match(client, /declaredFields\.has\(requestedSort\.field\)/);
-  assert.match(client, /SCHEMA_VERSIONS\.dataFieldSourceQuery/);
-  assert.match(client, /SCHEMA_VERSIONS\.dataExportRequest/);
-  assert.match(client, /`\$\{base\}\/export`/);
-  assert.match(client, /accept', 'text\/csv'/);
-  assert.match(client, /\/source\/query/);
-  assert.doesNotMatch(client, /operator:\s*'ilike'|operator:\s*'cs'|filters:/);
-  assert.match(resourceQuery, /if \(!declaredFields\.has\(fieldCode\)\) continue/);
-  assert.match(client, /\/api\/auth\/logout/);
-  assert.match(client, /x-openxiangda-role-session-id/);
-  assert.match(client, /requestApplicationApi/);
-  assert.doesNotMatch(client, /\/native\/current-user/);
-  const runtime = readFileSync(new URL('../src/runtime.tsx', import.meta.url), 'utf8');
-  assert.match(runtime, /selection_required/);
-  assert.match(runtime, /identityEpoch/);
-  assert.doesNotMatch(runtime, /focused_role|authorization-mode/);
-});
-
-test('admin appearance is a bounded Ant Design theme with compact route chrome', () => {
-  const appearance = readFileSync(new URL('../src/appearance.tsx', import.meta.url), 'utf8');
-  const main = readFileSync(new URL('../src/main.tsx', import.meta.url), 'utf8');
-  const shell = readFileSync(new URL('../src/Shell.tsx', import.meta.url), 'utf8');
-  assert.match(appearance, /'system' \| 'light' \| 'dark'/);
-  assert.match(appearance, /antdTheme\.darkAlgorithm/);
-  assert.match(appearance, /antdTheme\.defaultAlgorithm/);
-  assert.match(appearance, /ConfigProvider/);
-  assert.match(appearance, /openxiangda\.admin\.appearance/);
-  assert.match(main, /<AppearanceProvider>/);
-  assert.match(main, /oxa-global-request-loading/);
-  assert.match(main, /path="\/admin"/);
-  assert.match(shell, /openxiangda\.admin\.route-history/);
-  assert.match(shell, /MAX_HISTORY_ITEMS = 8/);
-  assert.match(shell, /<Segmented/);
-  assert.match(shell, /跟随系统/);
-  assert.match(shell, /退出登录/);
-  assert.match(shell, /切换应用角色/);
-  assert.match(shell, /<Header className="oxa-topbar">\s*<Breadcrumb/);
-  assert.doesNotMatch(shell, /oxa-topbar-page/);
-});
-
-test('standard desktop CRUD exposes compact filters, table tools, and lazy audit history', () => {
-  const pages = readFileSync(new URL('../src/components/resource/StandardResourcePages.tsx', import.meta.url), 'utf8');
-  const crud = readFileSync(new URL('../src/components/resource/GeneratedResourceCrud.tsx', import.meta.url), 'utf8');
-  assert.match(pages, /className="oxa-list-surface"/);
-  assert.doesNotMatch(pages, /className="oxa-page-heading"/);
-  assert.match(crud, /filtersExpanded/);
-  assert.match(crud, /更多筛选/);
-  assert.match(crud, /columnMenu/);
-  assert.match(crud, /densityMenu/);
-  assert.match(crud, /列设置/);
-  assert.match(crud, /密度/);
-  assert.match(crud, /ResourceImportButton/);
-  assert.match(crud, /ResourceBatchActions/);
-  const batch = readFileSync(new URL('../src/components/resource/ResourceBatchActions.tsx', import.meta.url), 'utf8');
-  assert.match(batch, /transactNativeData/);
-  assert.match(batch, /批量修改/);
-  assert.match(batch, /批量删除/);
-  assert.match(batch, /确认导入/);
-  assert.match(crud, /!auditExpanded/);
-  assert.match(crud, /<Collapse/);
-  assert.match(crud, /查看创建、更新和删除的字段变化/);
+test('application manifests expose one direct OpenXiangda dependency', () => {
+  for (const relative of [
+    '../../../package.json',
+    '../package.json',
+    '../../server/package.json',
+  ]) {
+    const manifest = JSON.parse(
+      readFileSync(new URL(relative, import.meta.url), 'utf8')
+    ) as Record<string, Record<string, string>>;
+    const dependencies = Object.entries({
+      ...(manifest.dependencies || {}),
+      ...(manifest.devDependencies || {}),
+      ...(manifest.peerDependencies || {}),
+    }).filter(([name]) =>
+      name === 'openxiangda' || name.startsWith('openxiangda-')
+    );
+    assert.deepEqual(
+      dependencies.map(([name]) => name),
+      dependencies.length ? ['openxiangda'] : []
+    );
+  }
 });
 
 test('runtime metadata stays mount-scoped', () => {
   const mount = readRuntimeMount(
-    (name) =>
+    name =>
       ({
         'openxiangda-runtime-base': '/view/example-app/',
         'openxiangda-app-code': 'example-app',
         'openxiangda-environment': 'preproduction',
-      }[name])
+      })[name]
   );
   assert.equal(resolveApplicationBasename(mount), '/view/example-app');
 });

package/template/openxiangda.config.ts

@@ -1,4 +1,4 @@
-import { defineOpenXiangdaApp } from 'openxiangda-devkit-core';
+import { defineOpenXiangdaApp } from 'openxiangda/config';
 
 /** Clean application scaffold: declare resources and fields, then generate CRUD. */
 export default defineOpenXiangdaApp({
@@ -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,7 @@
     "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": "2.0.0-alpha.2",
     "typescript": "5.9.3"
   }
 }

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

@@ -1,6 +1,7 @@
 // Generated by OpenXiangda 2.0 Native compiler. Do not edit by hand.
 export const compilerContractVersion = "native-2" as const;
 export const appCode = "openxiangda-application" as const;
+export const appName = "OpenXiangda 应用" as const;
 export const resourceCodes = [] as const;
 export const resourceSurfaces = {} as const;
 export const resourceDefinitions = {} as const;
@@ -17,6 +18,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 +33,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;

package/template/scripts/verify-template-budget.mjs

@@ -20,7 +20,7 @@ function visit(directory) {
 }
 visit(root);
 const bytes = files.reduce((total, file) => total + statSync(file).size, 0);
-if (files.length > 80) throw new Error(`TEMPLATE_SOURCE_FILE_BUDGET_EXCEEDED:${files.length}>80`);
+if (files.length > 50) throw new Error(`TEMPLATE_SOURCE_FILE_BUDGET_EXCEEDED:${files.length}>50`);
 if (bytes > 500_000) throw new Error(`TEMPLATE_SOURCE_BYTE_BUDGET_EXCEEDED:${bytes}>500000`);
 const productionFiles = files.filter(file => {
   const name = relative(root, file).replaceAll('\\', '/');
@@ -39,7 +39,7 @@ const agents = readFileSync(resolve(root, 'AGENTS.md'), 'utf8');
 if (!agents.includes('pnpm openxiangda')) throw new Error('TEMPLATE_AGENT_PINNED_CLI_MISSING');
 if (
   !agents.includes("union of that user's application roles") ||
-  !agents.includes('opaque authorization context')
+  !agents.includes('does not transmit a RoleSession header')
 ) {
   throw new Error('TEMPLATE_AGENT_ROLE_UNION_BOUNDARY_MISSING');
 }