@platforma-sdk/model 1.58.3 → 1.58.5

package/dist/filters/distill.cjs

@@ -1,6 +1,7 @@
 'use strict';
 
 var traverse = require('./traverse.cjs');
+var compat = require('es-toolkit/compat');
 
 /** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */
 const KNOWN_LEAF_KEYS_TUPLE = [
@@ -21,7 +22,17 @@ const KNOWN_LEAF_KEYS = new Set(KNOWN_LEAF_KEYS_TUPLE);
 function isFilledLeaf(node) {
     if (node.type == null)
         return false;
-    return !Object.values(node).some((v) => v === undefined);
+    return !Object.values(node).some((value) => {
+        switch (typeof value) {
+            case "number":
+            case "boolean":
+                return false;
+            case "string":
+                return value.trim() === "";
+            default: // undefined, null, empty objects/arrays
+                return compat.isEmpty(value);
+        }
+    });
 }
 function distillLeaf(node) {
     const result = {};
@@ -41,9 +52,8 @@ function distillFilterSpec(filter) {
         return null;
     return traverse.traverseFilterSpec(filter, {
         leaf: (leaf) => {
-            if (!isFilledLeaf(leaf))
-                return null;
-            return distillLeaf(leaf);
+            const distilled = distillLeaf(leaf);
+            return isFilledLeaf(distilled) ? distilled : null;
         },
         and: (results) => {
             const filtered = results.filter((f) => f !== null);

package/dist/filters/distill.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  RootFilterSpec,\n  type FilterSpec,\n  type FilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\nimport { InferFilterSpecLeaf } 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\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<\n  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>\n    ? RootFilterSpec<InferFilterSpecLeaf<FS>>\n    : FilterSpec<InferFilterSpecLeaf<FS>>,\n>(filter: null | undefined | FS): null | R {\n  if (filter == null) return null;\n  return traverseFilterSpec<FS, null | R>(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as R;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"and\", filters: filtered } as R);\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"or\", filters: filtered } as R);\n    },\n    not: (result) => (result === null ? null : ({ type: \"not\", filter: result } as R)),\n  });\n}\n"],"names":["traverseFilterSpec"],"mappings":";;;;AAYA;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,CAK/B,MAA6B,EAAA;IAC7B,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAOA,2BAAkB,CAAe,MAAM,EAAE;AAC9C,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,CAAM;QAC1D,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAQ;QACjF,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAQ;QAChF,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAQ,CAAC;AACnF,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"distill.cjs","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  RootFilterSpec,\n  type FilterSpec,\n  type FilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\nimport { InferFilterSpecLeaf } from \"@milaboratories/pl-model-common\";\nimport { isEmpty } from \"es-toolkit/compat\";\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<T>(node: FilterSpecLeaf<T>): boolean {\n  if (node.type == null) return false;\n  return !Object.values(node).some((value) => {\n    switch (typeof value) {\n      case \"number\":\n      case \"boolean\":\n        return false;\n      case \"string\":\n        return value.trim() === \"\";\n      default: // undefined, null, empty objects/arrays\n        return isEmpty(value);\n    }\n  });\n}\n\nfunction distillLeaf<T>(node: FilterSpecLeaf<T>): FilterSpecLeaf<T> {\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<T>;\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<\n  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>\n    ? RootFilterSpec<InferFilterSpecLeaf<FS>>\n    : FilterSpec<InferFilterSpecLeaf<FS>>,\n>(filter: null | undefined | FS): null | R {\n  if (filter == null) return null;\n  return traverseFilterSpec<FS, null | R>(filter, {\n    leaf: (leaf) => {\n      const distilled = distillLeaf(leaf);\n      return isFilledLeaf(distilled) ? (distilled as R) : null;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"and\", filters: filtered } as R);\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"or\", filters: filtered } as R);\n    },\n    not: (result) => (result === null ? null : ({ type: \"not\", filter: result } as R)),\n  });\n}\n"],"names":["isEmpty","traverseFilterSpec"],"mappings":";;;;;AAaA;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,CAAI,IAAuB,EAAA;AAC9C,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,KAAK,KAAI;QACzC,QAAQ,OAAO,KAAK;AAClB,YAAA,KAAK,QAAQ;AACb,YAAA,KAAK,SAAS;AACZ,gBAAA,OAAO,KAAK;AACd,YAAA,KAAK,QAAQ;AACX,gBAAA,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;AAC5B,YAAA;AACE,gBAAA,OAAOA,cAAO,CAAC,KAAK,CAAC;;AAE3B,IAAA,CAAC,CAAC;AACJ;AAEA,SAAS,WAAW,CAAI,IAAuB,EAAA;IAC7C,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,MAA2B;AACpC;AAEA;;;AAGG;AACG,SAAU,iBAAiB,CAK/B,MAA6B,EAAA;IAC7B,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAOC,2BAAkB,CAAe,MAAM,EAAE;AAC9C,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;AACnC,YAAA,OAAO,YAAY,CAAC,SAAS,CAAC,GAAI,SAAe,GAAG,IAAI;QAC1D,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAQ;QACjF,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAQ;QAChF,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAQ,CAAC;AACnF,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,EACL,cAAc,EACd,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAqCtE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,SAAS,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAChE,CAAC,SAAS,EAAE,SAAS,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAC1E,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GACvC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,EACvC,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,CAAC,CAiBzC"}
+{"version":3,"file":"distill.d.ts","sourceRoot":"","sources":["../../src/filters/distill.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAgDtE;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,EAAE,SAAS,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAChE,CAAC,SAAS,EAAE,SAAS,cAAc,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,GAC1E,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GACvC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,EACvC,MAAM,EAAE,IAAI,GAAG,SAAS,GAAG,EAAE,GAAG,IAAI,GAAG,CAAC,CAiBzC"}

package/dist/filters/distill.js

@@ -1,4 +1,5 @@
 import { traverseFilterSpec } from './traverse.js';
+import { isEmpty } from 'es-toolkit/compat';
 
 /** Compile-time check: every key in the tuple is a valid leaf key (via satisfies). */
 const KNOWN_LEAF_KEYS_TUPLE = [
@@ -19,7 +20,17 @@ const KNOWN_LEAF_KEYS = new Set(KNOWN_LEAF_KEYS_TUPLE);
 function isFilledLeaf(node) {
     if (node.type == null)
         return false;
-    return !Object.values(node).some((v) => v === undefined);
+    return !Object.values(node).some((value) => {
+        switch (typeof value) {
+            case "number":
+            case "boolean":
+                return false;
+            case "string":
+                return value.trim() === "";
+            default: // undefined, null, empty objects/arrays
+                return isEmpty(value);
+        }
+    });
 }
 function distillLeaf(node) {
     const result = {};
@@ -39,9 +50,8 @@ function distillFilterSpec(filter) {
         return null;
     return traverseFilterSpec(filter, {
         leaf: (leaf) => {
-            if (!isFilledLeaf(leaf))
-                return null;
-            return distillLeaf(leaf);
+            const distilled = distillLeaf(leaf);
+            return isFilledLeaf(distilled) ? distilled : null;
         },
         and: (results) => {
             const filtered = results.filter((f) => f !== null);

package/dist/filters/distill.js.map

@@ -1 +1 @@
-{"version":3,"file":"distill.js","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  RootFilterSpec,\n  type FilterSpec,\n  type FilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\nimport { InferFilterSpecLeaf } 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\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<\n  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>\n    ? RootFilterSpec<InferFilterSpecLeaf<FS>>\n    : FilterSpec<InferFilterSpecLeaf<FS>>,\n>(filter: null | undefined | FS): null | R {\n  if (filter == null) return null;\n  return traverseFilterSpec<FS, null | R>(filter, {\n    leaf: (leaf) => {\n      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;\n      return distillLeaf(leaf as Record<string, unknown>) as R;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"and\", filters: filtered } as R);\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"or\", filters: filtered } as R);\n    },\n    not: (result) => (result === null ? null : ({ type: \"not\", filter: result } as R)),\n  });\n}\n"],"names":[],"mappings":";;AAYA;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,CAK/B,MAA6B,EAAA;IAC7B,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAO,kBAAkB,CAAe,MAAM,EAAE;AAC9C,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,CAAM;QAC1D,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAQ;QACjF,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAQ;QAChF,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAQ,CAAC;AACnF,KAAA,CAAC;AACJ;;;;"}
+{"version":3,"file":"distill.js","sources":["../../src/filters/distill.ts"],"sourcesContent":["import { DistributiveKeys, UnionToTuples } from \"@milaboratories/helpers\";\nimport {\n  RootFilterSpec,\n  type FilterSpec,\n  type FilterSpecLeaf,\n} from \"@milaboratories/pl-model-common\";\nimport { traverseFilterSpec } from \"./traverse\";\nimport { InferFilterSpecLeaf } from \"@milaboratories/pl-model-common\";\nimport { isEmpty } from \"es-toolkit/compat\";\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<T>(node: FilterSpecLeaf<T>): boolean {\n  if (node.type == null) return false;\n  return !Object.values(node).some((value) => {\n    switch (typeof value) {\n      case \"number\":\n      case \"boolean\":\n        return false;\n      case \"string\":\n        return value.trim() === \"\";\n      default: // undefined, null, empty objects/arrays\n        return isEmpty(value);\n    }\n  });\n}\n\nfunction distillLeaf<T>(node: FilterSpecLeaf<T>): FilterSpecLeaf<T> {\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<T>;\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<\n  FS extends FilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>,\n  R extends FS extends RootFilterSpec<FilterSpecLeaf<unknown>, unknown, unknown>\n    ? RootFilterSpec<InferFilterSpecLeaf<FS>>\n    : FilterSpec<InferFilterSpecLeaf<FS>>,\n>(filter: null | undefined | FS): null | R {\n  if (filter == null) return null;\n  return traverseFilterSpec<FS, null | R>(filter, {\n    leaf: (leaf) => {\n      const distilled = distillLeaf(leaf);\n      return isFilledLeaf(distilled) ? (distilled as R) : null;\n    },\n    and: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"and\", filters: filtered } as R);\n    },\n    or: (results) => {\n      const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);\n      return filtered.length === 0 ? null : ({ type: \"or\", filters: filtered } as R);\n    },\n    not: (result) => (result === null ? null : ({ type: \"not\", filter: result } as R)),\n  });\n}\n"],"names":[],"mappings":";;;AAaA;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,CAAI,IAAuB,EAAA;AAC9C,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,KAAK,KAAI;QACzC,QAAQ,OAAO,KAAK;AAClB,YAAA,KAAK,QAAQ;AACb,YAAA,KAAK,SAAS;AACZ,gBAAA,OAAO,KAAK;AACd,YAAA,KAAK,QAAQ;AACX,gBAAA,OAAO,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE;AAC5B,YAAA;AACE,gBAAA,OAAO,OAAO,CAAC,KAAK,CAAC;;AAE3B,IAAA,CAAC,CAAC;AACJ;AAEA,SAAS,WAAW,CAAI,IAAuB,EAAA;IAC7C,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,MAA2B;AACpC;AAEA;;;AAGG;AACG,SAAU,iBAAiB,CAK/B,MAA6B,EAAA;IAC7B,IAAI,MAAM,IAAI,IAAI;AAAE,QAAA,OAAO,IAAI;IAC/B,OAAO,kBAAkB,CAAe,MAAM,EAAE;AAC9C,QAAA,IAAI,EAAE,CAAC,IAAI,KAAI;AACb,YAAA,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC;AACnC,YAAA,OAAO,YAAY,CAAC,SAAS,CAAC,GAAI,SAAe,GAAG,IAAI;QAC1D,CAAC;AACD,QAAA,GAAG,EAAE,CAAC,OAAO,KAAI;AACf,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAQ;QACjF,CAAC;AACD,QAAA,EAAE,EAAE,CAAC,OAAO,KAAI;AACd,YAAA,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,KAAiC,CAAC,KAAK,IAAI,CAAC;YAC9E,OAAO,QAAQ,CAAC,MAAM,KAAK,CAAC,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAQ;QAChF,CAAC;QACD,GAAG,EAAE,CAAC,MAAM,MAAM,MAAM,KAAK,IAAI,GAAG,IAAI,GAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAQ,CAAC;AACnF,KAAA,CAAC;AACJ;;;;"}

package/dist/package.json.cjs

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

package/dist/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/model",
-  "version": "1.58.3",
+  "version": "1.58.5",
   "description": "Platforma.bio SDK / Block Model",
   "files": [
     "./dist/**/*",
@@ -25,8 +25,8 @@
     "utility-types": "^3.11.0",
     "zod": "~3.23.8",
     "@milaboratories/helpers": "1.13.5",
-    "@milaboratories/pl-model-common": "1.25.1",
     "@milaboratories/pl-error-like": "1.12.8",
+    "@milaboratories/pl-model-common": "1.25.1",
     "@milaboratories/ptabler-expression-js": "1.1.23"
   },
   "devDependencies": {
@@ -34,8 +34,8 @@
     "fast-json-patch": "^3.1.1",
     "typescript": "~5.6.3",
     "vitest": "^4.0.18",
-    "@milaboratories/build-configs": "1.5.0",
     "@milaboratories/ts-builder": "1.2.11",
+    "@milaboratories/build-configs": "1.5.0",
     "@milaboratories/ts-configs": "1.2.1"
   },
   "scripts": {

package/src/filters/distill.ts

@@ -6,6 +6,7 @@ import {
 } from "@milaboratories/pl-model-common";
 import { traverseFilterSpec } from "./traverse";
 import { InferFilterSpecLeaf } from "@milaboratories/pl-model-common";
+import { isEmpty } from "es-toolkit/compat";
 
 /** All possible field names that can appear in any FilterSpecLeaf variant. */
 type FilterSpecLeafKey = DistributiveKeys<FilterSpecLeaf<string>>;
@@ -27,19 +28,29 @@ const KNOWN_LEAF_KEYS_TUPLE: UnionToTuples<FilterSpecLeafKey> = [
 const KNOWN_LEAF_KEYS: Set<FilterSpecLeafKey> = new Set(KNOWN_LEAF_KEYS_TUPLE);
 
 /** Returns true if the leaf is filled — type is defined and no required fields are undefined. */
-function isFilledLeaf(node: Record<string, unknown>): boolean {
+function isFilledLeaf<T>(node: FilterSpecLeaf<T>): boolean {
   if (node.type == null) return false;
-  return !Object.values(node).some((v) => v === undefined);
+  return !Object.values(node).some((value) => {
+    switch (typeof value) {
+      case "number":
+      case "boolean":
+        return false;
+      case "string":
+        return value.trim() === "";
+      default: // undefined, null, empty objects/arrays
+        return isEmpty(value);
+    }
+  });
 }
 
-function distillLeaf(node: Record<string, unknown>): FilterSpecLeaf<string> {
+function distillLeaf<T>(node: FilterSpecLeaf<T>): FilterSpecLeaf<T> {
   const result: Record<string, unknown> = {};
   for (const [key, value] of Object.entries(node)) {
     if (KNOWN_LEAF_KEYS.has(key as FilterSpecLeafKey)) {
       result[key] = value;
     }
   }
-  return result as FilterSpecLeaf<string>;
+  return result as FilterSpecLeaf<T>;
 }
 
 /**
@@ -55,8 +66,8 @@ export function distillFilterSpec<
   if (filter == null) return null;
   return traverseFilterSpec<FS, null | R>(filter, {
     leaf: (leaf) => {
-      if (!isFilledLeaf(leaf as Record<string, unknown>)) return null;
-      return distillLeaf(leaf as Record<string, unknown>) as R;
+      const distilled = distillLeaf(leaf);
+      return isFilledLeaf(distilled) ? (distilled as R) : null;
     },
     and: (results) => {
       const filtered = results.filter((f): f is NonNullable<typeof f> => f !== null);