@platforma-sdk/model 1.79.27 → 1.80.2

package/dist/components/PFrameForGraphs.js.map

@@ -1 +1 @@
-{"version":3,"file":"PFrameForGraphs.js","names":[],"sources":["../../src/components/PFrameForGraphs.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PFrameHandle } from \"@milaboratories/pl-model-common\";\nimport { Annotation, readAnnotationJson } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, RenderCtxBase } from \"../render\";\nimport { getAllRelatedColumns, getRelatedColumns } from \"../pframe_utils/columns\";\nexport type { AxesVault } from \"../pframe_utils/axes\";\nexport { enrichCompatible, getAvailableWithLinkersAxes } from \"../pframe_utils/axes\";\n\nexport function isHiddenFromGraphColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);\n}\n\nexport function isHiddenFromUIColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromUi);\n}\n\n/**\n The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool\n (including linker columns and all label columns).\n Block’s columns are added to pframe as is.\n Other columns are added basing on set of axes of block’s columns, considering available with linker columns.\n Compatible columns must have at least one axis from block’s axes set. This axis of the compatible column from\n result pool must satisfy matchAxisId (it can have less domain keys than in block’s axis, but without conflicting values\n among existing ones).\n In requests to pframe (calculateTableData) columns must have strictly the same axes. For compatibility in case\n of partially matched axis we add to pframe a copy of this column with modified axis (with filled missed domains)\n and modified label (with added domain values in case if more than one copy with different domains exist).\n */\nexport function createPFrameForGraphs<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  blockColumns?: PColumn<PColumnDataUniversal>[],\n): PFrameHandle | undefined {\n  const suitableSpec = (spec: PColumnSpec) =>\n    !isHiddenFromUIColumn(spec) && !isHiddenFromGraphColumn(spec);\n  // if current block doesn't produce own columns then use all columns from result pool\n  if (!blockColumns) {\n    return ctx.createPFrame(getAllRelatedColumns(ctx, suitableSpec));\n  }\n\n  return ctx.createPFrame(\n    getRelatedColumns(ctx, { columns: blockColumns, predicate: suitableSpec }),\n  );\n}\n"],"mappings":";;;;AAOA,SAAgB,wBAAwB,QAA8B;CACpE,OAAO,CAAC,CAAC,mBAAmB,QAAQ,WAAW,kBAAkB;AACnE;AAEA,SAAgB,qBAAqB,QAA8B;CACjE,OAAO,CAAC,CAAC,mBAAmB,QAAQ,WAAW,cAAc;AAC/D;;;;;;;;;;;;;AAcA,SAAgB,sBACd,KACA,cAC0B;CAC1B,MAAM,gBAAgB,SACpB,CAAC,qBAAqB,IAAI,KAAK,CAAC,wBAAwB,IAAI;CAE9D,IAAI,CAAC,cACH,OAAO,IAAI,aAAa,qBAAqB,KAAK,YAAY,CAAC;CAGjE,OAAO,IAAI,aACT,kBAAkB,KAAK;EAAE,SAAS;EAAc,WAAW;CAAa,CAAC,CAC3E;AACF"}
+{"version":3,"file":"PFrameForGraphs.js","names":[],"sources":["../../src/components/PFrameForGraphs.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PFrameHandle } from \"@milaboratories/pl-model-common\";\nimport { Annotation, readAnnotationJson } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, RenderCtxBase } from \"../render\";\nimport { getAllRelatedColumns, getRelatedColumns } from \"../pframe_utils/columns\";\nexport type { AxesVault } from \"../pframe_utils/axes\";\nexport { enrichCompatible, getAvailableWithLinkersAxes } from \"../pframe_utils/axes\";\n\nexport function isHiddenFromGraphColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromGraphs);\n}\n\nexport function isHiddenFromUIColumn(column: PColumnSpec): boolean {\n  return !!readAnnotationJson(column, Annotation.HideDataFromUi);\n}\n\n/**\n The aim of createPFrameForGraphs: to create pframe with block’s columns and all compatible columns from result pool\n (including linker columns and all label columns).\n Block’s columns are added to pframe as is.\n Other columns are added basing on set of axes of block’s columns, considering available with linker columns.\n Compatible columns must have at least one axis from block’s axes set. This axis of the compatible column from\n result pool must satisfy matchAxisId (it can have less domain keys than in block’s axis, but without conflicting values\n among existing ones).\n In requests to pframe (calculateTableData) columns must have strictly the same axes. For compatibility in case\n of partially matched axis we add to pframe a copy of this column with modified axis (with filled missed domains)\n and modified label (with added domain values in case if more than one copy with different domains exist).\n */\nexport function createPFrameForGraphs<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  blockColumns?: PColumn<undefined | PColumnDataUniversal>[],\n): PFrameHandle | undefined {\n  if (blockColumns?.some((v) => v.data === undefined)) return undefined;\n\n  const suitableSpec = (spec: PColumnSpec) =>\n    !isHiddenFromUIColumn(spec) && !isHiddenFromGraphColumn(spec);\n  // if current block doesn't produce own columns then use all columns from result pool\n  if (!blockColumns) {\n    return ctx.createPFrame(getAllRelatedColumns(ctx, suitableSpec));\n  }\n\n  return ctx.createPFrame(\n    getRelatedColumns(ctx, { columns: blockColumns, predicate: suitableSpec }),\n  );\n}\n"],"mappings":";;;;AAOA,SAAgB,wBAAwB,QAA8B;CACpE,OAAO,CAAC,CAAC,mBAAmB,QAAQ,WAAW,kBAAkB;AACnE;AAEA,SAAgB,qBAAqB,QAA8B;CACjE,OAAO,CAAC,CAAC,mBAAmB,QAAQ,WAAW,cAAc;AAC/D;;;;;;;;;;;;;AAcA,SAAgB,sBACd,KACA,cAC0B;CAC1B,IAAI,cAAc,MAAM,MAAM,EAAE,SAAS,KAAA,CAAS,GAAG,OAAO,KAAA;CAE5D,MAAM,gBAAgB,SACpB,CAAC,qBAAqB,IAAI,KAAK,CAAC,wBAAwB,IAAI;CAE9D,IAAI,CAAC,cACH,OAAO,IAAI,aAAa,qBAAqB,KAAK,YAAY,CAAC;CAGjE,OAAO,IAAI,aACT,kBAAkB,KAAK;EAAE,SAAS;EAAc,WAAW;CAAa,CAAC,CAC3E;AACF"}

package/dist/components/PlDataTable/columnResolver.cjs

@@ -0,0 +1,28 @@
+let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
+//#region src/components/PlDataTable/columnResolver.ts
+function createColumnResolver(columns, deps) {
+	const axisIds = [];
+	for (const c of columns) for (const ax of c.getSpec().axesSpec) axisIds.push((0, _milaboratories_pl_model_common.getAxisId)(ax));
+	const byFullId = /* @__PURE__ */ new Map();
+	const byPObjectId = /* @__PURE__ */ new Map();
+	for (const c of columns) {
+		byFullId.set(c.id, c);
+		const pid = (0, _milaboratories_pl_model_common.extractPObjectId)(c.id);
+		const existing = byPObjectId.get(pid);
+		if (existing === void 0) byPObjectId.set(pid, c);
+		else if (existing.id !== c.id) deps?.warn?.(`Ambiguous PObjectId ${pid}: recipe ids ${existing.id} and ${c.id} both match — keeping first.`);
+	}
+	return (ref) => {
+		if (ref.type === "axis") return axisIds.some((a) => (0, _milaboratories_pl_model_common.matchAxisId)(ref.id, a)) ? ref : void 0;
+		const hit = byFullId.get(ref.id) ?? byPObjectId.get((0, _milaboratories_pl_model_common.extractPObjectId)(ref.id));
+		if (hit === void 0) return void 0;
+		return {
+			type: "column",
+			id: hit.id
+		};
+	};
+}
+//#endregion
+exports.createColumnResolver = createColumnResolver;
+
+//# sourceMappingURL=columnResolver.cjs.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"columnResolver.cjs","names":[],"sources":["../../../src/components/PlDataTable/columnResolver.ts"],"sourcesContent":["import type {\n  AxisId,\n  ColumnUniversalId,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdColumn,\n} from \"@milaboratories/pl-model-common\";\nimport { extractPObjectId, getAxisId, matchAxisId } from \"@milaboratories/pl-model-common\";\nimport type { ColumnRecipe } from \"../../columns\";\n\n/**\n * Resolves a user-supplied PTableColumnId against the discovered set of\n * columns and axes. For column refs, accepts either the full recipe id (rich\n * {@link ColumnUniversalId}) or the bare {@link PObjectId} and returns a ref\n * carrying the recipe's full id — the same id that appears as the leaf in the\n * emitted SpecQuery, so engine-side dedup is consistent with the resolver's\n * view. Axis refs are checked against the union of axes spanned by the\n * columns and pass through unchanged on hit.\n * Returns `undefined` when the reference cannot be matched.\n */\nexport type ColumnResolver = (ref: PTableColumnId) => PTableColumnId | undefined;\n\nexport function createColumnResolver(\n  columns: ColumnRecipe[],\n  deps?: { warn?: (msg: string) => void },\n): ColumnResolver {\n  const axisIds: AxisId[] = [];\n  for (const c of columns) {\n    for (const ax of c.getSpec().axesSpec) {\n      axisIds.push(getAxisId(ax));\n    }\n  }\n\n  const byFullId = new Map<ColumnUniversalId, ColumnRecipe>();\n  const byPObjectId = new Map<PObjectId, ColumnRecipe>();\n  for (const c of columns) {\n    byFullId.set(c.id, c);\n    const pid = extractPObjectId(c.id);\n    const existing = byPObjectId.get(pid);\n    if (existing === undefined) {\n      byPObjectId.set(pid, c);\n    } else if (existing.id !== c.id) {\n      deps?.warn?.(\n        `Ambiguous PObjectId ${pid}: recipe ids ${existing.id} and ${c.id} both match — keeping first.`,\n      );\n    }\n  }\n\n  return (ref: PTableColumnId): PTableColumnId | undefined => {\n    if (ref.type === \"axis\") {\n      return axisIds.some((a) => matchAxisId(ref.id, a)) ? ref : undefined;\n    }\n    const hit = byFullId.get(ref.id) ?? byPObjectId.get(extractPObjectId(ref.id));\n    if (hit === undefined) return undefined;\n    return { type: \"column\", id: hit.id } satisfies PTableColumnIdColumn;\n  };\n}\n"],"mappings":";;AAsBA,SAAgB,qBACd,SACA,MACgB;CAChB,MAAM,UAAoB,CAAC;CAC3B,KAAK,MAAM,KAAK,SACd,KAAK,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,UAC3B,QAAQ,MAAA,GAAA,gCAAA,UAAA,CAAe,EAAE,CAAC;CAI9B,MAAM,2BAAW,IAAI,IAAqC;CAC1D,MAAM,8BAAc,IAAI,IAA6B;CACrD,KAAK,MAAM,KAAK,SAAS;EACvB,SAAS,IAAI,EAAE,IAAI,CAAC;EACpB,MAAM,OAAA,GAAA,gCAAA,iBAAA,CAAuB,EAAE,EAAE;EACjC,MAAM,WAAW,YAAY,IAAI,GAAG;EACpC,IAAI,aAAa,KAAA,GACf,YAAY,IAAI,KAAK,CAAC;OACjB,IAAI,SAAS,OAAO,EAAE,IAC3B,MAAM,OACJ,uBAAuB,IAAI,eAAe,SAAS,GAAG,OAAO,EAAE,GAAG,6BACpE;CAEJ;CAEA,QAAQ,QAAoD;EAC1D,IAAI,IAAI,SAAS,QACf,OAAO,QAAQ,MAAM,OAAA,GAAA,gCAAA,YAAA,CAAkB,IAAI,IAAI,CAAC,CAAC,IAAI,MAAM,KAAA;EAE7D,MAAM,MAAM,SAAS,IAAI,IAAI,EAAE,KAAK,YAAY,KAAA,GAAA,gCAAA,iBAAA,CAAqB,IAAI,EAAE,CAAC;EAC5E,IAAI,QAAQ,KAAA,GAAW,OAAO,KAAA;EAC9B,OAAO;GAAE,MAAM;GAAU,IAAI,IAAI;EAAG;CACtC;AACF"}

package/dist/components/PlDataTable/columnResolver.js

@@ -0,0 +1,28 @@
+import { extractPObjectId, getAxisId, matchAxisId } from "@milaboratories/pl-model-common";
+//#region src/components/PlDataTable/columnResolver.ts
+function createColumnResolver(columns, deps) {
+	const axisIds = [];
+	for (const c of columns) for (const ax of c.getSpec().axesSpec) axisIds.push(getAxisId(ax));
+	const byFullId = /* @__PURE__ */ new Map();
+	const byPObjectId = /* @__PURE__ */ new Map();
+	for (const c of columns) {
+		byFullId.set(c.id, c);
+		const pid = extractPObjectId(c.id);
+		const existing = byPObjectId.get(pid);
+		if (existing === void 0) byPObjectId.set(pid, c);
+		else if (existing.id !== c.id) deps?.warn?.(`Ambiguous PObjectId ${pid}: recipe ids ${existing.id} and ${c.id} both match — keeping first.`);
+	}
+	return (ref) => {
+		if (ref.type === "axis") return axisIds.some((a) => matchAxisId(ref.id, a)) ? ref : void 0;
+		const hit = byFullId.get(ref.id) ?? byPObjectId.get(extractPObjectId(ref.id));
+		if (hit === void 0) return void 0;
+		return {
+			type: "column",
+			id: hit.id
+		};
+	};
+}
+//#endregion
+export { createColumnResolver };
+
+//# sourceMappingURL=columnResolver.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"columnResolver.js","names":[],"sources":["../../../src/components/PlDataTable/columnResolver.ts"],"sourcesContent":["import type {\n  AxisId,\n  ColumnUniversalId,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdColumn,\n} from \"@milaboratories/pl-model-common\";\nimport { extractPObjectId, getAxisId, matchAxisId } from \"@milaboratories/pl-model-common\";\nimport type { ColumnRecipe } from \"../../columns\";\n\n/**\n * Resolves a user-supplied PTableColumnId against the discovered set of\n * columns and axes. For column refs, accepts either the full recipe id (rich\n * {@link ColumnUniversalId}) or the bare {@link PObjectId} and returns a ref\n * carrying the recipe's full id — the same id that appears as the leaf in the\n * emitted SpecQuery, so engine-side dedup is consistent with the resolver's\n * view. Axis refs are checked against the union of axes spanned by the\n * columns and pass through unchanged on hit.\n * Returns `undefined` when the reference cannot be matched.\n */\nexport type ColumnResolver = (ref: PTableColumnId) => PTableColumnId | undefined;\n\nexport function createColumnResolver(\n  columns: ColumnRecipe[],\n  deps?: { warn?: (msg: string) => void },\n): ColumnResolver {\n  const axisIds: AxisId[] = [];\n  for (const c of columns) {\n    for (const ax of c.getSpec().axesSpec) {\n      axisIds.push(getAxisId(ax));\n    }\n  }\n\n  const byFullId = new Map<ColumnUniversalId, ColumnRecipe>();\n  const byPObjectId = new Map<PObjectId, ColumnRecipe>();\n  for (const c of columns) {\n    byFullId.set(c.id, c);\n    const pid = extractPObjectId(c.id);\n    const existing = byPObjectId.get(pid);\n    if (existing === undefined) {\n      byPObjectId.set(pid, c);\n    } else if (existing.id !== c.id) {\n      deps?.warn?.(\n        `Ambiguous PObjectId ${pid}: recipe ids ${existing.id} and ${c.id} both match — keeping first.`,\n      );\n    }\n  }\n\n  return (ref: PTableColumnId): PTableColumnId | undefined => {\n    if (ref.type === \"axis\") {\n      return axisIds.some((a) => matchAxisId(ref.id, a)) ? ref : undefined;\n    }\n    const hit = byFullId.get(ref.id) ?? byPObjectId.get(extractPObjectId(ref.id));\n    if (hit === undefined) return undefined;\n    return { type: \"column\", id: hit.id } satisfies PTableColumnIdColumn;\n  };\n}\n"],"mappings":";;AAsBA,SAAgB,qBACd,SACA,MACgB;CAChB,MAAM,UAAoB,CAAC;CAC3B,KAAK,MAAM,KAAK,SACd,KAAK,MAAM,MAAM,EAAE,QAAQ,CAAC,CAAC,UAC3B,QAAQ,KAAK,UAAU,EAAE,CAAC;CAI9B,MAAM,2BAAW,IAAI,IAAqC;CAC1D,MAAM,8BAAc,IAAI,IAA6B;CACrD,KAAK,MAAM,KAAK,SAAS;EACvB,SAAS,IAAI,EAAE,IAAI,CAAC;EACpB,MAAM,MAAM,iBAAiB,EAAE,EAAE;EACjC,MAAM,WAAW,YAAY,IAAI,GAAG;EACpC,IAAI,aAAa,KAAA,GACf,YAAY,IAAI,KAAK,CAAC;OACjB,IAAI,SAAS,OAAO,EAAE,IAC3B,MAAM,OACJ,uBAAuB,IAAI,eAAe,SAAS,GAAG,OAAO,EAAE,GAAG,6BACpE;CAEJ;CAEA,QAAQ,QAAoD;EAC1D,IAAI,IAAI,SAAS,QACf,OAAO,QAAQ,MAAM,MAAM,YAAY,IAAI,IAAI,CAAC,CAAC,IAAI,MAAM,KAAA;EAE7D,MAAM,MAAM,SAAS,IAAI,IAAI,EAAE,KAAK,YAAY,IAAI,iBAAiB,IAAI,EAAE,CAAC;EAC5E,IAAI,QAAQ,KAAA,GAAW,OAAO,KAAA;EAC9B,OAAO;GAAE,MAAM;GAAU,IAAI,IAAI;EAAG;CACtC;AACF"}

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV2.cjs

@@ -1,3 +1,5 @@
+const require_column_lazy = require("../../../columns/column_lazy.cjs");
+require("../../../columns/index.cjs");
 const require_createPTableDefV3 = require("./createPTableDefV3.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 let es_toolkit = require("es-toolkit");
@@ -12,8 +14,8 @@ function createPTableDefV2(params) {
 	}
 	secondaryColumns.push(...params.labelColumns);
 	return require_createPTableDefV3.createPTableDefV3({
-		primary: coreColumns.map((column) => ({ column })),
-		secondary: secondaryColumns.map((column) => ({ entries: [{ column }] })),
+		primary: coreColumns.map((column) => require_column_lazy.ColumnLazyImpl.fromColumn(column)),
+		secondary: secondaryColumns.map((column) => require_column_lazy.ColumnLazyImpl.fromColumn(column)),
 		primaryJoinType: params.coreJoinType,
 		filters: params.filters,
 		sorting: params.sorting

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createPTableDefV2.cjs","names":["createPTableDefV3"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV2.ts"],"sourcesContent":["import type {\n  PColumn,\n  PColumnIdAndSpec,\n  PTableSorting,\n  PTableDefV2,\n  DataInfo,\n  PColumnValues,\n} from \"@milaboratories/pl-model-common\";\nimport { getColumnIdAndSpec } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, TreeNodeAccessor } from \"../../../render\";\nimport { isFunction } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV7\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\n\nexport function createPTableDefV2(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  return createPTableDefV3({\n    primary: coreColumns.map((column) => ({ column })),\n    secondary: secondaryColumns.map((column) => ({ entries: [{ column }] })),\n    primaryJoinType: params.coreJoinType,\n    filters: params.filters,\n    sorting: params.sorting,\n  });\n}\n"],"mappings":";;;;AAcA,SAAgB,kBAAkB,QAOsD;CACtF,IAAI,cAAc,OAAO;CACzB,MAAM,mBAA0C,CAAC;CAEjD,KAAA,GAAA,WAAA,WAAA,CAAe,OAAO,mBAAmB,GAAG;EAC1C,cAAc,CAAC;EACf,KAAK,MAAM,KAAK,OAAO,SACrB,IAAI,OAAO,qBAAA,GAAA,gCAAA,mBAAA,CAAuC,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;OACpE,iBAAiB,KAAK,CAAC;CAChC;CAEA,iBAAiB,KAAK,GAAG,OAAO,YAAY;CAE5C,OAAOA,0BAAAA,kBAAkB;EACvB,SAAS,YAAY,KAAK,YAAY,EAAE,OAAO,EAAE;EACjD,WAAW,iBAAiB,KAAK,YAAY,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE;EACvE,iBAAiB,OAAO;EACxB,SAAS,OAAO;EAChB,SAAS,OAAO;CAClB,CAAC;AACH"}
+{"version":3,"file":"createPTableDefV2.cjs","names":["createPTableDefV3","ColumnLazyImpl"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV2.ts"],"sourcesContent":["import type {\n  ColumnUniversalId,\n  PColumn,\n  PColumnIdAndSpec,\n  PTableSorting,\n  PTableDefV2,\n} from \"@milaboratories/pl-model-common\";\nimport { getColumnIdAndSpec } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isFunction } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV8\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport { ColumnLazyImpl } from \"../../../columns\";\n\nexport function createPTableDefV2(params: {\n  columns: PColumn<undefined | PColumnDataUniversal>[];\n  labelColumns: PColumn<undefined | PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: null | PlDataTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<ColumnUniversalId> {\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  return createPTableDefV3({\n    primary: coreColumns.map((column) => ColumnLazyImpl.fromColumn(column)),\n    secondary: secondaryColumns.map((column) => ColumnLazyImpl.fromColumn(column)),\n    primaryJoinType: params.coreJoinType,\n    filters: params.filters,\n    sorting: params.sorting,\n  });\n}\n"],"mappings":";;;;;;AAcA,SAAgB,kBAAkB,QAOC;CACjC,IAAI,cAAc,OAAO;CACzB,MAAM,mBAA0C,CAAC;CAEjD,KAAA,GAAA,WAAA,WAAA,CAAe,OAAO,mBAAmB,GAAG;EAC1C,cAAc,CAAC;EACf,KAAK,MAAM,KAAK,OAAO,SACrB,IAAI,OAAO,qBAAA,GAAA,gCAAA,mBAAA,CAAuC,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;OACpE,iBAAiB,KAAK,CAAC;CAChC;CAEA,iBAAiB,KAAK,GAAG,OAAO,YAAY;CAE5C,OAAOA,0BAAAA,kBAAkB;EACvB,SAAS,YAAY,KAAK,WAAWC,oBAAAA,eAAe,WAAW,MAAM,CAAC;EACtE,WAAW,iBAAiB,KAAK,WAAWA,oBAAAA,eAAe,WAAW,MAAM,CAAC;EAC7E,iBAAiB,OAAO;EACxB,SAAS,OAAO;EAChB,SAAS,OAAO;CAClB,CAAC;AACH"}

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV2.js

@@ -1,3 +1,5 @@
+import { ColumnLazyImpl } from "../../../columns/column_lazy.js";
+import "../../../columns/index.js";
 import { createPTableDefV3 } from "./createPTableDefV3.js";
 import { getColumnIdAndSpec } from "@milaboratories/pl-model-common";
 import { isFunction } from "es-toolkit";
@@ -12,8 +14,8 @@ function createPTableDefV2(params) {
 	}
 	secondaryColumns.push(...params.labelColumns);
 	return createPTableDefV3({
-		primary: coreColumns.map((column) => ({ column })),
-		secondary: secondaryColumns.map((column) => ({ entries: [{ column }] })),
+		primary: coreColumns.map((column) => ColumnLazyImpl.fromColumn(column)),
+		secondary: secondaryColumns.map((column) => ColumnLazyImpl.fromColumn(column)),
 		primaryJoinType: params.coreJoinType,
 		filters: params.filters,
 		sorting: params.sorting

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPTableDefV2.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV2.ts"],"sourcesContent":["import type {\n  PColumn,\n  PColumnIdAndSpec,\n  PTableSorting,\n  PTableDefV2,\n  DataInfo,\n  PColumnValues,\n} from \"@milaboratories/pl-model-common\";\nimport { getColumnIdAndSpec } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal, TreeNodeAccessor } from \"../../../render\";\nimport { isFunction } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV7\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\n\nexport function createPTableDefV2(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  return createPTableDefV3({\n    primary: coreColumns.map((column) => ({ column })),\n    secondary: secondaryColumns.map((column) => ({ entries: [{ column }] })),\n    primaryJoinType: params.coreJoinType,\n    filters: params.filters,\n    sorting: params.sorting,\n  });\n}\n"],"mappings":";;;;AAcA,SAAgB,kBAAkB,QAOsD;CACtF,IAAI,cAAc,OAAO;CACzB,MAAM,mBAA0C,CAAC;CAEjD,IAAI,WAAW,OAAO,mBAAmB,GAAG;EAC1C,cAAc,CAAC;EACf,KAAK,MAAM,KAAK,OAAO,SACrB,IAAI,OAAO,oBAAoB,mBAAmB,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;OACpE,iBAAiB,KAAK,CAAC;CAChC;CAEA,iBAAiB,KAAK,GAAG,OAAO,YAAY;CAE5C,OAAO,kBAAkB;EACvB,SAAS,YAAY,KAAK,YAAY,EAAE,OAAO,EAAE;EACjD,WAAW,iBAAiB,KAAK,YAAY,EAAE,SAAS,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE;EACvE,iBAAiB,OAAO;EACxB,SAAS,OAAO;EAChB,SAAS,OAAO;CAClB,CAAC;AACH"}
+{"version":3,"file":"createPTableDefV2.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV2.ts"],"sourcesContent":["import type {\n  ColumnUniversalId,\n  PColumn,\n  PColumnIdAndSpec,\n  PTableSorting,\n  PTableDefV2,\n} from \"@milaboratories/pl-model-common\";\nimport { getColumnIdAndSpec } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isFunction } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV8\";\nimport { createPTableDefV3 } from \"./createPTableDefV3\";\nimport { ColumnLazyImpl } from \"../../../columns\";\n\nexport function createPTableDefV2(params: {\n  columns: PColumn<undefined | PColumnDataUniversal>[];\n  labelColumns: PColumn<undefined | PColumnDataUniversal>[];\n  coreJoinType: \"inner\" | \"full\";\n  filters: null | PlDataTableFilters;\n  sorting: PTableSorting[];\n  coreColumnPredicate?: (spec: PColumnIdAndSpec) => boolean;\n}): PTableDefV2<ColumnUniversalId> {\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  return createPTableDefV3({\n    primary: coreColumns.map((column) => ColumnLazyImpl.fromColumn(column)),\n    secondary: secondaryColumns.map((column) => ColumnLazyImpl.fromColumn(column)),\n    primaryJoinType: params.coreJoinType,\n    filters: params.filters,\n    sorting: params.sorting,\n  });\n}\n"],"mappings":";;;;;;AAcA,SAAgB,kBAAkB,QAOC;CACjC,IAAI,cAAc,OAAO;CACzB,MAAM,mBAA0C,CAAC;CAEjD,IAAI,WAAW,OAAO,mBAAmB,GAAG;EAC1C,cAAc,CAAC;EACf,KAAK,MAAM,KAAK,OAAO,SACrB,IAAI,OAAO,oBAAoB,mBAAmB,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;OACpE,iBAAiB,KAAK,CAAC;CAChC;CAEA,iBAAiB,KAAK,GAAG,OAAO,YAAY;CAE5C,OAAO,kBAAkB;EACvB,SAAS,YAAY,KAAK,WAAW,eAAe,WAAW,MAAM,CAAC;EACtE,WAAW,iBAAiB,KAAK,WAAW,eAAe,WAAW,MAAM,CAAC;EAC7E,iBAAiB,OAAO;EACxB,SAAS,OAAO;EAChB,SAAS,OAAO;CAClB,CAAC;AACH"}

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.cjs

@@ -1,21 +1,34 @@
+const require_utils = require("../../../columns/utils.cjs");
+require("../../../columns/index.cjs");
 const require_filterToQuery = require("../../../filters/converters/filterToQuery.cjs");
 const require_distill = require("../../../filters/distill.cjs");
 require("../../../filters/index.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
 let es_toolkit = require("es-toolkit");
 //#region src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts
+/**
+* Assemble a ptable def directly from recipes. Each secondary recipe is its own
+* outer-joined subtree: `getQuery()` encodes its linker chain, and its
+* hit-/queries-qualifications are derived on the spot via {@link hitQualifications}
+* / {@link queriesQualifications} — no pre-extracted DTO. Bare leaves yield empty
+* qualifications, so plain {@link ColumnRecipe} arrays (e.g. label columns) work
+* unchanged.
+*/
 function createPTableDefV3(params) {
 	let query = {
 		type: params.primaryJoinType === "inner" ? "innerJoin" : "fullJoin",
-		entries: params.primary.map((a) => toLeaf(a.column, []))
+		entries: params.primary.map((c) => columnToJoinEntry(c, []))
 	};
 	if (params.secondary.length > 0) query = {
 		type: "outerJoin",
 		primary: {
 			entry: query,
-			qualifications: params.secondary.flatMap((g) => params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []))
+			qualifications: params.secondary.flatMap((s) => {
+				const quals = require_utils.queriesQualifications(s);
+				return params.primary.flatMap((p) => quals[p.id] ?? []);
+			})
 		},
-		secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e)))
+		secondary: params.secondary.map((c) => columnToJoinEntry(c, require_utils.hitQualifications(c)))
 	};
 	if (!(0, es_toolkit.isNil)(params.filters)) {
 		const nonEmpty = require_distill.distillFilterSpec(params.filters);
@@ -35,7 +48,7 @@ function createPTableDefV3(params) {
 		sortBy: params.sorting.map((s) => ({
 			expression: columnIdToExpr(s.column),
 			ascending: s.ascending,
-			nullsFirst: !s.naAndAbsentAreLeastValues
+			nullsFirst: s.naAndAbsentAreLeastValues
 		}))
 	};
 	return { query };
@@ -49,28 +62,10 @@ function columnIdToExpr(col) {
 		value: col.id
 	};
 }
-function toLeaf(col, qs) {
+function columnToJoinEntry(col, qualifications) {
 	return {
-		entry: {
-			type: "column",
-			column: col
-		},
-		qualifications: qs
-	};
-}
-function toJoinEntry(e) {
-	const qs = e.qualifications ?? [];
-	if ((0, es_toolkit.isNil)(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);
-	return {
-		...e.linkers.reduceRight((inner, linker) => ({
-			entry: {
-				type: "linkerJoin",
-				linker: { column: linker },
-				secondary: [inner]
-			},
-			qualifications: []
-		}), toLeaf(e.column, [])),
-		qualifications: qs
+		entry: col.getQuery(),
+		qualifications
 	};
 }
 //#endregion

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createPTableDefV3.cjs","names":["distillFilterSpec","filterSpecToSpecQueryExpr"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  PColumn,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV7\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\n\n/** Primary side — base row grid. */\nexport type PrimaryEntry<Data> = {\n  column: PColumn<Data>;\n};\n\n/** Secondary side leaf — the hit column or a label column, optionally reached via a linker chain. */\nexport type SecondaryEntry<Data> = {\n  column: PColumn<Data>;\n  /** For hit: `forHit`. For label/direct: omit. Applied to the outermost emitted join entry. */\n  qualifications?: AxisQualification[];\n  /**\n   * Linker chain leading to `column`, ordered from outermost to innermost.\n   * When present, the entry is emitted as nested `linkerJoin` operators —\n   * one per linker — wrapping the hit column. Binds this hit to this exact\n   * chain so the engine cannot reuse a sibling chain that happens to share\n   * axis name + domain.\n   */\n  linkers?: PColumn<Data>[];\n};\n\n/** Secondary group — one join subtree outer-joined onto primary. */\nexport type SecondaryGroup<Data> = {\n  entries: SecondaryEntry<Data>[];\n  /** Per-variant qualifications applied to the cloned primary anchors on this group's side.\n   *  Keyed by `PrimaryEntry.column.id`. Omit → base primary used unqualified (labels, non-variant columns). */\n  primaryQualifications?: Record<PObjectId, AxisQualification[]>;\n};\n\nexport function createPTableDefV3<Data = PColumnDataUniversal>(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: PrimaryEntry<Data>[];\n  secondary: SecondaryGroup<Data>[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<PColumn<Data>> {\n  let query: SpecQuery<PColumn<Data>> = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((a) => toLeaf(a.column, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((g) =>\n          params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),\n        ),\n      },\n      secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e))),\n    };\n  }\n\n  if (!isNil(params.filters)) {\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  if (!isNil(params.sorting) && 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.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction toLeaf<Data>(\n  col: PColumn<Data>,\n  qs: AxisQualification[],\n): SpecQueryJoinEntry<PColumn<Data>> {\n  return {\n    entry: { type: \"column\", column: col },\n    qualifications: qs,\n  };\n}\n\nfunction toJoinEntry<Data>(e: SecondaryEntry<Data>): SpecQueryJoinEntry<PColumn<Data>> {\n  const qs = e.qualifications ?? [];\n  if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);\n\n  const folded = e.linkers.reduceRight<SpecQueryJoinEntry<PColumn<Data>>>(\n    (inner, linker) => ({\n      entry: { type: \"linkerJoin\", linker: { column: linker }, secondary: [inner] },\n      qualifications: [],\n    }),\n    toLeaf(e.column, []),\n  );\n  return { ...folded, qualifications: qs };\n}\n"],"mappings":";;;;;;AA+CA,SAAgB,kBAA+C,QAMhC;CAC7B,IAAI,QAAkC;EACpC,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;CACzD;CAEA,IAAI,OAAO,UAAU,SAAS,GAC5B,QAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MACxC,OAAO,QAAQ,SAAS,MAAM,EAAE,wBAAwB,EAAE,OAAO,OAAO,CAAC,CAAC,CAC5E;EACF;EACA,WAAW,OAAO,UAAU,SAAS,MAAM,EAAE,QAAQ,KAAK,MAAM,YAAY,CAAC,CAAC,CAAC;CACjF;CAGF,IAAI,EAAA,GAAA,WAAA,MAAA,CAAO,OAAO,OAAO,GAAG;EAC1B,MAAM,WAAWA,gBAAAA,kBAAkB,OAAO,OAAO;EAEjD,IAAI,EAAA,GAAA,WAAA,MAAA,CAAO,QAAQ,GAAG;GACpB,MAAM,YAAYC,sBAAAA,0BAA0B,QAAQ;GACpD,IAAI,EAAA,GAAA,gCAAA,oBAAA,CAAqB,SAAS,GAChC,MAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,qDACnF;GAEF,QAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;GACb;EACF;CACF;CAEA,IAAI,EAAA,GAAA,WAAA,MAAA,CAAO,OAAO,OAAO,KAAK,OAAO,QAAQ,SAAS,GACpD,QAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,MAAM;GACnC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;EACjB,EAAE;CACJ;CAGF,OAAO,EAAE,MAAM;AACjB;AAEA,SAAS,eAAe,KAA0C;CAChE,OAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;CAAyB,IACvD;EAAE,MAAM;EAAa,OAAO,IAAI;CAAG;AACzC;AAEA,SAAS,OACP,KACA,IACmC;CACnC,OAAO;EACL,OAAO;GAAE,MAAM;GAAU,QAAQ;EAAI;EACrC,gBAAgB;CAClB;AACF;AAEA,SAAS,YAAkB,GAA4D;CACrF,MAAM,KAAK,EAAE,kBAAkB,CAAC;CAChC,KAAA,GAAA,WAAA,MAAA,CAAU,EAAE,OAAO,KAAK,EAAE,QAAQ,WAAW,GAAG,OAAO,OAAO,EAAE,QAAQ,EAAE;CAS1E,OAAO;EAAE,GAPM,EAAE,QAAQ,aACtB,OAAO,YAAY;GAClB,OAAO;IAAE,MAAM;IAAc,QAAQ,EAAE,QAAQ,OAAO;IAAG,WAAW,CAAC,KAAK;GAAE;GAC5E,gBAAgB,CAAC;EACnB,IACA,OAAO,EAAE,QAAQ,CAAC,CAAC,CAEJ;EAAG,gBAAgB;CAAG;AACzC"}
+{"version":3,"file":"createPTableDefV3.cjs","names":["queriesQualifications","hitQualifications","distillFilterSpec","filterSpecToSpecQueryExpr"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  ColumnUniversalId,\n  PObjectId,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV8\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\nimport type { ColumnRecipe } from \"../../..\";\nimport { hitQualifications, queriesQualifications } from \"../../../columns\";\n\n/**\n * Assemble a ptable def directly from recipes. Each secondary recipe is its own\n * outer-joined subtree: `getQuery()` encodes its linker chain, and its\n * hit-/queries-qualifications are derived on the spot via {@link hitQualifications}\n * / {@link queriesQualifications} — no pre-extracted DTO. Bare leaves yield empty\n * qualifications, so plain {@link ColumnRecipe} arrays (e.g. label columns) work\n * unchanged.\n */\nexport function createPTableDefV3(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: ColumnRecipe[];\n  secondary: ColumnRecipe[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<ColumnUniversalId> {\n  let query: SpecQuery = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((c) => columnToJoinEntry(c, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((s) => {\n          const quals = queriesQualifications(s);\n          return params.primary.flatMap((p) => quals[p.id as PObjectId] ?? []);\n        }),\n      },\n      secondary: params.secondary.map((c) => columnToJoinEntry(c, hitQualifications(c))),\n    };\n  }\n\n  if (!isNil(params.filters)) {\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  if (!isNil(params.sorting) && 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.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction columnToJoinEntry(\n  col: ColumnRecipe,\n  qualifications: readonly AxisQualification[],\n): SpecQueryJoinEntry {\n  return {\n    entry: col.getQuery(),\n    qualifications,\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA4BA,SAAgB,kBAAkB,QAMC;CACjC,IAAI,QAAmB;EACrB,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC;CAC7D;CAEA,IAAI,OAAO,UAAU,SAAS,GAC5B,QAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MAAM;IAC9C,MAAM,QAAQA,cAAAA,sBAAsB,CAAC;IACrC,OAAO,OAAO,QAAQ,SAAS,MAAM,MAAM,EAAE,OAAoB,CAAC,CAAC;GACrE,CAAC;EACH;EACA,WAAW,OAAO,UAAU,KAAK,MAAM,kBAAkB,GAAGC,cAAAA,kBAAkB,CAAC,CAAC,CAAC;CACnF;CAGF,IAAI,EAAA,GAAA,WAAA,MAAA,CAAO,OAAO,OAAO,GAAG;EAC1B,MAAM,WAAWC,gBAAAA,kBAAkB,OAAO,OAAO;EAEjD,IAAI,EAAA,GAAA,WAAA,MAAA,CAAO,QAAQ,GAAG;GACpB,MAAM,YAAYC,sBAAAA,0BAA0B,QAAQ;GACpD,IAAI,EAAA,GAAA,gCAAA,oBAAA,CAAqB,SAAS,GAChC,MAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,qDACnF;GAEF,QAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;GACb;EACF;CACF;CAEA,IAAI,EAAA,GAAA,WAAA,MAAA,CAAO,OAAO,OAAO,KAAK,OAAO,QAAQ,SAAS,GACpD,QAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,MAAM;GACnC,WAAW,EAAE;GACb,YAAY,EAAE;EAChB,EAAE;CACJ;CAGF,OAAO,EAAE,MAAM;AACjB;AAEA,SAAS,eAAe,KAA0C;CAChE,OAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;CAAyB,IACvD;EAAE,MAAM;EAAa,OAAO,IAAI;CAAG;AACzC;AAEA,SAAS,kBACP,KACA,gBACoB;CACpB,OAAO;EACL,OAAO,IAAI,SAAS;EACpB;CACF;AACF"}

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.js

@@ -1,21 +1,34 @@
+import { hitQualifications, queriesQualifications } from "../../../columns/utils.js";
+import "../../../columns/index.js";
 import { filterSpecToSpecQueryExpr } from "../../../filters/converters/filterToQuery.js";
 import { distillFilterSpec } from "../../../filters/distill.js";
 import "../../../filters/index.js";
 import { isBooleanExpression } from "@milaboratories/pl-model-common";
 import { isNil } from "es-toolkit";
 //#region src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts
+/**
+* Assemble a ptable def directly from recipes. Each secondary recipe is its own
+* outer-joined subtree: `getQuery()` encodes its linker chain, and its
+* hit-/queries-qualifications are derived on the spot via {@link hitQualifications}
+* / {@link queriesQualifications} — no pre-extracted DTO. Bare leaves yield empty
+* qualifications, so plain {@link ColumnRecipe} arrays (e.g. label columns) work
+* unchanged.
+*/
 function createPTableDefV3(params) {
 	let query = {
 		type: params.primaryJoinType === "inner" ? "innerJoin" : "fullJoin",
-		entries: params.primary.map((a) => toLeaf(a.column, []))
+		entries: params.primary.map((c) => columnToJoinEntry(c, []))
 	};
 	if (params.secondary.length > 0) query = {
 		type: "outerJoin",
 		primary: {
 			entry: query,
-			qualifications: params.secondary.flatMap((g) => params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []))
+			qualifications: params.secondary.flatMap((s) => {
+				const quals = queriesQualifications(s);
+				return params.primary.flatMap((p) => quals[p.id] ?? []);
+			})
 		},
-		secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e)))
+		secondary: params.secondary.map((c) => columnToJoinEntry(c, hitQualifications(c)))
 	};
 	if (!isNil(params.filters)) {
 		const nonEmpty = distillFilterSpec(params.filters);
@@ -35,7 +48,7 @@ function createPTableDefV3(params) {
 		sortBy: params.sorting.map((s) => ({
 			expression: columnIdToExpr(s.column),
 			ascending: s.ascending,
-			nullsFirst: !s.naAndAbsentAreLeastValues
+			nullsFirst: s.naAndAbsentAreLeastValues
 		}))
 	};
 	return { query };
@@ -49,28 +62,10 @@ function columnIdToExpr(col) {
 		value: col.id
 	};
 }
-function toLeaf(col, qs) {
+function columnToJoinEntry(col, qualifications) {
 	return {
-		entry: {
-			type: "column",
-			column: col
-		},
-		qualifications: qs
-	};
-}
-function toJoinEntry(e) {
-	const qs = e.qualifications ?? [];
-	if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);
-	return {
-		...e.linkers.reduceRight((inner, linker) => ({
-			entry: {
-				type: "linkerJoin",
-				linker: { column: linker },
-				secondary: [inner]
-			},
-			qualifications: []
-		}), toLeaf(e.column, [])),
-		qualifications: qs
+		entry: col.getQuery(),
+		qualifications
 	};
 }
 //#endregion

package/dist/components/PlDataTable/createPlDataTable/createPTableDefV3.js.map

@@ -1 +1 @@
-{"version":3,"file":"createPTableDefV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  PColumn,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n  PObjectId,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport type { PColumnDataUniversal } from \"../../../render\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV7\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\n\n/** Primary side — base row grid. */\nexport type PrimaryEntry<Data> = {\n  column: PColumn<Data>;\n};\n\n/** Secondary side leaf — the hit column or a label column, optionally reached via a linker chain. */\nexport type SecondaryEntry<Data> = {\n  column: PColumn<Data>;\n  /** For hit: `forHit`. For label/direct: omit. Applied to the outermost emitted join entry. */\n  qualifications?: AxisQualification[];\n  /**\n   * Linker chain leading to `column`, ordered from outermost to innermost.\n   * When present, the entry is emitted as nested `linkerJoin` operators —\n   * one per linker — wrapping the hit column. Binds this hit to this exact\n   * chain so the engine cannot reuse a sibling chain that happens to share\n   * axis name + domain.\n   */\n  linkers?: PColumn<Data>[];\n};\n\n/** Secondary group — one join subtree outer-joined onto primary. */\nexport type SecondaryGroup<Data> = {\n  entries: SecondaryEntry<Data>[];\n  /** Per-variant qualifications applied to the cloned primary anchors on this group's side.\n   *  Keyed by `PrimaryEntry.column.id`. Omit → base primary used unqualified (labels, non-variant columns). */\n  primaryQualifications?: Record<PObjectId, AxisQualification[]>;\n};\n\nexport function createPTableDefV3<Data = PColumnDataUniversal>(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: PrimaryEntry<Data>[];\n  secondary: SecondaryGroup<Data>[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<PColumn<Data>> {\n  let query: SpecQuery<PColumn<Data>> = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((a) => toLeaf(a.column, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((g) =>\n          params.primary.flatMap((p) => g.primaryQualifications?.[p.column.id] ?? []),\n        ),\n      },\n      secondary: params.secondary.flatMap((g) => g.entries.map((e) => toJoinEntry(e))),\n    };\n  }\n\n  if (!isNil(params.filters)) {\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  if (!isNil(params.sorting) && 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.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction toLeaf<Data>(\n  col: PColumn<Data>,\n  qs: AxisQualification[],\n): SpecQueryJoinEntry<PColumn<Data>> {\n  return {\n    entry: { type: \"column\", column: col },\n    qualifications: qs,\n  };\n}\n\nfunction toJoinEntry<Data>(e: SecondaryEntry<Data>): SpecQueryJoinEntry<PColumn<Data>> {\n  const qs = e.qualifications ?? [];\n  if (isNil(e.linkers) || e.linkers.length === 0) return toLeaf(e.column, qs);\n\n  const folded = e.linkers.reduceRight<SpecQueryJoinEntry<PColumn<Data>>>(\n    (inner, linker) => ({\n      entry: { type: \"linkerJoin\", linker: { column: linker }, secondary: [inner] },\n      qualifications: [],\n    }),\n    toLeaf(e.column, []),\n  );\n  return { ...folded, qualifications: qs };\n}\n"],"mappings":";;;;;;AA+CA,SAAgB,kBAA+C,QAMhC;CAC7B,IAAI,QAAkC;EACpC,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;CACzD;CAEA,IAAI,OAAO,UAAU,SAAS,GAC5B,QAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MACxC,OAAO,QAAQ,SAAS,MAAM,EAAE,wBAAwB,EAAE,OAAO,OAAO,CAAC,CAAC,CAC5E;EACF;EACA,WAAW,OAAO,UAAU,SAAS,MAAM,EAAE,QAAQ,KAAK,MAAM,YAAY,CAAC,CAAC,CAAC;CACjF;CAGF,IAAI,CAAC,MAAM,OAAO,OAAO,GAAG;EAC1B,MAAM,WAAW,kBAAkB,OAAO,OAAO;EAEjD,IAAI,CAAC,MAAM,QAAQ,GAAG;GACpB,MAAM,YAAY,0BAA0B,QAAQ;GACpD,IAAI,CAAC,oBAAoB,SAAS,GAChC,MAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,qDACnF;GAEF,QAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;GACb;EACF;CACF;CAEA,IAAI,CAAC,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ,SAAS,GACpD,QAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,MAAM;GACnC,WAAW,EAAE;GACb,YAAY,CAAC,EAAE;EACjB,EAAE;CACJ;CAGF,OAAO,EAAE,MAAM;AACjB;AAEA,SAAS,eAAe,KAA0C;CAChE,OAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;CAAyB,IACvD;EAAE,MAAM;EAAa,OAAO,IAAI;CAAG;AACzC;AAEA,SAAS,OACP,KACA,IACmC;CACnC,OAAO;EACL,OAAO;GAAE,MAAM;GAAU,QAAQ;EAAI;EACrC,gBAAgB;CAClB;AACF;AAEA,SAAS,YAAkB,GAA4D;CACrF,MAAM,KAAK,EAAE,kBAAkB,CAAC;CAChC,IAAI,MAAM,EAAE,OAAO,KAAK,EAAE,QAAQ,WAAW,GAAG,OAAO,OAAO,EAAE,QAAQ,EAAE;CAS1E,OAAO;EAAE,GAPM,EAAE,QAAQ,aACtB,OAAO,YAAY;GAClB,OAAO;IAAE,MAAM;IAAc,QAAQ,EAAE,QAAQ,OAAO;IAAG,WAAW,CAAC,KAAK;GAAE;GAC5E,gBAAgB,CAAC;EACnB,IACA,OAAO,EAAE,QAAQ,CAAC,CAAC,CAEJ;EAAG,gBAAgB;CAAG;AACzC"}
+{"version":3,"file":"createPTableDefV3.js","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPTableDefV3.ts"],"sourcesContent":["import type {\n  AxisQualification,\n  ColumnUniversalId,\n  PObjectId,\n  PTableColumnId,\n  PTableSorting,\n  PTableDefV2,\n  SingleAxisSelector,\n  SpecQuery,\n  SpecQueryExpression,\n  SpecQueryJoinEntry,\n} from \"@milaboratories/pl-model-common\";\nimport { isBooleanExpression } from \"@milaboratories/pl-model-common\";\nimport { isNil } from \"es-toolkit\";\nimport type { PlDataTableFilters } from \"../typesV8\";\nimport { distillFilterSpec, filterSpecToSpecQueryExpr } from \"../../../filters\";\nimport type { Nil } from \"@milaboratories/helpers\";\nimport type { ColumnRecipe } from \"../../..\";\nimport { hitQualifications, queriesQualifications } from \"../../../columns\";\n\n/**\n * Assemble a ptable def directly from recipes. Each secondary recipe is its own\n * outer-joined subtree: `getQuery()` encodes its linker chain, and its\n * hit-/queries-qualifications are derived on the spot via {@link hitQualifications}\n * / {@link queriesQualifications} — no pre-extracted DTO. Bare leaves yield empty\n * qualifications, so plain {@link ColumnRecipe} arrays (e.g. label columns) work\n * unchanged.\n */\nexport function createPTableDefV3(params: {\n  primaryJoinType: \"inner\" | \"full\";\n  primary: ColumnRecipe[];\n  secondary: ColumnRecipe[];\n  filters?: Nil | PlDataTableFilters;\n  sorting?: Nil | PTableSorting[];\n}): PTableDefV2<ColumnUniversalId> {\n  let query: SpecQuery = {\n    type: params.primaryJoinType === \"inner\" ? \"innerJoin\" : \"fullJoin\",\n    entries: params.primary.map((c) => columnToJoinEntry(c, [])),\n  };\n\n  if (params.secondary.length > 0) {\n    query = {\n      type: \"outerJoin\",\n      primary: {\n        entry: query,\n        qualifications: params.secondary.flatMap((s) => {\n          const quals = queriesQualifications(s);\n          return params.primary.flatMap((p) => quals[p.id as PObjectId] ?? []);\n        }),\n      },\n      secondary: params.secondary.map((c) => columnToJoinEntry(c, hitQualifications(c))),\n    };\n  }\n\n  if (!isNil(params.filters)) {\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  if (!isNil(params.sorting) && 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.naAndAbsentAreLeastValues,\n      })),\n    };\n  }\n\n  return { query };\n}\n\nfunction columnIdToExpr(col: PTableColumnId): SpecQueryExpression {\n  return col.type === \"axis\"\n    ? { type: \"axisRef\", value: col.id as SingleAxisSelector }\n    : { type: \"columnRef\", value: col.id };\n}\n\nfunction columnToJoinEntry(\n  col: ColumnRecipe,\n  qualifications: readonly AxisQualification[],\n): SpecQueryJoinEntry {\n  return {\n    entry: col.getQuery(),\n    qualifications,\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;AA4BA,SAAgB,kBAAkB,QAMC;CACjC,IAAI,QAAmB;EACrB,MAAM,OAAO,oBAAoB,UAAU,cAAc;EACzD,SAAS,OAAO,QAAQ,KAAK,MAAM,kBAAkB,GAAG,CAAC,CAAC,CAAC;CAC7D;CAEA,IAAI,OAAO,UAAU,SAAS,GAC5B,QAAQ;EACN,MAAM;EACN,SAAS;GACP,OAAO;GACP,gBAAgB,OAAO,UAAU,SAAS,MAAM;IAC9C,MAAM,QAAQ,sBAAsB,CAAC;IACrC,OAAO,OAAO,QAAQ,SAAS,MAAM,MAAM,EAAE,OAAoB,CAAC,CAAC;GACrE,CAAC;EACH;EACA,WAAW,OAAO,UAAU,KAAK,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,CAAC,CAAC;CACnF;CAGF,IAAI,CAAC,MAAM,OAAO,OAAO,GAAG;EAC1B,MAAM,WAAW,kBAAkB,OAAO,OAAO;EAEjD,IAAI,CAAC,MAAM,QAAQ,GAAG;GACpB,MAAM,YAAY,0BAA0B,QAAQ;GACpD,IAAI,CAAC,oBAAoB,SAAS,GAChC,MAAM,IAAI,MACR,kEAAkE,UAAU,KAAK,qDACnF;GAEF,QAAQ;IACN,MAAM;IACN,OAAO;IACP,WAAW;GACb;EACF;CACF;CAEA,IAAI,CAAC,MAAM,OAAO,OAAO,KAAK,OAAO,QAAQ,SAAS,GACpD,QAAQ;EACN,MAAM;EACN,OAAO;EACP,QAAQ,OAAO,QAAQ,KAAK,OAAO;GACjC,YAAY,eAAe,EAAE,MAAM;GACnC,WAAW,EAAE;GACb,YAAY,EAAE;EAChB,EAAE;CACJ;CAGF,OAAO,EAAE,MAAM;AACjB;AAEA,SAAS,eAAe,KAA0C;CAChE,OAAO,IAAI,SAAS,SAChB;EAAE,MAAM;EAAW,OAAO,IAAI;CAAyB,IACvD;EAAE,MAAM;EAAa,OAAO,IAAI;CAAG;AACzC;AAEA,SAAS,kBACP,KACA,gBACoB;CACpB,OAAO;EACL,OAAO,IAAI,SAAS;EACpB;CACF;AACF"}

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs

@@ -2,14 +2,17 @@ const require_label = require("../../../render/util/label.cjs");
 const require_pcolumn_data = require("../../../render/util/pcolumn_data.cjs");
 const require_column_collection = require("../../../render/util/column_collection.cjs");
 require("../../../render/index.cjs");
+const require_column_lazy = require("../../../columns/column_lazy.cjs");
+require("../../../columns/index.cjs");
 const require_traverse = require("../../../filters/traverse.cjs");
 const require_state_migration = require("../state-migration.cjs");
 const require_labels = require("../labels.cjs");
 const require_createPTableDefV2 = require("./createPTableDefV2.cjs");
 const require_utils = require("./utils.cjs");
+const require_columnResolver = require("../columnResolver.cjs");
 let _milaboratories_pl_model_common = require("@milaboratories/pl-model-common");
+let _milaboratories_helpers = require("@milaboratories/helpers");
 let es_toolkit = require("es-toolkit");
-let es_toolkit_compat = require("es-toolkit/compat");
 //#region src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts
 /**
 * Create p-table spec and handle given ui table state
@@ -38,31 +41,19 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		};
 	});
 	const fullColumns = [...columns, ...fullLabelColumns];
-	const fullColumnsIds = [...(0, _milaboratories_pl_model_common.uniqueBy)(fullColumns.flatMap((c) => c.spec.axesSpec.map((a) => (0, _milaboratories_pl_model_common.getAxisId)(a))), (a) => (0, _milaboratories_pl_model_common.canonicalizeJson)(a)).map((a) => ({
-		type: "axis",
-		id: a
-	})), ...fullColumns.map((c) => ({
-		type: "column",
-		id: c.id
-	}))];
-	const fullColumnsIdsSet = new Set(fullColumnsIds.map((c) => (0, _milaboratories_pl_model_common.canonicalizeJson)(c)));
-	const isValidColumnId = (id) => fullColumnsIdsSet.has(id);
-	const filters = tableStateNormalized.pTableParams.filters;
-	const defaultFilters = options?.filters ?? void 0;
-	const firstInvalidFilterColumn = (filters !== null ? require_traverse.collectFilterSpecColumns(filters) : []).find((col) => !isValidColumnId(col));
-	if (firstInvalidFilterColumn) throw new Error(`Invalid filter column ${firstInvalidFilterColumn}: column reference does not match the table columns`);
-	const firstInvalidDefaultFilterColumn = (defaultFilters !== void 0 ? require_traverse.collectFilterSpecColumns(defaultFilters) : []).find((col) => !isValidColumnId(col));
-	if (firstInvalidDefaultFilterColumn) throw new Error(`Invalid default filter column ${firstInvalidDefaultFilterColumn}: column reference does not match the table columns`);
+	const resolver = require_columnResolver.createColumnResolver(fullColumns.map((c) => require_column_lazy.ColumnLazyImpl.fromColumn(c)), { warn: ctx.logWarn.bind(ctx) });
+	const rawFilters = tableStateNormalized.pTableParams.filters;
+	const rawDefaultFilters = options?.filters ?? void 0;
+	const filters = remapFiltersThrowing(rawFilters, resolver, "filter");
+	const defaultFilters = remapFiltersThrowing(rawDefaultFilters ?? null, resolver, "default filter");
 	const userSorting = tableStateNormalized.pTableParams.sorting;
-	const sorting = ((0, es_toolkit_compat.isEmpty)(userSorting) ? options?.sorting : userSorting) ?? [];
-	const firstInvalidSortingColumn = sorting.find((s) => !isValidColumnId((0, _milaboratories_pl_model_common.canonicalizeJson)(s.column)));
-	if (firstInvalidSortingColumn) throw new Error(`Invalid sorting column ${JSON.stringify(firstInvalidSortingColumn.column)}: column reference does not match the table columns`);
+	const sorting = remapSortingThrowing(((0, _milaboratories_helpers.isNil)(userSorting) ? options?.sorting : userSorting) ?? [], resolver);
 	const coreJoinType = options?.coreJoinType ?? "full";
 	const fullDef = require_createPTableDefV2.createPTableDefV2({
 		columns,
 		labelColumns: fullLabelColumns,
 		coreJoinType,
-		filters,
+		filters: filters ?? null,
 		sorting,
 		coreColumnPredicate: options?.coreColumnPredicate
 	});
@@ -79,10 +70,7 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 	const coreColumnPredicate = options?.coreColumnPredicate;
 	if (coreColumnPredicate) columns.flatMap((c) => coreColumnPredicate((0, _milaboratories_pl_model_common.getColumnIdAndSpec)(c)) ? [c.id] : []).forEach((c) => hiddenColumns.delete(c));
 	sorting.map((s) => s.column).filter((c) => c.type === "column").forEach((c) => hiddenColumns.delete(c.id));
-	if (filters) require_traverse.collectFilterSpecColumns(filters).flatMap((c) => {
-		const obj = (0, _milaboratories_pl_model_common.parseJson)(c);
-		return obj.type === "column" ? [obj.id] : [];
-	}).forEach((c) => hiddenColumns.delete(c));
+	if (filters) require_traverse.collectFilterSpecColumns(filters).flatMap((c) => c.type === "column" ? [c.id] : []).forEach((c) => hiddenColumns.delete(c));
 	const visibleColumns = columns.filter((c) => !hiddenColumns.has(c.id));
 	const visibleLabelColumns = require_labels.getMatchingLabelColumns(visibleColumns.map(_milaboratories_pl_model_common.getColumnIdAndSpec), allLabelColumns);
 	if (!require_pcolumn_data.allPColumnsReady([...visibleColumns, ...visibleLabelColumns])) return void 0;
@@ -90,7 +78,7 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		columns: visibleColumns,
 		labelColumns: visibleLabelColumns,
 		coreJoinType,
-		filters,
+		filters: filters ?? null,
 		sorting,
 		coreColumnPredicate
 	});
@@ -101,9 +89,53 @@ function createPlDataTableV2(ctx, columns, tableState, options) {
 		fullTableHandle: fullHandle,
 		fullPframeHandle: pframeHandle,
 		visibleTableHandle: visibleHandle,
-		defaultFilters
+		defaultFilters: defaultFilters ?? void 0
 	};
 }
+/** Rewrite filter column refs through the resolver; throw on any unresolved ref. */
+function remapFiltersThrowing(filters, resolver, label) {
+	if ((0, _milaboratories_helpers.isNil)(filters)) return filters;
+	return require_traverse.traverseFilterSpec(filters, {
+		leaf: (leaf) => {
+			if (leaf.type === void 0) return leaf;
+			const result = { ...leaf };
+			if ("column" in result) {
+				const c = resolver(result.column);
+				if ((0, _milaboratories_helpers.isNil)(c)) throw new Error(`Invalid ${label} column ${JSON.stringify(result.column)}: column reference does not match the table columns`);
+				result.column = c;
+			}
+			if ("rhs" in result) {
+				const c = resolver(result.rhs);
+				if ((0, _milaboratories_helpers.isNil)(c)) throw new Error(`Invalid ${label} column ${JSON.stringify(result.rhs)}: column reference does not match the table columns`);
+				result.rhs = c;
+			}
+			return result;
+		},
+		and: (results) => ({
+			type: "and",
+			filters: results
+		}),
+		or: (results) => ({
+			type: "or",
+			filters: results
+		}),
+		not: (result) => ({
+			type: "not",
+			filter: result
+		})
+	});
+}
+/** Rewrite sorting column refs through the resolver; throw on any unresolved ref. */
+function remapSortingThrowing(sorting, resolver) {
+	return sorting.map((s) => {
+		const c = resolver(s.column);
+		if ((0, _milaboratories_helpers.isNil)(c)) throw new Error(`Invalid sorting column ${JSON.stringify(s.column)}: column reference does not match the table columns`);
+		return {
+			...s,
+			column: c
+		};
+	});
+}
 function getAllLabelColumns(resultPool) {
 	return new require_column_collection.PColumnCollection().addAxisLabelProvider(resultPool).addColumnProvider(resultPool).getColumns({
 		name: _milaboratories_pl_model_common.PColumnName.Label,

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV2.cjs","names":["upgradePlDataTableStateV2","getMatchingLabelColumns","deriveLabels","identity","Annotation","collectFilterSpecColumns","createPTableDefV2","isColumnOptional","getColumnIdAndSpec","allPColumnsReady","PColumnCollection","PColumnName"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"sourcesContent":["import type {\n  AxisId,\n  PColumn,\n  PObjectId,\n  PTableColumnId,\n  PTableColumnIdAxis,\n  PTableColumnIdColumn,\n  CanonicalizedJson,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  canonicalizeJson,\n  getAxisId,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  uniqueBy,\n  parseJson,\n  PColumnName,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  AxisLabelProvider,\n  ColumnProvider,\n  PColumnDataUniversal,\n  RenderCtxBase,\n} from \"../../../render\";\nimport { allPColumnsReady, deriveLabels, PColumnCollection } from \"../../../render\";\nimport { identity } from \"es-toolkit\";\nimport type { CreatePlDataTableOps, PlDataTableModel } from \"../typesV7\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport { getMatchingLabelColumns } from \"../labels\";\nimport { collectFilterSpecColumns } from \"../../../filters/traverse\";\nimport { isEmpty } from \"es-toolkit/compat\";\nimport { createPTableDefV2 } from \"./createPTableDefV2\";\nimport { isColumnOptional } from \"./utils\";\n\n/**\n * @deprecated This function is deprecated and will be removed in future. Please migrate to createPlDataTable with v3 options for improved column discovery and display configuration. See createPlDataTableOptionsV3 for details on the new options format and migration guidance.\n */\nexport type createPlDataTableOptionsV2 = {\n  columns: PColumn<PColumnDataUniversal>[];\n  tableState?: PlDataTableStateV2;\n  options?: CreatePlDataTableOps;\n};\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @deprecated This version of createPlDataTable is deprecated and will be removed in future. Please migrate to v3 by switching to the new options format and providing necessary information for column discovery and display configuration. See createPlDataTableOptionsV3 for details.\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: createPlDataTableOptionsV2[\"columns\"],\n  tableState?: createPlDataTableOptionsV2[\"tableState\"],\n  options?: createPlDataTableOptionsV2[\"options\"],\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool) ?? [];\n\n  let fullLabelColumns = getMatchingLabelColumns(columns, 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: string): boolean =>\n    fullColumnsIdsSet.has(id as CanonicalizedJson<PTableColumnId>);\n\n  // -- Filtering validation --\n  const filters = tableStateNormalized.pTableParams.filters;\n  const defaultFilters = options?.filters ?? undefined;\n  const filterColumns = filters !== null ? collectFilterSpecColumns(filters) : [];\n  const firstInvalidFilterColumn = filterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalidFilterColumn)\n    throw new Error(\n      `Invalid filter column ${firstInvalidFilterColumn}: column reference does not match the table columns`,\n    );\n  const defaultFilterColumns =\n    defaultFilters !== undefined ? collectFilterSpecColumns(defaultFilters) : [];\n  const firstInvalidDefaultFilterColumn = defaultFilterColumns.find((col) => !isValidColumnId(col));\n  if (firstInvalidDefaultFilterColumn)\n    throw new Error(\n      `Invalid default filter column ${firstInvalidDefaultFilterColumn}: column reference does not match the table columns`,\n    );\n\n  // -- Sorting validation --\n  const userSorting = tableStateNormalized.pTableParams.sorting;\n  const sorting = (isEmpty(userSorting) ? options?.sorting : userSorting) ?? [];\n  const firstInvalidSortingColumn = sorting.find(\n    (s) => !isValidColumnId(canonicalizeJson<PTableColumnId>(s.column)),\n  );\n  if (firstInvalidSortingColumn)\n    throw new Error(\n      `Invalid sorting column ${JSON.stringify(firstInvalidSortingColumn.column)}: column reference does not match the table columns`,\n    );\n\n  const coreJoinType = options?.coreJoinType ?? \"full\";\n  const fullDef = createPTableDefV2({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate: options?.coreColumnPredicate,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  const pframeHandle = ctx.createPFrame(fullColumns);\n  if (!fullHandle || !pframeHandle) 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 !== null) {\n        return hiddenColIds\n          .filter((s): s is PTableColumnIdColumn => s.type === \"column\")\n          .map((s) => s.id);\n      }\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 = options?.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  // 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  // Preserve filter columns from being hidden\n  if (filters) {\n    collectFilterSpecColumns(filters)\n      .flatMap((c) => {\n        const obj = parseJson(c);\n        return obj.type === \"column\" ? [obj.id] : [];\n      })\n      .forEach((c) => hiddenColumns.delete(c));\n  }\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 = createPTableDefV2({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters,\n  } satisfies PlDataTableModel;\n}\n\nfunction 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"],"mappings":"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"}
+{"version":3,"file":"createPlDataTableV2.cjs","names":["upgradePlDataTableStateV2","getMatchingLabelColumns","deriveLabels","identity","Annotation","createColumnResolver","ColumnLazyImpl","createPTableDefV2","isColumnOptional","getColumnIdAndSpec","allPColumnsReady","traverseFilterSpec","PColumnCollection","PColumnName"],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"sourcesContent":["import type {\n  ColumnUniversalId,\n  FilterSpecNode,\n  PColumn,\n  PTableColumnIdColumn,\n  PTableSorting,\n} from \"@milaboratories/pl-model-common\";\nimport {\n  Annotation,\n  getColumnIdAndSpec,\n  isLinkerColumn,\n  PColumnName,\n} from \"@milaboratories/pl-model-common\";\nimport type {\n  AxisLabelProvider,\n  ColumnProvider,\n  PColumnDataUniversal,\n  RenderCtxBase,\n} from \"../../../render\";\nimport { allPColumnsReady, deriveLabels, PColumnCollection } from \"../../../render\";\nimport { identity } from \"es-toolkit\";\nimport type {\n  CreatePlDataTableOps,\n  PlDataTableFilters,\n  PlDataTableFilterSpecLeaf,\n  PlDataTableModel,\n} from \"../typesV8\";\nimport { upgradePlDataTableStateV2 } from \"../state-migration\";\nimport type { PlDataTableStateV2 } from \"../state-migration\";\nimport { getMatchingLabelColumns } from \"../labels\";\nimport { collectFilterSpecColumns, traverseFilterSpec } from \"../../../filters/traverse\";\nimport { createPTableDefV2 } from \"./createPTableDefV2\";\nimport { isColumnOptional } from \"./utils\";\nimport { ColumnLazyImpl } from \"../../../columns\";\nimport { createColumnResolver, type ColumnResolver } from \"../columnResolver\";\nimport { isNil, type Nil } from \"@milaboratories/helpers\";\n\n/**\n * @deprecated This function is deprecated and will be removed in future. Please migrate to createPlDataTable with v3 options for improved column discovery and display configuration. See createPlDataTableOptionsV3 for details on the new options format and migration guidance.\n */\nexport type createPlDataTableOptionsV2 = {\n  columns: PColumn<PColumnDataUniversal>[];\n  tableState?: PlDataTableStateV2;\n  options?: CreatePlDataTableOps;\n};\n\n/**\n * Create p-table spec and handle given ui table state\n *\n * @deprecated This version of createPlDataTable is deprecated and will be removed in future. Please migrate to v3 by switching to the new options format and providing necessary information for column discovery and display configuration. See createPlDataTableOptionsV3 for details.\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: createPlDataTableOptionsV2[\"columns\"],\n  tableState?: createPlDataTableOptionsV2[\"tableState\"],\n  options?: createPlDataTableOptionsV2[\"options\"],\n): PlDataTableModel | undefined {\n  if (columns.length === 0) return undefined;\n\n  const tableStateNormalized = upgradePlDataTableStateV2(tableState);\n  const allLabelColumns = getAllLabelColumns(ctx.resultPool) ?? [];\n\n  let fullLabelColumns = getMatchingLabelColumns(columns, 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 resolver = createColumnResolver(\n    fullColumns.map((c) => ColumnLazyImpl.fromColumn(c)),\n    { warn: ctx.logWarn.bind(ctx) },\n  );\n\n  // -- Filtering: rewrite via resolver, throw if any reference is unresolved --\n  const rawFilters = tableStateNormalized.pTableParams.filters;\n  const rawDefaultFilters = options?.filters ?? undefined;\n  const filters = remapFiltersThrowing(rawFilters, resolver, \"filter\");\n  const defaultFilters = remapFiltersThrowing(\n    rawDefaultFilters ?? null,\n    resolver,\n    \"default filter\",\n  );\n\n  // -- Sorting: rewrite via resolver, throw if any reference is unresolved --\n  const userSorting = tableStateNormalized.pTableParams.sorting;\n  const rawSorting = (isNil(userSorting) ? options?.sorting : userSorting) ?? [];\n  const sorting = remapSortingThrowing(rawSorting, resolver);\n\n  const coreJoinType = options?.coreJoinType ?? \"full\";\n  const fullDef = createPTableDefV2({\n    columns,\n    labelColumns: fullLabelColumns,\n    coreJoinType,\n    filters: filters ?? null,\n    sorting,\n    coreColumnPredicate: options?.coreColumnPredicate,\n  });\n\n  const fullHandle = ctx.createPTableV2(fullDef);\n  const pframeHandle = ctx.createPFrame(fullColumns);\n  if (!fullHandle || !pframeHandle) return undefined;\n\n  const hiddenColumns = new Set<ColumnUniversalId>(\n    ((): ColumnUniversalId[] => {\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 !== null) {\n        return hiddenColIds\n          .filter((s): s is PTableColumnIdColumn => s.type === \"column\")\n          .map((s) => s.id);\n      }\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 = options?.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  // 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  // Preserve filter columns from being hidden\n  if (filters) {\n    collectFilterSpecColumns(filters)\n      .flatMap((c) => (c.type === \"column\" ? [c.id] : []))\n      .forEach((c) => hiddenColumns.delete(c));\n  }\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 = createPTableDefV2({\n    columns: visibleColumns,\n    labelColumns: visibleLabelColumns,\n    coreJoinType,\n    filters: filters ?? null,\n    sorting,\n    coreColumnPredicate,\n  });\n  const visibleHandle = ctx.createPTableV2(visibleDef);\n\n  if (!visibleHandle) return undefined;\n\n  return {\n    sourceId: tableStateNormalized.pTableParams.sourceId,\n    fullTableHandle: fullHandle,\n    fullPframeHandle: pframeHandle,\n    visibleTableHandle: visibleHandle,\n    defaultFilters: defaultFilters ?? undefined,\n  } satisfies PlDataTableModel;\n}\n\n/** Rewrite filter column refs through the resolver; throw on any unresolved ref. */\nfunction remapFiltersThrowing(\n  filters: Nil | PlDataTableFilters,\n  resolver: ColumnResolver,\n  label: string,\n): Nil | PlDataTableFilters {\n  if (isNil(filters)) return filters;\n\n  type Node = FilterSpecNode<PlDataTableFilterSpecLeaf>;\n  return traverseFilterSpec(filters, {\n    leaf: (leaf): Node => {\n      if (leaf.type === undefined) return leaf;\n      const result = { ...leaf };\n      if (\"column\" in result) {\n        const c = resolver(result.column);\n        if (isNil(c))\n          throw new Error(\n            `Invalid ${label} column ${JSON.stringify(result.column)}: column reference does not match the table columns`,\n          );\n        result.column = c;\n      }\n      if (\"rhs\" in result) {\n        const c = resolver(result.rhs);\n        if (isNil(c))\n          throw new Error(\n            `Invalid ${label} column ${JSON.stringify(result.rhs)}: column reference does not match the table columns`,\n          );\n        result.rhs = c;\n      }\n      return result;\n    },\n    and: (results): Node => ({ type: \"and\", filters: results }),\n    or: (results): Node => ({ type: \"or\", filters: results }),\n    not: (result): Node => ({ type: \"not\", filter: result }),\n  }) as PlDataTableFilters;\n}\n\n/** Rewrite sorting column refs through the resolver; throw on any unresolved ref. */\nfunction remapSortingThrowing(sorting: PTableSorting[], resolver: ColumnResolver): PTableSorting[] {\n  return sorting.map((s) => {\n    const c = resolver(s.column);\n    if (isNil(c))\n      throw new Error(\n        `Invalid sorting column ${JSON.stringify(s.column)}: column reference does not match the table columns`,\n      );\n    return { ...s, column: c };\n  });\n}\n\nfunction getAllLabelColumns(\n  resultPool: AxisLabelProvider & ColumnProvider,\n): undefined | PColumn<undefined | PColumnDataUniversal>[] {\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"],"mappings":"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"}

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.d.ts

@@ -1,6 +1,6 @@
 import { PColumnDataUniversal } from "../../../render/internal.js";
 import { RenderCtxBase } from "../../../render/api.js";
-import { CreatePlDataTableOps, PlDataTableModel } from "../typesV7.js";
+import { CreatePlDataTableOps, PlDataTableModel } from "../typesV8.js";
 import { PlDataTableStateV2 } from "../state-migration.js";
 import { PColumn } from "@milaboratories/pl-model-common";
 

package/dist/components/PlDataTable/createPlDataTable/createPlDataTableV2.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createPlDataTableV2.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"mappings":";;;;;;;;;;KAuCY,0BAAA;EACV,OAAA,EAAS,OAAA,CAAQ,oBAAA;EACjB,UAAA,GAAa,kBAAA;EACb,OAAA,GAAU,oBAAA;AAAA;;;;;;;;;;iBAYI,mBAAA,OACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,OAAA,EAAS,0BAAA,aACT,UAAA,GAAa,0BAAA,gBACb,OAAA,GAAU,0BAAA,cACT,gBAAA"}
+{"version":3,"file":"createPlDataTableV2.d.ts","names":[],"sources":["../../../../src/components/PlDataTable/createPlDataTable/createPlDataTableV2.ts"],"mappings":";;;;;;;;;;KAwCY,0BAAA;EACV,OAAA,EAAS,OAAA,CAAQ,oBAAA;EACjB,UAAA,GAAa,kBAAA;EACb,OAAA,GAAU,oBAAA;AAAA;;;;;;;;;;iBAYI,mBAAA,OACd,GAAA,EAAK,aAAA,CAAc,CAAA,EAAG,CAAA,GACtB,OAAA,EAAS,0BAAA,aACT,UAAA,GAAa,0BAAA,gBACb,OAAA,GAAU,0BAAA,cACT,gBAAA"}