triggerix-editor-preset-war3 0.0.6 → 0.0.8

package/dist/index.cjs

@@ -34,47 +34,6 @@ function parseTemplate(template, slots, slotValues) {
   return segments;
 }
 
-function buildDescriptor(def, slotValues) {
-  return {
-    id: def.id,
-    segments: parseTemplate(def.template, def.slots, slotValues)
-  };
-}
-function getEventDescriptor(registry, id, slotValues) {
-  const def = registry.getEvent(id);
-  return def ? buildDescriptor(def, slotValues) : null;
-}
-function getActionDescriptor(registry, id, slotValues) {
-  const def = registry.getAction(id);
-  return def ? buildDescriptor(def, slotValues) : null;
-}
-function getConditionDescriptor(registry, id, slotValues) {
-  const def = registry.getCondition(id);
-  return def ? buildDescriptor(def, slotValues) : null;
-}
-function getToolDescriptor(registry, toolName, slotValues) {
-  const def = registry.getTool(toolName);
-  if (!def)
-    return null;
-  if (def.kind === "leaf") {
-    return {
-      kind: "leaf",
-      name: toolName,
-      label: def.label,
-      input: def.input
-    };
-  }
-  return {
-    kind: "composite",
-    name: toolName,
-    label: def.label,
-    segments: parseTemplate(def.template, def.slots, slotValues)
-  };
-}
-function getSlotToolDescriptors(registry, slotDef) {
-  return slotDef.tools.map((name) => getToolDescriptor(registry, name)).filter((d) => d !== null);
-}
-
 class War3Registry extends editor.BaseRegistry {
   tools = /* @__PURE__ */ new Map();
   registerTool(name, def) {
@@ -97,74 +56,8 @@ class War3Registry extends editor.BaseRegistry {
   }
 }
 
-function resolveSlotValue(entry, registry) {
-  if (!entry.tool)
-    return void 0;
-  const toolDef = registry.getTool(entry.tool);
-  if (!toolDef)
-    return void 0;
-  if (toolDef.kind === "leaf") {
-    return toolDef.resolve(entry.value);
-  }
-  const resolvedSubSlots = {};
-  if (entry.subSlots) {
-    for (const [key, subEntry] of Object.entries(entry.subSlots)) {
-      resolvedSubSlots[key] = resolveSlotValue(subEntry, registry);
-    }
-  }
-  return toolDef.resolve(resolvedSubSlots);
-}
-function resolveItemParams(slotValues, registry) {
-  const params = {};
-  let hasParams = false;
-  for (const [key, entry] of Object.entries(slotValues)) {
-    const resolved = resolveSlotValue(entry, registry);
-    if (resolved !== void 0) {
-      params[key] = resolved;
-      hasParams = true;
-    }
-  }
-  return hasParams ? params : void 0;
-}
-function serializeItems(items, registry) {
-  return items.map((item) => {
-    const params = resolveItemParams(item.slotValues, registry);
-    const action = { type: item.id };
-    if (params) {
-      action.params = params;
-    }
-    return action;
-  });
-}
-function generateTriggerId() {
-  if (typeof globalThis.crypto?.randomUUID === "function") {
-    return globalThis.crypto.randomUUID();
-  }
-  return `trigger-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
-}
-function toTrigger(state, registry, triggerId) {
-  const eventParams = state.event ? resolveItemParams(state.event.slotValues, registry) : void 0;
-  const event = {
-    type: state.event?.id ?? "",
-    ...eventParams ? { payload: eventParams } : {}
-  };
-  const actions = serializeItems(state.actions, registry);
-  const trigger = {
-    id: triggerId ?? generateTriggerId(),
-    event,
-    actions
-  };
-  if (state.conditions.length > 0) {
-    trigger.conditions = {
-      type: "and",
-      conditions: serializeItems(state.conditions, registry)
-    };
-  }
-  return trigger;
-}
-
 const INITIAL_STATE = {
-  event: null,
+  events: [],
   conditions: [],
   actions: []
 };
@@ -172,24 +65,60 @@ class War3EditorStateManager extends editor.ObservableState {
   constructor() {
     super({ ...INITIAL_STATE });
   }
-  // --- Event ---
+  // --- Events ---
+  /**
+   * Single-event UI helper: reset the events array to one freshly-initialized event.
+   * Preserves conditions and actions; only the events slot is replaced.
+   */
   setEvent(id) {
-    this.setState((s) => ({ ...s, event: { id, slotValues: {} } }));
+    this.setState((s) => ({
+      ...s,
+      events: [{ id, slotValues: {} }]
+    }));
   }
+  /**
+   * Clear all events (single-event UI equivalent: no event configured).
+   */
   clearEvent() {
-    this.setState((s) => ({ ...s, event: null }));
+    this.setState((s) => ({ ...s, events: [] }));
   }
+  /**
+   * Single-event UI helper: set a slot on events[0]. No-op when no event is configured.
+   */
   setEventSlot(key, entry) {
+    this.setEventSlotAt(0, key, entry);
+  }
+  /**
+   * Multi-event: append a freshly-initialized event. Returns the new event's index.
+   */
+  addEvent(id) {
+    const index = this.getState().events.length;
+    this.setState((s) => ({ ...s, events: [...s.events, { id, slotValues: {} }] }));
+    return index;
+  }
+  /**
+   * Multi-event: remove an event by index. Out-of-range index is a no-op.
+   */
+  removeEvent(index) {
+    this.setState((s) => ({
+      ...s,
+      events: s.events.filter((_, i) => i !== index)
+    }));
+  }
+  /**
+   * Multi-event: set a slot on the event at the given index. Out-of-range index is a no-op.
+   */
+  setEventSlotAt(index, key, entry) {
     this.setState((s) => {
-      if (!s.event)
+      const target = s.events[index];
+      if (!target)
         return s;
-      return {
-        ...s,
-        event: {
-          ...s.event,
-          slotValues: { ...s.event.slotValues, [key]: entry }
-        }
+      const events = [...s.events];
+      events[index] = {
+        ...target,
+        slotValues: { ...target.slotValues, [key]: entry }
       };
+      return { ...s, events };
     });
   }
   // --- Actions ---
@@ -249,6 +178,113 @@ class War3EditorStateManager extends editor.ObservableState {
   }
 }
 
+function buildDescriptor(def, slotValues) {
+  return {
+    id: def.id,
+    segments: parseTemplate(def.template, def.slots, slotValues)
+  };
+}
+function getEventDescriptor(registry, id, slotValues) {
+  const def = registry.getEvent(id);
+  return def ? buildDescriptor(def, slotValues) : null;
+}
+function getActionDescriptor(registry, id, slotValues) {
+  const def = registry.getAction(id);
+  return def ? buildDescriptor(def, slotValues) : null;
+}
+function getConditionDescriptor(registry, id, slotValues) {
+  const def = registry.getCondition(id);
+  return def ? buildDescriptor(def, slotValues) : null;
+}
+function getToolDescriptor(registry, toolName, slotValues) {
+  const def = registry.getTool(toolName);
+  if (!def)
+    return null;
+  if (def.kind === "leaf") {
+    return {
+      kind: "leaf",
+      name: toolName,
+      label: def.label,
+      input: def.input
+    };
+  }
+  return {
+    kind: "composite",
+    name: toolName,
+    label: def.label,
+    segments: parseTemplate(def.template, def.slots, slotValues)
+  };
+}
+function getSlotToolDescriptors(registry, slotDef) {
+  return slotDef.tools.map((name) => getToolDescriptor(registry, name)).filter((d) => d !== null);
+}
+
+function resolveSlotValue(entry, registry) {
+  if (!entry.tool)
+    return void 0;
+  const toolDef = registry.getTool(entry.tool);
+  if (!toolDef)
+    return void 0;
+  if (toolDef.kind === "leaf") {
+    return toolDef.resolve(entry.value);
+  }
+  const resolvedSubSlots = {};
+  if (entry.subSlots) {
+    for (const [key, subEntry] of Object.entries(entry.subSlots)) {
+      resolvedSubSlots[key] = resolveSlotValue(subEntry, registry);
+    }
+  }
+  return toolDef.resolve(resolvedSubSlots);
+}
+function resolveItemParams(slotValues, registry) {
+  const params = {};
+  let hasParams = false;
+  for (const [key, entry] of Object.entries(slotValues)) {
+    const resolved = resolveSlotValue(entry, registry);
+    if (resolved !== void 0) {
+      params[key] = resolved;
+      hasParams = true;
+    }
+  }
+  return hasParams ? params : void 0;
+}
+function serializeEvent(item, registry) {
+  const eventParams = resolveItemParams(item.slotValues, registry);
+  return {
+    type: item.id,
+    ...eventParams ? { payload: eventParams } : {}
+  };
+}
+function serializeItems(items, registry) {
+  return items.map((item) => {
+    const params = resolveItemParams(item.slotValues, registry);
+    const action = { type: item.id };
+    if (params) {
+      action.params = params;
+    }
+    return action;
+  });
+}
+function generateTriggerId() {
+  if (typeof globalThis.crypto?.randomUUID === "function") {
+    return globalThis.crypto.randomUUID();
+  }
+  return `trigger-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`;
+}
+function toTrigger(state, registry, triggerId) {
+  const events = state.events.map((item) => serializeEvent(item, registry));
+  const actions = serializeItems(state.actions, registry);
+  const trigger = {
+    id: triggerId ?? generateTriggerId(),
+    events,
+    actions
+  };
+  if (state.conditions.length > 0) {
+    trigger.conditions = serializeItems(state.conditions, registry);
+  }
+  return trigger;
+}
+
 function createWar3Editor() {
   const registry = new War3Registry();
   const stateManager = new War3EditorStateManager();
@@ -271,11 +307,12 @@ function createWar3Editor() {
     getAvailableActions: () => registry.getActions(),
     getAvailableConditions: () => registry.getConditions(),
     // --- 描述符 ---
-    getEventDescriptor: () => {
+    getEventDescriptor: (index = 0) => {
       const state = stateManager.getState();
-      if (!state.event)
+      const ev = state.events[index];
+      if (!ev)
         return null;
-      return getEventDescriptor(registry, state.event.id, state.event.slotValues);
+      return getEventDescriptor(registry, ev.id, ev.slotValues);
     },
     getActionDescriptor: (index) => {
       const state = stateManager.getState();
@@ -297,6 +334,9 @@ function createWar3Editor() {
     setEvent: (id) => stateManager.setEvent(id),
     clearEvent: () => stateManager.clearEvent(),
     setEventSlot: (key, entry) => stateManager.setEventSlot(key, entry),
+    addEvent: (id) => stateManager.addEvent(id),
+    removeEvent: (index) => stateManager.removeEvent(index),
+    setEventSlotAt: (index, key, entry) => stateManager.setEventSlotAt(index, key, entry),
     addAction: (id) => stateManager.addAction(id),
     removeAction: (index) => stateManager.removeAction(index),
     moveAction: (from, to) => stateManager.moveAction(from, to),
@@ -316,6 +356,16 @@ function createWar3Editor() {
   return editor;
 }
 
+function defineLeafTool(def) {
+  return { ...def, kind: "leaf" };
+}
+function defineCompositeTool(def) {
+  return { ...def, kind: "composite" };
+}
+function defineCondition(def) {
+  return def;
+}
+
 function valueEquals(a, b) {
   if (a === b)
     return true;
@@ -368,16 +418,6 @@ function resolveSlotDisplayText(entry, registry, fallbackLabel) {
   }).join("");
 }
 
-function defineLeafTool(def) {
-  return { ...def, kind: "leaf" };
-}
-function defineCompositeTool(def) {
-  return { ...def, kind: "composite" };
-}
-function defineCondition(def) {
-  return def;
-}
-
 function defineWar3Preset(options) {
   return {
     name: options.name,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { BaseItemDef, BaseRegistry, Editor, Preset, ObservableState } from '@triggerix/editor';
+import { BaseItemDef, BaseRegistry, ObservableState, Editor, Preset } from '@triggerix/editor';
 export { BaseItemDef, Preset } from '@triggerix/editor';
 import { Value, Trigger } from '@triggerix/core';
 
@@ -81,7 +81,12 @@ interface ItemState {
     slotValues: Record<string, SlotValueEntry>;
 }
 interface War3EditorState {
-    event: ItemState | null;
+    /**
+     * Event sources that activate the trigger (OR semantics across the array).
+     * Empty array = no event configured.
+     * Single-event UI usually keeps this at length 0 or 1.
+     */
+    events: ItemState[];
     conditions: ItemState[];
     actions: ItemState[];
 }
@@ -93,6 +98,12 @@ interface War3PresetOptions {
     tools?: Record<string, ToolDef>;
 }
 
+/**
+ * 解析模板字符串为 Segment 数组
+ * 模板格式: "普通文本${slotKey}更多文本"
+ */
+declare function parseTemplate(template: string, slots?: Record<string, SlotDef>, slotValues?: Record<string, SlotValueEntry>): Segment[];
+
 /**
  * War3 注册表 - 继承 BaseRegistry，增加 Tool 注册能力
  */
@@ -107,6 +118,48 @@ declare class War3Registry extends BaseRegistry<War3EventDef, War3ActionDef, War
     };
 }
 
+/**
+ * War3 编辑器状态管理
+ * 继承 ObservableState，提供模板模式特有的状态操作
+ */
+declare class War3EditorStateManager extends ObservableState<War3EditorState> {
+    constructor();
+    /**
+     * Single-event UI helper: reset the events array to one freshly-initialized event.
+     * Preserves conditions and actions; only the events slot is replaced.
+     */
+    setEvent(id: string): void;
+    /**
+     * Clear all events (single-event UI equivalent: no event configured).
+     */
+    clearEvent(): void;
+    /**
+     * Single-event UI helper: set a slot on events[0]. No-op when no event is configured.
+     */
+    setEventSlot(key: string, entry: SlotValueEntry): void;
+    /**
+     * Multi-event: append a freshly-initialized event. Returns the new event's index.
+     */
+    addEvent(id: string): number;
+    /**
+     * Multi-event: remove an event by index. Out-of-range index is a no-op.
+     */
+    removeEvent(index: number): void;
+    /**
+     * Multi-event: set a slot on the event at the given index. Out-of-range index is a no-op.
+     */
+    setEventSlotAt(index: number, key: string, entry: SlotValueEntry): void;
+    addAction(id: string): void;
+    removeAction(index: number): void;
+    moveAction(from: number, to: number): void;
+    setActionSlot(actionIndex: number, key: string, entry: SlotValueEntry): void;
+    addCondition(id: string): void;
+    removeCondition(index: number): void;
+    setConditionSlot(conditionIndex: number, key: string, entry: SlotValueEntry): void;
+    reset(): void;
+    private setItemSlot;
+}
+
 interface War3Editor extends Editor<War3EditorState> {
     registerEvent: (def: War3EventDef) => void;
     registerAction: (def: War3ActionDef) => void;
@@ -116,7 +169,7 @@ interface War3Editor extends Editor<War3EditorState> {
     getAvailableEvents: () => War3EventDef[];
     getAvailableActions: () => War3ActionDef[];
     getAvailableConditions: () => War3ConditionDef[];
-    getEventDescriptor: () => ItemDescriptor | null;
+    getEventDescriptor: (index?: number) => ItemDescriptor | null;
     getActionDescriptor: (actionIndex: number) => ItemDescriptor | null;
     getConditionDescriptor: (conditionIndex: number) => ItemDescriptor | null;
     getToolDescriptor: (toolName: string, slotValues?: Record<string, SlotValueEntry>) => ToolDescriptor | null;
@@ -124,6 +177,9 @@ interface War3Editor extends Editor<War3EditorState> {
     setEvent: (id: string) => void;
     clearEvent: () => void;
     setEventSlot: (key: string, entry: SlotValueEntry) => void;
+    addEvent: (id: string) => number;
+    removeEvent: (index: number) => void;
+    setEventSlotAt: (index: number, key: string, entry: SlotValueEntry) => void;
     addAction: (id: string) => void;
     removeAction: (index: number) => void;
     moveAction: (from: number, to: number) => void;
@@ -140,24 +196,6 @@ interface War3Editor extends Editor<War3EditorState> {
 }
 declare function createWar3Editor(): War3Editor;
 
-declare function getEventDescriptor(registry: War3Registry, id: string, slotValues?: Record<string, SlotValueEntry>): ItemDescriptor | null;
-declare function getActionDescriptor(registry: War3Registry, id: string, slotValues?: Record<string, SlotValueEntry>): ItemDescriptor | null;
-declare function getConditionDescriptor(registry: War3Registry, id: string, slotValues?: Record<string, SlotValueEntry>): ItemDescriptor | null;
-declare function getToolDescriptor(registry: War3Registry, toolName: string, slotValues?: Record<string, SlotValueEntry>): ToolDescriptor | null;
-declare function getSlotToolDescriptors(registry: War3Registry, slotDef: SlotDef): ToolDescriptor[];
-
-/**
- * 递归解析 SlotValueEntry 为人类可读的展示文本
- *
- * - 如果 entry 为 null/undefined 或未选择 tool，返回 fallbackLabel（slot 占位文案）
- * - 如果 tool 为 leaf：
- *   - select 类型：尝试匹配 options 找到对应 label（支持对象值的深比较）
- *   - 其它类型：返回 value 的字符串形式
- *   - 若 value 为空：返回 fallbackLabel
- * - 如果 tool 为 composite：使用 tool 的 template 递归展开
- */
-declare function resolveSlotDisplayText(entry: SlotValueEntry | null | undefined, registry: War3Registry, fallbackLabel: string): string;
-
 /**
  * Type-safe LeafTool definition.
  * Input type comes from the resolve callback annotation; output is inferred.
@@ -192,11 +230,23 @@ declare function defineCondition<TSlotValues extends Record<string, unknown> = R
     resolve?: (slotValues: TSlotValues) => unknown;
 }): War3ConditionDef;
 
+declare function getEventDescriptor(registry: War3Registry, id: string, slotValues?: Record<string, SlotValueEntry>): ItemDescriptor | null;
+declare function getActionDescriptor(registry: War3Registry, id: string, slotValues?: Record<string, SlotValueEntry>): ItemDescriptor | null;
+declare function getConditionDescriptor(registry: War3Registry, id: string, slotValues?: Record<string, SlotValueEntry>): ItemDescriptor | null;
+declare function getToolDescriptor(registry: War3Registry, toolName: string, slotValues?: Record<string, SlotValueEntry>): ToolDescriptor | null;
+declare function getSlotToolDescriptors(registry: War3Registry, slotDef: SlotDef): ToolDescriptor[];
+
 /**
- * 解析模板字符串为 Segment 数组
- * 模板格式: "普通文本${slotKey}更多文本"
+ * 递归解析 SlotValueEntry 为人类可读的展示文本
+ *
+ * - 如果 entry 为 null/undefined 或未选择 tool，返回 fallbackLabel（slot 占位文案）
+ * - 如果 tool 为 leaf：
+ *   - select 类型：尝试匹配 options 找到对应 label（支持对象值的深比较）
+ *   - 其它类型：返回 value 的字符串形式
+ *   - 若 value 为空：返回 fallbackLabel
+ * - 如果 tool 为 composite：使用 tool 的 template 递归展开
  */
-declare function parseTemplate(template: string, slots?: Record<string, SlotDef>, slotValues?: Record<string, SlotValueEntry>): Segment[];
+declare function resolveSlotDisplayText(entry: SlotValueEntry | null | undefined, registry: War3Registry, fallbackLabel: string): string;
 
 declare function defineWar3Preset(options: War3PresetOptions): Preset<War3Editor>;
 
@@ -209,31 +259,16 @@ declare function resolveSlotValue(entry: SlotValueEntry, registry: War3Registry)
  *
  * Output shape (compatible with @triggerix/core):
  *   {
- *     id, event: { type, payload? }, conditions?: { type:'and', conditions:[...] },
+ *     id, events: [{ type, payload? }, ...],
+ *     conditions?: ConditionItem[]  // flat array, implicit AND
  *     actions: [{ type, params? }]
  *   }
+ *
+ * - Multiple events use OR semantics at runtime.
+ * - Conditions are emitted as a flat `ConditionItem[]` (no ConditionGroup wrapper);
+ *   the runtime treats the array as an implicit AND with explicit nested groups allowed.
  */
 declare function toTrigger(state: War3EditorState, registry: War3Registry, triggerId?: string): Trigger;
 
-/**
- * War3 编辑器状态管理
- * 继承 ObservableState，提供模板模式特有的状态操作
- */
-declare class War3EditorStateManager extends ObservableState<War3EditorState> {
-    constructor();
-    setEvent(id: string): void;
-    clearEvent(): void;
-    setEventSlot(key: string, entry: SlotValueEntry): void;
-    addAction(id: string): void;
-    removeAction(index: number): void;
-    moveAction(from: number, to: number): void;
-    setActionSlot(actionIndex: number, key: string, entry: SlotValueEntry): void;
-    addCondition(id: string): void;
-    removeCondition(index: number): void;
-    setConditionSlot(conditionIndex: number, key: string, entry: SlotValueEntry): void;
-    reset(): void;
-    private setItemSlot;
-}
-
 export { War3EditorStateManager, War3Registry, createWar3Editor, defineCompositeTool, defineCondition, defineLeafTool, defineWar3Preset, getActionDescriptor, getConditionDescriptor, getEventDescriptor, getSlotToolDescriptors, getToolDescriptor, parseTemplate, resolveSlotDisplayText, resolveSlotValue, toTrigger };
 export type { CompositeToolDef, CompositeToolDescriptor, ItemDescriptor, ItemState, LeafToolDef, LeafToolDescriptor, LeafToolInput, Segment, SlotDef, SlotValueEntry, ToolDef, ToolDescriptor, War3ActionDef, War3ConditionDef, War3Editor, War3EditorState, War3EventDef, War3PresetOptions };