openxiangda-devkit-core 2.0.0-alpha.107 → 2.0.0-alpha.109

package/dist/compiler/config.js

@@ -1,3 +1,4 @@
+import { materializeApplicationModules } from './application-model.js';
 import { SCHEMA_VERSIONS, DATA_FIELD_TYPES, PLATFORM_EVENT_TYPES_V2, nativePlatformCapabilityCatalog, validateDataResource, WORKFLOW_SUMMARY_MAX_FIELDS, WORKFLOW_SUMMARY_TEXT_LONG_MAX_BYTES, isWorkflowSummaryFieldType, } from 'openxiangda-contracts';
 import { Ajv2020 } from 'ajv/dist/2020.js';
 import { CronExpressionParser } from 'cron-parser';
@@ -33,8 +34,9 @@ export function defineAdminNavigation(groups) {
 export function adminNavigationGroup(code, label, items, options = {}) {
     return Object.freeze({ code, label, items: Object.freeze([...items]), ...options });
 }
-export function adminResourcePage(resourceCode, options) {
-    return adminNavigationItem({ kind: 'resource', resourceCode }, options);
+export function adminResourcePage(resourceCode, options = {}) {
+    const { viewCode, ...display } = options;
+    return adminNavigationItem({ kind: 'resource', resourceCode, ...(viewCode ? { viewCode } : {}) }, display);
 }
 export function adminOperationPage(routeCode, options) {
     return adminNavigationItem({ kind: 'operation', routeCode }, options);
@@ -92,10 +94,18 @@ function normalizeLegacyUserSurfaceAuthoring(declaration) {
 export function suggestAdminNavigation(config) {
     const groups = [];
     const resources = [...(config.data?.resources || [])]
-        .filter(resource => resource.surface?.generated?.list !== false)
         .sort((left, right) => left.code < right.code ? -1 : left.code > right.code ? 1 : 0);
-    if (resources.length > 0) {
-        groups.push(adminNavigationGroup('data-management', '数据管理', resources.map(resource => adminResourcePage(resource.code, { label: resource.name })), { icon: 'database', order: 100 }));
+    const resourceItems = resources.flatMap(resource => [
+        ...(resource.surface?.generated?.list !== false
+            ? [adminResourcePage(resource.code, { label: resource.name })]
+            : []),
+        ...[...(resource.surface?.views || [])]
+            .filter(view => view.generated.list !== false)
+            .sort((left, right) => left.code.localeCompare(right.code, 'en'))
+            .map(view => adminResourcePage(resource.code, { viewCode: view.code, label: view.name })),
+    ]);
+    if (resourceItems.length > 0) {
+        groups.push(adminNavigationGroup('data-management', '数据管理', resourceItems, { icon: 'database', order: 100 }));
     }
     const routes = [...(config.frontend.routes || [])]
         .filter(route => route.surface === 'admin' && !/[:*]/.test(route.path))
@@ -107,6 +117,9 @@ export function suggestAdminNavigation(config) {
 }
 function renderAdminNavigationOptions(options) {
     const entries = [
+        ...(options.viewCode !== undefined
+            ? [`viewCode: ${JSON.stringify(options.viewCode)}`]
+            : []),
         ...(options.label !== undefined
             ? [`label: ${JSON.stringify(options.label)}`]
             : []),
@@ -127,7 +140,9 @@ export function renderAdminNavigationSuggestion(config) {
     const groups = navigation.map(group => {
         imports.add('adminNavigationGroup');
         const items = group.items.map(item => {
-            const options = renderAdminNavigationOptions(item);
+            const options = renderAdminNavigationOptions({ ...item,
+                ...(item.page.kind === 'resource' && item.page.viewCode ? { viewCode: item.page.viewCode } : {}),
+            });
             let expression;
             switch (item.page.kind) {
                 case 'resource':
@@ -605,7 +620,6 @@ export function backendRuntimeRequired(config) {
                 config.events?.subscriptions?.length ||
                 config.events?.timers?.length ||
                 config.events?.dateTriggers?.length ||
-                config.workflows?.activations?.length ||
                 config.workflows?.providers?.length)));
 }
 function object(value) {
@@ -870,10 +884,8 @@ export function validateAppConfig(value) {
             Array.isArray(eventConfig.timers) && eventConfig.timers.length > 0 ||
             Array.isArray(eventConfig.dateTriggers) &&
                 eventConfig.dateTriggers.length > 0 ||
-            Array.isArray(workflowConfig.activations) &&
-                workflowConfig.activations.length > 0 ||
             Array.isArray(workflowConfig.providers) && workflowConfig.providers.length > 0)) {
-        diagnostics.push(diagnostic('APP_CONFIG_BACKEND_DISABLED_WITH_DECLARATIONS', 'backend.enabled=false 时不能声明后端操作、Secret、事件或工作流运行时', 'backend.enabled'));
+        diagnostics.push(diagnostic('APP_CONFIG_BACKEND_DISABLED_WITH_DECLARATIONS', 'backend.enabled=false 时不能声明后端操作、Secret、事件消费者或工作流人员提供器', 'backend.enabled'));
     }
     const secretNames = new Set();
     const secretEnvs = new Set();
@@ -2637,26 +2649,33 @@ function generatedPlatformRouteClaims(config) {
         const code = string(resource.code);
         if (!code)
             continue;
-        const surface = object(resource.surface);
-        const generated = object(surface.generated);
-        const native = !surface.mutationOwner || surface.mutationOwner === 'native';
-        const operations = {
-            list: generated.list === undefined ? true : generated.list === true,
-            detail: generated.detail === undefined ? true : generated.detail === true,
-            create: generated.create === undefined ? native : generated.create === true,
-            update: generated.update === undefined ? native : generated.update === true,
-        };
-        const base = `/admin/resources/${code}`;
-        const candidates = [
-            ['list', base],
-            ['detail', `${base}/:id`],
-            ['create', `${base}/new`],
-            ['update', `${base}/:id/edit`],
-        ];
-        for (const [operation, path] of candidates) {
-            if (!operations[operation])
-                continue;
-            claims.push({ owner: `resource:${code}:${operation}`, path }, { owner: `resource:${code}:${operation}:mobile`, path: `/m${path}` });
+        const resourceSurface = object(resource.surface);
+        for (const selected of [resourceSurface, ...(Array.isArray(resourceSurface.views) ? resourceSurface.views.map(object) : [])]) {
+            const surface = { ...resourceSurface, ...selected };
+            const viewCode = string(selected.code);
+            const generated = object(surface.generated);
+            const native = !surface.mutationOwner || surface.mutationOwner === 'native';
+            const operations = {
+                list: generated.list === undefined ? true : generated.list === true,
+                detail: generated.detail === undefined ? true : generated.detail === true,
+                create: generated.create === undefined ? native : generated.create === true,
+                update: generated.update === undefined ? native : generated.update === true,
+            };
+            const base = `/admin/resources/${code}${viewCode ? `/views/${viewCode}` : ""}`;
+            const candidates = [
+                ['list', base],
+                ['detail', `${base}/:id`],
+                ['create', `${base}/new`],
+                ['update', `${base}/:id/edit`],
+            ];
+            for (const [operation, path] of candidates) {
+                if (!operations[operation])
+                    continue;
+                const owner = `resource:${code}${viewCode ? `:view:${viewCode}` : ''}:${operation}`;
+                claims.push({ owner, path });
+                if (object(surface.mobile).enabled !== false)
+                    claims.push({ owner: `${owner}:mobile`, path: `/m${path}` });
+            }
         }
     }
     const frontend = object(config.frontend);
@@ -3291,10 +3310,12 @@ function validateAdminNavigation(config, diagnostics) {
             if (kind === 'resource') {
                 const resourceCode = string(page.resourceCode);
                 const resource = resources.get(resourceCode);
-                pageKey = `resource:${resourceCode}:list`;
-                defaultLabel = resource?.name || '';
+                const viewCode = string(page.viewCode);
+                const view = resource?.surface?.views?.find((item) => item.code === viewCode);
+                pageKey = `resource:${resourceCode}${viewCode ? `:view:${viewCode}` : ""}:list`;
+                defaultLabel = (viewCode ? view?.name : resource?.name) || '';
                 internalCode = resourceCode;
-                exists = Boolean(resource?.surface?.generated?.list);
+                exists = Boolean(viewCode ? view?.generated?.list : resource?.surface?.generated?.list);
             }
             else if (kind === 'operation') {
                 const routeCode = string(page.routeCode);
@@ -3500,24 +3521,21 @@ export function resourceCapabilityCodes(appCode, resourceCode) {
         delete: `${prefix}:delete`,
     };
 }
-function materializeRoleCapabilities(config, role) {
+function materializeRoleCapabilities(role) {
     const capabilities = new Set(role.capabilities);
-    for (const resource of config.data?.resources || []) {
-        if (resource.surface?.mutationOwner !== 'native' ||
-            !capabilities.has(resource.capabilities.read)) {
-            continue;
-        }
-        for (const operation of ['create', 'update', 'delete']) {
-            if (resource.surface?.generated?.[operation] === true) {
-                capabilities.add(resource.capabilities[operation]);
-            }
-        }
-    }
     for (const denied of role.deniedCapabilities || []) {
         capabilities.delete(denied);
     }
     return [...capabilities].sort();
 }
+/** Explicit business permission preset; adding a page never changes grants. */
+export function resourceRoleCapabilities(appCode, resourceCode, access) {
+    const codes = resourceCapabilityCodes(appCode, resourceCode);
+    const operations = access === 'manage'
+        ? ['read', 'create', 'update', 'delete']
+        : access === 'read' ? ['read'] : access;
+    return [...new Set(operations.map(operation => codes[operation]))].sort();
+}
 export function currentUserDataPolicy(input) {
     return {
         code: input.code,
@@ -3609,9 +3627,12 @@ export function materializeDataResource(appCode, declaration) {
         physicalPlanForField(definition, field.searchable === true);
         return definition;
     });
-    const visible = declaration.fields
-        .filter(field => field.list !== false)
-        .slice(0, 8);
+    const listCandidates = declaration.fields
+        .filter(field => field.list !== false && (field.hidden ?? field.system) !== true);
+    const visible = declaration.list?.fields
+        ? declaration.list.fields.flatMap(code => listCandidates.filter(field => field.code === code))
+        : listCandidates.slice(0, 8);
+    const defaultSortField = visible.find(field => supportsSort(field.type));
     const searchableFields = declaration.fields
         .filter(field => field.searchable === true)
         .map(field => field.code);
@@ -3634,6 +3655,7 @@ export function materializeDataResource(appCode, declaration) {
         return [capabilities[operation]];
     };
     const surface = {
+        ...(declaration.views?.length ? { views: declaration.views } : {}),
         mutationOwner,
         generated,
         fields: Object.fromEntries(declaration.fields.map(field => [
@@ -3645,6 +3667,9 @@ export function materializeDataResource(appCode, declaration) {
                 ...(field.section ? { section: field.section } : {}),
                 ...(field.required === true ? { requiredHint: true } : {}),
                 ...(field.system !== undefined ? { system: field.system } : {}),
+                ...(field.hidden !== undefined || field.system
+                    ? { hidden: field.hidden ?? true }
+                    : {}),
                 readCapabilities: access(field, 'read'),
                 createCapabilities: access(field, 'create'),
                 updateCapabilities: access(field, 'update'),
@@ -3678,22 +3703,23 @@ export function materializeDataResource(appCode, declaration) {
             },
         ])),
         list: {
+            fieldOrder: visible.map(field => field.code),
             defaultPageSize: declaration.list?.defaultPageSize || 20,
             ...(searchableFields.length ? { searchableFields } : {}),
             ...(filterFields.length ? { filterFields } : {}),
             ...(declaration.list?.defaultSort
                 ? { defaultSort: declaration.list.defaultSort }
-                : visible[0]
-                    ? { defaultSort: { field: visible[0].code, order: 'asc' } }
+                : defaultSortField
+                    ? { defaultSort: { field: defaultSortField.code, order: 'asc' } }
                     : {}),
         },
         form: {
             layout: declaration.form?.layout || 'flat',
-            fieldOrder: declaration.fields.map(field => field.code),
+            fieldOrder: declaration.form?.fields || declaration.fields.map(field => field.code),
         },
         detail: {
             layout: declaration.detail?.layout || 'flat',
-            fieldOrder: declaration.fields.map(field => field.code),
+            fieldOrder: declaration.detail?.fields || declaration.fields.map(field => field.code),
         },
         mobile: declaration.mobile || { enabled: true },
     };
@@ -3730,6 +3756,7 @@ export function validateAppDeclaration(value) {
     const resources = Array.isArray(data.resources) ? data.resources : [];
     const diagnostics = [];
     const resourceKeys = new Set([
+        'views',
         'code',
         'name',
         'mutationOwner',
@@ -3764,6 +3791,7 @@ export function validateAppDeclaration(value) {
         'widget',
         'section',
         'system',
+        'hidden',
         'list',
         'filter',
         'searchable',
@@ -3843,12 +3871,6 @@ export function validateAppDeclaration(value) {
                 else if (!rangeType && field.rangeBoundary !== undefined) {
                     diagnostics.push(diagnostic('APP_CONFIG_DATA_FIELD_RANGE_BOUNDARY_TYPE_INVALID', 'rangeBoundary 只能用于 date-range 或 datetime-range', `${fieldPath}.rangeBoundary`));
                 }
-                if (field.indexed === false &&
-                    (field.filter === true ||
-                        field.searchable === true ||
-                        field.sortable === true)) {
-                    diagnostics.push(diagnostic('APP_CONFIG_DATA_FIELD_INDEX_REQUIRED', '启用筛选、搜索或排序时不能显式关闭索引', `${fieldPath}.indexed`));
-                }
                 if (['radio', 'checkbox'].includes(widget) &&
                     object(field.source).loadMode !== 'all' &&
                     field.source !== undefined) {
@@ -3862,6 +3884,7 @@ export function validateAppDeclaration(value) {
                 'required',
                 'indexed',
                 'system',
+                'hidden',
                 'list',
                 'filter',
                 'searchable',
@@ -3890,6 +3913,27 @@ export function validateAppDeclaration(value) {
             if (code)
                 declaredCodes.add(code);
         });
+        for (const view of ['list', 'form', 'detail']) {
+            const selected = object(resource[view]).fields;
+            if (selected === undefined)
+                continue;
+            if (!Array.isArray(selected) || new Set(selected).size !== selected.length ||
+                selected.some(code => typeof code !== 'string' || !declaredCodes.has(code))) {
+                diagnostics.push(diagnostic('APP_CONFIG_DATA_VIEW_FIELDS_INVALID', '列表/表单/详情 fields 必须是当前资源中不重复的字段列表', `${resourcePath}.${view}.fields`));
+                materializable = false;
+            }
+        }
+        const selectedFormFields = object(resource.form).fields ?? fields.map(raw => object(raw).code);
+        if (Array.isArray(selectedFormFields) && (generated.create ?? mutationOwner === 'native')) {
+            for (const rawField of fields) {
+                const field = object(rawField);
+                if (field.required === true && field.system !== true &&
+                    supportsGeneratedMutation({ type: field.type, system: false }) &&
+                    object(field.access).create !== false && (field.hidden === true || !selectedFormFields.includes(field.code))) {
+                    diagnostics.push(diagnostic('APP_CONFIG_DATA_FORM_REQUIRED_FIELD_MISSING', `标准新增表单缺少必填字段 ${field.label || field.code}；请加入表单或关闭标准新增`, `${resourcePath}.form.fields`));
+                }
+            }
+        }
         for (const operation of ['create', 'update']) {
             const enabled = generated[operation] ?? mutationOwner === 'native';
             const writable = fields.some(rawField => {
@@ -3911,6 +3955,19 @@ export function validateAppDeclaration(value) {
         }
         if (appCode && fields.length && materializable) {
             const canonical = materializeDataResource(appCode, rawResource);
+            for (const [viewIndex, view] of (canonical.surface?.views || []).entries()) {
+                for (const [property, values, supports] of [
+                    ['searchableFields', view.list?.searchableFields || [], supportsSearch],
+                    ['filterFields', view.list?.filterFields || [], supportsFilter],
+                    ['defaultSort', view.list?.defaultSort ? [view.list.defaultSort.field] : [], supportsSort],
+                ]) {
+                    for (const code of values) {
+                        const field = canonical.schema.fields.find(field => field.code === code);
+                        if (!field || !supports(field.type))
+                            diagnostics.push(diagnostic('APP_CONFIG_DATA_VIEW_QUERY_FIELD_INVALID', '视图查询字段不存在或不支持此查询类型', `${resourcePath}.views[${viewIndex}].list.${property}`));
+                    }
+                }
+            }
             diagnostics.push(...validateDataResource(canonical).map(item => ({
                 ...item,
                 path: `${resourcePath}.${item.path}`,
@@ -3978,7 +4035,27 @@ export function validateAppDeclaration(value) {
     return diagnostics;
 }
 export function defineOpenXiangdaApp(declaration) {
-    const normalizedDeclaration = normalizeLegacyUserSurfaceAuthoring(declaration);
+    const { modules, ...input } = declaration;
+    const projected = materializeApplicationModules(modules || []);
+    if (projected.diagnostics.length)
+        throw new AppConfigValidationError(projected.diagnostics);
+    const normalizedDeclaration = normalizeLegacyUserSurfaceAuthoring({
+        ...input,
+        schemaVersion: declaration.schemaVersion ?? 3,
+        frontend: { root: 'apps/web', ...declaration.frontend },
+        backend: {
+            root: 'apps/server', runtime: 'node', framework: 'nestjs',
+            enabled: Boolean(declaration.backend?.operations?.length || declaration.backend?.secrets?.length ||
+                declaration.events?.subscriptions?.length || declaration.events?.timers?.length ||
+                declaration.events?.dateTriggers?.length ||
+                declaration.workflows?.providers?.length),
+            ...declaration.backend,
+        },
+        platform: { root: 'platform', ...declaration.platform },
+        ...(modules || declaration.data ? {
+            data: { resources: [...(declaration.data?.resources || []), ...projected.resources] },
+        } : {}),
+    });
     const declarationDiagnostics = validateAppDeclaration(normalizedDeclaration);
     if (declarationDiagnostics.length > 0) {
         throw new AppConfigValidationError(declarationDiagnostics);
@@ -4001,7 +4078,7 @@ export function defineOpenXiangdaApp(declaration) {
                 ...materialized.authz,
                 roles: materialized.authz.roles.map(role => ({
                     ...role,
-                    capabilities: materializeRoleCapabilities(materialized, role),
+                    capabilities: materializeRoleCapabilities(role),
                 })),
             },
         }