@platforma-sdk/model 1.54.9 → 1.54.13

package/src/filters/traverse.ts

@@ -0,0 +1,84 @@
+import type {
+  FilterSpec,
+  FilterSpecLeaf,
+  FilterSpecNode,
+  InferFilterSpecLeafColumn,
+} from "@milaboratories/pl-model-common";
+import type {
+  InferFilterSpecCommonLeaf,
+  InferFilterSpecLeaf,
+} from "@milaboratories/pl-model-common";
+
+export type FilterSpecVisitor<LeafArg, R> = {
+  /** Handle a leaf filter node. */
+  leaf: (leaf: LeafArg) => R;
+  /** Handle an AND node after children have been traversed. */
+  and: (results: R[]) => R;
+  /** Handle an OR node after children have been traversed. */
+  or: (results: R[]) => R;
+  /** Handle a NOT node after the inner filter has been traversed. */
+  not: (result: R) => R;
+};
+
+/**
+ * Recursively traverses a FilterSpec tree bottom-up, applying visitor callbacks.
+ *
+ * Entries with `{ type: undefined }` inside `and`/`or` arrays are skipped
+ * (these represent unfilled filter slots in the UI).
+ *
+ * Traversal order:
+ * 1. Recurse into child filters (`and`/`or`/`not`)
+ * 2. Apply the corresponding visitor callback with already-traversed children
+ * 3. For leaf nodes, call `leaf` directly
+ */
+export function traverseFilterSpec<
+  F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,
+  R,
+>(
+  filter: F,
+  visitor: FilterSpecVisitor<InferFilterSpecCommonLeaf<F> & InferFilterSpecLeaf<F>, R>,
+): R {
+  return traverseFilterSpecImpl(filter, visitor as FilterSpecVisitor<unknown, R>);
+}
+/** Internal implementation with simple generics for clean recursion. */
+function traverseFilterSpecImpl<R>(
+  filter: FilterSpecNode<FilterSpecLeaf<unknown>, unknown, unknown>,
+  visitor: FilterSpecVisitor<unknown, R>,
+): R {
+  switch (filter.type) {
+    case "and":
+      return visitor.and(
+        filter.filters
+          .filter((f) => f.type !== undefined)
+          .map((f) => traverseFilterSpecImpl(f, visitor)),
+      );
+    case "or":
+      return visitor.or(
+        filter.filters
+          .filter((f) => f.type !== undefined)
+          .map((f) => traverseFilterSpecImpl(f, visitor)),
+      );
+    case "not":
+      return visitor.not(traverseFilterSpecImpl(filter.filter, visitor));
+    default:
+      return visitor.leaf(filter);
+  }
+}
+
+/** Collects all column references (`column` and `rhs` fields) from filter leaves. */
+export function collectFilterSpecColumns<
+  F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,
+  R extends InferFilterSpecLeafColumn<F> = InferFilterSpecLeafColumn<F>,
+>(filter: F): R[] {
+  return traverseFilterSpec(filter, {
+    leaf: (leaf) => {
+      const cols: R[] = [];
+      if ("column" in leaf && leaf.column !== undefined) cols.push(leaf.column as R);
+      if ("rhs" in leaf && leaf.rhs !== undefined) cols.push(leaf.rhs as R);
+      return cols;
+    },
+    and: (results) => results.flat(),
+    or: (results) => results.flat(),
+    not: (result) => result,
+  });
+}

package/src/pframe_utils/querySpec.ts

@@ -1 +1 @@
-export { collectQueryColumns, isBooleanExpression } from "@milaboratories/pl-model-common";
+export { collectSpecQueryColumns, isBooleanExpression } from "@milaboratories/pl-model-common";

package/src/render/api.ts

@@ -28,6 +28,7 @@ import type {
 } from "@milaboratories/pl-model-common";
 import {
   AnchoredIdDeriver,
+  collectSpecQueryColumns,
   ensurePColumn,
   extractAllColumns,
   isDataInfo,
@@ -62,7 +63,6 @@ import type { APColumnSelectorWithSplit } from "./util/split_selectors";
 import { patchInSetFilters } from "./util/pframe_upgraders";
 import { allPColumnsReady } from "./util/pcolumn_data";
 import type { PColumnDataUniversal } from "./internal";
-import { collectQueryColumns } from "@milaboratories/pl-model-common";
 
 /**
  * Helper function to match domain objects
@@ -682,7 +682,7 @@ export abstract class RenderCtxBase<Args, Data> {
   }
 
   public createPTableV2(def: PTableDefV2<PColumn<PColumnDataUniversal>>): PTableHandle | undefined {
-    const columns = collectQueryColumns(def.query);
+    const columns = collectSpecQueryColumns(def.query);
     this.verifyInlineAndExplicitColumnsSupport(columns);
     if (!allPColumnsReady(columns)) return undefined;
     return this.ctx.createPTableV2(mapPTableDefV2(def, (po) => transformPColumnData(po)));