@cascateer/core 2.0.9 → 2.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cascateer/core",
-  "version": "2.0.9",
+  "version": "2.0.11",
   "repository": {
     "type": "git",
     "url": "https://github.com/cascateer/core.git"

package/src/jsx-runtime.ts

@@ -25,21 +25,6 @@ declare global {
   namespace JSX {
     type Element = MaybeObservable<Node | Primitive>;
 
-    export type CSSCustomPropertyDefinition = Omit<PropertyDefinition, "name">;
-
-    export type CSSCustomIntegerPropertyDefinition =
-      CSSCustomPropertyDefinition & { syntax: "<integer>" };
-
-    export interface CSSCustomPropertyDefinitions extends Record<
-      keyof {},
-      CSSCustomPropertyDefinition
-    > {}
-
-    type CSSCustomProperties = Record<
-      keyof CSSCustomPropertyDefinitions & `--${string}`,
-      string | number
-    >;
-
     type Children = MaybeObservable<MaybeArray<Element>>;
 
     interface IntrinsicAttributes {
@@ -72,6 +57,21 @@ declare global {
     interface Component<P extends Props = Props> {
       (props: IntrinsicAttributes & P): Element;
     }
+
+    export type CSSCustomPropertyDefinition = Omit<PropertyDefinition, "name">;
+
+    export type CSSCustomIntegerPropertyDefinition =
+      CSSCustomPropertyDefinition & { syntax: "<integer>" };
+
+    export interface CSSCustomPropertyDefinitions extends Record<
+      keyof {},
+      CSSCustomPropertyDefinition
+    > {}
+
+    type CSSCustomProperties = Record<
+      keyof CSSCustomPropertyDefinitions & `--${string}`,
+      string | number
+    >;
   }
 }
 

package/src/observable/Signal.ts

@@ -1,4 +1,4 @@
-import { clone, isEqual, memoize } from "lodash";
+import { clone, identity, isEqual, memoize } from "lodash";
 import { distinctUntilChanged, map, Observable, of, UnaryFunction } from "rxjs";
 import { TapObservable } from ".";
 import {
@@ -22,23 +22,15 @@ class SignalEnumerator<T> {
 
 class SignalReflector<T> {
   constructor(
-    private predicate: (
+    public predicate: (
       transform: Transform<T>,
-      callback: UnaryFunction<Transform<any>, void>,
-    ) => void = (transform, callback) => callback(transform),
+    ) => Transform<unknown> = identity,
   ) {}
 
-  reflect = (transform: Transform<T>) =>
-    new Promise<Transform<unknown>>((callback) =>
-      this.predicate(transform, callback),
-    );
-
-  lift = <U>(
+  reflect = <U>(
     lift: UnaryFunction<Transform<U>, Transform<T>>,
   ): SignalReflector<U> =>
-    new SignalReflector((transform, callback) =>
-      this.predicate(lift(transform), callback),
-    );
+    new SignalReflector((transform) => this.predicate(lift(transform)));
 }
 
 export class Signal<T> extends Observable<T> implements TapObservable<T> {
@@ -78,7 +70,7 @@ export class Signal<T> extends Observable<T> implements TapObservable<T> {
     return new Signal({
       value: this.pipe(map(project), distinctUntilChanged()),
       enumerator: new SignalEnumerator(enumerate),
-      reflector: this.reflector.lift(lift),
+      reflector: this.reflector.reflect(lift),
     });
   }
 

package/src/store.ts

@@ -73,7 +73,7 @@ export class ExtendableStoreAdapter<
             },
             void
           >;
-          reflect: UnaryFunction<(args: any) => Promise<Transform<any>>, void>;
+          register: UnaryFunction<(args: any) => Transform<any>, void>;
         }
       >;
     },
@@ -145,8 +145,8 @@ export class ExtendableStoreAdapter<
                       (signal) => ({
                         update: (predicate, config = {}) =>
                           thru(this.context.transform(key), (transform) => {
-                            transform.reflect((args) =>
-                              signal.reflector.reflect(predicate(args)),
+                            transform.register((args) =>
+                              signal.reflector.predicate(predicate(args)),
                             );
 
                             return (args) =>
@@ -204,7 +204,7 @@ export class StoreProvider<Data> extends ExtendableStoreAdapter<
                 }
               ),
             ),
-          reflect: (transform) =>
+          register: (transform) =>
             actions
               .pipe(
                 mergeMap(async (event) => {
@@ -212,11 +212,11 @@ export class StoreProvider<Data> extends ExtendableStoreAdapter<
                     event.type === "transformAction" &&
                     event.data.key === (await key)
                   ) {
-                    return transform(event.data.args).then((predicate) => ({
+                    return {
                       ...event,
-                      predicate,
+                      predicate: transform(event.data.args),
                       callback: callbacks.get(event.id),
-                    }));
+                    };
                   }
 
                   return [];
@@ -231,6 +231,8 @@ export class StoreProvider<Data> extends ExtendableStoreAdapter<
           value: merge(seedActions, transformActions).pipe(
             sequence<MulticastAction<Data>, Data>(
               ([action, previousAction], [previousState]) => {
+                console.log(action);
+
                 if (action.type === "seedAction") {
                   return action.predicate();
                 }