@yaoxiu/marketing-dsl 1.2.0 → 1.3.0

package/dist/index.cjs

@@ -400,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;
@@ -956,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);
     }
   }
@@ -1019,7 +1036,7 @@ 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());
@@ -1153,7 +1170,7 @@ function createRuntime(dsl, options = {}) {
       dispatch,
       setState,
       closeTop,
-      firedEnds
+      countdownEnds
     });
     ticker.sync(tree.countdownEndTimes, tree.countdownPrecision);
     return tree;
@@ -1523,7 +1540,14 @@ function validateNodeByType(node, path, ctx) {
     }
   }
   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");
     }
@@ -1618,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

@@ -438,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

@@ -438,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

@@ -398,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;
@@ -954,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);
     }
   }
@@ -1017,7 +1034,7 @@ 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());
@@ -1151,7 +1168,7 @@ function createRuntime(dsl, options = {}) {
       dispatch,
       setState,
       closeTop,
-      firedEnds
+      countdownEnds
     });
     ticker.sync(tree.countdownEndTimes, tree.countdownPrecision);
     return tree;
@@ -1521,7 +1538,14 @@ function validateNodeByType(node, path, ctx) {
     }
   }
   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");
     }
@@ -1601,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.2.0",
+  "version": "1.3.0",
   "type": "module",
   "description": "营销弹窗 DSL 解释器核心，纯逻辑无框架依赖",
   "license": "MIT",