insite-subscriptions-react 2.2.3 → 2.3.0

package/dist/Subscription.d.ts

@@ -24,11 +24,14 @@ export declare class SubscriptionComponent extends Component<Props, State> {
     renew(publicationName: string, params: unknown[]): void;
     subscribe(): void;
     unsubscribe(): void;
-    shouldComponentUpdate: ((nextProps: Props) => boolean) | undefined;
+    shouldComponentUpdate: typeof SubscriptionComponent.inconsistentShouldComponentUpdate | undefined;
     render(): string | number | true | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null;
-    handleUpdate: () => void | undefined;
+    handleUpdate(): void;
     componentDidMount(): void;
     componentWillUnmount(): void;
+    static inconsistentShouldComponentUpdate(this: SubscriptionComponent, nextProps: Props): boolean;
+    static consistentHandleUpdate(this: SubscriptionComponent): void;
+    static inconsistentHandleUpdate(this: SubscriptionComponent): void;
     static defaultProps: {
         params: never[];
     };

package/dist/Subscription.d.ts.map

@@ -1 +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;;sIAAC;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"}
+{"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;;sIAAC;IAEN,mBAAmB,qBAG0C;IAE7D,IAAI,QAAQ,YAEX;IAED,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE;IAIhD,SAAS;IAIT,WAAW;IAKX,qBAAqB,6EAGqC;IAE1D,MAAM;IAKN,YAAY;IAMZ,iBAAiB;IAWjB,oBAAoB;IAOpB,MAAM,CAAC,iCAAiC,CAAC,IAAI,EAAE,qBAAqB,EAAE,SAAS,EAAE,KAAK;IAYtF,MAAM,CAAC,sBAAsB,CAAC,IAAI,EAAE,qBAAqB;IASzD,MAAM,CAAC,wBAAwB,CAAC,IAAI,EAAE,qBAAqB;IAS3D,MAAM,CAAC,YAAY;;MAEjB;IAEF,MAAM,CAAC,MAAM,6BAAuB;CAEpC"}

package/dist/Subscription.js

@@ -35,31 +35,43 @@ export class SubscriptionComponent extends Component {
     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;
-    };
+    shouldComponentUpdate = this.props.consistent ?
+        undefined :
+        SubscriptionComponent.inconsistentShouldComponentUpdate;
     render() {
         return this.props.children?.(this.isActive, this.value) || null;
     }
-    handleUpdate = () => this.props.onUpdate?.(this.value);
+    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({});
-        };
+        this.handleUpdate =
+            this.props.consistent ?
+                SubscriptionComponent.consistentHandleUpdate :
+                SubscriptionComponent.inconsistentHandleUpdate;
     }
     componentWillUnmount() {
         this.unsubscribe();
     }
+    static inconsistentShouldComponentUpdate(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;
+    }
+    static consistentHandleUpdate() {
+        console.log("🔵 consistentHandleUpdate");
+        this.props.onUpdate?.(this.value);
+        this.forceUpdate();
+    }
+    static inconsistentHandleUpdate() {
+        console.log("🔵 inconsistentHandleUpdate");
+        this.props.onUpdate?.(this.value);
+        this.setState({});
+    }
     static defaultProps = {
         params: []
     };

package/dist/SubscriptionGroup.d.ts.map

@@ -1 +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,GAAI,aAAa,mCAAmC,EAAE,kpBAAsC;IAEpG,SAAS,eAAgC;IAEzC,WAAW,6BAAkC;IAE7C,qBAAqB,eAAmD,KAAK,0BAc3E;IAEF,MAAM;IAKN,YAAY,aAA2C;IAEvD,iBAAiB;IAkBjB,oBAAoB;IASpB,MAAM,CAAC,MAAM,6BAAuB;CAEpC"}
+{"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,GAAI,aAAa,mCAAmC,EAAE,kpBAAsC;IAEpG,SAAS,eAAgC;IAEzC,WAAW,6BAAkC;IAE7C,qBAAqB,eAAmD,KAAK,0BAc3E;IAEF,MAAM;IAKN,YAAY,aAA2C;IAEvD,iBAAiB;IAsBjB,oBAAoB;IASpB,MAAM,CAAC,MAAM,6BAAuB;CAEpC"}

package/dist/SubscriptionGroup.js

@@ -34,7 +34,7 @@ export class SubscriptionGroupComponent extends Component {
         if (this.definitionsSnapshot === definitionsSnapshot)
             return true;
         this.definitionsSnapshot = definitionsSnapshot;
-        this.redefine(nextProps.definitions);
+        void this.redefine(nextProps.definitions);
         return false;
     };
     render() {
@@ -44,9 +44,11 @@ export class SubscriptionGroupComponent extends Component {
     componentDidMount() {
         this.subscribe();
         this.handleUpdate = this.props.consistent ? () => {
+            console.log("🟣 consistentHandleUpdate");
             this.props.onUpdate?.(this.group);
             this.forceUpdate();
         } : () => {
+            console.log("🟣 inconsistentHandleUpdate");
             this.props.onUpdate?.(this.group);
             this.setState({});
         };

package/package.json

@@ -1,34 +1,34 @@
 {
-  "name": "insite-subscriptions-react",
-  "version": "2.2.3",
-  "description": "inSite subscriptions React components",
-  "type": "module",
-  "main": "./src/index.js",
-  "module": "./src/index.js",
-  "packageManager": "bun@1.2.9",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "tsc -p ."
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/nesvet/insite-subscriptions-react.git"
-  },
-  "keywords": [
-    "insite",
-    "subscriptions",
-    "react"
-  ],
-  "author": "Eugene Nesvetaev <dev@nesvet.dev> (https://nesvet.dev/)",
-  "license": "MIT",
-  "dependencies": {
-    "@nesvet/n": "^1.1.29",
-    "insite-subscriptions-client": "^2.2.3",
-    "react": "~18.2.0"
-  },
-  "devDependencies": {
-    "@nesvet/eslint-config": "^2.0.52",
-    "@types/react": "^18.3.20",
-    "typescript": "^5.8.3"
-  }
+	"name": "insite-subscriptions-react",
+	"version": "2.3.0",
+	"description": "inSite subscriptions React components",
+	"type": "module",
+	"main": "./src/index.js",
+	"module": "./src/index.js",
+	"packageManager": "bun@1.2.11",
+	"scripts": {
+		"test": "echo \"Error: no test specified\" && exit 1",
+		"build": "tsc -p ."
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/nesvet/insite-subscriptions-react.git"
+	},
+	"keywords": [
+		"insite",
+		"subscriptions",
+		"react"
+	],
+	"author": "Eugene Nesvetaev <dev@nesvet.dev> (https://nesvet.dev/)",
+	"license": "MIT",
+	"dependencies": {
+		"@nesvet/n": "^1.2.0",
+		"insite-subscriptions-client": "^2.3.0",
+		"react": "~18.2.0"
+	},
+	"devDependencies": {
+		"@nesvet/eslint-config": "^2.1.1",
+		"@types/react": "^18.3.20",
+		"typescript": "^5.8.3"
+	}
 }

package/src/Subscription.tsx

@@ -84,41 +84,30 @@ export class SubscriptionComponent extends Component<Props, State> {
 	}
 	
 	
-	shouldComponentUpdate = this.props.consistent ? undefined : (nextProps: Props) => {
-		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;
-		
-	};
+	shouldComponentUpdate =
+		this.props.consistent ?
+			undefined :
+			SubscriptionComponent.inconsistentShouldComponentUpdate;
 	
 	render() {
 		return this.props.children?.(this.isActive, this.value) || null;
 	}
 	
 	
-	handleUpdate = () => this.props.onUpdate?.(this.value);
+	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({});
-			
-		};
+		this.handleUpdate =
+			this.props.consistent ?
+				SubscriptionComponent.consistentHandleUpdate :
+				SubscriptionComponent.inconsistentHandleUpdate;
 		
 	}
 	
@@ -129,6 +118,36 @@ export class SubscriptionComponent extends Component<Props, State> {
 	}
 	
 	
+	static inconsistentShouldComponentUpdate(this: SubscriptionComponent, nextProps: Props) {
+		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;
+	}
+	
+	static consistentHandleUpdate(this: SubscriptionComponent) {
+		
+		console.log("🔵 consistentHandleUpdate");
+		
+		this.props.onUpdate?.(this.value);
+		this.forceUpdate();
+		
+	}
+	
+	static inconsistentHandleUpdate(this: SubscriptionComponent) {
+		
+		console.log("🔵 inconsistentHandleUpdate");
+		
+		this.props.onUpdate?.(this.value);
+		this.setState({});
+		
+	}
+	
 	static defaultProps = {
 		params: []
 	};

package/src/SubscriptionGroup.tsx

@@ -73,7 +73,7 @@ export class SubscriptionGroupComponent extends Component<Props, State> {
 			return true;
 		
 		this.definitionsSnapshot = definitionsSnapshot;
-		this.redefine(nextProps.definitions);
+		void this.redefine(nextProps.definitions);
 		
 		return false;
 		
@@ -92,11 +92,15 @@ export class SubscriptionGroupComponent extends Component<Props, State> {
 		
 		this.handleUpdate = this.props.consistent ? () => {
 			
+			console.log("🟣 consistentHandleUpdate");
+			
 			this.props.onUpdate?.(this.group);
 			this.forceUpdate();
 			
 		} : () => {
 			
+			console.log("🟣 inconsistentHandleUpdate");
+			
 			this.props.onUpdate?.(this.group);
 			this.setState({});