@okf/ootils 1.15.4 → 1.17.0

package/dist/browser.js

@@ -370,7 +370,8 @@ function getRollupPossibilities({
     if (visited.includes(startTagType) || visited.length >= maxDepth) {
       return [];
     }
-    const tagBlocks = getCachedTemplateBlocks(startTagType).filter(
+    const allBlocksInTemplate = getCachedTemplateBlocks(startTagType);
+    const tagBlocks = allBlocksInTemplate.filter(
       (block) => block.valuePath?.startsWith("tags.")
     );
     const chains = [];
@@ -392,6 +393,20 @@ function getRollupPossibilities({
         }
       }
     }
+    const valuePathBlocks = allBlocksInTemplate.filter(
+      (block) => block.props?.options?.length > 0 && !block.valuePath?.startsWith("tags.")
+    );
+    for (const block of valuePathBlocks) {
+      const terminalValuePath = block.props?.saveValueAsString ? block.valuePath : `${block.valuePath}.value`;
+      chains.push({
+        rollupType: "tagType",
+        tagTypeCollectionToRollup: tagType,
+        rollupPath: [...visited, startTagType, terminalValuePath],
+        // Additional metadata for filter display
+        filterDisplay: block.props?.shortLabel || block.props?.label || block.valuePath,
+        isTerminalValuePath: true
+      });
+    }
     return chains;
   };
   const singleLevelValuePathRollups = allBlocks.map((block) => {

package/dist/browser.mjs

@@ -334,7 +334,8 @@ function getRollupPossibilities({
     if (visited.includes(startTagType) || visited.length >= maxDepth) {
       return [];
     }
-    const tagBlocks = getCachedTemplateBlocks(startTagType).filter(
+    const allBlocksInTemplate = getCachedTemplateBlocks(startTagType);
+    const tagBlocks = allBlocksInTemplate.filter(
       (block) => block.valuePath?.startsWith("tags.")
     );
     const chains = [];
@@ -356,6 +357,20 @@ function getRollupPossibilities({
         }
       }
     }
+    const valuePathBlocks = allBlocksInTemplate.filter(
+      (block) => block.props?.options?.length > 0 && !block.valuePath?.startsWith("tags.")
+    );
+    for (const block of valuePathBlocks) {
+      const terminalValuePath = block.props?.saveValueAsString ? block.valuePath : `${block.valuePath}.value`;
+      chains.push({
+        rollupType: "tagType",
+        tagTypeCollectionToRollup: tagType,
+        rollupPath: [...visited, startTagType, terminalValuePath],
+        // Additional metadata for filter display
+        filterDisplay: block.props?.shortLabel || block.props?.label || block.valuePath,
+        isTerminalValuePath: true
+      });
+    }
     return chains;
   };
   const singleLevelValuePathRollups = allBlocks.map((block) => {

package/dist/node.d.mts

@@ -1180,6 +1180,10 @@ declare class BaseProducer {
     execute(params: any): Promise<void>;
     addBulkJobs(jobs: any): Promise<bullmq.Job<any, any, string>[]>;
     addJob(name: any, data: any, opts?: {}): Promise<bullmq.Job<any, any, string>>;
+    removeJobs(jobIds: any): Promise<{
+        removed: number;
+        results: any[];
+    }>;
     getStatus(): Promise<{
         waiting: number;
         active: number;

package/dist/node.d.ts

@@ -1180,6 +1180,10 @@ declare class BaseProducer {
     execute(params: any): Promise<void>;
     addBulkJobs(jobs: any): Promise<bullmq.Job<any, any, string>[]>;
     addJob(name: any, data: any, opts?: {}): Promise<bullmq.Job<any, any, string>>;
+    removeJobs(jobIds: any): Promise<{
+        removed: number;
+        results: any[];
+    }>;
     getStatus(): Promise<{
         waiting: number;
         active: number;

package/dist/node.js

@@ -1328,6 +1328,33 @@ var require_BaseProducer = __commonJS({
           throw error;
         }
       }
+      async removeJobs(jobIds) {
+        if (!jobIds || jobIds.length === 0) {
+          return { removed: 0, results: [] };
+        }
+        try {
+          const results = await Promise.all(
+            jobIds.map(async (jobId) => {
+              try {
+                const job = await this.queue.getJob(jobId);
+                if (job) {
+                  await job.remove();
+                  return { jobId, removed: true };
+                }
+                return { jobId, removed: false, reason: "not found" };
+              } catch (err) {
+                return { jobId, removed: false, reason: err.message };
+              }
+            })
+          );
+          const removedCount = results.filter((r) => r.removed).length;
+          console.log(`\u{1F5D1}\uFE0F ${this.constructor.name}: Removed ${removedCount}/${jobIds.length} jobs`);
+          return { removed: removedCount, results };
+        } catch (error) {
+          console.error(`\u274C ${this.constructor.name}: Failed to remove jobs:`, error);
+          throw error;
+        }
+      }
       async getStatus() {
         const waiting = await this.queue.getWaiting();
         const active = await this.queue.getActive();
@@ -1854,7 +1881,8 @@ function getRollupPossibilities({
     if (visited.includes(startTagType) || visited.length >= maxDepth) {
       return [];
     }
-    const tagBlocks = getCachedTemplateBlocks(startTagType).filter(
+    const allBlocksInTemplate = getCachedTemplateBlocks(startTagType);
+    const tagBlocks = allBlocksInTemplate.filter(
       (block) => block.valuePath?.startsWith("tags.")
     );
     const chains = [];
@@ -1876,6 +1904,20 @@ function getRollupPossibilities({
         }
       }
     }
+    const valuePathBlocks = allBlocksInTemplate.filter(
+      (block) => block.props?.options?.length > 0 && !block.valuePath?.startsWith("tags.")
+    );
+    for (const block of valuePathBlocks) {
+      const terminalValuePath = block.props?.saveValueAsString ? block.valuePath : `${block.valuePath}.value`;
+      chains.push({
+        rollupType: "tagType",
+        tagTypeCollectionToRollup: tagType,
+        rollupPath: [...visited, startTagType, terminalValuePath],
+        // Additional metadata for filter display
+        filterDisplay: block.props?.shortLabel || block.props?.label || block.valuePath,
+        isTerminalValuePath: true
+      });
+    }
     return chains;
   };
   const singleLevelValuePathRollups = allBlocks.map((block) => {

package/dist/node.mjs

@@ -1333,6 +1333,33 @@ var require_BaseProducer = __commonJS({
           throw error;
         }
       }
+      async removeJobs(jobIds) {
+        if (!jobIds || jobIds.length === 0) {
+          return { removed: 0, results: [] };
+        }
+        try {
+          const results = await Promise.all(
+            jobIds.map(async (jobId) => {
+              try {
+                const job = await this.queue.getJob(jobId);
+                if (job) {
+                  await job.remove();
+                  return { jobId, removed: true };
+                }
+                return { jobId, removed: false, reason: "not found" };
+              } catch (err) {
+                return { jobId, removed: false, reason: err.message };
+              }
+            })
+          );
+          const removedCount = results.filter((r) => r.removed).length;
+          console.log(`\u{1F5D1}\uFE0F ${this.constructor.name}: Removed ${removedCount}/${jobIds.length} jobs`);
+          return { removed: removedCount, results };
+        } catch (error) {
+          console.error(`\u274C ${this.constructor.name}: Failed to remove jobs:`, error);
+          throw error;
+        }
+      }
       async getStatus() {
         const waiting = await this.queue.getWaiting();
         const active = await this.queue.getActive();
@@ -1822,7 +1849,8 @@ function getRollupPossibilities({
     if (visited.includes(startTagType) || visited.length >= maxDepth) {
       return [];
     }
-    const tagBlocks = getCachedTemplateBlocks(startTagType).filter(
+    const allBlocksInTemplate = getCachedTemplateBlocks(startTagType);
+    const tagBlocks = allBlocksInTemplate.filter(
       (block) => block.valuePath?.startsWith("tags.")
     );
     const chains = [];
@@ -1844,6 +1872,20 @@ function getRollupPossibilities({
         }
       }
     }
+    const valuePathBlocks = allBlocksInTemplate.filter(
+      (block) => block.props?.options?.length > 0 && !block.valuePath?.startsWith("tags.")
+    );
+    for (const block of valuePathBlocks) {
+      const terminalValuePath = block.props?.saveValueAsString ? block.valuePath : `${block.valuePath}.value`;
+      chains.push({
+        rollupType: "tagType",
+        tagTypeCollectionToRollup: tagType,
+        rollupPath: [...visited, startTagType, terminalValuePath],
+        // Additional metadata for filter display
+        filterDisplay: block.props?.shortLabel || block.props?.label || block.valuePath,
+        isTerminalValuePath: true
+      });
+    }
     return chains;
   };
   const singleLevelValuePathRollups = allBlocks.map((block) => {

package/dist/universal.js

@@ -370,7 +370,8 @@ function getRollupPossibilities({
     if (visited.includes(startTagType) || visited.length >= maxDepth) {
       return [];
     }
-    const tagBlocks = getCachedTemplateBlocks(startTagType).filter(
+    const allBlocksInTemplate = getCachedTemplateBlocks(startTagType);
+    const tagBlocks = allBlocksInTemplate.filter(
       (block) => block.valuePath?.startsWith("tags.")
     );
     const chains = [];
@@ -392,6 +393,20 @@ function getRollupPossibilities({
         }
       }
     }
+    const valuePathBlocks = allBlocksInTemplate.filter(
+      (block) => block.props?.options?.length > 0 && !block.valuePath?.startsWith("tags.")
+    );
+    for (const block of valuePathBlocks) {
+      const terminalValuePath = block.props?.saveValueAsString ? block.valuePath : `${block.valuePath}.value`;
+      chains.push({
+        rollupType: "tagType",
+        tagTypeCollectionToRollup: tagType,
+        rollupPath: [...visited, startTagType, terminalValuePath],
+        // Additional metadata for filter display
+        filterDisplay: block.props?.shortLabel || block.props?.label || block.valuePath,
+        isTerminalValuePath: true
+      });
+    }
     return chains;
   };
   const singleLevelValuePathRollups = allBlocks.map((block) => {

package/dist/universal.mjs

@@ -334,7 +334,8 @@ function getRollupPossibilities({
     if (visited.includes(startTagType) || visited.length >= maxDepth) {
       return [];
     }
-    const tagBlocks = getCachedTemplateBlocks(startTagType).filter(
+    const allBlocksInTemplate = getCachedTemplateBlocks(startTagType);
+    const tagBlocks = allBlocksInTemplate.filter(
       (block) => block.valuePath?.startsWith("tags.")
     );
     const chains = [];
@@ -356,6 +357,20 @@ function getRollupPossibilities({
         }
       }
     }
+    const valuePathBlocks = allBlocksInTemplate.filter(
+      (block) => block.props?.options?.length > 0 && !block.valuePath?.startsWith("tags.")
+    );
+    for (const block of valuePathBlocks) {
+      const terminalValuePath = block.props?.saveValueAsString ? block.valuePath : `${block.valuePath}.value`;
+      chains.push({
+        rollupType: "tagType",
+        tagTypeCollectionToRollup: tagType,
+        rollupPath: [...visited, startTagType, terminalValuePath],
+        // Additional metadata for filter display
+        filterDisplay: block.props?.shortLabel || block.props?.label || block.valuePath,
+        isTerminalValuePath: true
+      });
+    }
     return chains;
   };
   const singleLevelValuePathRollups = allBlocks.map((block) => {

package/package.json

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