Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b9acd6d677 | ||
|
|
f55f63c254 | ||
|
|
331b1cb2a2 | ||
|
|
16c8275f4e |
+18
-9
@@ -51,8 +51,8 @@
|
||||
|
||||
for (const m of sorted) {
|
||||
if (!m.enabled || !m.real?.trim() || !m.substitute?.trim()) continue;
|
||||
const escaped = esc(m.real);
|
||||
const regex = new RegExp(escaped, m.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = wordBoundary(m.real);
|
||||
const regex = new RegExp(pattern, m.caseSensitive ? 'g' : 'gi');
|
||||
let match;
|
||||
while ((match = regex.exec(result)) !== null) {
|
||||
replacements.push({
|
||||
@@ -71,8 +71,8 @@
|
||||
const sorted = [...maps].sort((a, b) => b.substitute.length - a.substitute.length);
|
||||
for (const m of sorted) {
|
||||
if (!m.enabled || !m.real?.trim() || !m.substitute?.trim()) continue;
|
||||
const escaped = esc(m.substitute);
|
||||
const regex = new RegExp(escaped, m.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = wordBoundary(m.substitute);
|
||||
const regex = new RegExp(pattern, m.caseSensitive ? 'g' : 'gi');
|
||||
result = result.replace(regex, m.real);
|
||||
}
|
||||
return result;
|
||||
@@ -82,6 +82,15 @@
|
||||
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
}
|
||||
|
||||
// Add \b only on word-character edges so "not" doesn't match inside "nothing",
|
||||
// while leaving non-word edges (e.g. "@foo") alone since they self-delimit.
|
||||
function wordBoundary(str) {
|
||||
const escaped = esc(str);
|
||||
const left = /^\w/.test(str) ? '\\b' : '';
|
||||
const right = /\w$/.test(str) ? '\\b' : '';
|
||||
return left + escaped + right;
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// Smart Pattern Engine (inline for page world)
|
||||
// ============================================================
|
||||
@@ -1043,8 +1052,8 @@
|
||||
const pairs = getRevealPairs();
|
||||
let result = text;
|
||||
for (const p of pairs) {
|
||||
const escaped = esc(p.from);
|
||||
const regex = new RegExp(escaped, p.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = wordBoundary(p.from);
|
||||
const regex = new RegExp(pattern, p.caseSensitive ? 'g' : 'gi');
|
||||
result = result.replace(regex, p.to);
|
||||
}
|
||||
return result;
|
||||
@@ -1085,9 +1094,9 @@
|
||||
const pairs = getRevealPairs();
|
||||
let result = text;
|
||||
for (const p of pairs) {
|
||||
const escaped = esc(p.to); // p.to is the real value
|
||||
const regex = new RegExp(escaped, p.caseSensitive ? 'g' : 'gi');
|
||||
result = result.replace(regex, p.from); // p.from is the substitute
|
||||
const pattern = wordBoundary(p.to);
|
||||
const regex = new RegExp(pattern, p.caseSensitive ? 'g' : 'gi');
|
||||
result = result.replace(regex, p.from);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -23,8 +23,8 @@ const SubstitutionEngine = {
|
||||
for (const mapping of sorted) {
|
||||
if (!mapping.enabled || !mapping.real?.trim() || !mapping.substitute?.trim()) continue;
|
||||
|
||||
const escaped = this._escapeRegex(mapping.real);
|
||||
const regex = new RegExp(escaped, mapping.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = this._wordBoundaryPattern(mapping.real);
|
||||
const regex = new RegExp(pattern, mapping.caseSensitive ? 'g' : 'gi');
|
||||
let match;
|
||||
|
||||
while ((match = regex.exec(result)) !== null) {
|
||||
@@ -56,8 +56,8 @@ const SubstitutionEngine = {
|
||||
for (const mapping of sorted) {
|
||||
if (!mapping.enabled || !mapping.real?.trim() || !mapping.substitute?.trim()) continue;
|
||||
|
||||
const escaped = this._escapeRegex(mapping.substitute);
|
||||
const regex = new RegExp(escaped, mapping.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = this._wordBoundaryPattern(mapping.substitute);
|
||||
const regex = new RegExp(pattern, mapping.caseSensitive ? 'g' : 'gi');
|
||||
result = result.replace(regex, mapping.real);
|
||||
}
|
||||
|
||||
@@ -73,8 +73,8 @@ const SubstitutionEngine = {
|
||||
for (const mapping of mappings) {
|
||||
if (!mapping.enabled || !mapping.real?.trim()) continue;
|
||||
|
||||
const escaped = this._escapeRegex(mapping.real);
|
||||
const regex = new RegExp(escaped, mapping.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = this._wordBoundaryPattern(mapping.real);
|
||||
const regex = new RegExp(pattern, mapping.caseSensitive ? 'g' : 'gi');
|
||||
|
||||
if (regex.test(text)) {
|
||||
found.push({
|
||||
@@ -105,8 +105,8 @@ const SubstitutionEngine = {
|
||||
for (const mapping of sorted) {
|
||||
if (!mapping.enabled || !mapping.real?.trim() || !mapping.substitute?.trim()) continue;
|
||||
|
||||
const escaped = this._escapeRegex(mapping.real);
|
||||
const regex = new RegExp(escaped, mapping.caseSensitive ? 'g' : 'gi');
|
||||
const pattern = this._wordBoundaryPattern(mapping.real);
|
||||
const regex = new RegExp(pattern, mapping.caseSensitive ? 'g' : 'gi');
|
||||
let match;
|
||||
|
||||
while ((match = regex.exec(original)) !== null) {
|
||||
@@ -145,6 +145,16 @@ const SubstitutionEngine = {
|
||||
_escapeRegex(str) {
|
||||
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
},
|
||||
|
||||
// Wrap an escaped literal in \b only on edges that are word characters,
|
||||
// so "not" → "bad" matches "not" but not "nothing", while mappings whose
|
||||
// edges aren't word chars (e.g. "@foo", "foo.com ") still work.
|
||||
_wordBoundaryPattern(str) {
|
||||
const escaped = this._escapeRegex(str);
|
||||
const left = /^\w/.test(str) ? '\\b' : '';
|
||||
const right = /\w$/.test(str) ? '\\b' : '';
|
||||
return left + escaped + right;
|
||||
},
|
||||
};
|
||||
|
||||
// Support both module and content-script contexts
|
||||
|
||||
@@ -345,6 +345,18 @@ test('Disabled mapping is skipped', () => {
|
||||
if (result.text.includes('Alex Demo')) throw 'Disabled mapping should not substitute';
|
||||
});
|
||||
|
||||
test('Mapping matches whole words only', () => {
|
||||
const result = SubstitutionEngine.substitute('nothing is not a thing, not even this', [
|
||||
{ real: 'not', substitute: 'bad', enabled: true }
|
||||
]);
|
||||
if (result.text.includes('bahing') || result.text.includes('badhing')) {
|
||||
throw `Should not match inside "nothing", got: ${result.text}`;
|
||||
}
|
||||
if (!/\bbad\b/.test(result.text)) {
|
||||
throw `Should still match standalone "not", got: ${result.text}`;
|
||||
}
|
||||
});
|
||||
|
||||
// ============================================================
|
||||
// SMART PATTERNS
|
||||
// ============================================================
|
||||
|
||||
Reference in New Issue
Block a user