chore: spec cleanup

Author: jhefferman-sfdc

packages/@lwc/engine-core/src/framework/vm.ts

@@ -804,12 +804,13 @@ function setupContext(vm: VM) {
         ): void {
             renderer.registerContextConsumer(component, ContextEventName, {
                 setNewContext: (contextVarieties: ContextVarieties) => {
-                    // If current context does not have the requested variety,
-                    // return false to continue traversing
-                    if (!contextVarieties.has(contextVariety)) {
-                        return false;
+                    if (contextVarieties.has(contextVariety)) {
+                        contextProvidedCallback(contextVarieties.get(contextVariety));
+                        return true;
                     }
-                    contextProvidedCallback(contextVarieties.get(contextVariety));
+                    // Return false as context has not been found/consumed
+                    // and the consumer should continue traversing the context tree
+                    return false;
                 },
             });
         },

packages/@lwc/engine-core/src/framework/wiring/context.ts

@@ -57,6 +57,7 @@ export function createContextProviderWithRegister(
                 setDisconnectedCallback?.(disconnectCallback);
 
                 consumerConnectedCallback(consumer);
+                return true;
             }
         );
     };
@@ -91,6 +92,7 @@ export function createContextWatcher(
                 // eslint-disable-next-line @lwc/lwc-internal/no-invalid-todo
                 // TODO: dev-mode validation of config based on the adapter.contextSchema
                 callbackWhenContextIsReady(newContext);
+                return true;
             },
             setDisconnectedCallback(disconnectCallback: () => void) {
                 // adds this callback into the disconnect bucket so it gets disconnected from parent

packages/@lwc/engine-core/src/framework/wiring/types.ts

@@ -62,10 +62,10 @@ export interface WireDebugInfo {
 
 export type WireContextSubscriptionCallback = (
     subscriptionPayload: WireContextSubscriptionPayload
-) => boolean | void;
+) => boolean;
 
 export interface WireContextSubscriptionPayload {
-    setNewContext(newContext: ContextValue): boolean | void;
+    setNewContext(newContext: ContextValue): boolean;
     setDisconnectedCallback?(disconnectCallback: () => void): void;
 }
 

packages/@lwc/engine-dom/src/renderer/context.ts

@@ -16,7 +16,7 @@ import type {
 
 export class WireContextSubscriptionEvent extends CustomEvent<undefined> {
     // These are initialized on the constructor via defineProperties.
-    public readonly setNewContext!: (newContext: WireContextValue) => false | void;
+    public readonly setNewContext!: (newContext: WireContextValue) => boolean;
     public readonly setDisconnectedCallback?: (disconnectCallback: () => void) => void;
 
     constructor(
@@ -62,7 +62,7 @@ export function registerContextProvider(
             onContextSubscription({
                 setNewContext,
                 setDisconnectedCallback,
-            }) !== false
+            })
         ) {
             evt.stopImmediatePropagation();
         }

packages/@lwc/engine-server/src/context.ts

@@ -57,8 +57,8 @@ export function registerContextConsumer(
             const subscribeToProvider =
                 currentNode[HostContextProvidersKey].get(adapterContextToken);
             if (!isUndefined(subscribeToProvider)) {
-                // If context subscription is successful, top traversing to find a provider
-                if (subscribeToProvider(subscriptionPayload) !== false) {
+                // If context subscription is successful, stop traversing to locate a provider
+                if (subscribeToProvider(subscriptionPayload)) {
                     break;
                 }
             }

packages/@lwc/integration-karma/helpers/test-utils.js

@@ -722,12 +722,10 @@ window.TestUtils = (function (lwc, jasmine, beforeAll) {
 
     const connectContext = Symbol('connectContext');
     const disconnectContext = Symbol('disconnectContext');
-    const contextEventKey = Symbol('contextEventKey');
 
     const contextKeys = {
         connectContext,
         disconnectContext,
-        contextEventKey,
     };
 
     lwc.setContextKeys(contextKeys);

packages/@lwc/shared/src/__tests__/context.spec.ts

@@ -21,7 +21,6 @@ describe('context', () => {
         const mockContextKeys = {
             connectContext: Symbol('connect'),
             disconnectContext: Symbol('disconnect'),
-            contextEventKey: Symbol('event'),
         };
 
         setContextKeys(mockContextKeys);
@@ -30,20 +29,17 @@ describe('context', () => {
         expect(retrievedKeys).toBe(mockContextKeys);
         expect(retrievedKeys.connectContext).toBe(mockContextKeys.connectContext);
         expect(retrievedKeys.disconnectContext).toBe(mockContextKeys.disconnectContext);
-        expect(retrievedKeys.contextEventKey).toBe(mockContextKeys.contextEventKey);
     });
 
     it('should throw when attempting to set context keys multiple times', () => {
         const mockContextKeys1 = {
             connectContext: Symbol('connect1'),
             disconnectContext: Symbol('disconnect1'),
-            contextEventKey: Symbol('event1'),
         };
 
         const mockContextKeys2 = {
             connectContext: Symbol('connect2'),
             disconnectContext: Symbol('disconnect2'),
-            contextEventKey: Symbol('event2'),
         };
 
         setContextKeys(mockContextKeys1);

packages/@lwc/shared/src/context.ts

@@ -9,7 +9,6 @@ import { isFalse } from './assert';
 export type ContextKeys = {
     connectContext: symbol;
     disconnectContext: symbol;
-    contextEventKey: symbol;
 };
 
 let contextKeys: ContextKeys;