@pactor-app/runtime 0.1.0 → 1.1.0

package/dist/index.js

@@ -120,6 +120,14 @@ var DataStore = class {
     }
     return out;
   }
+  /** 各数据源的加载状态（loading / error），供表达式作用域的 `dataStatus` 键使用 */
+  getAllStatus() {
+    const out = {};
+    for (const [name, status] of this.statuses) {
+      out[name] = { loading: status.loading, error: status.error };
+    }
+    return out;
+  }
   subscribe(listener) {
     this.listeners.add(listener);
     return () => {
@@ -146,7 +154,8 @@ var DataStore = class {
     const previous = this.get(name);
     this.update(name, { loading: true, error: void 0, data: previous.data });
     try {
-      const data = await this.loadByType(config);
+      const raw = await this.loadByType(config);
+      const data = applyOptionMapping(raw, config);
       this.update(name, { loading: false, data, error: void 0 });
     } catch (cause) {
       this.update(name, {
@@ -212,6 +221,69 @@ var DataStore = class {
     }
   }
 };
+function applyOptionMapping(data, config) {
+  if (!config.valueField && !config.labelField && !config.disabledField) {
+    return data;
+  }
+  if (!Array.isArray(data)) {
+    return data;
+  }
+  const valueField = config.valueField ?? "value";
+  const labelField = config.labelField ?? "label";
+  return data.map((item) => {
+    if (item === null || typeof item !== "object") {
+      return item;
+    }
+    const record = item;
+    return {
+      ...record,
+      label: record[labelField],
+      value: record[valueField],
+      disabled: config.disabledField ? Boolean(record[config.disabledField]) : Boolean(record.disabled)
+    };
+  });
+}
+
+// src/datasource/dsl-source-resolver.ts
+function dslSourceKey(ref) {
+  const source = ref.source;
+  if (source.type === "service") {
+    return `service:${source.service}:${JSON.stringify(source.params ?? {})}`;
+  }
+  const request = source.request;
+  return `http:${(request.method ?? "GET").toUpperCase()}:${request.url}:${JSON.stringify(request.params ?? {})}:${JSON.stringify(request.headers ?? {})}`;
+}
+var DslSourceResolver = class {
+  constructor(deps) {
+    this.deps = deps;
+    this.cache = /* @__PURE__ */ new Map();
+  }
+  resolve(ref) {
+    const key = dslSourceKey(ref);
+    let cached = this.cache.get(key);
+    if (cached === void 0) {
+      cached = this.load(ref);
+      this.cache.set(key, cached);
+    }
+    return cached;
+  }
+  async load(ref) {
+    const scope = this.deps.getScope();
+    const source = ref.source;
+    if (source.type === "service") {
+      const handler = this.deps.services.get(source.service);
+      if (!handler) {
+        throw new Error(
+          `[@pactor-app/runtime] service not registered: "${source.service}"`
+        );
+      }
+      const params = resolveDeep(source.params ?? {}, scope);
+      return handler(params);
+    }
+    const request = resolveDeep(source.request, scope);
+    return this.deps.http.request(request);
+  }
+};
 
 // src/context/scope.ts
 function buildScope(context, local) {
@@ -221,6 +293,7 @@ function buildScope(context, local) {
     state: context.state.getState(),
     form: context.state.get("form"),
     data: context.data.getAllData(),
+    dataStatus: context.data.getAllStatus(),
     route: context.route,
     user: context.user,
     params: context.route.params,
@@ -330,6 +403,11 @@ function createRuntimeContext(options = {}) {
     http,
     getScope: () => buildScope(context)
   });
+  const dslSources = new DslSourceResolver({
+    services,
+    http,
+    getScope: () => buildScope(context)
+  });
   context = {
     app: options.app ?? {},
     page: options.page ?? {},
@@ -342,9 +420,12 @@ function createRuntimeContext(options = {}) {
     actions,
     forms,
     actionResults: {},
+    namedActions: options.namedActions ?? {},
+    pageComponents: options.pageComponents ?? {},
     permission,
     capabilities,
     http,
+    dslSources,
     locale: options.locale ?? "zh-CN",
     i18n: createI18nContext({
       locale: options.locale,
@@ -360,28 +441,53 @@ import { createI18nContext as createI18nContext2 } from "@pactor-app/core";
 import { createContext, useContext } from "react";
 var I18nReactContext = createContext(null);
 var I18nContextProvider = I18nReactContext.Provider;
-var defaultI18n = createI18nContext2({
-  messages: {
+var defaultMessages = {
+  "zh-CN": {
     "pactor.layout.expandSidebar": "\u5C55\u5F00\u4FA7\u8FB9\u680F",
     "pactor.layout.collapseSidebar": "\u6536\u8D77\u4FA7\u8FB9\u680F",
+    "pactor.layout.openNavigation": "\u6253\u5F00\u5BFC\u822A",
     "pactor.layout.closeTab": "\u5173\u95ED {{title}}",
     "pactor.layout.breadcrumb": "\u9762\u5305\u5C51",
     "pactor.table.loading": "\u52A0\u8F7D\u4E2D\u2026",
     "pactor.table.empty": "\u6682\u65E0\u6570\u636E",
     "pactor.form.required": "\u5FC5\u586B",
-    "pactor.select.clear": "\u6E05\u9664"
+    "pactor.select.clear": "\u6E05\u9664",
+    "pactor.alertDialog.confirm": "\u786E\u5B9A",
+    "pactor.alertDialog.cancel": "\u53D6\u6D88",
+    "pactor.command.empty": "\u65E0\u5339\u914D\u7ED3\u679C",
+    "pactor.overlay.close": "\u5173\u95ED"
+  },
+  "en-US": {
+    "pactor.layout.expandSidebar": "Expand sidebar",
+    "pactor.layout.collapseSidebar": "Collapse sidebar",
+    "pactor.layout.openNavigation": "Open navigation",
+    "pactor.layout.closeTab": "Close {{title}}",
+    "pactor.layout.breadcrumb": "Breadcrumb",
+    "pactor.table.loading": "Loading\u2026",
+    "pactor.table.empty": "No data",
+    "pactor.form.required": "Required",
+    "pactor.select.clear": "Clear",
+    "pactor.alertDialog.confirm": "Confirm",
+    "pactor.alertDialog.cancel": "Cancel",
+    "pactor.command.empty": "No results found",
+    "pactor.overlay.close": "Close"
   }
-});
+};
+function createDefaultI18n(locale) {
+  return createI18nContext2({ locale, messages: defaultMessages });
+}
+var defaultI18n = createDefaultI18n();
 function useI18n() {
   const value = useContext(I18nReactContext);
   if (value === null) {
     return defaultI18n;
   }
+  const fallback = createDefaultI18n(value.locale);
   return {
     ...value,
     t: (key, params) => {
       const translated = value.t(key, params);
-      return translated === key ? defaultI18n.t(key, params) : translated;
+      return translated === key ? fallback.t(key, params) : translated;
     }
   };
 }
@@ -446,6 +552,45 @@ function registerBuiltinActions(registry) {
     }
     return { ok: true };
   });
+  register("call", async (action, ctx) => {
+    const name = action.params?.["name"];
+    if (typeof name !== "string" || !name) {
+      return {
+        ok: false,
+        error: new Error("[@pactor-app/runtime] call \u52A8\u4F5C\u7F3A\u5C11 name \u53C2\u6570")
+      };
+    }
+    const target = ctx.context.namedActions[name];
+    if (target === void 0) {
+      return {
+        ok: false,
+        error: new Error(
+          `[@pactor-app/runtime] unknown named action: "${name}"`
+        )
+      };
+    }
+    const depth = (callDepth.get(ctx.context) ?? 0) + 1;
+    if (depth > MAX_CALL_DEPTH) {
+      return {
+        ok: false,
+        error: new Error(
+          `[@pactor-app/runtime] call \u5D4C\u5957\u8D85\u8FC7 ${MAX_CALL_DEPTH} \u5C42\uFF08\u7591\u4F3C\u5FAA\u73AF\u5F15\u7528\uFF09: "${name}"`
+        )
+      };
+    }
+    callDepth.set(ctx.context, depth);
+    try {
+      for (const child of asActions(target)) {
+        const result = await ctx.execute(child);
+        if (!result.ok) {
+          return result;
+        }
+      }
+      return { ok: true };
+    } finally {
+      callDepth.set(ctx.context, depth - 1);
+    }
+  });
   register("parallel", async (action, ctx) => {
     const results = await Promise.all(
       asActions(action.params?.["actions"]).map((child) => ctx.execute(child))
@@ -502,6 +647,8 @@ function asActions(value) {
   }
   return [];
 }
+var callDepth = /* @__PURE__ */ new WeakMap();
+var MAX_CALL_DEPTH = 20;
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -557,7 +704,7 @@ var ActionEngine = class {
         // Renderer 的 resolveProps）保持原样，由各自执行/渲染时
         // 按当时的 state 与作用域求值
         params: resolveDeep(action.params ?? {}, scope, {
-          isOpaque: (value) => typeof value["action"] === "string" || typeof value["type"] === "string"
+          isOpaque: (value) => typeof value["action"] === "string" || typeof value["type"] === "string" || typeof value["component"] === "string"
         })
       };
       const ctx = {
@@ -592,15 +739,57 @@ var ActionEngine = class {
 };
 
 // src/renderer/renderer.tsx
+import { isDslSourceRef } from "@pactor-app/core";
 import {
   resolveTemplate as resolveTemplate3
 } from "@pactor-app/expression";
+import { validateDslNode, validateDslNodes } from "@pactor-app/schema";
 import {
   createElement,
   useMemo,
   useSyncExternalStore as useSyncExternalStore2
 } from "react";
 
+// src/renderer/dsl-source-boundary.tsx
+import { useEffect, useState } from "react";
+import { Fragment, jsx } from "react/jsx-runtime";
+function DslSourceBoundary({
+  context,
+  sourceRef,
+  placeholder,
+  children
+}) {
+  const [state, setState] = useState({ status: "loading" });
+  const key = dslSourceKey(sourceRef);
+  useEffect(() => {
+    let cancelled = false;
+    setState({ status: "loading" });
+    context.dslSources.resolve(sourceRef).then(
+      (content) => {
+        if (!cancelled) {
+          setState({ status: "ready", content });
+        }
+      },
+      (cause) => {
+        if (!cancelled) {
+          console.warn("[@pactor-app/runtime] DSL \u52A8\u6001\u5F15\u7528\u89E3\u6790\u5931\u8D25", cause);
+          setState({ status: "error" });
+        }
+      }
+    );
+    return () => {
+      cancelled = true;
+    };
+  }, [context, key]);
+  if (state.status === "ready") {
+    return /* @__PURE__ */ jsx(Fragment, { children: children(state.content) });
+  }
+  if (state.status === "error") {
+    return null;
+  }
+  return /* @__PURE__ */ jsx(Fragment, { children: placeholder ?? null });
+}
+
 // src/renderer/renderer-context.ts
 import {
   createContext as createContext2,
@@ -654,7 +843,7 @@ function UnsupportedComponent({ type }) {
 }
 
 // src/renderer/renderer.tsx
-import { jsx, jsxs as jsxs2 } from "react/jsx-runtime";
+import { jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
 function DslRenderer({ context, node, engine, children }) {
   useSyncExternalStore2(
     (onChange) => {
@@ -676,6 +865,7 @@ function DslRenderer({ context, node, engine, children }) {
       context,
       engine: resolvedEngine,
       scope: {},
+      referenceStack: [],
       renderChildren: (children2, extraScope) => renderChildrenOf(root, children2, extraScope)
     };
     return root;
@@ -687,6 +877,44 @@ function DslRenderer({ context, node, engine, children }) {
 }
 function renderNode(node, value, key) {
   const scope = buildScope(value.context, value.scope);
+  if (node.component !== void 0) {
+    const name = node.component;
+    const stack = value.referenceStack ?? [];
+    if (stack.includes(name)) {
+      console.warn(
+        `[@pactor-app/runtime] \u7EC4\u4EF6\u5F15\u7528\u5FAA\u73AF\uFF1A${[...stack, name].join(" \u2192 ")}`
+      );
+      return null;
+    }
+    const subtree = value.context.pageComponents[name];
+    if (!subtree) {
+      return /* @__PURE__ */ jsx2(UnsupportedComponent, { type: `component(${name})` }, key);
+    }
+    const scoped = {
+      ...value,
+      referenceStack: [...stack, name]
+    };
+    scoped.renderChildren = (children, extraScope) => renderChildrenOf(scoped, children, extraScope);
+    if (isDslSourceRef(subtree)) {
+      const ref = subtree;
+      return /* @__PURE__ */ jsx2(RendererContextProvider, { value: scoped, children: /* @__PURE__ */ jsx2(
+        DslSourceBoundary,
+        {
+          context: value.context,
+          sourceRef: ref,
+          placeholder: ref.placeholder ? renderNode(ref.placeholder, scoped, "placeholder") : null,
+          children: (content) => {
+            const resolved = validateResolvedNode(content, `components.${name}`);
+            if (!resolved) {
+              return null;
+            }
+            return renderNode(mergeReferenceNode(resolved, node), scoped, key);
+          }
+        }
+      ) }, key);
+    }
+    return /* @__PURE__ */ jsx2(RendererContextProvider, { value: scoped, children: renderNode(mergeReferenceNode(subtree, node), scoped, key) }, key);
+  }
   if (node.when !== void 0) {
     const expression = typeof node.when === "string" ? node.when : node.when.expression;
     let visible;
@@ -713,7 +941,7 @@ function renderNode(node, value, key) {
   const entry = value.context.components.get(node.type);
   const normalized = normalizeEntry(entry);
   if (!normalized) {
-    return /* @__PURE__ */ jsx(UnsupportedComponent, { type: node.type }, key);
+    return /* @__PURE__ */ jsx2(UnsupportedComponent, { type: node.type }, key);
   }
   const props = resolveProps(node.props, scope);
   if (node.events) {
@@ -747,23 +975,102 @@ function resolveDeniedStrategy(permission) {
   }
   return "hidden";
 }
+function mergeReferenceNode(definition, reference) {
+  return {
+    ...definition,
+    props: { ...definition.props, ...reference.props },
+    events: { ...definition.events, ...reference.events },
+    when: reference.when ?? definition.when,
+    permission: reference.permission ?? definition.permission,
+    id: reference.id ?? definition.id
+  };
+}
+function validateResolvedNode(content, label) {
+  const errors = validateDslNode(content);
+  if (errors.length > 0) {
+    console.warn(
+      `[@pactor-app/runtime] \u52A8\u6001\u5F15\u7528\uFF08${label}\uFF09\u8FD4\u56DE\u5185\u5BB9\u672A\u901A\u8FC7\u6821\u9A8C`,
+      errors
+    );
+    return null;
+  }
+  return content;
+}
+function validateResolvedNodes(content, label) {
+  const errors = validateDslNodes(content);
+  if (errors.length > 0) {
+    console.warn(
+      `[@pactor-app/runtime] \u52A8\u6001\u5F15\u7528\uFF08${label}\uFF09\u8FD4\u56DE\u5185\u5BB9\u672A\u901A\u8FC7\u6821\u9A8C`,
+      errors
+    );
+    return null;
+  }
+  return content;
+}
+function renderChildItem(value, item, key) {
+  if (isDslSourceRef(item)) {
+    const ref = item;
+    return /* @__PURE__ */ jsx2(
+      DslSourceBoundary,
+      {
+        context: value.context,
+        sourceRef: ref,
+        placeholder: ref.placeholder ? renderNode(ref.placeholder, value, "placeholder") : null,
+        children: (content) => {
+          const nodes = validateResolvedNodes(content, "children");
+          if (!nodes) {
+            return null;
+          }
+          return nodes.map(
+            (child, index) => renderChildItem(value, child, isDslSourceRef(child) ? `ref-${index}` : child.id ?? index)
+          );
+        }
+      },
+      key
+    );
+  }
+  return renderNode(item, value, key);
+}
 function renderChildrenOf(value, children, extraScope) {
-  if (!children || children.length === 0) {
+  if (!children || Array.isArray(children) && children.length === 0) {
     return null;
   }
+  if (isDslSourceRef(children)) {
+    const ref = children;
+    return /* @__PURE__ */ jsx2(
+      DslSourceBoundary,
+      {
+        context: value.context,
+        sourceRef: ref,
+        placeholder: ref.placeholder ? renderNode(ref.placeholder, value, "placeholder") : null,
+        children: (content) => {
+          const nodes = validateResolvedNodes(content, "children");
+          if (!nodes) {
+            return null;
+          }
+          return nodes.map(
+            (child, index) => renderChildItem(value, child, isDslSourceRef(child) ? `ref-${index}` : child.id ?? index)
+          );
+        }
+      },
+      "dsl-source"
+    );
+  }
+  const itemKey = (child, index) => isDslSourceRef(child) ? `ref-${index}` : child.id ?? index;
   if (!extraScope) {
     return children.map(
-      (child, index) => renderNode(child, value, child.id ?? index)
+      (child, index) => renderChildItem(value, child, itemKey(child, index))
     );
   }
   const scoped = {
     context: value.context,
     engine: value.engine,
     scope: { ...value.scope, ...extraScope },
+    referenceStack: value.referenceStack,
     renderChildren: (nested, nestedScope) => renderChildrenOf(scoped, nested, nestedScope)
   };
-  return /* @__PURE__ */ jsx(RendererContextProvider, { value: scoped, children: children.map(
-    (child, index) => renderNode(child, scoped, child.id ?? index)
+  return /* @__PURE__ */ jsx2(RendererContextProvider, { value: scoped, children: children.map(
+    (child, index) => renderChildItem(scoped, child, itemKey(child, index))
   ) });
 }
 function normalizeEntry(entry) {
@@ -786,14 +1093,16 @@ function resolveProps(props, scope) {
   return out;
 }
 function isEmbeddedDslNode(value) {
-  return typeof value.type === "string";
+  return typeof value.type === "string" || typeof value.component === "string";
 }
 
 // src/page/page-runtime.tsx
+import { isDslSourceRef as isDslSourceRef2, resolveRootNodes } from "@pactor-app/core";
 import {
+  validateDslNodes as validateDslNodes2,
   validatePageDsl
 } from "@pactor-app/schema";
-import { Fragment, jsx as jsx2 } from "react/jsx-runtime";
+import { Fragment as Fragment2, jsx as jsx3 } from "react/jsx-runtime";
 var PageRuntimeError = class extends Error {
   constructor(errors) {
     super(
@@ -812,7 +1121,9 @@ function createPageRuntime(pageDsl, options = {}) {
     ...options,
     page: pageDsl.page,
     state: pageDsl.state ?? options.state,
-    dataSources: pageDsl.dataSources ?? options.dataSources
+    dataSources: pageDsl.dataSources ?? options.dataSources,
+    namedActions: pageDsl.actions ?? options.namedActions,
+    pageComponents: pageDsl.components ?? options.pageComponents
   });
   registerBuiltinActions(context.actions);
   const engine = new ActionEngine(context);
@@ -848,10 +1159,7 @@ function createPageRuntime(pageDsl, options = {}) {
       return destroyed;
     },
     render() {
-      if (!pageDsl.body) {
-        return null;
-      }
-      return /* @__PURE__ */ jsx2(DslRenderer, { context, node: pageDsl.body, engine });
+      return renderRoots(pageDsl, context, engine);
     },
     ready: () => triggerWhenAlive("onReady"),
     show: () => triggerWhenAlive("onShow"),
@@ -879,16 +1187,67 @@ function PageRuntimeView({
   runtime,
   children
 }) {
-  const body = runtime.pageDsl.body;
-  if (!body) {
-    return /* @__PURE__ */ jsx2(Fragment, { children: children ?? null });
+  return renderRoots(runtime.pageDsl, runtime.context, runtime.engine, children);
+}
+function renderRoots(pageDsl, context, engine, children) {
+  if (!pageDsl.body && isDslSourceRef2(pageDsl.children)) {
+    const ref = pageDsl.children;
+    return /* @__PURE__ */ jsx3(
+      DslSourceBoundary,
+      {
+        context,
+        sourceRef: ref,
+        placeholder: ref.placeholder ? /* @__PURE__ */ jsx3(DslRenderer, { context, node: ref.placeholder, engine }) : null,
+        children: (content) => renderResolvedRoots(content, context, engine, children)
+      }
+    );
+  }
+  const roots = resolveRootNodes(pageDsl);
+  if (roots.length === 0) {
+    return /* @__PURE__ */ jsx3(Fragment2, { children: children ?? null });
   }
-  return /* @__PURE__ */ jsx2(DslRenderer, { context: runtime.context, node: body, engine: runtime.engine, children });
+  return renderRootItems(roots, context, engine, children);
+}
+function renderResolvedRoots(content, context, engine, children) {
+  const errors = validateDslNodes2(content);
+  if (errors.length > 0) {
+    console.warn(
+      "[@pactor-app/runtime] \u6839\u7EA7 children \u52A8\u6001\u5F15\u7528\u8FD4\u56DE\u5185\u5BB9\u672A\u901A\u8FC7\u6821\u9A8C",
+      errors
+    );
+    return /* @__PURE__ */ jsx3(Fragment2, { children: children ?? null });
+  }
+  return renderRootItems(content, context, engine, children);
+}
+function renderRootItems(items, context, engine, children) {
+  return /* @__PURE__ */ jsx3(Fragment2, { children: items.map(
+    (item, index) => isDslSourceRef2(item) ? /* @__PURE__ */ jsx3(
+      DslSourceBoundary,
+      {
+        context,
+        sourceRef: item,
+        placeholder: item.placeholder ? /* @__PURE__ */ jsx3(DslRenderer, { context, node: item.placeholder, engine }) : null,
+        children: (content) => renderResolvedRoots(content, context, engine, children)
+      },
+      dslSourceKey(item)
+    ) : /* @__PURE__ */ jsx3(
+      DslRenderer,
+      {
+        context,
+        node: item,
+        engine,
+        children: index === items.length - 1 ? children : null
+      },
+      item.id ?? index
+    )
+  ) });
 }
 export {
   ActionEngine,
   DataStore,
   DslRenderer,
+  DslSourceBoundary,
+  DslSourceResolver,
   I18nContextProvider,
   PageRuntimeError,
   PageRuntimeView,
@@ -900,6 +1259,7 @@ export {
   createFetchHttpAdapter,
   createPageRuntime,
   createRuntimeContext,
+  dslSourceKey,
   registerBuiltinActions,
   resolveDeep,
   useDataSource,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pactor-app/runtime",
-  "version": "0.1.0",
+  "version": "1.1.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/core": "0.1.0",
-    "@pactor-app/expression": "0.1.0",
-    "@pactor-app/schema": "0.1.0"
+    "@pactor-app/core": "1.1.0",
+    "@pactor-app/expression": "1.1.0",
+    "@pactor-app/schema": "1.1.0"
   },
   "peerDependencies": {
     "react": ">=18"