libshv-js 11.0.3 → 11.0.5

package/dist/ws-client.js

@@ -131,9 +131,14 @@ export var ShvApiVersion;
 })(ShvApiVersion || (ShvApiVersion = {}));
 export const pathMatchesSubscription = (subscriptionPath, signalPath, apiVersion) => {
     if (apiVersion === ShvApiVersion.V2) {
-        const remainder = signalPath.slice(subscriptionPath.length);
-        return signalPath.startsWith(subscriptionPath) && (remainder.length === 0 || remainder.startsWith('/'));
+        // SHV2 path matching works as if there were a globstar at the end of the path (i.e. it just checks the prefix).
+        // Users of the library might still add the globstart at the end, so we'll remove it for them, so that they do
+        // not have to worry about this.
+        const recursivePathPrefix = subscriptionPath.endsWith('/**') ? subscriptionPath.slice(0, -3) : subscriptionPath;
+        const remainder = signalPath.slice(recursivePathPrefix.length);
+        return signalPath.startsWith(recursivePathPrefix) && (remainder.length === 0 || remainder.startsWith('/'));
     }
+    // SHV3 globstar at the end allows for no fragments at the end, so we'll check both.
     const recursivePathPrefix = subscriptionPath.endsWith('/**') ? subscriptionPath.slice(0, -3) : undefined;
     return (recursivePathPrefix !== undefined && minimatch(signalPath, recursivePathPrefix)) || minimatch(signalPath, subscriptionPath);
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "libshv-js",
-  "version": "11.0.3",
+  "version": "11.0.5",
   "description": "Typescript implementation of libshv",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,9 +41,9 @@
     "@typescript-eslint/parser": "^8.56.1",
     "@eslint/js": "^10.0.1",
     "eslint": "^10.0.0",
-    "eslint-config-xo": "^6.0.0",
+    "eslint-config-xo": "^7.0.0",
     "eslint-formatter-unix": "^9.0.1",
-    "eslint-plugin-unicorn": "^78.0.0",
+    "eslint-plugin-unicorn": "^79.0.0",
     "typescript": "^6.0.2",
     "typescript-eslint": "^8.46.1"
   },