@pactor-app/schema 0.1.0 → 1.1.0

package/dist/index.cjs

@@ -32,11 +32,16 @@ var index_exports = {};
 __export(index_exports, {
   ACTION_CONFIG_SCHEMA_ID: () => ACTION_CONFIG_SCHEMA_ID,
   DSL_NODE_SCHEMA_ID: () => DSL_NODE_SCHEMA_ID,
+  DSL_SOURCE_REF_SCHEMA_ID: () => DSL_SOURCE_REF_SCHEMA_ID,
   DSL_VERSION: () => DSL_VERSION,
   PAGE_DSL_SCHEMA_ID: () => PAGE_DSL_SCHEMA_ID,
   actionConfigSchema: () => actionConfigSchema,
   dslNodeSchema: () => dslNodeSchema,
+  dslSourceRefSchema: () => dslSourceRefSchema,
   pageDslSchema: () => pageDslSchema,
+  validateDslNode: () => validateDslNode,
+  validateDslNodes: () => validateDslNodes,
+  validateDslSourceRef: () => validateDslSourceRef,
   validatePageDsl: () => validatePageDsl
 });
 module.exports = __toCommonJS(index_exports);
@@ -99,18 +104,71 @@ var actionOrArraySchema = {
     { type: "array", items: { $ref: ACTION_CONFIG_SCHEMA_ID } }
   ]
 };
+var DSL_SOURCE_REF_SCHEMA_ID = "pactor:dsl-source-ref";
+var dslSourceRefSchema = {
+  $id: DSL_SOURCE_REF_SCHEMA_ID,
+  type: "object",
+  required: ["source"],
+  properties: {
+    source: {
+      anyOf: [
+        {
+          type: "object",
+          required: ["type", "service"],
+          properties: {
+            type: { const: "service" },
+            service: { type: "string", minLength: 1 },
+            params: { type: "object" }
+          },
+          additionalProperties: false
+        },
+        {
+          type: "object",
+          required: ["type", "request"],
+          properties: {
+            type: { const: "http" },
+            request: {
+              type: "object",
+              required: ["url"],
+              properties: {
+                method: { type: "string" },
+                url: { type: "string", minLength: 1 },
+                params: { type: "object" },
+                headers: { type: "object", additionalProperties: { type: "string" } }
+              },
+              additionalProperties: false
+            }
+          },
+          additionalProperties: false
+        }
+      ]
+    },
+    placeholder: { $ref: DSL_NODE_SCHEMA_ID }
+  },
+  additionalProperties: false
+};
+var dslChildrenSchema = {
+  anyOf: [
+    {
+      type: "array",
+      items: {
+        anyOf: [{ $ref: DSL_NODE_SCHEMA_ID }, { $ref: DSL_SOURCE_REF_SCHEMA_ID }]
+      }
+    },
+    { $ref: DSL_SOURCE_REF_SCHEMA_ID }
+  ]
+};
 var dslNodeSchema = {
   $id: DSL_NODE_SCHEMA_ID,
   type: "object",
-  required: ["type"],
+  anyOf: [{ required: ["type"] }, { required: ["component"] }],
   properties: {
     id: { type: "string" },
     type: { type: "string", minLength: 1 },
+    /** 引用节点：页面级命名组件（PageDsl.components）的 key */
+    component: { type: "string", minLength: 1 },
     props: { type: "object" },
-    children: {
-      type: "array",
-      items: { $ref: DSL_NODE_SCHEMA_ID }
-    },
+    children: dslChildrenSchema,
     events: {
       type: "object",
       additionalProperties: actionOrArraySchema
@@ -157,6 +215,11 @@ var dataSourceSchema = {
     service: { type: "string", minLength: 1 },
     autoLoad: { type: "boolean" },
     params: { type: "object" },
+    /** 选项字段映射（该数据源用作选项源时声明） */
+    valueField: { type: "string", minLength: 1 },
+    labelField: { type: "string", minLength: 1 },
+    /** 选项禁用标记字段 */
+    disabledField: { type: "string", minLength: 1 },
     request: {
       type: "object",
       required: ["url"],
@@ -207,16 +270,34 @@ var pageDslSchema = {
       properties: {
         id: { type: "string", minLength: 1 },
         title: { type: "string" },
+        /** 页面名称（标识用途） */
+        name: { type: "string" },
+        /** 页面描述 */
+        description: { type: "string" },
         type: { type: "string" },
         permission: permissionSchema2
       },
       additionalProperties: false
     },
+    /** 页面扩展元数据（自由键值，如 version / author），Runtime 不消费 */
+    meta: { type: "object" },
     state: { type: "object" },
     dataSources: {
       type: "object",
       additionalProperties: dataSourceSchema
     },
+    /** 页面级命名动作定义（供 call 动作按名引用复用） */
+    actions: {
+      type: "object",
+      additionalProperties: actionOrArraySchema2
+    },
+    /** 页面级命名组件定义（子树复用；值可为 DslSourceRef 远端惰性加载） */
+    components: {
+      type: "object",
+      additionalProperties: {
+        anyOf: [{ $ref: DSL_NODE_SCHEMA_ID }, { $ref: DSL_SOURCE_REF_SCHEMA_ID }]
+      }
+    },
     lifecycle: {
       type: "object",
       properties: {
@@ -229,7 +310,12 @@ var pageDslSchema = {
       },
       additionalProperties: false
     },
-    body: { $ref: DSL_NODE_SCHEMA_ID }
+    body: { $ref: DSL_NODE_SCHEMA_ID },
+    /**
+     * UI 树根（节点数组形态，或 DslSourceRef 动态引用）：`body` 缺失时作为替代，
+     * 用于 DSL 描述页面局部（无需 Page 等包装节点）
+     */
+    children: dslChildrenSchema
   },
   additionalProperties: false
 };
@@ -238,6 +324,7 @@ var pageDslSchema = {
 var import_ajv = __toESM(require("ajv"), 1);
 var ajv = new import_ajv.default({ allErrors: true, strict: false });
 ajv.addSchema(actionConfigSchema);
+ajv.addSchema(dslSourceRefSchema);
 ajv.addSchema(dslNodeSchema);
 ajv.addSchema(pageDslSchema);
 function toStructuredErrors(errors) {
@@ -266,16 +353,70 @@ function getValidator() {
 function validatePageDsl(document) {
   const validate = getValidator();
   const valid = validate(document);
-  return { valid, errors: valid ? [] : toStructuredErrors(validate.errors ?? []) };
+  return {
+    valid,
+    errors: valid ? [] : toStructuredErrors(validate.errors ?? []),
+    warnings: collectWarnings(document)
+  };
+}
+function collectWarnings(document) {
+  if (typeof document !== "object" || document === null) {
+    return [];
+  }
+  const doc = document;
+  if (doc.body !== void 0 && doc.children !== void 0) {
+    return [
+      {
+        path: "/children",
+        message: "body \u4E0E\u6839\u7EA7 children \u540C\u65F6\u58F0\u660E\uFF0Cchildren \u5C06\u88AB\u5FFD\u7565\uFF08body \u4F18\u5148\uFF09",
+        keyword: "conflict"
+      }
+    ];
+  }
+  return [];
+}
+function validateDslNode(value) {
+  const validate = ajv.getSchema(DSL_NODE_SCHEMA_ID);
+  if (!validate) {
+    throw new Error(`schema not registered: ${DSL_NODE_SCHEMA_ID}`);
+  }
+  const valid = validate(value);
+  return valid ? [] : toStructuredErrors(validate.errors ?? []);
+}
+function validateDslSourceRef(value) {
+  const validate = ajv.getSchema(DSL_SOURCE_REF_SCHEMA_ID);
+  if (!validate) {
+    throw new Error(`schema not registered: ${DSL_SOURCE_REF_SCHEMA_ID}`);
+  }
+  const valid = validate(value);
+  return valid ? [] : toStructuredErrors(validate.errors ?? []);
+}
+function validateDslNodes(value) {
+  if (!Array.isArray(value)) {
+    return [{ path: "/", message: "\u5FC5\u987B\u662F DslNode \u6570\u7EC4", keyword: "type" }];
+  }
+  return value.flatMap((item, index) => {
+    const isRef = typeof item === "object" && item !== null && !Array.isArray(item) && "source" in item;
+    const errors = isRef ? validateDslSourceRef(item) : validateDslNode(item);
+    return errors.map((error) => ({
+      ...error,
+      path: `/${index}${error.path === "/" ? "" : error.path}`
+    }));
+  });
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ACTION_CONFIG_SCHEMA_ID,
   DSL_NODE_SCHEMA_ID,
+  DSL_SOURCE_REF_SCHEMA_ID,
   DSL_VERSION,
   PAGE_DSL_SCHEMA_ID,
   actionConfigSchema,
   dslNodeSchema,
+  dslSourceRefSchema,
   pageDslSchema,
+  validateDslNode,
+  validateDslNodes,
+  validateDslSourceRef,
   validatePageDsl
 });

package/dist/index.d.cts

@@ -80,11 +80,79 @@ declare const actionConfigSchema: {
     };
     readonly additionalProperties: false;
 };
-/** DslNode：type 必填，children 递归 */
+/** DslSourceRef：动态 DSL 引用（service / http 二选一）+ 可选占位子树 */
+declare const DSL_SOURCE_REF_SCHEMA_ID = "pactor:dsl-source-ref";
+declare const dslSourceRefSchema: {
+    readonly $id: "pactor:dsl-source-ref";
+    readonly type: "object";
+    readonly required: readonly ["source"];
+    readonly properties: {
+        readonly source: {
+            readonly anyOf: readonly [{
+                readonly type: "object";
+                readonly required: readonly ["type", "service"];
+                readonly properties: {
+                    readonly type: {
+                        readonly const: "service";
+                    };
+                    readonly service: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
+                    readonly params: {
+                        readonly type: "object";
+                    };
+                };
+                readonly additionalProperties: false;
+            }, {
+                readonly type: "object";
+                readonly required: readonly ["type", "request"];
+                readonly properties: {
+                    readonly type: {
+                        readonly const: "http";
+                    };
+                    readonly request: {
+                        readonly type: "object";
+                        readonly required: readonly ["url"];
+                        readonly properties: {
+                            readonly method: {
+                                readonly type: "string";
+                            };
+                            readonly url: {
+                                readonly type: "string";
+                                readonly minLength: 1;
+                            };
+                            readonly params: {
+                                readonly type: "object";
+                            };
+                            readonly headers: {
+                                readonly type: "object";
+                                readonly additionalProperties: {
+                                    readonly type: "string";
+                                };
+                            };
+                        };
+                        readonly additionalProperties: false;
+                    };
+                };
+                readonly additionalProperties: false;
+            }];
+        };
+        readonly placeholder: {
+            readonly $ref: "pactor:dsl-node";
+        };
+    };
+    readonly additionalProperties: false;
+};
+/** DslNode：type（组件节点）或 component（引用页面级命名组件）二选一，children 递归 */
 declare const dslNodeSchema: {
     readonly $id: "pactor:dsl-node";
     readonly type: "object";
-    readonly required: readonly ["type"];
+    readonly anyOf: readonly [{
+        readonly required: readonly ["type"];
+    }, {
+        readonly required: readonly ["component"];
+    }];
     readonly properties: {
         readonly id: {
             readonly type: "string";
@@ -93,14 +161,27 @@ declare const dslNodeSchema: {
             readonly type: "string";
             readonly minLength: 1;
         };
+        /** 引用节点：页面级命名组件（PageDsl.components）的 key */
+        readonly component: {
+            readonly type: "string";
+            readonly minLength: 1;
+        };
         readonly props: {
             readonly type: "object";
         };
         readonly children: {
-            readonly type: "array";
-            readonly items: {
-                readonly $ref: "pactor:dsl-node";
-            };
+            readonly anyOf: readonly [{
+                readonly type: "array";
+                readonly items: {
+                    readonly anyOf: readonly [{
+                        readonly $ref: "pactor:dsl-node";
+                    }, {
+                        readonly $ref: "pactor:dsl-source-ref";
+                    }];
+                };
+            }, {
+                readonly $ref: "pactor:dsl-source-ref";
+            }];
         };
         readonly events: {
             readonly type: "object";
@@ -210,6 +291,14 @@ declare const pageDslSchema: {
                 readonly title: {
                     readonly type: "string";
                 };
+                /** 页面名称（标识用途） */
+                readonly name: {
+                    readonly type: "string";
+                };
+                /** 页面描述 */
+                readonly description: {
+                    readonly type: "string";
+                };
                 readonly type: {
                     readonly type: "string";
                 };
@@ -249,6 +338,10 @@ declare const pageDslSchema: {
             };
             readonly additionalProperties: false;
         };
+        /** 页面扩展元数据（自由键值，如 version / author），Runtime 不消费 */
+        readonly meta: {
+            readonly type: "object";
+        };
         readonly state: {
             readonly type: "object";
         };
@@ -271,6 +364,20 @@ declare const pageDslSchema: {
                     readonly params: {
                         readonly type: "object";
                     };
+                    /** 选项字段映射（该数据源用作选项源时声明） */
+                    readonly valueField: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
+                    readonly labelField: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
+                    /** 选项禁用标记字段 */
+                    readonly disabledField: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
                     readonly request: {
                         readonly type: "object";
                         readonly required: readonly ["url"];
@@ -308,6 +415,31 @@ declare const pageDslSchema: {
                 readonly additionalProperties: false;
             };
         };
+        /** 页面级命名动作定义（供 call 动作按名引用复用） */
+        readonly actions: {
+            readonly type: "object";
+            readonly additionalProperties: {
+                readonly anyOf: readonly [{
+                    readonly $ref: "pactor:action-config";
+                }, {
+                    readonly type: "array";
+                    readonly items: {
+                        readonly $ref: "pactor:action-config";
+                    };
+                }];
+            };
+        };
+        /** 页面级命名组件定义（子树复用；值可为 DslSourceRef 远端惰性加载） */
+        readonly components: {
+            readonly type: "object";
+            readonly additionalProperties: {
+                readonly anyOf: readonly [{
+                    readonly $ref: "pactor:dsl-node";
+                }, {
+                    readonly $ref: "pactor:dsl-source-ref";
+                }];
+            };
+        };
         readonly lifecycle: {
             readonly type: "object";
             readonly properties: {
@@ -377,6 +509,24 @@ declare const pageDslSchema: {
         readonly body: {
             readonly $ref: "pactor:dsl-node";
         };
+        /**
+         * UI 树根（节点数组形态，或 DslSourceRef 动态引用）：`body` 缺失时作为替代，
+         * 用于 DSL 描述页面局部（无需 Page 等包装节点）
+         */
+        readonly children: {
+            readonly anyOf: readonly [{
+                readonly type: "array";
+                readonly items: {
+                    readonly anyOf: readonly [{
+                        readonly $ref: "pactor:dsl-node";
+                    }, {
+                        readonly $ref: "pactor:dsl-source-ref";
+                    }];
+                };
+            }, {
+                readonly $ref: "pactor:dsl-source-ref";
+            }];
+        };
     };
     readonly additionalProperties: false;
 };
@@ -393,11 +543,24 @@ interface DslValidationError {
 interface DslValidationResult {
     valid: boolean;
     errors: DslValidationError[];
+    /** 提示级信息（不阻断校验），如 body 与根级 children 共存 */
+    warnings: DslValidationError[];
 }
 /**
  * 校验 Page DSL 文档是否符合根结构 Schema。
- * 校验通过时 errors 为空数组。
+ * 校验通过时 errors 为空数组；warnings 为提示级信息（不阻断校验）。
  */
 declare function validatePageDsl(document: unknown): DslValidationResult;
+/**
+ * 校验单个 DslNode（如远端动态加载的子树），返回结构化错误列表（空数组为通过）。
+ */
+declare function validateDslNode(value: unknown): DslValidationError[];
+/** 校验单个 DslSourceRef（children 数组中的引用元素） */
+declare function validateDslSourceRef(value: unknown): DslValidationError[];
+/**
+ * 校验 DslChildrenItem 数组（如远端动态加载的根级/节点级 children），
+ * 元素可为 DslNode 或 DslSourceRef 混排。返回结构化错误列表（空数组为通过）。
+ */
+declare function validateDslNodes(value: unknown): DslValidationError[];
 
-export { ACTION_CONFIG_SCHEMA_ID, DSL_NODE_SCHEMA_ID, DSL_VERSION, type DslValidationError, type DslValidationResult, PAGE_DSL_SCHEMA_ID, actionConfigSchema, dslNodeSchema, pageDslSchema, validatePageDsl };
+export { ACTION_CONFIG_SCHEMA_ID, DSL_NODE_SCHEMA_ID, DSL_SOURCE_REF_SCHEMA_ID, DSL_VERSION, type DslValidationError, type DslValidationResult, PAGE_DSL_SCHEMA_ID, actionConfigSchema, dslNodeSchema, dslSourceRefSchema, pageDslSchema, validateDslNode, validateDslNodes, validateDslSourceRef, validatePageDsl };

package/dist/index.d.ts

@@ -80,11 +80,79 @@ declare const actionConfigSchema: {
     };
     readonly additionalProperties: false;
 };
-/** DslNode：type 必填，children 递归 */
+/** DslSourceRef：动态 DSL 引用（service / http 二选一）+ 可选占位子树 */
+declare const DSL_SOURCE_REF_SCHEMA_ID = "pactor:dsl-source-ref";
+declare const dslSourceRefSchema: {
+    readonly $id: "pactor:dsl-source-ref";
+    readonly type: "object";
+    readonly required: readonly ["source"];
+    readonly properties: {
+        readonly source: {
+            readonly anyOf: readonly [{
+                readonly type: "object";
+                readonly required: readonly ["type", "service"];
+                readonly properties: {
+                    readonly type: {
+                        readonly const: "service";
+                    };
+                    readonly service: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
+                    readonly params: {
+                        readonly type: "object";
+                    };
+                };
+                readonly additionalProperties: false;
+            }, {
+                readonly type: "object";
+                readonly required: readonly ["type", "request"];
+                readonly properties: {
+                    readonly type: {
+                        readonly const: "http";
+                    };
+                    readonly request: {
+                        readonly type: "object";
+                        readonly required: readonly ["url"];
+                        readonly properties: {
+                            readonly method: {
+                                readonly type: "string";
+                            };
+                            readonly url: {
+                                readonly type: "string";
+                                readonly minLength: 1;
+                            };
+                            readonly params: {
+                                readonly type: "object";
+                            };
+                            readonly headers: {
+                                readonly type: "object";
+                                readonly additionalProperties: {
+                                    readonly type: "string";
+                                };
+                            };
+                        };
+                        readonly additionalProperties: false;
+                    };
+                };
+                readonly additionalProperties: false;
+            }];
+        };
+        readonly placeholder: {
+            readonly $ref: "pactor:dsl-node";
+        };
+    };
+    readonly additionalProperties: false;
+};
+/** DslNode：type（组件节点）或 component（引用页面级命名组件）二选一，children 递归 */
 declare const dslNodeSchema: {
     readonly $id: "pactor:dsl-node";
     readonly type: "object";
-    readonly required: readonly ["type"];
+    readonly anyOf: readonly [{
+        readonly required: readonly ["type"];
+    }, {
+        readonly required: readonly ["component"];
+    }];
     readonly properties: {
         readonly id: {
             readonly type: "string";
@@ -93,14 +161,27 @@ declare const dslNodeSchema: {
             readonly type: "string";
             readonly minLength: 1;
         };
+        /** 引用节点：页面级命名组件（PageDsl.components）的 key */
+        readonly component: {
+            readonly type: "string";
+            readonly minLength: 1;
+        };
         readonly props: {
             readonly type: "object";
         };
         readonly children: {
-            readonly type: "array";
-            readonly items: {
-                readonly $ref: "pactor:dsl-node";
-            };
+            readonly anyOf: readonly [{
+                readonly type: "array";
+                readonly items: {
+                    readonly anyOf: readonly [{
+                        readonly $ref: "pactor:dsl-node";
+                    }, {
+                        readonly $ref: "pactor:dsl-source-ref";
+                    }];
+                };
+            }, {
+                readonly $ref: "pactor:dsl-source-ref";
+            }];
         };
         readonly events: {
             readonly type: "object";
@@ -210,6 +291,14 @@ declare const pageDslSchema: {
                 readonly title: {
                     readonly type: "string";
                 };
+                /** 页面名称（标识用途） */
+                readonly name: {
+                    readonly type: "string";
+                };
+                /** 页面描述 */
+                readonly description: {
+                    readonly type: "string";
+                };
                 readonly type: {
                     readonly type: "string";
                 };
@@ -249,6 +338,10 @@ declare const pageDslSchema: {
             };
             readonly additionalProperties: false;
         };
+        /** 页面扩展元数据（自由键值，如 version / author），Runtime 不消费 */
+        readonly meta: {
+            readonly type: "object";
+        };
         readonly state: {
             readonly type: "object";
         };
@@ -271,6 +364,20 @@ declare const pageDslSchema: {
                     readonly params: {
                         readonly type: "object";
                     };
+                    /** 选项字段映射（该数据源用作选项源时声明） */
+                    readonly valueField: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
+                    readonly labelField: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
+                    /** 选项禁用标记字段 */
+                    readonly disabledField: {
+                        readonly type: "string";
+                        readonly minLength: 1;
+                    };
                     readonly request: {
                         readonly type: "object";
                         readonly required: readonly ["url"];
@@ -308,6 +415,31 @@ declare const pageDslSchema: {
                 readonly additionalProperties: false;
             };
         };
+        /** 页面级命名动作定义（供 call 动作按名引用复用） */
+        readonly actions: {
+            readonly type: "object";
+            readonly additionalProperties: {
+                readonly anyOf: readonly [{
+                    readonly $ref: "pactor:action-config";
+                }, {
+                    readonly type: "array";
+                    readonly items: {
+                        readonly $ref: "pactor:action-config";
+                    };
+                }];
+            };
+        };
+        /** 页面级命名组件定义（子树复用；值可为 DslSourceRef 远端惰性加载） */
+        readonly components: {
+            readonly type: "object";
+            readonly additionalProperties: {
+                readonly anyOf: readonly [{
+                    readonly $ref: "pactor:dsl-node";
+                }, {
+                    readonly $ref: "pactor:dsl-source-ref";
+                }];
+            };
+        };
         readonly lifecycle: {
             readonly type: "object";
             readonly properties: {
@@ -377,6 +509,24 @@ declare const pageDslSchema: {
         readonly body: {
             readonly $ref: "pactor:dsl-node";
         };
+        /**
+         * UI 树根（节点数组形态，或 DslSourceRef 动态引用）：`body` 缺失时作为替代，
+         * 用于 DSL 描述页面局部（无需 Page 等包装节点）
+         */
+        readonly children: {
+            readonly anyOf: readonly [{
+                readonly type: "array";
+                readonly items: {
+                    readonly anyOf: readonly [{
+                        readonly $ref: "pactor:dsl-node";
+                    }, {
+                        readonly $ref: "pactor:dsl-source-ref";
+                    }];
+                };
+            }, {
+                readonly $ref: "pactor:dsl-source-ref";
+            }];
+        };
     };
     readonly additionalProperties: false;
 };
@@ -393,11 +543,24 @@ interface DslValidationError {
 interface DslValidationResult {
     valid: boolean;
     errors: DslValidationError[];
+    /** 提示级信息（不阻断校验），如 body 与根级 children 共存 */
+    warnings: DslValidationError[];
 }
 /**
  * 校验 Page DSL 文档是否符合根结构 Schema。
- * 校验通过时 errors 为空数组。
+ * 校验通过时 errors 为空数组；warnings 为提示级信息（不阻断校验）。
  */
 declare function validatePageDsl(document: unknown): DslValidationResult;
+/**
+ * 校验单个 DslNode（如远端动态加载的子树），返回结构化错误列表（空数组为通过）。
+ */
+declare function validateDslNode(value: unknown): DslValidationError[];
+/** 校验单个 DslSourceRef（children 数组中的引用元素） */
+declare function validateDslSourceRef(value: unknown): DslValidationError[];
+/**
+ * 校验 DslChildrenItem 数组（如远端动态加载的根级/节点级 children），
+ * 元素可为 DslNode 或 DslSourceRef 混排。返回结构化错误列表（空数组为通过）。
+ */
+declare function validateDslNodes(value: unknown): DslValidationError[];
 
-export { ACTION_CONFIG_SCHEMA_ID, DSL_NODE_SCHEMA_ID, DSL_VERSION, type DslValidationError, type DslValidationResult, PAGE_DSL_SCHEMA_ID, actionConfigSchema, dslNodeSchema, pageDslSchema, validatePageDsl };
+export { ACTION_CONFIG_SCHEMA_ID, DSL_NODE_SCHEMA_ID, DSL_SOURCE_REF_SCHEMA_ID, DSL_VERSION, type DslValidationError, type DslValidationResult, PAGE_DSL_SCHEMA_ID, actionConfigSchema, dslNodeSchema, dslSourceRefSchema, pageDslSchema, validateDslNode, validateDslNodes, validateDslSourceRef, validatePageDsl };

package/dist/index.js

@@ -56,18 +56,71 @@ var actionOrArraySchema = {
     { type: "array", items: { $ref: ACTION_CONFIG_SCHEMA_ID } }
   ]
 };
+var DSL_SOURCE_REF_SCHEMA_ID = "pactor:dsl-source-ref";
+var dslSourceRefSchema = {
+  $id: DSL_SOURCE_REF_SCHEMA_ID,
+  type: "object",
+  required: ["source"],
+  properties: {
+    source: {
+      anyOf: [
+        {
+          type: "object",
+          required: ["type", "service"],
+          properties: {
+            type: { const: "service" },
+            service: { type: "string", minLength: 1 },
+            params: { type: "object" }
+          },
+          additionalProperties: false
+        },
+        {
+          type: "object",
+          required: ["type", "request"],
+          properties: {
+            type: { const: "http" },
+            request: {
+              type: "object",
+              required: ["url"],
+              properties: {
+                method: { type: "string" },
+                url: { type: "string", minLength: 1 },
+                params: { type: "object" },
+                headers: { type: "object", additionalProperties: { type: "string" } }
+              },
+              additionalProperties: false
+            }
+          },
+          additionalProperties: false
+        }
+      ]
+    },
+    placeholder: { $ref: DSL_NODE_SCHEMA_ID }
+  },
+  additionalProperties: false
+};
+var dslChildrenSchema = {
+  anyOf: [
+    {
+      type: "array",
+      items: {
+        anyOf: [{ $ref: DSL_NODE_SCHEMA_ID }, { $ref: DSL_SOURCE_REF_SCHEMA_ID }]
+      }
+    },
+    { $ref: DSL_SOURCE_REF_SCHEMA_ID }
+  ]
+};
 var dslNodeSchema = {
   $id: DSL_NODE_SCHEMA_ID,
   type: "object",
-  required: ["type"],
+  anyOf: [{ required: ["type"] }, { required: ["component"] }],
   properties: {
     id: { type: "string" },
     type: { type: "string", minLength: 1 },
+    /** 引用节点：页面级命名组件（PageDsl.components）的 key */
+    component: { type: "string", minLength: 1 },
     props: { type: "object" },
-    children: {
-      type: "array",
-      items: { $ref: DSL_NODE_SCHEMA_ID }
-    },
+    children: dslChildrenSchema,
     events: {
       type: "object",
       additionalProperties: actionOrArraySchema
@@ -114,6 +167,11 @@ var dataSourceSchema = {
     service: { type: "string", minLength: 1 },
     autoLoad: { type: "boolean" },
     params: { type: "object" },
+    /** 选项字段映射（该数据源用作选项源时声明） */
+    valueField: { type: "string", minLength: 1 },
+    labelField: { type: "string", minLength: 1 },
+    /** 选项禁用标记字段 */
+    disabledField: { type: "string", minLength: 1 },
     request: {
       type: "object",
       required: ["url"],
@@ -164,16 +222,34 @@ var pageDslSchema = {
       properties: {
         id: { type: "string", minLength: 1 },
         title: { type: "string" },
+        /** 页面名称（标识用途） */
+        name: { type: "string" },
+        /** 页面描述 */
+        description: { type: "string" },
         type: { type: "string" },
         permission: permissionSchema2
       },
       additionalProperties: false
     },
+    /** 页面扩展元数据（自由键值，如 version / author），Runtime 不消费 */
+    meta: { type: "object" },
     state: { type: "object" },
     dataSources: {
       type: "object",
       additionalProperties: dataSourceSchema
     },
+    /** 页面级命名动作定义（供 call 动作按名引用复用） */
+    actions: {
+      type: "object",
+      additionalProperties: actionOrArraySchema2
+    },
+    /** 页面级命名组件定义（子树复用；值可为 DslSourceRef 远端惰性加载） */
+    components: {
+      type: "object",
+      additionalProperties: {
+        anyOf: [{ $ref: DSL_NODE_SCHEMA_ID }, { $ref: DSL_SOURCE_REF_SCHEMA_ID }]
+      }
+    },
     lifecycle: {
       type: "object",
       properties: {
@@ -186,7 +262,12 @@ var pageDslSchema = {
       },
       additionalProperties: false
     },
-    body: { $ref: DSL_NODE_SCHEMA_ID }
+    body: { $ref: DSL_NODE_SCHEMA_ID },
+    /**
+     * UI 树根（节点数组形态，或 DslSourceRef 动态引用）：`body` 缺失时作为替代，
+     * 用于 DSL 描述页面局部（无需 Page 等包装节点）
+     */
+    children: dslChildrenSchema
   },
   additionalProperties: false
 };
@@ -195,6 +276,7 @@ var pageDslSchema = {
 import Ajv from "ajv";
 var ajv = new Ajv({ allErrors: true, strict: false });
 ajv.addSchema(actionConfigSchema);
+ajv.addSchema(dslSourceRefSchema);
 ajv.addSchema(dslNodeSchema);
 ajv.addSchema(pageDslSchema);
 function toStructuredErrors(errors) {
@@ -223,15 +305,69 @@ function getValidator() {
 function validatePageDsl(document) {
   const validate = getValidator();
   const valid = validate(document);
-  return { valid, errors: valid ? [] : toStructuredErrors(validate.errors ?? []) };
+  return {
+    valid,
+    errors: valid ? [] : toStructuredErrors(validate.errors ?? []),
+    warnings: collectWarnings(document)
+  };
+}
+function collectWarnings(document) {
+  if (typeof document !== "object" || document === null) {
+    return [];
+  }
+  const doc = document;
+  if (doc.body !== void 0 && doc.children !== void 0) {
+    return [
+      {
+        path: "/children",
+        message: "body \u4E0E\u6839\u7EA7 children \u540C\u65F6\u58F0\u660E\uFF0Cchildren \u5C06\u88AB\u5FFD\u7565\uFF08body \u4F18\u5148\uFF09",
+        keyword: "conflict"
+      }
+    ];
+  }
+  return [];
+}
+function validateDslNode(value) {
+  const validate = ajv.getSchema(DSL_NODE_SCHEMA_ID);
+  if (!validate) {
+    throw new Error(`schema not registered: ${DSL_NODE_SCHEMA_ID}`);
+  }
+  const valid = validate(value);
+  return valid ? [] : toStructuredErrors(validate.errors ?? []);
+}
+function validateDslSourceRef(value) {
+  const validate = ajv.getSchema(DSL_SOURCE_REF_SCHEMA_ID);
+  if (!validate) {
+    throw new Error(`schema not registered: ${DSL_SOURCE_REF_SCHEMA_ID}`);
+  }
+  const valid = validate(value);
+  return valid ? [] : toStructuredErrors(validate.errors ?? []);
+}
+function validateDslNodes(value) {
+  if (!Array.isArray(value)) {
+    return [{ path: "/", message: "\u5FC5\u987B\u662F DslNode \u6570\u7EC4", keyword: "type" }];
+  }
+  return value.flatMap((item, index) => {
+    const isRef = typeof item === "object" && item !== null && !Array.isArray(item) && "source" in item;
+    const errors = isRef ? validateDslSourceRef(item) : validateDslNode(item);
+    return errors.map((error) => ({
+      ...error,
+      path: `/${index}${error.path === "/" ? "" : error.path}`
+    }));
+  });
 }
 export {
   ACTION_CONFIG_SCHEMA_ID,
   DSL_NODE_SCHEMA_ID,
+  DSL_SOURCE_REF_SCHEMA_ID,
   DSL_VERSION,
   PAGE_DSL_SCHEMA_ID,
   actionConfigSchema,
   dslNodeSchema,
+  dslSourceRefSchema,
   pageDslSchema,
+  validateDslNode,
+  validateDslNodes,
+  validateDslSourceRef,
   validatePageDsl
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pactor-app/schema",
-  "version": "0.1.0",
+  "version": "1.1.0",
   "description": "Pactor schema: DSL version constants, JSON Schemas and Ajv-based validator",
   "keywords": [
     "pactor",
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "ajv": "^8.17.1",
-    "@pactor-app/core": "0.1.0"
+    "@pactor-app/core": "1.1.0"
   },
   "scripts": {
     "build": "tsup",