diff --git a/packages/block/src/base-block.ts b/packages/block/src/base-block.ts index 8c42ec5..8afd5d9 100644 --- a/packages/block/src/base-block.ts +++ b/packages/block/src/base-block.ts @@ -15,11 +15,11 @@ export class BaseBlock { #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(constant.stateNamespace(this.name)), set: () => { diff --git a/packages/block/src/created-block.ts b/packages/block/src/created-block.ts index 37c6318..68b53ef 100644 --- a/packages/block/src/created-block.ts +++ b/packages/block/src/created-block.ts @@ -22,7 +22,7 @@ export class CreatedBlock extends BaseBlock { 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 extends BaseBlock { if (!this.#connectedBlocks[name]) { const [bus] = touchBus(constant.privateBus(name)) const socket = bus.createSocket() - this.#connectedBlocks[name] = new BaseBlock

(name, this.name, socket) + this.#connectedBlocks[name] = new BaseBlock

(name, socket) } return this.#connectedBlocks[name] as BaseBlock

} diff --git a/packages/block/test/utils.test.ts b/packages/block/test/utils.test.ts index f8f210c..8ee2902 100644 --- 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('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(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 index 1330980..6799531 100644 --- a/packages/core/src/lib/socket.ts +++ b/packages/core/src/lib/socket.ts @@ -73,11 +73,8 @@ export class Socket { return new Proxy({} 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({} 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 index a9549a8..8bdea1d 100644 --- 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('

xxxx
')