sygnal 4.0.0 → 4.0.1

package/dist/index.d.ts

@@ -63,7 +63,7 @@ type DefaultSinks<STATE, PROPS, ACTIONS, DATA> = {
 type CustomDriverSinks<STATE, PROPS, DRIVERS, ACTIONS, ACTION_ENTRY> = keyof DRIVERS extends never ? {
   [driver: string]: SinkValue<STATE, PROPS, ACTIONS, any, any>;
 } : {
-  [DRIVER_KEY in keyof DRIVERS]: SinkValue<STATE, PROPS, ACTIONS, ACTION_ENTRY, DRIVERS[DRIVER_KEY]>;
+  [DRIVER_KEY in keyof DRIVERS]: SinkValue<STATE, PROPS, ACTIONS, ACTION_ENTRY, DRIVERS[DRIVER_KEY] extends { source: any, sink: any } ? DRIVERS[DRIVER_KEY]["sink"] : any>;
 }
 
 type ModelEntry<STATE, PROPS, DRIVERS, ACTIONS, ACTION_ENTRY> = SinkValue<STATE, PROPS, ACTIONS, ACTION_ENTRY, STATE> | Partial<DefaultSinks<STATE, PROPS, ACTIONS, ACTION_ENTRY> & CustomDriverSinks<STATE, PROPS, DRIVERS, ACTIONS, ACTION_ENTRY>>;
@@ -75,7 +75,7 @@ type WithDefaultActions<STATE, ACTIONS> = ACTIONS & {
 } 
 
 type ComponentModel<STATE, PROPS, DRIVERS, ACTIONS> = keyof ACTIONS extends never ? {
-  [action: string]: ModelEntry<STATE, PROPS, DRIVERS, WithDefaultActions<STATE, ACTIONS>, any>;
+  [action: string]: ModelEntry<STATE, PROPS, DRIVERS, WithDefaultActions<STATE, { [action: string]: any }>, any>;
 } : {
   [ACTION_KEY in keyof WithDefaultActions<STATE, ACTIONS>]?: ModelEntry<STATE, PROPS, DRIVERS, WithDefaultActions<STATE, ACTIONS>, WithDefaultActions<STATE, ACTIONS>[ACTION_KEY]>;
 };
@@ -140,7 +140,7 @@ type Lense<PARENT_STATE=any, CHILD_STATE=any> = {
   set: (state: PARENT_STATE, childState: CHILD_STATE) => PARENT_STATE;
 }
 
-type Filter<ARRAY=any[]> = (array: ARRAY) => ARRAY
+type Filter<ITEM=any> = (item: ITEM) => boolean
 
 type SortFunction<ITEM=any> = (a: ITEM, b: ITEM) => number
 type SortObject<ITEM=any> = {
@@ -162,17 +162,17 @@ type FixDrivers<DRIVERS> =
  * @template CALCULATED - Calculated state values (key = calculated variable name; value = type of the calculated variable)
  * @template CONTEXT - Context (key = context variable name; value = type of the context variable)
  */
-type Component<STATE=any, PROPS={[prop: string]: any}, DRIVERS={}, ACTIONS={}, CALCULATED={}, CONTEXT={}> = ComponentProps<STATE, PROPS, CONTEXT> & {
+type Component<STATE=any, PROPS={[prop: string]: any}, DRIVERS={}, ACTIONS={}, CALCULATED={}, CONTEXT={}> = ComponentProps<STATE & CALCULATED, PROPS, CONTEXT> & {
   label?: string;
   DOMSourceName?: string;
   stateSourceName?: string;
   requestSourceName?: string;
-  model?: ComponentModel<STATE, PROPS, FixDrivers<DRIVERS>, ACTIONS>;
-  intent?: ComponentIntent<STATE, FixDrivers<DRIVERS>, ACTIONS>;
+  model?: ComponentModel<STATE & CALCULATED, PROPS, FixDrivers<DRIVERS>, ACTIONS>;
+  intent?: ComponentIntent<STATE & CALCULATED, FixDrivers<DRIVERS>, ACTIONS>;
   initialState?: STATE;
   calculated?: Calculated<STATE, CALCULATED>;
   storeCalculatedInState?: boolean;
-  context?: Context<STATE, CONTEXT>;
+  context?: Context<STATE & CALCULATED, CONTEXT>;
   peers?: { [name: string]: Component };
   components?: { [name: string]: Component };
   debug?: boolean;
@@ -181,13 +181,12 @@ type Component<STATE=any, PROPS={[prop: string]: any}, DRIVERS={}, ACTIONS={}, C
 /**
  * Sygnal Root Component
  * @template STATE - State
- * @template PROPS - Props (from JSX element)
  * @template DRIVERS - Custom Drivers (default drivers are automatically applied)
  * @template ACTIONS - Actions (key = action name; value = type expected for Observable values for that action)
  * @template CALCULATED - Calculated state values (key = calculated variable name; value = type of the calculated variable)
  * @template CONTEXT - Context (key = context variable name; value = type of the context variable)
  */
-type RootComponent<STATE=any, DRIVERS={}, ACTIONS=any, CALCULATED=any, CONTEXT=any> = Component<STATE, any, DRIVERS, ACTIONS, CALCULATED, CONTEXT>
+type RootComponent<STATE=any, DRIVERS={}, ACTIONS={}, CALCULATED=any, CONTEXT=any> = Component<STATE, any, DRIVERS, ACTIONS, CALCULATED, CONTEXT>
 
 type CollectionProps<PROPS=any> = {
   of: any;

package/dist/jsx.cjs.js

@@ -152,7 +152,6 @@ const createElementWithModules = (modules) => {
     }
     if (fun(sel)) {
       if (sel.name === 'Fragment') {
-        console.log('Skipped instantiation');
         return sel(data || {}, children)
       }
       data ||= {};

package/dist/jsx.esm.js

@@ -150,7 +150,6 @@ const createElementWithModules = (modules) => {
     }
     if (fun(sel)) {
       if (sel.name === 'Fragment') {
-        console.log('Skipped instantiation');
         return sel(data || {}, children)
       }
       data ||= {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sygnal",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "An intuitive framework for building fast and small components or applications based on Cycle.js",
   "main": "./dist/index.cjs.js",
   "types": "./dist/index.d.ts",

package/src/index.d.ts

@@ -63,7 +63,7 @@ type DefaultSinks<STATE, PROPS, ACTIONS, DATA> = {
 type CustomDriverSinks<STATE, PROPS, DRIVERS, ACTIONS, ACTION_ENTRY> = keyof DRIVERS extends never ? {
   [driver: string]: SinkValue<STATE, PROPS, ACTIONS, any, any>;
 } : {
-  [DRIVER_KEY in keyof DRIVERS]: SinkValue<STATE, PROPS, ACTIONS, ACTION_ENTRY, DRIVERS[DRIVER_KEY]>;
+  [DRIVER_KEY in keyof DRIVERS]: SinkValue<STATE, PROPS, ACTIONS, ACTION_ENTRY, DRIVERS[DRIVER_KEY] extends { source: any, sink: any } ? DRIVERS[DRIVER_KEY]["sink"] : any>;
 }
 
 type ModelEntry<STATE, PROPS, DRIVERS, ACTIONS, ACTION_ENTRY> = SinkValue<STATE, PROPS, ACTIONS, ACTION_ENTRY, STATE> | Partial<DefaultSinks<STATE, PROPS, ACTIONS, ACTION_ENTRY> & CustomDriverSinks<STATE, PROPS, DRIVERS, ACTIONS, ACTION_ENTRY>>;
@@ -75,7 +75,7 @@ type WithDefaultActions<STATE, ACTIONS> = ACTIONS & {
 } 
 
 type ComponentModel<STATE, PROPS, DRIVERS, ACTIONS> = keyof ACTIONS extends never ? {
-  [action: string]: ModelEntry<STATE, PROPS, DRIVERS, WithDefaultActions<STATE, ACTIONS>, any>;
+  [action: string]: ModelEntry<STATE, PROPS, DRIVERS, WithDefaultActions<STATE, { [action: string]: any }>, any>;
 } : {
   [ACTION_KEY in keyof WithDefaultActions<STATE, ACTIONS>]?: ModelEntry<STATE, PROPS, DRIVERS, WithDefaultActions<STATE, ACTIONS>, WithDefaultActions<STATE, ACTIONS>[ACTION_KEY]>;
 };
@@ -140,7 +140,7 @@ export type Lense<PARENT_STATE=any, CHILD_STATE=any> = {
   set: (state: PARENT_STATE, childState: CHILD_STATE) => PARENT_STATE;
 }
 
-export type Filter<ARRAY=any[]> = (array: ARRAY) => ARRAY
+export type Filter<ITEM=any> = (item: ITEM) => boolean
 
 export type SortFunction<ITEM=any> = (a: ITEM, b: ITEM) => number
 export type SortObject<ITEM=any> = {
@@ -162,17 +162,17 @@ type FixDrivers<DRIVERS> =
  * @template CALCULATED - Calculated state values (key = calculated variable name; value = type of the calculated variable)
  * @template CONTEXT - Context (key = context variable name; value = type of the context variable)
  */
-export type Component<STATE=any, PROPS={[prop: string]: any}, DRIVERS={}, ACTIONS={}, CALCULATED={}, CONTEXT={}> = ComponentProps<STATE, PROPS, CONTEXT> & {
+export type Component<STATE=any, PROPS={[prop: string]: any}, DRIVERS={}, ACTIONS={}, CALCULATED={}, CONTEXT={}> = ComponentProps<STATE & CALCULATED, PROPS, CONTEXT> & {
   label?: string;
   DOMSourceName?: string;
   stateSourceName?: string;
   requestSourceName?: string;
-  model?: ComponentModel<STATE, PROPS, FixDrivers<DRIVERS>, ACTIONS>;
-  intent?: ComponentIntent<STATE, FixDrivers<DRIVERS>, ACTIONS>;
+  model?: ComponentModel<STATE & CALCULATED, PROPS, FixDrivers<DRIVERS>, ACTIONS>;
+  intent?: ComponentIntent<STATE & CALCULATED, FixDrivers<DRIVERS>, ACTIONS>;
   initialState?: STATE;
   calculated?: Calculated<STATE, CALCULATED>;
   storeCalculatedInState?: boolean;
-  context?: Context<STATE, CONTEXT>;
+  context?: Context<STATE & CALCULATED, CONTEXT>;
   peers?: { [name: string]: Component };
   components?: { [name: string]: Component };
   debug?: boolean;
@@ -186,7 +186,7 @@ export type Component<STATE=any, PROPS={[prop: string]: any}, DRIVERS={}, ACTION
  * @template CALCULATED - Calculated state values (key = calculated variable name; value = type of the calculated variable)
  * @template CONTEXT - Context (key = context variable name; value = type of the context variable)
  */
-export type RootComponent<STATE=any, DRIVERS={}, ACTIONS=any, CALCULATED=any, CONTEXT=any> = Component<STATE, any, DRIVERS, ACTIONS, CALCULATED, CONTEXT>
+export type RootComponent<STATE=any, DRIVERS={}, ACTIONS={}, CALCULATED=any, CONTEXT=any> = Component<STATE, any, DRIVERS, ACTIONS, CALCULATED, CONTEXT>
 
 export type CollectionProps<PROPS=any> = {
   of: any;

package/src/sygnal.d.ts

@@ -3,7 +3,7 @@ type Lense<PARENT_STATE=any, CHILD_STATE=any> = {
   set: (state: PARENT_STATE, childState: CHILD_STATE) => PARENT_STATE;
 }
 
-type Filter<ARRAY=any[]> = (array: ARRAY) => ARRAY
+type Filter<ITEM=any> = (item: ITEM) => boolean
 
 type SortFunction<ITEM=any> = (a: ITEM, b: ITEM) => number
 type SortObject<ITEM=any> = {
@@ -23,13 +23,15 @@ type SwitchableProps<PROPS=any> = {
   state?: string | Lense;
 } & Omit<PROPS, 'of' | 'state' | 'current'>;
 
-type ClassesType = (string | string[] | { [className: string]: boolean })[]
+type ClassesType = (string | string[] | { [className: string]: boolean | undefined })[]
 
 
 declare module 'sygnal' {
+  import { MainDOMSource } from '@cycle/dom';
+  import { Stream } from 'xstream';
   export function run(component: any, drivers?: any, options?: any): { hmr: (newComponent: any) => void }
   export function classes(...classes: ClassesType): string;
-  export function processForm<FIELDS extends { [field: string]: any }>(target: HTMLFormElement, options: { events: string | string[], preventDefault: boolean }): FIELDS & { event: Event, eventType: string };
+  export function processForm<FIELDS extends { [field: string]: any }>(target: MainDOMSource, options?: { events?: string | string[], preventDefault?: boolean }): Stream<FIELDS & { event: Event, eventType: string }>;
   export function Collection<PROPS extends { [prop: string]: any }>(
     props: CollectionProps<PROPS>
   ): JSX.Element;