fix(@rallie/block): remove the ability to get the trigger of event or…

… methods
ralliejs · Mar 4, 2023 · 718ff08 · 718ff08
1 parent 0ac37e1
commit 718ff08
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 52 deletions.
diff --git a/packages/block/src/base-block.ts b/packages/block/src/base-block.ts
@@ -15,11 +15,11 @@ export class BaseBlock<T extends BlockType> {
 
   #socket: Socket
 
-  constructor(name: string, triggerName: string, socket: Socket) {
+  constructor(name: string, socket: Socket) {
     this.name = name
     this.#socket = socket
-    this.events = this.#socket.createBroadcaster(() => triggerName)
-    this.methods = this.#socket.createUnicaster(() => triggerName)
+    this.events = this.#socket.createBroadcaster()
+    this.methods = this.#socket.createUnicaster()
     Reflect.defineProperty(this, 'state', {
       get: () => this.#socket.getState<T['state'], T['state']>(constant.stateNamespace(this.name)),
       set: () => {

diff --git a/packages/block/src/created-block.ts b/packages/block/src/created-block.ts
@@ -22,7 +22,7 @@ export class CreatedBlock<T extends BlockType> extends BaseBlock<T> {
   constructor(name: string, globalBus: Bus, globalSocket: Socket, isEntry: boolean) {
     const [bus] = touchBus(constant.privateBus(name))
     const socket = bus.createSocket()
-    super(name, name, socket)
+    super(name, socket)
     this.#socket = socket
     this.#globalBus = globalBus
     this.#globalSocket = globalSocket
@@ -58,7 +58,7 @@ export class CreatedBlock<T extends BlockType> extends BaseBlock<T> {
     if (!this.#connectedBlocks[name]) {
       const [bus] = touchBus(constant.privateBus(name))
       const socket = bus.createSocket()
-      this.#connectedBlocks[name] = new BaseBlock<P>(name, this.name, socket)
+      this.#connectedBlocks[name] = new BaseBlock<P>(name, socket)
     }
     return this.#connectedBlocks[name] as BaseBlock<P>
   }

diff --git a/packages/block/test/utils.test.ts b/packages/block/test/utils.test.ts
@@ -24,40 +24,4 @@ describe('Test errors and warnings', () => {
       }
     }).toThrowError(errors.stateIsReadonly('case2'))
   })
-
-  test('#case3: trigger', () => {
-    let normalFuncMethodTrigger = ''
-    let normalFuncEventTrigger = ''
-    type BlockType = {
-      methods: {
-        normalFunc: () => void
-        arrowFunc: () => void
-      }
-      events: {
-        normalFunc: () => void
-        arrowFunc: () => void
-      }
-    }
-    const block = createBlock<BlockType>('case3')
-    block.addMethods({
-      normalFunc() {
-        normalFuncMethodTrigger = arguments[arguments.length - 1]
-      },
-    })
-    block.listenEvents({
-      normalFunc() {
-        normalFuncEventTrigger = arguments[arguments.length - 1]
-      },
-    })
-    const tester = createBlock('tester')
-    const connectedBlock = tester.connect<BlockType>(block.name)
-    connectedBlock.methods.normalFunc()
-    expect(normalFuncMethodTrigger).toEqual('tester')
-    connectedBlock.events.normalFunc()
-    expect(normalFuncEventTrigger).toEqual('tester')
-    block.methods.normalFunc()
-    expect(normalFuncMethodTrigger).toEqual('case3')
-    block.events.normalFunc()
-    expect(normalFuncEventTrigger).toEqual('case3')
-  })
 })
diff --git a/packages/core/src/lib/socket.ts b/packages/core/src/lib/socket.ts
@@ -73,11 +73,8 @@ export class Socket {
     return new Proxy<T>({} as any, {
       get: (target, eventName) => {
         return (...args: any[]) => {
-          return this.#eventEmitter.emitBroadcast(
-            eventName as string,
-            ...args,
-            logger?.(eventName as string),
-          )
+          logger?.(eventName as string)
+          return this.#eventEmitter.emitBroadcast(eventName as string, ...args)
         }
       },
       set: () => {
@@ -94,11 +91,8 @@ export class Socket {
     return new Proxy<T>({} as any, {
       get: (target, eventName) => {
         return (...args: any[]) => {
-          return this.#eventEmitter.emitUnicast(
-            eventName as string,
-            ...args,
-            logger?.(eventName as string),
-          )
+          logger?.(eventName as string)
+          return this.#eventEmitter.emitUnicast(eventName as string, ...args)
         }
       },
       set: () => {

diff --git a/packages/load-html/test/utils.test.ts b/packages/load-html/test/utils.test.ts
@@ -132,7 +132,7 @@ describe('Test utils', () => {
     expect(styles[0].innerHTML.trim()).toEqual('background-color: "green";')
     expect(styles[1].innerHTML.trim()).toEqual('color: "red";')
     const { root: root2 } = utils.parseHtml(html, '#app')
-    expect(root2.innerHTML.trim()).toEqual('app')
+    expect(root2?.innerHTML.trim()).toEqual('app')
 
     console.error = jest.fn()
     const result = utils.parseHtml('<div>xxxx<div>')