@pactor-app/runtime 1.51.0 → 1.53.0

package/dist/index.cjs

@@ -194,6 +194,42 @@ var DataStore = class {
   init() {
     return Promise.all(this.autoLoadNames().map((name) => this.load(name)));
   }
+  /**
+   * 运行时注册数据源（如 DslSourceRef 片段载荷携带的 dataSources）：
+   * 名称冲突时告警并跳过（同一引用重复注册幂等），成功时播种空状态、
+   * 递增版本并通知订阅者。返回是否注册成功。
+   */
+  register(name, config) {
+    if (this.configs[name] !== void 0) {
+      console.warn(
+        `[@pactor-app/runtime] dataSource \u540D\u79F0\u51B2\u7A81\uFF1A"${name}" \u5DF2\u6CE8\u518C\uFF0C\u8DF3\u8FC7\u91CD\u590D\u6CE8\u518C`
+      );
+      return false;
+    }
+    this.configs[name] = config;
+    this.statuses.set(name, { loading: false });
+    this.notify();
+    return true;
+  }
+  /** 批量运行时注册，返回实际注册成功的名称列表（冲突名跳过） */
+  registerAll(configs) {
+    const registered = [];
+    for (const [name, config] of Object.entries(configs)) {
+      if (this.register(name, config)) {
+        registered.push(name);
+      }
+    }
+    return registered;
+  }
+  /** 注销运行时注册的数据源（如片段边界卸载时回收）；未知名为 no-op */
+  unregister(name) {
+    if (this.configs[name] === void 0) {
+      return;
+    }
+    delete this.configs[name];
+    this.statuses.delete(name);
+    this.notify();
+  }
   /**
    * 加载指定数据源。状态流转：开始置 loading 并清空 error；
    * 成功写入 data；失败写入 error（保留旧 data）。MUST NOT 抛出。
@@ -267,6 +303,9 @@ var DataStore = class {
   }
   update(name, status) {
     this.statuses.set(name, status);
+    this.notify();
+  }
+  notify() {
     this.version += 1;
     for (const listener of [...this.listeners]) {
       listener();
@@ -512,6 +551,8 @@ var defaultMessages = {
     "pactor.select.clear": "\u6E05\u9664",
     "pactor.select.search": "\u641C\u7D22\u9009\u9879",
     "pactor.input.clear": "\u6E05\u9664",
+    "pactor.input.showPassword": "\u663E\u793A\u5BC6\u7801",
+    "pactor.input.hidePassword": "\u9690\u85CF\u5BC6\u7801",
     "pactor.input.placeholder": "\u8BF7\u8F93\u5165",
     "pactor.numberInput.increase": "\u589E\u52A0",
     "pactor.numberInput.decrease": "\u51CF\u5C11",
@@ -621,6 +662,8 @@ var defaultMessages = {
     "pactor.select.clear": "Clear",
     "pactor.select.search": "Search options",
     "pactor.input.clear": "Clear",
+    "pactor.input.showPassword": "Show password",
+    "pactor.input.hidePassword": "Hide password",
     "pactor.input.placeholder": "Please enter",
     "pactor.numberInput.increase": "Increase",
     "pactor.numberInput.decrease": "Decrease",
@@ -1033,12 +1076,13 @@ var ActionEngine = class {
 };
 
 // src/renderer/renderer.tsx
-var import_core3 = require("@pactor-app/core");
+var import_core4 = require("@pactor-app/core");
 var import_expression3 = require("@pactor-app/expression");
 var import_schema = require("@pactor-app/schema");
 var import_react4 = require("react");
 
 // src/renderer/dsl-source-boundary.tsx
+var import_core3 = require("@pactor-app/core");
 var import_react2 = require("react");
 var import_jsx_runtime = require("react/jsx-runtime");
 function DslSourceBoundary({
@@ -1051,12 +1095,32 @@ function DslSourceBoundary({
   const key = dslSourceKey(sourceRef);
   (0, import_react2.useEffect)(() => {
     let cancelled = false;
+    let registeredSources = [];
     setState({ status: "loading" });
     context.dslSources.resolve(sourceRef).then(
       (content) => {
-        if (!cancelled) {
-          setState({ status: "ready", content });
+        if (cancelled) {
+          return;
+        }
+        if ((0, import_core3.isDslFragmentPayload)(content)) {
+          if (content.state) {
+            context.state.set(content.state);
+          }
+          if (content.dataSources) {
+            registeredSources = context.data.registerAll(content.dataSources);
+            for (const name of registeredSources) {
+              if (content.dataSources[name]?.autoLoad === true) {
+                context.data.load(name).catch((cause) => {
+                  console.warn(
+                    `[@pactor-app/runtime] \u7247\u6BB5\u6570\u636E\u6E90 "${name}" \u52A0\u8F7D\u5931\u8D25`,
+                    cause
+                  );
+                });
+              }
+            }
+          }
         }
+        setState({ status: "ready", content });
       },
       (cause) => {
         if (!cancelled) {
@@ -1067,6 +1131,9 @@ function DslSourceBoundary({
     );
     return () => {
       cancelled = true;
+      for (const name of registeredSources) {
+        context.data.unregister(name);
+      }
     };
   }, [context, key]);
   if (state.status === "ready") {
@@ -1179,7 +1246,7 @@ function renderNode(node, value, key) {
       referenceStack: [...stack, name]
     };
     scoped.renderChildren = (children, extraScope) => renderChildrenOf(scoped, children, extraScope);
-    if ((0, import_core3.isDslSourceRef)(subtree)) {
+    if ((0, import_core4.isDslSourceRef)(subtree)) {
       const ref = subtree;
       return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(RendererContextProvider, { value: scoped, children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
         DslSourceBoundary,
@@ -1281,6 +1348,17 @@ function validateResolvedNode(content, label) {
   return content;
 }
 function validateResolvedNodes(content, label) {
+  if ((0, import_core4.isDslFragmentPayload)(content)) {
+    const errors2 = (0, import_schema.validateDslFragmentPayload)(content);
+    if (errors2.length > 0) {
+      console.warn(
+        `[@pactor-app/runtime] \u52A8\u6001\u5F15\u7528\uFF08${label}\uFF09\u8FD4\u56DE\u7684\u7247\u6BB5\u8F7D\u8377\u672A\u901A\u8FC7\u6821\u9A8C`,
+        errors2
+      );
+      return null;
+    }
+    return content.children;
+  }
   const errors = (0, import_schema.validateDslNodes)(content);
   if (errors.length > 0) {
     console.warn(
@@ -1292,7 +1370,7 @@ function validateResolvedNodes(content, label) {
   return content;
 }
 function renderChildItem(value, item, key) {
-  if ((0, import_core3.isDslSourceRef)(item)) {
+  if ((0, import_core4.isDslSourceRef)(item)) {
     const ref = item;
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       DslSourceBoundary,
@@ -1306,7 +1384,7 @@ function renderChildItem(value, item, key) {
             return null;
           }
           return nodes.map(
-            (child, index) => renderChildItem(value, child, (0, import_core3.isDslSourceRef)(child) ? `ref-${index}` : child.id ?? index)
+            (child, index) => renderChildItem(value, child, (0, import_core4.isDslSourceRef)(child) ? `ref-${index}` : child.id ?? index)
           );
         }
       },
@@ -1319,7 +1397,7 @@ function renderChildrenOf(value, children, extraScope) {
   if (!children || Array.isArray(children) && children.length === 0) {
     return null;
   }
-  if ((0, import_core3.isDslSourceRef)(children)) {
+  if ((0, import_core4.isDslSourceRef)(children)) {
     const ref = children;
     return /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
       DslSourceBoundary,
@@ -1333,14 +1411,14 @@ function renderChildrenOf(value, children, extraScope) {
             return null;
           }
           return nodes.map(
-            (child, index) => renderChildItem(value, child, (0, import_core3.isDslSourceRef)(child) ? `ref-${index}` : child.id ?? index)
+            (child, index) => renderChildItem(value, child, (0, import_core4.isDslSourceRef)(child) ? `ref-${index}` : child.id ?? index)
           );
         }
       },
       "dsl-source"
     );
   }
-  const itemKey = (child, index) => (0, import_core3.isDslSourceRef)(child) ? `ref-${index}` : child.id ?? index;
+  const itemKey = (child, index) => (0, import_core4.isDslSourceRef)(child) ? `ref-${index}` : child.id ?? index;
   if (!extraScope) {
     return children.map(
       (child, index) => renderChildItem(value, child, itemKey(child, index))
@@ -1381,7 +1459,7 @@ function isEmbeddedDslNode(value) {
 }
 
 // src/page/page-runtime.tsx
-var import_core4 = require("@pactor-app/core");
+var import_core5 = require("@pactor-app/core");
 var import_schema2 = require("@pactor-app/schema");
 var import_jsx_runtime4 = require("react/jsx-runtime");
 var PageRuntimeError = class extends Error {
@@ -1471,7 +1549,7 @@ function PageRuntimeView({
   return renderRoots(runtime.pageDsl, runtime.context, runtime.engine, children);
 }
 function renderRoots(pageDsl, context, engine, children) {
-  if (!pageDsl.body && (0, import_core4.isDslSourceRef)(pageDsl.children)) {
+  if (!pageDsl.body && (0, import_core5.isDslSourceRef)(pageDsl.children)) {
     const ref = pageDsl.children;
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
       DslSourceBoundary,
@@ -1483,13 +1561,29 @@ function renderRoots(pageDsl, context, engine, children) {
       }
     );
   }
-  const roots = (0, import_core4.resolveRootNodes)(pageDsl);
+  const roots = (0, import_core5.resolveRootNodes)(pageDsl);
   if (roots.length === 0) {
     return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_jsx_runtime4.Fragment, { children: children ?? null });
   }
   return renderRootItems(roots, context, engine, children);
 }
 function renderResolvedRoots(content, context, engine, children) {
+  if ((0, import_core5.isDslFragmentPayload)(content)) {
+    const fragmentErrors = (0, import_schema2.validateDslFragmentPayload)(content);
+    if (fragmentErrors.length > 0) {
+      console.warn(
+        "[@pactor-app/runtime] \u6839\u7EA7 children \u52A8\u6001\u5F15\u7528\u8FD4\u56DE\u7684\u7247\u6BB5\u8F7D\u8377\u672A\u901A\u8FC7\u6821\u9A8C",
+        fragmentErrors
+      );
+      return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_jsx_runtime4.Fragment, { children: children ?? null });
+    }
+    return renderRootItems(
+      content.children,
+      context,
+      engine,
+      children
+    );
+  }
   const errors = (0, import_schema2.validateDslNodes)(content);
   if (errors.length > 0) {
     console.warn(
@@ -1502,7 +1596,7 @@ function renderResolvedRoots(content, context, engine, children) {
 }
 function renderRootItems(items, context, engine, children) {
   return /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(import_jsx_runtime4.Fragment, { children: items.map(
-    (item, index) => (0, import_core4.isDslSourceRef)(item) ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
+    (item, index) => (0, import_core5.isDslSourceRef)(item) ? /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
       DslSourceBoundary,
       {
         context,

package/dist/index.d.cts

@@ -135,6 +135,16 @@ declare class DataStore {
     getVersion(): number;
     /** 触发所有 `autoLoad: true` 的数据源（PageRuntime 初始化阶段调用） */
     init(): Promise<void[]>;
+    /**
+     * 运行时注册数据源（如 DslSourceRef 片段载荷携带的 dataSources）：
+     * 名称冲突时告警并跳过（同一引用重复注册幂等），成功时播种空状态、
+     * 递增版本并通知订阅者。返回是否注册成功。
+     */
+    register(name: string, config: DataSourceConfig): boolean;
+    /** 批量运行时注册，返回实际注册成功的名称列表（冲突名跳过） */
+    registerAll(configs: Record<string, DataSourceConfig>): string[];
+    /** 注销运行时注册的数据源（如片段边界卸载时回收）；未知名为 no-op */
+    unregister(name: string): void;
     /**
      * 加载指定数据源。状态流转：开始置 loading 并清空 error；
      * 成功写入 data；失败写入 error（保留旧 data）。MUST NOT 抛出。
@@ -150,6 +160,7 @@ declare class DataStore {
     private autoLoadNames;
     private loadByType;
     private update;
+    private notify;
 }
 
 interface DslSourceResolverDeps {
@@ -442,6 +453,12 @@ interface DslSourceBoundaryProps {
  * 非 DSL 组件类型）：解析中渲染 placeholder（缺省空）、成功交给
  * 调用方渲染、失败告警并渲染空——MUST NOT 抛错击穿渲染层。
  * 解析经 `context.dslSources`（Promise 级缓存去重）。
+ *
+ * 解析结果为片段载荷（DslFragmentPayload）时，在 effect 中应用副作用
+ * （MUST NOT 在 render 期注册——注册会推高 DataStore 版本引发重渲染循环）：
+ * `state` 合并进页面 state、`dataSources` 运行时注册（冲突名跳过），
+ * 随后触发其中 `autoLoad: true` 的数据源加载；卸载时注销本边界注册的
+ * 数据源名。裸数组形态无任何副作用。
  */
 declare function DslSourceBoundary({ context, sourceRef, placeholder, children, }: DslSourceBoundaryProps): react.JSX.Element | null;
 

package/dist/index.d.ts

@@ -135,6 +135,16 @@ declare class DataStore {
     getVersion(): number;
     /** 触发所有 `autoLoad: true` 的数据源（PageRuntime 初始化阶段调用） */
     init(): Promise<void[]>;
+    /**
+     * 运行时注册数据源（如 DslSourceRef 片段载荷携带的 dataSources）：
+     * 名称冲突时告警并跳过（同一引用重复注册幂等），成功时播种空状态、
+     * 递增版本并通知订阅者。返回是否注册成功。
+     */
+    register(name: string, config: DataSourceConfig): boolean;
+    /** 批量运行时注册，返回实际注册成功的名称列表（冲突名跳过） */
+    registerAll(configs: Record<string, DataSourceConfig>): string[];
+    /** 注销运行时注册的数据源（如片段边界卸载时回收）；未知名为 no-op */
+    unregister(name: string): void;
     /**
      * 加载指定数据源。状态流转：开始置 loading 并清空 error；
      * 成功写入 data；失败写入 error（保留旧 data）。MUST NOT 抛出。
@@ -150,6 +160,7 @@ declare class DataStore {
     private autoLoadNames;
     private loadByType;
     private update;
+    private notify;
 }
 
 interface DslSourceResolverDeps {
@@ -442,6 +453,12 @@ interface DslSourceBoundaryProps {
  * 非 DSL 组件类型）：解析中渲染 placeholder（缺省空）、成功交给
  * 调用方渲染、失败告警并渲染空——MUST NOT 抛错击穿渲染层。
  * 解析经 `context.dslSources`（Promise 级缓存去重）。
+ *
+ * 解析结果为片段载荷（DslFragmentPayload）时，在 effect 中应用副作用
+ * （MUST NOT 在 render 期注册——注册会推高 DataStore 版本引发重渲染循环）：
+ * `state` 合并进页面 state、`dataSources` 运行时注册（冲突名跳过），
+ * 随后触发其中 `autoLoad: true` 的数据源加载；卸载时注销本边界注册的
+ * 数据源名。裸数组形态无任何副作用。
  */
 declare function DslSourceBoundary({ context, sourceRef, placeholder, children, }: DslSourceBoundaryProps): react.JSX.Element | null;
 

package/dist/index.js

@@ -149,6 +149,42 @@ var DataStore = class {
   init() {
     return Promise.all(this.autoLoadNames().map((name) => this.load(name)));
   }
+  /**
+   * 运行时注册数据源（如 DslSourceRef 片段载荷携带的 dataSources）：
+   * 名称冲突时告警并跳过（同一引用重复注册幂等），成功时播种空状态、
+   * 递增版本并通知订阅者。返回是否注册成功。
+   */
+  register(name, config) {
+    if (this.configs[name] !== void 0) {
+      console.warn(
+        `[@pactor-app/runtime] dataSource \u540D\u79F0\u51B2\u7A81\uFF1A"${name}" \u5DF2\u6CE8\u518C\uFF0C\u8DF3\u8FC7\u91CD\u590D\u6CE8\u518C`
+      );
+      return false;
+    }
+    this.configs[name] = config;
+    this.statuses.set(name, { loading: false });
+    this.notify();
+    return true;
+  }
+  /** 批量运行时注册，返回实际注册成功的名称列表（冲突名跳过） */
+  registerAll(configs) {
+    const registered = [];
+    for (const [name, config] of Object.entries(configs)) {
+      if (this.register(name, config)) {
+        registered.push(name);
+      }
+    }
+    return registered;
+  }
+  /** 注销运行时注册的数据源（如片段边界卸载时回收）；未知名为 no-op */
+  unregister(name) {
+    if (this.configs[name] === void 0) {
+      return;
+    }
+    delete this.configs[name];
+    this.statuses.delete(name);
+    this.notify();
+  }
   /**
    * 加载指定数据源。状态流转：开始置 loading 并清空 error；
    * 成功写入 data；失败写入 error（保留旧 data）。MUST NOT 抛出。
@@ -222,6 +258,9 @@ var DataStore = class {
   }
   update(name, status) {
     this.statuses.set(name, status);
+    this.notify();
+  }
+  notify() {
     this.version += 1;
     for (const listener of [...this.listeners]) {
       listener();
@@ -467,6 +506,8 @@ var defaultMessages = {
     "pactor.select.clear": "\u6E05\u9664",
     "pactor.select.search": "\u641C\u7D22\u9009\u9879",
     "pactor.input.clear": "\u6E05\u9664",
+    "pactor.input.showPassword": "\u663E\u793A\u5BC6\u7801",
+    "pactor.input.hidePassword": "\u9690\u85CF\u5BC6\u7801",
     "pactor.input.placeholder": "\u8BF7\u8F93\u5165",
     "pactor.numberInput.increase": "\u589E\u52A0",
     "pactor.numberInput.decrease": "\u51CF\u5C11",
@@ -576,6 +617,8 @@ var defaultMessages = {
     "pactor.select.clear": "Clear",
     "pactor.select.search": "Search options",
     "pactor.input.clear": "Clear",
+    "pactor.input.showPassword": "Show password",
+    "pactor.input.hidePassword": "Hide password",
     "pactor.input.placeholder": "Please enter",
     "pactor.numberInput.increase": "Increase",
     "pactor.numberInput.decrease": "Decrease",
@@ -990,11 +1033,11 @@ var ActionEngine = class {
 };
 
 // src/renderer/renderer.tsx
-import { isDslSourceRef } from "@pactor-app/core";
+import { isDslFragmentPayload as isDslFragmentPayload2, isDslSourceRef } from "@pactor-app/core";
 import {
   resolveTemplate as resolveTemplate3
 } from "@pactor-app/expression";
-import { validateDslNode, validateDslNodes } from "@pactor-app/schema";
+import { validateDslFragmentPayload, validateDslNode, validateDslNodes } from "@pactor-app/schema";
 import {
   createElement,
   useMemo,
@@ -1002,6 +1045,7 @@ import {
 } from "react";
 
 // src/renderer/dsl-source-boundary.tsx
+import { isDslFragmentPayload } from "@pactor-app/core";
 import { useEffect, useState } from "react";
 import { Fragment, jsx } from "react/jsx-runtime";
 function DslSourceBoundary({
@@ -1014,12 +1058,32 @@ function DslSourceBoundary({
   const key = dslSourceKey(sourceRef);
   useEffect(() => {
     let cancelled = false;
+    let registeredSources = [];
     setState({ status: "loading" });
     context.dslSources.resolve(sourceRef).then(
       (content) => {
-        if (!cancelled) {
-          setState({ status: "ready", content });
+        if (cancelled) {
+          return;
         }
+        if (isDslFragmentPayload(content)) {
+          if (content.state) {
+            context.state.set(content.state);
+          }
+          if (content.dataSources) {
+            registeredSources = context.data.registerAll(content.dataSources);
+            for (const name of registeredSources) {
+              if (content.dataSources[name]?.autoLoad === true) {
+                context.data.load(name).catch((cause) => {
+                  console.warn(
+                    `[@pactor-app/runtime] \u7247\u6BB5\u6570\u636E\u6E90 "${name}" \u52A0\u8F7D\u5931\u8D25`,
+                    cause
+                  );
+                });
+              }
+            }
+          }
+        }
+        setState({ status: "ready", content });
       },
       (cause) => {
         if (!cancelled) {
@@ -1030,6 +1094,9 @@ function DslSourceBoundary({
     );
     return () => {
       cancelled = true;
+      for (const name of registeredSources) {
+        context.data.unregister(name);
+      }
     };
   }, [context, key]);
   if (state.status === "ready") {
@@ -1248,6 +1315,17 @@ function validateResolvedNode(content, label) {
   return content;
 }
 function validateResolvedNodes(content, label) {
+  if (isDslFragmentPayload2(content)) {
+    const errors2 = validateDslFragmentPayload(content);
+    if (errors2.length > 0) {
+      console.warn(
+        `[@pactor-app/runtime] \u52A8\u6001\u5F15\u7528\uFF08${label}\uFF09\u8FD4\u56DE\u7684\u7247\u6BB5\u8F7D\u8377\u672A\u901A\u8FC7\u6821\u9A8C`,
+        errors2
+      );
+      return null;
+    }
+    return content.children;
+  }
   const errors = validateDslNodes(content);
   if (errors.length > 0) {
     console.warn(
@@ -1348,8 +1426,9 @@ function isEmbeddedDslNode(value) {
 }
 
 // src/page/page-runtime.tsx
-import { isDslSourceRef as isDslSourceRef2, resolveRootNodes } from "@pactor-app/core";
+import { isDslFragmentPayload as isDslFragmentPayload3, isDslSourceRef as isDslSourceRef2, resolveRootNodes } from "@pactor-app/core";
 import {
+  validateDslFragmentPayload as validateDslFragmentPayload2,
   validateDslNodes as validateDslNodes2,
   validatePageDsl
 } from "@pactor-app/schema";
@@ -1460,6 +1539,22 @@ function renderRoots(pageDsl, context, engine, children) {
   return renderRootItems(roots, context, engine, children);
 }
 function renderResolvedRoots(content, context, engine, children) {
+  if (isDslFragmentPayload3(content)) {
+    const fragmentErrors = validateDslFragmentPayload2(content);
+    if (fragmentErrors.length > 0) {
+      console.warn(
+        "[@pactor-app/runtime] \u6839\u7EA7 children \u52A8\u6001\u5F15\u7528\u8FD4\u56DE\u7684\u7247\u6BB5\u8F7D\u8377\u672A\u901A\u8FC7\u6821\u9A8C",
+        fragmentErrors
+      );
+      return /* @__PURE__ */ jsx3(Fragment2, { children: children ?? null });
+    }
+    return renderRootItems(
+      content.children,
+      context,
+      engine,
+      children
+    );
+  }
   const errors = validateDslNodes2(content);
   if (errors.length > 0) {
     console.warn(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pactor-app/runtime",
-  "version": "1.51.0",
+  "version": "1.53.0",
   "description": "Pactor runtime: RuntimeContext, StateStore, DataSource runtime, action engine, React renderer and page runtime",
   "keywords": [
     "pactor",
@@ -45,9 +45,9 @@
     "access": "public"
   },
   "dependencies": {
-    "@pactor-app/expression": "1.51.0",
-    "@pactor-app/schema": "1.51.0",
-    "@pactor-app/core": "1.51.0"
+    "@pactor-app/core": "1.53.0",
+    "@pactor-app/schema": "1.53.0",
+    "@pactor-app/expression": "1.53.0"
   },
   "peerDependencies": {
     "react": ">=18"