using recursive regex for faster processing

This commit is contained in:
morsh 2018-01-18 15:49:06 +02:00
Родитель 0506a35595
Коммит 3e7a8ba694
2 изменённых файлов: 64 добавлений и 229 удалений

Просмотреть файл

@ -1,182 +0,0 @@
/**
* Created by velten on 11.02.17.
*/
/**
* Adds brackets before and after a part of string
* @param str string the hole regex string
* @param start int marks the position where ( should be inserted
* @param end int marks the position where ) should be inserted
* @param groupsAdded int defines the offset to the original string because of inserted brackets
* @return {string}
*/
function addGroupToRegexString(str, start, end, groupsAdded) {
start += groupsAdded * 2;
end += groupsAdded * 2;
return str.substring(0, start) + '(' + str.substring(start, end + 1) + ')' + str.substring(end + 1);
}
/**
* converts the given regex to a regex where all not captured string are going to be captured
* it along sides generates a mapper which maps the original group index to the shifted group offset and
* generates a list of groups indexes (including new generated capturing groups)
* which have been closed before a given group index (unshifted)
*
* Example:
* regexp: /a(?: )bc(def(ghi)xyz)/g => /(a(?: )bc)((def)(ghi)(xyz))/g
* groupIndexMapper: {'1': 2, '2', 4}
* previousGroupsForGroup: {'1': [1], '2': [1, 3]}
*
* @param regex RegExp
* @return {{regexp: RegExp, groupIndexMapper: {}, previousGroupsForGroup: {}}}
*/
function fillGroups(regex) {
let regexString;
let modifier;
if (regex.source && regex.flags) {
regexString = regex.source;
modifier = regex.flags;
}
else {
regexString = regex.toString();
modifier = regexString.substring(regexString.lastIndexOf(regexString[0]) + 1); // sometimes order matters ;)
regexString = regexString.substr(1, regex.toString().lastIndexOf(regexString[0]) - 1);
}
// regexp is greedy so it should match (? before ( right?
// brackets may be not quoted by \
// closing bracket may look like: ), )+, )+?, ){1,}?, ){1,1111}?
const tester = /(\\\()|(\\\))|(\(\?)|(\()|(\)(?:\{\d+,?\d*}|[*+?])?\??)/g;
let modifiedRegex = regexString;
let lastGroupStartPosition = -1;
let lastGroupEndPosition = -1;
let lastNonGroupStartPosition = -1;
let lastNonGroupEndPosition = -1;
let groupsAdded = 0;
let groupCount = 0;
let matchArr;
const nonGroupPositions = [];
const groupPositions = [];
const groupNumber = [];
const currentLengthIndexes = [];
const groupIndexMapper = {};
const previousGroupsForGroup = {};
while ((matchArr = tester.exec(regexString)) !== null) {
if(matchArr[1] || matchArr[2]) { // ignore escaped brackets
}
if (matchArr[3]) { // non capturing group
let index = matchArr.index + matchArr[0].length - 1;
lastNonGroupStartPosition = index;
nonGroupPositions.push(index);
}
else if (matchArr[4]) { // capturing group
let index = matchArr.index + matchArr[0].length - 1;
let lastGroupPosition = Math.max(lastGroupStartPosition, lastGroupEndPosition);
// if a (? is found add ) before it
if(lastNonGroupStartPosition > lastGroupPosition) {
modifiedRegex = addGroupToRegexString(modifiedRegex, lastGroupPosition + 1, lastNonGroupStartPosition - 2, groupsAdded);
groupsAdded++;
lastGroupEndPosition = lastNonGroupStartPosition - 1; // imaginary position as it is not in regex but modifiedRegex
currentLengthIndexes.push(groupCount + groupsAdded);
// if necessary also add group between (? and opening bracket
if(index > lastNonGroupStartPosition + 2) {
modifiedRegex = addGroupToRegexString(modifiedRegex, lastNonGroupStartPosition + 2, index - 1, groupsAdded);
groupsAdded++;
lastGroupEndPosition = index - 1; // imaginary position as it is not in regex but modifiedRegex
currentLengthIndexes.push(groupCount + groupsAdded);
}
}
else if (lastGroupPosition < index - 1) {
modifiedRegex = addGroupToRegexString(modifiedRegex, lastGroupPosition + 1, index - 1, groupsAdded);
groupsAdded++;
lastGroupEndPosition = index - 1; // imaginary position as it is not in regex but modifiedRegex
currentLengthIndexes.push(groupCount + groupsAdded);
}
groupCount++;
lastGroupStartPosition = index;
groupPositions.push(index);
groupNumber.push(groupCount + groupsAdded);
groupIndexMapper[groupCount] = groupCount + groupsAdded;
previousGroupsForGroup[groupCount] = currentLengthIndexes.slice();
}
else if (matchArr[5]) { // closing bracket
let index = matchArr.index + matchArr[0].length - 1;
if ((groupPositions.length && !nonGroupPositions.length) ||
groupPositions[groupPositions.length - 1] > nonGroupPositions[nonGroupPositions.length - 1]
) {
if (lastGroupStartPosition < lastGroupEndPosition && lastGroupEndPosition < index - 1) {
modifiedRegex = addGroupToRegexString(modifiedRegex, lastGroupEndPosition + 1, index - 1, groupsAdded);
groupsAdded++;
//lastGroupEndPosition = index - 1; will be set anyway
currentLengthIndexes.push(groupCount + groupsAdded);
}
groupPositions.pop();
lastGroupEndPosition = index;
currentLengthIndexes.push(groupNumber.pop());
}
else if (nonGroupPositions.length) {
nonGroupPositions.pop();
lastNonGroupEndPosition = index;
}
}
}
return {regexp: new RegExp(modifiedRegex, modifier), groupIndexMapper, previousGroupsForGroup};
}
module.exports = {
MultiRegExp2: function (baseRegExp) {
const {regexp, groupIndexMapper, previousGroupsForGroup} = fillGroups(baseRegExp);
this.regexp = regexp;
this.groupIndexMapper = groupIndexMapper;
this.previousGroupsForGroup = previousGroupsForGroup;
this.execForAllGroups = function(string, includeFullMatch) {
let matches = RegExp.prototype.exec.call(this.regexp, string);
if (!matches) return matches;
let firstIndex = matches.index;
let indexMapper = includeFullMatch ? this.groupIndexMapper : Object.assign({0: 0}, this.groupIndexMapper);
let previousGroups = includeFullMatch ? this.previousGroupsForGroup : Object.assign({0: []}, this.previousGroupsForGroup);
return Object.keys(indexMapper).map((group) => {
let mapped = indexMapper[group];
let r = {
match: matches[mapped],
start: firstIndex + previousGroups[group].reduce(
(sum, i) => sum + (matches[i] ? matches[i].length : 0), 0
)
};
r.end = r.start + (matches[mapped] ? matches[mapped].length : 0);
return r;
});
}
this.execForGroup = function (string, group) {
const matches = RegExp.prototype.exec.call(this.regexp, string);
if (!matches) return matches;
const firstIndex = matches.index;
const mapped = group == 0 ? 0 : this.groupIndexMapper[group];
const previousGroups = group == 0 ? [] : this.previousGroupsForGroup[group];
let r = {
match: matches[mapped],
start: firstIndex + previousGroups.reduce(
(sum, i) => sum + (matches[i] ? matches[i].length : 0), 0
)
};
r.end = r.start + (matches[mapped] ? matches[mapped].length : 0);
return r;
}
}
}

Просмотреть файл

@ -2,8 +2,6 @@ const fs = require('fs');
const path = require('path');
const resourceFieldProvider = require('./resourceFieldProvider');
const { MultiRegExp2 } = require('./multiRegExp2');
function getResourceFileNameById(dir, id, overwrite, mask) {
let files = fs.readdirSync(dir) || [];
@ -43,67 +41,86 @@ function isValidFile(filePath) {
return stats.isFile() && (filePath.endsWith('.js') || filePath.endsWith('.ts'));
}
function maskString(contents, unmask, maskRequirements, keyName, maskStart, maskEnd) {
let maskingStart = maskStart || '';
let maskingEnd = maskEnd || '';
let currentObject = maskRequirements || resourceFieldProvider.MASKING_REQUIREMENTS;
let prefix = keyName || '';
let result = null;
if (prefix) {
maskingStart += '"?' + prefix + '"?[^]*?:[^]*?';
function extractExpression(contents, expression, shouldReplace, mask) {
let findExpression = expression.exec(contents);
if (!findExpression || findExpression.length === 0) {
return null;
}
if (shouldReplace) {
return contents.replace(findExpression[0], findExpression[0].replace(findExpression[1], mask));
}
return findExpression[0];
}
function extractUnmaskExpression(contents, expression, shouldGetValue) {
let findExpression = expression.exec(contents);
if (!findExpression || findExpression.length === 0 || (shouldGetValue && findExpression.length <= 1)) {
return null;
}
return shouldGetValue ? findExpression[1] : findExpression[0];
}
function maskString(contents, unmask, maskRequirements, keyName) {
let maskRegexValue = null;
let currentObject = maskRequirements || resourceFieldProvider.MASKING_REQUIREMENTS;
let replacableObject = false;
switch (currentObject.type) {
case 'object':
maskingStart += '{[^]*?';
maskingEnd = '[^]*?}' + maskingEnd;
maskRegexValue = '\\s*"?' + keyName + '"?:\\s*{(.*)}';
break;
case 'array':
maskingStart += '\[[^]*?';
maskingEnd = '[^]*?\]' + maskingEnd;
maskRegexValue = '\\s*"?' + keyName + '"?:\\s*[(.*)]';
break;
case 'string':
maskingStart += '"';
maskingEnd = '"' + maskingEnd;
if (!unmask) {
let baseRegex = new RegExp(maskingStart + '(.*?)' + maskingEnd, 'gi');
let advcRegex = new MultiRegExp2(baseRegex);
let matching = advcRegex.execForAllGroups(contents);
if (!matching) { return null; }
contents = contents.substr(0, matching[1].start) + currentObject.mask + contents.substr(matching[1].end)
return contents;
} else {
let baseRegex = new RegExp(maskingStart + '(.*?)' + maskingEnd, 'gi');
let advcRegex = new MultiRegExp2(baseRegex);
let matching = advcRegex.execForAllGroups(contents);
if (!matching || matching[1].match !== currentObject.mask) { return null; }
let unmaskRegex = new RegExp(maskingStart + '(.*?)' + maskingEnd, 'gi');
let unadvcRegex = new MultiRegExp2(baseRegex);
let unmaskMatching = unadvcRegex.execForAllGroups(unmask);
contents = contents.substr(0, matching[1].start) + unmaskMatching[1].match + contents.substr(matching[1].end)
return contents;
}
maskRegexValue = '\\s*"?' + keyName + '"?:\\s*"(.*)"';
replacableObject = true;
break;
}
let maskedContent = contents;
let replaced = false;
// Focus searches only on relevant part from regex
let toReplace = null;
let toUnmask = null;
if (maskRegexValue && unmask) {
let maskRegex = new RegExp(maskRegexValue, 'gim');
toUnmask = extractUnmaskExpression(unmask, maskRegex, replacableObject);
if (!toUnmask) { return null; }
}
if (maskRegexValue) {
let maskRegex = new RegExp(maskRegexValue, 'gim');
let mask = unmask && toUnmask || currentObject.mask;
toReplace = extractExpression(contents, maskRegex, replacableObject, mask);
if (replacableObject) { return toReplace; }
if (!toReplace) { return null; }
}
// Mask child objects
let maskedContent = toReplace || contents;
let unmakedContent = toUnmask || unmask;
let shouldReplace = false;
for (let key in currentObject.mask) {
result = maskString(maskedContent, unmask, currentObject.mask[key], key, maskingStart, maskingEnd);
let result = maskString(maskedContent, unmakedContent, currentObject.mask[key], key);
if (result) {
maskedContent = result;
replaced = true;
shouldReplace = true;
}
}
// Replace maskedContent in parent string...
if (shouldReplace) {
if (currentObject.type === 'root') {
return maskedContent;
}
return contents.replace(toReplace, maskedContent);
}
return replaced ? maskedContent : null;
// No replace has taken place
return null;
}
function maskFileContent(contents) {