openxiangda-cli 2.0.0-alpha.60 → 2.0.0-alpha.62

package/template/openxiangda.config.ts

@@ -1,96 +1,29 @@
 import { defineOpenXiangdaApp } from 'openxiangda-devkit-core';
-import {
-  instruments,
-  protectedFieldCapabilities,
-} from './platform/data/instruments.js';
-import { colleges } from './platform/data/colleges.js';
-
-const read = 'app:instrument-center:data:instruments:read';
-const create = 'app:instrument-center:data:instruments:create';
-const update = 'app:instrument-center:data:instruments:update';
-const remove = 'app:instrument-center:data:instruments:delete';
-const inspectContext = 'app:instrument-center:instrument:context:read';
-const directoryRead = 'app:instrument-center:directory:read';
-const collegeRead = 'app:instrument-center:data:colleges:read';
-const collegeCreate = 'app:instrument-center:data:colleges:create';
-const collegeUpdate = 'app:instrument-center:data:colleges:update';
-const allProtectedFieldCapabilities = Object.values(
-  protectedFieldCapabilities
-).flatMap(capabilities => [capabilities.create, capabilities.update]);
-const collegeCreateCapabilities = Object.values(
-  protectedFieldCapabilities
-).map(capabilities => capabilities.create);
-const collegeUpdateCapabilities = Object.entries(protectedFieldCapabilities)
-  .filter(([field]) => field !== 'collegeId')
-  .map(([, capabilities]) => capabilities.update);
 
+/** Clean application scaffold: declare resources and fields, then generate CRUD. */
 export default defineOpenXiangdaApp({
   schemaVersion: 3,
-  app: { code: 'instrument-center', name: '仪器资源管理' },
-  frontend: {
-    root: 'apps/web',
-    routes: [
-      { code: 'instruments', path: '/instruments', label: '仪器资源', surface: 'admin', navigation: 'menu', capability: read },
-      { code: 'colleges', path: '/colleges', label: '学院字典', surface: 'admin', navigation: 'menu', capability: collegeRead },
-      { code: 'instrument-create', path: '/instruments/new', label: '新增仪器', surface: 'admin', navigation: 'hidden', parentCode: 'instruments', capability: create },
-      { code: 'instrument-edit', path: '/instruments/:id/edit', label: '编辑仪器', surface: 'admin', navigation: 'hidden', parentCode: 'instruments', capability: update },
-      { code: 'instrument-detail', path: '/instruments/:id', label: '仪器详情', surface: 'admin', navigation: 'hidden', parentCode: 'instruments', capability: read },
-    ],
-  },
+  app: { code: 'openxiangda-application', name: 'OpenXiangda 应用' },
+  frontend: { root: 'apps/web', routes: [] },
   backend: {
     root: 'apps/server',
     runtime: 'node',
     framework: 'nestjs',
+    enabled: false,
     runMode: 'shared',
     secrets: [],
-    operations: [
-      {
-        code: 'instrument-context.inspect',
-        method: 'GET',
-        path: '/api/instruments/context',
-        capability: inspectContext,
-        requestSchema: { type: 'object', additionalProperties: false },
-        responseSchema: { type: 'object' },
-      },
-    ],
+    operations: [],
   },
   platform: { root: 'platform' },
   authz: {
-    capabilities: [
-      { code: inspectContext, kind: 'backend', name: '查看当前应用身份摘要' },
-    ],
-    roles: [
-      { code: 'school_admin', name: '学校管理员', capabilities: [read, create, update, remove, collegeRead, collegeCreate, collegeUpdate, directoryRead, ...allProtectedFieldCapabilities, inspectContext] },
-      { code: 'college_admin', name: '学院管理员', capabilities: [read, create, update, remove, directoryRead, ...collegeCreateCapabilities, ...collegeUpdateCapabilities, inspectContext] },
-      { code: 'instrument_admin', name: '仪器管理员', capabilities: [read, update, directoryRead, inspectContext] },
-    ],
-    scopeDimensions: [
-      {
-        code: 'college',
-        name: '学院',
-        valueType: 'uuid',
-        hierarchyMode: 'flat',
-        valueSource: {
-          kind: 'native_resource',
-          resourceCode: 'colleges',
-          labelField: 'name',
-          enabledField: 'enabled',
-        },
-      },
-    ],
-    dataPolicies: [
-      {
-        code: 'instrument-access',
-        name: '仪器数据范围',
-        resourceCode: 'instruments',
-        unrestrictedRoleCodes: ['school_admin'],
-        matchMode: 'OR',
-        rules: [
-          { dimensionCode: 'college', field: 'collegeId', roleCodes: ['college_admin'] },
-          { subject: 'current_user', field: 'instrumentAdminIds', roleCodes: ['instrument_admin'] },
-        ],
-      },
-    ],
+    capabilities: [],
+    roles: [],
+    scopeDimensions: [],
+    scopeSources: [],
+    dataPolicies: [],
+    authorizationTransitions: [],
   },
-  data: { resources: [colleges, instruments] },
+  data: { resources: [] },
+  events: { subscriptions: [], timers: [] },
+  workflows: { definitions: [], bindings: [], activations: [], providers: [], editableParameters: [] },
 });

package/template/package.json

@@ -21,9 +21,9 @@
     "build": "pnpm --recursive build"
   },
   "devDependencies": {
-    "openxiangda-cli": "2.0.0-alpha.60",
-    "openxiangda-contracts": "2.0.0-alpha.28",
-    "openxiangda-devkit-core": "2.0.0-alpha.36",
+    "openxiangda-cli": "2.0.0-alpha.62",
+    "openxiangda-contracts": "2.0.0-alpha.30",
+    "openxiangda-devkit-core": "2.0.0-alpha.38",
     "typescript": "5.9.3"
   }
 }

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

@@ -1,31 +1,11 @@
 // Generated by OpenXiangda 2.0 Native compiler. Do not edit by hand.
 export const compilerContractVersion = "native-2" as const;
-export const appCode = "instrument-center" as const;
-export const resourceCodes = [
-  "colleges",
-  "instruments"
-] as const;
+export const appCode = "openxiangda-application" as const;
+export const resourceCodes = [] as const;
+export const resourceSurfaces = {} as const;
+export const resourceDefinitions = {} as const;
 export const capabilities = [
-  "app:instrument-center:data:colleges:create",
-  "app:instrument-center:data:colleges:delete",
-  "app:instrument-center:data:colleges:read",
-  "app:instrument-center:data:colleges:update",
-  "app:instrument-center:data:instruments:create",
-  "app:instrument-center:data:instruments:delete",
-  "app:instrument-center:data:instruments:read",
-  "app:instrument-center:data:instruments:update",
-  "app:instrument-center:directory:read",
-  "app:instrument-center:instrument:context:read",
-  "app:instrument-center:instrument:field:asset-code:create",
-  "app:instrument-center:instrument:field:asset-code:update",
-  "app:instrument-center:instrument:field:asset-value:create",
-  "app:instrument-center:instrument:field:asset-value:update",
-  "app:instrument-center:instrument:field:college-id:create",
-  "app:instrument-center:instrument:field:college-id:update",
-  "app:instrument-center:instrument:field:instrument-admin-ids:create",
-  "app:instrument-center:instrument:field:instrument-admin-ids:update",
-  "app:instrument-center:instrument:field:instrument-code:create",
-  "app:instrument-center:instrument:field:instrument-code:update",
+  "app:openxiangda-application:directory:read",
   "app:role:assign",
   "app:role:define",
   "app:role:grant-capability",
@@ -33,71 +13,8 @@ export const capabilities = [
   "app:scope-grant:manage",
   "app:super-admin:manage"
 ] as const;
-export const appOperations = {
-  instrumentContextInspect: {
-    "code": "instrument-context.inspect",
-    "method": "GET",
-    "path": "/api/instruments/context",
-    "requiredCapability": "app:instrument-center:instrument:context:read",
-    "requestSchemaDigest": "cd1a463c46d6264134447db17a8c3c7abe5b9a2488c6d759fea66da1f96b133e",
-    "responseSchemaDigest": "a2c799262a3ce3c19ef5cdd983bf3d12b43ab3c426227091b909dcb7054738c0"
-  }
-} as const;
-export const appRoutes = {
-  colleges: {
-    "code": "colleges",
-    "path": "/colleges",
-    "label": "学院字典",
-    "surface": "admin",
-    "navigation": "menu",
-    "capability": "app:instrument-center:data:colleges:read",
-    "tabPersistence": "session",
-    "keepAlive": "none"
-  },
-  instrumentCreate: {
-    "code": "instrument-create",
-    "path": "/instruments/new",
-    "label": "新增仪器",
-    "surface": "admin",
-    "navigation": "hidden",
-    "parentCode": "instruments",
-    "capability": "app:instrument-center:data:instruments:create",
-    "tabPersistence": "session",
-    "keepAlive": "none"
-  },
-  instrumentDetail: {
-    "code": "instrument-detail",
-    "path": "/instruments/:id",
-    "label": "仪器详情",
-    "surface": "admin",
-    "navigation": "hidden",
-    "parentCode": "instruments",
-    "capability": "app:instrument-center:data:instruments:read",
-    "tabPersistence": "none",
-    "keepAlive": "none"
-  },
-  instrumentEdit: {
-    "code": "instrument-edit",
-    "path": "/instruments/:id/edit",
-    "label": "编辑仪器",
-    "surface": "admin",
-    "navigation": "hidden",
-    "parentCode": "instruments",
-    "capability": "app:instrument-center:data:instruments:update",
-    "tabPersistence": "none",
-    "keepAlive": "none"
-  },
-  instruments: {
-    "code": "instruments",
-    "path": "/instruments",
-    "label": "仪器资源",
-    "surface": "admin",
-    "navigation": "menu",
-    "capability": "app:instrument-center:data:instruments:read",
-    "tabPersistence": "session",
-    "keepAlive": "none"
-  }
-} as const;
+export const appOperations = {} as const;
+export const appRoutes = {} as const;
 export const eventTypes = [] as const;
 export const eventSubscriptionCodes = [] as const;
 export const workflowCodes = [] as const;
@@ -109,43 +26,3 @@ export type AppRoute = (typeof appRoutes)[keyof typeof appRoutes];
 export type EventType = (typeof eventTypes)[number];
 export type EventSubscriptionCode = (typeof eventSubscriptionCodes)[number];
 export type WorkflowCode = (typeof workflowCodes)[number];
-
-export interface CollegesRecord {
-  id: string;
-  revision: number;
-  name: string;
-  enabled: boolean;
-}
-
-export interface InstrumentsRecord {
-  id: string;
-  revision: number;
-  instrumentCode: string;
-  chineseName: string;
-  englishName?: string | null;
-  aliasName?: string | null;
-  image?: string | null;
-  specModel: string;
-  categoryId: string;
-  instrumentSource?: string | null;
-  manufacturer?: string | null;
-  assetCode: string;
-  assetValue?: number | null;
-  enabledDate: string;
-  usageStatus: string;
-  instrumentStatus: string;
-  openToOutside: boolean;
-  subjectAreas?: unknown | null;
-  platformProperty?: string | null;
-  collegeId: string;
-  manageDepartmentId: string;
-  useDepartmentId: string;
-  instrumentAdminIds: unknown;
-  contactUserIds: unknown;
-  contactPhone: string;
-  contactEmail?: string | null;
-  locationId?: string | null;
-  address?: string | null;
-  serviceContent?: string | null;
-  attachments?: string | null;
-}

package/template/apps/server/src/instrument-context.controller.ts

@@ -1,25 +0,0 @@
-import { Controller, Get, UseGuards } from '@nestjs/common';
-import { appOperations } from '@app/contracts';
-import {
-  CurrentUser,
-  OpenXiangdaAuthzGuard,
-  OpenXiangdaOperation,
-  type OpenXiangdaCurrentUser,
-} from 'openxiangda-nest';
-
-@Controller('api/instruments')
-@UseGuards(OpenXiangdaAuthzGuard)
-export class InstrumentContextController {
-  @Get('context')
-  @OpenXiangdaOperation(appOperations.instrumentContextInspect)
-  inspect(@CurrentUser() user: OpenXiangdaCurrentUser) {
-    // Intentionally read-only: this demonstrates local Nest business actions
-    // without wrapping Data API CRUD.
-    return {
-      userId: user.userId,
-      roleCodes: user.roleCodes,
-      capabilityCodes: user.capabilityCodes,
-      environmentKey: user.environmentKey,
-    };
-  }
-}