@yaoxiu/marketing-dsl 1.1.0 → 1.3.0

package/README.md

@@ -47,7 +47,7 @@ import { createRuntime } from '@yaoxiu/marketing-dsl';
 
 const runtime = createRuntime(dsl, {
   user: { shopName: '麦爆了旗舰店', version: '专业版' },
-  sources: { listRenewTiers: (params) => api.getTiers(params) },
+  sources: { listRenewTiers: params => api.getTiers(params) },
   handlers: { setNeverRemind: () => localStorage.setItem('never', '1') },
   emit: (event, payload) => console.log(event, payload),
 });
@@ -56,11 +56,18 @@ const unsubscribe = runtime.subscribe(() => {
   render(runtime.getTree()); // 每次通知后重新取树画一遍
 });
 
+// 用户信息异步到了、或者要切换编辑态，用 update 就地更新。
+// 不要为此重建 runtime——重建会重新拉数据源、重放曝光埋点，
+// 还会把用户已经切到的 tab 打回默认值。
+runtime.update({ user: { shopName: '麦爆了旗舰店' } });
+
 // 卸载时必须调，否则倒计时定时器不会停
 runtime.destroy();
 unsubscribe();
 ```
 
+`update` 能改 `user` / `handlers` / `editMode`。换 `dsl` 本身要重建 runtime。
+
 ## 渲染树
 
 `getTree()` 返回的是纯数据，所有解释工作都已经做完：插值算完了、条件判断过了、循环展开了、样式转成 CSS 了、坐标换算好了、动作绑好了。
@@ -97,14 +104,14 @@ unsubscribe();
 
 这几条是设计红线，不会因为「就差一点点」而放开：
 
-| 边界 | 做法 |
-| --- | --- |
-| 不执行任意代码 | 手写解析器，不用 `eval` / `new Function`；不支持函数调用和赋值 |
-| 不能沿原型链逃逸 | `constructor` / `__proto__` / `prototype` 一律读不到，函数值也读不到 |
-| 不能通过样式作恶 | 只有白名单里的属性会输出，`position: fixed` 这类会被丢弃 |
-| 不能执行 `javascript:` | 链接只允许 `http` / `https` / `mailto` / `tel` 和相对路径 |
-| 不能打任意接口 | 数据源用注册名引用，配置里写不了 URL |
-| 不能调任意方法 | `call` 只能调宿主注册在 `handlers` 里的方法 |
+| 边界                   | 做法                                                                 |
+| ---------------------- | -------------------------------------------------------------------- |
+| 不执行任意代码         | 手写解析器，不用 `eval` / `new Function`；不支持函数调用和赋值       |
+| 不能沿原型链逃逸       | `constructor` / `__proto__` / `prototype` 一律读不到，函数值也读不到 |
+| 不能通过样式作恶       | 只有白名单里的属性会输出，`position: fixed` 这类会被丢弃             |
+| 不能执行 `javascript:` | 链接只允许 `http` / `https` / `mailto` / `tel` 和相对路径            |
+| 不能打任意接口         | 数据源用注册名引用，配置里写不了 URL                                 |
+| 不能调任意方法         | `call` 只能调宿主注册在 `handlers` 里的方法                          |
 
 ## 完整 DSL 语法
 

package/dist/index.cjs

@@ -326,9 +326,11 @@ function safeImageUrl(input) {
 
 // src/actions.ts
 function createDispatcher(options) {
-  const { setState, emit, openView, closeTop, closeAll, handlers = {}, editMode = false } = options;
+  const { setState, emit, openView, closeTop, closeAll } = options;
   function dispatch(action, context) {
     if (!action || !action.type) return;
+    const handlers = options.handlers || {};
+    const editMode = !!options.editMode;
     switch (action.type) {
       case "sequence":
         (action.actions || []).forEach((item) => dispatch(item, context));
@@ -398,10 +400,24 @@ function parseEndTime(to) {
   if (typeof to === "number") return to;
   if (to === void 0 || to === null || to === "") return 0;
   const raw = String(to).trim();
+  if (!raw) return 0;
   if (/^\d+$/.test(raw)) return Number(raw);
-  const time = new Date(raw.replace(/-/g, "/")).getTime();
+  if (/^\d{4}年/.test(raw)) {
+    const normalizedZh = raw.replace(/年|月/g, "/").replace(/日/g, " ").replace(/时|点|分/g, ":").replace(/秒/g, "").replace(/:+/g, ":").replace(/\s+/g, " ").replace(/[:\s]+$/, "").replace(/(\s\d{1,2})$/, "$1:00").trim();
+    const time2 = new Date(normalizedZh).getTime();
+    return isNaN(time2) ? 0 : time2;
+  }
+  const isIso = /^\d{4}-\d{2}-\d{2}T/.test(raw);
+  const normalized = isIso ? raw : raw.replace(/-/g, "/");
+  const time = new Date(normalized).getTime();
   return isNaN(time) ? 0 : time;
 }
+function isValidEndTime(to) {
+  if (typeof to === "number") return isFinite(to) && to > 0;
+  if (typeof to !== "string") return false;
+  if (to.indexOf("{{") > -1) return true;
+  return parseEndTime(to) > 0;
+}
 function computeParts(endTime, now = Date.now()) {
   const raw = endTime - now;
   const remain = raw > 0 ? raw : 0;
@@ -608,7 +624,13 @@ function resolveTree(input) {
   );
   const countdowns = { endTimes: [], precision: "s" };
   const renderLayers = ready ? layers.map(
-    (item, index) => resolveLayer(item.name, item.view, index === layers.length - 1, input, countdowns)
+    (item, index) => resolveLayer(
+      item.name,
+      item.view,
+      index === layers.length - 1,
+      input,
+      countdowns
+    )
   ) : [];
   return {
     ready: ready && layers.length > 0,
@@ -627,7 +649,9 @@ function resolveLayer(name, view, isTop, input, countdowns) {
   const rootLayout = stage.layout === "flow" ? "flow" : "absolute";
   const maskClosable = !!stage.maskClosable;
   const onMaskClick = maskClosable ? () => closeTop("mask") : void 0;
-  const nodes = (view.nodes || []).map((node, index) => resolveNode(node, `${name}-${index}`, rootLayout, context, input, countdowns)).filter((el) => !!el);
+  const nodes = (view.nodes || []).map(
+    (node, index) => resolveNode(node, `${name}-${index}`, rootLayout, context, input, countdowns)
+  ).filter((el) => !!el);
   return {
     name,
     type: view.type,
@@ -690,8 +714,12 @@ function resolveStageStyle(stage, isPopup, context) {
     base,
     {
       // width / height 支持数字（px）、'100%' / 'auto' / calc(...) 等相对单位，也支持 {{ }}
-      width: toLength(interpolate(stage.width === void 0 ? 320 : stage.width, context)),
-      height: toLength(interpolate(stage.height === void 0 ? 400 : stage.height, context))
+      width: toLength(
+        interpolate(stage.width === void 0 ? 320 : stage.width, context)
+      ),
+      height: toLength(
+        interpolate(stage.height === void 0 ? 400 : stage.height, context)
+      )
     },
     // stage.style 也走一遍插值，这样切 tab 时弹窗本身的背景能跟着变
     toCssStyle(interpolateDeep(stage.style, context))
@@ -746,7 +774,12 @@ function resolveCloseButton(config, layerName, closeTop) {
           tag: "img",
           className: "dsl-close-img",
           src: image,
-          style: { width: "100%", height: "100%", objectFit: "contain", display: "block" }
+          style: {
+            width: "100%",
+            height: "100%",
+            objectFit: "contain",
+            display: "block"
+          }
         }
       ]
     };
@@ -796,7 +829,14 @@ function resolveNode(node, key, layout, context, input, countdowns) {
         className: nodeClass("box", !!onClick),
         style: Object.assign({ position: "relative" }, style),
         onClick,
-        children: resolveChildren(node.children, key, "absolute", context, input, countdowns)
+        children: resolveChildren(
+          node.children,
+          key,
+          "absolute",
+          context,
+          input,
+          countdowns
+        )
       };
     case "flex":
       return {
@@ -881,7 +921,14 @@ function resolveRepeat(node, key, context, input, countdowns) {
       [node.itemName || "item"]: item,
       [node.indexName || "index"]: index
     });
-    return resolveNode(node.template, `${key}-${index}`, "flow", itemContext, input, countdowns);
+    return resolveNode(
+      node.template,
+      `${key}-${index}`,
+      "flow",
+      itemContext,
+      input,
+      countdowns
+    );
   }).filter((el) => !!el);
 }
 function resolveTabs(node, key, context, input) {
@@ -923,10 +970,13 @@ function resolveCountdown(node, key, style, context, input, countdowns) {
   const parts = computeParts(endTime);
   countdowns.endTimes.push(endTime);
   if (node.precision === "cs") countdowns.precision = "cs";
-  if (parts.ended && endTime && node.onEnd) {
+  if (endTime && node.onEnd) {
     const token = `${key}@${endTime}`;
-    if (!input.firedEnds.has(token)) {
-      input.firedEnds.add(token);
+    const status = input.countdownEnds.get(token);
+    if (status === void 0) {
+      input.countdownEnds.set(token, parts.ended ? "done" : "waiting");
+    } else if (status === "waiting" && parts.ended) {
+      input.countdownEnds.set(token, "done");
       input.dispatch(node.onEnd, context);
     }
   }
@@ -954,7 +1004,14 @@ function resolveCountdown(node, key, style, context, input, countdowns) {
     tag: "div",
     className: "dsl-node dsl-flex dsl-countdown",
     style: Object.assign({ display: "flex" }, style),
-    children: resolveChildren(node.children, key, "flow", childContext, input, countdowns)
+    children: resolveChildren(
+      node.children,
+      key,
+      "flow",
+      childContext,
+      input,
+      countdowns
+    )
   };
 }
 function toText(value) {
@@ -965,7 +1022,12 @@ function toText(value) {
 var noopEmit = () => {
 };
 function createRuntime(dsl, options = {}) {
-  const { user = {}, sources = {}, handlers = {}, editMode = false, emit = noopEmit } = options;
+  const { sources = {}, emit = noopEmit } = options;
+  const live = {
+    user: options.user || {},
+    handlers: options.handlers || {},
+    editMode: !!options.editMode
+  };
   const normalized = normalizeViews(dsl);
   let state = Object.assign({}, dsl.state || {});
   let resolvedData = {};
@@ -974,14 +1036,17 @@ function createRuntime(dsl, options = {}) {
   let loadFailed = false;
   let destroyed = false;
   const listeners = /* @__PURE__ */ new Set();
-  const firedEnds = /* @__PURE__ */ new Set();
+  const countdownEnds = /* @__PURE__ */ new Map();
   const notify = () => {
     if (destroyed) return;
     listeners.forEach((fn) => fn());
   };
   const ticker = createTicker({ onTick: notify });
   function buildContext() {
-    const context = Object.assign({}, resolvedData, { state, user });
+    const context = Object.assign({}, resolvedData, {
+      state,
+      user: live.user
+    });
     const derived = dsl.derived || {};
     Object.keys(derived).forEach((name) => {
       const config = derived[name] || {};
@@ -1042,8 +1107,12 @@ function createRuntime(dsl, options = {}) {
     // 配置里 close 可以自带 reason（如 'never-remind'），要透传给埋点，不能吞掉
     closeTop: (reason) => closeTop(reason),
     closeAll: (reason) => closeAll(reason),
-    handlers,
-    editMode
+    get handlers() {
+      return live.handlers;
+    },
+    get editMode() {
+      return live.editMode;
+    }
   });
   function fireLifecycle(viewName, hook, extra) {
     const view = normalized.views[viewName];
@@ -1070,7 +1139,7 @@ function createRuntime(dsl, options = {}) {
         return;
       }
       pending.push(
-        Promise.resolve(source(ref.params || {}, user)).then((result) => {
+        Promise.resolve(source(ref.params || {}, live.user)).then((result) => {
           resolved[key] = result;
         })
       );
@@ -1101,13 +1170,19 @@ function createRuntime(dsl, options = {}) {
       dispatch,
       setState,
       closeTop,
-      firedEnds
+      countdownEnds
     });
     ticker.sync(tree.countdownEndTimes, tree.countdownPrecision);
     return tree;
   }
   return {
     getTree,
+    update(patch) {
+      if (patch.user !== void 0) live.user = patch.user;
+      if (patch.handlers !== void 0) live.handlers = patch.handlers;
+      if (patch.editMode !== void 0) live.editMode = patch.editMode;
+      notify();
+    },
     subscribe(listener) {
       listeners.add(listener);
       return () => listeners.delete(listener);
@@ -1186,7 +1261,10 @@ function validate(dsl) {
   }
   const doc = dsl;
   if (doc.version !== DSL_VERSION) {
-    add("version", `version \u5FC5\u987B\u662F ${DSL_VERSION}\uFF0C\u5F53\u524D\u4E3A ${JSON.stringify(doc.version)}`);
+    add(
+      "version",
+      `version \u5FC5\u987B\u662F ${DSL_VERSION}\uFF0C\u5F53\u524D\u4E3A ${JSON.stringify(doc.version)}`
+    );
   }
   const dataKeys = validateData(doc.data, add);
   const stateKeys = validateState(doc.state, add);
@@ -1286,7 +1364,10 @@ function validateStage(stage, add, warn, ctx, prefix) {
   if (stage.onShow !== void 0) validateAction(stage.onShow, at("onShow"), ctx);
   if (stage.onClose !== void 0) validateAction(stage.onClose, at("onClose"), ctx);
   if (stage.height === "auto" && stage.layout !== "flow") {
-    add("stage.height", "height: 'auto' \u9700\u8981\u540C\u65F6\u8BBE\u7F6E stage.layout: 'flow'\uFF0C\u5426\u5219\u9AD8\u5EA6\u4F1A\u584C\u6210 0");
+    add(
+      "stage.height",
+      "height: 'auto' \u9700\u8981\u540C\u65F6\u8BBE\u7F6E stage.layout: 'flow'\uFF0C\u5426\u5219\u9AD8\u5EA6\u4F1A\u584C\u6210 0"
+    );
   }
 }
 function validateCloseButton(config, add, warn) {
@@ -1300,7 +1381,10 @@ function validateCloseButton(config, add, warn) {
   }
   if (config.offset !== void 0) {
     if (!Array.isArray(config.offset) || config.offset.length !== 2) {
-      add("stage.closeButton.offset", "offset \u5FC5\u987B\u662F [x, y] \u4E24\u9879\u6570\u7EC4\uFF0C\u8D1F\u503C\u4F1A\u628A\u6309\u94AE\u79FB\u5230\u5F39\u7A97\u5916\u9762");
+      add(
+        "stage.closeButton.offset",
+        "offset \u5FC5\u987B\u662F [x, y] \u4E24\u9879\u6570\u7EC4\uFF0C\u8D1F\u503C\u4F1A\u628A\u6309\u94AE\u79FB\u5230\u5F39\u7A97\u5916\u9762"
+      );
     } else {
       config.offset.forEach((value, index) => {
         if (!checkLength(value)) {
@@ -1321,7 +1405,10 @@ function validateCloseButton(config, add, warn) {
   if (config.style) {
     Object.keys(config.style).forEach((key) => {
       if (ALLOWED_STYLE_KEYS.indexOf(key) === -1) {
-        warn(`stage.closeButton.style.${key}`, `\u6837\u5F0F\u5C5E\u6027 "${key}" \u4E0D\u5728\u767D\u540D\u5355\u5185\uFF0C\u6E32\u67D3\u65F6\u4F1A\u88AB\u5FFD\u7565`);
+        warn(
+          `stage.closeButton.style.${key}`,
+          `\u6837\u5F0F\u5C5E\u6027 "${key}" \u4E0D\u5728\u767D\u540D\u5355\u5185\uFF0C\u6E32\u67D3\u65F6\u4F1A\u88AB\u5FFD\u7565`
+        );
       }
     });
   }
@@ -1392,7 +1479,10 @@ function validateNode(node, path, layout, ctx) {
     } else {
       node.rect.forEach((value, index) => {
         if (value !== void 0 && value !== null && !checkLength(value)) {
-          add(`${path}.rect[${index}]`, `"${value}" \u4E0D\u662F\u5408\u6CD5\u957F\u5EA6\uFF0C\u652F\u6301\u6570\u5B57(px) / '100%' / 'auto' \u7B49`);
+          add(
+            `${path}.rect[${index}]`,
+            `"${value}" \u4E0D\u662F\u5408\u6CD5\u957F\u5EA6\uFF0C\u652F\u6301\u6570\u5B57(px) / '100%' / 'auto' \u7B49`
+          );
         }
       });
     }
@@ -1410,7 +1500,10 @@ function validateNode(node, path, layout, ctx) {
         );
       }
       if (key === "aspectRatio" && !checkAspectRatio(node.style[key])) {
-        add(`${path}.style.aspectRatio`, "aspectRatio \u8981\u5199\u6210 '750 / 200' \u6216 1.5 \u8FD9\u6837\u7684\u5BBD\u9AD8\u6BD4");
+        add(
+          `${path}.style.aspectRatio`,
+          "aspectRatio \u8981\u5199\u6210 '750 / 200' \u6216 1.5 \u8FD9\u6837\u7684\u5BBD\u9AD8\u6BD4"
+        );
       }
     });
   }
@@ -1440,13 +1533,21 @@ function validateNodeByType(node, path, ctx) {
     if (typeof node.bind !== "string") {
       add(`${path}.bind`, "tabs \u5FC5\u987B\u63D0\u4F9B bind\uFF08data \u4E2D\u7684\u6570\u7EC4\u5B57\u6BB5\u540D\uFF09");
     }
-    if (typeof node.stateKey !== "string") add(`${path}.stateKey`, "tabs \u5FC5\u987B\u63D0\u4F9B stateKey");
+    if (typeof node.stateKey !== "string")
+      add(`${path}.stateKey`, "tabs \u5FC5\u987B\u63D0\u4F9B stateKey");
     if (node.labelField !== void 0 && typeof node.labelField !== "string") {
       add(`${path}.labelField`, "labelField \u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
     }
   }
   if (node.type === "countdown") {
-    if (!node.to) add(`${path}.to`, "countdown \u5FC5\u987B\u63D0\u4F9B to\uFF08\u7ED3\u675F\u65F6\u95F4\uFF09");
+    if (!node.to) {
+      add(`${path}.to`, "countdown \u5FC5\u987B\u63D0\u4F9B to\uFF08\u7ED3\u675F\u65F6\u95F4\uFF09");
+    } else if (!isValidEndTime(node.to)) {
+      add(
+        `${path}.to`,
+        `"${node.to}" \u4E0D\u662F\u80FD\u8BC6\u522B\u7684\u65F6\u95F4\u3002\u53EF\u4EE5\u5199 "2026-09-01 18:00:00" / "2026-09-01" / "2026\u5E749\u67081\u65E5 18\u70B9" / ISO \u683C\u5F0F / \u65F6\u95F4\u6233`
+      );
+    }
     if (node.precision !== void 0 && ["s", "cs"].indexOf(node.precision) === -1) {
       add(`${path}.precision`, "precision \u53EA\u80FD\u662F 's'\uFF08\u6BCF\u79D2\uFF09\u6216 'cs'\uFF08\u5398\u79D2\uFF0C\u9010\u5E27\u5237\u65B0\uFF09");
     }
@@ -1506,7 +1607,10 @@ function validateAction(action, path, ctx) {
       add(`${path}.view`, `views \u91CC\u4E0D\u5B58\u5728\u89C6\u56FE "${action.view}"`);
     }
     if (action.mode !== void 0 && ["stack", "replace"].indexOf(action.mode) === -1) {
-      add(`${path}.mode`, "mode \u53EA\u80FD\u662F 'stack'\uFF08\u9ED8\u8BA4\uFF0C\u53E0\u4E00\u5C42\uFF09\u6216 'replace'\uFF08\u6362\u6389\u5F53\u524D\u5C42\uFF09");
+      add(
+        `${path}.mode`,
+        "mode \u53EA\u80FD\u662F 'stack'\uFF08\u9ED8\u8BA4\uFF0C\u53E0\u4E00\u5C42\uFF09\u6216 'replace'\uFF08\u6362\u6389\u5F53\u524D\u5C42\uFF09"
+      );
     }
   }
   if (action.type === "sequence") {
@@ -1538,6 +1642,7 @@ exports.formatParts = formatParts;
 exports.interpolate = interpolate;
 exports.interpolateDeep = interpolateDeep;
 exports.isLength = isLength;
+exports.isValidEndTime = isValidEndTime;
 exports.normalizeViews = normalizeViews;
 exports.parseEndTime = parseEndTime;
 exports.safeImageUrl = safeImageUrl;

package/dist/index.d.cts

@@ -293,6 +293,16 @@ interface RuntimeOptions {
 interface DslRuntime {
     /** 当前渲染树。每次 subscribe 回调后重新取 */
     getTree: () => RenderTree;
+    /**
+     * 更新宿主传进来的东西。
+     *
+     * user 常常是异步到的（弹窗先挂载、用户信息后到），
+     * 不给更新入口的话文案就永远停在初始值。
+     * editMode / handlers 同理，宿主可能中途换。
+     *
+     * 不会重新拉数据源，也不会重放 onShow 曝光埋点——那些是一次性的。
+     */
+    update: (patch: Pick<RuntimeOptions, 'user' | 'handlers' | 'editMode'>) => void;
     /** 状态变化时回调，返回取消订阅的函数 */
     subscribe: (listener: () => void) => () => void;
     /** 供调试台等外部读取，正常渲染不需要 */
@@ -428,9 +438,16 @@ interface CountdownParts {
 type CountdownPrecision = 's' | 'cs';
 /** 把 to 解析成时间戳。兼容 '2026-09-01 00:00:00' 这种 Safari 不认的格式 */
 declare function parseEndTime(to: unknown): number;
+/**
+ * 判断一个 to 能不能解析。给校验用。
+ *
+ * 解析失败会当成「已结束」，页面上只会看到一行「已结束」，
+ * 运营根本意识不到是自己时间写错了——所以必须在保存前就拦下来。
+ */
+declare function isValidEndTime(to: unknown): boolean;
 /** 算出某个时刻的时间片段 */
 declare function computeParts(endTime: number, now?: number): CountdownParts;
 /** 不给 children 时退化成一行文本，占位符 {d} {h} {hAll} {m} {s} {cs} */
 declare function formatParts(parts: CountdownParts, format?: string): string;
 
-export { ACTION_TYPES, ALLOWED_STYLE_KEYS, CLOSE_POSITIONS, type CountdownParts, type CountdownPrecision, type CssStyle, DSL_VERSION, type Dsl, type DslAction, type DslActionBase, type DslCallAction, type DslCloseAction, type DslCloseAllAction, type DslCloseButton, type DslClosePosition, type DslDerived, type DslHandler, type DslLength, type DslNavigateAction, type DslNode, type DslNodeType, type DslOpenAction, type DslRect, type DslRuntime, type DslSequenceAction, type DslSetStateAction, type DslSource, type DslSourceRef, type DslStage, type DslStyle, type DslTrackAction, type DslView, type DslViewType, type Issue, NODE_TYPES, type NormalizedViews, type RenderElement, type RenderLayer, type RenderTree, type RuntimeEmit, type RuntimeEventName, type RuntimeEvents, type RuntimeOptions, SINGLE_VIEW_NAME, type ValidateResult, check, computeParts, createRuntime, evaluate, formatIssues, formatParts, interpolate, interpolateDeep, isLength, normalizeViews, parseEndTime, safeImageUrl, safeUrl, toCssStyle, toLength, validate };
+export { ACTION_TYPES, ALLOWED_STYLE_KEYS, CLOSE_POSITIONS, type CountdownParts, type CountdownPrecision, type CssStyle, DSL_VERSION, type Dsl, type DslAction, type DslActionBase, type DslCallAction, type DslCloseAction, type DslCloseAllAction, type DslCloseButton, type DslClosePosition, type DslDerived, type DslHandler, type DslLength, type DslNavigateAction, type DslNode, type DslNodeType, type DslOpenAction, type DslRect, type DslRuntime, type DslSequenceAction, type DslSetStateAction, type DslSource, type DslSourceRef, type DslStage, type DslStyle, type DslTrackAction, type DslView, type DslViewType, type Issue, NODE_TYPES, type NormalizedViews, type RenderElement, type RenderLayer, type RenderTree, type RuntimeEmit, type RuntimeEventName, type RuntimeEvents, type RuntimeOptions, SINGLE_VIEW_NAME, type ValidateResult, check, computeParts, createRuntime, evaluate, formatIssues, formatParts, interpolate, interpolateDeep, isLength, isValidEndTime, normalizeViews, parseEndTime, safeImageUrl, safeUrl, toCssStyle, toLength, validate };

package/dist/index.d.ts

@@ -293,6 +293,16 @@ interface RuntimeOptions {
 interface DslRuntime {
     /** 当前渲染树。每次 subscribe 回调后重新取 */
     getTree: () => RenderTree;
+    /**
+     * 更新宿主传进来的东西。
+     *
+     * user 常常是异步到的（弹窗先挂载、用户信息后到），
+     * 不给更新入口的话文案就永远停在初始值。
+     * editMode / handlers 同理，宿主可能中途换。
+     *
+     * 不会重新拉数据源，也不会重放 onShow 曝光埋点——那些是一次性的。
+     */
+    update: (patch: Pick<RuntimeOptions, 'user' | 'handlers' | 'editMode'>) => void;
     /** 状态变化时回调，返回取消订阅的函数 */
     subscribe: (listener: () => void) => () => void;
     /** 供调试台等外部读取，正常渲染不需要 */
@@ -428,9 +438,16 @@ interface CountdownParts {
 type CountdownPrecision = 's' | 'cs';
 /** 把 to 解析成时间戳。兼容 '2026-09-01 00:00:00' 这种 Safari 不认的格式 */
 declare function parseEndTime(to: unknown): number;
+/**
+ * 判断一个 to 能不能解析。给校验用。
+ *
+ * 解析失败会当成「已结束」，页面上只会看到一行「已结束」，
+ * 运营根本意识不到是自己时间写错了——所以必须在保存前就拦下来。
+ */
+declare function isValidEndTime(to: unknown): boolean;
 /** 算出某个时刻的时间片段 */
 declare function computeParts(endTime: number, now?: number): CountdownParts;
 /** 不给 children 时退化成一行文本，占位符 {d} {h} {hAll} {m} {s} {cs} */
 declare function formatParts(parts: CountdownParts, format?: string): string;
 
-export { ACTION_TYPES, ALLOWED_STYLE_KEYS, CLOSE_POSITIONS, type CountdownParts, type CountdownPrecision, type CssStyle, DSL_VERSION, type Dsl, type DslAction, type DslActionBase, type DslCallAction, type DslCloseAction, type DslCloseAllAction, type DslCloseButton, type DslClosePosition, type DslDerived, type DslHandler, type DslLength, type DslNavigateAction, type DslNode, type DslNodeType, type DslOpenAction, type DslRect, type DslRuntime, type DslSequenceAction, type DslSetStateAction, type DslSource, type DslSourceRef, type DslStage, type DslStyle, type DslTrackAction, type DslView, type DslViewType, type Issue, NODE_TYPES, type NormalizedViews, type RenderElement, type RenderLayer, type RenderTree, type RuntimeEmit, type RuntimeEventName, type RuntimeEvents, type RuntimeOptions, SINGLE_VIEW_NAME, type ValidateResult, check, computeParts, createRuntime, evaluate, formatIssues, formatParts, interpolate, interpolateDeep, isLength, normalizeViews, parseEndTime, safeImageUrl, safeUrl, toCssStyle, toLength, validate };
+export { ACTION_TYPES, ALLOWED_STYLE_KEYS, CLOSE_POSITIONS, type CountdownParts, type CountdownPrecision, type CssStyle, DSL_VERSION, type Dsl, type DslAction, type DslActionBase, type DslCallAction, type DslCloseAction, type DslCloseAllAction, type DslCloseButton, type DslClosePosition, type DslDerived, type DslHandler, type DslLength, type DslNavigateAction, type DslNode, type DslNodeType, type DslOpenAction, type DslRect, type DslRuntime, type DslSequenceAction, type DslSetStateAction, type DslSource, type DslSourceRef, type DslStage, type DslStyle, type DslTrackAction, type DslView, type DslViewType, type Issue, NODE_TYPES, type NormalizedViews, type RenderElement, type RenderLayer, type RenderTree, type RuntimeEmit, type RuntimeEventName, type RuntimeEvents, type RuntimeOptions, SINGLE_VIEW_NAME, type ValidateResult, check, computeParts, createRuntime, evaluate, formatIssues, formatParts, interpolate, interpolateDeep, isLength, isValidEndTime, normalizeViews, parseEndTime, safeImageUrl, safeUrl, toCssStyle, toLength, validate };

package/dist/index.js

@@ -324,9 +324,11 @@ function safeImageUrl(input) {
 
 // src/actions.ts
 function createDispatcher(options) {
-  const { setState, emit, openView, closeTop, closeAll, handlers = {}, editMode = false } = options;
+  const { setState, emit, openView, closeTop, closeAll } = options;
   function dispatch(action, context) {
     if (!action || !action.type) return;
+    const handlers = options.handlers || {};
+    const editMode = !!options.editMode;
     switch (action.type) {
       case "sequence":
         (action.actions || []).forEach((item) => dispatch(item, context));
@@ -396,10 +398,24 @@ function parseEndTime(to) {
   if (typeof to === "number") return to;
   if (to === void 0 || to === null || to === "") return 0;
   const raw = String(to).trim();
+  if (!raw) return 0;
   if (/^\d+$/.test(raw)) return Number(raw);
-  const time = new Date(raw.replace(/-/g, "/")).getTime();
+  if (/^\d{4}年/.test(raw)) {
+    const normalizedZh = raw.replace(/年|月/g, "/").replace(/日/g, " ").replace(/时|点|分/g, ":").replace(/秒/g, "").replace(/:+/g, ":").replace(/\s+/g, " ").replace(/[:\s]+$/, "").replace(/(\s\d{1,2})$/, "$1:00").trim();
+    const time2 = new Date(normalizedZh).getTime();
+    return isNaN(time2) ? 0 : time2;
+  }
+  const isIso = /^\d{4}-\d{2}-\d{2}T/.test(raw);
+  const normalized = isIso ? raw : raw.replace(/-/g, "/");
+  const time = new Date(normalized).getTime();
   return isNaN(time) ? 0 : time;
 }
+function isValidEndTime(to) {
+  if (typeof to === "number") return isFinite(to) && to > 0;
+  if (typeof to !== "string") return false;
+  if (to.indexOf("{{") > -1) return true;
+  return parseEndTime(to) > 0;
+}
 function computeParts(endTime, now = Date.now()) {
   const raw = endTime - now;
   const remain = raw > 0 ? raw : 0;
@@ -606,7 +622,13 @@ function resolveTree(input) {
   );
   const countdowns = { endTimes: [], precision: "s" };
   const renderLayers = ready ? layers.map(
-    (item, index) => resolveLayer(item.name, item.view, index === layers.length - 1, input, countdowns)
+    (item, index) => resolveLayer(
+      item.name,
+      item.view,
+      index === layers.length - 1,
+      input,
+      countdowns
+    )
   ) : [];
   return {
     ready: ready && layers.length > 0,
@@ -625,7 +647,9 @@ function resolveLayer(name, view, isTop, input, countdowns) {
   const rootLayout = stage.layout === "flow" ? "flow" : "absolute";
   const maskClosable = !!stage.maskClosable;
   const onMaskClick = maskClosable ? () => closeTop("mask") : void 0;
-  const nodes = (view.nodes || []).map((node, index) => resolveNode(node, `${name}-${index}`, rootLayout, context, input, countdowns)).filter((el) => !!el);
+  const nodes = (view.nodes || []).map(
+    (node, index) => resolveNode(node, `${name}-${index}`, rootLayout, context, input, countdowns)
+  ).filter((el) => !!el);
   return {
     name,
     type: view.type,
@@ -688,8 +712,12 @@ function resolveStageStyle(stage, isPopup, context) {
     base,
     {
       // width / height 支持数字（px）、'100%' / 'auto' / calc(...) 等相对单位，也支持 {{ }}
-      width: toLength(interpolate(stage.width === void 0 ? 320 : stage.width, context)),
-      height: toLength(interpolate(stage.height === void 0 ? 400 : stage.height, context))
+      width: toLength(
+        interpolate(stage.width === void 0 ? 320 : stage.width, context)
+      ),
+      height: toLength(
+        interpolate(stage.height === void 0 ? 400 : stage.height, context)
+      )
     },
     // stage.style 也走一遍插值，这样切 tab 时弹窗本身的背景能跟着变
     toCssStyle(interpolateDeep(stage.style, context))
@@ -744,7 +772,12 @@ function resolveCloseButton(config, layerName, closeTop) {
           tag: "img",
           className: "dsl-close-img",
           src: image,
-          style: { width: "100%", height: "100%", objectFit: "contain", display: "block" }
+          style: {
+            width: "100%",
+            height: "100%",
+            objectFit: "contain",
+            display: "block"
+          }
         }
       ]
     };
@@ -794,7 +827,14 @@ function resolveNode(node, key, layout, context, input, countdowns) {
         className: nodeClass("box", !!onClick),
         style: Object.assign({ position: "relative" }, style),
         onClick,
-        children: resolveChildren(node.children, key, "absolute", context, input, countdowns)
+        children: resolveChildren(
+          node.children,
+          key,
+          "absolute",
+          context,
+          input,
+          countdowns
+        )
       };
     case "flex":
       return {
@@ -879,7 +919,14 @@ function resolveRepeat(node, key, context, input, countdowns) {
       [node.itemName || "item"]: item,
       [node.indexName || "index"]: index
     });
-    return resolveNode(node.template, `${key}-${index}`, "flow", itemContext, input, countdowns);
+    return resolveNode(
+      node.template,
+      `${key}-${index}`,
+      "flow",
+      itemContext,
+      input,
+      countdowns
+    );
   }).filter((el) => !!el);
 }
 function resolveTabs(node, key, context, input) {
@@ -921,10 +968,13 @@ function resolveCountdown(node, key, style, context, input, countdowns) {
   const parts = computeParts(endTime);
   countdowns.endTimes.push(endTime);
   if (node.precision === "cs") countdowns.precision = "cs";
-  if (parts.ended && endTime && node.onEnd) {
+  if (endTime && node.onEnd) {
     const token = `${key}@${endTime}`;
-    if (!input.firedEnds.has(token)) {
-      input.firedEnds.add(token);
+    const status = input.countdownEnds.get(token);
+    if (status === void 0) {
+      input.countdownEnds.set(token, parts.ended ? "done" : "waiting");
+    } else if (status === "waiting" && parts.ended) {
+      input.countdownEnds.set(token, "done");
       input.dispatch(node.onEnd, context);
     }
   }
@@ -952,7 +1002,14 @@ function resolveCountdown(node, key, style, context, input, countdowns) {
     tag: "div",
     className: "dsl-node dsl-flex dsl-countdown",
     style: Object.assign({ display: "flex" }, style),
-    children: resolveChildren(node.children, key, "flow", childContext, input, countdowns)
+    children: resolveChildren(
+      node.children,
+      key,
+      "flow",
+      childContext,
+      input,
+      countdowns
+    )
   };
 }
 function toText(value) {
@@ -963,7 +1020,12 @@ function toText(value) {
 var noopEmit = () => {
 };
 function createRuntime(dsl, options = {}) {
-  const { user = {}, sources = {}, handlers = {}, editMode = false, emit = noopEmit } = options;
+  const { sources = {}, emit = noopEmit } = options;
+  const live = {
+    user: options.user || {},
+    handlers: options.handlers || {},
+    editMode: !!options.editMode
+  };
   const normalized = normalizeViews(dsl);
   let state = Object.assign({}, dsl.state || {});
   let resolvedData = {};
@@ -972,14 +1034,17 @@ function createRuntime(dsl, options = {}) {
   let loadFailed = false;
   let destroyed = false;
   const listeners = /* @__PURE__ */ new Set();
-  const firedEnds = /* @__PURE__ */ new Set();
+  const countdownEnds = /* @__PURE__ */ new Map();
   const notify = () => {
     if (destroyed) return;
     listeners.forEach((fn) => fn());
   };
   const ticker = createTicker({ onTick: notify });
   function buildContext() {
-    const context = Object.assign({}, resolvedData, { state, user });
+    const context = Object.assign({}, resolvedData, {
+      state,
+      user: live.user
+    });
     const derived = dsl.derived || {};
     Object.keys(derived).forEach((name) => {
       const config = derived[name] || {};
@@ -1040,8 +1105,12 @@ function createRuntime(dsl, options = {}) {
     // 配置里 close 可以自带 reason（如 'never-remind'），要透传给埋点，不能吞掉
     closeTop: (reason) => closeTop(reason),
     closeAll: (reason) => closeAll(reason),
-    handlers,
-    editMode
+    get handlers() {
+      return live.handlers;
+    },
+    get editMode() {
+      return live.editMode;
+    }
   });
   function fireLifecycle(viewName, hook, extra) {
     const view = normalized.views[viewName];
@@ -1068,7 +1137,7 @@ function createRuntime(dsl, options = {}) {
         return;
       }
       pending.push(
-        Promise.resolve(source(ref.params || {}, user)).then((result) => {
+        Promise.resolve(source(ref.params || {}, live.user)).then((result) => {
           resolved[key] = result;
         })
       );
@@ -1099,13 +1168,19 @@ function createRuntime(dsl, options = {}) {
       dispatch,
       setState,
       closeTop,
-      firedEnds
+      countdownEnds
     });
     ticker.sync(tree.countdownEndTimes, tree.countdownPrecision);
     return tree;
   }
   return {
     getTree,
+    update(patch) {
+      if (patch.user !== void 0) live.user = patch.user;
+      if (patch.handlers !== void 0) live.handlers = patch.handlers;
+      if (patch.editMode !== void 0) live.editMode = patch.editMode;
+      notify();
+    },
     subscribe(listener) {
       listeners.add(listener);
       return () => listeners.delete(listener);
@@ -1184,7 +1259,10 @@ function validate(dsl) {
   }
   const doc = dsl;
   if (doc.version !== DSL_VERSION) {
-    add("version", `version \u5FC5\u987B\u662F ${DSL_VERSION}\uFF0C\u5F53\u524D\u4E3A ${JSON.stringify(doc.version)}`);
+    add(
+      "version",
+      `version \u5FC5\u987B\u662F ${DSL_VERSION}\uFF0C\u5F53\u524D\u4E3A ${JSON.stringify(doc.version)}`
+    );
   }
   const dataKeys = validateData(doc.data, add);
   const stateKeys = validateState(doc.state, add);
@@ -1284,7 +1362,10 @@ function validateStage(stage, add, warn, ctx, prefix) {
   if (stage.onShow !== void 0) validateAction(stage.onShow, at("onShow"), ctx);
   if (stage.onClose !== void 0) validateAction(stage.onClose, at("onClose"), ctx);
   if (stage.height === "auto" && stage.layout !== "flow") {
-    add("stage.height", "height: 'auto' \u9700\u8981\u540C\u65F6\u8BBE\u7F6E stage.layout: 'flow'\uFF0C\u5426\u5219\u9AD8\u5EA6\u4F1A\u584C\u6210 0");
+    add(
+      "stage.height",
+      "height: 'auto' \u9700\u8981\u540C\u65F6\u8BBE\u7F6E stage.layout: 'flow'\uFF0C\u5426\u5219\u9AD8\u5EA6\u4F1A\u584C\u6210 0"
+    );
   }
 }
 function validateCloseButton(config, add, warn) {
@@ -1298,7 +1379,10 @@ function validateCloseButton(config, add, warn) {
   }
   if (config.offset !== void 0) {
     if (!Array.isArray(config.offset) || config.offset.length !== 2) {
-      add("stage.closeButton.offset", "offset \u5FC5\u987B\u662F [x, y] \u4E24\u9879\u6570\u7EC4\uFF0C\u8D1F\u503C\u4F1A\u628A\u6309\u94AE\u79FB\u5230\u5F39\u7A97\u5916\u9762");
+      add(
+        "stage.closeButton.offset",
+        "offset \u5FC5\u987B\u662F [x, y] \u4E24\u9879\u6570\u7EC4\uFF0C\u8D1F\u503C\u4F1A\u628A\u6309\u94AE\u79FB\u5230\u5F39\u7A97\u5916\u9762"
+      );
     } else {
       config.offset.forEach((value, index) => {
         if (!checkLength(value)) {
@@ -1319,7 +1403,10 @@ function validateCloseButton(config, add, warn) {
   if (config.style) {
     Object.keys(config.style).forEach((key) => {
       if (ALLOWED_STYLE_KEYS.indexOf(key) === -1) {
-        warn(`stage.closeButton.style.${key}`, `\u6837\u5F0F\u5C5E\u6027 "${key}" \u4E0D\u5728\u767D\u540D\u5355\u5185\uFF0C\u6E32\u67D3\u65F6\u4F1A\u88AB\u5FFD\u7565`);
+        warn(
+          `stage.closeButton.style.${key}`,
+          `\u6837\u5F0F\u5C5E\u6027 "${key}" \u4E0D\u5728\u767D\u540D\u5355\u5185\uFF0C\u6E32\u67D3\u65F6\u4F1A\u88AB\u5FFD\u7565`
+        );
       }
     });
   }
@@ -1390,7 +1477,10 @@ function validateNode(node, path, layout, ctx) {
     } else {
       node.rect.forEach((value, index) => {
         if (value !== void 0 && value !== null && !checkLength(value)) {
-          add(`${path}.rect[${index}]`, `"${value}" \u4E0D\u662F\u5408\u6CD5\u957F\u5EA6\uFF0C\u652F\u6301\u6570\u5B57(px) / '100%' / 'auto' \u7B49`);
+          add(
+            `${path}.rect[${index}]`,
+            `"${value}" \u4E0D\u662F\u5408\u6CD5\u957F\u5EA6\uFF0C\u652F\u6301\u6570\u5B57(px) / '100%' / 'auto' \u7B49`
+          );
         }
       });
     }
@@ -1408,7 +1498,10 @@ function validateNode(node, path, layout, ctx) {
         );
       }
       if (key === "aspectRatio" && !checkAspectRatio(node.style[key])) {
-        add(`${path}.style.aspectRatio`, "aspectRatio \u8981\u5199\u6210 '750 / 200' \u6216 1.5 \u8FD9\u6837\u7684\u5BBD\u9AD8\u6BD4");
+        add(
+          `${path}.style.aspectRatio`,
+          "aspectRatio \u8981\u5199\u6210 '750 / 200' \u6216 1.5 \u8FD9\u6837\u7684\u5BBD\u9AD8\u6BD4"
+        );
       }
     });
   }
@@ -1438,13 +1531,21 @@ function validateNodeByType(node, path, ctx) {
     if (typeof node.bind !== "string") {
       add(`${path}.bind`, "tabs \u5FC5\u987B\u63D0\u4F9B bind\uFF08data \u4E2D\u7684\u6570\u7EC4\u5B57\u6BB5\u540D\uFF09");
     }
-    if (typeof node.stateKey !== "string") add(`${path}.stateKey`, "tabs \u5FC5\u987B\u63D0\u4F9B stateKey");
+    if (typeof node.stateKey !== "string")
+      add(`${path}.stateKey`, "tabs \u5FC5\u987B\u63D0\u4F9B stateKey");
     if (node.labelField !== void 0 && typeof node.labelField !== "string") {
       add(`${path}.labelField`, "labelField \u5FC5\u987B\u662F\u5B57\u7B26\u4E32");
     }
   }
   if (node.type === "countdown") {
-    if (!node.to) add(`${path}.to`, "countdown \u5FC5\u987B\u63D0\u4F9B to\uFF08\u7ED3\u675F\u65F6\u95F4\uFF09");
+    if (!node.to) {
+      add(`${path}.to`, "countdown \u5FC5\u987B\u63D0\u4F9B to\uFF08\u7ED3\u675F\u65F6\u95F4\uFF09");
+    } else if (!isValidEndTime(node.to)) {
+      add(
+        `${path}.to`,
+        `"${node.to}" \u4E0D\u662F\u80FD\u8BC6\u522B\u7684\u65F6\u95F4\u3002\u53EF\u4EE5\u5199 "2026-09-01 18:00:00" / "2026-09-01" / "2026\u5E749\u67081\u65E5 18\u70B9" / ISO \u683C\u5F0F / \u65F6\u95F4\u6233`
+      );
+    }
     if (node.precision !== void 0 && ["s", "cs"].indexOf(node.precision) === -1) {
       add(`${path}.precision`, "precision \u53EA\u80FD\u662F 's'\uFF08\u6BCF\u79D2\uFF09\u6216 'cs'\uFF08\u5398\u79D2\uFF0C\u9010\u5E27\u5237\u65B0\uFF09");
     }
@@ -1504,7 +1605,10 @@ function validateAction(action, path, ctx) {
       add(`${path}.view`, `views \u91CC\u4E0D\u5B58\u5728\u89C6\u56FE "${action.view}"`);
     }
     if (action.mode !== void 0 && ["stack", "replace"].indexOf(action.mode) === -1) {
-      add(`${path}.mode`, "mode \u53EA\u80FD\u662F 'stack'\uFF08\u9ED8\u8BA4\uFF0C\u53E0\u4E00\u5C42\uFF09\u6216 'replace'\uFF08\u6362\u6389\u5F53\u524D\u5C42\uFF09");
+      add(
+        `${path}.mode`,
+        "mode \u53EA\u80FD\u662F 'stack'\uFF08\u9ED8\u8BA4\uFF0C\u53E0\u4E00\u5C42\uFF09\u6216 'replace'\uFF08\u6362\u6389\u5F53\u524D\u5C42\uFF09"
+      );
     }
   }
   if (action.type === "sequence") {
@@ -1521,4 +1625,4 @@ function formatIssues(issues) {
   return issues.map((item) => item.path ? `${item.path}: ${item.message}` : item.message).join("\n");
 }
 
-export { ACTION_TYPES, ALLOWED_STYLE_KEYS, CLOSE_POSITIONS, DSL_VERSION, NODE_TYPES, SINGLE_VIEW_NAME, check, computeParts, createRuntime, evaluate, formatIssues, formatParts, interpolate, interpolateDeep, isLength, normalizeViews, parseEndTime, safeImageUrl, safeUrl, toCssStyle, toLength, validate };
+export { ACTION_TYPES, ALLOWED_STYLE_KEYS, CLOSE_POSITIONS, DSL_VERSION, NODE_TYPES, SINGLE_VIEW_NAME, check, computeParts, createRuntime, evaluate, formatIssues, formatParts, interpolate, interpolateDeep, isLength, isValidEndTime, normalizeViews, parseEndTime, safeImageUrl, safeUrl, toCssStyle, toLength, validate };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yaoxiu/marketing-dsl",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "营销弹窗 DSL 解释器核心，纯逻辑无框架依赖",
   "license": "MIT",