openxiangda-devkit-core 2.48.2 → 2.51.1

package/dist/compiler/config.js

@@ -1,5 +1,10 @@
+import { assertWorkflowNativeStagePolicy } from 'openxiangda-contracts';
+import { validateAuthenticatedPublicRead, AuthenticatedPublicReadContractError } from 'openxiangda-contracts/native-compiler';
+import { DATE_EVENT_RESERVED_DATA_FIELDS_V2, dateEventProjectionFieldsV2, dateEventProjectionEnvelopeSchemaV2 } from 'openxiangda-contracts/native-compiler';
 import { validateUserCandidateReferences, validateWorkflowUserCandidateBindings, UserCandidateContractError } from 'openxiangda-contracts';
 import { parseNativeUniqueKeys, DATA_SUBTABLE_MAX_TOTAL_ROWS } from 'openxiangda-contracts';
+import { assertWorkflowOwnedSubjectCreate } from 'openxiangda-contracts';
+export { workflowBusinessCommandInvocationSchema } from 'openxiangda-contracts';
 import { validateManagedConcurrency } from 'openxiangda-contracts/native-compiler';
 import { normalizeDecimalReservationEventDeclaration, decimalReservationEventContext } from 'openxiangda-contracts';
 import { materializeApplicationModules } from './application-model.js';
@@ -18,14 +23,7 @@ import { AUTHORIZATION_TRANSITION_CAPABILITY_CODE_PATTERN, AUTHORIZATION_TRANSIT
 // The compiler owns the application source contract. Devkit and every adapter
 // re-export this module instead of maintaining separate configuration models.
 import { validateWorkflowBinding, validateWorkflowDefinition, } from '../internal/workflow.js';
-const DATE_TRIGGER_RESERVED_DATA_FIELDS = new Set([
-    'triggerCode',
-    'resourceCode',
-    'recordId',
-    'recordRevision',
-    'field',
-    'dueAt',
-]);
+const DATE_TRIGGER_RESERVED_DATA_FIELDS = new Set(DATE_EVENT_RESERVED_DATA_FIELDS_V2);
 const APP_DATA_FIELD_TYPES = new Set(DATA_FIELD_TYPES);
 const WORKFLOW_RUNTIME_CODE_PATTERN = /^[a-z][a-z0-9-]{2,63}$/;
 function adminNavigationItem(page, options = {}) {
@@ -1452,6 +1450,7 @@ export function validateAppConfig(value) {
                 'name',
                 'resourceCode',
                 'unrestrictedRoleCodes',
+                'publicRead',
                 'operations',
                 'matchMode',
                 'rules',
@@ -1494,6 +1493,20 @@ export function validateAppConfig(value) {
             if (!/^[a-z][a-z0-9]*(?:-[a-z0-9]+)*$/.test(string(policy.resourceCode))) {
                 diagnostics.push(diagnostic('APP_CONFIG_AUTHZ_POLICY_RESOURCE_REQUIRED', 'data policy 必须声明唯一目标 resourceCode', `authz.dataPolicies[${index}].resourceCode`));
             }
+            if (policy.publicRead !== undefined) {
+                const resource = dataResources.map(object).find(resource => resource.code === policy.resourceCode);
+                const baseline = roles.map(object).find(role => role.code === authenticatedUserRoleCode);
+                try {
+                    validateAuthenticatedPublicRead({ policy, resource, baselineRoleCode: authenticatedUserRoleCode,
+                        baselineCapabilities: Array.isArray(baseline?.capabilities) ? baseline.capabilities : [],
+                        baselineDeniedCapabilities: Array.isArray(baseline?.deniedCapabilities) ? baseline.deniedCapabilities : [], pointer: policyPath });
+                }
+                catch (error) {
+                    if (!(error instanceof AuthenticatedPublicReadContractError))
+                        throw error;
+                    diagnostics.push(diagnostic(error.code, '认证公共投影必须闭合公共字段，所有非公开字段与历史继续拒绝基线成员', error.pointer));
+                }
+            }
             if (policy.unrestrictedRoleCodes !== undefined) {
                 const unrestrictedRoleCodes = Array.isArray(policy.unrestrictedRoleCodes)
                     ? policy.unrestrictedRoleCodes
@@ -2012,6 +2025,16 @@ export function validateAppConfig(value) {
         const field = string(trigger.field);
         const fieldType = eventResourceFields.get(resourceCode)?.get(field);
         const payload = object(trigger.payload);
+        let projectionFields = [];
+        let generatedSchema = applicationEventSchemas.get(string(trigger.eventType));
+        try {
+            projectionFields = dateEventProjectionFieldsV2(resourceCode, (Array.isArray(events.subscriptions) ? events.subscriptions : []).map(object)
+                .filter(subscription => Array.isArray(subscription.eventTypes) && subscription.eventTypes.includes(trigger.eventType)), eventDataResources.map(object).find(resource => resource.code === resourceCode));
+            generatedSchema = dateEventProjectionEnvelopeSchemaV2(generatedSchema, projectionFields);
+        }
+        catch (error) {
+            diagnostics.push(diagnostic('APP_CONFIG_DATE_TRIGGER_PROJECTION_INVALID', `日期事件资料投影无效：${error instanceof Error ? error.message : 'invalid'}`, path));
+        }
         let payloadBytes = Number.POSITIVE_INFINITY;
         try {
             payloadBytes = Buffer.byteLength(JSON.stringify(trigger.payload || {}), 'utf8');
@@ -2030,7 +2053,7 @@ export function validateAppConfig(value) {
             Array.isArray(trigger.payload) ||
             payloadBytes > 64 * 1024 ||
             Object.keys(payload).some(key => DATE_TRIGGER_RESERVED_DATA_FIELDS.has(key)) ||
-            !eventDataMatchesSchema(applicationEventSchemas.get(string(trigger.eventType)), {
+            !eventDataMatchesSchema(generatedSchema, {
                 ...payload,
                 triggerCode: code,
                 resourceCode,
@@ -2038,6 +2061,7 @@ export function validateAppConfig(value) {
                 recordRevision: 1,
                 field,
                 dueAt: '2026-01-01T00:00:00.000Z',
+                ...(projectionFields.length ? { projection: {} } : {}),
             })) {
             diagnostics.push(diagnostic('APP_CONFIG_DATE_TRIGGER_INVALID', 'dateTrigger 必须使用唯一 code、date/datetime 字段、十年内 ISO-8601 offset、已注册应用事件、无保留字段且完整生成数据满足 JSON Schema', path));
         }
@@ -2388,6 +2412,11 @@ export function validateAppConfig(value) {
                     const property = workflowInputProperties[factKey];
                     const propertyRecord = isRecord(property) ? property : {};
                     const propertyType = string(propertyRecord.type);
+                    const nullableObject = Array.isArray(propertyRecord.type) &&
+                        propertyRecord.type.length === 2 &&
+                        new Set(propertyRecord.type).size === 2 &&
+                        propertyRecord.type.includes('object') &&
+                        propertyRecord.type.includes('null');
                     const itemRecord = isRecord(propertyRecord.items)
                         ? propertyRecord.items
                         : {};
@@ -2400,14 +2429,14 @@ export function validateAppConfig(value) {
                         ? 'array（items.type=array，items.items.type=object）'
                         : fieldType.endsWith('.multiple')
                             ? 'array（items.type=object）'
-                            : 'object';
+                            : 'object 或 [object, null]';
                     const shapeValid = fieldType === 'cascade.multiple'
                         ? propertyType === 'array' &&
                             itemType === 'array' &&
                             nestedItemType === 'object'
                         : fieldType.endsWith('.multiple')
                             ? propertyType === 'array' && itemType === 'object'
-                            : propertyType === 'object';
+                            : propertyType === 'object' || nullableObject;
                     if (!shapeValid) {
                         diagnostics.push(diagnostic('APP_CONFIG_WORKFLOW_FACT_PROJECTION_SHAPE_INVALID', `fact "${factKey}" 投影的字段 ${fieldCode} 是 ${fieldType} 快照字段；inputSchema.properties.${factKey} 必须声明 ${expected}`, `${path}.definition.inputSchema.properties.${factKey}`));
                     }
@@ -2800,15 +2829,38 @@ function validateBackendOperations(rawOperations, declaredResources, declaredRes
                 'roleAssertions',
                 'decimalReservation',
                 'dataCommands',
+                'workflowStage',
                 'recordEdit',
+                'ownedSubject',
             ]);
             let invalid = !isRecord(operation.platformAccess) ||
                 Object.keys(access).length === 0 ||
                 Object.keys(access).some(key => !allowedAccessKeys.has(key));
+            if (access.ownedSubject !== undefined) {
+                try {
+                    assertWorkflowOwnedSubjectCreate(access.ownedSubject);
+                }
+                catch {
+                    invalid = true;
+                }
+                invalid ||= access.workflow === undefined || access.decimalReservation !== undefined;
+            }
             if (access.dataCommands !== undefined) {
                 const commands = object(access.dataCommands);
                 invalid ||= commands.mode !== 'recoverable-native' || Object.keys(commands).some(key => key !== 'mode');
             }
+            if (access.workflowStage !== undefined) {
+                try {
+                    assertWorkflowNativeStagePolicy(access.workflowStage);
+                }
+                catch {
+                    invalid = true;
+                }
+                const stage = object(access.workflowStage);
+                invalid ||= object(access.dataCommands).mode !== 'recoverable-native' || access.decimalReservation !== undefined ||
+                    !declaredResources.has(string(stage.resourceCode)) || !declaredWorkflowCodes.has(string(stage.workflowCode)) ||
+                    !Array.isArray(object(access.workflow).codes) || !object(access.workflow).codes.includes(stage.workflowCode);
+            }
             if (access.recordEdit !== undefined) {
                 const edit = object(access.recordEdit);
                 const fields = Array.isArray(edit.fieldCodes) ? edit.fieldCodes : [];
@@ -2822,7 +2874,8 @@ function validateBackendOperations(rawOperations, declaredResources, declaredRes
                 const roles = Array.isArray(assertion.roleCodes) ? assertion.roleCodes : [];
                 invalid ||= !isRecord(access.roleAssertions) || roles.length < 1 || roles.length > 20 ||
                     new Set(roles).size !== roles.length || roles.some(role => !declaredRoleCodes.has(string(role))) ||
-                    Object.keys(assertion).some(key => key !== 'roleCodes');
+                    Object.keys(assertion).some(key => !['roleCodes', 'actorAuthority'].includes(key)) ||
+                    (Object.hasOwn(assertion, 'actorAuthority') && assertion.actorAuthority !== true);
             }
             if (access.directory !== undefined) {
                 const directory = object(access.directory);
@@ -2937,8 +2990,8 @@ function validateBackendOperations(rawOperations, declaredResources, declaredRes
                         Object.keys(workflow).some(key => !['codes', 'businessCommands'].includes(key));
                 if (workflow.businessCommands !== undefined) {
                     const commands = workflow.businessCommands;
-                    invalid ||= !Array.isArray(commands) || commands.length === 0 || commands.length > 3 ||
-                        new Set(commands).size !== commands.length || commands.some(command => !['approve', 'reject', 'withdraw'].includes(command));
+                    invalid ||= !Array.isArray(commands) || commands.length === 0 || commands.length > 4 ||
+                        new Set(commands).size !== commands.length || commands.some(command => !['approve', 'reject', 'withdraw', 'resubmit'].includes(command));
                 }
             }
             if (access.decimalReservation !== undefined) {
@@ -5043,6 +5096,11 @@ export function validateAppDeclaration(value) {
                 return;
             const path = `data.resources[${declaration.resourceIndex}].fields[${fieldIndex}].subtable`;
             const subtable = object(field.subtable);
+            if (subtable.minRows !== undefined &&
+                (!Number.isSafeInteger(subtable.minRows) || Number(subtable.minRows) < 0 ||
+                    Number(subtable.minRows) > Number(subtable.maxRows ?? 20))) {
+                diagnostics.push(diagnostic('APP_CONFIG_DATA_SUBTABLE_MIN_ROWS_INVALID', '子表 minRows 必须是非负整数且不能超过 maxRows（默认20）', `${path}.minRows`));
+            }
             const targetCode = string(subtable.resourceCode);
             const target = declaredResources.get(targetCode);
             if (!target || targetCode === resourceCode) {