fix: tf because registerDecorators happens before registerAdapter

salesforce · Sep 25, 2019 · b2d1a89 · b2d1a89
1 parent f7babf3
commit b2d1a89
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/@lwc/engine/src/framework/wiring.ts b/packages/@lwc/engine/src/framework/wiring.ts
@@ -102,7 +102,14 @@ function createContextWatcher(
 }
 
 function createConnector(vm: VM, name: string, wireDef: WireDef): WireAdapter {
-    const { method, adapter } = wireDef;
+    const { method } = wireDef;
+    let adapter = wireDef.adapter;
+
+    // support for callable adapters
+    if ((adapter as any).adapter) {
+        adapter = (adapter as any).adapter;
+    }
+
     const dataCallback = isUndefined(method)
         ? createFieldDataCallback(vm, name)
         : createMethodDataCallback(vm, method);
@@ -200,10 +207,6 @@ export function storeWiredMethodMeta(
     adapter: WireAdapterConstructor,
     configCallback: ConfigCallback
 ) {
-    // support for callable adapters
-    if ((adapter as any).adapter) {
-        adapter = (adapter as any).adapter;
-    }
     const method = descriptor.value;
     const def: WireMethodDef = {
         adapter,

diff --git a/packages/integration-tests/src/shared/templates.js b/packages/integration-tests/src/shared/templates.js
@@ -13,13 +13,11 @@ exports.app = function(cmpName) {
 
 exports.todoApp = function(cmpName) {
     return `
-        import { registerWireService, register as registerAdapter, ValueChangedEvent } from 'wire-service';
+        import { register as registerAdapter, ValueChangedEvent } from 'wire-service';
         import { createElement, register } from 'lwc';
         import Cmp from 'integration/${cmpName}';
         import { getTodo, getObservable } from 'todo';
 
-        registerWireService(register);
-
         // Register the wire adapter for @wire(getTodo).
         registerAdapter(getTodo, function getTodoWireAdapter(wiredEventTarget) {
             var subscription;

diff --git a/packages/integration-tests/src/shared/todo.js b/packages/integration-tests/src/shared/todo.js
@@ -81,7 +81,7 @@
         return getSubject(todo).observable;
     }
 
-    const getTodo = Symbol('getTodo');
+    const getTodo = function() {};
 
     exports.getTodo = getTodo;
     exports.getObservable = getObservable;