openxiangda-devkit-core 2.62.1 → 2.63.1

package/dist/compiler/config.js

@@ -1,3 +1,4 @@
+import { workflowAssignmentLeafBinding, workflowAssignmentLeaves, workflowBindingRoleCodes, validateWorkflowConditionalAssignmentShape } from 'openxiangda-contracts';
 import { compileApplicationAgentsV2, NativeApplicationAgentContractError } from 'openxiangda-contracts/native-compiler';
 import { normalizeDataMutationGrants } from 'openxiangda-contracts';
 import { parseNativeParentReadPolicy, validateNativeParentReadPolicies, NativeParentReadPolicyError, NativeDataPolicyExpressionV2Error } from 'openxiangda-contracts/native-compiler';
@@ -640,7 +641,7 @@ export function backendRuntimeRequired(config) {
         (backend.enabled !== false &&
             Boolean(backend.operations?.length ||
                 backend.secrets?.length ||
-                config.events?.subscriptions?.some(item => !item.execution) ||
+                config.events?.subscriptions?.some(item => item.execution?.kind !== 'native-data') ||
                 config.events?.timers?.length ||
                 config.events?.dateTriggers?.length ||
                 config.workflows?.providers?.length ||
@@ -947,7 +948,7 @@ export function validateAppConfig(value) {
         (Array.isArray(backend.operations) && backend.operations.length > 0 ||
             Array.isArray(backend.secrets) && backend.secrets.length > 0 ||
             Array.isArray(eventConfig.subscriptions) &&
-                eventConfig.subscriptions.some(item => !object(item).execution) ||
+                eventConfig.subscriptions.some(item => object(object(item).execution).kind !== 'native-data') ||
             Array.isArray(eventConfig.timers) && eventConfig.timers.length > 0 ||
             Array.isArray(eventConfig.dateTriggers) &&
                 eventConfig.dateTriggers.length > 0 ||
@@ -2531,6 +2532,20 @@ export function validateAppConfig(value) {
             if (bindingByKey.has(key)) {
                 diagnostics.push(diagnostic('APP_CONFIG_WORKFLOW_BINDING_DUPLICATE', `Workflow binding 重复: ${key}`, path));
             }
+            const declaredRoles = new Set((Array.isArray(authz.roles) ? authz.roles : []).map(item => string(object(item).code)));
+            for (const [code, entry] of Object.entries(binding.bindings || {})) {
+                if (entry.provider !== 'conditional')
+                    continue;
+                const shape = validateWorkflowConditionalAssignmentShape(entry);
+                for (const error of shape)
+                    diagnostics.push(diagnostic('APP_CONFIG_WORKFLOW_BINDING_INVALID', error, `${path}.binding.bindings.${code}`));
+                if (shape.length)
+                    continue;
+                for (const leaf of workflowAssignmentLeaves(entry))
+                    for (const role of [...workflowBindingRoleCodes(leaf), ...Object.values(leaf.routing?.sources || {}).map(source => source.roleCode)])
+                        if (!declaredRoles.has(role))
+                            diagnostics.push(diagnostic('WORKFLOW_CONDITIONAL_ROLE_UNDECLARED', '条件人员来源引用了未声明的角色', `${path}.binding.bindings.${code}`));
+            }
             bindingByKey.set(key, binding);
         });
         const activationWorkflowCodes = new Set();
@@ -2575,6 +2590,8 @@ export function validateAppConfig(value) {
             for (const error of validateWorkflowBinding(definition, binding)) {
                 diagnostics.push(diagnostic('APP_CONFIG_WORKFLOW_BINDING_INVALID', error, path));
             }
+            if (Object.values(binding.bindings || {}).some(entry => entry.provider === 'conditional' && validateWorkflowConditionalAssignmentShape(entry).length))
+                return;
             try {
                 const resource = (Array.isArray(data.resources) ? data.resources : []).map(object).find(item => item.code === definition.subject.resourceCode);
                 const fields = object(resource?.schema).fields;
@@ -2595,7 +2612,7 @@ export function validateAppConfig(value) {
                 }
             }
         });
-        for (const error of validateWorkflowAssignmentRoutingBindings(activeRoutingBindings))
+        for (const error of validateWorkflowAssignmentRoutingBindings(activeRoutingBindings.map(workflowAssignmentLeafBinding)))
             diagnostics.push(diagnostic('APP_CONFIG_WORKFLOW_ROUTING_INVALID', error, 'workflows.activations'));
         editableParameters.forEach((item, index) => {
             const parameter = object(item);
@@ -5228,7 +5245,7 @@ export function defineOpenXiangdaApp(declaration) {
         backend: {
             root: 'apps/server', runtime: 'node', framework: 'nestjs',
             enabled: Boolean(declaration.backend?.operations?.length || declaration.backend?.secrets?.length ||
-                declaration.events?.subscriptions?.some(item => !item.execution) || declaration.events?.timers?.length ||
+                declaration.events?.subscriptions?.some(item => item.execution?.kind !== 'native-data') || declaration.events?.timers?.length ||
                 declaration.events?.dateTriggers?.length ||
                 declaration.workflows?.providers?.length || declaration.data?.concurrency?.commands.some(command => command.mode === 'durable')),
             ...declaration.backend,