@okf/ootils 1.40.0 → 1.41.1

package/dist/universal.mjs

@@ -652,7 +652,8 @@ var collectMarkIdsInOrder = (editorState) => {
 var MAX_DEPTH_ROLLUP_POSSIBILITIES = 10;
 function getRollupPossibilities({
   tagType,
-  allTpls
+  allTpls,
+  includeSelfHead = false
 }) {
   const thisTagTpl = allTpls.find((d) => d.kp_content_type === tagType);
   if (!thisTagTpl) return [];
@@ -684,7 +685,8 @@ function getRollupPossibilities({
         chains.push({
           rollupType: "tagType",
           tagTypeCollectionToRollup: tagType,
-          rollupPath: [...visited, startTagType, nextTagType]
+          rollupPath: [...visited, startTagType, nextTagType],
+          filterDisplay: block.props?.shortLabel || block.props?.label
         });
         if (visited.length < maxDepth - 1) {
           const nextChains = findTagChains(
@@ -730,7 +732,8 @@ function getRollupPossibilities({
     const directChain = {
       rollupType: "tagType",
       tagTypeCollectionToRollup: tagType,
-      rollupPath: [tagType, block.props.tagType]
+      rollupPath: [tagType, block.props.tagType],
+      filterDisplay: block.props?.shortLabel || block.props?.label
     };
     const deeperChains = findTagChains(
       block.props?.tagType,
@@ -739,7 +742,14 @@ function getRollupPossibilities({
     );
     return [directChain, ...deeperChains];
   });
-  return [...singleLevelValuePathRollups, ...nestedTagRollups];
+  const selfHeadRollup = includeSelfHead && nestedTagRollups.length > 0 && singleLevelValuePathRollups.length === 0 ? [
+    {
+      rollupType: "tagType",
+      tagTypeCollectionToRollup: tagType,
+      rollupPath: [tagType]
+    }
+  ] : [];
+  return [...singleLevelValuePathRollups, ...selfHeadRollup, ...nestedTagRollups];
 }
 
 // src/bullmq/GLOBAL_BULLMQ_CONFIG.js
@@ -1644,6 +1654,7 @@ var buildFilterConfigurations = ({ groups, type, selectedTpls, allTpls, isRollup
           if (isTerminalValuePath) {
             return element.filterDisplay || lastItemInPath;
           }
+          if (element.filterDisplay) return element.filterDisplay;
           const lastTag = rollupPath[rollupPath.length - 1];
           const lastTagTpl = allTpls.find(
             (tpl) => tpl.kp_content_type === lastTag
@@ -1688,6 +1699,7 @@ var buildFilterConfigurations = ({ groups, type, selectedTpls, allTpls, isRollup
             scope: section.filterScope
           };
         };
+        const isSelfTerminalTag = element.rollupPath.length === 1 && !isLastTagProfile && !isTerminalValuePath;
         return {
           filterId: `ROLLUP_${section.filterScope}_${element.rollupPath.join(
             "_"
@@ -1701,9 +1713,14 @@ var buildFilterConfigurations = ({ groups, type, selectedTpls, allTpls, isRollup
             scope: section.filterScope
           }),
           contentType: element.rollupPath[0],
-          path: `tags.${element.rollupPath[1]}`,
+          path: `tags.${isSelfTerminalTag ? element.rollupPath[0] : element.rollupPath[1]}`,
           source: getSourceConfig(),
-          target: {
+          target: isSelfTerminalTag ? {
+            filterType: "tagType",
+            tagType: element.rollupPath[0],
+            rollupPath: element.rollupPath,
+            ...isAnno && { isAnno: true }
+          } : {
             filterType: "nestedRollupTagType",
             rollupPath: element.rollupPath,
             ...isAnno && { isAnno: true }
@@ -1910,7 +1927,7 @@ var extractAndOrganizeBlocks = (selectedTpls, allTpls, { smTagTypesConfig } = {}
     return {
       contentType: tpl.kp_content_type,
       blocks: allBlocks.filter((block) => block.valuePath.startsWith("tags.") && ["TagsInputSingle", "TagsInputMulti"].includes(block.comp)).flatMap((block) => {
-        const possibilities = getRollupPossibilities({ tagType: block.props.tagType, allTpls });
+        const possibilities = getRollupPossibilities({ tagType: block.props.tagType, allTpls, includeSelfHead: true });
         return possibilities.map((p) => ({
           ...p,
           filterType: p.rollupPath ? "nestedRollupTagType" : "rollupValuePathType"
@@ -2243,13 +2260,16 @@ var buildTagTypeParentMap = (tagTypesInGroup, allTpls) => {
     const tagBlocks = blocks.filter(
       (block) => block.valuePath?.startsWith("tags.") && block.props?.tagType
     );
+    const referencedTagTypes = /* @__PURE__ */ new Set();
     for (const block of tagBlocks) {
       const referencedTagType = block.props.tagType;
       if (tagTypeSet.has(referencedTagType) && referencedTagType !== tagType) {
-        parentMap.set(tagType, referencedTagType);
-        break;
+        referencedTagTypes.add(referencedTagType);
       }
     }
+    if (referencedTagTypes.size === 1) {
+      parentMap.set(tagType, [...referencedTagTypes][0]);
+    }
   }
   for (const child of parentMap.keys()) {
     const visited = /* @__PURE__ */ new Set();
@@ -2323,6 +2343,34 @@ var sortFiltersHierarchically = (filters) => {
   return sorted;
 };
 
+// src/utils/autoGenFilterConfigsFromTpl/utils/deduplicateRollupTagFilters.ts
+var deduplicateRollupTagFilters = (rollups) => {
+  const tagTerminals = [];
+  const nonTag = [];
+  for (const r of rollups) {
+    const rp = r.target?.rollupPath;
+    if (rp?.length && !rp[rp.length - 1].startsWith("main.")) {
+      tagTerminals.push(r);
+    } else {
+      nonTag.push({ ...r, isTagRollup: false });
+    }
+  }
+  if (tagTerminals.length === 0) return nonTag;
+  const byTerminal = /* @__PURE__ */ new Map();
+  for (const r of tagTerminals) {
+    const terminal = r.target.rollupPath[r.target.rollupPath.length - 1];
+    const existing = byTerminal.get(terminal);
+    if (!existing || r.target.rollupPath.length < existing.target.rollupPath.length) {
+      byTerminal.set(terminal, r);
+    }
+  }
+  const dedupedTags = [...byTerminal.values()].map((r) => ({
+    ...r,
+    isTagRollup: true
+  }));
+  return [...nonTag, ...dedupedTags];
+};
+
 // src/utils/autoGenFilterConfigsFromTpl/utils/_self_managed_buildDocHierarchyConfig.ts
 var injectFilterOptionsBy = (filters) => filters.map(
   (f) => f.parentFilterId ? { ...f, source: { ...f.source, filterOptionsBy: { filterId: f.parentFilterId } } } : f
@@ -2429,24 +2477,34 @@ var _self_managed_buildDocHierarchyConfig = ({
     const dedupedFilters = filtersWithCommonFlag.filter(
       (f) => !rollupSourceKeys.has(JSON.stringify(f.source))
     );
-    const combined = [...dedupedFilters, ...rollupConfigs];
+    const dedupedRollupConfigs = deduplicateRollupTagFilters(rollupConfigs);
+    const combined = [...dedupedFilters, ...dedupedRollupConfigs];
     const combinedWithParents = injectFilterOptionsBy(
       sortFiltersHierarchically(
         attachParentFields(combined, allTpls)
       )
     );
-    const rollupFilterIds = new Set(rollupConfigs.map((r) => r.filterId));
+    const rollupFilterIds = new Set(dedupedRollupConfigs.map((r) => r.filterId));
     const filtersWithParents = combinedWithParents.filter(
       (f) => !rollupFilterIds.has(f.filterId)
     );
     const rollupsWithParents = combinedWithParents.filter(
       (f) => rollupFilterIds.has(f.filterId)
     );
+    const rollupContentTypes = new Set(
+      rollupsWithParents.filter((r) => r.target?.rollupPath).flatMap((r) => r.target.rollupPath)
+    );
+    const rollupDisplayMap = {};
+    for (const ct of rollupContentTypes) {
+      const t = allTpls.find((tp) => tp.kp_content_type === ct);
+      if (t?.general?.content?.title) rollupDisplayMap[ct] = t.general.content.title;
+    }
     return {
       contentType: tpl.kp_content_type,
       display: tplData?.general?.content?.title || tpl.kp_content_type,
       filters: filtersWithParents,
-      rollups: rollupsWithParents
+      rollups: rollupsWithParents,
+      rollupDisplayMap
     };
   });
   const filteredPerDataset = perDataset.filter(

package/package.json

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