insite-subscriptions-react 1.0.148 → 2.0.1

package/dist/Subscription.d.ts

@@ -0,0 +1,38 @@
+import { Component, type ReactNode } from "react";
+import { Subscription, SubscriptionArrayWithSubscription, SubscriptionMap, SubscriptionMapWithSubscription, SubscriptionObjectWithSubscription } from "insite-subscriptions-client";
+type Value = SubscriptionArrayWithSubscription | SubscriptionMapWithSubscription | SubscriptionObjectWithSubscription;
+type Props = {
+    map?: boolean;
+    array?: boolean;
+    publication: string;
+    params: unknown[];
+    Item?: SubscriptionMap["Item"];
+    valueRef: (value: Value) => void;
+    consistent?: boolean;
+    children?: (isActive: boolean, value: Value) => ReactNode;
+    onUpdate?: (value: Value) => void;
+};
+type State = object | undefined;
+export declare class SubscriptionComponent extends Component<Props, State> {
+    constructor(props: Props);
+    state: {} | undefined;
+    value: SubscriptionObjectWithSubscription | SubscriptionMapWithSubscription<({
+        _id: string;
+    } & Record<string, any>) | import("insite-subscriptions-client/dist/SubscriptionMap").SubscriptionMapItem> | SubscriptionArrayWithSubscription<unknown>;
+    publicationSnapshot: string | undefined;
+    get isActive(): boolean;
+    renew(publicationName: string, params: unknown[]): void;
+    subscribe(): void;
+    unsubscribe(): void;
+    shouldComponentUpdate: ((nextProps: Props) => boolean) | undefined;
+    render(): string | number | true | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null;
+    handleUpdate: () => void | undefined;
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    static defaultProps: {
+        params: never[];
+    };
+    static bindTo: typeof Subscription.bindTo;
+}
+export {};
+//# sourceMappingURL=Subscription.d.ts.map

package/dist/Subscription.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"Subscription.d.ts","sourceRoot":"","sources":["../src/Subscription.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,KAAK,SAAS,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAIN,YAAY,EAEZ,iCAAiC,EACjC,eAAe,EACf,+BAA+B,EAE/B,kCAAkC,EAElC,MAAM,6BAA6B,CAAC;AAGrC,KAAK,KAAK,GAAG,iCAAiC,GAAG,+BAA+B,GAAG,kCAAkC,CAAC;AAEtH,KAAK,KAAK,GAAG;IACZ,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,OAAO,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;IAC/B,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IACjC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,KAAK,SAAS,CAAC;IAC1D,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;CAClC,CAAC;AAEF,KAAK,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;AAOhC,qBAAa,qBAAsB,SAAQ,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;gBACrD,KAAK,EAAE,KAAK;IAmBxB,KAAK,iBAGA;IAEL,KAAK;;4JAAC;IAEN,mBAAmB,qBAG0C;IAE7D,IAAI,QAAQ,YAEX;IAED,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAIhD,SAAS;IAIT,WAAW;IAKX,qBAAqB,eAAmD,KAAK,0BAW3E;IAEF,MAAM;IAKN,YAAY,yBAA2C;IAEvD,iBAAiB;IAkBjB,oBAAoB;IAOpB,MAAM,CAAC,YAAY;;MAEjB;IAEF,MAAM,CAAC,MAAM,6BAAuB;CAEpC"}

package/dist/Subscription.js

@@ -0,0 +1,67 @@
+import { Component } from "react";
+import { getSubscriptionSymbol, renewSymbol, subscribeSymbol, Subscription, SubscriptionArray, SubscriptionMap, SubscriptionObject, unsubscribeSymbol } from "insite-subscriptions-client";
+function isValueSubscriptionMap(props, value) {
+    return props.map === true;
+}
+export class SubscriptionComponent extends Component {
+    constructor(props) {
+        super(props);
+        const target = props.map ?
+            new SubscriptionMap.WithSubscription(props.publication, props.params, (() => this.handleUpdate()), false) :
+            props.array ?
+                new SubscriptionArray.WithSubscription(props.publication, props.params, (() => this.handleUpdate()), false) :
+                new SubscriptionObject.WithSubscription(props.publication, props.params, (() => this.handleUpdate()), false);
+        this.value = target;
+        if (isValueSubscriptionMap(props, target) && props.Item)
+            target.Item = props.Item;
+        props.valueRef?.(this.value);
+    }
+    state = this.props.consistent ?
+        undefined :
+        {};
+    value;
+    publicationSnapshot = this.props.consistent ?
+        undefined :
+        JSON.stringify(this.props.params) + this.props.publication;
+    get isActive() {
+        return this.value[getSubscriptionSymbol]()?.isActive ?? false;
+    }
+    renew(publicationName, params) {
+        return this.value[renewSymbol](publicationName, params);
+    }
+    subscribe() {
+        return this.value[subscribeSymbol]();
+    }
+    unsubscribe() {
+        return this.value[unsubscribeSymbol]();
+    }
+    shouldComponentUpdate = this.props.consistent ? undefined : (nextProps) => {
+        const publicationSnapshot = JSON.stringify(nextProps.params) + nextProps.publication;
+        if (this.publicationSnapshot === publicationSnapshot)
+            return true;
+        this.publicationSnapshot = publicationSnapshot;
+        this.renew(nextProps.publication, nextProps.params);
+        return false;
+    };
+    render() {
+        return this.props.children?.(this.isActive, this.value) || null;
+    }
+    handleUpdate = () => this.props.onUpdate?.(this.value);
+    componentDidMount() {
+        this.subscribe();
+        this.handleUpdate = this.props.consistent ? () => {
+            this.props.onUpdate?.(this.value);
+            this.forceUpdate();
+        } : () => {
+            this.props.onUpdate?.(this.value);
+            this.setState({});
+        };
+    }
+    componentWillUnmount() {
+        this.unsubscribe();
+    }
+    static defaultProps = {
+        params: []
+    };
+    static bindTo = Subscription.bindTo;
+}

package/dist/SubscriptionGroup.d.ts

@@ -0,0 +1,33 @@
+import { Component, ReactNode } from "react";
+import { Subscription, SubscriptionGroup, type SubscriptionGroupOptions, type SubscriptionGroupUnparsedDefinition } from "insite-subscriptions-client";
+type SubscriptionGroupValues = any[] & Record<string, any>;
+type Props = {
+    definitions: SubscriptionGroupUnparsedDefinition[];
+    target: SubscriptionGroupOptions["target"];
+    debounce: SubscriptionGroupOptions["debounce"];
+    valuesRef: (values: SubscriptionGroupValues) => void;
+    consistent: boolean;
+    children: (isLoaded: boolean, values: SubscriptionGroupValues) => ReactNode;
+    onUpdate: (group: SubscriptionGroup) => void;
+};
+type State = object | undefined;
+export declare class SubscriptionGroupComponent extends Component<Props, State> {
+    constructor(props: Props);
+    group: SubscriptionGroup<SubscriptionGroupUnparsedDefinition[]>;
+    state: {} | undefined;
+    definitionsSnapshot: string | undefined;
+    get isLoaded(): boolean;
+    get isInited(): boolean;
+    get values(): any[] & Record<string, any>;
+    redefine: (definitions: SubscriptionGroupUnparsedDefinition[]) => Promise<(import("insite-subscriptions-client/dist/SubscriptionGroup/SubscriptionGroupItem").SubscriptionGroupItem<import("insite-subscriptions-client").SubscriptionGroupSubscriptionType, import("insite-subscriptions-client").SubscriptionGroupDefinition<import("insite-subscriptions-client").SubscriptionGroupSubscriptionType>> | import("insite-subscriptions-client/dist/SubscriptionGroup/SubscriptionGroupItem").SubscriptionGroupItem<import("insite-subscriptions-client").SubscriptionGroupSubscriptionType, import("insite-subscriptions-client").SubscriptionGroupDefinition<import("insite-subscriptions-client").SubscriptionGroupSubscriptionType>>[])[]>;
+    subscribe: () => (void | undefined)[];
+    unsubscribe: () => (void | undefined)[];
+    shouldComponentUpdate: ((nextProps: Props) => boolean) | undefined;
+    render(): string | number | true | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null;
+    handleUpdate: () => void;
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    static bindTo: typeof Subscription.bindTo;
+}
+export {};
+//# sourceMappingURL=SubscriptionGroup.d.ts.map

package/dist/SubscriptionGroup.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SubscriptionGroup.d.ts","sourceRoot":"","sources":["../src/SubscriptionGroup.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE7C,OAAO,EACN,YAAY,EACZ,iBAAiB,EACjB,KAAK,wBAAwB,EAC7B,KAAK,mCAAmC,EACxC,MAAM,6BAA6B,CAAC;AAGrC,KAAK,uBAAuB,GAAG,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;AAE3D,KAAK,KAAK,GAAG;IACZ,WAAW,EAAE,mCAAmC,EAAE,CAAC;IACnD,MAAM,EAAE,wBAAwB,CAAC,QAAQ,CAAC,CAAC;IAC3C,QAAQ,EAAE,wBAAwB,CAAC,UAAU,CAAC,CAAC;IAC/C,SAAS,EAAE,CAAC,MAAM,EAAE,uBAAuB,KAAK,IAAI,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,uBAAuB,KAAK,SAAS,CAAC;IAC5E,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,KAAK,KAAK,GAAG,MAAM,GAAG,SAAS,CAAC;AAGhC,qBAAa,0BAA2B,SAAQ,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC;gBAC1D,KAAK,EAAE,KAAK;IAexB,KAAK,2DAAC;IAEN,KAAK,iBAA0C;IAE/C,mBAAmB,qBAA8E;IAEjG,IAAI,QAAQ,YAEX;IAED,IAAI,QAAQ,YAEX;IAED,IAAI,MAAM,gCAET;IAED,QAAQ,gBAAiB,mCAAmC,EAAE,kpBAAsC;IAEpG,SAAS,6BAAgC;IAEzC,WAAW,6BAAkC;IAE7C,qBAAqB,eAAmD,KAAK,0BAc3E;IAEF,MAAM;IAKN,YAAY,aAA2C;IAEvD,iBAAiB;IAkBjB,oBAAoB;IASpB,MAAM,CAAC,MAAM,6BAAuB;CAEpC"}

package/dist/SubscriptionGroup.js

@@ -0,0 +1,59 @@
+import { Component } from "react";
+import { noop } from "@nesvet/n";
+import { Subscription, SubscriptionGroup } from "insite-subscriptions-client";
+export class SubscriptionGroupComponent extends Component {
+    constructor(props) {
+        super(props);
+        this.group = new SubscriptionGroup(props.definitions, {
+            target: props.target,
+            debounce: props.debounce,
+            immediately: false
+        });
+        this.group.on("update", () => this.handleUpdate());
+        props.valuesRef?.(this.group.values);
+    }
+    group;
+    state = this.props.consistent ? undefined : {};
+    definitionsSnapshot = this.props.consistent ? undefined : JSON.stringify(this.props.definitions);
+    get isLoaded() {
+        return this.group.isLoaded;
+    }
+    get isInited() {
+        return this.group.isInited;
+    }
+    get values() {
+        return this.group.values;
+    }
+    redefine = (definitions) => this.group.redefine(definitions);
+    subscribe = () => this.group.subscribe();
+    unsubscribe = () => this.group.unsubscribe();
+    shouldComponentUpdate = this.props.consistent ? undefined : (nextProps) => {
+        if (this.props.target !== nextProps.target || this.props.debounce !== nextProps.debounce)
+            this.group.applyOptions({ target: nextProps.target, debounceLimit: nextProps.debounce });
+        const definitionsSnapshot = JSON.stringify(nextProps.definitions);
+        if (this.definitionsSnapshot === definitionsSnapshot)
+            return true;
+        this.definitionsSnapshot = definitionsSnapshot;
+        this.redefine(nextProps.definitions);
+        return false;
+    };
+    render() {
+        return this.props.children?.(this.group.isLoaded, this.group.values) || null;
+    }
+    handleUpdate = () => this.props.onUpdate?.(this.group);
+    componentDidMount() {
+        this.subscribe();
+        this.handleUpdate = this.props.consistent ? () => {
+            this.props.onUpdate?.(this.group);
+            this.forceUpdate();
+        } : () => {
+            this.props.onUpdate?.(this.group);
+            this.setState({});
+        };
+    }
+    componentWillUnmount() {
+        this.handleUpdate = noop;
+        this.unsubscribe();
+    }
+    static bindTo = Subscription.bindTo;
+}

package/dist/index.d.ts

@@ -0,0 +1,3 @@
+export { SubscriptionComponent as Subscription } from "./Subscription";
+export { SubscriptionGroupComponent as SubscriptionGroup } from "./SubscriptionGroup";
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACvE,OAAO,EAAE,0BAA0B,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC"}

package/package.json

@@ -1,13 +1,14 @@
 {
   "name": "insite-subscriptions-react",
-  "version": "1.0.148",
+  "version": "2.0.1",
   "description": "inSite subscriptions React components",
   "type": "module",
-  "main": "./lib/index.js",
-  "module": "./lib/index.js",
-  "packageManager": "bun@1.1.9",
+  "main": "./src/index.js",
+  "module": "./src/index.js",
+  "packageManager": "bun@1.1.26",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc -p ."
   },
   "repository": {
     "type": "git",
@@ -21,11 +22,13 @@
   "author": "Eugene Nesvetaev <dev@nesvet.dev> (https://nesvet.dev/)",
   "license": "MIT",
   "dependencies": {
-    "insite-subscriptions-client": "^1",
-    "@nesvet/n": "^1",
-    "react": "18.2"
+    "@nesvet/n": "^1.1.7",
+    "insite-subscriptions-client": "^2.0.2",
+    "react": "~18.2.0"
   },
   "devDependencies": {
-    "@nesvet/eslint-config": "^1"
+    "@nesvet/eslint-config": "^2.0.25",
+    "@types/react": "^18.3.5",
+    "typescript": "^5.5.4"
   }
 }

package/{lib/Subscription.jsx → src/Subscription.tsx}

@@ -1,32 +1,54 @@
+import { Component, type ReactNode } from "react";
 import {
 	getSubscriptionSymbol,
 	renewSymbol,
 	subscribeSymbol,
 	Subscription,
 	SubscriptionArray,
+	SubscriptionArrayWithSubscription,
 	SubscriptionMap,
+	SubscriptionMapWithSubscription,
 	SubscriptionObject,
+	SubscriptionObjectWithSubscription,
 	unsubscribeSymbol
 } from "insite-subscriptions-client";
-import { Component } from "react";
 
 
-export class SubscriptionComponent extends Component {
-	constructor(props) {
+type Value = SubscriptionArrayWithSubscription | SubscriptionMapWithSubscription | SubscriptionObjectWithSubscription;
+
+type Props = {
+	map?: boolean;
+	array?: boolean;
+	publication: string;
+	params: unknown[];
+	Item?: SubscriptionMap["Item"];
+	valueRef: (value: Value) => void;
+	consistent?: boolean;
+	children?: (isActive: boolean, value: Value) => ReactNode;
+	onUpdate?: (value: Value) => void;
+};
+
+type State = object | undefined;
+
+function isValueSubscriptionMap(props: Props, value: Value): value is SubscriptionMapWithSubscription {
+	return props.map === true;
+}
+
+
+export class SubscriptionComponent extends Component<Props, State> {
+	constructor(props: Props) {
 		super(props);
 		
-		const SubscriptionTarget =
+		const target =
 			props.map ?
-				SubscriptionMap :
+				new SubscriptionMap.WithSubscription(props.publication, props.params, (() => this.handleUpdate()), false) :
 				props.array ?
-					SubscriptionArray :
-					SubscriptionObject;
-		
-		const target = new SubscriptionTarget.WithSubscription(props.publication, props.params, () => this.handleUpdate(), false);
+					new SubscriptionArray.WithSubscription(props.publication, props.params, (() => this.handleUpdate()), false) :
+					new SubscriptionObject.WithSubscription(props.publication, props.params, (() => this.handleUpdate()), false);
 		
 		this.value = target;
 		
-		if (props.map && props.Item)
+		if (isValueSubscriptionMap(props, target) && props.Item)
 			target.Item = props.Item;
 		
 		props.valueRef?.(this.value);
@@ -38,6 +60,8 @@ export class SubscriptionComponent extends Component {
 			undefined :
 			{};
 	
+	value;
+	
 	publicationSnapshot =
 		this.props.consistent ?
 			undefined :
@@ -47,7 +71,7 @@ export class SubscriptionComponent extends Component {
 		return this.value[getSubscriptionSymbol]()?.isActive ?? false;
 	}
 	
-	renew(publicationName, params) {
+	renew(publicationName: string, params: unknown[]) {
 		return this.value[renewSymbol](publicationName, params);
 	}
 	
@@ -60,7 +84,7 @@ export class SubscriptionComponent extends Component {
 	}
 	
 	
-	shouldComponentUpdate = this.props.consistent ? undefined : nextProps => {
+	shouldComponentUpdate = this.props.consistent ? undefined : (nextProps: Props) => {
 		const publicationSnapshot = JSON.stringify(nextProps.params) + nextProps.publication;
 		
 		if (this.publicationSnapshot === publicationSnapshot)

package/{lib/SubscriptionGroup.jsx → src/SubscriptionGroup.tsx}

@@ -1,10 +1,30 @@
+import { Component, ReactNode } from "react";
 import { noop } from "@nesvet/n";
-import { Subscription, SubscriptionGroup } from "insite-subscriptions-client";
-import { Component } from "react";
+import {
+	Subscription,
+	SubscriptionGroup,
+	type SubscriptionGroupOptions,
+	type SubscriptionGroupUnparsedDefinition
+} from "insite-subscriptions-client";
 
 
-export class SubscriptionGroupComponent extends Component {
-	constructor(props) {
+type SubscriptionGroupValues = any[] & Record<string, any>;// eslint-disable-line @typescript-eslint/no-explicit-any
+
+type Props = {
+	definitions: SubscriptionGroupUnparsedDefinition[];
+	target: SubscriptionGroupOptions["target"];
+	debounce: SubscriptionGroupOptions["debounce"];
+	valuesRef: (values: SubscriptionGroupValues) => void;
+	consistent: boolean;
+	children: (isLoaded: boolean, values: SubscriptionGroupValues) => ReactNode;
+	onUpdate: (group: SubscriptionGroup) => void;
+};
+
+type State = object | undefined;
+
+
+export class SubscriptionGroupComponent extends Component<Props, State> {
+	constructor(props: Props) {
 		super(props);
 		
 		this.group = new SubscriptionGroup(props.definitions, {
@@ -19,6 +39,8 @@ export class SubscriptionGroupComponent extends Component {
 		
 	}
 	
+	group;
+	
 	state = this.props.consistent ? undefined : {};
 	
 	definitionsSnapshot = this.props.consistent ? undefined : JSON.stringify(this.props.definitions);
@@ -35,13 +57,13 @@ export class SubscriptionGroupComponent extends Component {
 		return this.group.values;
 	}
 	
-	redefine = definitions => this.group.redefine(definitions);
+	redefine = (definitions: SubscriptionGroupUnparsedDefinition[]) => this.group.redefine(definitions);
 	
 	subscribe = () => this.group.subscribe();
 	
 	unsubscribe = () => this.group.unsubscribe();
 	
-	shouldComponentUpdate = this.props.consistent ? undefined : nextProps => {
+	shouldComponentUpdate = this.props.consistent ? undefined : (nextProps: Props) => {
 		if (this.props.target !== nextProps.target || this.props.debounce !== nextProps.debounce)
 			this.group.applyOptions({ target: nextProps.target, debounceLimit: nextProps.debounce });
 		

package/src/index.ts

@@ -0,0 +1,2 @@
+export { SubscriptionComponent as Subscription } from "./Subscription";
+export { SubscriptionGroupComponent as SubscriptionGroup } from "./SubscriptionGroup";