@holo-js/flux-react 0.3.16 → 0.3.18

package/dist/index.d.ts

@@ -1,26 +1,9 @@
-import { FluxClient, FluxConnectionStatus, FluxListenerControls } from '@holo-js/flux';
-import { GeneratedBroadcastManifest, BroadcastPayloadFor, BroadcastJsonObject } from '@holo-js/broadcast';
+import { FluxClient, FluxConnectionStatus, FluxListenerControls, FluxManifestTypes } from '@holo-js/flux';
+import { GeneratedBroadcastManifest, BroadcastPayloadFor } from '@holo-js/broadcast';
 
-type ManifestEventName<TManifest extends GeneratedBroadcastManifest> = TManifest['events'][number]['name'] & string;
-type ManifestChannelPattern<TManifest extends GeneratedBroadcastManifest> = TManifest['channels'][number]['pattern'] & string;
-type ManifestChannelEntryByPattern<TManifest extends GeneratedBroadcastManifest, TPattern extends string> = Extract<TManifest['channels'][number], {
-    pattern: TPattern;
-}>;
-type ManifestPresenceMember<TManifest extends GeneratedBroadcastManifest, TPattern extends string> = Extract<ManifestChannelEntryByPattern<TManifest, TPattern>, {
-    member: unknown;
-}> extends {
-    member: infer TMember;
-} ? TMember : BroadcastJsonObject;
-type ManifestEventNamesForPattern<TManifest extends GeneratedBroadcastManifest, TPattern extends string> = TManifest['events'][number] extends infer TEvent ? TEvent extends {
-    readonly name: infer TName;
-    readonly channels: readonly {
-        readonly pattern: infer TEventPattern;
-    }[];
-} ? TPattern extends TEventPattern & string ? TName & string : never : never : never;
-type ManifestSubscriptionEventName<TManifest extends GeneratedBroadcastManifest, TChannel extends string> = string extends ManifestEventName<TManifest> ? string : TChannel extends ManifestChannelPattern<TManifest> ? ManifestEventNamesForPattern<TManifest, TChannel> : never;
-type ManifestHookChannel<TManifest extends GeneratedBroadcastManifest> = string extends ManifestChannelPattern<TManifest> ? string : ManifestChannelPattern<TManifest>;
-type ManifestHookEvent<TManifest extends GeneratedBroadcastManifest, TChannel extends string, TEvent extends string> = TEvent & ManifestSubscriptionEventName<TManifest, TChannel>;
-type ManifestHookPresenceMember<TMember, TManifest extends GeneratedBroadcastManifest, TChannel extends string> = unknown extends TMember ? string extends ManifestChannelPattern<TManifest> ? BroadcastJsonObject : ManifestPresenceMember<TManifest, TChannel> : TMember;
+type ManifestHookChannel<TManifest extends GeneratedBroadcastManifest> = FluxManifestTypes<TManifest>['channelPattern'];
+type ManifestHookEvent<TManifest extends GeneratedBroadcastManifest, TChannel extends string, TEvent extends string> = TEvent & FluxManifestTypes<TManifest, TChannel>['adapterEvent'];
+type ManifestHookPresenceMember<TMember, TManifest extends GeneratedBroadcastManifest, TChannel extends string> = FluxManifestTypes<TManifest, TChannel, TMember>['adapterPresenceMember'];
 interface FluxHookOptions<TManifest extends GeneratedBroadcastManifest = GeneratedBroadcastManifest> {
     readonly client?: FluxClient<TManifest>;
     readonly onUnmount?: (cleanup: () => void) => void;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 // src/index.ts
 import { useEffect, useMemo, useReducer, useRef, useSyncExternalStore } from "react";
-import { getFluxClient } from "@holo-js/flux";
+import { fluxInternals, getFluxClient } from "@holo-js/flux";
 function resolveClient(options) {
   return options.client ?? getFluxClient();
 }
@@ -23,20 +23,6 @@ function useLatestRef(value) {
 function serializeEventDependency(events) {
   return Array.isArray(events) ? events.map(String).join("\0") : String(events);
 }
-function memberKey(member) {
-  return JSON.stringify(member) ?? String(member);
-}
-function appendPresenceMember(members, member) {
-  return Object.freeze([...members, member]);
-}
-function removePresenceMember(members, member) {
-  const key = memberKey(member);
-  const index = members.findIndex((candidate) => Object.is(candidate, member) || memberKey(candidate) === key);
-  if (index < 0) {
-    return members;
-  }
-  return Object.freeze(members.filter((_, candidateIndex) => candidateIndex !== index));
-}
 function useControls(createSubscription, onUnmount, dependencies = []) {
   const controlsRef = useRef(createNoopControls());
   const onUnmountRef = useLatestRef(onUnmount);
@@ -155,11 +141,11 @@ function useFluxPresence(channel, callbacks = {}, options = {}) {
       }
     }).joining((member) => {
       if (active) {
-        updateMembers(appendPresenceMember(membersRef.current, member));
+        updateMembers(fluxInternals.appendPresenceMember(membersRef.current, member));
       }
     }).leaving((member) => {
       if (active) {
-        updateMembers(removePresenceMember(membersRef.current, member));
+        updateMembers(fluxInternals.removePresenceMember(membersRef.current, member));
       }
     }).listen();
     onUnmountRef.current?.(cleanup);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holo-js/flux-react",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "description": "Holo-JS Framework - React and Next hook skeletons for Flux",
   "type": "module",
   "license": "MIT",
@@ -23,8 +23,8 @@
     "test": "vitest --run"
   },
   "dependencies": {
-    "@holo-js/broadcast": "^0.3.16",
-    "@holo-js/flux": "^0.3.16"
+    "@holo-js/broadcast": "^0.3.18",
+    "@holo-js/flux": "^0.3.18"
   },
   "peerDependencies": {
     "react": "^19.2.6"