diff --git a/ssw-dacli/src/main/java/ssw/dacli/validation/ConfigValidator.java b/ssw-dacli/src/main/java/ssw/dacli/validation/ConfigValidator.java new file mode 100644 index 0000000..76c2a22 --- /dev/null +++ b/ssw-dacli/src/main/java/ssw/dacli/validation/ConfigValidator.java @@ -0,0 +1,57 @@ +package ssw.dacli.validation; + +import java.util.List; + +/** + * v15 L2 配置提交校验器接口. + * + *
每个 module (di/dm/dict/workflow) 实现 1 个 {@code ConfigValidator}, + * 校验该 module 提交到 JNPF API 之前的 config 完整性和业务约束. + * + *
实现类要求: + *
调用方模式 (dacli CLI): + *
{@code
+ * List errors = ConfigValidatorFactory
+ * .get(Module.DM)
+ * .validate(dmConfig);
+ * if (!errors.isEmpty()) {
+ * errors.forEach(System.err::println);
+ * System.exit(2);
+ * }
+ * }
+ *
+ * 对照文档: {@code docs/dacli/v15-validation-schema.md} (60+ 条规则详表)
+ *
+ * @param 实现要点:
+ * 应尽量穷尽所有错误 (而不是发现第一个就返回), 让用户一次性看到全部.
+ *
+ * @param config 待校验配置 (非 null)
+ * @return 错误列表 (空 = 校验通过)
+ */
+ List 仿照 {@code FieldBuilderFactory} 模式: 自动扫描 classpath 下所有
+ * {@link ConfigValidator} 实现 (META-INF/services), 按 {@link Module} 索引.
+ *
+ * 反向调试器支持:
+ * 调用示例:
+ * 从 classpath 资源 {@code dacli/validation-rules.json} 加载 14 条 formValidate 正则
+ * (enCode/fullName/field/email/iphone/...) + 4 module 字段绑定, 提供静态方法
+ * 供 dacli 子命令 {@code @Parameters} 注解引用.
+ *
+ * 用法 1 (单条正则):
+ * 用法 2 (字段→正则 映射):
+ * 资源路径: {@code boot/ssw-dacli/src/main/resources/dacli/validation-rules.json}
+ * (从 {@code web/packages/jnpf/utils/src/helpers/formValidate.ts} 抄录, 2026-06-12)
+ */
+public final class DacliValidation {
+ private static final String RESOURCE = "/dacli/validation-rules.json";
+
+ private static final Map 每个 module 对应 1 个 {@link ConfigValidator} 实现.
+ *
+ * @see ConfigValidator#module()
+ */
+public enum Module {
+ /** 数据接口 (JNPF /api/visualdev/DataInterface) */
+ DI("di"),
+ /** 数据模型 (JNPF /api/system/DataModel) */
+ DM("dm"),
+ /** 字典 (JNPF /api/system/DictionaryType + DictionaryData) */
+ DICT("dict"),
+ /** 工作流 (JNPF /api/workflow/Engine) */
+ WORKFLOW("workflow");
+
+ private final String code;
+
+ Module(String code) {
+ this.code = code;
+ }
+
+ /** 模块短码, 供命令行 / JSON 序列化使用 (e.g. "di" / "dm") */
+ public String code() {
+ return code;
+ }
+
+ /** 从短码反查枚举 (大小写不敏感) */
+ public static Module fromCode(String code) {
+ if (code == null) {
+ throw new IllegalArgumentException("module code 不能为 null");
+ }
+ for (Module m : values()) {
+ if (m.code.equalsIgnoreCase(code)) return m;
+ }
+ throw new IllegalArgumentException("Unknown module code: " + code);
+ }
+}
diff --git a/ssw-dacli/src/main/java/ssw/dacli/validation/Severity.java b/ssw-dacli/src/main/java/ssw/dacli/validation/Severity.java
new file mode 100644
index 0000000..755ce7e
--- /dev/null
+++ b/ssw-dacli/src/main/java/ssw/dacli/validation/Severity.java
@@ -0,0 +1,12 @@
+package ssw.dacli.validation;
+
+/**
+ * v15 校验错误严重度.
+ *
+ * ERROR — 必填/必传缺失, 必须修才能提交 (后端 API 必返 400)
+ * WARNING — 业务约束, 可提交但可能功能异常 (e.g. enCode 唯一性)
+ */
+public enum Severity {
+ ERROR,
+ WARNING
+}
diff --git a/ssw-dacli/src/main/java/ssw/dacli/validation/ValidationError.java b/ssw-dacli/src/main/java/ssw/dacli/validation/ValidationError.java
new file mode 100644
index 0000000..7792377
--- /dev/null
+++ b/ssw-dacli/src/main/java/ssw/dacli/validation/ValidationError.java
@@ -0,0 +1,53 @@
+package ssw.dacli.validation;
+
+/**
+ * v15 单条校验错误的不可变记录.
+ *
+ * 由 {@link ConfigValidator#validate} 返回. dacli CLI 在调用 JNPF API 之前
+ * 收集所有错误, 一并打印给用户 (而不是提交后才发现).
+ *
+ * 字段对应 {@code docs/dacli/v15-validation-schema.md} §1-§5 表格的 5 列:
+ * 示例:
+ * v15 启动时 (D3 阶段) 4 module 都没有注册 validator, 工厂应抛
+ * {@link UnsupportedOperationException} 并提示需在指定路径添加实现.
+ */
+public class ConfigValidatorFactoryTest {
+
+ @Test
+ public void testRegisteredModules_emptyAtD3() {
+ // D3 阶段 4 module 都未注册 (D4-D7 才会实现)
+ // 此断言反映"未实现"现状, D4 实现 DmConfigValidator 后此断言需更新
+ assertEquals(0, ConfigValidatorFactory.registeredModules().size(),
+ "D3 阶段 4 module 都未注册, D4+ 才会逐个实现");
+ }
+
+ @Test
+ public void testGet_unregistered_throwsHelpfulError() {
+ UnsupportedOperationException ex = assertThrows(UnsupportedOperationException.class,
+ () -> ConfigValidatorFactory.get(Module.DM));
+ // 错误消息应提示开发者如何实现
+ assertTrue(ex.getMessage().contains("dm"), "错误消息应包含 module 短码");
+ assertTrue(ex.getMessage().contains("ConfigValidator"), "错误消息应提示需注册 ConfigValidator");
+ assertTrue(ex.getMessage().contains("META-INF/services"),
+ "错误消息应提示 SPI 注册路径");
+ }
+
+ @Test
+ public void testIsSupported_unregistered() {
+ assertFalse(ConfigValidatorFactory.isSupported(Module.DI));
+ assertFalse(ConfigValidatorFactory.isSupported(Module.DM));
+ assertFalse(ConfigValidatorFactory.isSupported(Module.DICT));
+ assertFalse(ConfigValidatorFactory.isSupported(Module.WORKFLOW));
+ }
+}
diff --git a/ssw-dacli/src/test/java/ssw/dacli/validation/DacliValidationTest.java b/ssw-dacli/src/test/java/ssw/dacli/validation/DacliValidationTest.java
new file mode 100644
index 0000000..edad50a
--- /dev/null
+++ b/ssw-dacli/src/test/java/ssw/dacli/validation/DacliValidationTest.java
@@ -0,0 +1,213 @@
+package ssw.dacli.validation;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * v15 D3 — DacliValidation 单元测试 (验证 validation-rules.json 加载与正则应用).
+ *
+ * 覆盖 14 条 regularList + 4 module 字段绑定 + 字段映射表.
+ */
+public class DacliValidationTest {
+
+ @Test
+ public void testRulesLoaded_14() {
+ // 14 条 formValidate 正则全部加载
+ assertEquals(14, DacliValidation.ruleCount(),
+ "期望 14 条 regularList, 实际 " + DacliValidation.ruleCount());
+ }
+
+ @Test
+ public void testEnCode_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("enCode");
+ assertTrue(r.matches("userInfo")); // camelCase 允许
+ assertTrue(r.matches("orderInfo2024")); // 含数字允许
+ assertTrue(r.matches("sys.dept")); // 允许小数点
+ assertTrue(r.matches("DataX")); // 大小写不敏感
+ assertTrue(r.matches("a.b.c.d")); // 多段小数点
+ }
+
+ @Test
+ public void testEnCode_invalid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("enCode");
+ assertFalse(r.matches(".user"), "首尾不能是小数点");
+ assertFalse(r.matches("user."), "首尾不能是小数点");
+ assertFalse(r.matches("用户"), "不允许中文");
+ assertFalse(r.matches("user_info"), "不允许下划线 (formValidate 严格模式)");
+ assertFalse(r.matches("user-info"), "不允许连字符");
+ }
+
+ @Test
+ public void testFullName_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("fullName");
+ assertTrue(r.matches("用户管理"));
+ assertTrue(r.matches("OrderInfo2024"));
+ assertTrue(r.matches("数据字典1"));
+ }
+
+ @Test
+ public void testFullName_invalid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("fullName");
+ assertFalse(r.matches("user-info"), "连字符不允许");
+ assertFalse(r.matches("订单 管理"), "空格不允许");
+ }
+
+ @Test
+ public void testIphone_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("iphone");
+ assertTrue(r.matches("13800138000"));
+ assertTrue(r.matches("19912345678"));
+ }
+
+ @Test
+ public void testIphone_invalid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("iphone");
+ assertFalse(r.matches("12800138000"), "12x 开头不允许");
+ assertFalse(r.matches("1380013800"), "11 位");
+ assertFalse(r.matches("138001380000"), "12 位");
+ }
+
+ @Test
+ public void testEmail_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("email");
+ assertTrue(r.matches("user@example.com"));
+ assertTrue(r.matches("u.s.e.r@sub.example.co")); // 多个小数点 (local + domain)
+ }
+
+ @Test
+ public void testEmail_invalid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("email");
+ assertFalse(r.matches("user+tag@example.com"), "+ 不允许 (formValidate 严格模式)");
+ assertFalse(r.matches("plainaddress"));
+ }
+
+ @Test
+ public void testBigInt_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("bigInt");
+ assertTrue(r.matches("1"));
+ assertTrue(r.matches("99999"));
+ }
+
+ @Test
+ public void testBigInt_invalid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("bigInt");
+ assertFalse(r.matches("0"), "0 不是正整数");
+ assertFalse(r.matches("-1"), "负数不允许");
+ assertFalse(r.matches("1.5"), "小数不允许");
+ }
+
+ @Test
+ public void testIdCard_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("idCard");
+ assertTrue(r.matches("11010119900307891X")); // 18 位 + X 结尾
+ assertTrue(r.matches("110101199003078910"));
+ }
+
+ @Test
+ public void testPlateNumber_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("plateNumber");
+ assertTrue(r.matches("京A12345"));
+ assertTrue(r.matches("沪B5678挂"));
+ }
+
+ @Test
+ public void testField_valid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("field");
+ assertTrue(r.matches("f_name"));
+ assertTrue(r.matches("f_order_id_2024"));
+ }
+
+ @Test
+ public void testField_invalid() {
+ DacliValidation.PatternRule r = DacliValidation.getRule("field");
+ assertFalse(r.matches("1abc"), "数字开头不允许");
+ assertFalse(r.matches("_abc"), "下划线开头不允许");
+ }
+
+ @Test
+ public void testValidate_method() {
+ // 正常情况
+ DacliValidation.validate("enCode", "userInfo"); // 不抛 (camelCase)
+ DacliValidation.validate("iphone", "13800138000"); // 不抛
+
+ // 失败情况
+ assertThrows(IllegalArgumentException.class,
+ () -> DacliValidation.validate("enCode", ".bad"));
+ }
+
+ @Test
+ public void testModuleBindings_loaded() {
+ // 4 module × 多字段
+ assertTrue(DacliValidation.moduleBindingCount() >= 7,
+ "期望 ≥ 7 条 module 绑定, 实际 " + DacliValidation.moduleBindingCount());
+ }
+
+ @Test
+ public void testDmTable_moduleBinding() {
+ // dm.table 走独立定义 (大写+下划线+字母开头)
+ DacliValidation.PatternRule r = DacliValidation.getModuleBinding("dm", "table");
+ assertTrue(r.matches("TDS_X"));
+ assertTrue(r.matches("TDS_ORDER_2024"));
+ assertFalse(r.matches("tds_x"), "小写不允许");
+ assertFalse(r.matches("1TDS"), "数字开头不允许");
+ }
+
+ @Test
+ public void testDmFields_moduleBinding() {
+ // dm.fields (字段名) 走 formValidate 'field' (小写+下划线+字母开头)
+ DacliValidation.PatternRule r = DacliValidation.getModuleBinding("dm", "fields");
+ assertTrue(r.matches("f_name"));
+ assertFalse(r.matches("F_NAME"), "大写不允许");
+ }
+
+ @Test
+ public void testDmDataLengthDecimal_moduleBinding() {
+ // decimal 类型的 dataLength (数字+逗号)
+ DacliValidation.PatternRule r = DacliValidation.getModuleBinding("dm", "dataLengthDecimal");
+ assertTrue(r.matches("10"));
+ assertTrue(r.matches("10,2"));
+ assertTrue(r.matches("18,4"));
+ assertFalse(r.matches("10.2"), "点不允许");
+ assertFalse(r.matches("abc"), "字母不允许");
+ }
+
+ @Test
+ public void testWorkflowTemplateJsonField_moduleBinding() {
+ // workflow.templateJsonField (BPMN 字段 key, 字母数字下划线+字母开头)
+ DacliValidation.PatternRule r = DacliValidation.getModuleBinding("workflow", "templateJsonField");
+ assertTrue(r.matches("f_name"));
+ assertTrue(r.matches("OrderId"));
+ assertFalse(r.matches("1abc"), "数字开头不允许");
+ assertFalse(r.matches("user-info"), "连字符不允许");
+ }
+
+ @Test
+ public void testFieldToRuleMap_fullName() {
+ // 通用字段映射: "fullName" → "fullName" (regularList)
+ DacliValidation.PatternRule r = DacliValidation.ruleForField("fullName");
+ assertTrue(r.matches("用户管理"));
+ }
+
+ @Test
+ public void testFieldToRuleMap_newTable() {
+ // 通用字段映射: "newTable" → "dm.table" (module binding)
+ DacliValidation.PatternRule r = DacliValidation.ruleForField("newTable");
+ assertTrue(r.matches("TDS_X"));
+ }
+
+ @Test
+ public void testFieldToRuleMap_unknown() {
+ assertThrows(IllegalArgumentException.class,
+ () -> DacliValidation.ruleForField("nonExistentField"));
+ }
+
+ @Test
+ public void testCaseInsensitive_enCode() {
+ // enCode 应大小写不敏感 (caseInsensitive=true)
+ DacliValidation.PatternRule r = DacliValidation.getRule("enCode");
+ assertTrue(r.caseInsensitive());
+ assertTrue(r.matches("USERINFO"));
+ assertTrue(r.matches("Sys.Dept"));
+ }
+}
diff --git a/ssw-dacli/src/test/java/ssw/dacli/validation/ModuleTest.java b/ssw-dacli/src/test/java/ssw/dacli/validation/ModuleTest.java
new file mode 100644
index 0000000..f881474
--- /dev/null
+++ b/ssw-dacli/src/test/java/ssw/dacli/validation/ModuleTest.java
@@ -0,0 +1,44 @@
+package ssw.dacli.validation;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * v15 D3 — Module enum 单元测试.
+ */
+public class ModuleTest {
+
+ @Test
+ public void testModuleCount_4() {
+ assertEquals(4, Module.values().length, "4 module: di/dm/dict/workflow");
+ }
+
+ @Test
+ public void testModuleCode() {
+ assertEquals("di", Module.DI.code());
+ assertEquals("dm", Module.DM.code());
+ assertEquals("dict", Module.DICT.code());
+ assertEquals("workflow", Module.WORKFLOW.code());
+ }
+
+ @Test
+ public void testFromCode_valid() {
+ assertEquals(Module.DI, Module.fromCode("di"));
+ assertEquals(Module.DM, Module.fromCode("dm"));
+ assertEquals(Module.DICT, Module.fromCode("dict"));
+ assertEquals(Module.WORKFLOW, Module.fromCode("workflow"));
+ }
+
+ @Test
+ public void testFromCode_caseInsensitive() {
+ assertEquals(Module.DI, Module.fromCode("DI"));
+ assertEquals(Module.WORKFLOW, Module.fromCode("WORKFLOW"));
+ }
+
+ @Test
+ public void testFromCode_invalid() {
+ assertThrows(IllegalArgumentException.class, () -> Module.fromCode("unknown"));
+ assertThrows(IllegalArgumentException.class, () -> Module.fromCode(null));
+ }
+}
diff --git a/ssw-dacli/src/test/java/ssw/dacli/validation/ValidationErrorTest.java b/ssw-dacli/src/test/java/ssw/dacli/validation/ValidationErrorTest.java
new file mode 100644
index 0000000..eca3c33
--- /dev/null
+++ b/ssw-dacli/src/test/java/ssw/dacli/validation/ValidationErrorTest.java
@@ -0,0 +1,49 @@
+package ssw.dacli.validation;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * v15 D3 — ValidationError 记录单元测试.
+ */
+public class ValidationErrorTest {
+
+ @Test
+ public void testRecord_basic() {
+ ValidationError e = new ValidationError("dm-L2-1", Module.DM,
+ "请至少添加一个字段", "fields", Severity.ERROR);
+ assertEquals("dm-L2-1", e.code());
+ assertEquals(Module.DM, e.module());
+ assertEquals("请至少添加一个字段", e.message());
+ assertEquals("fields", e.field());
+ assertEquals(Severity.ERROR, e.severity());
+ }
+
+ @Test
+ public void testRecord_autoInferModule() {
+ // 不传 module, 从 code 前缀推断
+ ValidationError e = new ValidationError("wf-L2-37", "选择分支节点至少设置2条分支",
+ "nodes[0].outgoing", Severity.ERROR);
+ assertEquals(Module.WORKFLOW, e.module());
+ }
+
+ @Test
+ public void testRecord_toString() {
+ ValidationError e = new ValidationError("dm-L2-3", Module.DM,
+ "第1行列名不能为空", "fields[0].field", Severity.ERROR);
+ String str = e.toString();
+ assertTrue(str.contains("dm-L2-3"));
+ assertTrue(str.contains("第1行列名不能为空"));
+ assertTrue(str.contains("ERROR"));
+ }
+
+ @Test
+ public void testRecord_inferAllModules() {
+ // 4 module 全部推断
+ assertEquals(Module.DI, new ValidationError("di-L2-1", "x", "y", Severity.ERROR).module());
+ assertEquals(Module.DM, new ValidationError("dm-L2-1", "x", "y", Severity.ERROR).module());
+ assertEquals(Module.DICT, new ValidationError("dict-L2-1", "x", "y", Severity.ERROR).module());
+ assertEquals(Module.WORKFLOW, new ValidationError("wf-L2-1", "x", "y", Severity.ERROR).module());
+ }
+}
+ *
+ *
+ *
+ *
+ *
+ * {@code
+ * ConfigValidator
+ */
+public final class ConfigValidatorFactory {
+ private static final Map{@code
+ * DacliValidation.PatternRule rule = DacliValidation.getRule("enCode");
+ * if (!rule.pattern().matcher(input).matches()) {
+ * throw new IllegalArgumentException(rule.message());
+ * }
+ * }
+ *
+ * {@code
+ * DacliValidation.PatternRule rule = DacliValidation.ruleForField("fullName");
+ * // 或 dm 专用
+ * DacliValidation.PatternRule rule = DacliValidation.ruleForDmField("newTable");
+ * }
+ *
+ *
+ *
+ *
+ * {@code
+ * new ValidationError("dm-L2-1", Module.DM, "请至少添加一个字段", "fields", Severity.ERROR)
+ * }
+ */
+public record ValidationError(
+ String code,
+ Module module,
+ String message,
+ String field,
+ Severity severity
+) {
+ /** 简化构造 (module 自动从 code 前缀推断) */
+ public ValidationError(String code, String message, String field, Severity severity) {
+ this(code, inferModule(code), message, field, severity);
+ }
+
+ /** 从 code 前缀 (e.g. "dm-L2-3") 推断 module (dm) */
+ private static Module inferModule(String code) {
+ if (code == null) return null;
+ String prefix = code.split("-")[0].toLowerCase();
+ return switch (prefix) {
+ case "di" -> Module.DI;
+ case "dm" -> Module.DM;
+ case "dict" -> Module.DICT;
+ case "wf" -> Module.WORKFLOW;
+ default -> null;
+ };
+ }
+
+ @Override
+ public String toString() {
+ return String.format("[%s] %s.%s: %s (%s)",
+ severity, module.code(), field, message, code);
+ }
+}
diff --git a/ssw-dacli/src/main/resources/META-INF/services/ssw.dacli.validation.ConfigValidator b/ssw-dacli/src/main/resources/META-INF/services/ssw.dacli.validation.ConfigValidator
new file mode 100644
index 0000000..e69de29
diff --git a/ssw-dacli/src/test/java/ssw/dacli/validation/ConfigValidatorFactoryTest.java b/ssw-dacli/src/test/java/ssw/dacli/validation/ConfigValidatorFactoryTest.java
new file mode 100644
index 0000000..589aad1
--- /dev/null
+++ b/ssw-dacli/src/test/java/ssw/dacli/validation/ConfigValidatorFactoryTest.java
@@ -0,0 +1,41 @@
+package ssw.dacli.validation;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * v15 D3 — ConfigValidatorFactory SPI 注册测试.
+ *
+ *