@platforma-sdk/model 1.53.15 → 1.54.7

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

@@ -0,0 +1 @@
+{"version":3,"file":"filterUiToExpressionImpl.js","sources":["../../../src/filters/converters/filterUiToExpressionImpl.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport {\n  and,\n  col,\n  lit,\n  or,\n  rank,\n  type Expression,\n  type ExpressionImpl,\n} from \"@milaboratories/ptabler-expression-js\";\nimport type { FilterSpec } from \"../types\";\n\nexport function convertFilterUiToExpressionImpl(value: FilterSpec): ExpressionImpl {\n  if (value.type === \"or\") {\n    const expressions = value.filters\n      .filter((f) => f.type !== undefined)\n      .map(convertFilterUiToExpressionImpl);\n    if (expressions.length === 0) {\n      throw new Error(\"OR filter requires at least one operand\");\n    }\n    return or(...expressions);\n  }\n\n  if (value.type === \"and\") {\n    const expressions = value.filters\n      .filter((f) => f.type !== undefined)\n      .map(convertFilterUiToExpressionImpl);\n    if (expressions.length === 0) {\n      throw new Error(\"AND filter requires at least one operand\");\n    }\n    return and(...expressions);\n  }\n\n  if (value.type === \"not\") {\n    return convertFilterUiToExpressionImpl(value.filter).not();\n  }\n\n  if (value.type === \"isNA\") {\n    return col(value.column).isNull();\n  }\n\n  if (value.type === \"isNotNA\") {\n    return col(value.column).isNotNull();\n  }\n\n  if (value.type === \"patternEquals\") {\n    return col(value.column).eq(lit(value.value));\n  }\n\n  if (value.type === \"patternNotEquals\") {\n    return col(value.column).neq(lit(value.value));\n  }\n\n  if (value.type === \"patternContainSubsequence\") {\n    return col(value.column).strContains(value.value, false, true);\n  }\n\n  if (value.type === \"patternNotContainSubsequence\") {\n    return col(value.column).strContains(value.value, false, true).not();\n  }\n\n  if (value.type === \"equal\") {\n    return col(value.column).eq(lit(value.x));\n  }\n\n  if (value.type === \"notEqual\") {\n    return col(value.column).neq(lit(value.x));\n  }\n\n  if (value.type === \"lessThan\") {\n    return col(value.column).lt(lit(value.x));\n  }\n\n  if (value.type === \"greaterThan\") {\n    return col(value.column).gt(lit(value.x));\n  }\n\n  if (value.type === \"lessThanOrEqual\") {\n    return col(value.column).le(lit(value.x));\n  }\n\n  if (value.type === \"greaterThanOrEqual\") {\n    return col(value.column).ge(lit(value.x));\n  }\n\n  if (value.type === \"equalToColumn\") {\n    return col(value.column).eq(col(value.rhs));\n  }\n\n  if (value.type === \"greaterThanColumn\") {\n    if (value.minDiff !== undefined && value.minDiff !== 0) {\n      return col(value.column).plus(lit(value.minDiff)).gt(col(value.rhs));\n    }\n    return col(value.column).gt(col(value.rhs));\n  }\n\n  if (value.type === \"lessThanColumn\") {\n    if (value.minDiff !== undefined && value.minDiff !== 0) {\n      return col(value.column).plus(lit(value.minDiff)).lt(col(value.rhs));\n    }\n    return col(value.column).lt(col(value.rhs));\n  }\n\n  if (value.type === \"greaterThanColumnOrEqual\") {\n    if (value.minDiff !== undefined && value.minDiff !== 0) {\n      return col(value.column).plus(lit(value.minDiff)).ge(col(value.rhs));\n    }\n    return col(value.column).ge(col(value.rhs));\n  }\n\n  if (value.type === \"lessThanColumnOrEqual\") {\n    if (value.minDiff !== undefined && value.minDiff !== 0) {\n      return col(value.column).plus(lit(value.minDiff)).le(col(value.rhs));\n    }\n    return col(value.column).le(col(value.rhs));\n  }\n\n  if (value.type === \"topN\") {\n    return rank(col(value.column), true).over([]).le(lit(value.n));\n  }\n\n  if (value.type === \"bottomN\") {\n    return rank(col(value.column), false).over([]).le(lit(value.n));\n  }\n\n  if (\n    value.type === \"patternMatchesRegularExpression\" ||\n    value.type === \"patternFuzzyContainSubsequence\" ||\n    value.type === \"inSet\" ||\n    value.type === \"notInSet\" ||\n    value.type === \"ifNa\"\n  ) {\n    throw new Error(\"Not implemented filter type: \" + value.type);\n  }\n\n  if (value.type === undefined) {\n    throw new Error(\"Filter type is undefined, this should not happen\");\n  }\n\n  assertNever(value);\n}\n\nexport function convertFilterUiToExpressions(value: FilterSpec): Expression {\n  return convertFilterUiToExpressionImpl(value).toJSON();\n}\n"],"names":[],"mappings":";;;AAYM,SAAU,+BAA+B,CAAC,KAAiB,EAAA;AAC/D,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE;AACvB,QAAA,MAAM,WAAW,GAAG,KAAK,CAAC;aACvB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;aAClC,GAAG,CAAC,+BAA+B,CAAC;AACvC,QAAA,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;AAC5B,YAAA,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC;QAC5D;AACA,QAAA,OAAO,EAAE,CAAC,GAAG,WAAW,CAAC;IAC3B;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;AACxB,QAAA,MAAM,WAAW,GAAG,KAAK,CAAC;aACvB,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,KAAK,SAAS;aAClC,GAAG,CAAC,+BAA+B,CAAC;AACvC,QAAA,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;AAC5B,YAAA,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC;QAC7D;AACA,QAAA,OAAO,GAAG,CAAC,GAAG,WAAW,CAAC;IAC5B;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE;QACxB,OAAO,+BAA+B,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE;IAC5D;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QACzB,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE;IACnC;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;QAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE;IACtC;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE;AAClC,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC/C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE;AACrC,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAChD;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,2BAA2B,EAAE;AAC9C,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC;IAChE;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,8BAA8B,EAAE;QACjD,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC,GAAG,EAAE;IACtE;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;AAC1B,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;AAC7B,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;AAC7B,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE;AAChC,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,iBAAiB,EAAE;AACpC,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,oBAAoB,EAAE;AACvC,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,eAAe,EAAE;AAClC,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE;AACtC,QAAA,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,EAAE;YACtD,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtE;AACA,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,gBAAgB,EAAE;AACnC,QAAA,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,EAAE;YACtD,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtE;AACA,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,0BAA0B,EAAE;AAC7C,QAAA,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,EAAE;YACtD,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtE;AACA,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAuB,EAAE;AAC1C,QAAA,IAAI,KAAK,CAAC,OAAO,KAAK,SAAS,IAAI,KAAK,CAAC,OAAO,KAAK,CAAC,EAAE;YACtD,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtE;AACA,QAAA,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAChE;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;QAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACjE;AAEA,IAAA,IACE,KAAK,CAAC,IAAI,KAAK,iCAAiC;QAChD,KAAK,CAAC,IAAI,KAAK,gCAAgC;QAC/C,KAAK,CAAC,IAAI,KAAK,OAAO;QACtB,KAAK,CAAC,IAAI,KAAK,UAAU;AACzB,QAAA,KAAK,CAAC,IAAI,KAAK,MAAM,EACrB;QACA,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,KAAK,CAAC,IAAI,CAAC;IAC/D;AAEA,IAAA,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;AAC5B,QAAA,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC;IACrE;IAEA,WAAW,CAAC,KAAK,CAAC;AACpB;AAEM,SAAU,4BAA4B,CAAC,KAAiB,EAAA;AAC5D,IAAA,OAAO,+BAA+B,CAAC,KAAK,CAAC,CAAC,MAAM,EAAE;AACxD;;;;"}

package/dist/filters/converters/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./filterToQuery";
+export * from "./filterUiToExpressionImpl";
+//# sourceMappingURL=index.d.ts.map

package/dist/filters/converters/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/filters/converters/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC"}

package/dist/filters/distill.cjs

@@ -0,0 +1,46 @@
+'use strict';
+
+/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */
+const KNOWN_LEAF_KEYS_TUPLE = [
+    "n",
+    "x",
+    "rhs",
+    "type",
+    "value",
+    "column",
+    "minDiff",
+    "maxEdits",
+    "wildcard",
+    "replacement",
+    "substitutionsOnly",
+];
+const KNOWN_LEAF_KEYS = new Set(KNOWN_LEAF_KEYS_TUPLE);
+function distillLeaf(node) {
+    const result = {};
+    for (const [key, value] of Object.entries(node)) {
+        if (KNOWN_LEAF_KEYS.has(key)) {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+function distillNode(node) {
+    switch (node.type) {
+        case "and":
+        case "or":
+            return { type: node.type, filters: node.filters.map(distillNode) };
+        case "not":
+            return { type: "not", filter: distillNode(node.filter) };
+        default:
+            return distillLeaf(node);
+    }
+}
+/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */
+function distillFilter(filter) {
+    if (filter == null)
+        return null;
+    return distillNode(filter);
+}
+
+exports.distillFilter = distillFilter;
+//# sourceMappingURL=distill.cjs.map

package/dist/filters/distill.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  type FilterSpec,\n  type FilterSpecLeaf,\n  type PTableFilters,\n} from \"@milaboratories/pl-model-common\";\n\n/** All possible field names that can appear in any FilterSpecLeaf variant. */\ntype FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;\n\n/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */\nconst KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [\n  \"n\",\n  \"x\",\n  \"rhs\",\n  \"type\",\n  \"value\",\n  \"column\",\n  \"minDiff\",\n  \"maxEdits\",\n  \"wildcard\",\n  \"replacement\",\n  \"substitutionsOnly\",\n];\nconst KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);\n\ntype UnknownFilterNode = FilterSpec<\n  FilterSpecLeaf<string>,\n  Record<string, unknown>,\n  Record<string, unknown>\n>;\n\nfunction distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {\n  const result: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(node)) {\n    if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {\n      result[key] = value;\n    }\n  }\n  return result as FilterSpecLeaf<string>;\n}\n\nfunction distillNode(node: UnknownFilterNode): FilterSpec<FilterSpecLeaf<string>> {\n  switch (node.type) {\n    case \"and\":\n    case \"or\":\n      return { type: node.type, filters: node.filters.map(distillNode) };\n    case \"not\":\n      return { type: \"not\", filter: distillNode(node.filter) };\n    default:\n      return distillLeaf(node as Record<string, unknown>);\n  }\n}\n\n/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */\nexport function distillFilter(filter: UnknownFilterNode | null | undefined): PTableFilters {\n  if (filter == null) return null;\n  return distillNode(filter);\n}\n"],"names":[],"mappings":";;AAUA;AACA,MAAM,qBAAqB,GAAqC;IAC9D,GAAG;IACH,GAAG;IACH,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;IACb,mBAAmB;CACpB;AACD,MAAM,eAAe,GAA2B,IAAI,GAAG,CAAC,qBAAqB,CAAC;AAQ9E,SAAS,WAAW,CAAC,IAA6B,EAAA;IAChD,MAAM,MAAM,GAA4B,EAAE;AAC1C,IAAA,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AAC/C,QAAA,IAAI,eAAe,CAAC,GAAG,CAAC,GAAwB,CAAC,EAAE;AACjD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;QACrB;IACF;AACA,IAAA,OAAO,MAAgC;AACzC;AAEA,SAAS,WAAW,CAAC,IAAuB,EAAA;AAC1C,IAAA,QAAQ,IAAI,CAAC,IAAI;AACf,QAAA,KAAK,KAAK;AACV,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;AACpE,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;AAC1D,QAAA;AACE,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAC;;AAEzD;AAEA;AACM,SAAU,aAAa,CAAC,MAA4C,EAAA;IACxE,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;AAC/B,IAAA,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B;;;;"}

package/dist/filters/distill.d.ts

@@ -0,0 +1,6 @@
+import { type FilterSpec, type FilterSpecLeaf, type PTableFilters } from "@milaboratories/pl-model-common";
+type UnknownFilterNode = FilterSpec<FilterSpecLeaf<string>, Record<string, unknown>, Record<string, unknown>>;
+/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */
+export declare function distillFilter(filter: UnknownFilterNode | null | undefined): PTableFilters;
+export {};
+//# sourceMappingURL=distill.d.ts.map

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

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

package/dist/filters/distill.js

@@ -0,0 +1,44 @@
+/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */
+const KNOWN_LEAF_KEYS_TUPLE = [
+    "n",
+    "x",
+    "rhs",
+    "type",
+    "value",
+    "column",
+    "minDiff",
+    "maxEdits",
+    "wildcard",
+    "replacement",
+    "substitutionsOnly",
+];
+const KNOWN_LEAF_KEYS = new Set(KNOWN_LEAF_KEYS_TUPLE);
+function distillLeaf(node) {
+    const result = {};
+    for (const [key, value] of Object.entries(node)) {
+        if (KNOWN_LEAF_KEYS.has(key)) {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+function distillNode(node) {
+    switch (node.type) {
+        case "and":
+        case "or":
+            return { type: node.type, filters: node.filters.map(distillNode) };
+        case "not":
+            return { type: "not", filter: distillNode(node.filter) };
+        default:
+            return distillLeaf(node);
+    }
+}
+/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */
+function distillFilter(filter) {
+    if (filter == null)
+        return null;
+    return distillNode(filter);
+}
+
+export { distillFilter };
+//# sourceMappingURL=distill.js.map

package/dist/filters/distill.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"distill.js","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  type FilterSpec,\n  type FilterSpecLeaf,\n  type PTableFilters,\n} from \"@milaboratories/pl-model-common\";\n\n/** All possible field names that can appear in any FilterSpecLeaf variant. */\ntype FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;\n\n/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */\nconst KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [\n  \"n\",\n  \"x\",\n  \"rhs\",\n  \"type\",\n  \"value\",\n  \"column\",\n  \"minDiff\",\n  \"maxEdits\",\n  \"wildcard\",\n  \"replacement\",\n  \"substitutionsOnly\",\n];\nconst KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);\n\ntype UnknownFilterNode = FilterSpec<\n  FilterSpecLeaf<string>,\n  Record<string, unknown>,\n  Record<string, unknown>\n>;\n\nfunction distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {\n  const result: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(node)) {\n    if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {\n      result[key] = value;\n    }\n  }\n  return result as FilterSpecLeaf<string>;\n}\n\nfunction distillNode(node: UnknownFilterNode): FilterSpec<FilterSpecLeaf<string>> {\n  switch (node.type) {\n    case \"and\":\n    case \"or\":\n      return { type: node.type, filters: node.filters.map(distillNode) };\n    case \"not\":\n      return { type: \"not\", filter: distillNode(node.filter) };\n    default:\n      return distillLeaf(node as Record<string, unknown>);\n  }\n}\n\n/** Strips all non-FilterSpec metadata from the filter tree (whitelist approach). */\nexport function distillFilter(filter: UnknownFilterNode | null | undefined): PTableFilters {\n  if (filter == null) return null;\n  return distillNode(filter);\n}\n"],"names":[],"mappings":"AAUA;AACA,MAAM,qBAAqB,GAAqC;IAC9D,GAAG;IACH,GAAG;IACH,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;IACb,mBAAmB;CACpB;AACD,MAAM,eAAe,GAA2B,IAAI,GAAG,CAAC,qBAAqB,CAAC;AAQ9E,SAAS,WAAW,CAAC,IAA6B,EAAA;IAChD,MAAM,MAAM,GAA4B,EAAE;AAC1C,IAAA,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AAC/C,QAAA,IAAI,eAAe,CAAC,GAAG,CAAC,GAAwB,CAAC,EAAE;AACjD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;QACrB;IACF;AACA,IAAA,OAAO,MAAgC;AACzC;AAEA,SAAS,WAAW,CAAC,IAAuB,EAAA;AAC1C,IAAA,QAAQ,IAAI,CAAC,IAAI;AACf,QAAA,KAAK,KAAK;AACV,QAAA,KAAK,IAAI;AACP,YAAA,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;AACpE,QAAA,KAAK,KAAK;AACR,YAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;AAC1D,QAAA;AACE,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAC;;AAEzD;AAEA;AACM,SAAU,aAAa,CAAC,MAA4C,EAAA;IACxE,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;AAC/B,IAAA,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B;;;;"}

package/dist/filters/index.d.ts

@@ -1,3 +1,4 @@
-export * from "./converter";
+export * from "./converters";
+export * from "./distill";
 export * from "./types";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/filters/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/dist/filters/types.d.ts

@@ -5,121 +5,5 @@ export type SimplifiedUniversalPColumnEntry = {
     label: string;
     obj: SimplifiedPColumnSpec;
 };
-export type FilterSpecNode<Leaf, CommonNode = {}, CommonLeaf = {}> = (CommonLeaf & Leaf) | (CommonNode & {
-    type: "not";
-    filter: FilterSpecNode<Leaf, CommonNode, CommonLeaf>;
-}) | (CommonNode & {
-    type: "or";
-    filters: FilterSpecNode<Leaf, CommonNode, CommonLeaf>[];
-}) | (CommonNode & {
-    type: "and";
-    filters: FilterSpecNode<Leaf, CommonNode, CommonLeaf>[];
-});
-export type FilterSpecLeaf<T = SUniversalPColumnId> = {
-    type: undefined;
-} | {
-    type: "isNA";
-    column: T;
-} | {
-    type: "isNotNA";
-    column: T;
-} | {
-    type: "patternEquals";
-    column: T;
-    value: string;
-} | {
-    type: "patternNotEquals";
-    column: T;
-    value: string;
-} | {
-    type: "patternContainSubsequence";
-    column: T;
-    value: string;
-} | {
-    type: "patternNotContainSubsequence";
-    column: T;
-    value: string;
-} | {
-    type: "patternMatchesRegularExpression";
-    column: T;
-    value: string;
-} | {
-    type: "patternFuzzyContainSubsequence";
-    column: T;
-    value: string;
-    maxEdits?: number;
-    substitutionsOnly?: boolean;
-    wildcard?: string;
-} | {
-    type: "inSet";
-    column: T;
-    value: string[];
-} | {
-    type: "notInSet";
-    column: T;
-    value: string[];
-} | {
-    type: "topN";
-    column: T;
-    n: number;
-} | {
-    type: "bottomN";
-    column: T;
-    n: number;
-} | {
-    type: "equal";
-    column: T;
-    x: number;
-} | {
-    type: "notEqual";
-    column: T;
-    x: number;
-} | {
-    type: "lessThan";
-    column: T;
-    x: number;
-} | {
-    type: "greaterThan";
-    column: T;
-    x: number;
-} | {
-    type: "lessThanOrEqual";
-    column: T;
-    x: number;
-} | {
-    type: "greaterThanOrEqual";
-    column: T;
-    x: number;
-} | {
-    type: "equalToColumn";
-    column: T;
-    rhs: T;
-} | {
-    type: "lessThanColumn";
-    column: T;
-    rhs: T;
-    minDiff?: number;
-} | {
-    type: "greaterThanColumn";
-    column: T;
-    rhs: T;
-    minDiff?: number;
-} | {
-    type: "lessThanColumnOrEqual";
-    column: T;
-    rhs: T;
-    minDiff?: number;
-} | {
-    type: "greaterThanColumnOrEqual";
-    column: T;
-    rhs: T;
-    minDiff?: number;
-};
-export type FilterSpec<Leaf extends FilterSpecLeaf<unknown> = FilterSpecLeaf<SUniversalPColumnId>, CommonNode = {}, CommonLeaf = CommonNode> = FilterSpecNode<Leaf, CommonNode, CommonLeaf>;
-export type FilterSpecType = Exclude<FilterSpec, {
-    type: undefined;
-}>["type"];
-export type FilterSpecOfType<T extends FilterSpecType> = Extract<FilterSpec, {
-    type: T;
-}>;
+export type { FilterSpecNode, FilterSpecLeaf, FilterSpec, FilterSpecType, FilterSpecOfType, PTableFilters, } from "@milaboratories/pl-model-common";
 //# sourceMappingURL=types.d.ts.map

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

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

package/dist/index.cjs

@@ -9,7 +9,8 @@ var normalization = require('./bconfig/normalization.cjs');
 var types = require('./bconfig/types.cjs');
 var PFrameForGraphs = require('./components/PFrameForGraphs.cjs');
 var filters_ui = require('./components/PlAnnotations/filters_ui.cjs');
-var PlDataTable = require('./components/PlDataTable.cjs');
+var stateMigration = require('./components/PlDataTable/state-migration.cjs');
+var table = require('./components/PlDataTable/table.cjs');
 var PlMultiSequenceAlignment = require('./components/PlMultiSequenceAlignment.cjs');
 var PlSelectionModel = require('./components/PlSelectionModel.cjs');
 var actions = require('./config/actions.cjs');
@@ -24,8 +25,10 @@ var column_collection = require('./render/util/column_collection.cjs');
 var future = require('./render/future.cjs');
 var sdk_info = require('./sdk_info.cjs');
 var raw_globals = require('./raw_globals.cjs');
-var converter = require('./filters/converter.cjs');
-var converter$1 = require('./annotations/converter.cjs');
+var filterToQuery = require('./filters/converters/filterToQuery.cjs');
+var filterUiToExpressionImpl = require('./filters/converters/filterUiToExpressionImpl.cjs');
+var distill = require('./filters/distill.cjs');
+var converter = require('./annotations/converter.cjs');
 var index = require('./pframe_utils/index.cjs');
 var plModelCommon = require('@milaboratories/pl-model-common');
 var plErrorLike = require('@milaboratories/pl-error-like');
@@ -78,15 +81,12 @@ exports.compileAnnotationScript = filters_ui.compileAnnotationScript;
 exports.compileFilter = filters_ui.compileFilter;
 exports.compileFilters = filters_ui.compileFilters;
 exports.unreachable = filters_ui.unreachable;
-exports.createPlDataTableSheet = PlDataTable.createPlDataTableSheet;
-exports.createPlDataTableStateV2 = PlDataTable.createPlDataTableStateV2;
-exports.createPlDataTableV2 = PlDataTable.createPlDataTableV2;
-exports.getAllLabelColumns = PlDataTable.getAllLabelColumns;
-exports.getMatchingLabelColumns = PlDataTable.getMatchingLabelColumns;
-exports.isColumnHidden = PlDataTable.isColumnHidden;
-exports.isColumnOptional = PlDataTable.isColumnOptional;
-exports.makeDefaultPTableParams = PlDataTable.makeDefaultPTableParams;
-exports.upgradePlDataTableStateV2 = PlDataTable.upgradePlDataTableStateV2;
+exports.createDefaultPTableParams = stateMigration.createDefaultPTableParams;
+exports.createPlDataTableStateV2 = stateMigration.createPlDataTableStateV2;
+exports.upgradePlDataTableStateV2 = stateMigration.upgradePlDataTableStateV2;
+exports.createPlDataTableV2 = table.createPlDataTableV2;
+exports.isColumnHidden = table.isColumnHidden;
+exports.isColumnOptional = table.isColumnOptional;
 exports.createRowSelectionColumn = PlMultiSequenceAlignment.createRowSelectionColumn;
 exports.createPlSelectionModel = PlSelectionModel.createPlSelectionModel;
 exports.Args = actions.Args;
@@ -154,9 +154,11 @@ exports.FutureRef = future.FutureRef;
 exports.CurrentSdkInfo = sdk_info.CurrentSdkInfo;
 exports.getPlatformaApiVersion = raw_globals.getPlatformaApiVersion;
 exports.getRawPlatformaInstance = raw_globals.getRawPlatformaInstance;
-exports.convertFilterUiToExpressionImpl = converter.convertFilterUiToExpressionImpl;
-exports.convertFilterUiToExpressions = converter.convertFilterUiToExpressions;
-exports.convertFilterSpecsToExpressionSpecs = converter$1.convertFilterSpecsToExpressionSpecs;
+exports.filterSpecToSpecQueryExpr = filterToQuery.filterSpecToSpecQueryExpr;
+exports.convertFilterUiToExpressionImpl = filterUiToExpressionImpl.convertFilterUiToExpressionImpl;
+exports.convertFilterUiToExpressions = filterUiToExpressionImpl.convertFilterUiToExpressions;
+exports.distillFilter = distill.distillFilter;
+exports.convertFilterSpecsToExpressionSpecs = converter.convertFilterSpecsToExpressionSpecs;
 exports.getAxisUniqueValues = index.getAxisUniqueValues;
 exports.getColumnOrAxisValueLabelsId = index.getColumnOrAxisValueLabelsId;
 exports.getColumnSpecById = index.getColumnSpecById;

package/dist/index.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/index.js

@@ -7,7 +7,8 @@ export { downgradeCfgOrLambda, extractConfig } from './bconfig/normalization.js'
 export { isConfigLambda } from './bconfig/types.js';
 export { createPFrameForGraphs, enrichCompatible, getAvailableWithLinkersAxes, isHiddenFromGraphColumn, isHiddenFromUIColumn } from './components/PFrameForGraphs.js';
 export { compileAnnotationScript, compileFilter, compileFilters, unreachable } from './components/PlAnnotations/filters_ui.js';
-export { createPlDataTableSheet, createPlDataTableStateV2, createPlDataTableV2, getAllLabelColumns, getMatchingLabelColumns, isColumnHidden, isColumnOptional, makeDefaultPTableParams, upgradePlDataTableStateV2 } from './components/PlDataTable.js';
+export { createDefaultPTableParams, createPlDataTableStateV2, upgradePlDataTableStateV2 } from './components/PlDataTable/state-migration.js';
+export { createPlDataTableV2, isColumnHidden, isColumnOptional } from './components/PlDataTable/table.js';
 export { createRowSelectionColumn } from './components/PlMultiSequenceAlignment.js';
 export { createPlSelectionModel } from './components/PlSelectionModel.js';
 export { Args, It, MainOutputs, StagingOutputs, UiState, and, extractArchiveAndGetURL, flatten, getBlobContent, getBlobContentAsJson, getBlobContentAsString, getDownloadedBlobContent, getFromCfg, getImmediate, getImportProgress, getJsonField, getLastLogs, getLogHandle, getOnDemandBlobContent, getProgressLog, getProgressLogWithInfo, getResourceField, getResourceValueAsJson, isEmpty, isolate, makeArray, makeObject, mapArrayValues, mapRecordValues, mapResourceFields, not, or } from './config/actions.js';
@@ -22,7 +23,9 @@ export { PColumnCollection } from './render/util/column_collection.js';
 export { FutureRef } from './render/future.js';
 export { CurrentSdkInfo } from './sdk_info.js';
 export { getPlatformaApiVersion, getRawPlatformaInstance } from './raw_globals.js';
-export { convertFilterUiToExpressionImpl, convertFilterUiToExpressions } from './filters/converter.js';
+export { filterSpecToSpecQueryExpr } from './filters/converters/filterToQuery.js';
+export { convertFilterUiToExpressionImpl, convertFilterUiToExpressions } from './filters/converters/filterUiToExpressionImpl.js';
+export { distillFilter } from './filters/distill.js';
 export { convertFilterSpecsToExpressionSpecs } from './annotations/converter.js';
 export { getAxisUniqueValues, getColumnOrAxisValueLabelsId, getColumnSpecById, getColumnUniqueValues, getColumnsFull, getRequestColumnsFromSelectedSources, getSingleColumnData, getUniqueSourceValuesWithLabels } from './pframe_utils/index.js';
 export * from '@milaboratories/pl-model-common';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/package.json.cjs

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

package/dist/package.json.js

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

package/dist/pframe_utils/columns.cjs

@@ -2,6 +2,8 @@
 
 var plModelCommon = require('@milaboratories/pl-model-common');
 var PFrameForGraphs = require('../components/PFrameForGraphs.cjs');
+require('@milaboratories/ptabler-expression-js');
+require('../filters/distill.cjs');
 require('canonicalize');
 var column_collection = require('../render/util/column_collection.cjs');
 require('../render/util/label.cjs');

package/dist/pframe_utils/columns.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"columns.cjs","sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"../components\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"../components\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return extendedColumns;\n}\n"],"names":["PColumnCollection","getNormalizedAxesList","getAxisId","canonicalizeJson","enrichCompatible","isLinkerColumn","getAvailableWithLinkersAxes","matchAxisId","isLabelColumn"],"mappings":"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"}
+{"version":3,"file":"columns.cjs","sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"../components\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"../components\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return extendedColumns;\n}\n"],"names":["PColumnCollection","getNormalizedAxesList","getAxisId","canonicalizeJson","enrichCompatible","isLinkerColumn","getAvailableWithLinkersAxes","matchAxisId","isLabelColumn"],"mappings":"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"}

package/dist/pframe_utils/columns.js

@@ -1,5 +1,7 @@
 import { getNormalizedAxesList, getAxisId, canonicalizeJson, isLinkerColumn, matchAxisId, isLabelColumn } from '@milaboratories/pl-model-common';
 import { enrichCompatible, getAvailableWithLinkersAxes } from '../components/PFrameForGraphs.js';
+import '@milaboratories/ptabler-expression-js';
+import '../filters/distill.js';
 import 'canonicalize';
 import { PColumnCollection } from '../render/util/column_collection.js';
 import '../render/util/label.js';

package/dist/pframe_utils/columns.js.map

@@ -1 +1 @@
-{"version":3,"file":"columns.js","sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"../components\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"../components\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return extendedColumns;\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"columns.js","sources":["../../src/pframe_utils/columns.ts"],"sourcesContent":["import type { PColumn, PColumnSpec, PColumnLazy, PFrameDef } from \"@milaboratories/pl-model-common\";\nimport {\n  getNormalizedAxesList,\n  getAxisId,\n  canonicalizeJson,\n  isLinkerColumn,\n  matchAxisId,\n  isLabelColumn,\n} from \"@milaboratories/pl-model-common\";\nimport type { AxesVault } from \"../components\";\nimport { enrichCompatible, getAvailableWithLinkersAxes } from \"../components\";\nimport type { RenderCtxBase, PColumnDataUniversal } from \"../render\";\nimport { PColumnCollection } from \"../render\";\n\nexport function getAllRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  predicate: (spec: PColumnSpec) => boolean,\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block doesn't produce own columns then use all columns from result pool\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  const allColumns =\n    columns.getColumns(predicate, {\n      dontWaitAllData: true,\n      overrideLabelAnnotation: false,\n    }) ?? [];\n\n  const allAxes: AxesVault = new Map(\n    allColumns\n      .flatMap((column) => getNormalizedAxesList(column.spec.axesSpec))\n      .map((axisSpec) => {\n        const axisId = getAxisId(axisSpec);\n        return [canonicalizeJson(axisId), axisSpec];\n      }),\n  );\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(allAxes, allColumns);\n\n  return extendedColumns;\n}\n\nexport function getRelatedColumns<A, U>(\n  ctx: RenderCtxBase<A, U>,\n  {\n    columns: rootColumns,\n    predicate,\n  }: {\n    columns: PColumn<PColumnDataUniversal>[];\n    predicate: (spec: PColumnSpec) => boolean;\n  },\n): PFrameDef<PColumn<PColumnDataUniversal> | PColumnLazy<undefined | PColumnDataUniversal>> {\n  // if current block has its own columns then take from result pool only compatible with them\n  const columns = new PColumnCollection();\n  columns.addColumnProvider(ctx.resultPool);\n  columns.addColumns(rootColumns);\n\n  // all possible axes from block columns\n  const blockAxes: AxesVault = new Map();\n  // axes from block columns and compatible result pool columns\n  const allAxes: AxesVault = new Map();\n  for (const c of rootColumns) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      blockAxes.set(canonicalizeJson(aid), spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  // all linker columns always go to pFrame - even it's impossible to use some of them they all are hidden\n  const linkerColumns =\n    columns.getColumns((spec) => predicate(spec) && isLinkerColumn(spec), {\n      dontWaitAllData: true,\n    }) ?? [];\n  const availableWithLinkersAxes = getAvailableWithLinkersAxes(linkerColumns, blockAxes);\n\n  // all possible axes from connected linkers\n  for (const item of availableWithLinkersAxes) {\n    blockAxes.set(...item);\n    allAxes.set(...item);\n  }\n\n  const blockAxesArr = Array.from(blockAxes.values());\n  // all compatible with block columns but without label columns\n  let compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return blockAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // extend axes set for label columns request\n  for (const c of compatibleWithoutLabels) {\n    for (const spec of getNormalizedAxesList(c.spec.axesSpec)) {\n      const aid = getAxisId(spec);\n      allAxes.set(canonicalizeJson(aid), spec);\n    }\n  }\n\n  const allAxesArr = Array.from(allAxes.values());\n  // extend allowed columns - add columns thad doesn't have axes from block, but have all axes in 'allAxes' list (that means all axes from linkers or from 'hanging' of other selected columns)\n  compatibleWithoutLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.every((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => !isLabelColumn(column.spec));\n\n  // label columns must be compatible with full set of axes - block axes and axes from compatible columns from result pool\n  const compatibleLabels = (\n    columns.getColumns(\n      (spec) =>\n        predicate(spec) &&\n        spec.axesSpec.some((axisSpec) => {\n          const axisId = getAxisId(axisSpec);\n          return allAxesArr.some((selectorAxisSpec) =>\n            matchAxisId(getAxisId(selectorAxisSpec), axisId),\n          );\n        }),\n      { dontWaitAllData: true, overrideLabelAnnotation: false },\n    ) ?? []\n  ).filter((column) => isLabelColumn(column.spec));\n\n  const compatible = [...compatibleWithoutLabels, ...compatibleLabels];\n\n  // additional columns are duplicates with extra fields in domains for compatibility if there are ones with partial match\n  const extendedColumns = enrichCompatible(blockAxes, compatible);\n\n  return extendedColumns;\n}\n"],"names":[],"mappings":"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"}

package/dist/pframe_utils/index.cjs

@@ -2,6 +2,8 @@
 
 var esToolkit = require('es-toolkit');
 var plModelCommon = require('@milaboratories/pl-model-common');
+require('@milaboratories/ptabler-expression-js');
+require('../filters/distill.cjs');
 require('canonicalize');
 require('../render/util/label.cjs');