Merge pull request #164 from 6RiverSystems/fix/while-running-check

fix: while running check
6RiverSystems · Sep 27, 2023 · 8b32952 · 8b32952
2 parents bac5dfc + 163aaa1
commit 8b32952
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/lib/nodes/decorators/While.ts b/lib/nodes/decorators/While.ts
@@ -32,7 +32,7 @@ export class While<S extends BlueshellState, E> extends Decorator<S, E> {
 	protected decorateCall(handleEvent: (state: S, event: E) => ResultCode, state: S, event: E) {
 		const storage: WhileNodeStorage = this.getNodeStorage(state);
 
-		if (storage.running || this.conditional(state, event)) {
+		if (storage.running !== undefined || this.conditional(state, event)) {
 			if (storage.beganAtLeastOneLoop) {
 				Action.treePublisher.publishResult(state, event, false);
 				clearEventSeenRecursive(this.child, state);
@@ -70,6 +70,10 @@ export class While<S extends BlueshellState, E> extends Decorator<S, E> {
 		}
 	}
 
+	protected onEvent(state: S, event: E): ResultCode {
+		return this.handleChild(state, event);
+	}
+
 	get symbol(): string {
 		return '↻';
 	}

diff --git a/test/nodes/decorators/While.test.ts b/test/nodes/decorators/While.test.ts
@@ -110,8 +110,8 @@ describe('While', function () {
 
 	it('latches', function () {
 		const testAction = new TestAction('testAction', [
-			{ rc: rc.RUNNING, inc: false },
-			{ rc: rc.SUCCESS, inc: true },
+			{ rc: rc.RUNNING, inc: true },
+			{ rc: rc.SUCCESS, inc: false },
 		]);
 
 		const uut = new decorators.While<TestState, number>(
@@ -129,17 +129,17 @@ describe('While', function () {
 
 		let result = uut.handleEvent(state, 0);
 		assert.strictEqual(rc.RUNNING, result);
-		assert.strictEqual(state.counter, 0);
+		assert.strictEqual(state.counter, 1);
 		assert.strictEqual(testAction.eventCount, 1);
 
 		result = uut.handleEvent(state, 0);
 		assert.strictEqual(rc.RUNNING, result);
-		assert.strictEqual(state.counter, 1);
+		assert.strictEqual(state.counter, 2);
 		assert.strictEqual(testAction.eventCount, 3);
 
 		result = uut.handleEvent(state, 0);
 		assert.strictEqual(rc.RUNNING, result);
-		assert.strictEqual(state.counter, 2);
+		assert.strictEqual(state.counter, 3);
 		assert.strictEqual(testAction.eventCount, 5);
 
 		result = uut.handleEvent(state, 0);