Fn inheritance

Author: alexanderkirtzel

packages/sources/node/src/lib/push.ts

@@ -15,10 +15,10 @@ export function createPush(
   instance: SourceNode.Instance,
   handleCommand: SourceNode.HandleCommand,
   handleEvent: SourceNode.HandleEvent,
-): Elb.Fn<Promise<Elb.PushResult>> {
+): Elb.Fn {
   const push = async (
-    nameOrEvent: string | WalkerOS.DeepPartialEvent,
-    data?: Elb.PushData,
+    nameOrEvent: unknown,
+    data: Elb.PushData = {},
     options?: Elb.PushOptions,
   ) => {
     let result: Elb.PushResult = {
@@ -30,10 +30,10 @@ export function createPush(
 
     return await tryCatchAsync(
       async (
-        nameOrEvent: string | WalkerOS.DeepPartialEvent,
-        data?: Elb.PushData,
+        nameOrEvent: unknown,
+        data: Elb.PushData,
         options?: Elb.PushOptions,
-      ): Promise<Elb.PushResult> => {
+      ): Elb.Return => {
         const { event, command } = createEventOrCommand(
           instance,
           nameOrEvent,
@@ -208,8 +208,8 @@ export async function pushToDestinations(
 
 function createEventOrCommand(
   instance: SourceNode.Instance,
-  nameOrEvent: string | WalkerOS.DeepPartialEvent,
-  pushData: unknown,
+  nameOrEvent: unknown,
+  pushData: Elb.PushData,
 ): { event?: WalkerOS.Event; command?: string } {
   // Determine the partial event
   const partialEvent: WalkerOS.PartialEvent = isSameType(

packages/sources/node/src/types/elb.ts

@@ -1,18 +1,11 @@
 import type { Elb, WalkerOS } from '@elbwalker/types';
 import { DestinationNode, SourceNode } from '.';
 
-export interface Fn<R = Return>
-  extends Elb.Fn<R>,
-    Arguments<R>,
+export interface Fn<R = Return, D = PushData, O = PushOptions>
+  extends Elb.Fn<R, D, O>,
     CommandDestination<R>,
     CommandRun<R> {}
 
-export type Arguments<R = Return> = (
-  name: string,
-  data?: PushData,
-  options?: PushOptions,
-) => R;
-
 export type CommandDestination<R = void> = (
   event: 'walker destination',
   destination: DestinationNode.Destination | DestinationNode.DestinationInit,
@@ -23,6 +16,7 @@ export type CommandRun<R = void> = (event: 'walker run') => R;
 export type PushData =
   | Elb.PushData
   | DestinationNode.Destination
+  | DestinationNode.DestinationInit
   | Partial<SourceNode.State>;
 
 export type PushOptions = Elb.PushOptions | DestinationNode.Config;

packages/sources/walkerjs/src/types/elb.ts

@@ -1,23 +1,13 @@
 import type { Elb, WalkerOS } from '@elbwalker/types';
 import type { On, DestinationWeb, Walker, SourceWalkerjs } from '.';
 
-export interface Fn<R = void>
-  extends Elb.Fn<R>,
-    Arguments<R>,
+export interface Fn<R = void, D = PushData, O = PushOptions, C = PushContext>
+  extends Elb.Fn<R, D, O, C>,
     CommandInit<R>,
     CommandDestination<R>,
     CommandOn<R>,
     CommandRun<R> {}
 
-export type Arguments<R = void> = (
-  event?: string,
-  data?: PushData,
-  options?: PushOptions,
-  context?: PushContext,
-  nested?: WalkerOS.Entities,
-  custom?: WalkerOS.Properties,
-) => R;
-
 export type CommandInit<R = void> = (
   event: 'walker init',
   scope: Scope | Scope[],
@@ -40,16 +30,7 @@ export type CommandOn<R = void> = (
   rules: WalkerOS.SingleOrArray<On.ConsentConfig>,
 ) => R;
 
-type FnParameters<T> = T extends (...args: unknown[]) => unknown
-  ? Parameters<T>[number]
-  : never;
-
-export type Layer = Array<
-  | IArguments
-  | WalkerOS.DeepPartialEvent
-  | FnParameters<Fn[keyof Fn]>
-  | Parameters<Arguments>[number]
->;
+export type Layer = Elb.Layer;
 
 export type PushData =
   | Elb.PushData

packages/types/src/elb.ts

@@ -1,12 +1,26 @@
 import type { Hooks, WalkerOS } from '.';
 
-export interface Fn<R = void>
+export interface Fn<R = void, D = PushData, O = PushOptions, C = PushContext>
   extends Event<R>,
+    Arguments<R, D, O, C>,
     CommandConfig<R>,
     CommandConsent<R>,
     CommandHook<R>,
     CommandUser<R> {}
 
+export type Arguments<
+  R = void,
+  D = PushData,
+  O = PushOptions,
+  C = PushContext,
+> = (
+  event?: string,
+  data?: D,
+  options?: O,
+  context?: C,
+  nested?: WalkerOS.Entities,
+  custom?: WalkerOS.Properties,
+) => R;
 export type CommandConfig<R = void> = (
   event: 'walker config',
   config: Partial<WalkerOS.Config>,
@@ -37,3 +51,14 @@ export type PushData =
 export type PushOptions = Hooks.AnyFunction | object;
 
 export type PushContext = WalkerOS.OrderedProperties;
+
+type FnParameters<T> = T extends (...args: unknown[]) => unknown
+  ? Parameters<T>[number]
+  : never;
+
+export type Layer = Array<
+  | IArguments
+  | WalkerOS.DeepPartialEvent
+  | FnParameters<Fn[keyof Fn]>
+  | Parameters<Arguments>[number]
+>;

packages/utils/src/web/elb.ts

@@ -1,7 +1,5 @@
 import type { Elb } from '@elbwalker/types';
 
-export type ElbLayer = Array<IArguments>;
-
 export const elb: Elb.Fn = function () {
   const w = window as unknown as Record<string, unknown[]>;
   // eslint-disable-next-line prefer-rest-params