@platforma-sdk/model 1.54.9 → 1.54.10

package/dist/filters/converters/filterUiToExpressionImpl.cjs

@@ -2,109 +2,89 @@
 
 var plModelCommon = require('@milaboratories/pl-model-common');
 var ptablerExpressionJs = require('@milaboratories/ptabler-expression-js');
+var traverse = require('../traverse.cjs');
 
 function convertFilterUiToExpressionImpl(value) {
-    if (value.type === "or") {
-        const expressions = value.filters
-            .filter((f) => f.type !== undefined)
-            .map(convertFilterUiToExpressionImpl);
-        if (expressions.length === 0) {
-            throw new Error("OR filter requires at least one operand");
-        }
-        return ptablerExpressionJs.or(...expressions);
-    }
-    if (value.type === "and") {
-        const expressions = value.filters
-            .filter((f) => f.type !== undefined)
-            .map(convertFilterUiToExpressionImpl);
-        if (expressions.length === 0) {
-            throw new Error("AND filter requires at least one operand");
-        }
-        return ptablerExpressionJs.and(...expressions);
-    }
-    if (value.type === "not") {
-        return convertFilterUiToExpressionImpl(value.filter).not();
-    }
-    if (value.type === "isNA") {
-        return ptablerExpressionJs.col(value.column).isNull();
-    }
-    if (value.type === "isNotNA") {
-        return ptablerExpressionJs.col(value.column).isNotNull();
-    }
-    if (value.type === "patternEquals") {
-        return ptablerExpressionJs.col(value.column).eq(ptablerExpressionJs.lit(value.value));
-    }
-    if (value.type === "patternNotEquals") {
-        return ptablerExpressionJs.col(value.column).neq(ptablerExpressionJs.lit(value.value));
-    }
-    if (value.type === "patternContainSubsequence") {
-        return ptablerExpressionJs.col(value.column).strContains(value.value, false, true);
-    }
-    if (value.type === "patternNotContainSubsequence") {
-        return ptablerExpressionJs.col(value.column).strContains(value.value, false, true).not();
-    }
-    if (value.type === "equal") {
-        return ptablerExpressionJs.col(value.column).eq(ptablerExpressionJs.lit(value.x));
-    }
-    if (value.type === "notEqual") {
-        return ptablerExpressionJs.col(value.column).neq(ptablerExpressionJs.lit(value.x));
-    }
-    if (value.type === "lessThan") {
-        return ptablerExpressionJs.col(value.column).lt(ptablerExpressionJs.lit(value.x));
-    }
-    if (value.type === "greaterThan") {
-        return ptablerExpressionJs.col(value.column).gt(ptablerExpressionJs.lit(value.x));
-    }
-    if (value.type === "lessThanOrEqual") {
-        return ptablerExpressionJs.col(value.column).le(ptablerExpressionJs.lit(value.x));
-    }
-    if (value.type === "greaterThanOrEqual") {
-        return ptablerExpressionJs.col(value.column).ge(ptablerExpressionJs.lit(value.x));
-    }
-    if (value.type === "equalToColumn") {
-        return ptablerExpressionJs.col(value.column).eq(ptablerExpressionJs.col(value.rhs));
-    }
-    if (value.type === "greaterThanColumn") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).gt(ptablerExpressionJs.col(value.rhs));
-        }
-        return ptablerExpressionJs.col(value.column).gt(ptablerExpressionJs.col(value.rhs));
-    }
-    if (value.type === "lessThanColumn") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).lt(ptablerExpressionJs.col(value.rhs));
-        }
-        return ptablerExpressionJs.col(value.column).lt(ptablerExpressionJs.col(value.rhs));
-    }
-    if (value.type === "greaterThanColumnOrEqual") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).ge(ptablerExpressionJs.col(value.rhs));
-        }
-        return ptablerExpressionJs.col(value.column).ge(ptablerExpressionJs.col(value.rhs));
-    }
-    if (value.type === "lessThanColumnOrEqual") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).le(ptablerExpressionJs.col(value.rhs));
-        }
-        return ptablerExpressionJs.col(value.column).le(ptablerExpressionJs.col(value.rhs));
-    }
-    if (value.type === "topN") {
-        return ptablerExpressionJs.rank(ptablerExpressionJs.col(value.column), true).over([]).le(ptablerExpressionJs.lit(value.n));
-    }
-    if (value.type === "bottomN") {
-        return ptablerExpressionJs.rank(ptablerExpressionJs.col(value.column), false).over([]).le(ptablerExpressionJs.lit(value.n));
-    }
-    if (value.type === "patternMatchesRegularExpression" ||
-        value.type === "patternFuzzyContainSubsequence" ||
-        value.type === "inSet" ||
-        value.type === "notInSet" ||
-        value.type === "ifNa") {
-        throw new Error("Not implemented filter type: " + value.type);
-    }
-    if (value.type === undefined) {
-        throw new Error("Filter type is undefined, this should not happen");
+    return traverse.traverseFilterSpec(value, {
+        leaf: leafToExpressionImpl,
+        and: (expressions) => {
+            if (expressions.length === 0) {
+                throw new Error("AND filter requires at least one operand");
+            }
+            return ptablerExpressionJs.and(...expressions);
+        },
+        or: (expressions) => {
+            if (expressions.length === 0) {
+                throw new Error("OR filter requires at least one operand");
+            }
+            return ptablerExpressionJs.or(...expressions);
+        },
+        not: (result) => result.not(),
+    });
+}
+function leafToExpressionImpl(value) {
+    switch (value.type) {
+        case "isNA":
+            return ptablerExpressionJs.col(value.column).isNull();
+        case "isNotNA":
+            return ptablerExpressionJs.col(value.column).isNotNull();
+        case "patternEquals":
+            return ptablerExpressionJs.col(value.column).eq(ptablerExpressionJs.lit(value.value));
+        case "patternNotEquals":
+            return ptablerExpressionJs.col(value.column).neq(ptablerExpressionJs.lit(value.value));
+        case "patternContainSubsequence":
+            return ptablerExpressionJs.col(value.column).strContains(value.value, false, true);
+        case "patternNotContainSubsequence":
+            return ptablerExpressionJs.col(value.column).strContains(value.value, false, true).not();
+        case "equal":
+            return ptablerExpressionJs.col(value.column).eq(ptablerExpressionJs.lit(value.x));
+        case "notEqual":
+            return ptablerExpressionJs.col(value.column).neq(ptablerExpressionJs.lit(value.x));
+        case "lessThan":
+            return ptablerExpressionJs.col(value.column).lt(ptablerExpressionJs.lit(value.x));
+        case "greaterThan":
+            return ptablerExpressionJs.col(value.column).gt(ptablerExpressionJs.lit(value.x));
+        case "lessThanOrEqual":
+            return ptablerExpressionJs.col(value.column).le(ptablerExpressionJs.lit(value.x));
+        case "greaterThanOrEqual":
+            return ptablerExpressionJs.col(value.column).ge(ptablerExpressionJs.lit(value.x));
+        case "equalToColumn":
+            return ptablerExpressionJs.col(value.column).eq(ptablerExpressionJs.col(value.rhs));
+        case "greaterThanColumn":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).gt(ptablerExpressionJs.col(value.rhs));
+            }
+            return ptablerExpressionJs.col(value.column).gt(ptablerExpressionJs.col(value.rhs));
+        case "lessThanColumn":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).lt(ptablerExpressionJs.col(value.rhs));
+            }
+            return ptablerExpressionJs.col(value.column).lt(ptablerExpressionJs.col(value.rhs));
+        case "greaterThanColumnOrEqual":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).ge(ptablerExpressionJs.col(value.rhs));
+            }
+            return ptablerExpressionJs.col(value.column).ge(ptablerExpressionJs.col(value.rhs));
+        case "lessThanColumnOrEqual":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return ptablerExpressionJs.col(value.column).plus(ptablerExpressionJs.lit(value.minDiff)).le(ptablerExpressionJs.col(value.rhs));
+            }
+            return ptablerExpressionJs.col(value.column).le(ptablerExpressionJs.col(value.rhs));
+        case "topN":
+            return ptablerExpressionJs.rank(ptablerExpressionJs.col(value.column), true).over([]).le(ptablerExpressionJs.lit(value.n));
+        case "bottomN":
+            return ptablerExpressionJs.rank(ptablerExpressionJs.col(value.column), false).over([]).le(ptablerExpressionJs.lit(value.n));
+        case "patternMatchesRegularExpression":
+        case "patternFuzzyContainSubsequence":
+        case "inSet":
+        case "notInSet":
+        case "ifNa":
+            throw new Error("Not implemented filter type: " + value.type);
+        case undefined:
+            throw new Error("Filter type is undefined, this should not happen");
+        default:
+            plModelCommon.assertNever(value);
     }
-    plModelCommon.assertNever(value);
 }
 function convertFilterUiToExpressions(value) {
     return convertFilterUiToExpressionImpl(value).toJSON();

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

@@ -1 +1 @@
-{"version":3,"file":"filterUiToExpressionImpl.cjs","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":["or","and","col","lit","rank","assertNever"],"mappings":"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"}
+{"version":3,"file":"filterUiToExpressionImpl.cjs","sources":["../../../src/filters/converters/filterUiToExpressionImpl.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type { FilterSpecLeaf } 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\";\nimport { traverseFilterSpec } from \"../traverse\";\n\nexport function convertFilterUiToExpressionImpl(value: FilterSpec): ExpressionImpl {\n  return traverseFilterSpec(value, {\n    leaf: leafToExpressionImpl,\n    and: (expressions) => {\n      if (expressions.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return and(...expressions);\n    },\n    or: (expressions) => {\n      if (expressions.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return or(...expressions);\n    },\n    not: (result) => result.not(),\n  });\n}\n\nfunction leafToExpressionImpl(value: FilterSpecLeaf): ExpressionImpl {\n  switch (value.type) {\n    case \"isNA\":\n      return col(value.column).isNull();\n    case \"isNotNA\":\n      return col(value.column).isNotNull();\n    case \"patternEquals\":\n      return col(value.column).eq(lit(value.value));\n    case \"patternNotEquals\":\n      return col(value.column).neq(lit(value.value));\n    case \"patternContainSubsequence\":\n      return col(value.column).strContains(value.value, false, true);\n    case \"patternNotContainSubsequence\":\n      return col(value.column).strContains(value.value, false, true).not();\n    case \"equal\":\n      return col(value.column).eq(lit(value.x));\n    case \"notEqual\":\n      return col(value.column).neq(lit(value.x));\n    case \"lessThan\":\n      return col(value.column).lt(lit(value.x));\n    case \"greaterThan\":\n      return col(value.column).gt(lit(value.x));\n    case \"lessThanOrEqual\":\n      return col(value.column).le(lit(value.x));\n    case \"greaterThanOrEqual\":\n      return col(value.column).ge(lit(value.x));\n    case \"equalToColumn\":\n      return col(value.column).eq(col(value.rhs));\n    case \"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    case \"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    case \"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    case \"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    case \"topN\":\n      return rank(col(value.column), true).over([]).le(lit(value.n));\n    case \"bottomN\":\n      return rank(col(value.column), false).over([]).le(lit(value.n));\n    case \"patternMatchesRegularExpression\":\n    case \"patternFuzzyContainSubsequence\":\n    case \"inSet\":\n    case \"notInSet\":\n    case \"ifNa\":\n      throw new Error(\"Not implemented filter type: \" + value.type);\n    case undefined:\n      throw new Error(\"Filter type is undefined, this should not happen\");\n    default:\n      assertNever(value);\n  }\n}\n\nexport function convertFilterUiToExpressions(value: FilterSpec): Expression {\n  return convertFilterUiToExpressionImpl(value).toJSON();\n}\n"],"names":["traverseFilterSpec","and","or","col","lit","rank","assertNever"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"filterUiToExpressionImpl.d.ts","sourceRoot":"","sources":["../../../src/filters/converters/filterUiToExpressionImpl.ts"],"names":[],"mappings":"AACA,OAAO,EAML,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,UAAU,GAAG,cAAc,CAgIjF;AAED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAE1E"}
+{"version":3,"file":"filterUiToExpressionImpl.d.ts","sourceRoot":"","sources":["../../../src/filters/converters/filterUiToExpressionImpl.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAG3C,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,UAAU,GAAG,cAAc,CAiBjF;AAmED,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU,CAE1E"}

package/dist/filters/converters/filterUiToExpressionImpl.js

@@ -1,108 +1,88 @@
 import { assertNever } from '@milaboratories/pl-model-common';
-import { or, and, col, lit, rank } from '@milaboratories/ptabler-expression-js';
+import { or, and, rank, col, lit } from '@milaboratories/ptabler-expression-js';
+import { traverseFilterSpec } from '../traverse.js';
 
 function convertFilterUiToExpressionImpl(value) {
-    if (value.type === "or") {
-        const expressions = value.filters
-            .filter((f) => f.type !== undefined)
-            .map(convertFilterUiToExpressionImpl);
-        if (expressions.length === 0) {
-            throw new Error("OR filter requires at least one operand");
-        }
-        return or(...expressions);
-    }
-    if (value.type === "and") {
-        const expressions = value.filters
-            .filter((f) => f.type !== undefined)
-            .map(convertFilterUiToExpressionImpl);
-        if (expressions.length === 0) {
-            throw new Error("AND filter requires at least one operand");
-        }
-        return and(...expressions);
-    }
-    if (value.type === "not") {
-        return convertFilterUiToExpressionImpl(value.filter).not();
-    }
-    if (value.type === "isNA") {
-        return col(value.column).isNull();
-    }
-    if (value.type === "isNotNA") {
-        return col(value.column).isNotNull();
-    }
-    if (value.type === "patternEquals") {
-        return col(value.column).eq(lit(value.value));
-    }
-    if (value.type === "patternNotEquals") {
-        return col(value.column).neq(lit(value.value));
-    }
-    if (value.type === "patternContainSubsequence") {
-        return col(value.column).strContains(value.value, false, true);
-    }
-    if (value.type === "patternNotContainSubsequence") {
-        return col(value.column).strContains(value.value, false, true).not();
-    }
-    if (value.type === "equal") {
-        return col(value.column).eq(lit(value.x));
-    }
-    if (value.type === "notEqual") {
-        return col(value.column).neq(lit(value.x));
-    }
-    if (value.type === "lessThan") {
-        return col(value.column).lt(lit(value.x));
-    }
-    if (value.type === "greaterThan") {
-        return col(value.column).gt(lit(value.x));
-    }
-    if (value.type === "lessThanOrEqual") {
-        return col(value.column).le(lit(value.x));
-    }
-    if (value.type === "greaterThanOrEqual") {
-        return col(value.column).ge(lit(value.x));
-    }
-    if (value.type === "equalToColumn") {
-        return col(value.column).eq(col(value.rhs));
-    }
-    if (value.type === "greaterThanColumn") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return col(value.column).plus(lit(value.minDiff)).gt(col(value.rhs));
-        }
-        return col(value.column).gt(col(value.rhs));
-    }
-    if (value.type === "lessThanColumn") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return col(value.column).plus(lit(value.minDiff)).lt(col(value.rhs));
-        }
-        return col(value.column).lt(col(value.rhs));
-    }
-    if (value.type === "greaterThanColumnOrEqual") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return col(value.column).plus(lit(value.minDiff)).ge(col(value.rhs));
-        }
-        return col(value.column).ge(col(value.rhs));
-    }
-    if (value.type === "lessThanColumnOrEqual") {
-        if (value.minDiff !== undefined && value.minDiff !== 0) {
-            return col(value.column).plus(lit(value.minDiff)).le(col(value.rhs));
-        }
-        return col(value.column).le(col(value.rhs));
-    }
-    if (value.type === "topN") {
-        return rank(col(value.column), true).over([]).le(lit(value.n));
-    }
-    if (value.type === "bottomN") {
-        return rank(col(value.column), false).over([]).le(lit(value.n));
-    }
-    if (value.type === "patternMatchesRegularExpression" ||
-        value.type === "patternFuzzyContainSubsequence" ||
-        value.type === "inSet" ||
-        value.type === "notInSet" ||
-        value.type === "ifNa") {
-        throw new Error("Not implemented filter type: " + value.type);
-    }
-    if (value.type === undefined) {
-        throw new Error("Filter type is undefined, this should not happen");
+    return traverseFilterSpec(value, {
+        leaf: leafToExpressionImpl,
+        and: (expressions) => {
+            if (expressions.length === 0) {
+                throw new Error("AND filter requires at least one operand");
+            }
+            return and(...expressions);
+        },
+        or: (expressions) => {
+            if (expressions.length === 0) {
+                throw new Error("OR filter requires at least one operand");
+            }
+            return or(...expressions);
+        },
+        not: (result) => result.not(),
+    });
+}
+function leafToExpressionImpl(value) {
+    switch (value.type) {
+        case "isNA":
+            return col(value.column).isNull();
+        case "isNotNA":
+            return col(value.column).isNotNull();
+        case "patternEquals":
+            return col(value.column).eq(lit(value.value));
+        case "patternNotEquals":
+            return col(value.column).neq(lit(value.value));
+        case "patternContainSubsequence":
+            return col(value.column).strContains(value.value, false, true);
+        case "patternNotContainSubsequence":
+            return col(value.column).strContains(value.value, false, true).not();
+        case "equal":
+            return col(value.column).eq(lit(value.x));
+        case "notEqual":
+            return col(value.column).neq(lit(value.x));
+        case "lessThan":
+            return col(value.column).lt(lit(value.x));
+        case "greaterThan":
+            return col(value.column).gt(lit(value.x));
+        case "lessThanOrEqual":
+            return col(value.column).le(lit(value.x));
+        case "greaterThanOrEqual":
+            return col(value.column).ge(lit(value.x));
+        case "equalToColumn":
+            return col(value.column).eq(col(value.rhs));
+        case "greaterThanColumn":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return col(value.column).plus(lit(value.minDiff)).gt(col(value.rhs));
+            }
+            return col(value.column).gt(col(value.rhs));
+        case "lessThanColumn":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return col(value.column).plus(lit(value.minDiff)).lt(col(value.rhs));
+            }
+            return col(value.column).lt(col(value.rhs));
+        case "greaterThanColumnOrEqual":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return col(value.column).plus(lit(value.minDiff)).ge(col(value.rhs));
+            }
+            return col(value.column).ge(col(value.rhs));
+        case "lessThanColumnOrEqual":
+            if (value.minDiff !== undefined && value.minDiff !== 0) {
+                return col(value.column).plus(lit(value.minDiff)).le(col(value.rhs));
+            }
+            return col(value.column).le(col(value.rhs));
+        case "topN":
+            return rank(col(value.column), true).over([]).le(lit(value.n));
+        case "bottomN":
+            return rank(col(value.column), false).over([]).le(lit(value.n));
+        case "patternMatchesRegularExpression":
+        case "patternFuzzyContainSubsequence":
+        case "inSet":
+        case "notInSet":
+        case "ifNa":
+            throw new Error("Not implemented filter type: " + value.type);
+        case undefined:
+            throw new Error("Filter type is undefined, this should not happen");
+        default:
+            assertNever(value);
     }
-    assertNever(value);
 }
 function convertFilterUiToExpressions(value) {
     return convertFilterUiToExpressionImpl(value).toJSON();

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

@@ -1 +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":"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"}
+{"version":3,"file":"filterUiToExpressionImpl.js","sources":["../../../src/filters/converters/filterUiToExpressionImpl.ts"],"sourcesContent":["import { assertNever } from \"@milaboratories/pl-model-common\";\nimport type { FilterSpecLeaf } 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\";\nimport { traverseFilterSpec } from \"../traverse\";\n\nexport function convertFilterUiToExpressionImpl(value: FilterSpec): ExpressionImpl {\n  return traverseFilterSpec(value, {\n    leaf: leafToExpressionImpl,\n    and: (expressions) => {\n      if (expressions.length === 0) {\n        throw new Error(\"AND filter requires at least one operand\");\n      }\n      return and(...expressions);\n    },\n    or: (expressions) => {\n      if (expressions.length === 0) {\n        throw new Error(\"OR filter requires at least one operand\");\n      }\n      return or(...expressions);\n    },\n    not: (result) => result.not(),\n  });\n}\n\nfunction leafToExpressionImpl(value: FilterSpecLeaf): ExpressionImpl {\n  switch (value.type) {\n    case \"isNA\":\n      return col(value.column).isNull();\n    case \"isNotNA\":\n      return col(value.column).isNotNull();\n    case \"patternEquals\":\n      return col(value.column).eq(lit(value.value));\n    case \"patternNotEquals\":\n      return col(value.column).neq(lit(value.value));\n    case \"patternContainSubsequence\":\n      return col(value.column).strContains(value.value, false, true);\n    case \"patternNotContainSubsequence\":\n      return col(value.column).strContains(value.value, false, true).not();\n    case \"equal\":\n      return col(value.column).eq(lit(value.x));\n    case \"notEqual\":\n      return col(value.column).neq(lit(value.x));\n    case \"lessThan\":\n      return col(value.column).lt(lit(value.x));\n    case \"greaterThan\":\n      return col(value.column).gt(lit(value.x));\n    case \"lessThanOrEqual\":\n      return col(value.column).le(lit(value.x));\n    case \"greaterThanOrEqual\":\n      return col(value.column).ge(lit(value.x));\n    case \"equalToColumn\":\n      return col(value.column).eq(col(value.rhs));\n    case \"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    case \"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    case \"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    case \"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    case \"topN\":\n      return rank(col(value.column), true).over([]).le(lit(value.n));\n    case \"bottomN\":\n      return rank(col(value.column), false).over([]).le(lit(value.n));\n    case \"patternMatchesRegularExpression\":\n    case \"patternFuzzyContainSubsequence\":\n    case \"inSet\":\n    case \"notInSet\":\n    case \"ifNa\":\n      throw new Error(\"Not implemented filter type: \" + value.type);\n    case undefined:\n      throw new Error(\"Filter type is undefined, this should not happen\");\n    default:\n      assertNever(value);\n  }\n}\n\nexport function convertFilterUiToExpressions(value: FilterSpec): Expression {\n  return convertFilterUiToExpressionImpl(value).toJSON();\n}\n"],"names":[],"mappings":"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"}

package/dist/filters/distill.cjs

@@ -1,5 +1,7 @@
 'use strict';
 
+var traverse = require('./traverse.cjs');
+
 /** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */
 const KNOWN_LEAF_KEYS_TUPLE = [
     "n",
@@ -30,23 +32,6 @@ function distillLeaf(node) {
     }
     return result;
 }
-function distillNode(node) {
-    switch (node.type) {
-        case "and":
-        case "or": {
-            const filtered = node.filters.map(distillNode).filter((f) => f !== null);
-            return filtered.length === 0 ? null : { type: node.type, filters: filtered };
-        }
-        case "not": {
-            const inner = distillNode(node.filter);
-            return inner === null ? null : { type: "not", filter: inner };
-        }
-        default:
-            if (!isFilledLeaf(node))
-                return null;
-            return distillLeaf(node);
-    }
-}
 /**
  * Strips non-FilterSpec metadata (whitelist approach) and removes
  * unfilled leaves (type is undefined or any required field is undefined).
@@ -54,7 +39,22 @@ function distillNode(node) {
 function distillFilterSpec(filter) {
     if (filter == null)
         return null;
-    return distillNode(filter);
+    return traverse.traverseFilterSpec(filter, {
+        leaf: (leaf) => {
+            if (!isFilledLeaf(leaf))
+                return null;
+            return distillLeaf(leaf);
+        },
+        and: (results) => {
+            const filtered = results.filter((f) => f !== null);
+            return filtered.length === 0 ? null : { type: "and", filters: filtered };
+        },
+        or: (results) => {
+            const filtered = results.filter((f) => f !== null);
+            return filtered.length === 0 ? null : { type: "or", filters: filtered };
+        },
+        not: (result) => (result === null ? null : { type: "not", filter: result }),
+    });
 }
 
 exports.distillFilterSpec = distillFilterSpec;

package/dist/filters/distill.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport { type FilterSpec, type FilterSpecLeaf } from \"@milaboratories/pl-model-common\";\n\n/** All possible field names that can appear in any FilterSpecLeaf variant. */\ntype FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;\n\n/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */\nconst KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [\n  \"n\",\n  \"x\",\n  \"rhs\",\n  \"type\",\n  \"value\",\n  \"column\",\n  \"minDiff\",\n  \"maxEdits\",\n  \"wildcard\",\n  \"replacement\",\n  \"substitutionsOnly\",\n];\nconst KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);\n\n/** Returns true if the leaf is filled — type is defined and no required fields are undefined. */\nfunction isFilledLeaf(node: Record<string, unknown>): boolean {\n  if (node.type == null) return false;\n  return !Object.values(node).some((v) => v === undefined);\n}\n\nfunction distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {\n  const result: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(node)) {\n    if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {\n      result[key] = value;\n    }\n  }\n  return result as FilterSpecLeaf<string>;\n}\n\nfunction distillNode<T extends FilterSpecLeaf<unknown>>(\n  node: FilterSpec<T, unknown, unknown>,\n): FilterSpec<T> | null {\n  switch (node.type) {\n    case \"and\":\n    case \"or\": {\n      const filtered = node.filters.map(distillNode).filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: node.type, filters: filtered };\n    }\n    case \"not\": {\n      const inner = distillNode(node.filter);\n      return inner === null ? null : { type: \"not\", filter: inner };\n    }\n    default:\n      if (!isFilledLeaf(node)) return null;\n      return distillLeaf(node);\n  }\n}\n\n/**\n * Strips non-FilterSpec metadata (whitelist approach) and removes\n * unfilled leaves (type is undefined or any required field is undefined).\n */\nexport function distillFilterSpec<T extends FilterSpecLeaf<unknown>>(\n  filter: null | undefined | FilterSpec<T, unknown, unknown>,\n): null | FilterSpec<T> {\n  if (filter == null) return null;\n  return distillNode(filter);\n}\n"],"names":[],"mappings":";;AAMA;AACA,MAAM,qBAAqB,GAAqC;IAC9D,GAAG;IACH,GAAG;IACH,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;IACb,mBAAmB;CACpB;AACD,MAAM,eAAe,GAA2B,IAAI,GAAG,CAAC,qBAAqB,CAAC;AAE9E;AACA,SAAS,YAAY,CAAC,IAA6B,EAAA;AACjD,IAAA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;AAAE,QAAA,OAAO,KAAK;AACnC,IAAA,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAC1D;AAEA,SAAS,WAAW,CAAC,IAA6B,EAAA;IAChD,MAAM,MAAM,GAA4B,EAAE;AAC1C,IAAA,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AAC/C,QAAA,IAAI,eAAe,CAAC,GAAG,CAAC,GAAwB,CAAC,EAAE;AACjD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;QACrB;IACF;AACA,IAAA,OAAO,MAAgC;AACzC;AAEA,SAAS,WAAW,CAClB,IAAqC,EAAA;AAErC,IAAA,QAAQ,IAAI,CAAC,IAAI;AACf,QAAA,KAAK,KAAK;QACV,KAAK,IAAI,EAAE;YACT,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YAC5F,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC9E;QACA,KAAK,KAAK,EAAE;YACV,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC;AACtC,YAAA,OAAO,KAAK,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE;QAC/D;AACA,QAAA;AACE,YAAA,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC;AAAE,gBAAA,OAAO,IAAI;AACpC,YAAA,OAAO,WAAW,CAAC,IAAI,CAAC;;AAE9B;AAEA;;;AAGG;AACG,SAAU,iBAAiB,CAC/B,MAA0D,EAAA;IAE1D,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;AAC/B,IAAA,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B;;;;"}
+{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport { type FilterSpec, type FilterSpecLeaf } from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\n\n/** All possible field names that can appear in any FilterSpecLeaf variant. */\ntype FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;\n\n/** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */\nconst KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [\n  \"n\",\n  \"x\",\n  \"rhs\",\n  \"type\",\n  \"value\",\n  \"column\",\n  \"minDiff\",\n  \"maxEdits\",\n  \"wildcard\",\n  \"replacement\",\n  \"substitutionsOnly\",\n];\nconst KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);\n\n/** Returns true if the leaf is filled — type is defined and no required fields are undefined. */\nfunction isFilledLeaf(node: Record<string, unknown>): boolean {\n  if (node.type == null) return false;\n  return !Object.values(node).some((v) => v === undefined);\n}\n\nfunction distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {\n  const result: Record<string, unknown> = {};\n  for (const [key, value] of Object.entries(node)) {\n    if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {\n      result[key] = value;\n    }\n  }\n  return result as FilterSpecLeaf<string>;\n}\n\n/**\n * Strips non-FilterSpec metadata (whitelist approach) and removes\n * unfilled leaves (type is undefined or any required field is undefined).\n */\nexport function distillFilterSpec<T extends FilterSpecLeaf<unknown>>(\n  filter: null | undefined | FilterSpec<T, unknown, unknown>,\n): null | FilterSpec<T> {\n  if (filter == null) return null;\n  return traverseFilterSpec(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as FilterSpec<T>;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: \"and\", filters: filtered };\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is FilterSpec<T> => f !== null);\n      return filtered.length === 0 ? null : { type: \"or\", filters: filtered };\n    },\n    not: (result) => (result === null ? null : { type: \"not\", filter: result }),\n  });\n}\n"],"names":["traverseFilterSpec"],"mappings":";;;;AAOA;AACA,MAAM,qBAAqB,GAAqC;IAC9D,GAAG;IACH,GAAG;IACH,KAAK;IACL,MAAM;IACN,OAAO;IACP,QAAQ;IACR,SAAS;IACT,UAAU;IACV,UAAU;IACV,aAAa;IACb,mBAAmB;CACpB;AACD,MAAM,eAAe,GAA2B,IAAI,GAAG,CAAC,qBAAqB,CAAC;AAE9E;AACA,SAAS,YAAY,CAAC,IAA6B,EAAA;AACjD,IAAA,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI;AAAE,QAAA,OAAO,KAAK;AACnC,IAAA,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,SAAS,CAAC;AAC1D;AAEA,SAAS,WAAW,CAAC,IAA6B,EAAA;IAChD,MAAM,MAAM,GAA4B,EAAE;AAC1C,IAAA,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;AAC/C,QAAA,IAAI,eAAe,CAAC,GAAG,CAAC,GAAwB,CAAC,EAAE;AACjD,YAAA,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK;QACrB;IACF;AACA,IAAA,OAAO,MAAgC;AACzC;AAEA;;;AAGG;AACG,SAAU,iBAAiB,CAC/B,MAA0D,EAAA;IAE1D,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAOA,2BAAkB,CAAC,MAAM,EAAE;AAChC,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,IAAI,CAAC,YAAY,CAAC,IAA+B,CAAC;AAAE,gBAAA,OAAO,IAAI;AAC/D,YAAA,OAAO,WAAW,CAAC,IAA+B,CAAkB;QACtE,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YACtE,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE;QAC1E,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAyB,CAAC,KAAK,IAAI,CAAC;YACtE,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE;QACzE,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AAC5E,KAAA,CAAC;AACJ;;;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../src/filters/distill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAwDvF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EACjE,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GACzD,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAGtB"}
+{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../src/filters/distill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAsCvF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,SAAS,cAAc,CAAC,OAAO,CAAC,EACjE,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,UAAU,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GACzD,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,CAiBtB"}