euredact 0.5.1 → 0.7.0

package/dist/cjs/rules/engine.js

@@ -280,12 +280,20 @@ class RuleEngine {
             if (this.matcher.validate(m)) {
                 validated.push({ match: m, hasValidValidator: m.patternDef.validator !== null });
             }
-            else if (m.patternDef.validator !== null && !m.patternDef.requiresContext) {
-                failedSpans.push({ start: m.start, end: m.end, code: m.countryCode,
-                    etype: String(m.patternDef.entityType) });
-                if (cues_js_1.RESCUE_TARGETS.has(String(m.patternDef.entityType))
-                    && (0, cues_js_1.cuedType)(text, m.start) === m.patternDef.entityType)
+            else if (m.patternDef.validator !== null) {
+                const cued = cues_js_1.RESCUE_TARGETS.has(String(m.patternDef.entityType))
+                    && (0, cues_js_1.cuedType)(text, m.start) === m.patternDef.entityType;
+                if (!m.patternDef.requiresContext) {
+                    failedSpans.push({ start: m.start, end: m.end, code: m.countryCode,
+                        etype: String(m.patternDef.entityType) });
+                    if (cued)
+                        rescued.push(m);
+                }
+                else if (cued) {
+                    // A label-gated pattern is rescued too, but only by a cue touching the
+                    // value; it casts no demotion zone (rules-engine#75).
                     rescued.push(m);
+                }
             }
         }
         // Evidence pass: work out which countries this document belongs to, from
@@ -495,7 +503,7 @@ class RuleEngine {
             // the value is filed as a Cypriot identity number. Dropping it also clears
             // outOfScope, which would otherwise claim the detection belongs to a
             // country the caller did not declare while naming no country at all.
-            const retyped = (0, cues_js_1.retypedBy)(text, match.start, entityType, countryScores.get(match.countryCode) ?? 0);
+            const retyped = (0, cues_js_1.retypedBy)(text, match.start, entityType, countryScores.get(match.countryCode) ?? 0, match.countryCode);
             if (retyped !== null) {
                 entityType = retyped;
                 country = null;