triggerix-editor-preset-war3 0.0.7 → 0.0.8

package/README.md

@@ -169,7 +169,7 @@ War3ConditionDef / ToolDef                      │
 - **查询**：`getAvailableEvents` / `getAvailableActions` / `getAvailableConditions`
 - **描述符**：`getEventDescriptor` / `getActionDescriptor(index)` / `getConditionDescriptor(index)` / `getToolDescriptor(name, slotValues?)` / `getSlotTools(slotDef)`
 - **状态操作**：
-  - Event：`setEvent` / `clearEvent` / `setEventSlot`
+  - Event：`setEvent` / `clearEvent` / `setEventSlot`（单事件便捷）；多事件：`addEvent` / `removeEvent` / `setEventSlotAt(index, …)`
   - Action：`addAction` / `removeAction` / `moveAction` / `setActionSlot`
   - Condition：`addCondition` / `removeCondition` / `setConditionSlot`
 - **值来源**：`getValueSources(valueType?)` 返回 `{ conditions, tools }`
@@ -191,14 +191,14 @@ War3ConditionDef / ToolDef                      │
 
 ```ts
 {
-  id: string,                 // 默认 crypto.randomUUID()，可外部传入
-  event: { type: string, payload?: Record<string, Value> },
-  conditions?: { type: 'and', conditions: Action[] }, // 仅当 conditions 非空时存在
-  actions: Action[]           // [{ type, params? }]
+  id: string,                  // 默认 crypto.randomUUID()，可外部传入
+  events: { type: string, payload?: Record<string, Value> }[], // 多事件 OR 触发
+  conditions?: ConditionItem[], // 扁平数组，默认隐式 AND，可嵌套显式 group
+  actions: Action[]            // [{ type, params? }]
 }
 ```
 
-> 注：编辑期 Condition 在内部以 `Action` 形式（`{ type, params }`）存储，序列化为 `and` 分组；Condition ↔ Action 的语义映射由运行时层完成。
+> 注：编辑期 Condition 在内部以 `Action` 形式（`{ type, params }`）存储，作为扁平 `ConditionItem[]` 透传至运行时；Condition ↔ Action 的语义映射由运行时层完成。
 
 ## 模块结构
 
@@ -288,9 +288,9 @@ const emitEventTool = defineCompositeTool<
 
 ```ts
 interface War3EditorState {
-  event: ItemState | null // 单一事件
+  events: ItemState[]   // 多事件源（运行时按 OR 匹配）；UI 单事件时通常为 0 或 1 项
   conditions: ItemState[] // 条件列表（AND 语义）
-  actions: ItemState[] // 动作列表（顺序敏感）
+  actions: ItemState[]   // 动作列表（顺序敏感）
 }
 
 interface ItemState {

package/dist/index.cjs

@@ -57,7 +57,7 @@ class War3Registry extends editor.BaseRegistry {
 }
 
 const INITIAL_STATE = {
-  event: null,
+  events: [],
   conditions: [],
   actions: []
 };
@@ -65,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 ---
@@ -212,6 +248,13 @@ function resolveItemParams(slotValues, registry) {
   }
   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);
@@ -229,22 +272,15 @@ function generateTriggerId() {
   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 events = state.events.map((item) => serializeEvent(item, registry));
   const actions = serializeItems(state.actions, registry);
   const trigger = {
     id: triggerId ?? generateTriggerId(),
-    event,
+    events,
     actions
   };
   if (state.conditions.length > 0) {
-    trigger.conditions = {
-      type: "and",
-      conditions: serializeItems(state.conditions, registry)
-    };
+    trigger.conditions = serializeItems(state.conditions, registry);
   }
   return trigger;
 }
@@ -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),

package/dist/index.d.cts

@@ -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[];
 }
@@ -119,9 +124,31 @@ declare class War3Registry extends BaseRegistry<War3EventDef, War3ActionDef, War
  */
 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;
@@ -142,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;
@@ -150,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;
@@ -229,9 +259,14 @@ 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;
 

package/dist/index.d.mts

@@ -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[];
 }
@@ -119,9 +124,31 @@ declare class War3Registry extends BaseRegistry<War3EventDef, War3ActionDef, War
  */
 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;
@@ -142,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;
@@ -150,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;
@@ -229,9 +259,14 @@ 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;
 

package/dist/index.d.ts

@@ -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[];
 }
@@ -119,9 +124,31 @@ declare class War3Registry extends BaseRegistry<War3EventDef, War3ActionDef, War
  */
 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;
@@ -142,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;
@@ -150,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;
@@ -229,9 +259,14 @@ 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;
 

package/dist/index.mjs

@@ -55,7 +55,7 @@ class War3Registry extends BaseRegistry {
 }
 
 const INITIAL_STATE = {
-  event: null,
+  events: [],
   conditions: [],
   actions: []
 };
@@ -63,24 +63,60 @@ class War3EditorStateManager extends 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 ---
@@ -210,6 +246,13 @@ function resolveItemParams(slotValues, registry) {
   }
   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);
@@ -227,22 +270,15 @@ function generateTriggerId() {
   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 events = state.events.map((item) => serializeEvent(item, registry));
   const actions = serializeItems(state.actions, registry);
   const trigger = {
     id: triggerId ?? generateTriggerId(),
-    event,
+    events,
     actions
   };
   if (state.conditions.length > 0) {
-    trigger.conditions = {
-      type: "and",
-      conditions: serializeItems(state.conditions, registry)
-    };
+    trigger.conditions = serializeItems(state.conditions, registry);
   }
   return trigger;
 }
@@ -269,11 +305,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();
@@ -295,6 +332,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),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "triggerix-editor-preset-war3",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "War3-style template editor preset for Triggerix",
   "homepage": "https://github.com/triggerix-collective/triggerix-editor-preset-war3#readme",
   "repository": {
@@ -25,8 +25,8 @@
     "dist"
   ],
   "dependencies": {
-    "@triggerix/core": "^0.0.8",
-    "@triggerix/editor": "^0.0.8"
+    "@triggerix/core": "^0.0.10",
+    "@triggerix/editor": "^0.0.10"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^9.0.0",