Merge pull request #100 from AliMD/fix/signal

[Signal] Fix multi request and add demo
Alwatr · Mar 12, 2022 · caf2e76 · caf2e76
2 parents ca03444 + f617387
commit caf2e76
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 2 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -7,6 +7,9 @@
   </head>
 
   <body>
-    <a href="./logger/index.html">Logger</a>
+    <ol>
+      <li><a href="./logger/">Logger</a></li>
+      <li><a href="./signal/">Signal</a></li>
+    </ol>
   </body>
 </html>
diff --git a/demo/signal/index.html b/demo/signal/index.html
@@ -0,0 +1,16 @@
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title></title>
+  </head>
+
+  <body>
+    <h3>Check the console</h3>
+    <button id="requestButton">Request Signal</button>
+    <button id="requestButton2">3x Request Signal</button>
+    <script src="./index.js" type="module"></script>
+
+  </body>
+</html>
diff --git a/demo/signal/index.ts b/demo/signal/index.ts
@@ -0,0 +1,24 @@
+import {SignalInterface} from '@alwatr/signal';
+
+const signal = new SignalInterface('easter-egg');
+
+signal.setProvider((param) => {
+  const newValue = param * 10;
+  console.info('2. signal provider called', {param, newValue});
+  return newValue;
+});
+
+document.getElementById('requestButton')?.addEventListener('click', async () => {
+  console.info('1. request param: 1');
+  const value = await signal.request(1);
+  console.info('3. new signal value', {value});
+});
+
+document.getElementById('requestButton2')?.addEventListener('click', async () => {
+  console.info('1. request');
+  const value1 = await signal.request(1);
+  console.info('3. 2x request');
+  const value2p = signal.request(2);
+  const value3p = signal.request(3);
+  console.info('4. new signal value', {value1, value2: await value2p, value3: await value3p});
+});
diff --git a/package/signal/src/signal.ts b/package/signal/src/signal.ts
@@ -149,11 +149,12 @@ export class SignalInterface<SignalName extends keyof AlwatrSignals> {
    */
   request(requestParam: AlwatrRequestSignals[SignalName]): Promise<AlwatrSignals[SignalName]> {
     this._logger.logMethodArgs('request', {requestParam});
+    const nextSignalValuePromise = this.getNextSignalValue();
     _dispatchSignal(
       `request-${this.name}` as unknown as SignalName,
       requestParam as unknown as AlwatrSignals[SignalName], // mastmalize to avoid type error
     );
-    return this.getNextSignalValue();
+    return nextSignalValuePromise;
   }
 
   /**