@okf/ootils 1.44.0 → 1.44.2

package/dist/universal.js

@@ -838,8 +838,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -871,8 +871,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -898,8 +898,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -923,8 +923,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -948,8 +948,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -999,7 +999,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1041,7 +1042,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1094,7 +1096,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1126,8 +1129,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -1151,8 +1154,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -1176,7 +1179,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1200,8 +1204,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -1227,7 +1231,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1255,7 +1260,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1280,7 +1286,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1306,7 +1313,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1335,7 +1343,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1361,8 +1370,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -2497,6 +2506,13 @@ var deduplicateRollupTagFilters = (rollups) => {
 var injectFilterOptionsBy = (filters) => filters.map(
   (f) => f.parentFilterId ? { ...f, source: { ...f.source, filterOptionsBy: { filterId: f.parentFilterId } } } : f
 );
+var isRollupConfig = (f) => !!f.target?.rollupPath || f.target?.filterType === "rollupValuePathType";
+var dedupeSharedGroupConfigs = (configs) => {
+  const rollups = configs.filter(isRollupConfig);
+  const rollupSourceKeys = new Set(rollups.map((r) => JSON.stringify(r.source)));
+  const directFilters = configs.filter((f) => !isRollupConfig(f)).filter((f) => !rollupSourceKeys.has(JSON.stringify(f.source)));
+  return [...directFilters, ...deduplicateRollupTagFilters(rollups)];
+};
 var _self_managed_buildDocHierarchyConfig = ({
   combinedDocumentBlocks,
   docRollupBlocks,
@@ -2509,17 +2525,19 @@ var _self_managed_buildDocHierarchyConfig = ({
   const commonGroup = allGroups.find(
     (g) => g.contentTypes.length === selectedTpls.length
   );
-  const commonFilterConfigs = commonGroup ? injectFilterOptionsBy(
+  const commonFilterConfigs = commonGroup && selectedTpls.length >= 2 ? injectFilterOptionsBy(
     sortFiltersHierarchically(
       attachParentFields(
-        buildFilterConfigurations({
-          groups: [commonGroup],
-          type: "tags",
-          selectedTpls,
-          allTpls,
-          isRollup: false,
-          isAnno: false
-        }).flatMap((s) => s.configs),
+        dedupeSharedGroupConfigs(
+          buildFilterConfigurations({
+            groups: [commonGroup],
+            type: "tags",
+            selectedTpls,
+            allTpls,
+            isRollup: false,
+            isAnno: false
+          }).flatMap((s) => s.configs)
+        ),
         allTpls
       )
     )
@@ -2531,14 +2549,16 @@ var _self_managed_buildDocHierarchyConfig = ({
     const groupFilterConfigs = injectFilterOptionsBy(
       sortFiltersHierarchically(
         attachParentFields(
-          buildFilterConfigurations({
-            groups: [group],
-            type: "tags",
-            selectedTpls,
-            allTpls,
-            isRollup: false,
-            isAnno: false
-          }).flatMap((s) => s.configs),
+          dedupeSharedGroupConfigs(
+            buildFilterConfigurations({
+              groups: [group],
+              type: "tags",
+              selectedTpls,
+              allTpls,
+              isRollup: false,
+              isAnno: false
+            }).flatMap((s) => s.configs)
+          ),
           allTpls
         )
       )

package/dist/universal.mjs

@@ -768,8 +768,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -801,8 +801,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -828,8 +828,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -853,8 +853,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -878,8 +878,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -929,7 +929,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -971,7 +972,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1024,7 +1026,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1056,8 +1059,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -1081,8 +1084,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -1106,7 +1109,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1130,8 +1134,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -1157,7 +1161,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1185,7 +1190,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1210,7 +1216,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1236,7 +1243,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1265,7 +1273,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
+          maxLen: 1e3
+          // see note on the first maxLen above — 10 dropped tracker events mid-burst
         }
       }
     },
@@ -1291,8 +1300,8 @@ var BASE_BULLMQ_CONFIG = {
       },
       streams: {
         events: {
-          maxLen: 10
-          // Keep very low, cuz we dont really use historical stream events as of now
+          maxLen: 1e3
+          // SockerIOService QueueEvents tails this stream for progress tracking; trimming at 10 dropped completion events mid-burst (stuck FE tracker). Entries are small now that job returnvalues are trimmed, so 1000 is cheap.
         }
       }
     },
@@ -2427,6 +2436,13 @@ var deduplicateRollupTagFilters = (rollups) => {
 var injectFilterOptionsBy = (filters) => filters.map(
   (f) => f.parentFilterId ? { ...f, source: { ...f.source, filterOptionsBy: { filterId: f.parentFilterId } } } : f
 );
+var isRollupConfig = (f) => !!f.target?.rollupPath || f.target?.filterType === "rollupValuePathType";
+var dedupeSharedGroupConfigs = (configs) => {
+  const rollups = configs.filter(isRollupConfig);
+  const rollupSourceKeys = new Set(rollups.map((r) => JSON.stringify(r.source)));
+  const directFilters = configs.filter((f) => !isRollupConfig(f)).filter((f) => !rollupSourceKeys.has(JSON.stringify(f.source)));
+  return [...directFilters, ...deduplicateRollupTagFilters(rollups)];
+};
 var _self_managed_buildDocHierarchyConfig = ({
   combinedDocumentBlocks,
   docRollupBlocks,
@@ -2439,17 +2455,19 @@ var _self_managed_buildDocHierarchyConfig = ({
   const commonGroup = allGroups.find(
     (g) => g.contentTypes.length === selectedTpls.length
   );
-  const commonFilterConfigs = commonGroup ? injectFilterOptionsBy(
+  const commonFilterConfigs = commonGroup && selectedTpls.length >= 2 ? injectFilterOptionsBy(
     sortFiltersHierarchically(
       attachParentFields(
-        buildFilterConfigurations({
-          groups: [commonGroup],
-          type: "tags",
-          selectedTpls,
-          allTpls,
-          isRollup: false,
-          isAnno: false
-        }).flatMap((s) => s.configs),
+        dedupeSharedGroupConfigs(
+          buildFilterConfigurations({
+            groups: [commonGroup],
+            type: "tags",
+            selectedTpls,
+            allTpls,
+            isRollup: false,
+            isAnno: false
+          }).flatMap((s) => s.configs)
+        ),
         allTpls
       )
     )
@@ -2461,14 +2479,16 @@ var _self_managed_buildDocHierarchyConfig = ({
     const groupFilterConfigs = injectFilterOptionsBy(
       sortFiltersHierarchically(
         attachParentFields(
-          buildFilterConfigurations({
-            groups: [group],
-            type: "tags",
-            selectedTpls,
-            allTpls,
-            isRollup: false,
-            isAnno: false
-          }).flatMap((s) => s.configs),
+          dedupeSharedGroupConfigs(
+            buildFilterConfigurations({
+              groups: [group],
+              type: "tags",
+              selectedTpls,
+              allTpls,
+              isRollup: false,
+              isAnno: false
+            }).flatMap((s) => s.configs)
+          ),
           allTpls
         )
       )

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.44.0",
+  "version": "1.44.2",
   "description": "Utility functions for both browser and Node.js",
   "main": "dist/index.js",
   "module": "dist/index.mjs",