@platforma-sdk/model 1.63.12 → 1.65.0

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

@@ -1 +1 @@
-{"version":3,"file":"labels.cjs","names":["PColumnCollection","PColumnName"],"sources":["../../../src/components/PlDataTable/labels.ts"],"sourcesContent":["import type { AxisId, PColumn, PColumnIdAndSpec, PObjectId } from \"@milaboratories/pl-model-common\";\nimport {\n  getAxisId,\n  isLabelColumn,\n  matchAxisId,\n  PColumnName,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxisLabelProvider, ColumnProvider, PColumnDataUniversal } from \"../../render\";\nimport { PColumnCollection } from \"../../render\";\n\n/** Get all label columns from the result pool */\nexport function getAllLabelColumns(\n  resultPool: AxisLabelProvider & ColumnProvider,\n): PColumn<PColumnDataUniversal>[] | undefined {\n  return new PColumnCollection()\n    .addAxisLabelProvider(resultPool)\n    .addColumnProvider(resultPool)\n    .getColumns(\n      {\n        name: PColumnName.Label,\n        axes: [{}], // exactly one axis\n      },\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    );\n}\n\n/** Get label columns matching the provided columns from the result pool */\nexport function getMatchingLabelColumns(\n  columns: PColumnIdAndSpec[],\n  allLabelColumns: PColumn<PColumnDataUniversal>[],\n): PColumn<PColumnDataUniversal>[] {\n  // split input columns into label and value columns\n  const inputLabelColumns: typeof columns = [];\n  const inputValueColumns: typeof columns = [];\n  for (const column of columns) {\n    if (isLabelColumn(column.spec)) {\n      inputLabelColumns.push(column);\n    } else {\n      inputValueColumns.push(column);\n    }\n  }\n\n  // collect distinct axes of value columns\n  const unlabeledAxes: AxisId[] = [];\n  for (const column of inputValueColumns) {\n    for (const axis of column.spec.axesSpec) {\n      const axisId = getAxisId(axis);\n      if (!unlabeledAxes.some((id) => matchAxisId(id, axisId))) {\n        unlabeledAxes.push(axisId);\n      }\n    }\n  }\n\n  // remove axes matched by input label columns\n  for (const labelColumn of inputLabelColumns) {\n    const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n\n  // warning: changing this id will break backward compatibility\n  const colId = (\n    id: PObjectId,\n    domain?: Record<string, string>,\n    contextDomain?: Record<string, string>,\n  ): PObjectId => {\n    let wid = id.toString();\n    if (domain) {\n      for (const k in domain) {\n        wid += k;\n        wid += domain[k];\n      }\n    }\n    if (contextDomain) {\n      for (const k in contextDomain) {\n        wid += k;\n        wid += contextDomain[k];\n      }\n    }\n    return wid as PObjectId;\n  };\n\n  // search label columns for unmatched axes\n  const labelColumns: typeof allLabelColumns = [];\n  for (const labelColumn of allLabelColumns) {\n    const labelAxis = labelColumn.spec.axesSpec[0];\n    const labelAxisId = getAxisId(labelAxis);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      const axisId = unlabeledAxes[labelMatch];\n      const dataDomainLen =\n        Object.keys(axisId.domain ?? {}).length + Object.keys(axisId.contextDomain ?? {}).length;\n      const labelDomainLen =\n        Object.keys(labelAxis.domain ?? {}).length +\n        Object.keys(labelAxis.contextDomain ?? {}).length;\n      if (dataDomainLen > labelDomainLen) {\n        labelColumns.push({\n          id: colId(labelColumn.id, axisId.domain, axisId.contextDomain),\n          spec: {\n            ...labelColumn.spec,\n            axesSpec: [{ ...axisId, annotations: labelAxis.annotations }],\n          },\n          data: labelColumn.data,\n        });\n      } else {\n        labelColumns.push(labelColumn);\n      }\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n  return labelColumns;\n}\n"],"mappings":";;;;;;AAWA,SAAgB,mBACd,YAC6C;AAC7C,QAAO,IAAIA,0BAAAA,mBAAmB,CAC3B,qBAAqB,WAAW,CAChC,kBAAkB,WAAW,CAC7B,WACC;EACE,MAAMC,gCAAAA,YAAY;EAClB,MAAM,CAAC,EAAE,CAAC;EACX,EACD;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D;;;AAIL,SAAgB,wBACd,SACA,iBACiC;CAEjC,MAAM,oBAAoC,EAAE;CAC5C,MAAM,oBAAoC,EAAE;AAC5C,MAAK,MAAM,UAAU,QACnB,MAAA,GAAA,gCAAA,eAAkB,OAAO,KAAK,CAC5B,mBAAkB,KAAK,OAAO;KAE9B,mBAAkB,KAAK,OAAO;CAKlC,MAAM,gBAA0B,EAAE;AAClC,MAAK,MAAM,UAAU,kBACnB,MAAK,MAAM,QAAQ,OAAO,KAAK,UAAU;EACvC,MAAM,UAAA,GAAA,gCAAA,WAAmB,KAAK;AAC9B,MAAI,CAAC,cAAc,MAAM,QAAA,GAAA,gCAAA,aAAmB,IAAI,OAAO,CAAC,CACtD,eAAc,KAAK,OAAO;;AAMhC,MAAK,MAAM,eAAe,mBAAmB;EAC3C,MAAM,eAAA,GAAA,gCAAA,WAAwB,YAAY,KAAK,SAAS,GAAG;EAC3D,MAAM,aAAa,cAAc,WAAW,YAAA,GAAA,gCAAA,aAAuB,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,GACjB,eAAc,OAAO,YAAY,EAAE;;CAKvC,MAAM,SACJ,IACA,QACA,kBACc;EACd,IAAI,MAAM,GAAG,UAAU;AACvB,MAAI,OACF,MAAK,MAAM,KAAK,QAAQ;AACtB,UAAO;AACP,UAAO,OAAO;;AAGlB,MAAI,cACF,MAAK,MAAM,KAAK,eAAe;AAC7B,UAAO;AACP,UAAO,cAAc;;AAGzB,SAAO;;CAIT,MAAM,eAAuC,EAAE;AAC/C,MAAK,MAAM,eAAe,iBAAiB;EACzC,MAAM,YAAY,YAAY,KAAK,SAAS;EAC5C,MAAM,eAAA,GAAA,gCAAA,WAAwB,UAAU;EACxC,MAAM,aAAa,cAAc,WAAW,YAAA,GAAA,gCAAA,aAAuB,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,IAAI;GACrB,MAAM,SAAS,cAAc;AAM7B,OAJE,OAAO,KAAK,OAAO,UAAU,EAAE,CAAC,CAAC,SAAS,OAAO,KAAK,OAAO,iBAAiB,EAAE,CAAC,CAAC,SAElF,OAAO,KAAK,UAAU,UAAU,EAAE,CAAC,CAAC,SACpC,OAAO,KAAK,UAAU,iBAAiB,EAAE,CAAC,CAAC,OAE3C,cAAa,KAAK;IAChB,IAAI,MAAM,YAAY,IAAI,OAAO,QAAQ,OAAO,cAAc;IAC9D,MAAM;KACJ,GAAG,YAAY;KACf,UAAU,CAAC;MAAE,GAAG;MAAQ,aAAa,UAAU;MAAa,CAAC;KAC9D;IACD,MAAM,YAAY;IACnB,CAAC;OAEF,cAAa,KAAK,YAAY;AAEhC,iBAAc,OAAO,YAAY,EAAE;;;AAGvC,QAAO"}
+{"version":3,"file":"labels.cjs","names":["ColumnCollectionBuilder","collectCtxColumnSnapshotProviders","PColumnName"],"sources":["../../../src/components/PlDataTable/labels.ts"],"sourcesContent":["import type { AxisId, PColumn, PColumnSpec, PObjectId } from \"@milaboratories/pl-model-common\";\nimport {\n  getAxisId,\n  isLabelColumn,\n  matchAxisId,\n  PColumnName,\n  Services,\n  type RequireServices,\n} from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, RenderCtxBase } from \"../../render\";\nimport { ColumnCollectionBuilder, collectCtxColumnSnapshotProviders } from \"../../columns\";\nimport { throwError } from \"@milaboratories/helpers\";\n\n/**\n * Get all label columns visible in the current render context\n * (result pool + block outputs + prerun).\n */\nexport function getAllLabelColumns<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\n): PColumn<PColumnDataUniversal>[] {\n  const pframeSpec =\n    ctx.services.pframeSpec ?? throwError(\"PFrameSpec service is required for label discovery.\");\n  const collection = new ColumnCollectionBuilder(pframeSpec)\n    .addSources(collectCtxColumnSnapshotProviders(ctx))\n    .build({ allowPartialColumnList: true });\n  try {\n    return collection\n      .findColumns({ include: { name: PColumnName.Label, axes: [] } })\n      .reduce<PColumn<PColumnDataUniversal>[]>((acc, hit) => {\n        const data = hit.data?.get();\n        return data === undefined ? acc : [...acc, { id: hit.id, spec: hit.spec, data }];\n      }, []);\n  } finally {\n    collection.dispose();\n  }\n}\n\n/** Get label columns matching the provided columns from the result pool */\nexport function getMatchingLabelColumns(\n  columns: { spec: PColumnSpec }[],\n  allLabelColumns: PColumn<PColumnDataUniversal>[],\n): PColumn<PColumnDataUniversal>[] {\n  // split input columns into label and value columns\n  const inputLabelColumns: typeof columns = [];\n  const inputValueColumns: typeof columns = [];\n  for (const column of columns) {\n    if (isLabelColumn(column.spec)) {\n      inputLabelColumns.push(column);\n    } else {\n      inputValueColumns.push(column);\n    }\n  }\n\n  // collect distinct axes of value columns\n  const unlabeledAxes: AxisId[] = [];\n  for (const column of inputValueColumns) {\n    for (const axis of column.spec.axesSpec) {\n      const axisId = getAxisId(axis);\n      if (!unlabeledAxes.some((id) => matchAxisId(id, axisId))) {\n        unlabeledAxes.push(axisId);\n      }\n    }\n  }\n\n  // remove axes matched by input label columns\n  for (const labelColumn of inputLabelColumns) {\n    const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n\n  // warning: changing this id will break backward compatibility\n  const colId = (\n    id: PObjectId,\n    domain?: Record<string, string>,\n    contextDomain?: Record<string, string>,\n  ): PObjectId => {\n    let wid = id.toString();\n    if (domain) {\n      for (const k in domain) {\n        wid += k;\n        wid += domain[k];\n      }\n    }\n    if (contextDomain) {\n      for (const k in contextDomain) {\n        wid += k;\n        wid += contextDomain[k];\n      }\n    }\n    return wid as PObjectId;\n  };\n\n  // search label columns for unmatched axes\n  const labelColumns: typeof allLabelColumns = [];\n  for (const labelColumn of allLabelColumns) {\n    const labelAxis = labelColumn.spec.axesSpec[0];\n    const labelAxisId = getAxisId(labelAxis);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      const axisId = unlabeledAxes[labelMatch];\n      const dataDomainLen =\n        Object.keys(axisId.domain ?? {}).length + Object.keys(axisId.contextDomain ?? {}).length;\n      const labelDomainLen =\n        Object.keys(labelAxis.domain ?? {}).length +\n        Object.keys(labelAxis.contextDomain ?? {}).length;\n      if (dataDomainLen > labelDomainLen) {\n        labelColumns.push({\n          id: colId(labelColumn.id, axisId.domain, axisId.contextDomain),\n          spec: {\n            ...labelColumn.spec,\n            axesSpec: [{ ...axisId, annotations: labelAxis.annotations }],\n          },\n          data: labelColumn.data,\n        });\n      } else {\n        labelColumns.push(labelColumn);\n      }\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n  return labelColumns;\n}\n"],"mappings":";;;;;;;;;;;AAiBA,SAAgB,mBACd,KACiC;CAGjC,MAAM,aAAa,IAAIA,kCAAAA,wBADrB,IAAI,SAAS,eAAA,GAAA,wBAAA,YAAyB,sDAAsD,CACpC,CACvD,WAAWC,2BAAAA,kCAAkC,IAAI,CAAC,CAClD,MAAM,EAAE,wBAAwB,MAAM,CAAC;AAC1C,KAAI;AACF,SAAO,WACJ,YAAY,EAAE,SAAS;GAAE,MAAMC,gCAAAA,YAAY;GAAO,MAAM,EAAE;GAAE,EAAE,CAAC,CAC/D,QAAyC,KAAK,QAAQ;GACrD,MAAM,OAAO,IAAI,MAAM,KAAK;AAC5B,UAAO,SAAS,KAAA,IAAY,MAAM,CAAC,GAAG,KAAK;IAAE,IAAI,IAAI;IAAI,MAAM,IAAI;IAAM;IAAM,CAAC;KAC/E,EAAE,CAAC;WACA;AACR,aAAW,SAAS;;;;AAKxB,SAAgB,wBACd,SACA,iBACiC;CAEjC,MAAM,oBAAoC,EAAE;CAC5C,MAAM,oBAAoC,EAAE;AAC5C,MAAK,MAAM,UAAU,QACnB,MAAA,GAAA,gCAAA,eAAkB,OAAO,KAAK,CAC5B,mBAAkB,KAAK,OAAO;KAE9B,mBAAkB,KAAK,OAAO;CAKlC,MAAM,gBAA0B,EAAE;AAClC,MAAK,MAAM,UAAU,kBACnB,MAAK,MAAM,QAAQ,OAAO,KAAK,UAAU;EACvC,MAAM,UAAA,GAAA,gCAAA,WAAmB,KAAK;AAC9B,MAAI,CAAC,cAAc,MAAM,QAAA,GAAA,gCAAA,aAAmB,IAAI,OAAO,CAAC,CACtD,eAAc,KAAK,OAAO;;AAMhC,MAAK,MAAM,eAAe,mBAAmB;EAC3C,MAAM,eAAA,GAAA,gCAAA,WAAwB,YAAY,KAAK,SAAS,GAAG;EAC3D,MAAM,aAAa,cAAc,WAAW,YAAA,GAAA,gCAAA,aAAuB,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,GACjB,eAAc,OAAO,YAAY,EAAE;;CAKvC,MAAM,SACJ,IACA,QACA,kBACc;EACd,IAAI,MAAM,GAAG,UAAU;AACvB,MAAI,OACF,MAAK,MAAM,KAAK,QAAQ;AACtB,UAAO;AACP,UAAO,OAAO;;AAGlB,MAAI,cACF,MAAK,MAAM,KAAK,eAAe;AAC7B,UAAO;AACP,UAAO,cAAc;;AAGzB,SAAO;;CAIT,MAAM,eAAuC,EAAE;AAC/C,MAAK,MAAM,eAAe,iBAAiB;EACzC,MAAM,YAAY,YAAY,KAAK,SAAS;EAC5C,MAAM,eAAA,GAAA,gCAAA,WAAwB,UAAU;EACxC,MAAM,aAAa,cAAc,WAAW,YAAA,GAAA,gCAAA,aAAuB,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,IAAI;GACrB,MAAM,SAAS,cAAc;AAM7B,OAJE,OAAO,KAAK,OAAO,UAAU,EAAE,CAAC,CAAC,SAAS,OAAO,KAAK,OAAO,iBAAiB,EAAE,CAAC,CAAC,SAElF,OAAO,KAAK,UAAU,UAAU,EAAE,CAAC,CAAC,SACpC,OAAO,KAAK,UAAU,iBAAiB,EAAE,CAAC,CAAC,OAE3C,cAAa,KAAK;IAChB,IAAI,MAAM,YAAY,IAAI,OAAO,QAAQ,OAAO,cAAc;IAC9D,MAAM;KACJ,GAAG,YAAY;KACf,UAAU,CAAC;MAAE,GAAG;MAAQ,aAAa,UAAU;MAAa,CAAC;KAC9D;IACD,MAAM,YAAY;IACnB,CAAC;OAEF,cAAa,KAAK,YAAY;AAEhC,iBAAc,OAAO,YAAY,EAAE;;;AAGvC,QAAO"}

package/dist/components/PlDataTable/labels.js

@@ -1,16 +1,30 @@
-import { PColumnCollection } from "../../render/util/column_collection.js";
-import "../../render/index.js";
+import { ColumnCollectionBuilder } from "../../columns/column_collection_builder.js";
+import { collectCtxColumnSnapshotProviders } from "../../columns/ctx_column_sources.js";
+import "../../columns/index.js";
 import { PColumnName, getAxisId, isLabelColumn, matchAxisId } from "@milaboratories/pl-model-common";
+import { throwError } from "@milaboratories/helpers";
 //#region src/components/PlDataTable/labels.ts
-/** Get all label columns from the result pool */
-function getAllLabelColumns(resultPool) {
-	return new PColumnCollection().addAxisLabelProvider(resultPool).addColumnProvider(resultPool).getColumns({
-		name: PColumnName.Label,
-		axes: [{}]
-	}, {
-		dontWaitAllData: true,
-		overrideLabelAnnotation: false
-	});
+/**
+* Get all label columns visible in the current render context
+* (result pool + block outputs + prerun).
+*/
+function getAllLabelColumns(ctx) {
+	const collection = new ColumnCollectionBuilder(ctx.services.pframeSpec ?? throwError("PFrameSpec service is required for label discovery.")).addSources(collectCtxColumnSnapshotProviders(ctx)).build({ allowPartialColumnList: true });
+	try {
+		return collection.findColumns({ include: {
+			name: PColumnName.Label,
+			axes: []
+		} }).reduce((acc, hit) => {
+			const data = hit.data?.get();
+			return data === void 0 ? acc : [...acc, {
+				id: hit.id,
+				spec: hit.spec,
+				data
+			}];
+		}, []);
+	} finally {
+		collection.dispose();
+	}
 }
 /** Get label columns matching the provided columns from the result pool */
 function getMatchingLabelColumns(columns, allLabelColumns) {

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

@@ -1 +1 @@
-{"version":3,"file":"labels.js","names":[],"sources":["../../../src/components/PlDataTable/labels.ts"],"sourcesContent":["import type { AxisId, PColumn, PColumnIdAndSpec, PObjectId } from \"@milaboratories/pl-model-common\";\nimport {\n  getAxisId,\n  isLabelColumn,\n  matchAxisId,\n  PColumnName,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxisLabelProvider, ColumnProvider, PColumnDataUniversal } from \"../../render\";\nimport { PColumnCollection } from \"../../render\";\n\n/** Get all label columns from the result pool */\nexport function getAllLabelColumns(\n  resultPool: AxisLabelProvider & ColumnProvider,\n): PColumn<PColumnDataUniversal>[] | undefined {\n  return new PColumnCollection()\n    .addAxisLabelProvider(resultPool)\n    .addColumnProvider(resultPool)\n    .getColumns(\n      {\n        name: PColumnName.Label,\n        axes: [{}], // exactly one axis\n      },\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    );\n}\n\n/** Get label columns matching the provided columns from the result pool */\nexport function getMatchingLabelColumns(\n  columns: PColumnIdAndSpec[],\n  allLabelColumns: PColumn<PColumnDataUniversal>[],\n): PColumn<PColumnDataUniversal>[] {\n  // split input columns into label and value columns\n  const inputLabelColumns: typeof columns = [];\n  const inputValueColumns: typeof columns = [];\n  for (const column of columns) {\n    if (isLabelColumn(column.spec)) {\n      inputLabelColumns.push(column);\n    } else {\n      inputValueColumns.push(column);\n    }\n  }\n\n  // collect distinct axes of value columns\n  const unlabeledAxes: AxisId[] = [];\n  for (const column of inputValueColumns) {\n    for (const axis of column.spec.axesSpec) {\n      const axisId = getAxisId(axis);\n      if (!unlabeledAxes.some((id) => matchAxisId(id, axisId))) {\n        unlabeledAxes.push(axisId);\n      }\n    }\n  }\n\n  // remove axes matched by input label columns\n  for (const labelColumn of inputLabelColumns) {\n    const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n\n  // warning: changing this id will break backward compatibility\n  const colId = (\n    id: PObjectId,\n    domain?: Record<string, string>,\n    contextDomain?: Record<string, string>,\n  ): PObjectId => {\n    let wid = id.toString();\n    if (domain) {\n      for (const k in domain) {\n        wid += k;\n        wid += domain[k];\n      }\n    }\n    if (contextDomain) {\n      for (const k in contextDomain) {\n        wid += k;\n        wid += contextDomain[k];\n      }\n    }\n    return wid as PObjectId;\n  };\n\n  // search label columns for unmatched axes\n  const labelColumns: typeof allLabelColumns = [];\n  for (const labelColumn of allLabelColumns) {\n    const labelAxis = labelColumn.spec.axesSpec[0];\n    const labelAxisId = getAxisId(labelAxis);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      const axisId = unlabeledAxes[labelMatch];\n      const dataDomainLen =\n        Object.keys(axisId.domain ?? {}).length + Object.keys(axisId.contextDomain ?? {}).length;\n      const labelDomainLen =\n        Object.keys(labelAxis.domain ?? {}).length +\n        Object.keys(labelAxis.contextDomain ?? {}).length;\n      if (dataDomainLen > labelDomainLen) {\n        labelColumns.push({\n          id: colId(labelColumn.id, axisId.domain, axisId.contextDomain),\n          spec: {\n            ...labelColumn.spec,\n            axesSpec: [{ ...axisId, annotations: labelAxis.annotations }],\n          },\n          data: labelColumn.data,\n        });\n      } else {\n        labelColumns.push(labelColumn);\n      }\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n  return labelColumns;\n}\n"],"mappings":";;;;;AAWA,SAAgB,mBACd,YAC6C;AAC7C,QAAO,IAAI,mBAAmB,CAC3B,qBAAqB,WAAW,CAChC,kBAAkB,WAAW,CAC7B,WACC;EACE,MAAM,YAAY;EAClB,MAAM,CAAC,EAAE,CAAC;EACX,EACD;EAAE,iBAAiB;EAAM,yBAAyB;EAAO,CAC1D;;;AAIL,SAAgB,wBACd,SACA,iBACiC;CAEjC,MAAM,oBAAoC,EAAE;CAC5C,MAAM,oBAAoC,EAAE;AAC5C,MAAK,MAAM,UAAU,QACnB,KAAI,cAAc,OAAO,KAAK,CAC5B,mBAAkB,KAAK,OAAO;KAE9B,mBAAkB,KAAK,OAAO;CAKlC,MAAM,gBAA0B,EAAE;AAClC,MAAK,MAAM,UAAU,kBACnB,MAAK,MAAM,QAAQ,OAAO,KAAK,UAAU;EACvC,MAAM,SAAS,UAAU,KAAK;AAC9B,MAAI,CAAC,cAAc,MAAM,OAAO,YAAY,IAAI,OAAO,CAAC,CACtD,eAAc,KAAK,OAAO;;AAMhC,MAAK,MAAM,eAAe,mBAAmB;EAC3C,MAAM,cAAc,UAAU,YAAY,KAAK,SAAS,GAAG;EAC3D,MAAM,aAAa,cAAc,WAAW,WAAW,YAAY,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,GACjB,eAAc,OAAO,YAAY,EAAE;;CAKvC,MAAM,SACJ,IACA,QACA,kBACc;EACd,IAAI,MAAM,GAAG,UAAU;AACvB,MAAI,OACF,MAAK,MAAM,KAAK,QAAQ;AACtB,UAAO;AACP,UAAO,OAAO;;AAGlB,MAAI,cACF,MAAK,MAAM,KAAK,eAAe;AAC7B,UAAO;AACP,UAAO,cAAc;;AAGzB,SAAO;;CAIT,MAAM,eAAuC,EAAE;AAC/C,MAAK,MAAM,eAAe,iBAAiB;EACzC,MAAM,YAAY,YAAY,KAAK,SAAS;EAC5C,MAAM,cAAc,UAAU,UAAU;EACxC,MAAM,aAAa,cAAc,WAAW,WAAW,YAAY,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,IAAI;GACrB,MAAM,SAAS,cAAc;AAM7B,OAJE,OAAO,KAAK,OAAO,UAAU,EAAE,CAAC,CAAC,SAAS,OAAO,KAAK,OAAO,iBAAiB,EAAE,CAAC,CAAC,SAElF,OAAO,KAAK,UAAU,UAAU,EAAE,CAAC,CAAC,SACpC,OAAO,KAAK,UAAU,iBAAiB,EAAE,CAAC,CAAC,OAE3C,cAAa,KAAK;IAChB,IAAI,MAAM,YAAY,IAAI,OAAO,QAAQ,OAAO,cAAc;IAC9D,MAAM;KACJ,GAAG,YAAY;KACf,UAAU,CAAC;MAAE,GAAG;MAAQ,aAAa,UAAU;MAAa,CAAC;KAC9D;IACD,MAAM,YAAY;IACnB,CAAC;OAEF,cAAa,KAAK,YAAY;AAEhC,iBAAc,OAAO,YAAY,EAAE;;;AAGvC,QAAO"}
+{"version":3,"file":"labels.js","names":[],"sources":["../../../src/components/PlDataTable/labels.ts"],"sourcesContent":["import type { AxisId, PColumn, PColumnSpec, PObjectId } from \"@milaboratories/pl-model-common\";\nimport {\n  getAxisId,\n  isLabelColumn,\n  matchAxisId,\n  PColumnName,\n  Services,\n  type RequireServices,\n} from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, RenderCtxBase } from \"../../render\";\nimport { ColumnCollectionBuilder, collectCtxColumnSnapshotProviders } from \"../../columns\";\nimport { throwError } from \"@milaboratories/helpers\";\n\n/**\n * Get all label columns visible in the current render context\n * (result pool + block outputs + prerun).\n */\nexport function getAllLabelColumns<A, U, S extends RequireServices<typeof Services.PFrameSpec>>(\n  ctx: RenderCtxBase<A, U, S>,\n): PColumn<PColumnDataUniversal>[] {\n  const pframeSpec =\n    ctx.services.pframeSpec ?? throwError(\"PFrameSpec service is required for label discovery.\");\n  const collection = new ColumnCollectionBuilder(pframeSpec)\n    .addSources(collectCtxColumnSnapshotProviders(ctx))\n    .build({ allowPartialColumnList: true });\n  try {\n    return collection\n      .findColumns({ include: { name: PColumnName.Label, axes: [] } })\n      .reduce<PColumn<PColumnDataUniversal>[]>((acc, hit) => {\n        const data = hit.data?.get();\n        return data === undefined ? acc : [...acc, { id: hit.id, spec: hit.spec, data }];\n      }, []);\n  } finally {\n    collection.dispose();\n  }\n}\n\n/** Get label columns matching the provided columns from the result pool */\nexport function getMatchingLabelColumns(\n  columns: { spec: PColumnSpec }[],\n  allLabelColumns: PColumn<PColumnDataUniversal>[],\n): PColumn<PColumnDataUniversal>[] {\n  // split input columns into label and value columns\n  const inputLabelColumns: typeof columns = [];\n  const inputValueColumns: typeof columns = [];\n  for (const column of columns) {\n    if (isLabelColumn(column.spec)) {\n      inputLabelColumns.push(column);\n    } else {\n      inputValueColumns.push(column);\n    }\n  }\n\n  // collect distinct axes of value columns\n  const unlabeledAxes: AxisId[] = [];\n  for (const column of inputValueColumns) {\n    for (const axis of column.spec.axesSpec) {\n      const axisId = getAxisId(axis);\n      if (!unlabeledAxes.some((id) => matchAxisId(id, axisId))) {\n        unlabeledAxes.push(axisId);\n      }\n    }\n  }\n\n  // remove axes matched by input label columns\n  for (const labelColumn of inputLabelColumns) {\n    const labelAxisId = getAxisId(labelColumn.spec.axesSpec[0]);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n\n  // warning: changing this id will break backward compatibility\n  const colId = (\n    id: PObjectId,\n    domain?: Record<string, string>,\n    contextDomain?: Record<string, string>,\n  ): PObjectId => {\n    let wid = id.toString();\n    if (domain) {\n      for (const k in domain) {\n        wid += k;\n        wid += domain[k];\n      }\n    }\n    if (contextDomain) {\n      for (const k in contextDomain) {\n        wid += k;\n        wid += contextDomain[k];\n      }\n    }\n    return wid as PObjectId;\n  };\n\n  // search label columns for unmatched axes\n  const labelColumns: typeof allLabelColumns = [];\n  for (const labelColumn of allLabelColumns) {\n    const labelAxis = labelColumn.spec.axesSpec[0];\n    const labelAxisId = getAxisId(labelAxis);\n    const labelMatch = unlabeledAxes.findIndex((axisId) => matchAxisId(axisId, labelAxisId));\n    if (labelMatch !== -1) {\n      const axisId = unlabeledAxes[labelMatch];\n      const dataDomainLen =\n        Object.keys(axisId.domain ?? {}).length + Object.keys(axisId.contextDomain ?? {}).length;\n      const labelDomainLen =\n        Object.keys(labelAxis.domain ?? {}).length +\n        Object.keys(labelAxis.contextDomain ?? {}).length;\n      if (dataDomainLen > labelDomainLen) {\n        labelColumns.push({\n          id: colId(labelColumn.id, axisId.domain, axisId.contextDomain),\n          spec: {\n            ...labelColumn.spec,\n            axesSpec: [{ ...axisId, annotations: labelAxis.annotations }],\n          },\n          data: labelColumn.data,\n        });\n      } else {\n        labelColumns.push(labelColumn);\n      }\n      unlabeledAxes.splice(labelMatch, 1);\n    }\n  }\n  return labelColumns;\n}\n"],"mappings":";;;;;;;;;;AAiBA,SAAgB,mBACd,KACiC;CAGjC,MAAM,aAAa,IAAI,wBADrB,IAAI,SAAS,cAAc,WAAW,sDAAsD,CACpC,CACvD,WAAW,kCAAkC,IAAI,CAAC,CAClD,MAAM,EAAE,wBAAwB,MAAM,CAAC;AAC1C,KAAI;AACF,SAAO,WACJ,YAAY,EAAE,SAAS;GAAE,MAAM,YAAY;GAAO,MAAM,EAAE;GAAE,EAAE,CAAC,CAC/D,QAAyC,KAAK,QAAQ;GACrD,MAAM,OAAO,IAAI,MAAM,KAAK;AAC5B,UAAO,SAAS,KAAA,IAAY,MAAM,CAAC,GAAG,KAAK;IAAE,IAAI,IAAI;IAAI,MAAM,IAAI;IAAM;IAAM,CAAC;KAC/E,EAAE,CAAC;WACA;AACR,aAAW,SAAS;;;;AAKxB,SAAgB,wBACd,SACA,iBACiC;CAEjC,MAAM,oBAAoC,EAAE;CAC5C,MAAM,oBAAoC,EAAE;AAC5C,MAAK,MAAM,UAAU,QACnB,KAAI,cAAc,OAAO,KAAK,CAC5B,mBAAkB,KAAK,OAAO;KAE9B,mBAAkB,KAAK,OAAO;CAKlC,MAAM,gBAA0B,EAAE;AAClC,MAAK,MAAM,UAAU,kBACnB,MAAK,MAAM,QAAQ,OAAO,KAAK,UAAU;EACvC,MAAM,SAAS,UAAU,KAAK;AAC9B,MAAI,CAAC,cAAc,MAAM,OAAO,YAAY,IAAI,OAAO,CAAC,CACtD,eAAc,KAAK,OAAO;;AAMhC,MAAK,MAAM,eAAe,mBAAmB;EAC3C,MAAM,cAAc,UAAU,YAAY,KAAK,SAAS,GAAG;EAC3D,MAAM,aAAa,cAAc,WAAW,WAAW,YAAY,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,GACjB,eAAc,OAAO,YAAY,EAAE;;CAKvC,MAAM,SACJ,IACA,QACA,kBACc;EACd,IAAI,MAAM,GAAG,UAAU;AACvB,MAAI,OACF,MAAK,MAAM,KAAK,QAAQ;AACtB,UAAO;AACP,UAAO,OAAO;;AAGlB,MAAI,cACF,MAAK,MAAM,KAAK,eAAe;AAC7B,UAAO;AACP,UAAO,cAAc;;AAGzB,SAAO;;CAIT,MAAM,eAAuC,EAAE;AAC/C,MAAK,MAAM,eAAe,iBAAiB;EACzC,MAAM,YAAY,YAAY,KAAK,SAAS;EAC5C,MAAM,cAAc,UAAU,UAAU;EACxC,MAAM,aAAa,cAAc,WAAW,WAAW,YAAY,QAAQ,YAAY,CAAC;AACxF,MAAI,eAAe,IAAI;GACrB,MAAM,SAAS,cAAc;AAM7B,OAJE,OAAO,KAAK,OAAO,UAAU,EAAE,CAAC,CAAC,SAAS,OAAO,KAAK,OAAO,iBAAiB,EAAE,CAAC,CAAC,SAElF,OAAO,KAAK,UAAU,UAAU,EAAE,CAAC,CAAC,SACpC,OAAO,KAAK,UAAU,iBAAiB,EAAE,CAAC,CAAC,OAE3C,cAAa,KAAK;IAChB,IAAI,MAAM,YAAY,IAAI,OAAO,QAAQ,OAAO,cAAc;IAC9D,MAAM;KACJ,GAAG,YAAY;KACf,UAAU,CAAC;MAAE,GAAG;MAAQ,aAAa,UAAU;MAAa,CAAC;KAC9D;IACD,MAAM,YAAY;IACnB,CAAC;OAEF,cAAa,KAAK,YAAY;AAEhC,iBAAc,OAAO,YAAY,EAAE;;;AAGvC,QAAO"}

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

@@ -38,7 +38,8 @@ function migrateV4toV5(state) {
 			sourceId: entry.sourceId,
 			gridState: entry.gridState,
 			sheetsState: entry.sheetsState,
-			filtersState
+			filtersState,
+			defaultFiltersState: null
 		};
 	});
 	const oldSourceId = state.pTableParams.sourceId;
@@ -48,8 +49,12 @@ function migrateV4toV5(state) {
 		stateCache: migratedCache,
 		pTableParams: currentCache && oldSourceId ? {
 			sourceId: oldSourceId,
-			hiddenColIds: state.pTableParams.hiddenColIds,
+			hiddenColIds: state.pTableParams.hiddenColIds?.map((id) => ({
+				type: "column",
+				id
+			})) ?? null,
 			filters: require_distill.distillFilterSpec(currentCache.filtersState),
+			defaultFilters: null,
 			sorting: state.pTableParams.sorting
 		} : createDefaultPTableParams()
 	};
@@ -185,6 +190,7 @@ function createDefaultPTableParams() {
 		sourceId: null,
 		hiddenColIds: null,
 		filters: null,
+		defaultFilters: null,
 		sorting: []
 	};
 }

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

@@ -1 +1 @@
-{"version":3,"file":"state-migration.cjs","names":["distillFilterSpec"],"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 \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV5\";\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[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(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: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\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"],"mappings":"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"}
+{"version":3,"file":"state-migration.cjs","names":["distillFilterSpec"],"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 \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV5\";\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[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(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      defaultFiltersState: null,\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:\n              state.pTableParams.hiddenColIds?.map((id) => ({ type: \"column\" as const, id })) ??\n              null,\n            filters: distillFilterSpec(currentCache.filtersState),\n            defaultFilters: null,\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: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\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    defaultFilters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}

package/dist/components/PlDataTable/state-migration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-migration.d.ts","names":[],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"mappings":";;;;;;;AAwBA;KAAY,kBAAA;EAIN,SAAA;IACE,WAAA;MACE,aAAA,EAAe,iBAAA,CAAkB,gBAAA;IAAA;IAEnC,IAAA;MACE,SAAA;QACE,KAAA,EAAO,iBAAA,CAAkB,gBAAA;QACzB,IAAA;MAAA;IAAA;IAGJ,gBAAA;MACE,YAAA,EAAc,iBAAA,CAAkB,gBAAA;IAAA;IAElC,QAAA;IACA,MAAA,GAAS,MAAA,CAAO,iBAAA,CAAkB,MAAA;EAAA;EAEpC,YAAA;IACE,OAAA,GAAU,aAAA;IACV,OAAA,GAAU,kBAAA;EAAA;AAAA;EAIZ,OAAA;EACA,UAAA;IACE,QAAA;IACA,SAAA;MACE,WAAA;QACE,aAAA,EAAe,iBAAA,CAAkB,gBAAA;MAAA;MAEnC,IAAA;QACE,SAAA;UACE,KAAA,EAAO,iBAAA,CAAkB,gBAAA;UACzB,IAAA;QAAA;MAAA;MAGJ,gBAAA;QACE,YAAA,EAAc,iBAAA,CAAkB,gBAAA;MAAA;IAAA;IAGpC,WAAA,EAAa,qBAAA;EAAA;EAEf,YAAA;IACE,YAAA,EAAc,SAAA;IACd,OAAA,EAAS,kBAAA;IACT,OAAA,EAAS,aAAA;EAAA;AAAA;EAIX,OAAA;EACA,UAAA;IACE,QAAA;IACA,SAAA;MACE,WAAA;QACE,aAAA,EAAe,iBAAA,CAAkB,gBAAA;MAAA;MAEnC,IAAA;QACE,SAAA;UACE,KAAA,EAAO,iBAAA,CAAkB,gBAAA;UACzB,IAAA;QAAA;MAAA;MAGJ,gBAAA;QACE,YAAA,EAAc,iBAAA,CAAkB,gBAAA;MAAA;IAAA;IAGpC,WAAA,EAAa,qBAAA;IACb,YAAA,EAAc,sBAAA;EAAA;EAEhB,YAAA,EAAc,cAAA;AAAA;EAGd,OAAA;EACA,UAAA;IACE,QAAA;IACA,SAAA,EAAW,wBAAA;IACX,WAAA,EAAa,qBAAA;IACb,YAAA,EAAc,sBAAA;EAAA,KA7CD;EAgDf,YAAA;IACE,QAAA;IACA,YAAA,EAAc,SAAA;IACd,OAAA,EAAS,aAAA;EAAA;AAAA,IAIb,4BAAA;;iBAGY,yBAAA,CACd,KAAA,EAAO,kBAAA,eACN,4BAAA;AAAA,iBAsJa,yBAAA,CAAA,GAA6B,cAAA;AAAA,iBAS7B,wBAAA,CAAA,GAA4B,4BAAA"}
+{"version":3,"file":"state-migration.d.ts","names":[],"sources":["../../../src/components/PlDataTable/state-migration.ts"],"mappings":";;;;;;;AAwBA;KAAY,kBAAA;EAIN,SAAA;IACE,WAAA;MACE,aAAA,EAAe,iBAAA,CAAkB,gBAAA;IAAA;IAEnC,IAAA;MACE,SAAA;QACE,KAAA,EAAO,iBAAA,CAAkB,gBAAA;QACzB,IAAA;MAAA;IAAA;IAGJ,gBAAA;MACE,YAAA,EAAc,iBAAA,CAAkB,gBAAA;IAAA;IAElC,QAAA;IACA,MAAA,GAAS,MAAA,CAAO,iBAAA,CAAkB,MAAA;EAAA;EAEpC,YAAA;IACE,OAAA,GAAU,aAAA;IACV,OAAA,GAAU,kBAAA;EAAA;AAAA;EAIZ,OAAA;EACA,UAAA;IACE,QAAA;IACA,SAAA;MACE,WAAA;QACE,aAAA,EAAe,iBAAA,CAAkB,gBAAA;MAAA;MAEnC,IAAA;QACE,SAAA;UACE,KAAA,EAAO,iBAAA,CAAkB,gBAAA;UACzB,IAAA;QAAA;MAAA;MAGJ,gBAAA;QACE,YAAA,EAAc,iBAAA,CAAkB,gBAAA;MAAA;IAAA;IAGpC,WAAA,EAAa,qBAAA;EAAA;EAEf,YAAA;IACE,YAAA,EAAc,SAAA;IACd,OAAA,EAAS,kBAAA;IACT,OAAA,EAAS,aAAA;EAAA;AAAA;EAIX,OAAA;EACA,UAAA;IACE,QAAA;IACA,SAAA;MACE,WAAA;QACE,aAAA,EAAe,iBAAA,CAAkB,gBAAA;MAAA;MAEnC,IAAA;QACE,SAAA;UACE,KAAA,EAAO,iBAAA,CAAkB,gBAAA;UACzB,IAAA;QAAA;MAAA;MAGJ,gBAAA;QACE,YAAA,EAAc,iBAAA,CAAkB,gBAAA;MAAA;IAAA;IAGpC,WAAA,EAAa,qBAAA;IACb,YAAA,EAAc,sBAAA;EAAA;EAEhB,YAAA,EAAc,cAAA;AAAA;EAGd,OAAA;EACA,UAAA;IACE,QAAA;IACA,SAAA,EAAW,wBAAA;IACX,WAAA,EAAa,qBAAA;IACb,YAAA,EAAc,sBAAA;EAAA,KA7CD;EAgDf,YAAA;IACE,QAAA;IACA,YAAA,EAAc,SAAA;IACd,OAAA,EAAS,aAAA;EAAA;AAAA,IAIb,4BAAA;;iBAGY,yBAAA,CACd,KAAA,EAAO,kBAAA,eACN,4BAAA;AAAA,iBA0Ja,yBAAA,CAAA,GAA6B,cAAA;AAAA,iBAU7B,wBAAA,CAAA,GAA4B,4BAAA"}

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

@@ -37,7 +37,8 @@ function migrateV4toV5(state) {
 			sourceId: entry.sourceId,
 			gridState: entry.gridState,
 			sheetsState: entry.sheetsState,
-			filtersState
+			filtersState,
+			defaultFiltersState: null
 		};
 	});
 	const oldSourceId = state.pTableParams.sourceId;
@@ -47,8 +48,12 @@ function migrateV4toV5(state) {
 		stateCache: migratedCache,
 		pTableParams: currentCache && oldSourceId ? {
 			sourceId: oldSourceId,
-			hiddenColIds: state.pTableParams.hiddenColIds,
+			hiddenColIds: state.pTableParams.hiddenColIds?.map((id) => ({
+				type: "column",
+				id
+			})) ?? null,
 			filters: distillFilterSpec(currentCache.filtersState),
+			defaultFilters: null,
 			sorting: state.pTableParams.sorting
 		} : createDefaultPTableParams()
 	};
@@ -184,6 +189,7 @@ function createDefaultPTableParams() {
 		sourceId: null,
 		hiddenColIds: null,
 		filters: null,
+		defaultFilters: null,
 		sorting: []
 	};
 }

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

@@ -1 +1 @@
-{"version":3,"file":"state-migration.js","names":[],"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 \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV5\";\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[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(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: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\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"],"mappings":"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"}
+{"version":3,"file":"state-migration.js","names":[],"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 \"./typesV4\";\nimport type {\n  PlDataTableFiltersWithMeta,\n  PlDataTableGridStateCore,\n  PlDataTableSheetState,\n  PlDataTableStateV2CacheEntry,\n  PlDataTableStateV2Normalized,\n  PTableParamsV2,\n} from \"./typesV5\";\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[\"filters\"] = [];\n    for (const f of entry.filtersState) {\n      if (f.filter !== null && !f.filter.disabled) {\n        const column = canonicalizeJson(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      defaultFiltersState: null,\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:\n              state.pTableParams.hiddenColIds?.map((id) => ({ type: \"column\" as const, id })) ??\n              null,\n            filters: distillFilterSpec(currentCache.filtersState),\n            defaultFilters: null,\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: CanonicalizedJson<PTableColumnId>,\n  filter: PlTableFilter,\n  nextId: () => number,\n): PlDataTableFiltersWithMeta[\"filters\"][number] {\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    defaultFilters: null,\n    sorting: [],\n  };\n}\n\nexport function createPlDataTableStateV2(): PlDataTableStateV2Normalized {\n  return {\n    version: 5,\n    stateCache: [],\n    pTableParams: createDefaultPTableParams(),\n  };\n}\n"],"mappings":"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"}

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

@@ -1,5 +1,6 @@
 import { FilterSpecLeaf as FilterSpecLeaf$1 } from "../../filters/types.js";
-import { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PColumnIdAndSpec, PFrameHandle, PObjectId, PTableColumnId, PTableColumnSpec, PTableHandle, PTableSorting, RootFilterSpec } from "@milaboratories/pl-model-common";
+import { AxisId, AxisSpec, CanonicalizedJson, ListOptionBase, PColumnIdAndSpec, PFrameHandle, PTableColumnId, PTableColumnSpec, PTableHandle, PTableSorting, RootFilterSpec } from "@milaboratories/pl-model-common";
+import { Nil } from "@milaboratories/helpers";
 
 //#region src/components/PlDataTable/typesV5.d.ts
 type PlTableColumnId = {
@@ -31,29 +32,35 @@ type PlDataTableSheetState = {
   value: string | number;
 };
 /** Tree-based filter state compatible with PlAdvancedFilter's RootFilter */
-type PlDataTableFilters = RootFilterSpec<FilterSpecLeaf$1<CanonicalizedJson<PTableColumnId>>>;
-type PlDataTableFiltersWithMeta = RootFilterSpec<FilterSpecLeaf$1<CanonicalizedJson<PTableColumnId>>, {
+type PlDataTableFilterMeta = {
   id: number;
-  isExpanded?: boolean;
   source?: "table-filter" | "table-search";
-}>;
+  isExpanded?: boolean;
+  isSuppressed?: boolean;
+};
+type PlDataTableFilterSpecLeaf = FilterSpecLeaf$1<CanonicalizedJson<PTableColumnId>>;
+type PlDataTableFilters = RootFilterSpec<PlDataTableFilterSpecLeaf>;
+type PlDataTableFiltersWithMeta = RootFilterSpec<PlDataTableFilterSpecLeaf, PlDataTableFilterMeta>;
 type PlDataTableStateV2CacheEntry = {
   /** DataSource identifier for state management */sourceId: string; /** Internal ag-grid state */
   gridState: PlDataTableGridStateCore; /** Sheets state */
-  sheetsState: PlDataTableSheetState[]; /** Filters state (tree-based, compatible with PlAdvancedFilter) */
-  filtersState: null | PlDataTableFiltersWithMeta; /** Fast search string */
+  sheetsState: PlDataTableSheetState[]; /** User filters state (tree-based, compatible with PlAdvancedFilter) */
+  filtersState: null | PlDataTableFiltersWithMeta; /** Default filters state from model (snapshot of defaults) */
+  defaultFiltersState: null | PlDataTableFiltersWithMeta; /** Fast search string */
   searchString?: string;
 };
 type PTableParamsV2 = {
   sourceId: null;
   hiddenColIds: null;
-  filters: null;
   sorting: [];
+  filters: null;
+  defaultFilters: null;
 } | {
   sourceId: string;
-  hiddenColIds: null | PObjectId[];
-  filters: null | PlDataTableFilters;
+  hiddenColIds: null | PTableColumnId[];
   sorting: PTableSorting[];
+  filters: null | PlDataTableFilters;
+  defaultFilters: null | PlDataTableFilters;
 };
 type PlDataTableStateV2Normalized = {
   /** Version for upgrades */version: 5; /** Internal states, LRU cache for 5 sourceId-s */
@@ -62,10 +69,11 @@ type PlDataTableStateV2Normalized = {
 };
 /** PlAgDataTable model */
 type PlDataTableModel = {
-  /** DataSource identifier for state management */sourceId: string | null; /** p-table including all columns, used to show the full specification of the table */
-  fullTableHandle: PTableHandle; /** p-frame handle */
-  fullPframeHandle: PFrameHandle; /** p-table including only visible columns, used to get the data */
-  visibleTableHandle: PTableHandle;
+  /** DataSource identifier for state management */sourceId: null | string; /** p-table including all columns, used to show the full specification of the table */
+  fullTableHandle?: PTableHandle; /** p-frame handle */
+  fullPframeHandle?: PFrameHandle; /** p-table including only visible columns, used to get the data */
+  visibleTableHandle?: PTableHandle; /** Default filters from model options, surfaced for UI display */
+  defaultFilters?: Nil | PlDataTableFilters;
 };
 type CreatePlDataTableOps = {
   /** Filters for columns and non-partitioned axes */filters?: PlDataTableFilters; /** Sorting to columns hidden from user */
@@ -90,5 +98,5 @@ type CreatePlDataTableOps = {
   coreJoinType?: "inner" | "full";
 };
 //#endregion
-export { CreatePlDataTableOps, PTableParamsV2, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson };
+export { CreatePlDataTableOps, PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson };
 //# sourceMappingURL=typesV5.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"typesV5.d.ts","names":[],"sources":["../../../src/components/PlDataTable/typesV5.ts"],"mappings":";;;;KAgBY,eAAA;6BAEV,MAAA,EAAQ,gBAAA,EAFE;EAIV,OAAA,EAAS,gBAAA;AAAA;AAAA,KAGC,mBAAA,GAAsB,iBAAA,CAAkB,eAAA;AAAA,KAExC,wBAAA;EAPF,+BASR,WAAA;IAPS,0BASP,aAAA,EAAe,mBAAA;EAAA,GANP;EASV,IAAA;IATkD,6CAWhD,SAAA;MAX+D,sCAa7D,KAAA,EAAO,mBAAA,EAXuB;MAa9B,IAAA;IAAA;EAAA,GAMY;EAFhB,gBAAA;IAEmC,mCAAjC,YAAA,EAAc,mBAAA;EAAA;AAAA;AAAA,KAIN,gBAAA;EAdR,8BAgBF,IAAA,EAAM,QAAA,EAdK;EAgBX,OAAA,EAAS,cAAA,qBAVT;EAYA,YAAA;AAAA;AAAA,KAGU,qBAAA;EAbyB,qBAenC,MAAA,EAAQ,MAAA,EAXkB;EAa1B,KAAA;AAAA;;KAIU,kBAAA,GAAqB,cAAA,CAAe,gBAAA,CAAe,iBAAA,CAAkB,cAAA;AAAA,KACrE,0BAAA,GAA6B,cAAA,CACvC,gBAAA,CAAe,iBAAA,CAAkB,cAAA;EAC/B,EAAA;EAAY,UAAA;EAAsB,MAAA;AAAA;AAAA,KAG1B,4BAAA;EAdqB,iDAgB/B,QAAA,UAdc;EAgBd,SAAA,EAAW,wBAAA,EAhBH;EAkBR,WAAA,EAAa,qBAAA,IAhBR;EAkBL,YAAA,SAAqB,0BAAA,EAdX;EAgBV,YAAA;AAAA;AAAA,KAGU,cAAA;EAEN,QAAA;EACA,YAAA;EACA,OAAA;EACA,OAAA;AAAA;EAGA,QAAA;EACA,YAAA,SAAqB,SAAA;EACrB,OAAA,SAAgB,kBAAA;EAChB,OAAA,EAAS,aAAA;AAAA;AAAA,KAGH,4BAAA;EAhCA,2BAkCV,OAAA;EAEA,UAAA,EAAY,4BAAA,IAnCG;EAqCf,YAAA,EAAc,cAAA;AAAA;;KAIJ,gBAAA;EA1C6B,iDA4CvC,QAAA,iBA3Ce;EA6Cf,eAAA,EAAiB,YAAA,EA5Cf;EA8CF,gBAAA,EAAkB,YAAA,EA9CkB;EAgDpC,kBAAA,EAAoB,YAAA;AAAA;AAAA,KAGV,oBAAA;EAhD4B,mDAkDtC,OAAA,GAAU,kBAAA,EA9CC;EAiDX,OAAA,GAAU,aAAA;EA7CW;;;;;EAoDrB,mBAAA,IAAuB,IAAA,EAAM,gBAAA;EAtD7B;;;;;;;AAOF;;;;EA4DE,YAAA;AAAA"}
+{"version":3,"file":"typesV5.d.ts","names":[],"sources":["../../../src/components/PlDataTable/typesV5.ts"],"mappings":";;;;;KAgBY,eAAA;6BAEV,MAAA,EAAQ,gBAAA,EAFE;EAIV,OAAA,EAAS,gBAAA;AAAA;AAAA,KAGC,mBAAA,GAAsB,iBAAA,CAAkB,eAAA;AAAA,KAExC,wBAAA;EAPF,+BASR,WAAA;IAPS,0BASP,aAAA,EAAe,mBAAA;EAAA,GANP;EASV,IAAA;IATkD,6CAWhD,SAAA;MAX+D,sCAa7D,KAAA,EAAO,mBAAA,EAXuB;MAa9B,IAAA;IAAA;EAAA,GAMY;EAFhB,gBAAA;IAEmC,mCAAjC,YAAA,EAAc,mBAAA;EAAA;AAAA;AAAA,KAIN,gBAAA;EAdR,8BAgBF,IAAA,EAAM,QAAA,EAdK;EAgBX,OAAA,EAAS,cAAA,qBAVT;EAYA,YAAA;AAAA;AAAA,KAGU,qBAAA;EAbyB,qBAenC,MAAA,EAAQ,MAAA,EAXkB;EAa1B,KAAA;AAAA;;KAIU,qBAAA;EACV,EAAA;EACA,MAAA;EACA,UAAA;EACA,YAAA;AAAA;AAAA,KAEU,yBAAA,GAA4B,gBAAA,CAAe,iBAAA,CAAkB,cAAA;AAAA,KAC7D,kBAAA,GAAqB,cAAA,CAAe,yBAAA;AAAA,KACpC,0BAAA,GAA6B,cAAA,CACvC,yBAAA,EACA,qBAAA;AAAA,KAGU,4BAAA;EAnBV,iDAqBA,QAAA,UAnBA;EAqBA,SAAA,EAAW,wBAAA,EArBN;EAuBL,WAAA,EAAa,qBAAA,IAnBkB;EAqB/B,YAAA,SAAqB,0BAAA,EArBU;EAuB/B,mBAAA,SAA4B,0BAAA,EArB5B;EAuBA,YAAA;AAAA;AAAA,KAGU,cAAA;EAEN,QAAA;EACA,YAAA;EACA,OAAA;EACA,OAAA;EACA,cAAA;AAAA;EAGA,QAAA;EACA,YAAA,SAAqB,cAAA;EACrB,OAAA,EAAS,aAAA;EACT,OAAA,SAAgB,kBAAA;EAChB,cAAA,SAAuB,kBAAA;AAAA;AAAA,KAGjB,4BAAA;EAtC2E,2BAwCrF,OAAA,KAvC4B;EAyC5B,UAAA,EAAY,4BAAA,IAzCmB;EA2C/B,YAAA,EAAc,cAAA;AAAA;;KAIJ,gBAAA;EA7CV,iDA+CA,QAAA,iBAhDuC;EAkDvC,eAAA,GAAkB,YAAA,EAlDmC;EAoDrD,gBAAA,GAAmB,YAAA,EAnDnB;EAqDA,kBAAA,GAAqB,YAAA,EApDA;EAsDrB,cAAA,GAAiB,GAAA,GAAM,kBAAA;AAAA;AAAA,KAGb,oBAAA;qDAEV,OAAA,GAAU,kBAAA,EAlDG;EAqDb,OAAA,GAAU,aAAA;EAjDkB;;;;;EAwD5B,mBAAA,IAAuB,IAAA,EAAM,gBAAA;EA5D7B;;;;;;;;;AASF;;EAgEE,YAAA;AAAA"}

package/dist/components/index.cjs

@@ -3,8 +3,10 @@ require("./PFrameForGraphs.cjs");
 require("./PlAnnotations/filters_ui.cjs");
 require("./PlDataTable/state-migration.cjs");
 require("./PlDataTable/createPlDataTableSheet.cjs");
-require("./PlDataTable/createPlDataTable/createPlDataTableV3.cjs");
+require("./PlDataTable/createPlDataTable/utils.cjs");
 require("./PlDataTable/createPlDataTable/createPlDataTableV2.cjs");
+require("./PlDataTable/createPlDataTable/discoverColumns.cjs");
+require("./PlDataTable/createPlDataTable/createPlDataTableV3.cjs");
 require("./PlDataTable/createPlDataTable/index.cjs");
 require("./PlDataTable/index.cjs");
 require("./PlMultiSequenceAlignment.cjs");

package/dist/components/index.d.ts

@@ -2,11 +2,13 @@ import { AxesVault, enrichCompatible, getAvailableWithLinkersAxes } from "../pfr
 import { createPFrameForGraphs, isHiddenFromGraphColumn, isHiddenFromUIColumn } from "./PFrameForGraphs.js";
 import { AndFilter, AnnotationFilter, AnnotationMode, AnnotationScript, AnnotationScript2, AnnotationStep, IsNA, Log10, NotFilter, NumericalComparisonFilter, OrFilter, PatternFilter, PatternPredicate, PatternPredicateContainSubsequence, PatternPredicateEquals, SortedCumulativeSum, TransformedColumn, ValueRank } from "./PlAnnotations/filter.js";
 import { AnnotationScriptUi, AnnotationStepUi, AnyForm, FilterUi, FilterUiOfType, FilterUiType, FormField, TypeField, TypeFieldRecord, TypeForm, TypeToLiteral, compileAnnotationScript, compileFilter, compileFilters, unreachable } from "./PlAnnotations/filters_ui.js";
-import { PTableParamsV2, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson } from "./PlDataTable/typesV5.js";
+import { PTableParamsV2, PlDataTableFilterMeta, PlDataTableFilterSpecLeaf, PlDataTableFilters, PlDataTableFiltersWithMeta, PlDataTableGridStateCore, PlDataTableModel, PlDataTableSheet, PlDataTableSheetState, PlDataTableStateV2CacheEntry, PlDataTableStateV2Normalized, PlTableColumnId, PlTableColumnIdJson } from "./PlDataTable/typesV5.js";
 import { PlDataTableStateV2, createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from "./PlDataTable/state-migration.js";
 import { createPlDataTableSheet } from "./PlDataTable/createPlDataTableSheet.js";
 import { createPlDataTableV2 } from "./PlDataTable/createPlDataTable/createPlDataTableV2.js";
-import { createPlDataTableV3, isColumnHidden, isColumnOptional } from "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
+import { discoverTableColumnSnaphots } from "./PlDataTable/createPlDataTable/discoverColumns.js";
+import { ColumnMatcher, ColumnOrderRule, ColumnVisibilityRule, ColumnsDisplayOptions, ColumnsSelectorConfig, createPlDataTableOptionsV3, createPlDataTableV3 } from "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
 import { createPlDataTable } from "./PlDataTable/createPlDataTable/index.js";
+import { getEffectiveVisibility, getOrderPriority, isColumnHidden, isColumnOptional } from "./PlDataTable/createPlDataTable/utils.js";
 import { PTableKey, PlSelectionModel, createPlSelectionModel } from "./PlSelectionModel.js";
 import { PColumnPredicate, PlMultiSequenceAlignmentColorSchemeOption, PlMultiSequenceAlignmentModel, PlMultiSequenceAlignmentSettings, PlMultiSequenceAlignmentWidget, createRowSelectionColumn } from "./PlMultiSequenceAlignment.js";

package/dist/components/index.js

@@ -3,8 +3,10 @@ import "./PFrameForGraphs.js";
 import "./PlAnnotations/filters_ui.js";
 import "./PlDataTable/state-migration.js";
 import "./PlDataTable/createPlDataTableSheet.js";
-import "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
+import "./PlDataTable/createPlDataTable/utils.js";
 import "./PlDataTable/createPlDataTable/createPlDataTableV2.js";
+import "./PlDataTable/createPlDataTable/discoverColumns.js";
+import "./PlDataTable/createPlDataTable/createPlDataTableV3.js";
 import "./PlDataTable/createPlDataTable/index.js";
 import "./PlDataTable/index.js";
 import "./PlMultiSequenceAlignment.js";

package/dist/index.cjs

@@ -39,15 +39,17 @@ const require_column_snapshot_provider = require("./columns/column_snapshot_prov
 const require_column_selector = require("./columns/column_selector.cjs");
 const require_column_collection_builder = require("./columns/column_collection_builder.cjs");
 const require_ctx_column_sources = require("./columns/ctx_column_sources.cjs");
+const require_expand_by_partition = require("./columns/expand_by_partition.cjs");
 require("./columns/index.cjs");
-const require_createPlDataTableV3 = require("./components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs");
+const require_utils = require("./components/PlDataTable/createPlDataTable/utils.cjs");
 const require_createPlDataTableV2 = require("./components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs");
+const require_discoverColumns = require("./components/PlDataTable/createPlDataTable/discoverColumns.cjs");
+const require_createPlDataTableV3 = require("./components/PlDataTable/createPlDataTable/createPlDataTableV3.cjs");
 const require_index$5 = require("./components/PlDataTable/createPlDataTable/index.cjs");
 const require_PlMultiSequenceAlignment = require("./components/PlMultiSequenceAlignment.cjs");
 const require_PlSelectionModel = require("./components/PlSelectionModel.cjs");
 require("./components/index.cjs");
 const require_pframe = require("./pframe.cjs");
-const require_write_labels_to_specs = require("./labels/write_labels_to_specs.cjs");
 require("./labels/index.cjs");
 const require_ref_util = require("./ref_util.cjs");
 const require_raw_globals = require("./raw_globals.cjs");
@@ -110,14 +112,16 @@ exports.and = require_actions.and;
 exports.blockServiceNames = require_block_services.blockServiceNames;
 exports.buildServices = require_service_bridge.buildServices;
 exports.collectCtxColumnSnapshotProviders = require_ctx_column_sources.collectCtxColumnSnapshotProviders;
-exports.columnSelectorsToPredicate = require_column_selector.columnSelectorsToPredicate;
 exports.compileAnnotationScript = require_filters_ui.compileAnnotationScript;
 exports.compileFilter = require_filters_ui.compileFilter;
 exports.compileFilters = require_filters_ui.compileFilters;
+exports.convertColumnSelectorToMultiColumnSelector = require_column_selector.convertColumnSelectorToMultiColumnSelector;
 exports.convertFilterSpecsToExpressionSpecs = require_converter.convertFilterSpecsToExpressionSpecs;
 exports.convertFilterUiToExpressionImpl = require_filterUiToExpressionImpl.convertFilterUiToExpressionImpl;
 exports.convertFilterUiToExpressions = require_filterUiToExpressionImpl.convertFilterUiToExpressions;
 exports.convertOrParsePColumnData = require_pcolumn_data.convertOrParsePColumnData;
+exports.convertRelaxedAxisSelectorToMultiAxisSelector = require_column_selector.convertRelaxedAxisSelectorToMultiAxisSelector;
+exports.convertRelaxedColumnSelectorToMultiColumnSelector = require_column_selector.convertRelaxedColumnSelectorToMultiColumnSelector;
 exports.createBlockStorage = require_block_storage.createBlockStorage;
 exports.createColumnSnapshot = require_column_snapshot.createColumnSnapshot;
 exports.createDefaultPTableParams = require_state_migration.createDefaultPTableParams;
@@ -134,9 +138,11 @@ exports.createRowSelectionColumn = require_PlMultiSequenceAlignment.createRowSel
 exports.deriveDataFromStorage = require_block_storage.deriveDataFromStorage;
 exports.deriveDistinctLabels = require_derive_distinct_labels.deriveDistinctLabels;
 exports.deriveLabels = require_label.deriveLabels;
+exports.discoverTableColumnSnaphots = require_discoverColumns.discoverTableColumnSnaphots;
 exports.distillFilterSpec = require_distill.distillFilterSpec;
 exports.downgradeCfgOrLambda = require_normalization.downgradeCfgOrLambda;
 exports.enrichCompatible = require_axes.enrichCompatible;
+exports.expandByPartition = require_expand_by_partition.expandByPartition;
 exports.extractArchiveAndGetURL = require_actions.extractArchiveAndGetURL;
 exports.extractConfig = require_normalization.extractConfig;
 exports.filterDataInfoEntries = require_axis_filtering.filterDataInfoEntries;
@@ -155,6 +161,7 @@ exports.getColumnSpecById = require_index$9.getColumnSpecById;
 exports.getColumnUniqueValues = require_index$9.getColumnUniqueValues;
 exports.getColumnsFull = require_index$9.getColumnsFull;
 exports.getDownloadedBlobContent = require_actions.getDownloadedBlobContent;
+exports.getEffectiveVisibility = require_utils.getEffectiveVisibility;
 exports.getEnvironmentValue = require_env_value.getEnvironmentValue;
 exports.getFromCfg = require_actions.getFromCfg;
 exports.getImmediate = require_actions.getImmediate;
@@ -163,6 +170,7 @@ exports.getJsonField = require_actions.getJsonField;
 exports.getLastLogs = require_actions.getLastLogs;
 exports.getLogHandle = require_actions.getLogHandle;
 exports.getOnDemandBlobContent = require_actions.getOnDemandBlobContent;
+exports.getOrderPriority = require_utils.getOrderPriority;
 exports.getPartitionKeysList = require_pcolumn_data.getPartitionKeysList;
 exports.getPlatformaApiVersion = require_raw_globals.getPlatformaApiVersion;
 exports.getPluginData = require_block_storage.getPluginData;
@@ -179,8 +187,8 @@ exports.getUniquePartitionKeys = require_pcolumn_data.getUniquePartitionKeys;
 exports.getUniqueSourceValuesWithLabels = require_index$9.getUniqueSourceValuesWithLabels;
 exports.ifDef = require_accessor.ifDef;
 exports.isBlockStorage = require_block_storage.isBlockStorage;
-exports.isColumnHidden = require_createPlDataTableV3.isColumnHidden;
-exports.isColumnOptional = require_createPlDataTableV3.isColumnOptional;
+exports.isColumnHidden = require_utils.isColumnHidden;
+exports.isColumnOptional = require_utils.isColumnOptional;
 exports.isColumnSnapshotProvider = require_column_snapshot_provider.isColumnSnapshotProvider;
 exports.isConfigLambda = require_types.isConfigLambda;
 exports.isEmpty = require_actions.isEmpty;
@@ -194,11 +202,8 @@ exports.makeObject = require_actions.makeObject;
 exports.mapArrayValues = require_actions.mapArrayValues;
 exports.mapRecordValues = require_actions.mapRecordValues;
 exports.mapResourceFields = require_actions.mapResourceFields;
-exports.matchColumn = require_column_selector.matchColumn;
-exports.matchColumnSelectors = require_column_selector.matchColumnSelectors;
 exports.migrateBlockStorage = require_block_storage.migrateBlockStorage;
 exports.normalizeBlockStorage = require_block_storage.normalizeBlockStorage;
-exports.normalizeSelectors = require_column_selector.normalizeSelectors;
 exports.not = require_actions.not;
 exports.or = require_actions.or;
 exports.parsePColumnData = require_pcolumn_data.parsePColumnData;
@@ -212,7 +217,6 @@ exports.unreachable = require_filters_ui.unreachable;
 exports.updateStorageData = require_block_storage.updateStorageData;
 exports.upgradePlDataTableStateV2 = require_state_migration.upgradePlDataTableStateV2;
 exports.wrapOutputs = require_block_state_util.wrapOutputs;
-exports.writeLabelsToSpecs = require_write_labels_to_specs.writeLabelsToSpecs;
 var _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 Object.keys(_milaboratories_pl_model_common).forEach(function(k) {
 	if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {