重构: df-core改名df-types(类型库语义准+全workspace机械改名54处)

This commit is contained in:
2026-06-17 02:44:34 +08:00
parent a19f535134
commit 4be15912cd
40 changed files with 90 additions and 90 deletions

View File

@@ -4,7 +4,7 @@ version = "0.1.0"
edition = "2021"
[dependencies]
df-core = { path = "../df-core" }
df-types = { path = "../df-types" }
serde = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true }

View File

@@ -2,8 +2,8 @@
use std::collections::{HashMap, HashSet, VecDeque};
use df_core::error::Result;
use df_core::types::NodeId;
use df_types::error::Result;
use df_types::types::NodeId;
use crate::node::Node;
@@ -141,7 +141,7 @@ impl Dag {
}
if processed != node_ids.len() {
return Err(df_core::error::Error::Workflow(
return Err(df_types::error::Error::Workflow(
"DAG 中存在环,无法进行拓扑排序".to_string(),
));
}

View File

@@ -2,7 +2,7 @@
use tokio::sync::broadcast;
use tokio::sync::broadcast::error::SendError;
use df_core::events::WorkflowEvent;
use df_types::events::WorkflowEvent;
/// 事件总线
#[derive(Debug)]

View File

@@ -2,8 +2,8 @@
use std::collections::HashMap;
use df_core::events::WorkflowEvent;
use df_core::types::NodeId;
use df_types::events::WorkflowEvent;
use df_types::types::NodeId;
use crate::dag::Dag;
use crate::eventbus::EventBus;
@@ -350,7 +350,7 @@ mod tests {
assert!(err.to_string().contains("节点 a 执行失败"));
// 同层成功节点状态正常更新,下游节点保持 Pending
use df_core::types::NodeStatus;
use df_types::types::NodeStatus;
assert_eq!(executor.state_machine.get(&"a".to_string()), NodeStatus::Failed);
assert_eq!(executor.state_machine.get(&"b".to_string()), NodeStatus::Completed);
assert_eq!(executor.state_machine.get(&"c".to_string()), NodeStatus::Pending);
@@ -383,7 +383,7 @@ mod tests {
/// 状态保持 Cancelled,run 返回取消相关 Err 而非状态转换错误。
#[tokio::test]
async fn test_cancelled_node_skips_set_failed() {
use df_core::types::NodeStatus;
use df_types::types::NodeStatus;
let mut dag = Dag::new();
dag.add_node("x".to_string(), Box::new(CancelSelfNode));
@@ -434,7 +434,7 @@ mod tests {
/// 状态保持 Cancelled,run 返回 Ok(已批准审批不应误报失败)。
#[tokio::test]
async fn test_cancelled_node_skips_set_completed() {
use df_core::types::NodeStatus;
use df_types::types::NodeStatus;
let mut dag = Dag::new();
dag.add_node("y".to_string(), Box::new(CancelSelfThenOkNode));
@@ -458,8 +458,8 @@ mod tests {
/// 前端按 type 区分「取消」与「失败」。订阅事件总线收集所有事件断言。
#[tokio::test]
async fn test_cancelled_node_emits_node_cancelled_event() {
use df_core::events::WorkflowEvent;
use df_core::types::NodeStatus;
use df_types::events::WorkflowEvent;
use df_types::types::NodeStatus;
let mut dag = Dag::new();
dag.add_node("c".to_string(), Box::new(CancelSelfNode));

View File

@@ -3,7 +3,7 @@
use async_trait::async_trait;
use serde::{Deserialize, Serialize};
use df_core::types::NodeId;
use df_types::types::NodeId;
use super::eventbus::EventBus;
use super::state::StateMachine;

View File

@@ -12,7 +12,7 @@
use std::collections::HashMap;
use std::sync::{Arc, Mutex};
use df_core::types::{NodeId, NodeStatus};
use df_types::types::{NodeId, NodeStatus};
/// 节点状态机
#[derive(Debug, Clone)]