Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions src/filter.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import {
maskCodePointRangesPreservingLength,
normalizeTextInput,
type TextCodePointRange,
} from "@textfilters/core";
import { censorCodePointRanges, normalizeTextInput } from "@textfilters/core";

import { createEmailScanner } from "./scanner.js";
import {
Expand All @@ -11,15 +7,6 @@ import {
type EmailFilterOptions,
} from "./types.js";

const maskEmailRanges = (
codePoints: readonly string[],
ranges: readonly TextCodePointRange[],
maskChar: string,
): string => {
if (ranges.length === 0) return codePoints.join("");
return maskCodePointRangesPreservingLength(codePoints, ranges, maskChar);
};

export function createEmailFilter(
options: EmailFilterOptions = {},
): EmailFilter {
Expand All @@ -33,7 +20,7 @@ export function createEmailFilter(
if (!source) return source;
const codePoints = Array.from(source);
const ranges = scanner.scan({ text: source, codePoints }).ranges;
return maskEmailRanges(codePoints, ranges, maskChar);
return censorCodePointRanges(codePoints, ranges, maskChar);
},
};
}
Expand Down
1 change: 1 addition & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export {
type EmailRangeScanResult,
type EmailFilter,
type EmailFilterOptions,
type EmailScanHints,
type EmailScanInput,
} from "./types.js";
export {
Expand Down
22 changes: 12 additions & 10 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,26 @@ export interface EmailFilter {
censor(text: unknown): string;
}

export interface EmailScanHints {
readonly textLength?: number;
readonly hasNonAscii?: boolean;
readonly hasAtSign?: boolean;
readonly hasDot?: boolean;
}

export interface EmailScanInput {
readonly text: string;
readonly codePoints: readonly string[];
readonly hints?: {
readonly textLength?: number;
readonly hasNonAscii?: boolean;
readonly hasAtSign?: boolean;
readonly hasDot?: boolean;
};
readonly hints?: EmailScanHints;
}

export interface EmailRangeScanResult {
export type EmailRangeScanResult = {
readonly ranges: readonly TextCodePointRange[];
}
};

export interface EmailRangeMatch {
export type EmailRangeMatch = {
readonly range: TextCodePointRange;
}
};

export type EmailRangeMatchSink = (match: EmailRangeMatch) => boolean | void;

Expand Down
39 changes: 39 additions & 0 deletions tests/scanner.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,38 @@ import { describe, expect, it } from "vitest";

import {
checkEmailRanges,
createEmailFilter,
createEmailScanner,
scanEmailRangeMatches,
scanEmailRanges,
EMAIL_FILTER_NAME,
type EmailRangeScanner,
type EmailRangeScanResult,
type EmailScanHints,
} from "../src/index.js";

const mask = (value: string, maskChar = "*"): string =>
maskChar.repeat(Array.from(value).length);

describe("@textfilters/email scanner", () => {
it("keeps scanner contracts compatible with shared range shapes", () => {
const scanner: EmailRangeScanner = createEmailScanner();
const hints: EmailScanHints = {
textLength: "contact user@example.com now".length,
hasNonAscii: false,
hasAtSign: true,
hasDot: true,
};
const text = "contact user@example.com now";
const result: EmailRangeScanResult = scanner.scan({
text,
codePoints: Array.from(text),
hints,
});

expect(result).toEqual({ ranges: [[8, 24]] });
});

it("exposes scanner ranges compatible with code point masking", () => {
const scanner = createEmailScanner();
expect(
Expand All @@ -22,6 +47,20 @@ describe("@textfilters/email scanner", () => {
expect(scanner.name).toBe(EMAIL_FILTER_NAME);
});

it("keeps the public censor wrapper aligned with scanner ranges", () => {
const text = "contact user@example.com now";
const scanner = createEmailScanner();
const ranges = scanner.scan({
text,
codePoints: Array.from(text),
}).ranges;

expect(ranges).toEqual([[8, 24]]);
expect(createEmailFilter({ maskChar: "#" }).censor(text)).toBe(
`contact ${mask("user@example.com", "#")} now`,
);
});

it("keeps direct and obfuscated coverage through the scanner path", () => {
expect(scanEmailRanges("contact user@example.com")).toEqual([[8, 24]]);
expect(scanEmailRanges("contact user [at] example [dot] com")).toEqual([
Expand Down