helm-env-delta 1.10.0 → 1.10.2

package/README.md

@@ -693,6 +693,35 @@ outputFormat:
 
 ---
 
+### 🔍 CLI Filter Operators
+
+The `-f/--filter` flag supports logical operators for complex filtering:
+
+| Operator | Name   | Example              | Matches                                         |
+| -------- | ------ | -------------------- | ----------------------------------------------- |
+| (none)   | Simple | `-f prod`            | Files where filename or content contains "prod" |
+| `\|`     | OR     | `-f "prod\|staging"` | Files matching "prod" OR "staging"              |
+| `&`      | AND    | `-f "values&prod"`   | Files matching "values" AND "prod"              |
+
+```bash
+# OR: match ANY term (filename or content)
+hed -c config.yaml -f "prod|staging" --list-files
+
+# AND: match ALL terms (can be split between filename and content)
+hed -c config.yaml -f "values&prod" --list-files
+
+# Escape literal | or & with backslash
+hed -c config.yaml -f "foo\|bar" --list-files
+```
+
+**Constraints:**
+
+- Cannot mix `&` and `|` in a single filter (throws error)
+- Case-insensitive matching
+- Empty terms are ignored (`a||b` becomes `a|b`)
+
+---
+
 ### 🔗 Config Inheritance
 
 Reuse base configurations across environment pairs.
@@ -768,7 +797,7 @@ hed --config <file> [options]  # Short alias
 | `--show-config`             |       | Display resolved config after inheritance                           |
 | `--format-only`             |       | Format destination files only (source not required)                 |
 | `--skip-format`             | `-S`  | Skip YAML formatting during sync                                    |
-| `--filter <string>`         | `-f`  | Filter files by filename or content (case-insensitive)              |
+| `--filter <string>`         | `-f`  | Filter files by filename/content (supports `\|` OR, `&` AND)        |
 | `--mode <type>`             | `-m`  | Filter by change type: new, modified, deleted, all (default: all)   |
 | `--no-color`                |       | Disable colored output (CI/accessibility)                           |
 | `--verbose`                 |       | Show detailed debug info                                            |
@@ -810,6 +839,12 @@ hed -c config.yaml --force
 # Filter to only process files matching 'prod'
 hed -c config.yaml -f prod -d
 
+# Filter with OR: match files containing 'prod' OR 'staging'
+hed -c config.yaml -f "prod|staging" -l
+
+# Filter with AND: match files containing BOTH 'values' AND 'prod'
+hed -c config.yaml -f "values&prod" -d
+
 # Sync only new files
 hed -c config.yaml -m new
 

package/dist/commandLine.js

@@ -26,7 +26,7 @@ const parseCommandLine = (argv) => {
         .option('--suggest', 'Analyze differences and suggest transforms and stop rules', false)
         .option('--suggest-threshold <number>', 'Minimum confidence for suggestions (0-1, default: 0.3)', '0.3')
         .option('--no-color', 'Disable colored output')
-        .option('-f, --filter <string>', 'Filter files by filename or content (case-insensitive)')
+        .option('-f, --filter <string>', 'Filter files by filename or content (supports | for OR, & for AND)')
         .option('-m, --mode <type>', 'Filter by change type: new, modified, deleted, all', 'all')
         .option('--verbose', 'Show detailed debug information', false)
         .option('--quiet', 'Suppress all output except critical errors', false)
@@ -50,6 +50,12 @@ Examples:
   # Filter to only process files matching 'prod'
   $ helm-env-delta --config config.yaml -f prod --diff
 
+  # Filter with OR: files matching 'prod' OR 'staging'
+  $ helm-env-delta --config config.yaml -f "prod|staging" --diff
+
+  # Filter with AND: files matching 'values' AND 'prod'
+  $ helm-env-delta --config config.yaml -f "values&prod" --diff
+
   # Sync only new files
   $ helm-env-delta --config config.yaml --mode new
 

package/dist/index.js

@@ -355,6 +355,8 @@ const main = async () => {
             console.error(error.message);
         else if ((0, suggestionEngine_1.isSuggestionEngineError)(error))
             console.error(error.message);
+        else if ((0, fileFilter_1.isFilterParseError)(error))
+            console.error(error.message);
         else if (error instanceof Error)
             console.error('Unexpected error:', error.message);
         else

package/dist/utils/fileFilter.d.ts

@@ -1,6 +1,38 @@
 import type { FileDiffResult } from '../fileDiff';
 import type { FileMap } from '../fileLoader';
 export type ChangeMode = 'new' | 'modified' | 'deleted' | 'all';
+export type FilterLogicalOperator = 'AND' | 'OR' | 'NONE';
+export interface ParsedFilter {
+    operator: FilterLogicalOperator;
+    terms: string[];
+}
+export declare const FilterParseError: {
+    new (message: string, options?: import("./errors").ErrorOptions): {
+        [key: string]: unknown;
+        readonly code?: string;
+        readonly path?: string;
+        readonly cause?: Error;
+        readonly hints?: string[];
+        name: string;
+        message: string;
+        stack?: string;
+    };
+    captureStackTrace(targetObject: object, constructorOpt?: Function): void;
+    prepareStackTrace(err: Error, stackTraces: NodeJS.CallSite[]): any;
+    stackTraceLimit: number;
+};
+export declare const isFilterParseError: (error: unknown) => error is {
+    [key: string]: unknown;
+    readonly code?: string;
+    readonly path?: string;
+    readonly cause?: Error;
+    readonly hints?: string[];
+    name: string;
+    message: string;
+    stack?: string;
+};
+export declare const parseFilterExpression: (filter: string | undefined) => ParsedFilter;
+export declare const fileMatchesFilter: (filePath: string, content: string, parsedFilter: ParsedFilter) => boolean;
 export declare const filterDiffResultByMode: (diffResult: FileDiffResult, mode: ChangeMode) => FileDiffResult;
 export declare const filterFileMap: (fileMap: FileMap, filter: string | undefined) => FileMap;
 export declare const filterFileMaps: (sourceFiles: FileMap, destinationFiles: FileMap, filter: string | undefined) => {

package/dist/utils/fileFilter.js

@@ -1,6 +1,86 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterFileMaps = exports.filterFileMap = exports.filterDiffResultByMode = void 0;
+exports.filterFileMaps = exports.filterFileMap = exports.filterDiffResultByMode = exports.fileMatchesFilter = exports.parseFilterExpression = exports.isFilterParseError = exports.FilterParseError = void 0;
+const errors_1 = require("./errors");
+const filterParseErrorCodes = {
+    MIXED_OPERATORS: 'Cannot combine AND (&) and OR (|) operators in a single filter expression'
+};
+exports.FilterParseError = (0, errors_1.createErrorClass)('FilterParseError', filterParseErrorCodes);
+exports.isFilterParseError = (0, errors_1.createErrorTypeGuard)(exports.FilterParseError);
+const parseFilterExpression = (filter) => {
+    if (!filter)
+        return { operator: 'NONE', terms: [] };
+    let hasUnescapedOr = false;
+    let hasUnescapedAnd = false;
+    for (let index = 0; index < filter.length; index++) {
+        const char = filter[index];
+        const isEscaped = index > 0 && filter[index - 1] === '\\';
+        if (char === '|' && !isEscaped)
+            hasUnescapedOr = true;
+        if (char === '&' && !isEscaped)
+            hasUnescapedAnd = true;
+    }
+    if (hasUnescapedOr && hasUnescapedAnd)
+        throw new exports.FilterParseError('Mixed operators detected', {
+            code: 'MIXED_OPERATORS',
+            hints: [
+                'Use only | (OR) or only & (AND) in a single filter',
+                String.raw `Escape literal characters with backslash: \| or \&`
+            ]
+        });
+    const operator = hasUnescapedOr ? 'OR' : hasUnescapedAnd ? 'AND' : 'NONE';
+    let terms;
+    if (operator === 'NONE')
+        terms = [filter];
+    else {
+        const splitChar = operator === 'OR' ? '|' : '&';
+        terms = [];
+        let currentTerm = '';
+        for (let index = 0; index < filter.length; index++) {
+            const char = filter[index];
+            const isEscaped = index > 0 && filter[index - 1] === '\\';
+            if (char === splitChar && !isEscaped) {
+                terms.push(currentTerm);
+                currentTerm = '';
+            }
+            else if (char === '\\' && index + 1 < filter.length && (filter[index + 1] === '|' || filter[index + 1] === '&'))
+                continue;
+            else
+                currentTerm += char;
+        }
+        terms.push(currentTerm);
+    }
+    const processedTerms = terms
+        .map((term) => term
+        .replaceAll(/\\([&|])/g, '$1')
+        .trim()
+        .toLowerCase())
+        .filter((term) => term.length > 0);
+    const finalOperator = processedTerms.length <= 1 ? 'NONE' : operator;
+    return { operator: finalOperator, terms: processedTerms };
+};
+exports.parseFilterExpression = parseFilterExpression;
+const fileMatchesFilter = (filePath, content, parsedFilter) => {
+    const { operator, terms } = parsedFilter;
+    if (terms.length === 0)
+        return true;
+    const lowerPath = filePath.toLowerCase();
+    const lowerContent = content.toLowerCase();
+    const termMatches = (term) => lowerPath.includes(term) || lowerContent.includes(term);
+    switch (operator) {
+        case 'OR': {
+            return terms.some((term) => termMatches(term));
+        }
+        case 'AND': {
+            return terms.every((term) => termMatches(term));
+        }
+        case 'NONE': {
+            const firstTerm = terms[0];
+            return terms.length === 0 || (firstTerm !== undefined && termMatches(firstTerm));
+        }
+    }
+};
+exports.fileMatchesFilter = fileMatchesFilter;
 const filterDiffResultByMode = (diffResult, mode) => {
     if (mode === 'all')
         return diffResult;
@@ -13,29 +93,26 @@ const filterDiffResultByMode = (diffResult, mode) => {
 };
 exports.filterDiffResultByMode = filterDiffResultByMode;
 const filterFileMap = (fileMap, filter) => {
-    if (!filter)
+    const parsedFilter = (0, exports.parseFilterExpression)(filter);
+    if (parsedFilter.terms.length === 0)
         return fileMap;
-    const lowerFilter = filter.toLowerCase();
     const filteredMap = new Map();
-    for (const [filePath, content] of fileMap) {
-        const filenameMatches = filePath.toLowerCase().includes(lowerFilter);
-        const contentMatches = content.toLowerCase().includes(lowerFilter);
-        if (filenameMatches || contentMatches)
+    for (const [filePath, content] of fileMap)
+        if ((0, exports.fileMatchesFilter)(filePath, content, parsedFilter))
             filteredMap.set(filePath, content);
-    }
     return filteredMap;
 };
 exports.filterFileMap = filterFileMap;
 const filterFileMaps = (sourceFiles, destinationFiles, filter) => {
-    if (!filter)
+    const parsedFilter = (0, exports.parseFilterExpression)(filter);
+    if (parsedFilter.terms.length === 0)
         return { sourceFiles, destinationFiles };
-    const lowerFilter = filter.toLowerCase();
     const matchingPaths = new Set();
     for (const [filePath, content] of sourceFiles)
-        if (filePath.toLowerCase().includes(lowerFilter) || content.toLowerCase().includes(lowerFilter))
+        if ((0, exports.fileMatchesFilter)(filePath, content, parsedFilter))
             matchingPaths.add(filePath);
     for (const [filePath, content] of destinationFiles)
-        if (filePath.toLowerCase().includes(lowerFilter) || content.toLowerCase().includes(lowerFilter))
+        if ((0, exports.fileMatchesFilter)(filePath, content, parsedFilter))
             matchingPaths.add(filePath);
     const filteredSource = new Map();
     const filteredDestination = new Map();

package/dist/utils/index.d.ts

@@ -20,4 +20,5 @@ export { applyFixedValues, getFixedValuesForFile, setValueAtPath } from './fixed
 export type { ApplicableFilter } from './arrayMerger';
 export { findMatchingTargetItem, getApplicableArrayFilters, itemMatchesAnyFilter, shouldPreserveItem } from './arrayMerger';
 export { isCommentOnlyContent } from './commentOnlyDetector';
-export { filterFileMap, filterFileMaps } from './fileFilter';
+export type { FilterLogicalOperator, ParsedFilter } from './fileFilter';
+export { fileMatchesFilter, filterFileMap, filterFileMaps, FilterParseError, isFilterParseError, parseFilterExpression } from './fileFilter';

package/dist/utils/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NUMERIC_MIN_MULTIPLIER = exports.NUMERIC_MIN_FLOOR = exports.MAX_EXAMPLES_PER_SUGGESTION = exports.ISO_TIMESTAMP_PATTERN = exports.FILTER_THRESHOLDS = exports.CONSTRAINT_FIELD_NAMES = exports.CONFIDENCE_DEFAULTS = exports.ARRAY_KEY_FIELDS = exports.ANTONYM_PAIRS = exports.isYamlSeq = exports.isYamlMap = exports.isYamlCollection = exports.isScalar = exports.extractScalarValue = exports.extractKeyValue = exports.validateVersionString = exports.applyRegexRulesSequentially = exports.validateTargetedRegex = exports.validatePathlessRegex = exports.getAllValuesRecursive = exports.RegexPatternFileLoaderError = exports.loadRegexPatternsFromKeys = exports.loadRegexPatternArray = exports.isRegexPatternFileLoaderError = exports.TransformFileLoaderError = exports.loadTransformFiles = exports.loadTransformFile = exports.isTransformFileLoaderError = exports.YamlFileLoaderError = exports.loadYamlFile = exports.isYamlFileLoaderError = exports.escapeRegex = exports.VersionCheckerError = exports.isVersionCheckerError = exports.checkForUpdates = exports.generateUnifiedDiff = exports.PatternMatcher = exports.globalMatcher = exports.isYamlFile = exports.parseJsonPath = exports.parseFilterSegment = exports.matchesFilter = exports.isFilterSegment = exports.getValueAtPath = exports.clearJsonPathCache = exports.serializeForDiff = exports.normalizeForComparison = exports.deepEqual = exports.createErrorTypeGuard = exports.createErrorClass = void 0;
-exports.filterFileMaps = exports.filterFileMap = exports.isCommentOnlyContent = exports.shouldPreserveItem = exports.itemMatchesAnyFilter = exports.getApplicableArrayFilters = exports.findMatchingTargetItem = exports.setValueAtPath = exports.getFixedValuesForFile = exports.applyFixedValues = exports.UUID_PATTERN = exports.SEMVER_PATTERN = exports.SEMANTIC_PATTERNS = exports.SEMANTIC_KEYWORDS = exports.PROBLEMATIC_REGEX_CHARS = void 0;
+exports.parseFilterExpression = exports.isFilterParseError = exports.FilterParseError = exports.filterFileMaps = exports.filterFileMap = exports.fileMatchesFilter = exports.isCommentOnlyContent = exports.shouldPreserveItem = exports.itemMatchesAnyFilter = exports.getApplicableArrayFilters = exports.findMatchingTargetItem = exports.setValueAtPath = exports.getFixedValuesForFile = exports.applyFixedValues = exports.UUID_PATTERN = exports.SEMVER_PATTERN = exports.SEMANTIC_PATTERNS = exports.SEMANTIC_KEYWORDS = exports.PROBLEMATIC_REGEX_CHARS = void 0;
 var errors_1 = require("./errors");
 Object.defineProperty(exports, "createErrorClass", { enumerable: true, get: function () { return errors_1.createErrorClass; } });
 Object.defineProperty(exports, "createErrorTypeGuard", { enumerable: true, get: function () { return errors_1.createErrorTypeGuard; } });
@@ -85,5 +85,9 @@ Object.defineProperty(exports, "shouldPreserveItem", { enumerable: true, get: fu
 var commentOnlyDetector_1 = require("./commentOnlyDetector");
 Object.defineProperty(exports, "isCommentOnlyContent", { enumerable: true, get: function () { return commentOnlyDetector_1.isCommentOnlyContent; } });
 var fileFilter_1 = require("./fileFilter");
+Object.defineProperty(exports, "fileMatchesFilter", { enumerable: true, get: function () { return fileFilter_1.fileMatchesFilter; } });
 Object.defineProperty(exports, "filterFileMap", { enumerable: true, get: function () { return fileFilter_1.filterFileMap; } });
 Object.defineProperty(exports, "filterFileMaps", { enumerable: true, get: function () { return fileFilter_1.filterFileMaps; } });
+Object.defineProperty(exports, "FilterParseError", { enumerable: true, get: function () { return fileFilter_1.FilterParseError; } });
+Object.defineProperty(exports, "isFilterParseError", { enumerable: true, get: function () { return fileFilter_1.isFilterParseError; } });
+Object.defineProperty(exports, "parseFilterExpression", { enumerable: true, get: function () { return fileFilter_1.parseFilterExpression; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "helm-env-delta",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "HelmEnvDelta – environment-aware YAML delta and sync for GitOps",
   "author": "BCsabaEngine",
   "license": "ISC",
@@ -68,7 +68,7 @@
   },
   "devDependencies": {
     "@types/hogan.js": "^3.0.5",
-    "@types/node": "^25.1.0",
+    "@types/node": "^25.2.0",
     "@types/picomatch": "^4.0.2",
     "@typescript-eslint/eslint-plugin": "^8.54.0",
     "@typescript-eslint/parser": "^8.54.0",
@@ -84,9 +84,9 @@
   },
   "dependencies": {
     "chalk": "^5.6.2",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "diff": "^8.0.3",
-    "diff2html": "3.4.52",
+    "diff2html": "3.4.56",
     "open": "^11.0.0",
     "picomatch": "^4.0.3",
     "tinyglobby": "^0.2.15",