@ersbeth/picoflow 1.1.0 → 1.1.2

package/dist/picoflow.js

@@ -1,3 +1,5 @@
+import { createSignal, createMemo, createResource, onMount, onCleanup } from 'solid-js';
+
 function isDisposable(obj) {
   return obj !== null && obj !== void 0 && typeof obj.dispose === "function";
 }
@@ -1545,4 +1547,110 @@ function map(initial) {
   );
 }
 
-export { FlowArray, FlowEffect, FlowGraph, FlowMap, FlowNode, FlowNodeAsync, FlowSignal, array, constant, constantAsync, derivation, derivationAsync, effect, isDisposable, map, signal, state, stateAsync };
+class SolidState {
+  /**
+   * Returns the current value.
+   */
+  get;
+  /**
+   * Sets the value or updates it using a getter function.
+   */
+  set;
+  /**
+   * Creates a new SolidState with the given initial value.
+   * @param initialValue - The initial value.
+   */
+  constructor(initialValue) {
+    const [get, set] = createSignal(initialValue);
+    this.get = get;
+    this.set = set;
+  }
+}
+class SolidDerivation {
+  /**
+   * Returns the current derived value.
+   */
+  get;
+  /**
+   * Creates a new SolidDerivation from a getter function or value.
+   * @param calculator - The getter function or value.
+   */
+  constructor(calculator) {
+    const get = createMemo(calculator);
+    this.get = get;
+  }
+}
+class SolidResource {
+  /**
+   * Returns the current value (or undefined if not yet loaded).
+   */
+  get;
+  /**
+   * Returns the current resource state.
+   */
+  state;
+  /**
+   * Returns the latest successfully loaded value (or undefined).
+   */
+  latest;
+  /**
+   * Triggers a refetch of the resource.
+   */
+  refetch;
+  set;
+  /**
+   * Creates a new SolidResource from a fetcher function.
+   * @param fetcher - The async fetcher function.
+   */
+  constructor(fetcher) {
+    const [get, set] = createResource(fetcher);
+    this.get = get;
+    this.state = () => get.state;
+    this.latest = () => get.latest;
+    this.refetch = () => set.refetch();
+    this.set = (value) => set.mutate(value);
+  }
+}
+
+function fromNode(node) {
+  let initialized = false;
+  const solidResource = new SolidResource(async () => {
+    let value;
+    if (initialized) {
+      value = await node.get(null);
+    } else {
+      value = await node.pick();
+      initialized = true;
+    }
+    return value;
+  });
+  let fx;
+  onMount(() => {
+    fx = new FlowEffect(async (t) => {
+      const watched = node.watch(t);
+      if (watched instanceof Promise) {
+        await watched;
+      }
+      solidResource.refetch();
+    });
+  });
+  onCleanup(() => fx.dispose());
+  return solidResource;
+}
+function fromGetter(getter) {
+  const derivation = new FlowNodeAsync(async (t) => {
+    return getter(t);
+  });
+  return fromNode(derivation);
+}
+function from(flow) {
+  if (flow instanceof FlowNodeAsync || flow instanceof FlowNode) {
+    return fromNode(flow);
+  }
+  if (typeof flow === "function") {
+    return fromGetter(flow);
+  }
+  throw new Error("Invalid flow type");
+}
+
+export { FlowArray, FlowEffect, FlowGraph, FlowMap, FlowNode, FlowNodeAsync, FlowSignal, SolidDerivation, SolidResource, SolidState, array, constant, constantAsync, derivation, derivationAsync, effect, from, isDisposable, map, signal, state, stateAsync };

package/dist/types/index.d.ts

@@ -60,4 +60,5 @@
  * @see {@link https://github.com/yourusername/picoflow | GitHub Repository}
  */
 export * from './flow';
+export * from './solid';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAEH,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAEH,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}

package/dist/types/solid/converters.d.ts

@@ -1,13 +1,13 @@
 import { FlowReadonly, FlowReadonlyAsync } from '../flow';
 import { FlowTracker } from '../flow/base/flowTracker';
 import { SolidResource } from './primitives';
+import { NotPromise } from '../flow/base';
 /**
  * Utility type that excludes Promise types from T.
  * Used to ensure type safety for synchronous derivations/resources.
  *
  * @public
  */
-export type NotPromise<T> = T extends Promise<unknown> ? never : T;
 /**
  * Converts a FlowNode, FlowNodeAsync, or getter function into a SolidResource.
  *
@@ -50,5 +50,8 @@ export type NotPromise<T> = T extends Promise<unknown> ? never : T;
  *
  * @public
  */
-export declare function from<T>(flow: FlowReadonlyAsync<T> | FlowReadonly<T> | ((t: FlowTracker) => T) | ((t: FlowTracker) => Promise<T>)): SolidResource<T>;
+export declare function from<T>(flow: FlowReadonlyAsync<T>): SolidResource<T>;
+export declare function from<T>(flow: FlowReadonly<T>): SolidResource<T>;
+export declare function from<T>(flow: (t: FlowTracker) => Promise<T>): SolidResource<T>;
+export declare function from<T>(flow: (t: FlowTracker) => NotPromise<T>): SolidResource<T>;
 //# sourceMappingURL=converters.d.ts.map

package/dist/types/solid/converters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"converters.d.ts","sourceRoot":"","sources":["../../../src/solid/converters.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAmE7C;;;;;GAKG;AACH,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,CAAC,SAAS,OAAO,CAAC,OAAO,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,IAAI,CAAC,CAAC,EACrB,IAAI,EACD,iBAAiB,CAAC,CAAC,CAAC,GACpB,YAAY,CAAC,CAAC,CAAC,GACf,CAAC,CAAC,CAAC,EAAE,WAAW,KAAK,CAAC,CAAC,GACvB,CAAC,CAAC,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC,GACjC,aAAa,CAAC,CAAC,CAAC,CAUlB"}
+{"version":3,"file":"converters.d.ts","sourceRoot":"","sources":["../../../src/solid/converters.ts"],"names":[],"mappings":"AACA,OAAO,EAAY,KAAK,YAAY,EAAE,KAAK,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAE9E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAqE/C;;;;;GAKG;AAGH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyCG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AACtE,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AACjE,wBAAgB,IAAI,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AAChF,wBAAgB,IAAI,CAAC,CAAC,EACrB,IAAI,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,UAAU,CAAC,CAAC,CAAC,GACrC,aAAa,CAAC,CAAC,CAAC,CAAC"}

package/dist/types/solid/index.d.ts

@@ -1,3 +1,3 @@
-export { from, type NotPromise } from './converters';
-export { SolidDerivation, type SolidGetter, type SolidObservable, SolidResource, SolidState, } from './primitives';
+export * from './converters';
+export * from './primitives';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/solid/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/solid/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EACN,eAAe,EACf,KAAK,WAAW,EAChB,KAAK,eAAe,EACpB,aAAa,EACb,UAAU,GACV,MAAM,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/solid/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ersbeth/picoflow",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "Minimal Dataflow librairy for TypeScript",
   "type": "module",
   "exports": {

package/src/index.ts

@@ -61,3 +61,4 @@
  */
 
 export * from "./flow";
+export * from "./solid";

package/src/solid/converters.ts

@@ -4,7 +4,7 @@ import { FlowEffect } from "../flow/base";
 import type { FlowTracker } from "../flow/base/flowTracker";
 import { FlowNodeAsync } from "../flow/nodes/async/flowNodeAsync";
 import { SolidResource } from "./primitives";
-
+import type { NotPromise } from "../flow/base";
 /**
  * Converts an asynchronous FlowNodeAsync (Promise-based) into a SolidJS resource.
  *
@@ -36,7 +36,10 @@ function fromNode<T>(node: FlowNodeAsync<T> | FlowNode<T>): SolidResource<T> {
 
 	onMount(() => {
 		fx = new FlowEffect(async (t) => {
-			node.watch(t);
+			const watched = node.watch(t);
+			if (watched instanceof Promise) {
+				await watched;
+			}
 			solidResource.refetch();
 		});
 	});
@@ -76,7 +79,7 @@ function fromGetter<T>(
  *
  * @public
  */
-export type NotPromise<T> = T extends Promise<unknown> ? never : T;
+// export type NotPromise<T> = T extends Promise<unknown> ? never : T;
 
 /**
  * Converts a FlowNode, FlowNodeAsync, or getter function into a SolidResource.
@@ -120,11 +123,17 @@ export type NotPromise<T> = T extends Promise<unknown> ? never : T;
  *
  * @public
  */
+export function from<T>(flow: FlowReadonlyAsync<T>): SolidResource<T>;
+export function from<T>(flow: FlowReadonly<T>): SolidResource<T>;
+export function from<T>(flow: (t: FlowTracker) => Promise<T>): SolidResource<T>;
+export function from<T>(
+	flow: (t: FlowTracker) => NotPromise<T>,
+): SolidResource<T>;
 export function from<T>(
 	flow:
 		| FlowReadonlyAsync<T>
 		| FlowReadonly<T>
-		| ((t: FlowTracker) => T)
+		| ((t: FlowTracker) => NotPromise<T>)
 		| ((t: FlowTracker) => Promise<T>),
 ): SolidResource<T> {
 	if (flow instanceof FlowNodeAsync || flow instanceof FlowNode) {

package/src/solid/index.ts

@@ -1,8 +1,2 @@
-export { from, type NotPromise } from "./converters";
-export {
-	SolidDerivation,
-	type SolidGetter,
-	type SolidObservable,
-	SolidResource,
-	SolidState,
-} from "./primitives";
+export * from "./converters";
+export * from "./primitives";