@platforma-sdk/model 1.54.7 → 1.54.8

package/dist/annotations/converter.cjs

@@ -2,13 +2,13 @@
 
 var ptablerExpressionJs = require('@milaboratories/ptabler-expression-js');
 var filterUiToExpressionImpl = require('../filters/converters/filterUiToExpressionImpl.cjs');
-var filterEmpty = require('../filters/converters/filterEmpty.cjs');
+var distill = require('../filters/distill.cjs');
 
 function convertFilterSpecsToExpressionSpecs(annotationsUI) {
     const validAnnotationsUI = annotationsUI
         .map((step) => ({
         label: step.label,
-        filter: filterEmpty.filterEmptyPieces(step.filter),
+        filter: distill.distillFilterSpec(step.filter),
     }))
         .filter((step) => step.filter !== null);
     return validAnnotationsUI.map((step) => ({

package/dist/annotations/converter.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"converter.cjs","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from \"@milaboratories/ptabler-expression-js\";\nimport { convertFilterUiToExpressionImpl } from \"../filters/converters/filterUiToExpressionImpl\";\nimport type { ExpressionSpec, FilterSpecUi } from \"./types\";\nimport { filterEmptyPieces } from \"../filters/converters/filterEmpty\";\n\nexport function convertFilterSpecsToExpressionSpecs(\n  annotationsUI: FilterSpecUi[],\n): ExpressionSpec[] {\n  const validAnnotationsUI = annotationsUI\n    .map((step) => ({\n      label: step.label,\n      filter: filterEmptyPieces(step.filter),\n    }))\n    .filter(\n      (step): step is { label: string; filter: NonNullable<typeof step.filter> } =>\n        step.filter !== null,\n    );\n\n  return validAnnotationsUI.map(\n    (step): ExpressionSpec => ({\n      type: \"alias\",\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter))\n        .then(true)\n        .otherwise(false)\n        .toJSON(),\n    }),\n  );\n}\n"],"names":["filterEmptyPieces","when","convertFilterUiToExpressionImpl"],"mappings":";;;;;;AAKM,SAAU,mCAAmC,CACjD,aAA6B,EAAA;IAE7B,MAAM,kBAAkB,GAAG;AACxB,SAAA,GAAG,CAAC,CAAC,IAAI,MAAM;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,QAAA,MAAM,EAAEA,6BAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;AACvC,KAAA,CAAC;AACD,SAAA,MAAM,CACL,CAAC,IAAI,KACH,IAAI,CAAC,MAAM,KAAK,IAAI,CACvB;IAEH,OAAO,kBAAkB,CAAC,GAAG,CAC3B,CAAC,IAAI,MAAsB;AACzB,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAEC,wBAAI,CAACC,wDAA+B,CAAC,IAAI,CAAC,MAAM,CAAC;aACrD,IAAI,CAAC,IAAI;aACT,SAAS,CAAC,KAAK;AACf,aAAA,MAAM,EAAE;AACZ,KAAA,CAAC,CACH;AACH;;;;"}
+{"version":3,"file":"converter.cjs","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from \"@milaboratories/ptabler-expression-js\";\nimport { convertFilterUiToExpressionImpl } from \"../filters/converters/filterUiToExpressionImpl\";\nimport type { ExpressionSpec, FilterSpecUi } from \"./types\";\nimport { distillFilterSpec } from \"../filters/distill\";\n\nexport function convertFilterSpecsToExpressionSpecs(\n  annotationsUI: FilterSpecUi[],\n): ExpressionSpec[] {\n  const validAnnotationsUI = annotationsUI\n    .map((step) => ({\n      label: step.label,\n      filter: distillFilterSpec(step.filter),\n    }))\n    .filter(\n      (step): step is { label: string; filter: NonNullable<typeof step.filter> } =>\n        step.filter !== null,\n    );\n\n  return validAnnotationsUI.map(\n    (step): ExpressionSpec => ({\n      type: \"alias\",\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter))\n        .then(true)\n        .otherwise(false)\n        .toJSON(),\n    }),\n  );\n}\n"],"names":["distillFilterSpec","when","convertFilterUiToExpressionImpl"],"mappings":";;;;;;AAKM,SAAU,mCAAmC,CACjD,aAA6B,EAAA;IAE7B,MAAM,kBAAkB,GAAG;AACxB,SAAA,GAAG,CAAC,CAAC,IAAI,MAAM;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,QAAA,MAAM,EAAEA,yBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;AACvC,KAAA,CAAC;AACD,SAAA,MAAM,CACL,CAAC,IAAI,KACH,IAAI,CAAC,MAAM,KAAK,IAAI,CACvB;IAEH,OAAO,kBAAkB,CAAC,GAAG,CAC3B,CAAC,IAAI,MAAsB;AACzB,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAEC,wBAAI,CAACC,wDAA+B,CAAC,IAAI,CAAC,MAAM,CAAC;aACrD,IAAI,CAAC,IAAI;aACT,SAAS,CAAC,KAAK;AACf,aAAA,MAAM,EAAE;AACZ,KAAA,CAAC,CACH;AACH;;;;"}

package/dist/annotations/converter.js

@@ -1,12 +1,12 @@
 import { when } from '@milaboratories/ptabler-expression-js';
 import { convertFilterUiToExpressionImpl } from '../filters/converters/filterUiToExpressionImpl.js';
-import { filterEmptyPieces } from '../filters/converters/filterEmpty.js';
+import { distillFilterSpec } from '../filters/distill.js';
 
 function convertFilterSpecsToExpressionSpecs(annotationsUI) {
     const validAnnotationsUI = annotationsUI
         .map((step) => ({
         label: step.label,
-        filter: filterEmptyPieces(step.filter),
+        filter: distillFilterSpec(step.filter),
     }))
         .filter((step) => step.filter !== null);
     return validAnnotationsUI.map((step) => ({

package/dist/annotations/converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"converter.js","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from \"@milaboratories/ptabler-expression-js\";\nimport { convertFilterUiToExpressionImpl } from \"../filters/converters/filterUiToExpressionImpl\";\nimport type { ExpressionSpec, FilterSpecUi } from \"./types\";\nimport { filterEmptyPieces } from \"../filters/converters/filterEmpty\";\n\nexport function convertFilterSpecsToExpressionSpecs(\n  annotationsUI: FilterSpecUi[],\n): ExpressionSpec[] {\n  const validAnnotationsUI = annotationsUI\n    .map((step) => ({\n      label: step.label,\n      filter: filterEmptyPieces(step.filter),\n    }))\n    .filter(\n      (step): step is { label: string; filter: NonNullable<typeof step.filter> } =>\n        step.filter !== null,\n    );\n\n  return validAnnotationsUI.map(\n    (step): ExpressionSpec => ({\n      type: \"alias\",\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter))\n        .then(true)\n        .otherwise(false)\n        .toJSON(),\n    }),\n  );\n}\n"],"names":[],"mappings":";;;;AAKM,SAAU,mCAAmC,CACjD,aAA6B,EAAA;IAE7B,MAAM,kBAAkB,GAAG;AACxB,SAAA,GAAG,CAAC,CAAC,IAAI,MAAM;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,QAAA,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;AACvC,KAAA,CAAC;AACD,SAAA,MAAM,CACL,CAAC,IAAI,KACH,IAAI,CAAC,MAAM,KAAK,IAAI,CACvB;IAEH,OAAO,kBAAkB,CAAC,GAAG,CAC3B,CAAC,IAAI,MAAsB;AACzB,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC;aACrD,IAAI,CAAC,IAAI;aACT,SAAS,CAAC,KAAK;AACf,aAAA,MAAM,EAAE;AACZ,KAAA,CAAC,CACH;AACH;;;;"}
+{"version":3,"file":"converter.js","sources":["../../src/annotations/converter.ts"],"sourcesContent":["import { when } from \"@milaboratories/ptabler-expression-js\";\nimport { convertFilterUiToExpressionImpl } from \"../filters/converters/filterUiToExpressionImpl\";\nimport type { ExpressionSpec, FilterSpecUi } from \"./types\";\nimport { distillFilterSpec } from \"../filters/distill\";\n\nexport function convertFilterSpecsToExpressionSpecs(\n  annotationsUI: FilterSpecUi[],\n): ExpressionSpec[] {\n  const validAnnotationsUI = annotationsUI\n    .map((step) => ({\n      label: step.label,\n      filter: distillFilterSpec(step.filter),\n    }))\n    .filter(\n      (step): step is { label: string; filter: NonNullable<typeof step.filter> } =>\n        step.filter !== null,\n    );\n\n  return validAnnotationsUI.map(\n    (step): ExpressionSpec => ({\n      type: \"alias\",\n      name: step.label.trim(),\n      value: when(convertFilterUiToExpressionImpl(step.filter))\n        .then(true)\n        .otherwise(false)\n        .toJSON(),\n    }),\n  );\n}\n"],"names":[],"mappings":";;;;AAKM,SAAU,mCAAmC,CACjD,aAA6B,EAAA;IAE7B,MAAM,kBAAkB,GAAG;AACxB,SAAA,GAAG,CAAC,CAAC,IAAI,MAAM;QACd,KAAK,EAAE,IAAI,CAAC,KAAK;AACjB,QAAA,MAAM,EAAE,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;AACvC,KAAA,CAAC;AACD,SAAA,MAAM,CACL,CAAC,IAAI,KACH,IAAI,CAAC,MAAM,KAAK,IAAI,CACvB;IAEH,OAAO,kBAAkB,CAAC,GAAG,CAC3B,CAAC,IAAI,MAAsB;AACzB,QAAA,IAAI,EAAE,OAAO;AACb,QAAA,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;QACvB,KAAK,EAAE,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,MAAM,CAAC;aACrD,IAAI,CAAC,IAAI;aACT,SAAS,CAAC,KAAK;AACf,aAAA,MAAM,EAAE;AACZ,KAAA,CAAC,CACH;AACH;;;;"}

package/dist/components/PlDataTable/index.d.ts

@@ -1,4 +1,4 @@
-export type { PlTableColumnId, PlTableColumnIdJson, PlDataTableGridStateCore, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PTableParamsV2, PlDataTableStateV2Normalized, PlDataTableModel, } from "./v5";
+export type { PlTableColumnId, PlTableColumnIdJson, PlDataTableGridStateCore, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PTableParamsV2, PlDataTableStateV2Normalized, PlDataTableModel, PlDataTableFilters, PlDataTableFiltersWithMeta, } from "./v5";
 export type { PlDataTableStateV2 } from "./state-migration";
 export { upgradePlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, } from "./state-migration";
 export { isColumnHidden, isColumnOptional, createPlDataTableV2 } from "./table";

package/dist/components/PlDataTable/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/PlDataTable/index.ts"],"names":[],"mappings":"AAEA,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,wBAAwB,EACxB,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,EAC5B,cAAc,EACd,4BAA4B,EAC5B,gBAAgB,GACjB,MAAM,MAAM,CAAC;AAEd,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/PlDataTable/index.ts"],"names":[],"mappings":"AAEA,YAAY,EACV,eAAe,EACf,mBAAmB,EACnB,wBAAwB,EACxB,gBAAgB,EAChB,qBAAqB,EACrB,4BAA4B,EAC5B,cAAc,EACd,4BAA4B,EAC5B,gBAAgB,EAChB,kBAAkB,EAClB,0BAA0B,GAC3B,MAAM,MAAM,CAAC;AAEd,YAAY,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EAAE,cAAc,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC"}

package/dist/components/PlDataTable/state-migration.cjs

@@ -68,7 +68,7 @@ function migrateV4toV5(state) {
             ? {
                 sourceId: oldSourceId,
                 hiddenColIds: state.pTableParams.hiddenColIds,
-                filters: distill.distillFilter(currentCache.filtersState),
+                filters: distill.distillFilterSpec(currentCache.filtersState),
                 sorting: state.pTableParams.sorting,
             }
             : createDefaultPTableParams(),

package/dist/components/PlDataTable/state-migration.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"state-migration.cjs","sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilter } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./v4\";\nimport type {\n  PlDataTableAdvancedFilter,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./v5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableAdvancedFilter[] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson<PTableColumnId>(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableAdvancedFilter | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilter(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: string,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableAdvancedFilter {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"names":["canonicalizeJson","distillFilter"],"mappings":"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"}
+{"version":3,"file":"state-migration.cjs","sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./v4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./v5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson<PTableColumnId>(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilterSpec(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: string,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"names":["canonicalizeJson","distillFilterSpec"],"mappings":"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"}

package/dist/components/PlDataTable/state-migration.js

@@ -1,6 +1,6 @@
 import { canonicalizeJson } from '@milaboratories/pl-model-common';
 import '@milaboratories/ptabler-expression-js';
-import { distillFilter } from '../../filters/distill.js';
+import { distillFilterSpec } from '../../filters/distill.js';
 
 /** Upgrade PlDataTableStateV2 to the latest version */
 function upgradePlDataTableStateV2(state) {
@@ -66,7 +66,7 @@ function migrateV4toV5(state) {
             ? {
                 sourceId: oldSourceId,
                 hiddenColIds: state.pTableParams.hiddenColIds,
-                filters: distillFilter(currentCache.filtersState),
+                filters: distillFilterSpec(currentCache.filtersState),
                 sorting: state.pTableParams.sorting,
             }
             : createDefaultPTableParams(),

package/dist/components/PlDataTable/state-migration.js.map

@@ -1 +1 @@
-{"version":3,"file":"state-migration.js","sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilter } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./v4\";\nimport type {\n  PlDataTableAdvancedFilter,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./v5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableAdvancedFilter[] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson<PTableColumnId>(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableAdvancedFilter | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilter(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: string,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableAdvancedFilter {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"state-migration.js","sources":["../../../src/components/PlDataTable/state-migration.ts"],"sourcesContent":["import type {\n  AxisId,\n  CanonicalizedJson,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnSpec,\n  PTableRecordFilter,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport { canonicalizeJson } from \"@milaboratories/pl-model-common\";\nimport { distillFilterSpec } from \"../../filters\";\nimport type { PlDataTableFilterState, PlTableFilter } from \"./v4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./v5\";\n\n/**\n * PlDataTableV2 persisted state\n */\nexport type PlDataTableStateV2 =\n  // Old versions of the state\n  | {\n      // no version\n      gridState: {\n        columnOrder?: {\n          orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sort?: {\n          sortModel: {\n            colId: CanonicalizedJson<PTableColumnSpec>;\n            sort: \"asc\" | \"desc\";\n          }[];\n        };\n        columnVisibility?: {\n          hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n        };\n        sourceId?: string;\n        sheets?: Record<CanonicalizedJson<AxisId>, string | number>;\n      };\n      pTableParams?: {\n        sorting?: PTableSorting[];\n        filters?: PTableRecordFilter[];\n      };\n    }\n  | {\n      version: 2;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n      }[];\n      pTableParams: {\n        hiddenColIds: PObjectId[] | null;\n        filters: PTableRecordFilter[];\n        sorting: PTableSorting[];\n      };\n    }\n  | {\n      version: 3;\n      stateCache: {\n        sourceId: string;\n        gridState: {\n          columnOrder?: {\n            orderedColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n          sort?: {\n            sortModel: {\n              colId: CanonicalizedJson<PTableColumnSpec>;\n              sort: \"asc\" | \"desc\";\n            }[];\n          };\n          columnVisibility?: {\n            hiddenColIds: CanonicalizedJson<PTableColumnSpec>[];\n          };\n        };\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      pTableParams: PTableParamsV2;\n    }\n  | {\n      version: 4;\n      stateCache: {\n        sourceId: string;\n        gridState: PlDataTableGridStateCore;\n        sheetsState: PlDataTableSheetState[];\n        filtersState: PlDataTableFilterState[];\n      }[];\n      /** Old format; only fields used in migration are typed */\n      pTableParams: {\n        sourceId: string | null;\n        hiddenColIds: PObjectId[] | null;\n        sorting: PTableSorting[];\n      };\n    }\n  // Normalized state\n  | PlDataTableStateV2Normalized;\n\n/** Upgrade PlDataTableStateV2 to the latest version */\nexport function upgradePlDataTableStateV2(\n  state: PlDataTableStateV2 | undefined,\n): PlDataTableStateV2Normalized {\n  // Block just added, had no state, model started earlier than the UI\n  if (!state) {\n    return createPlDataTableStateV2();\n  }\n  // v1 -> v2\n  if (!(\"version\" in state)) {\n    // Non upgradeable as sourceId calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v2 -> v3\n  if (state.version === 2) {\n    state = {\n      version: 3,\n      stateCache: state.stateCache.map((entry) => ({\n        ...entry,\n        filtersState: [],\n      })),\n      pTableParams: createDefaultPTableParams(),\n    };\n  }\n  // v3 -> v4\n  if (state.version === 3) {\n    // Non upgradeable as column ids calculation algorithm has changed, resetting state to default\n    state = createPlDataTableStateV2();\n  }\n  // v4 -> v5: migrate per-column filters to tree-based format\n  if (state.version === 4) {\n    state = migrateV4toV5(state);\n  }\n  return state;\n}\n\n/** Migrate v4 state to v5: convert per-column filters to tree-based format */\nfunction migrateV4toV5(\n  state: Extract<PlDataTableStateV2, { version: 4 }>,\n): PlDataTableStateV2Normalized {\n  let idCounter = 0;\n  const nextId = () => ++idCounter;\n\n  const migratedCache: PlDataTableStateV2CacheEntry[] = state.stateCache.map((entry) => {\n    const leaves: PlDataTableFiltersWithMeta[] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson<PTableColumnId>(f.id);\n        leaves.push(migrateTableFilter(column, f.filter.value, nextId));\n      }\n    }\n    const filtersState: PlDataTableFiltersWithMeta | null =\n      leaves.length > 0 ? { id: nextId(), type: \"and\", filters: leaves } : null;\n\n    return {\n      sourceId: entry.sourceId,\n      gridState: entry.gridState,\n      sheetsState: entry.sheetsState,\n      filtersState,\n    };\n  });\n\n  const oldSourceId = state.pTableParams.sourceId;\n  const currentCache = oldSourceId\n    ? migratedCache.find((e) => e.sourceId === oldSourceId)\n    : undefined;\n\n  return {\n    version: 5,\n    stateCache: migratedCache,\n    pTableParams:\n      currentCache && oldSourceId\n        ? {\n            sourceId: oldSourceId,\n            hiddenColIds: state.pTableParams.hiddenColIds,\n            filters: distillFilterSpec(currentCache.filtersState),\n            sorting: state.pTableParams.sorting,\n          }\n        : createDefaultPTableParams(),\n  };\n}\n\n/** Migrate a single per-column PlTableFilter to a tree-based FilterSpec node */\nfunction migrateTableFilter(\n  column: string,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta {\n  const id = nextId();\n  switch (filter.type) {\n    case \"isNA\":\n      return { id, type: \"isNA\", column };\n    case \"isNotNA\":\n      return { id, type: \"isNotNA\", column };\n    case \"number_equals\":\n      return { id, type: \"equal\", column, x: filter.reference };\n    case \"number_notEquals\":\n      return { id, type: \"notEqual\", column, x: filter.reference };\n    case \"number_greaterThan\":\n      return { id, type: \"greaterThan\", column, x: filter.reference };\n    case \"number_greaterThanOrEqualTo\":\n      return { id, type: \"greaterThanOrEqual\", column, x: filter.reference };\n    case \"number_lessThan\":\n      return { id, type: \"lessThan\", column, x: filter.reference };\n    case \"number_lessThanOrEqualTo\":\n      return { id, type: \"lessThanOrEqual\", column, x: filter.reference };\n    case \"number_between\":\n      return {\n        id,\n        type: \"and\",\n        filters: [\n          filter.includeLowerBound\n            ? { id: nextId(), type: \"greaterThanOrEqual\" as const, column, x: filter.lowerBound }\n            : { id: nextId(), type: \"greaterThan\" as const, column, x: filter.lowerBound },\n          filter.includeUpperBound\n            ? { id: nextId(), type: \"lessThanOrEqual\" as const, column, x: filter.upperBound }\n            : { id: nextId(), type: \"lessThan\" as const, column, x: filter.upperBound },\n        ],\n      };\n    case \"string_equals\":\n      return { id, type: \"patternEquals\", column, value: filter.reference };\n    case \"string_notEquals\":\n      return { id, type: \"patternNotEquals\", column, value: filter.reference };\n    case \"string_contains\":\n      return { id, type: \"patternContainSubsequence\", column, value: filter.reference };\n    case \"string_doesNotContain\":\n      return { id, type: \"patternNotContainSubsequence\", column, value: filter.reference };\n    case \"string_matches\":\n      return { id, type: \"patternMatchesRegularExpression\", column, value: filter.reference };\n    case \"string_doesNotMatch\":\n      return {\n        id,\n        type: \"not\",\n        filter: {\n          id: nextId(),\n          type: \"patternMatchesRegularExpression\",\n          column,\n          value: filter.reference,\n        },\n      };\n    case \"string_containsFuzzyMatch\":\n      return {\n        id,\n        type: \"patternFuzzyContainSubsequence\",\n        column,\n        value: filter.reference,\n        maxEdits: filter.maxEdits,\n        substitutionsOnly: filter.substitutionsOnly,\n        ...(filter.wildcard !== undefined ? { wildcard: filter.wildcard } : {}),\n      };\n  }\n}\n\nexport function createDefaultPTableParams(): PTableParamsV2 {\n  return {\n    sourceId: null,\n    hiddenColIds: null,\n    filters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"names":[],"mappings":"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"}

package/dist/components/PlDataTable/table.cjs

@@ -3,12 +3,11 @@
 var plModelCommon = require('@milaboratories/pl-model-common');
 var filterToQuery = require('../../filters/converters/filterToQuery.cjs');
 require('@milaboratories/ptabler-expression-js');
-require('../../filters/distill.cjs');
+var distill = require('../../filters/distill.cjs');
 require('canonicalize');
 var label = require('../../render/util/label.cjs');
 var pcolumn_data = require('../../render/util/pcolumn_data.cjs');
 var esToolkit = require('es-toolkit');
-var filterEmpty = require('../../filters/converters/filterEmpty.cjs');
 var stateMigration = require('./state-migration.cjs');
 var labels = require('./labels.cjs');
 
@@ -47,7 +46,7 @@ function createPTableDef(params) {
     };
     // Apply filters
     if (params.filters !== null) {
-        const nonEmpty = filterEmpty.filterEmptyPieces(params.filters);
+        const nonEmpty = distill.distillFilterSpec(params.filters);
         if (!esToolkit.isNil(nonEmpty)) {
             const pridicate = filterToQuery.filterSpecToSpecQueryExpr(nonEmpty);
             if (!plModelCommon.isBooleanExpression(pridicate)) {

package/dist/components/PlDataTable/table.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"table.cjs","sources":["../../../src/components/PlDataTable/table.ts"],"sourcesContent":["import type {\n  AxisId,\n  AxisSpec,\n  DataInfo,\n  PColumn,\n  PColumnIdAndSpec,\n  PColumnValues,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableDefV2,\n  PTableSorting,\n  SpecQuery,\n  SingleAxisSelector,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  readAnnotation,\n  uniqueBy,\n  isBooleanExpression,\n} from \"@milaboratories/pl-model-common\";\nimport type { PTableFilters } from \"../../filters\";\nimport { filterSpecToSpecQueryExpr } from \"../../filters\";\nimport type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from \"../../render\";\nimport { allPColumnsReady, deriveLabels } from \"../../render\";\nimport { identity, isFunction, isNil } from \"es-toolkit\";\nimport { filterEmptyPieces } from \"../../filters/converters/filterEmpty\";\nimport type { CreatePlDataTableOps, PlDataTableModel } from \"./v5\";\nimport { upgradePlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableSheet } from \"./v5\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"./labels\";\n\n/** Convert a PTableColumnId to a SpecQueryExpression reference. */\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  if (col.type === \"axis\") {\n    return { type: \"axisRef\", value: col.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: col.id };\n}\n\n/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */\nfunction joinEntry<C>(input: SpecQuery<C>): SpecQueryJoinEntry<C> {\n  return { entry: input, qualifications: [] };\n}\n\nfunction createPTableDef(params: {\n  columns: PColumn<PColumnDataUniversal>[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: PTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {\n  let coreColumns = params.columns;\n  const secondaryColumns: typeof params.columns = [];\n\n  if (isFunction(params.coreColumnPredicate)) {\n    coreColumns = [];\n    for (const c of params.columns)\n      if (params.coreColumnPredicate(getColumnIdAndSpec(c))) coreColumns.push(c);\n      else secondaryColumns.push(c);\n  }\n\n  secondaryColumns.push(...params.labelColumns);\n\n  // Build SpecQuery directly from columns\n  const coreJoinQuery: SpecQuery<\n    PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>\n  > = {\n    type: params.coreJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: coreColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  let query: SpecQuery<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> = {\n    type: \"outerJoin\",\n    primary: joinEntry(coreJoinQuery),\n    secondary: secondaryColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  // Apply filters\n  if (params.filters !== null) {\n    const nonEmpty = filterEmptyPieces(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  // Apply sorting\n  if (params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: s.ascending === s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\n/** Check if column should be omitted from the table */\nexport function isColumnHidden(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"hidden\";\n}\n\n/** Check if column is hidden by default */\nexport function isColumnOptional(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"optional\";\n}\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @param ctx context\n * @param columns column list\n * @param tableState table ui state\n * @returns PlAgDataTableV2 table source\n */\nexport function createPlDataTableV2<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: PColumn<PColumnDataUniversal>[],\n  tableState: PlDataTableStateV2 | undefined,\n  ops?: CreatePlDataTableOps,\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);\n  fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map(\n    (v) => {\n      return {\n        ...v.value,\n        spec: {\n          ...v.value.spec,\n          annotations: {\n            ...v.value.spec.annotations,\n            [Annotation.Label]: v.label,\n          },\n        },\n      };\n    },\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  const fullColumnsAxes = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n  const fullColumnsIds: PTableColumnId[] = [\n    ...fullColumnsAxes.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n  const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n  const isValidColumnId = (id: PTableColumnId): boolean =>\n    fullColumnsIdsSet.has(canonicalizeJson<PTableColumnId>(id));\n\n  const coreJoinType = ops?.coreJoinType ?? \"full\";\n  const filters = tableStateNormalized.pTableParams.filters;\n  const sorting: PTableSorting[] = uniqueBy(\n    [...tableStateNormalized.pTableParams.sorting, ...(ops?.sorting ?? [])],\n    (s) => canonicalizeJson<PTableColumnId>(s.column),\n  ).filter((s) => {\n    const valid = isValidColumnId(s.column);\n    if (!valid)\n      ctx.logWarn(`Sorting ${JSON.stringify(s)} does not match provided columns, skipping`);\n    return valid;\n  });\n\n  const fullDef = createPTableDef({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: ops?.coreColumnPredicate,\n  });\n  const fullHandle = ctx.createPTableV2(fullDef);\n  if (!fullHandle) return undefined;\n\n  const hiddenColumns = new Set<PObjectId>(\n    ((): PObjectId[] => {\n      // Inner join works as a filter - all columns must be present\n      if (coreJoinType === \"inner\") return [];\n\n      const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;\n      if (hiddenColIds) return hiddenColIds;\n\n      return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n    })(),\n  );\n\n  // Preserve linker columns\n  columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve core columns as they change the shape of join.\n  const coreColumnPredicate = ops?.coreColumnPredicate;\n  if (coreColumnPredicate) {\n    const coreColumns = columns.flatMap((c) =>\n      coreColumnPredicate(getColumnIdAndSpec(c)) ? [c.id] : [],\n    );\n    coreColumns.forEach((c) => hiddenColumns.delete(c));\n  }\n\n  // Sorting changes the order of result rows — preserve sorted columns from being hidden\n  sorting\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .forEach((c) => hiddenColumns.delete(c.id));\n\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  // if at least one column is not yet computed, we can't show the table\n  if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return undefined;\n\n  const visibleDef = createPTableDef({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    visibleTableHandle: visibleHandle,\n  } satisfies PlDataTableModel;\n}\n\n/** Create sheet entries for PlDataTable */\nexport function createPlDataTableSheet<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  axis: AxisSpec,\n  values: (string | number)[],\n): PlDataTableSheet {\n  const labels = ctx.resultPool.findLabels(axis);\n  return {\n    axis,\n    options: values.map((v) => ({\n      value: v,\n      label: labels?.[v] ?? v.toString(),\n    })),\n    defaultValue: values[0],\n  };\n}\n"],"names":["isFunction","getColumnIdAndSpec","filterEmptyPieces","isNil","filterSpecToSpecQueryExpr","isBooleanExpression","readAnnotation","Annotation","upgradePlDataTableStateV2","getAllLabelColumns","getMatchingLabelColumns","deriveLabels","identity","uniqueBy","getAxisId","canonicalizeJson","isLinkerColumn","allPColumnsReady"],"mappings":"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"}
+{"version":3,"file":"table.cjs","sources":["../../../src/components/PlDataTable/table.ts"],"sourcesContent":["import type {\n  AxisId,\n  AxisSpec,\n  DataInfo,\n  PColumn,\n  PColumnIdAndSpec,\n  PColumnValues,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableDefV2,\n  PTableSorting,\n  SpecQuery,\n  SingleAxisSelector,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  readAnnotation,\n  uniqueBy,\n  isBooleanExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { filterSpecToSpecQueryExpr } from \"../../filters\";\nimport type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from \"../../render\";\nimport { allPColumnsReady, deriveLabels } from \"../../render\";\nimport { identity, isFunction, isNil } from \"es-toolkit\";\nimport { distillFilterSpec } from \"../../filters/distill\";\nimport type { CreatePlDataTableOps, PlDataTableFilters, PlDataTableModel } from \"./v5\";\nimport { upgradePlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableSheet } from \"./v5\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"./labels\";\n\n/** Convert a PTableColumnId to a SpecQueryExpression reference. */\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  if (col.type === \"axis\") {\n    return { type: \"axisRef\", value: col.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: col.id };\n}\n\n/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */\nfunction joinEntry<C>(input: SpecQuery<C>): SpecQueryJoinEntry<C> {\n  return { entry: input, qualifications: [] };\n}\n\nfunction createPTableDef(params: {\n  columns: PColumn<PColumnDataUniversal>[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: null | PlDataTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {\n  let coreColumns = params.columns;\n  const secondaryColumns: typeof params.columns = [];\n\n  if (isFunction(params.coreColumnPredicate)) {\n    coreColumns = [];\n    for (const c of params.columns)\n      if (params.coreColumnPredicate(getColumnIdAndSpec(c))) coreColumns.push(c);\n      else secondaryColumns.push(c);\n  }\n\n  secondaryColumns.push(...params.labelColumns);\n\n  // Build SpecQuery directly from columns\n  const coreJoinQuery: SpecQuery<\n    PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>\n  > = {\n    type: params.coreJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: coreColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  let query: SpecQuery<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> = {\n    type: \"outerJoin\",\n    primary: joinEntry(coreJoinQuery),\n    secondary: secondaryColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  // Apply filters\n  if (params.filters !== null) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  // Apply sorting\n  if (params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: s.ascending === s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\n/** Check if column should be omitted from the table */\nexport function isColumnHidden(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"hidden\";\n}\n\n/** Check if column is hidden by default */\nexport function isColumnOptional(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"optional\";\n}\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @param ctx context\n * @param columns column list\n * @param tableState table ui state\n * @returns PlAgDataTableV2 table source\n */\nexport function createPlDataTableV2<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: PColumn<PColumnDataUniversal>[],\n  tableState: PlDataTableStateV2 | undefined,\n  ops?: CreatePlDataTableOps,\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);\n  fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map(\n    (v) => {\n      return {\n        ...v.value,\n        spec: {\n          ...v.value.spec,\n          annotations: {\n            ...v.value.spec.annotations,\n            [Annotation.Label]: v.label,\n          },\n        },\n      };\n    },\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  const fullColumnsAxes = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n  const fullColumnsIds: PTableColumnId[] = [\n    ...fullColumnsAxes.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n  const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n  const isValidColumnId = (id: PTableColumnId): boolean =>\n    fullColumnsIdsSet.has(canonicalizeJson<PTableColumnId>(id));\n\n  const coreJoinType = ops?.coreJoinType ?? \"full\";\n  const filters = tableStateNormalized.pTableParams.filters;\n  const sorting: PTableSorting[] = uniqueBy(\n    [...tableStateNormalized.pTableParams.sorting, ...(ops?.sorting ?? [])],\n    (s) => canonicalizeJson<PTableColumnId>(s.column),\n  ).filter((s) => {\n    const valid = isValidColumnId(s.column);\n    if (!valid)\n      ctx.logWarn(`Sorting ${JSON.stringify(s)} does not match provided columns, skipping`);\n    return valid;\n  });\n\n  const fullDef = createPTableDef({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: ops?.coreColumnPredicate,\n  });\n  const fullHandle = ctx.createPTableV2(fullDef);\n  if (!fullHandle) return undefined;\n\n  const hiddenColumns = new Set<PObjectId>(\n    ((): PObjectId[] => {\n      // Inner join works as a filter - all columns must be present\n      if (coreJoinType === \"inner\") return [];\n\n      const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;\n      if (hiddenColIds) return hiddenColIds;\n\n      return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n    })(),\n  );\n\n  // Preserve linker columns\n  columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve core columns as they change the shape of join.\n  const coreColumnPredicate = ops?.coreColumnPredicate;\n  if (coreColumnPredicate) {\n    const coreColumns = columns.flatMap((c) =>\n      coreColumnPredicate(getColumnIdAndSpec(c)) ? [c.id] : [],\n    );\n    coreColumns.forEach((c) => hiddenColumns.delete(c));\n  }\n\n  // Sorting changes the order of result rows — preserve sorted columns from being hidden\n  sorting\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .forEach((c) => hiddenColumns.delete(c.id));\n\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  // if at least one column is not yet computed, we can't show the table\n  if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return undefined;\n\n  const visibleDef = createPTableDef({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    visibleTableHandle: visibleHandle,\n  } satisfies PlDataTableModel;\n}\n\n/** Create sheet entries for PlDataTable */\nexport function createPlDataTableSheet<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  axis: AxisSpec,\n  values: (string | number)[],\n): PlDataTableSheet {\n  const labels = ctx.resultPool.findLabels(axis);\n  return {\n    axis,\n    options: values.map((v) => ({\n      value: v,\n      label: labels?.[v] ?? v.toString(),\n    })),\n    defaultValue: values[0],\n  };\n}\n"],"names":["isFunction","getColumnIdAndSpec","distillFilterSpec","isNil","filterSpecToSpecQueryExpr","isBooleanExpression","readAnnotation","Annotation","upgradePlDataTableStateV2","getAllLabelColumns","getMatchingLabelColumns","deriveLabels","identity","uniqueBy","getAxisId","canonicalizeJson","isLinkerColumn","allPColumnsReady"],"mappings":"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"}

package/dist/components/PlDataTable/table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/components/PlDataTable/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EAER,OAAO,EAaR,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,EAQX,MAAM,iCAAiC,CAAC;AAGzC,OAAO,KAAK,EAAE,aAAa,EAAoB,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAI1F,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAqF7C,uDAAuD;AACvD,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,WAAW,CAAC,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAE1E;AAED,2CAA2C;AAC3C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,WAAW,CAAC,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAE5E;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACtC,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,EACxC,UAAU,EAAE,kBAAkB,GAAG,SAAS,EAC1C,GAAG,CAAC,EAAE,oBAAoB,GACzB,gBAAgB,GAAG,SAAS,CAoH9B;AAED,2CAA2C;AAC3C,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,CAAC,EACzC,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EACxB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAC1B,gBAAgB,CAUlB"}
+{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/components/PlDataTable/table.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,QAAQ,EAER,OAAO,EAaR,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,EAQX,MAAM,iCAAiC,CAAC;AAEzC,OAAO,KAAK,EAAE,aAAa,EAAoB,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAI1F,OAAO,KAAK,EAAE,oBAAoB,EAAsB,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAEvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAqF7C,uDAAuD;AACvD,wBAAgB,cAAc,CAAC,IAAI,EAAE;IAAE,WAAW,CAAC,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAE1E;AAED,2CAA2C;AAC3C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE;IAAE,WAAW,CAAC,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAE5E;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,CAAC,EACtC,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,CAAC,oBAAoB,CAAC,EAAE,EACxC,UAAU,EAAE,kBAAkB,GAAG,SAAS,EAC1C,GAAG,CAAC,EAAE,oBAAoB,GACzB,gBAAgB,GAAG,SAAS,CAoH9B;AAED,2CAA2C;AAC3C,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,CAAC,EACzC,GAAG,EAAE,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,EACxB,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,GAC1B,gBAAgB,CAUlB"}

package/dist/components/PlDataTable/table.js

@@ -1,12 +1,11 @@
 import { readAnnotation, Annotation, getColumnIdAndSpec, uniqueBy, getAxisId, canonicalizeJson, isLinkerColumn, isBooleanExpression } from '@milaboratories/pl-model-common';
 import { filterSpecToSpecQueryExpr } from '../../filters/converters/filterToQuery.js';
 import '@milaboratories/ptabler-expression-js';
-import '../../filters/distill.js';
+import { distillFilterSpec } from '../../filters/distill.js';
 import 'canonicalize';
 import { deriveLabels } from '../../render/util/label.js';
 import { allPColumnsReady } from '../../render/util/pcolumn_data.js';
 import { isFunction, isNil, identity } from 'es-toolkit';
-import { filterEmptyPieces } from '../../filters/converters/filterEmpty.js';
 import { upgradePlDataTableStateV2 } from './state-migration.js';
 import { getAllLabelColumns, getMatchingLabelColumns } from './labels.js';
 
@@ -45,7 +44,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);
             if (!isBooleanExpression(pridicate)) {

package/dist/components/PlDataTable/table.js.map

@@ -1 +1 @@
-{"version":3,"file":"table.js","sources":["../../../src/components/PlDataTable/table.ts"],"sourcesContent":["import type {\n  AxisId,\n  AxisSpec,\n  DataInfo,\n  PColumn,\n  PColumnIdAndSpec,\n  PColumnValues,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableDefV2,\n  PTableSorting,\n  SpecQuery,\n  SingleAxisSelector,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  readAnnotation,\n  uniqueBy,\n  isBooleanExpression,\n} from \"@milaboratories/pl-model-common\";\nimport type { PTableFilters } from \"../../filters\";\nimport { filterSpecToSpecQueryExpr } from \"../../filters\";\nimport type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from \"../../render\";\nimport { allPColumnsReady, deriveLabels } from \"../../render\";\nimport { identity, isFunction, isNil } from \"es-toolkit\";\nimport { filterEmptyPieces } from \"../../filters/converters/filterEmpty\";\nimport type { CreatePlDataTableOps, PlDataTableModel } from \"./v5\";\nimport { upgradePlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableSheet } from \"./v5\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"./labels\";\n\n/** Convert a PTableColumnId to a SpecQueryExpression reference. */\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  if (col.type === \"axis\") {\n    return { type: \"axisRef\", value: col.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: col.id };\n}\n\n/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */\nfunction joinEntry<C>(input: SpecQuery<C>): SpecQueryJoinEntry<C> {\n  return { entry: input, qualifications: [] };\n}\n\nfunction createPTableDef(params: {\n  columns: PColumn<PColumnDataUniversal>[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: PTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {\n  let coreColumns = params.columns;\n  const secondaryColumns: typeof params.columns = [];\n\n  if (isFunction(params.coreColumnPredicate)) {\n    coreColumns = [];\n    for (const c of params.columns)\n      if (params.coreColumnPredicate(getColumnIdAndSpec(c))) coreColumns.push(c);\n      else secondaryColumns.push(c);\n  }\n\n  secondaryColumns.push(...params.labelColumns);\n\n  // Build SpecQuery directly from columns\n  const coreJoinQuery: SpecQuery<\n    PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>\n  > = {\n    type: params.coreJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: coreColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  let query: SpecQuery<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> = {\n    type: \"outerJoin\",\n    primary: joinEntry(coreJoinQuery),\n    secondary: secondaryColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  // Apply filters\n  if (params.filters !== null) {\n    const nonEmpty = filterEmptyPieces(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  // Apply sorting\n  if (params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: s.ascending === s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\n/** Check if column should be omitted from the table */\nexport function isColumnHidden(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"hidden\";\n}\n\n/** Check if column is hidden by default */\nexport function isColumnOptional(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"optional\";\n}\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @param ctx context\n * @param columns column list\n * @param tableState table ui state\n * @returns PlAgDataTableV2 table source\n */\nexport function createPlDataTableV2<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: PColumn<PColumnDataUniversal>[],\n  tableState: PlDataTableStateV2 | undefined,\n  ops?: CreatePlDataTableOps,\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);\n  fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map(\n    (v) => {\n      return {\n        ...v.value,\n        spec: {\n          ...v.value.spec,\n          annotations: {\n            ...v.value.spec.annotations,\n            [Annotation.Label]: v.label,\n          },\n        },\n      };\n    },\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  const fullColumnsAxes = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n  const fullColumnsIds: PTableColumnId[] = [\n    ...fullColumnsAxes.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n  const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n  const isValidColumnId = (id: PTableColumnId): boolean =>\n    fullColumnsIdsSet.has(canonicalizeJson<PTableColumnId>(id));\n\n  const coreJoinType = ops?.coreJoinType ?? \"full\";\n  const filters = tableStateNormalized.pTableParams.filters;\n  const sorting: PTableSorting[] = uniqueBy(\n    [...tableStateNormalized.pTableParams.sorting, ...(ops?.sorting ?? [])],\n    (s) => canonicalizeJson<PTableColumnId>(s.column),\n  ).filter((s) => {\n    const valid = isValidColumnId(s.column);\n    if (!valid)\n      ctx.logWarn(`Sorting ${JSON.stringify(s)} does not match provided columns, skipping`);\n    return valid;\n  });\n\n  const fullDef = createPTableDef({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: ops?.coreColumnPredicate,\n  });\n  const fullHandle = ctx.createPTableV2(fullDef);\n  if (!fullHandle) return undefined;\n\n  const hiddenColumns = new Set<PObjectId>(\n    ((): PObjectId[] => {\n      // Inner join works as a filter - all columns must be present\n      if (coreJoinType === \"inner\") return [];\n\n      const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;\n      if (hiddenColIds) return hiddenColIds;\n\n      return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n    })(),\n  );\n\n  // Preserve linker columns\n  columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve core columns as they change the shape of join.\n  const coreColumnPredicate = ops?.coreColumnPredicate;\n  if (coreColumnPredicate) {\n    const coreColumns = columns.flatMap((c) =>\n      coreColumnPredicate(getColumnIdAndSpec(c)) ? [c.id] : [],\n    );\n    coreColumns.forEach((c) => hiddenColumns.delete(c));\n  }\n\n  // Sorting changes the order of result rows — preserve sorted columns from being hidden\n  sorting\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .forEach((c) => hiddenColumns.delete(c.id));\n\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  // if at least one column is not yet computed, we can't show the table\n  if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return undefined;\n\n  const visibleDef = createPTableDef({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    visibleTableHandle: visibleHandle,\n  } satisfies PlDataTableModel;\n}\n\n/** Create sheet entries for PlDataTable */\nexport function createPlDataTableSheet<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  axis: AxisSpec,\n  values: (string | number)[],\n): PlDataTableSheet {\n  const labels = ctx.resultPool.findLabels(axis);\n  return {\n    axis,\n    options: values.map((v) => ({\n      value: v,\n      label: labels?.[v] ?? v.toString(),\n    })),\n    defaultValue: values[0],\n  };\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"table.js","sources":["../../../src/components/PlDataTable/table.ts"],"sourcesContent":["import type {\n  AxisId,\n  AxisSpec,\n  DataInfo,\n  PColumn,\n  PColumnIdAndSpec,\n  PColumnValues,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  PTableDefV2,\n  PTableSorting,\n  SpecQuery,\n  SingleAxisSelector,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  readAnnotation,\n  uniqueBy,\n  isBooleanExpression,\n} from \"@milaboratories/pl-model-common\";\nimport { filterSpecToSpecQueryExpr } from \"../../filters\";\nimport type { RenderCtxBase, TreeNodeAccessor, PColumnDataUniversal } from \"../../render\";\nimport { allPColumnsReady, deriveLabels } from \"../../render\";\nimport { identity, isFunction, isNil } from \"es-toolkit\";\nimport { distillFilterSpec } from \"../../filters/distill\";\nimport type { CreatePlDataTableOps, PlDataTableFilters, PlDataTableModel } from \"./v5\";\nimport { upgradePlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableStateV2 } from \"./state-migration\";\nimport type { PlDataTableSheet } from \"./v5\";\nimport { getAllLabelColumns, getMatchingLabelColumns } from \"./labels\";\n\n/** Convert a PTableColumnId to a SpecQueryExpression reference. */\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  if (col.type === \"axis\") {\n    return { type: \"axisRef\", value: col.id as SingleAxisSelector };\n  }\n  return { type: \"columnRef\", value: col.id };\n}\n\n/** Wrap a SpecQuery as a SpecQueryJoinEntry with empty qualifications. */\nfunction joinEntry<C>(input: SpecQuery<C>): SpecQueryJoinEntry<C> {\n  return { entry: input, qualifications: [] };\n}\n\nfunction createPTableDef(params: {\n  columns: PColumn<PColumnDataUniversal>[];\n  labelColumns: PColumn<PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: null | PlDataTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> {\n  let coreColumns = params.columns;\n  const secondaryColumns: typeof params.columns = [];\n\n  if (isFunction(params.coreColumnPredicate)) {\n    coreColumns = [];\n    for (const c of params.columns)\n      if (params.coreColumnPredicate(getColumnIdAndSpec(c))) coreColumns.push(c);\n      else secondaryColumns.push(c);\n  }\n\n  secondaryColumns.push(...params.labelColumns);\n\n  // Build SpecQuery directly from columns\n  const coreJoinQuery: SpecQuery<\n    PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>\n  > = {\n    type: params.coreJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: coreColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  let query: SpecQuery<PColumn<TreeNodeAccessor | PColumnValues | DataInfo<TreeNodeAccessor>>> = {\n    type: \"outerJoin\",\n    primary: joinEntry(coreJoinQuery),\n    secondary: secondaryColumns.map((c) => joinEntry({ type: \"column\", column: c })),\n  };\n\n  // Apply filters\n  if (params.filters !== null) {\n    const nonEmpty = distillFilterSpec(params.filters);\n\n    if (!isNil(nonEmpty)) {\n      const pridicate = filterSpecToSpecQueryExpr(nonEmpty);\n      if (!isBooleanExpression(pridicate)) {\n        throw new Error(\n          `Filter conversion produced a non-boolean expression (got type \"${pridicate.type}\"), expected a boolean predicate for query filtering`,\n        );\n      }\n      query = {\n        type: \"filter\",\n        input: query,\n        predicate: pridicate,\n      };\n    }\n  }\n\n  // Apply sorting\n  if (params.sorting.length > 0) {\n    query = {\n      type: \"sort\",\n      input: query,\n      sortBy: params.sorting.map((s) => ({\n        expression: columnIdToExpr(s.column),\n        ascending: s.ascending,\n        nullsFirst: s.ascending === s.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\n/** Check if column should be omitted from the table */\nexport function isColumnHidden(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"hidden\";\n}\n\n/** Check if column is hidden by default */\nexport function isColumnOptional(spec: { annotations?: Annotation }): boolean {\n  return readAnnotation(spec, Annotation.Table.Visibility) === \"optional\";\n}\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @param ctx context\n * @param columns column list\n * @param tableState table ui state\n * @returns PlAgDataTableV2 table source\n */\nexport function createPlDataTableV2<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  columns: PColumn<PColumnDataUniversal>[],\n  tableState: PlDataTableStateV2 | undefined,\n  ops?: CreatePlDataTableOps,\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool);\n  if (!allLabelColumns) return undefined;\n\n  let fullLabelColumns = getMatchingLabelColumns(columns.map(getColumnIdAndSpec), allLabelColumns);\n  fullLabelColumns = deriveLabels(fullLabelColumns, identity, { includeNativeLabel: true }).map(\n    (v) => {\n      return {\n        ...v.value,\n        spec: {\n          ...v.value.spec,\n          annotations: {\n            ...v.value.spec.annotations,\n            [Annotation.Label]: v.label,\n          },\n        },\n      };\n    },\n  );\n\n  const fullColumns = [...columns, ...fullLabelColumns];\n\n  const fullColumnsAxes = uniqueBy(\n    fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => getAxisId(a))),\n    (a) => canonicalizeJson<AxisId>(a),\n  );\n  const fullColumnsIds: PTableColumnId[] = [\n    ...fullColumnsAxes.map((a) => ({ type: \"axis\", id: a }) satisfies PTableColumnIdAxis),\n    ...fullColumns.map((c) => ({ type: \"column\", id: c.id }) satisfies PTableColumnIdColumn),\n  ];\n  const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => canonicalizeJson<PTableColumnId>(c)));\n  const isValidColumnId = (id: PTableColumnId): boolean =>\n    fullColumnsIdsSet.has(canonicalizeJson<PTableColumnId>(id));\n\n  const coreJoinType = ops?.coreJoinType ?? \"full\";\n  const filters = tableStateNormalized.pTableParams.filters;\n  const sorting: PTableSorting[] = uniqueBy(\n    [...tableStateNormalized.pTableParams.sorting, ...(ops?.sorting ?? [])],\n    (s) => canonicalizeJson<PTableColumnId>(s.column),\n  ).filter((s) => {\n    const valid = isValidColumnId(s.column);\n    if (!valid)\n      ctx.logWarn(`Sorting ${JSON.stringify(s)} does not match provided columns, skipping`);\n    return valid;\n  });\n\n  const fullDef = createPTableDef({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: ops?.coreColumnPredicate,\n  });\n  const fullHandle = ctx.createPTableV2(fullDef);\n  if (!fullHandle) return undefined;\n\n  const hiddenColumns = new Set<PObjectId>(\n    ((): PObjectId[] => {\n      // Inner join works as a filter - all columns must be present\n      if (coreJoinType === \"inner\") return [];\n\n      const hiddenColIds = tableStateNormalized.pTableParams.hiddenColIds;\n      if (hiddenColIds) return hiddenColIds;\n\n      return columns.filter((c) => isColumnOptional(c.spec)).map((c) => c.id);\n    })(),\n  );\n\n  // Preserve linker columns\n  columns.filter((c) => isLinkerColumn(c.spec)).forEach((c) => hiddenColumns.delete(c.id));\n\n  // Preserve core columns as they change the shape of join.\n  const coreColumnPredicate = ops?.coreColumnPredicate;\n  if (coreColumnPredicate) {\n    const coreColumns = columns.flatMap((c) =>\n      coreColumnPredicate(getColumnIdAndSpec(c)) ? [c.id] : [],\n    );\n    coreColumns.forEach((c) => hiddenColumns.delete(c));\n  }\n\n  // Sorting changes the order of result rows — preserve sorted columns from being hidden\n  sorting\n    .map((s) => s.column)\n    .filter((c): c is PTableColumnIdColumn => c.type === \"column\")\n    .forEach((c) => hiddenColumns.delete(c.id));\n\n  const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));\n  const visibleLabelColumns = getMatchingLabelColumns(\n    visibleColumns.map(getColumnIdAndSpec),\n    allLabelColumns,\n  );\n\n  // if at least one column is not yet computed, we can't show the table\n  if (!allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return undefined;\n\n  const visibleDef = createPTableDef({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    visibleTableHandle: visibleHandle,\n  } satisfies PlDataTableModel;\n}\n\n/** Create sheet entries for PlDataTable */\nexport function createPlDataTableSheet<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  axis: AxisSpec,\n  values: (string | number)[],\n): PlDataTableSheet {\n  const labels = ctx.resultPool.findLabels(axis);\n  return {\n    axis,\n    options: values.map((v) => ({\n      value: v,\n      label: labels?.[v] ?? v.toString(),\n    })),\n    defaultValue: values[0],\n  };\n}\n"],"names":[],"mappings":"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"}

package/dist/components/PlDataTable/v5.d.ts

@@ -1,4 +1,4 @@
-import type { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PObjectId, PTableColumnSpec, PTableFilters, PTableRecordFilter, PTableSorting, PColumnIdAndSpec, PTableHandle } from "@milaboratories/pl-model-common";
+import type { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PObjectId, PTableColumnSpec, PTableRecordFilter, PTableSorting, PColumnIdAndSpec, PTableHandle } from "@milaboratories/pl-model-common";
 import type { FilterSpec, FilterSpecLeaf } from "../../filters";
 export type PlTableColumnId = {
     /** Original column spec */
@@ -44,7 +44,8 @@ export type PlDataTableSheetState = {
     value: string | number;
 };
 /** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
-export type PlDataTableAdvancedFilter = FilterSpec<FilterSpecLeaf<string>, {
+export type PlDataTableFilters = FilterSpec<FilterSpecLeaf<string>>;
+export type PlDataTableFiltersWithMeta = FilterSpec<FilterSpecLeaf<string>, {
     id: number;
     isExpanded?: boolean;
 }>;
@@ -56,7 +57,7 @@ export type PlDataTableStateV2CacheEntry = {
     /** Sheets state */
     sheetsState: PlDataTableSheetState[];
     /** Filters state (tree-based, compatible with PlAdvancedFilter) */
-    filtersState: PlDataTableAdvancedFilter | null;
+    filtersState: null | PlDataTableFiltersWithMeta;
 };
 export type PTableParamsV2 = {
     sourceId: null;
@@ -65,8 +66,8 @@ export type PTableParamsV2 = {
     sorting: [];
 } | {
     sourceId: string;
-    hiddenColIds: PObjectId[] | null;
-    filters: PTableFilters;
+    hiddenColIds: null | PObjectId[];
+    filters: null | PlDataTableFilters;
     sorting: PTableSorting[];
 };
 export type PlDataTableStateV2Normalized = {

package/dist/components/PlDataTable/v5.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"v5.d.ts","sourceRoot":"","sources":["../../../src/components/PlDataTable/v5.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"v5.d.ts","sourceRoot":"","sources":["../../../src/components/PlDataTable/v5.ts"],"names":[],"mappings":"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"}

package/dist/filters/distill.cjs

@@ -15,6 +15,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)) {
@@ -27,20 +33,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);
 }
 
-exports.distillFilter = distillFilter;
+exports.distillFilterSpec = distillFilterSpec;
 //# sourceMappingURL=distill.cjs.map

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 {\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.cjs","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;;;;"}