@platforma-sdk/model 1.54.7 → 1.54.8

package/dist/filters/distill.d.ts

@@ -1,6 +1,7 @@
-import { type FilterSpec, type FilterSpecLeaf, type PTableFilters } from "@milaboratories/pl-model-common";
-type UnknownFilterNode = FilterSpec<FilterSpecLeaf<string>, Record<string, unknown>, Record<string, unknown>>;
-/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */
-export declare function distillFilter(filter: UnknownFilterNode | null | undefined): PTableFilters;
-export {};
+import { type FilterSpec, type FilterSpecLeaf } from "@milaboratories/pl-model-common";
+/**
+ * Strips non-FilterSpec metadata (whitelist approach) and removes
+ * unfilled leaves (type is undefined or any required field is undefined).
+ */
+export declare function distillFilterSpec<T extends FilterSpecLeaf<unknown>>(filter: null | undefined | FilterSpec<T, unknown, unknown>): null | FilterSpec<T>;
 //# sourceMappingURL=distill.d.ts.map

package/dist/filters/distill.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../src/filters/distill.ts"],"names":[],"mappings":"AACA,OAAO,EACL,KAAK,UAAU,EACf,KAAK,cAAc,EACnB,KAAK,aAAa,EACnB,MAAM,iCAAiC,CAAC;AAqBzC,KAAK,iBAAiB,GAAG,UAAU,CACjC,cAAc,CAAC,MAAM,CAAC,EACtB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACvB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CACxB,CAAC;AAwBF,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,GAAG,SAAS,GAAG,aAAa,CAGzF"}
+{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../src/filters/distill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAwDvF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EACjE,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GACzD,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAGtB"}

package/dist/filters/distill.js

@@ -13,6 +13,12 @@ const KNOWN_LEAF_KEYS_TUPLE = [
     "substitutionsOnly",
 ];
 const KNOWN_LEAF_KEYS = new Set(KNOWN_LEAF_KEYS_TUPLE);
+/** Returns true if the leaf is filled — type is defined and no required fields are undefined. */
+function isFilledLeaf(node) {
+    if (node.type == null)
+        return false;
+    return !Object.values(node).some((v) => v === undefined);
+}
 function distillLeaf(node) {
     const result = {};
     for (const [key, value] of Object.entries(node)) {
@@ -25,20 +31,29 @@ function distillLeaf(node) {
 function distillNode(node) {
     switch (node.type) {
         case "and":
-        case "or":
-            return { type: node.type, filters: node.filters.map(distillNode) };
-        case "not":
-            return { type: "not", filter: distillNode(node.filter) };
+        case "or": {
+            const filtered = node.filters.map(distillNode).filter((f) => f !== null);
+            return filtered.length === 0 ? null : { type: node.type, filters: filtered };
+        }
+        case "not": {
+            const inner = distillNode(node.filter);
+            return inner === null ? null : { type: "not", filter: inner };
+        }
         default:
+            if (!isFilledLeaf(node))
+                return null;
             return distillLeaf(node);
     }
 }
-/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */
-function distillFilter(filter) {
+/**
+ * Strips non-FilterSpec metadata (whitelist approach) and removes
+ * unfilled leaves (type is undefined or any required field is undefined).
+ */
+function distillFilterSpec(filter) {
     if (filter == null)
         return null;
     return distillNode(filter);
 }
 
-export { distillFilter };
+export { distillFilterSpec };
 //# sourceMappingURL=distill.js.map

package/dist/filters/distill.js.map

@@ -1 +1 @@
-{"version":3,"file":"distill.js","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  type FilterSpec,\n  type FilterSpecLeaf,\n  type PTableFilters,\n} from \"@milaboratories/pl-model-common\";\n\n/** All possible field names that can appear in any FilterSpecLeaf variant. */\ntype FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;\n\n/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */\nconst KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [\n  \"n\",\n  \"x\",\n  \"rhs\",\n  \"type\",\n  \"value\",\n  \"column\",\n  \"minDiff\",\n  \"maxEdits\",\n  \"wildcard\",\n  \"replacement\",\n  \"substitutionsOnly\",\n];\nconst KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);\n\ntype UnknownFilterNode = FilterSpec<\n  FilterSpecLeaf<string>,\n  Record<string, unknown>,\n  Record<string, unknown>\n>;\n\nfunction distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {\n  const result: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(node)) {\n    if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {\n      result[key] = value;\n    }\n  }\n  return result as FilterSpecLeaf<string>;\n}\n\nfunction distillNode(node: UnknownFilterNode): FilterSpec<FilterSpecLeaf<string>> {\n  switch (node.type) {\n    case \"and\":\n    case \"or\":\n      return { type: node.type, filters: node.filters.map(distillNode) };\n    case \"not\":\n      return { type: \"not\", filter: distillNode(node.filter) };\n    default:\n      return distillLeaf(node as Record<string, unknown>);\n  }\n}\n\n/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */\nexport function distillFilter(filter: UnknownFilterNode | null | undefined): PTableFilters {\n  if (filter == null) return null;\n  return distillNode(filter);\n}\n"],"names":[],"mappings":"AAUA;AACA,MAAM,qBAAqB,GAAqC;IAC9D,GAAG;IACH,GAAG;IACH,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;IACb,mBAAmB;CACpB;AACD,MAAM,eAAe,GAA2B,IAAI,GAAG,CAAC,qBAAqB,CAAC;AAQ9E,SAAS,WAAW,CAAC,IAA6B,EAAA;IAChD,MAAM,MAAM,GAA4B,EAAE;AAC1C,IAAA,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AAC/C,QAAA,IAAI,eAAe,CAAC,GAAG,CAAC,GAAwB,CAAC,EAAE;AACjD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;QACrB;IACF;AACA,IAAA,OAAO,MAAgC;AACzC;AAEA,SAAS,WAAW,CAAC,IAAuB,EAAA;AAC1C,IAAA,QAAQ,IAAI,CAAC,IAAI;AACf,QAAA,KAAK,KAAK;AACV,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;AACpE,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;AAC1D,QAAA;AACE,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAC;;AAEzD;AAEA;AACM,SAAU,aAAa,CAAC,MAA4C,EAAA;IACxE,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;AAC/B,IAAA,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B;;;;"}
+{"version":3,"file":"distill.js","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport { type FilterSpec, type FilterSpecLeaf } from \"@milaboratories/pl-model-common\";\n\n/** All possible field names that can appear in any FilterSpecLeaf variant. */\ntype FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;\n\n/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */\nconst KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [\n  \"n\",\n  \"x\",\n  \"rhs\",\n  \"type\",\n  \"value\",\n  \"column\",\n  \"minDiff\",\n  \"maxEdits\",\n  \"wildcard\",\n  \"replacement\",\n  \"substitutionsOnly\",\n];\nconst KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);\n\n/** Returns true if the leaf is filled — type is defined and no required fields are undefined. */\nfunction isFilledLeaf(node: Record<string, unknown>): boolean {\n  if (node.type == null) return false;\n  return !Object.values(node).some((v) => v === undefined);\n}\n\nfunction distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {\n  const result: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(node)) {\n    if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {\n      result[key] = value;\n    }\n  }\n  return result as FilterSpecLeaf<string>;\n}\n\nfunction distillNode<T extends FilterSpecLeaf<unknown>>(\n  node: FilterSpec<T, unknown, unknown>,\n): FilterSpec<T> | null {\n  switch (node.type) {\n    case \"and\":\n    case \"or\": {\n      const filtered = node.filters.map(distillNode).filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: node.type, filters: filtered };\n    }\n    case \"not\": {\n      const inner = distillNode(node.filter);\n      return inner === null ? null : { type: \"not\", filter: inner };\n    }\n    default:\n      if (!isFilledLeaf(node)) return null;\n      return distillLeaf(node);\n  }\n}\n\n/**\n * Strips non-FilterSpec metadata (whitelist approach) and removes\n * unfilled leaves (type is undefined or any required field is undefined).\n */\nexport function distillFilterSpec<T extends FilterSpecLeaf<unknown>>(\n  filter: null | undefined | FilterSpec<T, unknown, unknown>,\n): null | FilterSpec<T> {\n  if (filter == null) return null;\n  return distillNode(filter);\n}\n"],"names":[],"mappings":"AAMA;AACA,MAAM,qBAAqB,GAAqC;IAC9D,GAAG;IACH,GAAG;IACH,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;IACb,mBAAmB;CACpB;AACD,MAAM,eAAe,GAA2B,IAAI,GAAG,CAAC,qBAAqB,CAAC;AAE9E;AACA,SAAS,YAAY,CAAC,IAA6B,EAAA;AACjD,IAAA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;AAAE,QAAA,OAAO,KAAK;AACnC,IAAA,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAC1D;AAEA,SAAS,WAAW,CAAC,IAA6B,EAAA;IAChD,MAAM,MAAM,GAA4B,EAAE;AAC1C,IAAA,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AAC/C,QAAA,IAAI,eAAe,CAAC,GAAG,CAAC,GAAwB,CAAC,EAAE;AACjD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;QACrB;IACF;AACA,IAAA,OAAO,MAAgC;AACzC;AAEA,SAAS,WAAW,CAClB,IAAqC,EAAA;AAErC,IAAA,QAAQ,IAAI,CAAC,IAAI;AACf,QAAA,KAAK,KAAK;QACV,KAAK,IAAI,EAAE;YACT,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YAC5F,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9E;QACA,KAAK,KAAK,EAAE;YACV,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;AACtC,YAAA,OAAO,KAAK,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;QAC/D;AACA,QAAA;AACE,YAAA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;AAAE,gBAAA,OAAO,IAAI;AACpC,YAAA,OAAO,WAAW,CAAC,IAAI,CAAC;;AAE9B;AAEA;;;AAGG;AACG,SAAU,iBAAiB,CAC/B,MAA0D,EAAA;IAE1D,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;AAC/B,IAAA,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B;;;;"}

package/dist/filters/types.d.ts

@@ -5,5 +5,5 @@ export type SimplifiedUniversalPColumnEntry = {
     label: string;
     obj: SimplifiedPColumnSpec;
 };
-export type { FilterSpecNode, FilterSpecLeaf, FilterSpec, FilterSpecType, FilterSpecOfType, PTableFilters, } from "@milaboratories/pl-model-common";
+export type { FilterSpecNode, FilterSpecLeaf, FilterSpec, FilterSpecType, FilterSpecOfType, } from "@milaboratories/pl-model-common";
 //# sourceMappingURL=types.d.ts.map

package/dist/filters/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/filters/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAExF,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,CAAC,CAAC;AAEnF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,EAAE,EAAE,mBAAmB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,qBAAqB,CAAC;CAC5B,CAAC;AAEF,YAAY,EACV,cAAc,EACd,cAAc,EACd,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,GACd,MAAM,iCAAiC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/filters/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAExF,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,aAAa,CAAC,CAAC;AAEnF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,EAAE,EAAE,mBAAmB,CAAC;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,qBAAqB,CAAC;CAC5B,CAAC;AAEF,YAAY,EACV,cAAc,EACd,cAAc,EACd,UAAU,EACV,cAAc,EACd,gBAAgB,GACjB,MAAM,iCAAiC,CAAC"}

package/dist/index.cjs

@@ -157,7 +157,7 @@ exports.getRawPlatformaInstance = raw_globals.getRawPlatformaInstance;
 exports.filterSpecToSpecQueryExpr = filterToQuery.filterSpecToSpecQueryExpr;
 exports.convertFilterUiToExpressionImpl = filterUiToExpressionImpl.convertFilterUiToExpressionImpl;
 exports.convertFilterUiToExpressions = filterUiToExpressionImpl.convertFilterUiToExpressions;
-exports.distillFilter = distill.distillFilter;
+exports.distillFilterSpec = distill.distillFilterSpec;
 exports.convertFilterSpecsToExpressionSpecs = converter.convertFilterSpecsToExpressionSpecs;
 exports.getAxisUniqueValues = index.getAxisUniqueValues;
 exports.getColumnOrAxisValueLabelsId = index.getColumnOrAxisValueLabelsId;

package/dist/index.js

@@ -25,7 +25,7 @@ export { CurrentSdkInfo } from './sdk_info.js';
 export { getPlatformaApiVersion, getRawPlatformaInstance } from './raw_globals.js';
 export { filterSpecToSpecQueryExpr } from './filters/converters/filterToQuery.js';
 export { convertFilterUiToExpressionImpl, convertFilterUiToExpressions } from './filters/converters/filterUiToExpressionImpl.js';
-export { distillFilter } from './filters/distill.js';
+export { distillFilterSpec } from './filters/distill.js';
 export { convertFilterSpecsToExpressionSpecs } from './annotations/converter.js';
 export { getAxisUniqueValues, getColumnOrAxisValueLabelsId, getColumnSpecById, getColumnUniqueValues, getColumnsFull, getRequestColumnsFromSelectedSources, getSingleColumnData, getUniqueSourceValuesWithLabels } from './pframe_utils/index.js';
 export * from '@milaboratories/pl-model-common';

package/dist/package.json.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var version = "1.54.7";
+var version = "1.54.8";
 
 exports.version = version;
 //# sourceMappingURL=package.json.cjs.map

package/dist/package.json.js

@@ -1,4 +1,4 @@
-var version = "1.54.7";
+var version = "1.54.8";
 
 export { version };
 //# sourceMappingURL=package.json.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.54.7",
+  "version": "1.54.8",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -25,9 +25,9 @@
     "utility-types": "^3.11.0",
     "zod": "~3.23.8",
     "@milaboratories/helpers": "1.13.4",
-    "@milaboratories/pl-model-common": "1.24.7",
-    "@milaboratories/ptabler-expression-js": "1.1.17",
-    "@milaboratories/pl-error-like": "1.12.8"
+    "@milaboratories/pl-error-like": "1.12.8",
+    "@milaboratories/ptabler-expression-js": "1.1.18",
+    "@milaboratories/pl-model-common": "1.24.8"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "^4.0.16",
@@ -35,8 +35,8 @@
     "typescript": "~5.6.3",
     "vitest": "^4.0.16",
     "@milaboratories/build-configs": "1.4.4",
-    "@milaboratories/ts-configs": "1.2.1",
-    "@milaboratories/ts-builder": "1.2.10"
+    "@milaboratories/ts-builder": "1.2.10",
+    "@milaboratories/ts-configs": "1.2.1"
   },
   "scripts": {
     "build": "ts-builder build --target node",

package/src/annotations/converter.ts

@@ -1,7 +1,7 @@
 import { when } from "@milaboratories/ptabler-expression-js";
 import { convertFilterUiToExpressionImpl } from "../filters/converters/filterUiToExpressionImpl";
 import type { ExpressionSpec, FilterSpecUi } from "./types";
-import { filterEmptyPieces } from "../filters/converters/filterEmpty";
+import { distillFilterSpec } from "../filters/distill";
 
 export function convertFilterSpecsToExpressionSpecs(
   annotationsUI: FilterSpecUi[],
@@ -9,7 +9,7 @@ export function convertFilterSpecsToExpressionSpecs(
   const validAnnotationsUI = annotationsUI
     .map((step) => ({
       label: step.label,
-      filter: filterEmptyPieces(step.filter),
+      filter: distillFilterSpec(step.filter),
     }))
     .filter(
       (step): step is { label: string; filter: NonNullable<typeof step.filter> } =>

package/src/components/PlDataTable/index.ts

@@ -10,6 +10,8 @@ export type {
   PTableParamsV2,
   PlDataTableStateV2Normalized,
   PlDataTableModel,
+  PlDataTableFilters,
+  PlDataTableFiltersWithMeta,
 } from "./v5";
 
 export type { PlDataTableStateV2 } from "./state-migration";

package/src/components/PlDataTable/state-migration.ts

@@ -8,10 +8,10 @@ import type {
   PTableSorting,
 } from "@milaboratories/pl-model-common";
 import { canonicalizeJson } from "@milaboratories/pl-model-common";
-import { distillFilter } from "../../filters";
+import { distillFilterSpec } from "../../filters";
 import type { PlDataTableFilterState, PlTableFilter } from "./v4";
 import type {
-  PlDataTableAdvancedFilter,
+  PlDataTableFiltersWithMeta,
   PlDataTableGridStateCore,
   PlDataTableSheetState,
   PlDataTableStateV2CacheEntry,
@@ -158,14 +158,14 @@ function migrateV4toV5(
   const nextId = () => ++idCounter;
 
   const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {
-    const leaves: PlDataTableAdvancedFilter[] = [];
+    const leaves: PlDataTableFiltersWithMeta[] = [];
     for (const f of entry.filtersState) {
       if (f.filter !== null && !f.filter.disabled) {
         const column = canonicalizeJson<PTableColumnId>(f.id);
         leaves.push(migrateTableFilter(column, f.filter.value, nextId));
       }
     }
-    const filtersState: PlDataTableAdvancedFilter | null =
+    const filtersState: PlDataTableFiltersWithMeta | null =
       leaves.length > 0 ? { id: nextId(), type: "and", filters: leaves } : null;
 
     return {
@@ -189,7 +189,7 @@ function migrateV4toV5(
         ? {
             sourceId: oldSourceId,
             hiddenColIds: state.pTableParams.hiddenColIds,
-            filters: distillFilter(currentCache.filtersState),
+            filters: distillFilterSpec(currentCache.filtersState),
             sorting: state.pTableParams.sorting,
           }
         : createDefaultPTableParams(),
@@ -201,7 +201,7 @@ function migrateTableFilter(
   column: string,
   filter: PlTableFilter,
   nextId: () => number,
-): PlDataTableAdvancedFilter {
+): PlDataTableFiltersWithMeta {
   const id = nextId();
   switch (filter.type) {
     case "isNA":

package/src/components/PlDataTable/table.ts

@@ -26,13 +26,12 @@ import {
   uniqueBy,
   isBooleanExpression,
 } from "@milaboratories/pl-model-common";
-import type { PTableFilters } from "../../filters";
 import { filterSpecToSpecQueryExpr } from "../../filters";
 import type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from "../../render";
 import { allPColumnsReady, deriveLabels } from "../../render";
 import { identity, isFunction, isNil } from "es-toolkit";
-import { filterEmptyPieces } from "../../filters/converters/filterEmpty";
-import type { CreatePlDataTableOps, PlDataTableModel } from "./v5";
+import { distillFilterSpec } from "../../filters/distill";
+import type { CreatePlDataTableOps, PlDataTableFilters, PlDataTableModel } from "./v5";
 import { upgradePlDataTableStateV2 } from "./state-migration";
 import type { PlDataTableStateV2 } from "./state-migration";
 import type { PlDataTableSheet } from "./v5";
@@ -55,7 +54,7 @@ function createPTableDef(params: {
   columns: PColumn<PColumnDataUniversal>[];
   labelColumns: PColumn<PColumnDataUniversal>[];
   coreJoinType: "inner" | "full";
-  filters: PTableFilters;
+  filters: null | PlDataTableFilters;
   sorting: PTableSorting[];
   coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;
 }): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {
@@ -87,7 +86,7 @@ function createPTableDef(params: {
 
   // Apply filters
   if (params.filters !== null) {
-    const nonEmpty = filterEmptyPieces(params.filters);
+    const nonEmpty = distillFilterSpec(params.filters);
 
     if (!isNil(nonEmpty)) {
       const pridicate = filterSpecToSpecQueryExpr(nonEmpty);

package/src/components/PlDataTable/v5.ts

@@ -5,7 +5,6 @@ import type {
   ListOptionBase,
   PObjectId,
   PTableColumnSpec,
-  PTableFilters,
   PTableRecordFilter,
   PTableSorting,
   PColumnIdAndSpec,
@@ -62,7 +61,8 @@ export type PlDataTableSheetState = {
 };
 
 /** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
-export type PlDataTableAdvancedFilter = FilterSpec<
+export type PlDataTableFilters = FilterSpec<FilterSpecLeaf<string>>;
+export type PlDataTableFiltersWithMeta = FilterSpec<
   FilterSpecLeaf<string>,
   { id: number; isExpanded?: boolean }
 >;
@@ -75,7 +75,7 @@ export type PlDataTableStateV2CacheEntry = {
   /** Sheets state */
   sheetsState: PlDataTableSheetState[];
   /** Filters state (tree-based, compatible with PlAdvancedFilter) */
-  filtersState: PlDataTableAdvancedFilter | null;
+  filtersState: null | PlDataTableFiltersWithMeta;
 };
 
 export type PTableParamsV2 =
@@ -87,8 +87,8 @@ export type PTableParamsV2 =
     }
   | {
       sourceId: string;
-      hiddenColIds: PObjectId[] | null;
-      filters: PTableFilters;
+      hiddenColIds: null | PObjectId[];
+      filters: null | PlDataTableFilters;
       sorting: PTableSorting[];
     };
 

package/src/filters/distill.test.ts

@@ -0,0 +1,191 @@
+import { describe, expect, it } from "vitest";
+import type { FilterSpec, FilterSpecLeaf } from "@milaboratories/pl-model-common";
+import { distillFilterSpec } from "./distill";
+
+type F = FilterSpec<FilterSpecLeaf<string>>;
+
+const leaf: F = { type: "equal", column: "c1", x: 1 };
+const emptyLeaf: F = { type: undefined };
+const incompleteLeaf: F = { type: "equal", column: "c1", x: undefined as unknown as number };
+
+describe("distillFilterSpec", () => {
+  it("returns null for null input", () => {
+    expect(distillFilterSpec(null)).toBeNull();
+  });
+
+  it("returns null for undefined input", () => {
+    expect(distillFilterSpec(undefined)).toBeNull();
+  });
+
+  it("returns valid leaf as-is", () => {
+    expect(distillFilterSpec(leaf)).toEqual(leaf);
+  });
+
+  it("returns null for empty leaf", () => {
+    expect(distillFilterSpec(emptyLeaf)).toBeNull();
+  });
+
+  it("returns null for incomplete leaf", () => {
+    expect(distillFilterSpec(incompleteLeaf)).toBeNull();
+  });
+
+  // --- distill (strips extra metadata) ---
+
+  it("strips non-FilterSpec metadata from leaf", () => {
+    const leafWithMeta = { type: "equal" as const, column: "c1", x: 1, _extra: true, label: "hi" };
+    expect(distillFilterSpec(leafWithMeta)).toEqual({ type: "equal", column: "c1", x: 1 });
+  });
+
+  it("strips non-FilterSpec metadata from nested nodes", () => {
+    const filter = {
+      type: "and" as const,
+      filters: [{ type: "equal" as const, column: "c1", x: 1, _meta: "remove" }],
+      _rootMeta: 42,
+    };
+    expect(distillFilterSpec(filter)).toEqual({
+      type: "and",
+      filters: [{ type: "equal", column: "c1", x: 1 }],
+    });
+  });
+
+  // --- and ---
+
+  it("filters out empty children from and", () => {
+    const filter: F = { type: "and", filters: [emptyLeaf, leaf, emptyLeaf] };
+    expect(distillFilterSpec(filter)).toEqual({ type: "and", filters: [leaf] });
+  });
+
+  it("returns null when all and children are empty", () => {
+    const filter: F = { type: "and", filters: [emptyLeaf, emptyLeaf] };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null for and with no children", () => {
+    const filter: F = { type: "and", filters: [] };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  // --- or ---
+
+  it("filters out empty children from or", () => {
+    const leaf2: F = { type: "equal", column: "c2", x: 2 };
+    const filter: F = { type: "or", filters: [leaf, emptyLeaf, leaf2] };
+    expect(distillFilterSpec(filter)).toEqual({ type: "or", filters: [leaf, leaf2] });
+  });
+
+  it("returns null when all or children are empty", () => {
+    const filter: F = { type: "or", filters: [emptyLeaf] };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  // --- not ---
+
+  it("preserves not with valid inner filter", () => {
+    const filter: F = { type: "not", filter: leaf };
+    expect(distillFilterSpec(filter)).toEqual({ type: "not", filter: leaf });
+  });
+
+  it("returns null for not wrapping an empty filter", () => {
+    const filter: F = { type: "not", filter: emptyLeaf };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  // --- nested collapse ---
+
+  it("returns null when nested and collapses", () => {
+    const filter: F = {
+      type: "not",
+      filter: { type: "and", filters: [emptyLeaf] },
+    };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null when parent and has only a collapsing child", () => {
+    const filter: F = {
+      type: "and",
+      filters: [{ type: "or", filters: [emptyLeaf] }],
+    };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("keeps valid siblings when one child collapses", () => {
+    const filter: F = {
+      type: "and",
+      filters: [{ type: "or", filters: [emptyLeaf] }, leaf],
+    };
+    expect(distillFilterSpec(filter)).toEqual({ type: "and", filters: [leaf] });
+  });
+
+  // --- unfilled fields (at least one undefined field drops the leaf) ---
+
+  it("returns null for leaf with undefined column", () => {
+    const filter: F = { type: "equal", column: undefined as unknown as string, x: 1 };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null for leaf with undefined value (string filter)", () => {
+    const filter: F = {
+      type: "patternEquals",
+      column: "c1",
+      value: undefined as unknown as string,
+    };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null for greaterThan with undefined x", () => {
+    const filter: F = {
+      type: "greaterThan",
+      column: "c1",
+      x: undefined as unknown as number,
+    };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null for topN with undefined n", () => {
+    const filter: F = {
+      type: "topN",
+      column: "c1",
+      n: undefined as unknown as number,
+    };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null for inSet with undefined value", () => {
+    const filter: F = {
+      type: "inSet",
+      column: "c1",
+      value: undefined as unknown as string[],
+    };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("drops incomplete leaf from and, keeps filled siblings", () => {
+    const incomplete: F = { type: "greaterThan", column: "c1", x: undefined as unknown as number };
+    const filter: F = { type: "and", filters: [leaf, incomplete] };
+    expect(distillFilterSpec(filter)).toEqual({ type: "and", filters: [leaf] });
+  });
+
+  it("drops incomplete leaf from or, keeps filled siblings", () => {
+    const incomplete: F = {
+      type: "patternEquals",
+      column: "c1",
+      value: undefined as unknown as string,
+    };
+    const leaf2: F = { type: "equal", column: "c2", x: 2 };
+    const filter: F = { type: "or", filters: [incomplete, leaf2] };
+    expect(distillFilterSpec(filter)).toEqual({ type: "or", filters: [leaf2] });
+  });
+
+  it("returns null for not wrapping an incomplete leaf", () => {
+    const incomplete: F = { type: "equal", column: undefined as unknown as string, x: 1 };
+    const filter: F = { type: "not", filter: incomplete };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+
+  it("returns null when and contains only incomplete leaves", () => {
+    const a: F = { type: "equal", column: "c1", x: undefined as unknown as number };
+    const b: F = { type: "greaterThan", column: undefined as unknown as string, x: 5 };
+    const filter: F = { type: "and", filters: [a, b] };
+    expect(distillFilterSpec(filter)).toBeNull();
+  });
+});

package/src/filters/distill.ts

@@ -1,9 +1,5 @@
 import { DistributiveKeys, UnionToTuples } from "@milaboratories/helpers";
-import {
-  type FilterSpec,
-  type FilterSpecLeaf,
-  type PTableFilters,
-} from "@milaboratories/pl-model-common";
+import { type FilterSpec, type FilterSpecLeaf } from "@milaboratories/pl-model-common";
 
 /** All possible field names that can appear in any FilterSpecLeaf variant. */
 type FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;
@@ -24,11 +20,11 @@ const KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [
 ];
 const KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);
 
-type UnknownFilterNode = FilterSpec<
-  FilterSpecLeaf<string>,
-  Record<string, unknown>,
-  Record<string, unknown>
->;
+/** Returns true if the leaf is filled — type is defined and no required fields are undefined. */
+function isFilledLeaf(node: Record<string, unknown>): boolean {
+  if (node.type == null) return false;
+  return !Object.values(node).some((v) => v === undefined);
+}
 
 function distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {
   const result: Record<string, unknown> = {};
@@ -40,20 +36,32 @@ function distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {
   return result as FilterSpecLeaf<string>;
 }
 
-function distillNode(node: UnknownFilterNode): FilterSpec<FilterSpecLeaf<string>> {
+function distillNode<T extends FilterSpecLeaf<unknown>>(
+  node: FilterSpec<T, unknown, unknown>,
+): FilterSpec<T> | null {
   switch (node.type) {
     case "and":
-    case "or":
-      return { type: node.type, filters: node.filters.map(distillNode) };
-    case "not":
-      return { type: "not", filter: distillNode(node.filter) };
+    case "or": {
+      const filtered = node.filters.map(distillNode).filter((f): f is FilterSpec<T> => f !== null);
+      return filtered.length === 0 ? null : { type: node.type, filters: filtered };
+    }
+    case "not": {
+      const inner = distillNode(node.filter);
+      return inner === null ? null : { type: "not", filter: inner };
+    }
     default:
-      return distillLeaf(node as Record<string, unknown>);
+      if (!isFilledLeaf(node)) return null;
+      return distillLeaf(node);
   }
 }
 
-/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */
-export function distillFilter(filter: UnknownFilterNode | null | undefined): PTableFilters {
+/**
+ * Strips non-FilterSpec metadata (whitelist approach) and removes
+ * unfilled leaves (type is undefined or any required field is undefined).
+ */
+export function distillFilterSpec<T extends FilterSpecLeaf<unknown>>(
+  filter: null | undefined | FilterSpec<T, unknown, unknown>,
+): null | FilterSpec<T> {
   if (filter == null) return null;
   return distillNode(filter);
 }

package/src/filters/types.ts

@@ -14,5 +14,4 @@ export type {
   FilterSpec,
   FilterSpecType,
   FilterSpecOfType,
-  PTableFilters,
 } from "@milaboratories/pl-model-common";

package/dist/filters/converters/filterEmpty.cjs

@@ -1,49 +0,0 @@
-'use strict';
-
-function filterPredicate(item) {
-    // No need to convert empty steps
-    if (item.type == null) {
-        return false;
-    }
-    if (item.type === "or") {
-        return item.filters.length > 0;
-    }
-    if (item.type === "and") {
-        return item.filters.length > 0;
-    }
-    if (item.type === "not") {
-        return filterPredicate(item.filter);
-    }
-    // Filter out any item that has undefined values in required fields
-    return !Object.values(item).some((v) => v === undefined);
-}
-function filterEmptyPieces(item) {
-    if (item.type === "or" || item.type === "and") {
-        const filtered = item.filters
-            .map(filterEmptyPieces)
-            .filter((f) => f !== null && filterPredicate(f));
-        return filtered.length === 0
-            ? null
-            : {
-                ...item,
-                filters: filtered,
-            };
-    }
-    if (item.type === "not") {
-        const inner = filterEmptyPieces(item.filter);
-        return inner === null || !filterPredicate(inner)
-            ? null
-            : {
-                ...item,
-                filter: inner,
-            };
-    }
-    if (!filterPredicate(item)) {
-        return null;
-    }
-    return item;
-}
-
-exports.filterEmptyPieces = filterEmptyPieces;
-exports.filterPredicate = filterPredicate;
-//# sourceMappingURL=filterEmpty.cjs.map

package/dist/filters/converters/filterEmpty.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"filterEmpty.cjs","sources":["../../../src/filters/converters/filterEmpty.ts"],"sourcesContent":["import { FilterSpec, FilterSpecLeaf } from \"@milaboratories/pl-model-common\";\n\nexport function filterPredicate(\n  item: FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n): boolean {\n  // No need to convert empty steps\n  if (item.type == null) {\n    return false;\n  }\n\n  if (item.type === \"or\") {\n    return item.filters.length > 0;\n  }\n\n  if (item.type === \"and\") {\n    return item.filters.length > 0;\n  }\n\n  if (item.type === \"not\") {\n    return filterPredicate(item.filter);\n  }\n\n  // Filter out any item that has undefined values in required fields\n  return !Object.values(item).some((v) => v === undefined);\n}\n\nexport function filterEmptyPieces<T extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>>(\n  item: T,\n): null | T {\n  if (item.type === \"or\" || item.type === \"and\") {\n    const filtered = item.filters\n      .map(filterEmptyPieces)\n      .filter((f): f is T => f !== null && filterPredicate(f));\n\n    return filtered.length === 0\n      ? null\n      : {\n          ...item,\n          filters: filtered,\n        };\n  }\n  if (item.type === \"not\") {\n    const inner = filterEmptyPieces(item.filter);\n    return inner === null || !filterPredicate(inner)\n      ? null\n      : {\n          ...item,\n          filter: inner,\n        };\n  }\n\n  if (!filterPredicate(item)) {\n    return null;\n  }\n\n  return item;\n}\n"],"names":[],"mappings":";;AAEM,SAAU,eAAe,CAC7B,IAA2D,EAAA;;AAG3D,IAAA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,EAAE;AACrB,QAAA,OAAO,KAAK;IACd;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE;AACtB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;IAChC;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AACvB,QAAA,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC;IAChC;AAEA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AACvB,QAAA,OAAO,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC;IACrC;;AAGA,IAAA,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAC1D;AAEM,SAAU,iBAAiB,CAC/B,IAAO,EAAA;AAEP,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;AAC7C,QAAA,MAAM,QAAQ,GAAG,IAAI,CAAC;aACnB,GAAG,CAAC,iBAAiB;AACrB,aAAA,MAAM,CAAC,CAAC,CAAC,KAAa,CAAC,KAAK,IAAI,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;AAE1D,QAAA,OAAO,QAAQ,CAAC,MAAM,KAAK;AACzB,cAAE;AACF,cAAE;AACE,gBAAA,GAAG,IAAI;AACP,gBAAA,OAAO,EAAE,QAAQ;aAClB;IACP;AACA,IAAA,IAAI,IAAI,CAAC,IAAI,KAAK,KAAK,EAAE;QACvB,MAAM,KAAK,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;QAC5C,OAAO,KAAK,KAAK,IAAI,IAAI,CAAC,eAAe,CAAC,KAAK;AAC7C,cAAE;AACF,cAAE;AACE,gBAAA,GAAG,IAAI;AACP,gBAAA,MAAM,EAAE,KAAK;aACd;IACP;AAEA,IAAA,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;AAC1B,QAAA,OAAO,IAAI;IACb;AAEA,IAAA,OAAO,IAAI;AACb;;;;;"}