@aikotools/datafilter 1.0.2 → 1.0.4

package/README.md

@@ -15,6 +15,8 @@ Advanced data filtering engine for JSON file matching in E2E testing.
 - **Order Handling**: Support for both strict and flexible ordering of expected files
 - **🆕 Wildcard Optionals**: Match arbitrary number of optional files without explicit specification
 - **Greedy vs. Non-Greedy**: Control whether wildcards match once or multiple times
+- **PreFilter Support**: Global file filtering before rule matching
+- **Group Filtering**: Organize files into groups with shared filter criteria
 - **Deep Object Access**: Path-based navigation through nested JSON structures
 - **Sort Integration**: Custom sort functions for file ordering before matching
 
@@ -176,6 +178,131 @@ Validate timestamps (ISO strings or numeric):
 }
 ```
 
+## Advanced Features
+
+### PreFilter - Global File Exclusion
+
+PreFilter allows you to exclude files globally **before** any rule matching occurs. Files not matching the preFilter criteria are collected in the `preFiltered` property of the result, separate from `unmapped` files.
+
+**Use Case:** Filter out irrelevant files (e.g., debug files, temporary files) before processing, while keeping track of what was excluded.
+
+```typescript
+const result = filterFiles({
+  files: [
+    { fileName: 'event1.json', data: { type: 'event', status: 'active', value: 42 } },
+    { fileName: 'event2.json', data: { type: 'event', status: 'active', value: 100 } },
+    { fileName: 'debug.json', data: { type: 'debug', status: 'inactive', value: 0 } },
+    { fileName: 'temp.json', data: { type: 'temp', status: 'inactive', value: -1 } },
+  ],
+  preFilter: [
+    // Only process files with status 'active'
+    { path: ['status'], check: { value: 'active' } }
+  ],
+  rules: [
+    { match: [{ path: ['type'], check: { value: 'event' } }], expected: 'event1' },
+    { match: [{ path: ['type'], check: { value: 'event' } }], expected: 'event2' },
+  ],
+});
+
+// Result:
+// - mapped: event1.json, event2.json
+// - preFiltered: debug.json, temp.json (with failed check details)
+// - unmapped: []
+```
+
+### Group Filtering - Organize by Categories
+
+Group filtering allows you to organize files into categories with shared filter criteria, then apply category-specific rules.
+
+**Use Case:** Different file types (e.g., orders, invoices, reports) need different validation rules.
+
+```typescript
+import { filterFilesWithGroups } from '@aikotools/datafilter';
+
+const result = filterFilesWithGroups({
+  files: [
+    { fileName: 'order1.json', data: { category: 'order', orderId: 'A123', amount: 100 } },
+    { fileName: 'order2.json', data: { category: 'order', orderId: 'A124', amount: 200 } },
+    { fileName: 'invoice1.json', data: { category: 'invoice', invoiceId: 'INV-001', total: 100 } },
+    { fileName: 'invoice2.json', data: { category: 'invoice', invoiceId: 'INV-002', total: 200 } },
+    { fileName: 'report.json', data: { category: 'report', month: 'January' } },
+  ],
+  groups: [
+    {
+      // Group 1: Orders
+      groupFilter: [
+        { path: ['category'], check: { value: 'order' } }
+      ],
+      rules: [
+        { match: [{ path: ['orderId'], check: { value: 'A123' } }], expected: 'order_A123' },
+        { match: [{ path: ['orderId'], check: { value: 'A124' } }], expected: 'order_A124' },
+      ]
+    },
+    {
+      // Group 2: Invoices
+      groupFilter: [
+        { path: ['category'], check: { value: 'invoice' } }
+      ],
+      rules: [
+        { match: [{ path: ['invoiceId'], check: { value: 'INV-001' } }], expected: 'invoice_001' },
+        { match: [{ path: ['invoiceId'], check: { value: 'INV-002' } }], expected: 'invoice_002' },
+      ]
+    },
+    {
+      // Group 3: Reports (with wildcard)
+      groupFilter: [
+        { path: ['category'], check: { value: 'report' } }
+      ],
+      rules: [
+        { matchAny: [{ path: ['category'], check: { value: 'report' } }], optional: true, greedy: true }
+      ]
+    }
+  ],
+  preFilter: [
+    // Optional: Only process files with specific structure
+    { path: ['category'], check: { exists: true } }
+  ]
+});
+
+// Result:
+// - mapped: order_A123, order_A124, invoice_001, invoice_002
+// - wildcardMatched: report.json
+// - unmapped: []
+```
+
+### Combining PreFilter, Groups, and Wildcards
+
+```typescript
+const result = filterFilesWithGroups({
+  files: allFiles,
+
+  // Step 1: Global exclusion
+  preFilter: [
+    { path: ['status'], check: { value: 'active' } },
+    { path: ['deleted'], check: { exists: false } }
+  ],
+
+  // Step 2: Group by type and apply rules
+  groups: [
+    {
+      groupFilter: [{ path: ['type'], check: { value: 'critical' } }],
+      rules: [
+        { match: [{ path: ['priority'], check: { value: 1 } }], expected: 'critical_1' },
+        { match: [{ path: ['priority'], check: { value: 2 } }], expected: 'critical_2' },
+      ]
+    },
+    {
+      groupFilter: [{ path: ['type'], check: { value: 'normal' } }],
+      rules: [
+        { matchAny: [{ path: ['type'], check: { value: 'normal' } }], optional: true, greedy: true }
+      ]
+    }
+  ],
+
+  sortFn: (a, b) => a.data.timestamp - b.data.timestamp
+});
+```
+
 ## Complete Example
 
 ### Scenario from Requirements
@@ -250,13 +377,32 @@ Main filtering function.
 - `files: JsonFile[]` - Files to filter
 - `rules: (MatchRule | MatchRule[])[]` - Matching rules
 - `sortFn?: (a, b) => number` - Optional sort function
+- `preFilter?: FilterCriterion[]` - Optional pre-filter criteria (files not matching are collected in `preFiltered`)
 - `context?: { startTimeScript?, startTimeTest?, pathTime? }` - Optional context
 
 **FilterResult:**
 - `mapped: MappedFile[]` - Successfully mapped files
 - `wildcardMatched: WildcardMappedFile[]` - Files matched by wildcards
-- `unmapped: UnmappedFile[]` - Files that couldn't be matched
-- `stats: { totalFiles, mappedFiles, wildcardMatchedFiles, unmappedFiles, ... }`
+- `unmapped: UnmappedFile[]` - Files that passed preFilter but couldn't be matched to any rule
+- `preFiltered: PreFilteredFile[]` - Files excluded by preFilter criteria (with failed check details)
+- `stats: { totalFiles, mappedFiles, wildcardMatchedFiles, unmappedFiles, preFilteredFiles, ... }`
+
+### filterFilesWithGroups(request: FilterGroupRequest): FilterResult
+
+Filtering with grouped rules for categorized file processing.
+
+**FilterGroupRequest:**
+- `files: JsonFile[]` - Files to filter
+- `groups: FilterGroup[]` - Filter groups with common criteria and rules
+- `sortFn?: (a, b) => number` - Optional sort function
+- `preFilter?: FilterCriterion[]` - Optional pre-filter criteria (applied before group filtering)
+- `context?: { startTimeScript?, startTimeTest?, pathTime? }` - Optional context
+
+**FilterGroup:**
+- `groupFilter: FilterCriterion[]` - Criteria to identify files belonging to this group
+- `rules: (MatchRule | MatchRule[])[]` - Rules to apply to files in this group
+
+**FilterResult:** Same as `filterFiles()`
 
 ### Matcher Class
 
@@ -266,7 +412,12 @@ For advanced usage with multiple filter operations:
 import { Matcher } from '@aikotools/datafilter';
 
 const matcher = new Matcher({ startTimeScript, startTimeTest });
-const result = matcher.filterFiles(files, rules, sortFn);
+
+// With preFilter
+const result = matcher.filterFiles(files, rules, sortFn, preFilter);
+
+// With groups
+const groupResult = matcher.filterFilesWithGroups(files, groups, sortFn, preFilter);
 ```
 
 ### FilterEngine Class

package/dist/aikotools-datafilter.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const $=require("luxon");function k(i){return"matchAny"in i}function E(i){return"match"in i&&"expected"in i}function y(i,s){const t=[];if(s.length===0)return{value:i,found:!0,validPath:[]};let e=i;for(let n=0;n<s.length;n++){const r=s[n];if(e==null)return{value:void 0,found:!1,error:`Cannot read property '${r}' of ${e}`,validPath:t};if(Array.isArray(e)){const a=typeof r=="number"?r:parseInt(String(r),10);if(isNaN(a))return{value:void 0,found:!1,error:`Array index must be a number, got '${r}'`,validPath:t};if(a<0||a>=e.length)return{value:void 0,found:!1,error:`Array index ${a} out of bounds (length: ${e.length})`,validPath:t};t.push(a),e=e[a];continue}if(typeof e=="object"){const a=String(r);if(!(a in e))return{value:void 0,found:!1,error:`Property '${a}' does not exist`,validPath:t};t.push(a),e=e[a];continue}return{value:void 0,found:!1,error:`Cannot access property '${r}' of primitive type ${typeof e}`,validPath:t}}return{value:e,found:!0,validPath:t}}function M(i,s){const t=y(i,s);return t.found&&t.value!==void 0}function P(i,s,t){const e=y(i,s);return e.found&&e.value!==void 0?e.value:t}class S{constructor(s){this.context=s}evaluateCriterion(s,t){const e=t.check;return"value"in e?this.checkValue(s,t.path,e):"exists"in e?this.checkExists(s,t.path,e):"itemExists"in e&&"item"in e?this.checkArrayElement(s,t.path,e):"type"in e&&"size"in e?this.checkArraySize(s,t.path,e):"min"in e&&"max"in e?typeof e.min=="number"&&typeof e.max=="number"?this.checkNumericRange(s,t.path,e):this.checkTimeRange(s,t.path,e):{status:!1,checkType:"unknown",reason:`Unknown check type: ${JSON.stringify(e)}`}}checkValue(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkValue",reason:{message:n.error||"Path not found",path:t}};const r=n.value,a=e.value;return this.deepEqual(r,a)?{status:!0,checkType:"checkValue"}:{status:!1,checkType:"checkValue",reason:{message:"Value mismatch",path:t,expected:a,actual:r}}}checkExists(s,t,e){const n=y(s,t),r=n.found&&n.value!==void 0;return e.exists===r?{status:!0,checkType:"checkExists"}:{status:!1,checkType:"checkExists",reason:{message:e.exists?`Path should exist but doesn't: ${n.error}`:"Path should not exist but does",path:t}}}checkArrayElement(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkArrayElement",reason:{message:n.error||"Path not found",path:t}};const r=n.value;if(!Array.isArray(r))return{status:!1,checkType:"checkArrayElement",reason:{message:"Value is not an array",path:t,actualType:typeof r}};const a=r.some(u=>this.deepEqual(u,e.item));return e.itemExists===a?{status:!0,checkType:"checkArrayElement"}:{status:!1,checkType:"checkArrayElement",reason:{message:e.itemExists?"Item should exist in array but doesn't":"Item should not exist in array but does",path:t,item:e.item}}}checkArraySize(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkArraySize",reason:{message:n.error||"Path not found",path:t}};const r=n.value;if(!Array.isArray(r))return{status:!1,checkType:"checkArraySize",reason:{message:"Value is not an array",path:t,actualType:typeof r}};const a=r.length,u=e.size;let l=!1,f="";switch(e.type){case"equal":l=a===u,f=`Array length should be ${u} but is ${a}`;break;case"lessThan":l=a<u,f=`Array length should be less than ${u} but is ${a}`;break;case"greaterThan":l=a>u,f=`Array length should be greater than ${u} but is ${a}`;break}return l?{status:!0,checkType:"checkArraySize"}:{status:!1,checkType:"checkArraySize",reason:{message:f,path:t,expected:u,actual:a}}}checkTimeRange(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkTimeRange",reason:{message:n.error||"Path not found",path:t}};const r=n.value;if(typeof r=="number"){const a=parseInt(e.min),u=parseInt(e.max);return isNaN(a)||isNaN(u)?{status:!1,checkType:"checkTimeRange",reason:{message:"Min or max is not a valid number",min:e.min,max:e.max}}:r>=a&&r<=u?{status:!0,checkType:"checkTimeRange"}:{status:!1,checkType:"checkTimeRange",reason:{message:`Timestamp ${r} is outside range [${a}, ${u}]`,path:t,actual:r,min:a,max:u}}}if(typeof r=="string"){const a=$.DateTime.fromISO(r),u=$.DateTime.fromISO(e.min),l=$.DateTime.fromISO(e.max);return a.isValid?!u.isValid||!l.isValid?{status:!1,checkType:"checkTimeRange",reason:{message:"Invalid min or max time",min:e.min,max:e.max}}:a>=u&&a<=l?{status:!0,checkType:"checkTimeRange"}:{status:!1,checkType:"checkTimeRange",reason:{message:`Timestamp ${r} is outside range [${e.min}, ${e.max}]`,path:t,actual:r,min:e.min,max:e.max}}:{status:!1,checkType:"checkTimeRange",reason:{message:`Invalid timestamp: ${r}`,path:t}}}return{status:!1,checkType:"checkTimeRange",reason:{message:`Timestamp must be a string or number, got ${typeof r}`,path:t}}}checkNumericRange(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkNumericRange",reason:{message:n.error||"Path not found",path:t}};const r=n.value;return typeof r!="number"?{status:!1,checkType:"checkNumericRange",reason:{message:`Value must be a number, got ${typeof r}`,path:t,actual:r}}:r>=e.min&&r<=e.max?{status:!0,checkType:"checkNumericRange"}:{status:!1,checkType:"checkNumericRange",reason:{message:`Value ${r} is outside range [${e.min}, ${e.max}]`,path:t,actual:r,min:e.min,max:e.max}}}deepEqual(s,t){if(s===t)return!0;if(s===null||t===null||s===void 0||t===void 0)return s===t;if(typeof s!=typeof t)return!1;if(s instanceof Date&&t instanceof Date)return s.getTime()===t.getTime();if(Array.isArray(s)&&Array.isArray(t))return s.length!==t.length?!1:s.every((e,n)=>this.deepEqual(e,t[n]));if(typeof s=="object"&&typeof t=="object"){const e=Object.keys(s),n=Object.keys(t);return e.length!==n.length?!1:e.every(r=>this.deepEqual(s[r],t[r]))}return s===t}}class w{constructor(s){this.engine=new S(s)}matchFile(s,t){const n=(k(t)?t.matchAny:t.match).map(a=>this.engine.evaluateCriterion(s.data,a));return{matched:n.every(a=>a.status),checks:n,rule:t}}applyPreFilter(s,t){return s.filter(e=>t.map(r=>this.engine.evaluateCriterion(e.data,r)).every(r=>r.status))}filterFiles(s,t,e,n){const r=n?this.applyPreFilter(s,n):s,a=e?[...r].sort(e):[...r],u=[],l=[],f=[],g=new Set,x=new Map;let o=0,c=0;for(;o<a.length;){const h=a[o];if(c>=t.length){g.has(o)||f.push({file:h,attemptedRules:[]}),o++;continue}const m=t[c],v=[];let R=!1;if(Array.isArray(m)){for(let p=0;p<m.length;p++){if(x.get(c)?.has(p))continue;const T=m[p],F=this.matchFile(h,T);if(v.push(F),F.matched&&E(T)){x.has(c)||x.set(c,new Set);const b=x.get(c);b&&b.add(p),u.push({expected:T.expected,file:h,matchResult:F,optional:T.optional||!1,info:T.info}),g.add(o),R=!0;break}}x.get(c)?.size===m.length&&c++,o++}else{const d=m,p=this.matchFile(h,d);v.push(p),p.matched?E(d)?(u.push({expected:d.expected,file:h,matchResult:p,optional:d.optional||!1,info:d.info}),g.add(o),c++,o++):k(d)&&(l.push({file:h,matchResult:p,info:d.info}),g.add(o),d.greedy||c++,o++):d.optional||k(d)?c++:(f.push({file:h,attemptedRules:v}),o++)}}const A={totalFiles:s.length,mappedFiles:u.length,wildcardMatchedFiles:l.length,unmappedFiles:f.length,totalRules:this.countRules(t),mandatoryRules:this.countMandatoryRules(t),optionalRules:this.countOptionalRules(t)};return{mapped:u,wildcardMatched:l,unmapped:f,stats:A}}countRules(s){return s.reduce((t,e)=>Array.isArray(e)?t+e.length:t+1,0)}countMandatoryRules(s){return s.reduce((t,e)=>Array.isArray(e)?t+e.filter(n=>!n.optional&&!k(n)).length:t+(e.optional||k(e)?0:1),0)}countOptionalRules(s){return s.reduce((t,e)=>Array.isArray(e)?t+e.filter(n=>n.optional||k(n)).length:t+(e.optional||k(e)?1:0),0)}filterFilesWithGroups(s,t,e,n){const r=n?this.applyPreFilter(s,n):s,a=e?[...r].sort(e):[...r],u=[],l=[],f=[];for(const o of t){const c=a.filter(m=>o.groupFilter.map(R=>this.engine.evaluateCriterion(m.data,R)).every(R=>R.status));if(c.length===0)continue;const A=o.rules.map(m=>(Array.isArray(m),m)),h=this.filterFiles(c,A);u.push(...h.mapped),l.push(...h.wildcardMatched),f.push(...h.unmapped)}const g=t.flatMap(o=>o.rules),x={totalFiles:s.length,mappedFiles:u.length,wildcardMatchedFiles:l.length,unmappedFiles:f.length,totalRules:this.countRules(g),mandatoryRules:this.countMandatoryRules(g),optionalRules:this.countOptionalRules(g)};return{mapped:u,wildcardMatched:l,unmapped:f,stats:x}}}function V(i){const s=new w(i.context);if(i.rules&&i.groups)throw new Error('FilterRequest: Provide either "rules" or "groups", not both');if(!i.rules&&!i.groups)throw new Error('FilterRequest: Must provide either "rules" or "groups"');if(i.groups)return s.filterFilesWithGroups(i.files,i.groups,i.sortFn,i.preFilter);if(!i.rules)throw new Error("FilterRequest: Rules are required");return s.filterFiles(i.files,i.rules,i.sortFn,i.preFilter)}exports.FilterEngine=S;exports.Matcher=w;exports.filterFiles=V;exports.getValueFromPath=y;exports.getValueOr=P;exports.isSingleMatchRule=E;exports.isWildcardRule=k;exports.pathExists=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("luxon");function x(i){return"matchAny"in i}function b(i){return"match"in i&&"expected"in i}function y(i,s){const t=[];if(s.length===0)return{value:i,found:!0,validPath:[]};let e=i;for(let n=0;n<s.length;n++){const r=s[n];if(e==null)return{value:void 0,found:!1,error:`Cannot read property '${r}' of ${e}`,validPath:t};if(Array.isArray(e)){const a=typeof r=="number"?r:parseInt(String(r),10);if(isNaN(a))return{value:void 0,found:!1,error:`Array index must be a number, got '${r}'`,validPath:t};if(a<0||a>=e.length)return{value:void 0,found:!1,error:`Array index ${a} out of bounds (length: ${e.length})`,validPath:t};t.push(a),e=e[a];continue}if(typeof e=="object"){const a=String(r);if(!(a in e))return{value:void 0,found:!1,error:`Property '${a}' does not exist`,validPath:t};t.push(a),e=e[a];continue}return{value:void 0,found:!1,error:`Cannot access property '${r}' of primitive type ${typeof e}`,validPath:t}}return{value:e,found:!0,validPath:t}}function P(i,s){const t=y(i,s);return t.found&&t.value!==void 0}function V(i,s,t){const e=y(i,s);return e.found&&e.value!==void 0?e.value:t}class w{constructor(s){this.context=s}evaluateCriterion(s,t){const e=t.check;return"value"in e?this.checkValue(s,t.path,e):"exists"in e?this.checkExists(s,t.path,e):"itemExists"in e&&"item"in e?this.checkArrayElement(s,t.path,e):"type"in e&&"size"in e?this.checkArraySize(s,t.path,e):"min"in e&&"max"in e?typeof e.min=="number"&&typeof e.max=="number"?this.checkNumericRange(s,t.path,e):this.checkTimeRange(s,t.path,e):{status:!1,checkType:"unknown",reason:`Unknown check type: ${JSON.stringify(e)}`}}checkValue(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkValue",reason:{message:n.error||"Path not found",path:t}};const r=n.value,a=e.value;return this.deepEqual(r,a)?{status:!0,checkType:"checkValue"}:{status:!1,checkType:"checkValue",reason:{message:"Value mismatch",path:t,expected:a,actual:r}}}checkExists(s,t,e){const n=y(s,t),r=n.found&&n.value!==void 0;return e.exists===r?{status:!0,checkType:"checkExists"}:{status:!1,checkType:"checkExists",reason:{message:e.exists?`Path should exist but doesn't: ${n.error}`:"Path should not exist but does",path:t}}}checkArrayElement(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkArrayElement",reason:{message:n.error||"Path not found",path:t}};const r=n.value;if(!Array.isArray(r))return{status:!1,checkType:"checkArrayElement",reason:{message:"Value is not an array",path:t,actualType:typeof r}};const a=r.some(u=>this.deepEqual(u,e.item));return e.itemExists===a?{status:!0,checkType:"checkArrayElement"}:{status:!1,checkType:"checkArrayElement",reason:{message:e.itemExists?"Item should exist in array but doesn't":"Item should not exist in array but does",path:t,item:e.item}}}checkArraySize(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkArraySize",reason:{message:n.error||"Path not found",path:t}};const r=n.value;if(!Array.isArray(r))return{status:!1,checkType:"checkArraySize",reason:{message:"Value is not an array",path:t,actualType:typeof r}};const a=r.length,u=e.size;let o=!1,h="";switch(e.type){case"equal":o=a===u,h=`Array length should be ${u} but is ${a}`;break;case"lessThan":o=a<u,h=`Array length should be less than ${u} but is ${a}`;break;case"greaterThan":o=a>u,h=`Array length should be greater than ${u} but is ${a}`;break}return o?{status:!0,checkType:"checkArraySize"}:{status:!1,checkType:"checkArraySize",reason:{message:h,path:t,expected:u,actual:a}}}checkTimeRange(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkTimeRange",reason:{message:n.error||"Path not found",path:t}};const r=n.value;if(typeof r=="number"){const a=parseInt(e.min),u=parseInt(e.max);return isNaN(a)||isNaN(u)?{status:!1,checkType:"checkTimeRange",reason:{message:"Min or max is not a valid number",min:e.min,max:e.max}}:r>=a&&r<=u?{status:!0,checkType:"checkTimeRange"}:{status:!1,checkType:"checkTimeRange",reason:{message:`Timestamp ${r} is outside range [${a}, ${u}]`,path:t,actual:r,min:a,max:u}}}if(typeof r=="string"){const a=E.DateTime.fromISO(r),u=E.DateTime.fromISO(e.min),o=E.DateTime.fromISO(e.max);return a.isValid?!u.isValid||!o.isValid?{status:!1,checkType:"checkTimeRange",reason:{message:"Invalid min or max time",min:e.min,max:e.max}}:a>=u&&a<=o?{status:!0,checkType:"checkTimeRange"}:{status:!1,checkType:"checkTimeRange",reason:{message:`Timestamp ${r} is outside range [${e.min}, ${e.max}]`,path:t,actual:r,min:e.min,max:e.max}}:{status:!1,checkType:"checkTimeRange",reason:{message:`Invalid timestamp: ${r}`,path:t}}}return{status:!1,checkType:"checkTimeRange",reason:{message:`Timestamp must be a string or number, got ${typeof r}`,path:t}}}checkNumericRange(s,t,e){const n=y(s,t);if(!n.found)return{status:!1,checkType:"checkNumericRange",reason:{message:n.error||"Path not found",path:t}};const r=n.value;return typeof r!="number"?{status:!1,checkType:"checkNumericRange",reason:{message:`Value must be a number, got ${typeof r}`,path:t,actual:r}}:r>=e.min&&r<=e.max?{status:!0,checkType:"checkNumericRange"}:{status:!1,checkType:"checkNumericRange",reason:{message:`Value ${r} is outside range [${e.min}, ${e.max}]`,path:t,actual:r,min:e.min,max:e.max}}}deepEqual(s,t){if(s===t)return!0;if(s===null||t===null||s===void 0||t===void 0)return s===t;if(typeof s!=typeof t)return!1;if(s instanceof Date&&t instanceof Date)return s.getTime()===t.getTime();if(Array.isArray(s)&&Array.isArray(t))return s.length!==t.length?!1:s.every((e,n)=>this.deepEqual(e,t[n]));if(typeof s=="object"&&typeof t=="object"){const e=Object.keys(s),n=Object.keys(t);return e.length!==n.length?!1:e.every(r=>this.deepEqual(s[r],t[r]))}return s===t}}class M{constructor(s){this.engine=new w(s)}matchFile(s,t){const n=(x(t)?t.matchAny:t.match).map(a=>this.engine.evaluateCriterion(s.data,a));return{matched:n.every(a=>a.status),checks:n,rule:t}}applyPreFilter(s,t){const e=[],n=[];for(const r of s){const a=t.map(u=>this.engine.evaluateCriterion(r.data,u));a.every(u=>u.status)?e.push(r):n.push({file:r,failedChecks:a.filter(u=>!u.status)})}return{matched:e,excluded:n}}filterFiles(s,t,e,n){let r,a=[];if(n){const f=this.applyPreFilter(s,n);r=f.matched,a=f.excluded}else r=s;const u=e?[...r].sort(e):[...r],o=[],h=[],g=[],k=new Set,R=new Map;let l=0,c=0;for(;l<u.length;){const f=u[l];if(c>=t.length){k.has(l)||g.push({file:f,attemptedRules:[]}),l++;continue}const m=t[c],F=[];let T=!1;if(Array.isArray(m)){for(let p=0;p<m.length;p++){if(R.get(c)?.has(p))continue;const v=m[p],$=this.matchFile(f,v);if(F.push($),$.matched&&b(v)){R.has(c)||R.set(c,new Set);const S=R.get(c);S&&S.add(p),o.push({expected:v.expected,file:f,matchResult:$,optional:v.optional||!1,info:v.info}),k.add(l),T=!0;break}}R.get(c)?.size===m.length&&c++,l++}else{const d=m,p=this.matchFile(f,d);F.push(p),p.matched?b(d)?(o.push({expected:d.expected,file:f,matchResult:p,optional:d.optional||!1,info:d.info}),k.add(l),c++,l++):x(d)&&(h.push({file:f,matchResult:p,info:d.info}),k.add(l),d.greedy||c++,l++):d.optional||x(d)?c++:(g.push({file:f,attemptedRules:F}),l++)}}const A={totalFiles:s.length,mappedFiles:o.length,wildcardMatchedFiles:h.length,unmappedFiles:g.length,preFilteredFiles:a.length,totalRules:this.countRules(t),mandatoryRules:this.countMandatoryRules(t),optionalRules:this.countOptionalRules(t)};return{mapped:o,wildcardMatched:h,unmapped:g,preFiltered:a,stats:A}}countRules(s){return s.reduce((t,e)=>Array.isArray(e)?t+e.length:t+1,0)}countMandatoryRules(s){return s.reduce((t,e)=>Array.isArray(e)?t+e.filter(n=>!n.optional&&!x(n)).length:t+(e.optional||x(e)?0:1),0)}countOptionalRules(s){return s.reduce((t,e)=>Array.isArray(e)?t+e.filter(n=>n.optional||x(n)).length:t+(e.optional||x(e)?1:0),0)}filterFilesWithGroups(s,t,e,n){let r,a=[];if(n){const l=this.applyPreFilter(s,n);r=l.matched,a=l.excluded}else r=s;const u=e?[...r].sort(e):[...r],o=[],h=[],g=[];for(const l of t){const c=u.filter(m=>l.groupFilter.map(T=>this.engine.evaluateCriterion(m.data,T)).every(T=>T.status));if(c.length===0)continue;const A=l.rules.map(m=>(Array.isArray(m),m)),f=this.filterFiles(c,A);o.push(...f.mapped),h.push(...f.wildcardMatched),g.push(...f.unmapped)}const k=t.flatMap(l=>l.rules),R={totalFiles:s.length,mappedFiles:o.length,wildcardMatchedFiles:h.length,unmappedFiles:g.length,preFilteredFiles:a.length,totalRules:this.countRules(k),mandatoryRules:this.countMandatoryRules(k),optionalRules:this.countOptionalRules(k)};return{mapped:o,wildcardMatched:h,unmapped:g,preFiltered:a,stats:R}}}function I(i){const s=new M(i.context);if(i.rules&&i.groups)throw new Error('FilterRequest: Provide either "rules" or "groups", not both');if(!i.rules&&!i.groups)throw new Error('FilterRequest: Must provide either "rules" or "groups"');if(i.groups)return s.filterFilesWithGroups(i.files,i.groups,i.sortFn,i.preFilter);if(!i.rules)throw new Error("FilterRequest: Rules are required");return s.filterFiles(i.files,i.rules,i.sortFn,i.preFilter)}exports.FilterEngine=w;exports.Matcher=M;exports.filterFiles=I;exports.getValueFromPath=y;exports.getValueOr=V;exports.isSingleMatchRule=b;exports.isWildcardRule=x;exports.pathExists=P;

package/dist/aikotools-datafilter.mjs

@@ -1,11 +1,11 @@
-import { DateTime as $ } from "luxon";
-function x(i) {
+import { DateTime as E } from "luxon";
+function R(i) {
   return "matchAny" in i;
 }
-function b(i) {
+function w(i) {
   return "match" in i && "expected" in i;
 }
-function g(i, s) {
+function k(i, s) {
   const t = [];
   if (s.length === 0)
     return {
@@ -67,15 +67,15 @@ function g(i, s) {
     validPath: t
   };
 }
-function V(i, s) {
-  const t = g(i, s);
+function I(i, s) {
+  const t = k(i, s);
   return t.found && t.value !== void 0;
 }
-function I(i, s, t) {
-  const e = g(i, s);
+function N(i, s, t) {
+  const e = k(i, s);
   return e.found && e.value !== void 0 ? e.value : t;
 }
-class w {
+class S {
   constructor(s) {
     this.context = s;
   }
@@ -104,7 +104,7 @@ class w {
    * @returns FilterCheckResult
    */
   checkValue(s, t, e) {
-    const n = g(s, t);
+    const n = k(s, t);
     if (!n.found)
       return {
         status: !1,
@@ -138,7 +138,7 @@ class w {
    * @returns FilterCheckResult
    */
   checkExists(s, t, e) {
-    const n = g(s, t), r = n.found && n.value !== void 0;
+    const n = k(s, t), r = n.found && n.value !== void 0;
     return e.exists === r ? {
       status: !0,
       checkType: "checkExists"
@@ -160,7 +160,7 @@ class w {
    * @returns FilterCheckResult
    */
   checkArrayElement(s, t, e) {
-    const n = g(s, t);
+    const n = k(s, t);
     if (!n.found)
       return {
         status: !1,
@@ -204,7 +204,7 @@ class w {
    * @returns FilterCheckResult
    */
   checkArraySize(s, t, e) {
-    const n = g(s, t);
+    const n = k(s, t);
     if (!n.found)
       return {
         status: !1,
@@ -226,26 +226,26 @@ class w {
         }
       };
     const a = r.length, u = e.size;
-    let c = !1, f = "";
+    let l = !1, h = "";
     switch (e.type) {
       case "equal":
-        c = a === u, f = `Array length should be ${u} but is ${a}`;
+        l = a === u, h = `Array length should be ${u} but is ${a}`;
         break;
       case "lessThan":
-        c = a < u, f = `Array length should be less than ${u} but is ${a}`;
+        l = a < u, h = `Array length should be less than ${u} but is ${a}`;
         break;
       case "greaterThan":
-        c = a > u, f = `Array length should be greater than ${u} but is ${a}`;
+        l = a > u, h = `Array length should be greater than ${u} but is ${a}`;
         break;
     }
-    return c ? {
+    return l ? {
       status: !0,
       checkType: "checkArraySize"
     } : {
       status: !1,
       checkType: "checkArraySize",
       reason: {
-        message: f,
+        message: h,
         path: t,
         expected: u,
         actual: a
@@ -261,7 +261,7 @@ class w {
    * @returns FilterCheckResult
    */
   checkTimeRange(s, t, e) {
-    const n = g(s, t);
+    const n = k(s, t);
     if (!n.found)
       return {
         status: !1,
@@ -298,8 +298,8 @@ class w {
       };
     }
     if (typeof r == "string") {
-      const a = $.fromISO(r), u = $.fromISO(e.min), c = $.fromISO(e.max);
-      return a.isValid ? !u.isValid || !c.isValid ? {
+      const a = E.fromISO(r), u = E.fromISO(e.min), l = E.fromISO(e.max);
+      return a.isValid ? !u.isValid || !l.isValid ? {
         status: !1,
         checkType: "checkTimeRange",
         reason: {
@@ -307,7 +307,7 @@ class w {
           min: e.min,
           max: e.max
         }
-      } : a >= u && a <= c ? {
+      } : a >= u && a <= l ? {
         status: !0,
         checkType: "checkTimeRange"
       } : {
@@ -347,7 +347,7 @@ class w {
    * @returns FilterCheckResult
    */
   checkNumericRange(s, t, e) {
-    const n = g(s, t);
+    const n = k(s, t);
     if (!n.found)
       return {
         status: !1,
@@ -401,9 +401,9 @@ class w {
     return s === t;
   }
 }
-class S {
+class M {
   constructor(s) {
-    this.engine = new w(s);
+    this.engine = new S(s);
   }
   /**
    * Matches a single file against a rule.
@@ -413,7 +413,7 @@ class S {
    * @returns MatchResult indicating if all criteria matched
    */
   matchFile(s, t) {
-    const n = (x(t) ? t.matchAny : t.match).map((a) => this.engine.evaluateCriterion(s.data, a));
+    const n = (R(t) ? t.matchAny : t.match).map((a) => this.engine.evaluateCriterion(s.data, a));
     return {
       matched: n.every((a) => a.status),
       checks: n,
@@ -421,14 +421,22 @@ class S {
     };
   }
   /**
-   * Applies pre-filter criteria to files, returning only files that match all criteria.
+   * Applies pre-filter criteria to files, separating files that match from those that don't.
    *
    * @param files - Files to filter
    * @param preFilter - Filter criteria that all files must match
-   * @returns Filtered files that match all preFilter criteria
+   * @returns Object with matched files and excluded files (with failed checks)
    */
   applyPreFilter(s, t) {
-    return s.filter((e) => t.map((r) => this.engine.evaluateCriterion(e.data, r)).every((r) => r.status));
+    const e = [], n = [];
+    for (const r of s) {
+      const a = t.map((u) => this.engine.evaluateCriterion(r.data, u));
+      a.every((u) => u.status) ? e.push(r) : n.push({
+        file: r,
+        failedChecks: a.filter((u) => !u.status)
+      });
+    }
+    return { matched: e, excluded: n };
   }
   /**
    * Main filtering function that processes files according to rules.
@@ -440,70 +448,78 @@ class S {
    * @returns FilterResult with mapped, wildcardMatched, and unmapped files
    */
   filterFiles(s, t, e, n) {
-    const r = n ? this.applyPreFilter(s, n) : s, a = e ? [...r].sort(e) : [...r], u = [], c = [], f = [], y = /* @__PURE__ */ new Set(), k = /* @__PURE__ */ new Map();
-    let o = 0, l = 0;
-    for (; o < a.length; ) {
-      const h = a[o];
-      if (l >= t.length) {
-        y.has(o) || f.push({
-          file: h,
+    let r, a = [];
+    if (n) {
+      const f = this.applyPreFilter(s, n);
+      r = f.matched, a = f.excluded;
+    } else
+      r = s;
+    const u = e ? [...r].sort(e) : [...r], l = [], h = [], y = [], g = /* @__PURE__ */ new Set(), x = /* @__PURE__ */ new Map();
+    let o = 0, c = 0;
+    for (; o < u.length; ) {
+      const f = u[o];
+      if (c >= t.length) {
+        g.has(o) || y.push({
+          file: f,
           attemptedRules: []
         }), o++;
         continue;
       }
-      const m = t[l], v = [];
-      let R = !1;
+      const m = t[c], A = [];
+      let T = !1;
       if (Array.isArray(m)) {
         for (let p = 0; p < m.length; p++) {
-          if (k.get(l)?.has(p))
+          if (x.get(c)?.has(p))
             continue;
-          const T = m[p], F = this.matchFile(h, T);
-          if (v.push(F), F.matched && b(T)) {
-            k.has(l) || k.set(l, /* @__PURE__ */ new Set());
-            const E = k.get(l);
-            E && E.add(p), u.push({
-              expected: T.expected,
-              file: h,
-              matchResult: F,
-              optional: T.optional || !1,
-              info: T.info
-            }), y.add(o), R = !0;
+          const v = m[p], $ = this.matchFile(f, v);
+          if (A.push($), $.matched && w(v)) {
+            x.has(c) || x.set(c, /* @__PURE__ */ new Set());
+            const b = x.get(c);
+            b && b.add(p), l.push({
+              expected: v.expected,
+              file: f,
+              matchResult: $,
+              optional: v.optional || !1,
+              info: v.info
+            }), g.add(o), T = !0;
             break;
           }
         }
-        k.get(l)?.size === m.length && l++, o++;
+        x.get(c)?.size === m.length && c++, o++;
       } else {
-        const d = m, p = this.matchFile(h, d);
-        v.push(p), p.matched ? b(d) ? (u.push({
+        const d = m, p = this.matchFile(f, d);
+        A.push(p), p.matched ? w(d) ? (l.push({
           expected: d.expected,
-          file: h,
+          file: f,
           matchResult: p,
           optional: d.optional || !1,
           info: d.info
-        }), y.add(o), l++, o++) : x(d) && (c.push({
-          file: h,
+        }), g.add(o), c++, o++) : R(d) && (h.push({
+          file: f,
           matchResult: p,
           info: d.info
-        }), y.add(o), d.greedy || l++, o++) : d.optional || x(d) ? l++ : (f.push({
-          file: h,
-          attemptedRules: v
+        }), g.add(o), d.greedy || c++, o++) : d.optional || R(d) ? c++ : (y.push({
+          file: f,
+          attemptedRules: A
         }), o++);
       }
     }
-    const A = {
+    const F = {
       totalFiles: s.length,
-      mappedFiles: u.length,
-      wildcardMatchedFiles: c.length,
-      unmappedFiles: f.length,
+      mappedFiles: l.length,
+      wildcardMatchedFiles: h.length,
+      unmappedFiles: y.length,
+      preFilteredFiles: a.length,
       totalRules: this.countRules(t),
       mandatoryRules: this.countMandatoryRules(t),
       optionalRules: this.countOptionalRules(t)
     };
     return {
-      mapped: u,
-      wildcardMatched: c,
-      unmapped: f,
-      stats: A
+      mapped: l,
+      wildcardMatched: h,
+      unmapped: y,
+      preFiltered: a,
+      stats: F
     };
   }
   /**
@@ -516,13 +532,13 @@ class S {
    * Counts mandatory rules
    */
   countMandatoryRules(s) {
-    return s.reduce((t, e) => Array.isArray(e) ? t + e.filter((n) => !n.optional && !x(n)).length : t + (e.optional || x(e) ? 0 : 1), 0);
+    return s.reduce((t, e) => Array.isArray(e) ? t + e.filter((n) => !n.optional && !R(n)).length : t + (e.optional || R(e) ? 0 : 1), 0);
   }
   /**
    * Counts optional rules
    */
   countOptionalRules(s) {
-    return s.reduce((t, e) => Array.isArray(e) ? t + e.filter((n) => n.optional || x(n)).length : t + (e.optional || x(e) ? 1 : 0), 0);
+    return s.reduce((t, e) => Array.isArray(e) ? t + e.filter((n) => n.optional || R(n)).length : t + (e.optional || R(e) ? 1 : 0), 0);
   }
   /**
    * Filtering function for grouped rules with common filter criteria.
@@ -536,33 +552,41 @@ class S {
    * @returns FilterResult with mapped, wildcardMatched, and unmapped files
    */
   filterFilesWithGroups(s, t, e, n) {
-    const r = n ? this.applyPreFilter(s, n) : s, a = e ? [...r].sort(e) : [...r], u = [], c = [], f = [];
+    let r, a = [];
+    if (n) {
+      const o = this.applyPreFilter(s, n);
+      r = o.matched, a = o.excluded;
+    } else
+      r = s;
+    const u = e ? [...r].sort(e) : [...r], l = [], h = [], y = [];
     for (const o of t) {
-      const l = a.filter((m) => o.groupFilter.map((R) => this.engine.evaluateCriterion(m.data, R)).every((R) => R.status));
-      if (l.length === 0)
+      const c = u.filter((m) => o.groupFilter.map((T) => this.engine.evaluateCriterion(m.data, T)).every((T) => T.status));
+      if (c.length === 0)
         continue;
-      const A = o.rules.map((m) => (Array.isArray(m), m)), h = this.filterFiles(l, A);
-      u.push(...h.mapped), c.push(...h.wildcardMatched), f.push(...h.unmapped);
+      const F = o.rules.map((m) => (Array.isArray(m), m)), f = this.filterFiles(c, F);
+      l.push(...f.mapped), h.push(...f.wildcardMatched), y.push(...f.unmapped);
     }
-    const y = t.flatMap((o) => o.rules), k = {
+    const g = t.flatMap((o) => o.rules), x = {
       totalFiles: s.length,
-      mappedFiles: u.length,
-      wildcardMatchedFiles: c.length,
-      unmappedFiles: f.length,
-      totalRules: this.countRules(y),
-      mandatoryRules: this.countMandatoryRules(y),
-      optionalRules: this.countOptionalRules(y)
+      mappedFiles: l.length,
+      wildcardMatchedFiles: h.length,
+      unmappedFiles: y.length,
+      preFilteredFiles: a.length,
+      totalRules: this.countRules(g),
+      mandatoryRules: this.countMandatoryRules(g),
+      optionalRules: this.countOptionalRules(g)
     };
     return {
-      mapped: u,
-      wildcardMatched: c,
-      unmapped: f,
-      stats: k
+      mapped: l,
+      wildcardMatched: h,
+      unmapped: y,
+      preFiltered: a,
+      stats: x
     };
   }
 }
-function N(i) {
-  const s = new S(i.context);
+function z(i) {
+  const s = new M(i.context);
   if (i.rules && i.groups)
     throw new Error('FilterRequest: Provide either "rules" or "groups", not both');
   if (!i.rules && !i.groups)
@@ -579,12 +603,12 @@ function N(i) {
   return s.filterFiles(i.files, i.rules, i.sortFn, i.preFilter);
 }
 export {
-  w as FilterEngine,
-  S as Matcher,
-  N as filterFiles,
-  g as getValueFromPath,
-  I as getValueOr,
-  b as isSingleMatchRule,
-  x as isWildcardRule,
-  V as pathExists
+  S as FilterEngine,
+  M as Matcher,
+  z as filterFiles,
+  k as getValueFromPath,
+  N as getValueOr,
+  w as isSingleMatchRule,
+  R as isWildcardRule,
+  I as pathExists
 };

package/dist/src/core/types.d.ts

@@ -247,6 +247,19 @@ export interface UnmappedFile {
      */
     attemptedRules: MatchResult[];
 }
+/**
+ * A pre-filtered file that was excluded by preFilter criteria
+ */
+export interface PreFilteredFile {
+    /**
+     * The file that was excluded
+     */
+    file: JsonFile;
+    /**
+     * The preFilter checks that failed
+     */
+    failedChecks: FilterCheckResult[];
+}
 /**
  * Result of the entire filtering operation
  */
@@ -263,6 +276,10 @@ export interface FilterResult {
      * Files that couldn't be matched to any rule
      */
     unmapped: UnmappedFile[];
+    /**
+     * Files that were excluded by preFilter criteria
+     */
+    preFiltered: PreFilteredFile[];
     /**
      * Statistics
      */
@@ -271,6 +288,7 @@ export interface FilterResult {
         mappedFiles: number;
         wildcardMatchedFiles: number;
         unmappedFiles: number;
+        preFilteredFiles: number;
         totalRules: number;
         mandatoryRules: number;
         optionalRules: number;

package/dist/src/core/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/types.ts"],"names":[],"mappings":"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"}

package/dist/src/index.d.ts

@@ -4,7 +4,7 @@ import { FilterRequest, FilterResult } from './core/types';
  *
  * Advanced data filtering engine for JSON file matching in E2E testing
  */
-export type { PathElement, TimeUnit, CheckValue, CheckExists, CheckArrayElement, CheckArraySize, CheckTimeRange, CheckNumericRange, FilterCriterion, SingleMatchRule, WildcardMatchRule, MatchRule, FilterGroup, JsonFile, FilterCheckResult, MatchResult, MappedFile, WildcardMappedFile, UnmappedFile, FilterResult, FilterRequest, } from './core/types';
+export type { PathElement, TimeUnit, CheckValue, CheckExists, CheckArrayElement, CheckArraySize, CheckTimeRange, CheckNumericRange, FilterCriterion, SingleMatchRule, WildcardMatchRule, MatchRule, FilterGroup, JsonFile, FilterCheckResult, MatchResult, MappedFile, WildcardMappedFile, UnmappedFile, PreFilteredFile, FilterResult, FilterRequest, } from './core/types';
 export { isWildcardRule, isSingleMatchRule } from './core/types';
 export { FilterEngine } from './engine';
 export { Matcher } from './matcher';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,YAAY,EACV,WAAW,EACX,QAAQ,EACR,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,SAAS,EACT,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,YAAY,EACZ,aAAa,GACd,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAClE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAI3C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,YAAY,CA4BhE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,YAAY,EACV,WAAW,EACX,QAAQ,EACR,UAAU,EACV,WAAW,EACX,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,eAAe,EACf,eAAe,EACf,iBAAiB,EACjB,SAAS,EACT,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,WAAW,EACX,UAAU,EACV,kBAAkB,EAClB,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,aAAa,GACd,MAAM,cAAc,CAAA;AAErB,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAGhE,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AAGvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAGnC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAClE,YAAY,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAI3C,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE/D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,YAAY,CA4BhE"}

package/dist/src/matcher/Matcher.d.ts

@@ -18,11 +18,11 @@ export declare class Matcher {
      */
     matchFile(file: JsonFile, rule: MatchRule): MatchResult;
     /**
-     * Applies pre-filter criteria to files, returning only files that match all criteria.
+     * Applies pre-filter criteria to files, separating files that match from those that don't.
      *
      * @param files - Files to filter
      * @param preFilter - Filter criteria that all files must match
-     * @returns Filtered files that match all preFilter criteria
+     * @returns Object with matched files and excluded files (with failed checks)
      */
     private applyPreFilter;
     /**

package/dist/src/matcher/Matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Matcher.d.ts","sourceRoot":"","sources":["../../../src/matcher/Matcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,SAAS,EACT,YAAY,EAIZ,WAAW,EACX,eAAe,EACf,WAAW,EACZ,MAAM,eAAe,CAAA;AAItB;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAc;gBAEhB,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE;IAI1E;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,GAAG,WAAW;IAgBvD;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAStB;;;;;;;;OAQG;IACH,WAAW,CACT,KAAK,EAAE,QAAQ,EAAE,EACjB,KAAK,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,EAClC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,KAAK,MAAM,EAC7C,SAAS,CAAC,EAAE,eAAe,EAAE,GAC5B,YAAY;IAuKf;;OAEG;IACH,OAAO,CAAC,UAAU;IASlB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAS3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;;;;;;;;;OAUG;IACH,qBAAqB,CACnB,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,WAAW,EAAE,EACrB,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,KAAK,MAAM,EAC7C,SAAS,CAAC,EAAE,eAAe,EAAE,GAC5B,YAAY;CA+DhB"}
+{"version":3,"file":"Matcher.d.ts","sourceRoot":"","sources":["../../../src/matcher/Matcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,SAAS,EACT,YAAY,EAKZ,WAAW,EACX,eAAe,EACf,WAAW,EACZ,MAAM,eAAe,CAAA;AAItB;;;GAGG;AACH,qBAAa,OAAO;IAClB,OAAO,CAAC,MAAM,CAAc;gBAEhB,OAAO,CAAC,EAAE;QAAE,eAAe,CAAC,EAAE,MAAM,CAAC;QAAC,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE;IAI1E;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,GAAG,WAAW;IAgBvD;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IA4BtB;;;;;;;;OAQG;IACH,WAAW,CACT,KAAK,EAAE,QAAQ,EAAE,EACjB,KAAK,EAAE,CAAC,SAAS,GAAG,SAAS,EAAE,CAAC,EAAE,EAClC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,KAAK,MAAM,EAC7C,SAAS,CAAC,EAAE,eAAe,EAAE,GAC5B,YAAY;IAkLf;;OAEG;IACH,OAAO,CAAC,UAAU;IASlB;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAS3B;;OAEG;IACH,OAAO,CAAC,kBAAkB;IAS1B;;;;;;;;;;OAUG;IACH,qBAAqB,CACnB,KAAK,EAAE,QAAQ,EAAE,EACjB,MAAM,EAAE,WAAW,EAAE,EACrB,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,KAAK,MAAM,EAC7C,SAAS,CAAC,EAAE,eAAe,EAAE,GAC5B,YAAY;CA0EhB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aikotools/datafilter",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Advanced data filtering engine for JSON file matching in E2E testing",
   "type": "module",
   "main": "dist/aikotools-datafilter.cjs",
@@ -26,8 +26,8 @@
   },
   "scripts": {
     "dev": "vite",
-    "format": "prettier --write \"src/**/*.{js,ts,json}\"",
-    "lint": "eslint \"src/**/*.{js,ts}\"",
+    "format": "prettier --write \"{src,tests}/**/*.{js,ts,json}\"",
+    "lint": "eslint \"{src,tests}/**/*.{js,ts}\"",
     "depcheck": "depcheck",
     "build": "npm run format && npm run lint && npm run depcheck && tsc && vite build",
     "test": "npm run build && vitest run --coverage",