jsgar 4.0.4 → 4.1.0

package/dist/gar.umd.js

@@ -55,7 +55,7 @@
                 this.scaledHeartbeatTimeoutInterval *= this.timeoutScale;
             }
             this.unique_key_and_record_updates = uniqueKeyAndRecordUpdates;
-            this.version = 650708;
+            this.version = 650709;
             this.uuid = GARClient._generateUUID();
 
             if (typeof window !== 'undefined' && window.location) {
@@ -919,7 +919,8 @@
          * @param {boolean} [includeDerived=false] - Include derived topics
          * @param {boolean} [trimDefaultValues=false] - Trim records containing default values from the snapshot
          * @param {string|null} [workingNamespace] - Namespace for matching relative paths
-         * @param {string|null} [restrictNamespace=false] - Restricts topics and keys to children of restrict_namespace. Defaults to the working namespace. Use "::" for root / no restriction.
+         * @param {string|Array<string>|null} [restrictNamespace] - Restricts topics and keys to children of these namespaces (union). Defaults to the working namespace. Use ["::"] for root / no restriction.
+         * @param {string|Array<string>|null} [excludeNamespace] - Excludes topics and keys from children of these namespaces (union). Defaults to 'g' unless restrictNamespace is set.
          * @param {string|null} [density] - For performance tuning
          * @param {number} [subscriptionGroup=0] - Subscription group ID for isolating callbacks
          * @param {string|null} [subscriptionSet] - Subscription set identifier
@@ -943,6 +944,7 @@
             trimDefaultValues = false,
             workingNamespace = null,
             restrictNamespace = null,
+            excludeNamespace = null,
             density = null,
             subscriptionGroup = 0,
             subscriptionSet = null,
@@ -1030,7 +1032,10 @@
                 valueDict.include_derived = includeDerived;
             }
             if (restrictNamespace) {
-                valueDict.restrict_namespace = restrictNamespace;
+                valueDict.restrict_namespace = typeof restrictNamespace === 'string' ? [restrictNamespace] : restrictNamespace;
+            }
+            if (excludeNamespace) {
+                valueDict.exclude_namespace = typeof excludeNamespace === 'string' ? [excludeNamespace] : excludeNamespace;
             }
             if (trimDefaultValues) {
                 valueDict.trim_default_values = trimDefaultValues;
@@ -1299,8 +1304,8 @@
          * @param {string|null} [excludeTopicFilter]
          * @param {Array<string>|null} [historyTypes]
          * @param {string|null} [workingNamespace]
-         * @param {string|null} [restrictNamespace]
-         * @param {string|null} [excludeNamespace]
+         * @param {string|Array<string>|null} [restrictNamespace]
+         * @param {string|Array<string>|null} [excludeNamespace]
          * @param {boolean} [includeDerived=false]
          * @param {number} [timeout=10.0] seconds
          * @param {number} [subscriptionGroupServerKeys=650704]
@@ -1335,8 +1340,8 @@
             if (Array.isArray(topicList)) recordFilter.topic_list = topicList;
             if (Array.isArray(classList)) recordFilter.class_list = classList;
             if (workingNamespace != null) recordFilter.working_namespace = workingNamespace;
-            if (restrictNamespace != null) recordFilter.restrict_namespace = restrictNamespace;
-            if (excludeNamespace != null) recordFilter.exclude_namespace = excludeNamespace;
+            if (restrictNamespace != null) recordFilter.restrict_namespace = typeof restrictNamespace === 'string' ? [restrictNamespace] : restrictNamespace;
+            if (excludeNamespace != null) recordFilter.exclude_namespace = typeof excludeNamespace === 'string' ? [excludeNamespace] : excludeNamespace;
             if (keyFilter != null) recordFilter.key_filter_regex = keyFilter;
             if (excludeKeyFilter != null) recordFilter.exclude_key_filter_regex = excludeKeyFilter;
             if (topicFilter != null) recordFilter.topic_filter_regex = topicFilter;

package/gar.js

@@ -49,7 +49,7 @@ class GARClient {
             this.scaledHeartbeatTimeoutInterval *= this.timeoutScale;
         }
         this.unique_key_and_record_updates = uniqueKeyAndRecordUpdates;
-        this.version = 650708;
+        this.version = 650709;
         this.uuid = GARClient._generateUUID();
 
         if (typeof window !== 'undefined' && window.location) {
@@ -913,7 +913,8 @@ class GARClient {
      * @param {boolean} [includeDerived=false] - Include derived topics
      * @param {boolean} [trimDefaultValues=false] - Trim records containing default values from the snapshot
      * @param {string|null} [workingNamespace] - Namespace for matching relative paths
-     * @param {string|null} [restrictNamespace=false] - Restricts topics and keys to children of restrict_namespace. Defaults to the working namespace. Use "::" for root / no restriction.
+     * @param {string|Array<string>|null} [restrictNamespace] - Restricts topics and keys to children of these namespaces (union). Defaults to the working namespace. Use ["::"] for root / no restriction.
+     * @param {string|Array<string>|null} [excludeNamespace] - Excludes topics and keys from children of these namespaces (union). Defaults to 'g' unless restrictNamespace is set.
      * @param {string|null} [density] - For performance tuning
      * @param {number} [subscriptionGroup=0] - Subscription group ID for isolating callbacks
      * @param {string|null} [subscriptionSet] - Subscription set identifier
@@ -937,6 +938,7 @@ class GARClient {
         trimDefaultValues = false,
         workingNamespace = null,
         restrictNamespace = null,
+        excludeNamespace = null,
         density = null,
         subscriptionGroup = 0,
         subscriptionSet = null,
@@ -1024,7 +1026,10 @@ class GARClient {
             valueDict.include_derived = includeDerived;
         }
         if (restrictNamespace) {
-            valueDict.restrict_namespace = restrictNamespace;
+            valueDict.restrict_namespace = typeof restrictNamespace === 'string' ? [restrictNamespace] : restrictNamespace;
+        }
+        if (excludeNamespace) {
+            valueDict.exclude_namespace = typeof excludeNamespace === 'string' ? [excludeNamespace] : excludeNamespace;
         }
         if (trimDefaultValues) {
             valueDict.trim_default_values = trimDefaultValues;
@@ -1293,8 +1298,8 @@ class GARClient {
      * @param {string|null} [excludeTopicFilter]
      * @param {Array<string>|null} [historyTypes]
      * @param {string|null} [workingNamespace]
-     * @param {string|null} [restrictNamespace]
-     * @param {string|null} [excludeNamespace]
+     * @param {string|Array<string>|null} [restrictNamespace]
+     * @param {string|Array<string>|null} [excludeNamespace]
      * @param {boolean} [includeDerived=false]
      * @param {number} [timeout=10.0] seconds
      * @param {number} [subscriptionGroupServerKeys=650704]
@@ -1329,8 +1334,8 @@ class GARClient {
         if (Array.isArray(topicList)) recordFilter.topic_list = topicList;
         if (Array.isArray(classList)) recordFilter.class_list = classList;
         if (workingNamespace != null) recordFilter.working_namespace = workingNamespace;
-        if (restrictNamespace != null) recordFilter.restrict_namespace = restrictNamespace;
-        if (excludeNamespace != null) recordFilter.exclude_namespace = excludeNamespace;
+        if (restrictNamespace != null) recordFilter.restrict_namespace = typeof restrictNamespace === 'string' ? [restrictNamespace] : restrictNamespace;
+        if (excludeNamespace != null) recordFilter.exclude_namespace = typeof excludeNamespace === 'string' ? [excludeNamespace] : excludeNamespace;
         if (keyFilter != null) recordFilter.key_filter_regex = keyFilter;
         if (excludeKeyFilter != null) recordFilter.exclude_key_filter_regex = excludeKeyFilter;
         if (topicFilter != null) recordFilter.topic_filter_regex = topicFilter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsgar",
-  "version": "4.0.4",
+  "version": "4.1.0",
   "description": "A Javascript client for the GAR protocol",
   "type": "module",
   "main": "dist/gar.umd.js",