From 4615a94d3f6964b779e66db2b13d564dffc4b068 Mon Sep 17 00:00:00 2001 From: Steven Levithan Date: Wed, 29 Jan 2025 17:24:44 +0100 Subject: [PATCH] Revert name change --- src/atomic.js | 16 ++++++++-------- src/regex.js | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/atomic.js b/src/atomic.js index 25a7474..b887900 100644 --- a/src/atomic.js +++ b/src/atomic.js @@ -12,11 +12,11 @@ Apply transformations for atomic groups: `(?>…)`. function atomic(expression, data) { const hiddenCaptures = data?.hiddenCaptures ?? []; // Capture transfer is used by - let captureTransfersMap = data?.captureTransfersMap ?? new Map(); + let captureTransfers = data?.captureTransfers ?? new Map(); if (!/\(\?>/.test(expression)) { return { pattern: expression, - captureTransfersMap, + captureTransfers, hiddenCaptures, }; } @@ -68,16 +68,16 @@ function atomic(expression, data) { hasProcessedAG = true; addedHiddenCaptures.push(addedCaptureNum); incrementIfAtLeast(hiddenCaptures, addedCaptureNum); - if (captureTransfersMap.size) { - const newCaptureTransfersMap = new Map(); - captureTransfersMap.forEach((/** @type {number} */ from, /** @type {number | string} */ to) => { - newCaptureTransfersMap.set( + if (captureTransfers.size) { + const newCaptureTransfers = new Map(); + captureTransfers.forEach((/** @type {number} */ from, /** @type {number | string} */ to) => { + newCaptureTransfers.set( // `to` can be a group number or name to >= addedCaptureNum ? to + 1 : to, from + (from >= addedCaptureNum ? 1 : 0) ); }); - captureTransfersMap = newCaptureTransfersMap; + captureTransfers = newCaptureTransfers; } break; } @@ -113,7 +113,7 @@ function atomic(expression, data) { return { pattern: expression, - captureTransfersMap, + captureTransfers, hiddenCaptures, }; } diff --git a/src/regex.js b/src/regex.js index f4eae7c..0b2d882 100644 --- a/src/regex.js +++ b/src/regex.js @@ -12,12 +12,12 @@ import {Context, hasUnescaped, replaceUnescaped} from 'regex-utilities'; @typedef {string | RegExp | Pattern | number} InterpolatedValue @typedef {{ flags?: string; - captureTransfersMap?: Map; + captureTransfers?: Map; hiddenCaptures?: Array; }} PluginData @typedef {{ pattern: string; - captureTransfersMap?: Map; + captureTransfers?: Map; hiddenCaptures?: Array; }} PluginResult @typedef {TemplateStringsArray | {raw: Array}} RawTemplate