@okf/ootils 1.44.0 → 1.44.2

package/dist/node.js

@@ -65,8 +65,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -98,8 +98,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -125,8 +125,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -150,8 +150,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -175,8 +175,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -226,7 +226,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -268,7 +269,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -321,7 +323,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -353,8 +356,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -378,8 +381,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -403,7 +406,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -427,8 +431,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -454,7 +458,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -482,7 +487,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -507,7 +513,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -533,7 +540,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -562,7 +570,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -588,8 +597,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -4337,6 +4346,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,
@@ -4349,17 +4365,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
       )
     )
@@ -4371,14 +4389,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/node.mjs

@@ -70,8 +70,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -103,8 +103,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -130,8 +130,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -155,8 +155,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -180,8 +180,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -231,7 +231,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -273,7 +274,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -326,7 +328,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -358,8 +361,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -383,8 +386,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -408,7 +411,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -432,8 +436,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -459,7 +463,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -487,7 +492,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -512,7 +518,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -538,7 +545,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -567,7 +575,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           streams: {
             events: {
-              maxLen: 10
+              maxLen: 1e3
+              // see note on the first maxLen above — 10 dropped tracker events mid-burst
             }
           }
         },
@@ -593,8 +602,8 @@ var init_GLOBAL_BULLMQ_CONFIG = __esm({
           },
           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.
             }
           }
         },
@@ -4250,6 +4259,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,
@@ -4262,17 +4278,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
       )
     )
@@ -4284,14 +4302,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
         )
       )