Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix/action splitting (#1497)

Browse Source 
* fixed argument splitting logic to rely onregex instead of simple string split

* abstracted splitting function
This commit is contained in:
Nikhil Nandagopal 2020-11-02 10:54:15 +05:30 committed by GitHub
parent 2b20c55ba7
commit 2ec5b6297b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/client/src/components/editorComponents/actioncreator/ActionCreator.tsx
View File

@ -46,6 +46,7 @@ const FILE_TYPE_OPTIONS = [
{ label: "SVG", value: "'image/svg+xml'", id: "image/svg+xml" }, { label: "SVG", value: "'image/svg+xml'", id: "image/svg+xml" },
]; ];
const FUNC_ARGS_REGEX = /((["][^"]*["])|(['][^']*['])|([\(].*[\)[=][>][{].*[}])|([^'",][^,"+]*[^'",]*))*/gi;
const ACTION_TRIGGER_REGEX = /^{{([\s\S]*?)\(([\s\S]*?)\)}}$/g; const ACTION_TRIGGER_REGEX = /^{{([\s\S]*?)\(([\s\S]*?)\)}}$/g;
//Old Regex:: /\(\) => ([\s\S]*?)(\([\s\S]*?\))/g; //Old Regex:: /\(\) => ([\s\S]*?)(\([\s\S]*?\))/g;
const ACTION_ANONYMOUS_FUNC_REGEX = /\(\) => (({[\s\S]*?})|([\s\S]*?)(\([\s\S]*?\)))/g; const ACTION_ANONYMOUS_FUNC_REGEX = /\(\) => (({[\s\S]*?})|([\s\S]*?)(\([\s\S]*?\)))/g;
@ -103,13 +104,24 @@ const JSToString = (js: string): string => {
.join(""); .join("");
}; };
const argsStringToArray = (funcArgs: string): string[] => {
const argsplitMatches = [...funcArgs.matchAll(FUNC_ARGS_REGEX)];
return argsplitMatches
.map(match => {
return match[0];
})
.filter(arg => {
return arg !== "";
});
};
const textSetter = ( const textSetter = (
changeValue: any, changeValue: any,
currentValue: string, currentValue: string,
argNum: number, argNum: number,
): string => { ): string => {
const matches = [...currentValue.matchAll(ACTION_TRIGGER_REGEX)]; const matches = [...currentValue.matchAll(ACTION_TRIGGER_REGEX)];
const args = matches[0][2].split(","); const args = argsStringToArray(matches[0][2]);
const jsVal = stringToJS(changeValue); const jsVal = stringToJS(changeValue);
args[argNum] = jsVal; args[argNum] = jsVal;
const result = currentValue.replace( const result = currentValue.replace(
@ -122,8 +134,8 @@ const textSetter = (
const textGetter = (value: string, argNum: number) => { const textGetter = (value: string, argNum: number) => {
const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)]; const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
if (matches.length) { if (matches.length) {
const funcArgs = matches[0][2]; const args = argsStringToArray(matches[0][2]);
const arg = funcArgs.split(",")[argNum]; const arg = args[argNum];
const stringFromJS = arg ? JSToString(arg.trim()) : arg; const stringFromJS = arg ? JSToString(arg.trim()) : arg;
return stringFromJS; return stringFromJS;
} }
@ -136,7 +148,7 @@ const enumTypeSetter = (
argNum: number, argNum: number,
): string => { ): string => {
const matches = [...currentValue.matchAll(ACTION_TRIGGER_REGEX)]; const matches = [...currentValue.matchAll(ACTION_TRIGGER_REGEX)];
const args = matches[0][2].split(","); const args = argsStringToArray(matches[0][2]);
args[argNum] = changeValue as string; args[argNum] = changeValue as string;
const result = currentValue.replace( const result = currentValue.replace(
ACTION_TRIGGER_REGEX, ACTION_TRIGGER_REGEX,
@ -152,8 +164,8 @@ const enumTypeGetter = (
): string => { ): string => {
const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)]; const matches = [...value.matchAll(ACTION_TRIGGER_REGEX)];
if (matches.length) { if (matches.length) {
const funcArgs = matches[0][2]; const args = argsStringToArray(matches[0][2]);
const arg = funcArgs.split(",")[argNum]; const arg = args[argNum];
return arg ? arg.trim() : defaultValue; return arg ? arg.trim() : defaultValue;
} }
return defaultValue; return defaultValue;