@platforma-sdk/model 1.54.10 → 1.54.13

package/dist/filters/converters/filterToQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterToQuery.js","sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  if (parsed.type === \"axis\") {\n    return { type: \"axisRef\", value: parsed.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr(\n  filter: FilterSpec<FilterSpecLeaf<string>>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr(filter: FilterSpecLeaf<string>): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n      };\n    case \"notInSet\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isIn\",\n          input: resolveColumnRef(filter.column),\n          set: filter.value,\n        },\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"ifNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"filterToQuery.js","sources":["../../../src/filters/converters/filterToQuery.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type {\n  FilterSpec,\n  FilterSpecLeaf,\n  PTableColumnId,\n  SingleAxisSelector,\n  SpecQueryExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"../traverse\";\n\n/** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */\nfunction resolveColumnRef(columnStr: string): SpecQueryExpression {\n  const parsed = JSON.parse(columnStr) as PTableColumnId;\n  return parsed.type === \"axis\"\n    ? { type: \"axisRef\", value: parsed.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: parsed.id };\n}\n\n/** Converts a FilterSpec tree into a SpecQueryExpression. */\nexport function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: FilterSpec<Leaf>,\n): SpecQueryExpression {\n  return traverseFilterSpec(filter, {\n    leaf: leafToSpecQueryExpr,\n    and: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return { type: \"and\", input: inputs };\n    },\n    or: (inputs) => {\n      if (inputs.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return { type: \"or\", input: inputs };\n    },\n    not: (input) => ({ type: \"not\", input }),\n  });\n}\n\nfunction leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(\n  filter: Leaf,\n): SpecQueryExpression {\n  switch (filter.type) {\n    case \"patternEquals\":\n      return {\n        type: \"stringEquals\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotEquals\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringEquals\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternContainSubsequence\":\n      return {\n        type: \"stringContains\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        caseInsensitive: false,\n      };\n    case \"patternNotContainSubsequence\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"stringContains\",\n          input: resolveColumnRef(filter.column),\n          value: filter.value,\n          caseInsensitive: false,\n        },\n      };\n    case \"patternMatchesRegularExpression\":\n      return {\n        type: \"stringRegex\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n      };\n    case \"patternFuzzyContainSubsequence\":\n      return {\n        type: \"stringContainsFuzzy\",\n        input: resolveColumnRef(filter.column),\n        value: filter.value,\n        maxEdits: filter.maxEdits ?? 1,\n        caseInsensitive: false,\n        substitutionsOnly: filter.substitutionsOnly ?? false,\n        wildcard: filter.wildcard ?? null,\n      };\n\n    case \"equal\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"notEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ne\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"lt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThan\":\n      return {\n        type: \"numericComparison\",\n        operand: \"gt\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"lessThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"le\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n    case \"greaterThanOrEqual\":\n      return {\n        type: \"numericComparison\",\n        operand: \"ge\",\n        left: resolveColumnRef(filter.column),\n        right: { type: \"constant\", value: filter.x },\n      };\n\n    case \"equalToColumn\":\n      return {\n        type: \"numericComparison\",\n        operand: \"eq\",\n        left: resolveColumnRef(filter.column),\n        right: resolveColumnRef(filter.rhs),\n      };\n    case \"lessThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"lt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"lt\", left, right };\n    }\n    case \"greaterThanColumn\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"gt\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"gt\", left, right };\n    }\n    case \"lessThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"le\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"le\", left, right };\n    }\n    case \"greaterThanColumnOrEqual\": {\n      const left = resolveColumnRef(filter.column);\n      const right = resolveColumnRef(filter.rhs);\n      if (filter.minDiff !== undefined && filter.minDiff !== 0) {\n        return {\n          type: \"numericComparison\",\n          operand: \"ge\",\n          left: {\n            type: \"numericBinary\",\n            operand: \"add\",\n            left,\n            right: { type: \"constant\", value: filter.minDiff },\n          },\n          right,\n        };\n      }\n      return { type: \"numericComparison\", operand: \"ge\", left, right };\n    }\n\n    case \"inSet\":\n      return {\n        type: \"isIn\",\n        input: resolveColumnRef(filter.column),\n        set: filter.value,\n      };\n    case \"notInSet\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isIn\",\n          input: resolveColumnRef(filter.column),\n          set: filter.value,\n        },\n      };\n\n    case \"isNA\":\n      return {\n        type: \"isNull\",\n        input: resolveColumnRef(filter.column),\n      };\n    case \"isNotNA\":\n      return {\n        type: \"not\",\n        input: {\n          type: \"isNull\",\n          input: resolveColumnRef(filter.column),\n        },\n      };\n\n    case \"ifNa\":\n      return {\n        type: \"ifNull\",\n        input: resolveColumnRef(filter.column),\n        replacement: { type: \"constant\", value: filter.replacement },\n      };\n\n    case \"topN\":\n    case \"bottomN\":\n      throw new Error(`Filter type \"${filter.type}\" is not supported in query expressions`);\n\n    case undefined:\n      throw new Error(\"Filter type is undefined\");\n\n    default:\n      assertNever(filter);\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/filters/distill.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport { type FilterSpec, type FilterSpecLeaf } from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\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\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 traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as FilterSpec<T>;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: \"and\", filters: filtered };\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: \"or\", filters: filtered };\n    },\n    not: (result) => (result === null ? null : { type: \"not\", filter: result }),\n  });\n}\n"],"names":["traverseFilterSpec"],"mappings":";;;;AAOA;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;;;AAGG;AACG,SAAU,iBAAiB,CAC/B,MAA0D,EAAA;IAE1D,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAOA,2BAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,IAAI,CAAC,YAAY,CAAC,IAA+B,CAAC;AAAE,gBAAA,OAAO,IAAI;AAC/D,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAkB;QACtE,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YACtE,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC1E,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YACtE,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QACzE,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5E,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  RootFilterSpec,\n  type FilterSpec,\n  type FilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\nimport { InferFilterSpecLeaf } 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\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<\n  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>\n    ? RootFilterSpec<InferFilterSpecLeaf<FS>>\n    : FilterSpec<InferFilterSpecLeaf<FS>>,\n>(filter: null | undefined | FS): null | R {\n  if (filter == null) return null;\n  return traverseFilterSpec<FS, null | R>(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as R;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"and\", filters: filtered } as R);\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"or\", filters: filtered } as R);\n    },\n    not: (result) => (result === null ? null : ({ type: \"not\", filter: result } as R)),\n  });\n}\n"],"names":["traverseFilterSpec"],"mappings":";;;;AAYA;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;;;AAGG;AACG,SAAU,iBAAiB,CAK/B,MAA6B,EAAA;IAC7B,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAOA,2BAAkB,CAAe,MAAM,EAAE;AAC9C,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,IAAI,CAAC,YAAY,CAAC,IAA+B,CAAC;AAAE,gBAAA,OAAO,IAAI;AAC/D,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAM;QAC1D,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAQ;QACjF,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAQ;QAChF,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAQ,CAAC;AACnF,KAAA,CAAC;AACJ;;;;"}

package/dist/filters/distill.d.ts

@@ -1,7 +1,8 @@
-import { type FilterSpec, type FilterSpecLeaf } from "@milaboratories/pl-model-common";
+import { RootFilterSpec, type FilterSpec, type FilterSpecLeaf } from "@milaboratories/pl-model-common";
+import { InferFilterSpecLeaf } 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>;
+export declare function distillFilterSpec<FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>, R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown> ? RootFilterSpec<InferFilterSpecLeaf<FS>> : FilterSpec<InferFilterSpecLeaf<FS>>>(filter: null | undefined | FS): null | R;
 //# 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,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAsCvF;;;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,CAiBtB"}
+{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../src/filters/distill.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAqCtE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,SAAS,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAChE,CAAC,SAAS,EAAE,SAAS,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAC1E,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GACvC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,EACvC,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,CAAC,CAiBzC"}

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 { type FilterSpec, type FilterSpecLeaf } from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\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\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 traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as FilterSpec<T>;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: \"and\", filters: filtered };\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: \"or\", filters: filtered };\n    },\n    not: (result) => (result === null ? null : { type: \"not\", filter: result }),\n  });\n}\n"],"names":[],"mappings":";;AAOA;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;;;AAGG;AACG,SAAU,iBAAiB,CAC/B,MAA0D,EAAA;IAE1D,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAO,kBAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,IAAI,CAAC,YAAY,CAAC,IAA+B,CAAC;AAAE,gBAAA,OAAO,IAAI;AAC/D,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAkB;QACtE,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YACtE,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC1E,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YACtE,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QACzE,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5E,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"distill.js","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  RootFilterSpec,\n  type FilterSpec,\n  type FilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\nimport { InferFilterSpecLeaf } 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\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<\n  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>\n    ? RootFilterSpec<InferFilterSpecLeaf<FS>>\n    : FilterSpec<InferFilterSpecLeaf<FS>>,\n>(filter: null | undefined | FS): null | R {\n  if (filter == null) return null;\n  return traverseFilterSpec<FS, null | R>(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as R;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"and\", filters: filtered } as R);\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"or\", filters: filtered } as R);\n    },\n    not: (result) => (result === null ? null : ({ type: \"not\", filter: result } as R)),\n  });\n}\n"],"names":[],"mappings":";;AAYA;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;;;AAGG;AACG,SAAU,iBAAiB,CAK/B,MAA6B,EAAA;IAC7B,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAO,kBAAkB,CAAe,MAAM,EAAE;AAC9C,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,IAAI,CAAC,YAAY,CAAC,IAA+B,CAAC;AAAE,gBAAA,OAAO,IAAI;AAC/D,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAM;QAC1D,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAQ;QACjF,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAQ;QAChF,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAQ,CAAC;AACnF,KAAA,CAAC;AACJ;;;;"}

package/dist/filters/traverse.cjs

@@ -12,17 +12,21 @@
  * 3. For leaf nodes, call `leaf` directly
  */
 function traverseFilterSpec(filter, visitor) {
+    return traverseFilterSpecImpl(filter, visitor);
+}
+/** Internal implementation with simple generics for clean recursion. */
+function traverseFilterSpecImpl(filter, visitor) {
     switch (filter.type) {
         case "and":
             return visitor.and(filter.filters
                 .filter((f) => f.type !== undefined)
-                .map((f) => traverseFilterSpec(f, visitor)));
+                .map((f) => traverseFilterSpecImpl(f, visitor)));
         case "or":
             return visitor.or(filter.filters
                 .filter((f) => f.type !== undefined)
-                .map((f) => traverseFilterSpec(f, visitor)));
+                .map((f) => traverseFilterSpecImpl(f, visitor)));
         case "not":
-            return visitor.not(traverseFilterSpec(filter.filter, visitor));
+            return visitor.not(traverseFilterSpecImpl(filter.filter, visitor));
         default:
             return visitor.leaf(filter);
     }

package/dist/filters/traverse.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"traverse.cjs","sources":["../../src/filters/traverse.ts"],"sourcesContent":["import type { FilterSpecLeaf, FilterSpecNode } from \"@milaboratories/pl-model-common\";\n\n/**\n * Recursively traverses a FilterSpec tree bottom-up, applying visitor callbacks.\n *\n * Entries with `{ type: undefined }` inside `and`/`or` arrays are skipped\n * (these represent unfilled filter slots in the UI).\n *\n * Traversal order:\n * 1. Recurse into child filters (`and`/`or`/`not`)\n * 2. Apply the corresponding visitor callback with already-traversed children\n * 3. For leaf nodes, call `leaf` directly\n */\nexport function traverseFilterSpec<Leaf extends FilterSpecLeaf<unknown>, CommonNode, CommonLeaf, R>(\n  filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>,\n  visitor: {\n    /** Handle a leaf filter node. */\n    leaf: (leaf: CommonLeaf & Leaf) => R;\n    /** Handle an AND node after children have been traversed. */\n    and: (results: R[]) => R;\n    /** Handle an OR node after children have been traversed. */\n    or: (results: R[]) => R;\n    /** Handle a NOT node after the inner filter has been traversed. */\n    not: (result: R) => R;\n  },\n): R {\n  switch (filter.type) {\n    case \"and\":\n      return visitor.and(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpec(f, visitor)),\n      );\n    case \"or\":\n      return visitor.or(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpec(f, visitor)),\n      );\n    case \"not\":\n      return visitor.not(traverseFilterSpec(filter.filter, visitor));\n    default:\n      return visitor.leaf(filter as CommonLeaf & Leaf);\n  }\n}\n\n/** Collects all column references (`column` and `rhs` fields) from filter leaves. */\nexport function collectFilterSpecColumns<\n  Leaf extends FilterSpecLeaf<unknown>,\n  CommonNode,\n  CommonLeaf,\n>(filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>): string[] {\n  return traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      const cols: string[] = [];\n      if (\"column\" in leaf && leaf.column !== undefined) cols.push(leaf.column as string);\n      if (\"rhs\" in leaf && leaf.rhs !== undefined) cols.push(leaf.rhs as string);\n      return cols;\n    },\n    and: (results) => results.flat(),\n    or: (results) => results.flat(),\n    not: (result) => result,\n  });\n}\n"],"names":[],"mappings":";;AAEA;;;;;;;;;;AAUG;AACG,SAAU,kBAAkB,CAChC,MAAoD,EACpD,OASC,EAAA;AAED,IAAA,QAAQ,MAAM,CAAC,IAAI;AACjB,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAC9C;AACH,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,OAAO,CAAC,EAAE,CACf,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAC9C;AACH,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAChE,QAAA;AACE,YAAA,OAAO,OAAO,CAAC,IAAI,CAAC,MAA2B,CAAC;;AAEtD;AAEA;AACM,SAAU,wBAAwB,CAItC,MAAoD,EAAA;IACpD,OAAO,kBAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;YACb,MAAM,IAAI,GAAa,EAAE;YACzB,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAgB,CAAC;YACnF,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAa,CAAC;AAC1E,YAAA,OAAO,IAAI;QACb,CAAC;QACD,GAAG,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;QAChC,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;AAC/B,QAAA,GAAG,EAAE,CAAC,MAAM,KAAK,MAAM;AACxB,KAAA,CAAC;AACJ;;;;;"}
+{"version":3,"file":"traverse.cjs","sources":["../../src/filters/traverse.ts"],"sourcesContent":["import type {\n  FilterSpec,\n  FilterSpecLeaf,\n  FilterSpecNode,\n  InferFilterSpecLeafColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  InferFilterSpecCommonLeaf,\n  InferFilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\n\nexport type FilterSpecVisitor<LeafArg, R> = {\n  /** Handle a leaf filter node. */\n  leaf: (leaf: LeafArg) => R;\n  /** Handle an AND node after children have been traversed. */\n  and: (results: R[]) => R;\n  /** Handle an OR node after children have been traversed. */\n  or: (results: R[]) => R;\n  /** Handle a NOT node after the inner filter has been traversed. */\n  not: (result: R) => R;\n};\n\n/**\n * Recursively traverses a FilterSpec tree bottom-up, applying visitor callbacks.\n *\n * Entries with `{ type: undefined }` inside `and`/`or` arrays are skipped\n * (these represent unfilled filter slots in the UI).\n *\n * Traversal order:\n * 1. Recurse into child filters (`and`/`or`/`not`)\n * 2. Apply the corresponding visitor callback with already-traversed children\n * 3. For leaf nodes, call `leaf` directly\n */\nexport function traverseFilterSpec<\n  F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R,\n>(\n  filter: F,\n  visitor: FilterSpecVisitor<InferFilterSpecCommonLeaf<F> & InferFilterSpecLeaf<F>, R>,\n): R {\n  return traverseFilterSpecImpl(filter, visitor as FilterSpecVisitor<unknown, R>);\n}\n/** Internal implementation with simple generics for clean recursion. */\nfunction traverseFilterSpecImpl<R>(\n  filter: FilterSpecNode<FilterSpecLeaf<unknown>, unknown, unknown>,\n  visitor: FilterSpecVisitor<unknown, R>,\n): R {\n  switch (filter.type) {\n    case \"and\":\n      return visitor.and(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpecImpl(f, visitor)),\n      );\n    case \"or\":\n      return visitor.or(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpecImpl(f, visitor)),\n      );\n    case \"not\":\n      return visitor.not(traverseFilterSpecImpl(filter.filter, visitor));\n    default:\n      return visitor.leaf(filter);\n  }\n}\n\n/** Collects all column references (`column` and `rhs` fields) from filter leaves. */\nexport function collectFilterSpecColumns<\n  F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends InferFilterSpecLeafColumn<F> = InferFilterSpecLeafColumn<F>,\n>(filter: F): R[] {\n  return traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      const cols: R[] = [];\n      if (\"column\" in leaf && leaf.column !== undefined) cols.push(leaf.column as R);\n      if (\"rhs\" in leaf && leaf.rhs !== undefined) cols.push(leaf.rhs as R);\n      return cols;\n    },\n    and: (results) => results.flat(),\n    or: (results) => results.flat(),\n    not: (result) => result,\n  });\n}\n"],"names":[],"mappings":";;AAsBA;;;;;;;;;;AAUG;AACG,SAAU,kBAAkB,CAIhC,MAAS,EACT,OAAoF,EAAA;AAEpF,IAAA,OAAO,sBAAsB,CAAC,MAAM,EAAE,OAAwC,CAAC;AACjF;AACA;AACA,SAAS,sBAAsB,CAC7B,MAAiE,EACjE,OAAsC,EAAA;AAEtC,IAAA,QAAQ,MAAM,CAAC,IAAI;AACjB,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAClD;AACH,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,OAAO,CAAC,EAAE,CACf,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAClD;AACH,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACpE,QAAA;AACE,YAAA,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;;AAEjC;AAEA;AACM,SAAU,wBAAwB,CAGtC,MAAS,EAAA;IACT,OAAO,kBAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;YACb,MAAM,IAAI,GAAQ,EAAE;YACpB,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAW,CAAC;YAC9E,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAQ,CAAC;AACrE,YAAA,OAAO,IAAI;QACb,CAAC;QACD,GAAG,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;QAChC,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;AAC/B,QAAA,GAAG,EAAE,CAAC,MAAM,KAAK,MAAM;AACxB,KAAA,CAAC;AACJ;;;;;"}

package/dist/filters/traverse.d.ts

@@ -1,4 +1,15 @@
-import type { FilterSpecLeaf, FilterSpecNode } from "@milaboratories/pl-model-common";
+import type { FilterSpec, FilterSpecLeaf, 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.
  *
@@ -10,16 +21,7 @@ import type { FilterSpecLeaf, FilterSpecNode } from "@milaboratories/pl-model-co
  * 2. Apply the corresponding visitor callback with already-traversed children
  * 3. For leaf nodes, call `leaf` directly
  */
-export declare function traverseFilterSpec<Leaf extends FilterSpecLeaf<unknown>, CommonNode, CommonLeaf, R>(filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>, visitor: {
-    /** Handle a leaf filter node. */
-    leaf: (leaf: CommonLeaf & Leaf) => 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;
-}): R;
+export declare function traverseFilterSpec<F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>, R>(filter: F, visitor: FilterSpecVisitor<InferFilterSpecCommonLeaf<F> & InferFilterSpecLeaf<F>, R>): R;
 /** Collects all column references (`column` and `rhs` fields) from filter leaves. */
-export declare function collectFilterSpecColumns<Leaf extends FilterSpecLeaf<unknown>, CommonNode, CommonLeaf>(filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>): string[];
+export declare function collectFilterSpecColumns<F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>, R extends InferFilterSpecLeafColumn<F> = InferFilterSpecLeafColumn<F>>(filter: F): R[];
 //# sourceMappingURL=traverse.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../src/filters/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtF;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,SAAS,cAAc,CAAC,OAAO,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,EAChG,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,EACpD,OAAO,EAAE;IACP,iCAAiC;IACjC,IAAI,EAAE,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,KAAK,CAAC,CAAC;IACrC,6DAA6D;IAC7D,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACzB,4DAA4D;IAC5D,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACxB,mEAAmE;IACnE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;CACvB,GACA,CAAC,CAmBH;AAED,qFAAqF;AACrF,wBAAgB,wBAAwB,CACtC,IAAI,SAAS,cAAc,CAAC,OAAO,CAAC,EACpC,UAAU,EACV,UAAU,EACV,MAAM,EAAE,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,UAAU,CAAC,GAAG,MAAM,EAAE,CAYhE"}
+{"version":3,"file":"traverse.d.ts","sourceRoot":"","sources":["../../src/filters/traverse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,cAAc,EAEd,yBAAyB,EAC1B,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EACV,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,iCAAiC,CAAC;AAEzC,MAAM,MAAM,iBAAiB,CAAC,OAAO,EAAE,CAAC,IAAI;IAC1C,iCAAiC;IACjC,IAAI,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,CAAC,CAAC;IAC3B,6DAA6D;IAC7D,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACzB,4DAA4D;IAC5D,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACxB,mEAAmE;IACnE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,CAAC;CACvB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAChC,CAAC,SAAS,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAC/D,CAAC,EAED,MAAM,EAAE,CAAC,EACT,OAAO,EAAE,iBAAiB,CAAC,yBAAyB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GACnF,CAAC,CAEH;AA0BD,qFAAqF;AACrF,wBAAgB,wBAAwB,CACtC,CAAC,SAAS,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAC/D,CAAC,SAAS,yBAAyB,CAAC,CAAC,CAAC,GAAG,yBAAyB,CAAC,CAAC,CAAC,EACrE,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAYhB"}

package/dist/filters/traverse.js

@@ -10,17 +10,21 @@
  * 3. For leaf nodes, call `leaf` directly
  */
 function traverseFilterSpec(filter, visitor) {
+    return traverseFilterSpecImpl(filter, visitor);
+}
+/** Internal implementation with simple generics for clean recursion. */
+function traverseFilterSpecImpl(filter, visitor) {
     switch (filter.type) {
         case "and":
             return visitor.and(filter.filters
                 .filter((f) => f.type !== undefined)
-                .map((f) => traverseFilterSpec(f, visitor)));
+                .map((f) => traverseFilterSpecImpl(f, visitor)));
         case "or":
             return visitor.or(filter.filters
                 .filter((f) => f.type !== undefined)
-                .map((f) => traverseFilterSpec(f, visitor)));
+                .map((f) => traverseFilterSpecImpl(f, visitor)));
         case "not":
-            return visitor.not(traverseFilterSpec(filter.filter, visitor));
+            return visitor.not(traverseFilterSpecImpl(filter.filter, visitor));
         default:
             return visitor.leaf(filter);
     }

package/dist/filters/traverse.js.map

@@ -1 +1 @@
-{"version":3,"file":"traverse.js","sources":["../../src/filters/traverse.ts"],"sourcesContent":["import type { FilterSpecLeaf, FilterSpecNode } from \"@milaboratories/pl-model-common\";\n\n/**\n * Recursively traverses a FilterSpec tree bottom-up, applying visitor callbacks.\n *\n * Entries with `{ type: undefined }` inside `and`/`or` arrays are skipped\n * (these represent unfilled filter slots in the UI).\n *\n * Traversal order:\n * 1. Recurse into child filters (`and`/`or`/`not`)\n * 2. Apply the corresponding visitor callback with already-traversed children\n * 3. For leaf nodes, call `leaf` directly\n */\nexport function traverseFilterSpec<Leaf extends FilterSpecLeaf<unknown>, CommonNode, CommonLeaf, R>(\n  filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>,\n  visitor: {\n    /** Handle a leaf filter node. */\n    leaf: (leaf: CommonLeaf & Leaf) => R;\n    /** Handle an AND node after children have been traversed. */\n    and: (results: R[]) => R;\n    /** Handle an OR node after children have been traversed. */\n    or: (results: R[]) => R;\n    /** Handle a NOT node after the inner filter has been traversed. */\n    not: (result: R) => R;\n  },\n): R {\n  switch (filter.type) {\n    case \"and\":\n      return visitor.and(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpec(f, visitor)),\n      );\n    case \"or\":\n      return visitor.or(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpec(f, visitor)),\n      );\n    case \"not\":\n      return visitor.not(traverseFilterSpec(filter.filter, visitor));\n    default:\n      return visitor.leaf(filter as CommonLeaf & Leaf);\n  }\n}\n\n/** Collects all column references (`column` and `rhs` fields) from filter leaves. */\nexport function collectFilterSpecColumns<\n  Leaf extends FilterSpecLeaf<unknown>,\n  CommonNode,\n  CommonLeaf,\n>(filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>): string[] {\n  return traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      const cols: string[] = [];\n      if (\"column\" in leaf && leaf.column !== undefined) cols.push(leaf.column as string);\n      if (\"rhs\" in leaf && leaf.rhs !== undefined) cols.push(leaf.rhs as string);\n      return cols;\n    },\n    and: (results) => results.flat(),\n    or: (results) => results.flat(),\n    not: (result) => result,\n  });\n}\n"],"names":[],"mappings":"AAEA;;;;;;;;;;AAUG;AACG,SAAU,kBAAkB,CAChC,MAAoD,EACpD,OASC,EAAA;AAED,IAAA,QAAQ,MAAM,CAAC,IAAI;AACjB,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAC9C;AACH,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,OAAO,CAAC,EAAE,CACf,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAC9C;AACH,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAChE,QAAA;AACE,YAAA,OAAO,OAAO,CAAC,IAAI,CAAC,MAA2B,CAAC;;AAEtD;AAEA;AACM,SAAU,wBAAwB,CAItC,MAAoD,EAAA;IACpD,OAAO,kBAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;YACb,MAAM,IAAI,GAAa,EAAE;YACzB,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAgB,CAAC;YACnF,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAa,CAAC;AAC1E,YAAA,OAAO,IAAI;QACb,CAAC;QACD,GAAG,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;QAChC,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;AAC/B,QAAA,GAAG,EAAE,CAAC,MAAM,KAAK,MAAM;AACxB,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"traverse.js","sources":["../../src/filters/traverse.ts"],"sourcesContent":["import type {\n  FilterSpec,\n  FilterSpecLeaf,\n  FilterSpecNode,\n  InferFilterSpecLeafColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  InferFilterSpecCommonLeaf,\n  InferFilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\n\nexport type FilterSpecVisitor<LeafArg, R> = {\n  /** Handle a leaf filter node. */\n  leaf: (leaf: LeafArg) => R;\n  /** Handle an AND node after children have been traversed. */\n  and: (results: R[]) => R;\n  /** Handle an OR node after children have been traversed. */\n  or: (results: R[]) => R;\n  /** Handle a NOT node after the inner filter has been traversed. */\n  not: (result: R) => R;\n};\n\n/**\n * Recursively traverses a FilterSpec tree bottom-up, applying visitor callbacks.\n *\n * Entries with `{ type: undefined }` inside `and`/`or` arrays are skipped\n * (these represent unfilled filter slots in the UI).\n *\n * Traversal order:\n * 1. Recurse into child filters (`and`/`or`/`not`)\n * 2. Apply the corresponding visitor callback with already-traversed children\n * 3. For leaf nodes, call `leaf` directly\n */\nexport function traverseFilterSpec<\n  F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R,\n>(\n  filter: F,\n  visitor: FilterSpecVisitor<InferFilterSpecCommonLeaf<F> & InferFilterSpecLeaf<F>, R>,\n): R {\n  return traverseFilterSpecImpl(filter, visitor as FilterSpecVisitor<unknown, R>);\n}\n/** Internal implementation with simple generics for clean recursion. */\nfunction traverseFilterSpecImpl<R>(\n  filter: FilterSpecNode<FilterSpecLeaf<unknown>, unknown, unknown>,\n  visitor: FilterSpecVisitor<unknown, R>,\n): R {\n  switch (filter.type) {\n    case \"and\":\n      return visitor.and(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpecImpl(f, visitor)),\n      );\n    case \"or\":\n      return visitor.or(\n        filter.filters\n          .filter((f) => f.type !== undefined)\n          .map((f) => traverseFilterSpecImpl(f, visitor)),\n      );\n    case \"not\":\n      return visitor.not(traverseFilterSpecImpl(filter.filter, visitor));\n    default:\n      return visitor.leaf(filter);\n  }\n}\n\n/** Collects all column references (`column` and `rhs` fields) from filter leaves. */\nexport function collectFilterSpecColumns<\n  F extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends InferFilterSpecLeafColumn<F> = InferFilterSpecLeafColumn<F>,\n>(filter: F): R[] {\n  return traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      const cols: R[] = [];\n      if (\"column\" in leaf && leaf.column !== undefined) cols.push(leaf.column as R);\n      if (\"rhs\" in leaf && leaf.rhs !== undefined) cols.push(leaf.rhs as R);\n      return cols;\n    },\n    and: (results) => results.flat(),\n    or: (results) => results.flat(),\n    not: (result) => result,\n  });\n}\n"],"names":[],"mappings":"AAsBA;;;;;;;;;;AAUG;AACG,SAAU,kBAAkB,CAIhC,MAAS,EACT,OAAoF,EAAA;AAEpF,IAAA,OAAO,sBAAsB,CAAC,MAAM,EAAE,OAAwC,CAAC;AACjF;AACA;AACA,SAAS,sBAAsB,CAC7B,MAAiE,EACjE,OAAsC,EAAA;AAEtC,IAAA,QAAQ,MAAM,CAAC,IAAI;AACjB,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAChB,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAClD;AACH,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,OAAO,CAAC,EAAE,CACf,MAAM,CAAC;iBACJ,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;AAClC,iBAAA,GAAG,CAAC,CAAC,CAAC,KAAK,sBAAsB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAClD;AACH,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACpE,QAAA;AACE,YAAA,OAAO,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;;AAEjC;AAEA;AACM,SAAU,wBAAwB,CAGtC,MAAS,EAAA;IACT,OAAO,kBAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;YACb,MAAM,IAAI,GAAQ,EAAE;YACpB,IAAI,QAAQ,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAW,CAAC;YAC9E,IAAI,KAAK,IAAI,IAAI,IAAI,IAAI,CAAC,GAAG,KAAK,SAAS;AAAE,gBAAA,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAQ,CAAC;AACrE,YAAA,OAAO,IAAI;QACb,CAAC;QACD,GAAG,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;QAChC,EAAE,EAAE,CAAC,OAAO,KAAK,OAAO,CAAC,IAAI,EAAE;AAC/B,QAAA,GAAG,EAAE,CAAC,MAAM,KAAK,MAAM;AACxB,KAAA,CAAC;AACJ;;;;"}

package/dist/package.json.cjs

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

package/dist/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.54.10",
+  "version": "1.54.13",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -24,19 +24,19 @@
     "fast-json-patch": "^3.1.1",
     "utility-types": "^3.11.0",
     "zod": "~3.23.8",
-    "@milaboratories/helpers": "1.13.4",
     "@milaboratories/pl-error-like": "1.12.8",
-    "@milaboratories/ptabler-expression-js": "1.1.20",
-    "@milaboratories/pl-model-common": "1.24.10"
+    "@milaboratories/pl-model-common": "1.24.11",
+    "@milaboratories/helpers": "1.13.5",
+    "@milaboratories/ptabler-expression-js": "1.1.21"
   },
   "devDependencies": {
     "@vitest/coverage-istanbul": "^4.0.16",
     "fast-json-patch": "^3.1.1",
     "typescript": "~5.6.3",
     "vitest": "^4.0.16",
+    "@milaboratories/ts-configs": "1.2.1",
     "@milaboratories/ts-builder": "1.2.10",
-    "@milaboratories/build-configs": "1.4.4",
-    "@milaboratories/ts-configs": "1.2.1"
+    "@milaboratories/build-configs": "1.4.4"
   },
   "scripts": {
     "build": "ts-builder build --target node",

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

@@ -158,10 +158,10 @@ function migrateV4toV5(
   const nextId = () => ++idCounter;
 
   const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {
-    const leaves: PlDataTableFiltersWithMeta[] = [];
+    const leaves: PlDataTableFiltersWithMeta["filters"] = [];
     for (const f of entry.filtersState) {
       if (f.filter !== null && !f.filter.disabled) {
-        const column = canonicalizeJson<PTableColumnId>(f.id);
+        const column = canonicalizeJson(f.id);
         leaves.push(migrateTableFilter(column, f.filter.value, nextId));
       }
     }
@@ -198,10 +198,10 @@ function migrateV4toV5(
 
 /** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */
 function migrateTableFilter(
-  column: string,
+  column: CanonicalizedJson<PTableColumnId>,
   filter: PlTableFilter,
   nextId: () => number,
-): PlDataTableFiltersWithMeta {
+): PlDataTableFiltersWithMeta["filters"][number] {
   const id = nextId();
   switch (filter.type) {
     case "isNA":

package/src/components/PlDataTable/table.ts

@@ -26,6 +26,7 @@ import {
   readAnnotation,
   uniqueBy,
   isBooleanExpression,
+  parseJson,
 } from "@milaboratories/pl-model-common";
 import { filterSpecToSpecQueryExpr } from "../../filters";
 import type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from "../../render";
@@ -186,7 +187,7 @@ export function createPlDataTableV2<A, U>(
   const stateFilters = tableStateNormalized.pTableParams.filters;
   const opsFilters = ops?.filters ?? null;
   const filters: null | PlDataTableFilters =
-    stateFilters !== null && opsFilters !== null
+    stateFilters != null && opsFilters != null
       ? { type: "and", filters: [stateFilters, opsFilters] }
       : (stateFilters ?? opsFilters);
   const filterColumns = filters ? collectFilterSpecColumns(filters) : [];
@@ -218,6 +219,7 @@ export function createPlDataTableV2<A, U>(
     sorting,
     coreColumnPredicate: ops?.coreColumnPredicate,
   });
+
   const fullHandle = ctx.createPTableV2(fullDef);
   if (!fullHandle) return undefined;
 
@@ -245,12 +247,22 @@ export function createPlDataTableV2<A, U>(
     coreColumns.forEach((c) => hiddenColumns.delete(c));
   }
 
-  // Sorting changes the order of result rows — preserve sorted columns from being hidden
+  // Preserve sorted columns from being hidden
   sorting
     .map((s) => s.column)
     .filter((c): c is PTableColumnIdColumn => c.type === "column")
     .forEach((c) => hiddenColumns.delete(c.id));
 
+  // Preserve filter columns from being hidden
+  if (filters) {
+    collectFilterSpecColumns(filters)
+      .flatMap((c) => {
+        const obj = parseJson(c);
+        return obj.type === "column" ? [obj.id] : [];
+      })
+      .forEach((c) => hiddenColumns.delete(c));
+  }
+
   const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));
   const visibleLabelColumns = getMatchingLabelColumns(
     visibleColumns.map(getColumnIdAndSpec),
@@ -269,13 +281,14 @@ export function createPlDataTableV2<A, U>(
     coreColumnPredicate,
   });
   const visibleHandle = ctx.createPTableV2(visibleDef);
+
   if (!visibleHandle) return undefined;
 
   return {
     sourceId: tableStateNormalized.pTableParams.sourceId,
     fullTableHandle: fullHandle,
     visibleTableHandle: visibleHandle,
-  } satisfies PlDataTableModel;
+  } as PlDataTableModel;
 }
 
 /** Create sheet entries for PlDataTable */

package/src/components/PlDataTable/v5.ts

@@ -8,8 +8,10 @@ import type {
   PTableSorting,
   PColumnIdAndSpec,
   PTableHandle,
+  RootFilterSpec,
+  PTableColumnId,
 } from "@milaboratories/pl-model-common";
-import type { FilterSpec, FilterSpecLeaf } from "../../filters";
+import type { FilterSpecLeaf } from "../../filters";
 
 export type PlTableColumnId = {
   /** Original column spec */
@@ -60,10 +62,10 @@ export type PlDataTableSheetState = {
 };
 
 /** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
-export type PlDataTableFilters = FilterSpec<FilterSpecLeaf<string>>;
-export type PlDataTableFiltersWithMeta = FilterSpec<
-  FilterSpecLeaf<string>,
-  { id: number; isExpanded?: boolean }
+export type PlDataTableFilters = RootFilterSpec<FilterSpecLeaf<CanonicalizedJson<PTableColumnId>>>;
+export type PlDataTableFiltersWithMeta = RootFilterSpec<
+  FilterSpecLeaf<CanonicalizedJson<PTableColumnId>>,
+  { id: number; isExpanded?: boolean; source?: "table-filter" | "table-search" }
 >;
 
 export type PlDataTableStateV2CacheEntry = {
@@ -75,6 +77,8 @@ export type PlDataTableStateV2CacheEntry = {
   sheetsState: PlDataTableSheetState[];
   /** Filters state (tree-based, compatible with PlAdvancedFilter) */
   filtersState: null | PlDataTableFiltersWithMeta;
+  /** Fast search string */
+  searchString?: string;
 };
 
 export type PTableParamsV2 =

package/src/filters/converters/filterToQuery.ts

@@ -11,15 +11,14 @@ import { traverseFilterSpec } from "../traverse";
 /** Parses a CanonicalizedJson<PTableColumnId> string into a SpecQueryExpression reference. */
 function resolveColumnRef(columnStr: string): SpecQueryExpression {
   const parsed = JSON.parse(columnStr) as PTableColumnId;
-  if (parsed.type === "axis") {
-    return { type: "axisRef", value: parsed.id as SingleAxisSelector };
-  }
-  return { type: "columnRef", value: parsed.id };
+  return parsed.type === "axis"
+    ? { type: "axisRef", value: parsed.id as SingleAxisSelector }
+    : { type: "columnRef", value: parsed.id };
 }
 
 /** Converts a FilterSpec tree into a SpecQueryExpression. */
-export function filterSpecToSpecQueryExpr(
-  filter: FilterSpec<FilterSpecLeaf<string>>,
+export function filterSpecToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(
+  filter: FilterSpec<Leaf>,
 ): SpecQueryExpression {
   return traverseFilterSpec(filter, {
     leaf: leafToSpecQueryExpr,
@@ -39,7 +38,9 @@ export function filterSpecToSpecQueryExpr(
   });
 }
 
-function leafToSpecQueryExpr(filter: FilterSpecLeaf<string>): SpecQueryExpression {
+function leafToSpecQueryExpr<Leaf extends FilterSpecLeaf<string>>(
+  filter: Leaf,
+): SpecQueryExpression {
   switch (filter.type) {
     case "patternEquals":
       return {

package/src/filters/distill.ts

@@ -1,6 +1,11 @@
 import { DistributiveKeys, UnionToTuples } from "@milaboratories/helpers";
-import { type FilterSpec, type FilterSpecLeaf } from "@milaboratories/pl-model-common";
+import {
+  RootFilterSpec,
+  type FilterSpec,
+  type FilterSpecLeaf,
+} from "@milaboratories/pl-model-common";
 import { traverseFilterSpec } from "./traverse";
+import { InferFilterSpecLeaf } from "@milaboratories/pl-model-common";
 
 /** All possible field names that can appear in any FilterSpecLeaf variant. */
 type FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;
@@ -41,23 +46,26 @@ function distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {
  * 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> {
+export function distillFilterSpec<
+  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,
+  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>
+    ? RootFilterSpec<InferFilterSpecLeaf<FS>>
+    : FilterSpec<InferFilterSpecLeaf<FS>>,
+>(filter: null | undefined | FS): null | R {
   if (filter == null) return null;
-  return traverseFilterSpec(filter, {
+  return traverseFilterSpec<FS, null | R>(filter, {
     leaf: (leaf) => {
       if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;
-      return distillLeaf(leaf as Record<string, unknown>) as FilterSpec<T>;
+      return distillLeaf(leaf as Record<string, unknown>) as R;
     },
     and: (results) => {
-      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);
-      return filtered.length === 0 ? null : { type: "and", filters: filtered };
+      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);
+      return filtered.length === 0 ? null : ({ type: "and", filters: filtered } as R);
     },
     or: (results) => {
-      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);
-      return filtered.length === 0 ? null : { type: "or", filters: filtered };
+      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);
+      return filtered.length === 0 ? null : ({ type: "or", filters: filtered } as R);
     },
-    not: (result) => (result === null ? null : { type: "not", filter: result }),
+    not: (result) => (result === null ? null : ({ type: "not", filter: result } as R)),
   });
 }