Skip to content

Commit

Permalink
feat(If Node,Switch Node): Add negative operations
Browse files Browse the repository at this point in the history 
* add some not conditions to the if node

* change default to true

I think the most used behavior is 
"if value1 is true" instead of "if value1 is false"

* add u and s flag to regex

* add some not conditions to the switch node

* Add If Not Empty and Object Comparation

* ⏪ Reverted setting bools to true by default

* Changed order for operations so Not items are under the normal ones

Co-authored-by: lublak <lublak.de@gmail.com>
Co-authored-by: lublak <44057030+lublak@users.noreply.github.com>
Co-authored-by: Luiz Eduardo <luizeof@gmail.com>
  • Loading branch information
@Joffcom @lublak @luizeof
4 people committed Mar 12, 2022
1 parent 5c2deb4 commit 6412546
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 20 deletions.
53 changes: 47 additions & 6 deletions packages/nodes-base/nodes/If/If.node.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@ export class If implements INodeType {
name: 'Is Empty',
value: 'isEmpty',
},
{
name: 'Is Not Empty',
value: 'isNotEmpty',
},
],
default: 'smaller',
description: 'Operation to decide where the the data should be mapped to.',
Expand All @@ -168,6 +172,7 @@ export class If implements INodeType {
hide: {
operation: [
'isEmpty',
'isNotEmpty',
],
},
},
Expand Down Expand Up @@ -196,34 +201,50 @@ export class If implements INodeType {
name: 'Contains',
value: 'contains',
},
{
name: 'Not Contains',
value: 'notContains',
},
{
name: 'Ends With',
value: 'endsWith',
},
{
name: 'Equal',
value: 'equal',
name: 'Not Ends With',
value: 'notEndsWith',
},
{
name: 'Not Contains',
value: 'notContains',
name: 'Equal',
value: 'equal',
},
{
name: 'Not Equal',
value: 'notEqual',
},
{
name: 'Regex',
name: 'Regex Match',
value: 'regex',
},
{
name: 'Regex Not Match',
value: 'notRegex',
},
{
name: 'Starts With',
value: 'startsWith',
},
{
name: 'Not Starts With',
value: 'notStartsWith',
},
{
name: 'Is Empty',
value: 'isEmpty',
},
{
name: 'Is Not Empty',
value: 'isNotEmpty',
},
],
default: 'equal',
description: 'Operation to decide where the the data should be mapped to.',
Expand All @@ -236,7 +257,9 @@ export class If implements INodeType {
hide: {
operation: [
'isEmpty',
'isNotEmpty',
'regex',
'notRegex',
],
},
},
Expand All @@ -251,6 +274,7 @@ export class If implements INodeType {
show: {
operation: [
'regex',
'notRegex',
],
},
},
Expand Down Expand Up @@ -303,14 +327,17 @@ export class If implements INodeType {
contains: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || '').toString().includes((value2 || '').toString()),
notContains: (value1: NodeParameterValue, value2: NodeParameterValue) => !(value1 || '').toString().includes((value2 || '').toString()),
endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).endsWith(value2 as string),
notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => !(value1 as string).endsWith(value2 as string),
equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
larger: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) > (value2 || 0),
largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) >= (value2 || 0),
smaller: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) < (value2 || 0),
smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) <= (value2 || 0),
startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string),
isEmpty: (value1: NodeParameterValue) => [undefined, null, ''].includes(value1 as string),
notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => !(value1 as string).startsWith(value2 as string),
isEmpty: (value1: NodeParameterValue) => (([undefined, null, ''].includes(value1 as string)) || ((typeof value1 === 'object' && value1 !== null) ? (Object.entries(value1 as string).length === 0) : false)),
isNotEmpty: (value1: NodeParameterValue) => !(([undefined, null, ''].includes(value1 as string)) || ((typeof value1 === 'object' && value1 !== null) ? (Object.entries(value1 as string).length === 0) : false)),
regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));

Expand All @@ -325,6 +352,20 @@ export class If implements INodeType {

return !!(value1 || '').toString().match(regex);
},
notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));

let regex: RegExp;
if (!regexMatch) {
regex = new RegExp((value2 || '').toString());
} else if (regexMatch.length === 1) {
regex = new RegExp(regexMatch[1]);
} else {
regex = new RegExp(regexMatch[1], regexMatch[2]);
}

return !(value1 || '').toString().match(regex);
},
};

// Converts the input data of a dateTime into a number for easy compare
Expand Down
58 changes: 44 additions & 14 deletions packages/nodes-base/nodes/Switch/Switch.node.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,30 +430,42 @@ export class Switch implements INodeType {
name: 'Contains',
value: 'contains',
},
{
name: 'Not Contains',
value: 'notContains',
},
{
name: 'Ends With',
value: 'endsWith',
},
{
name: 'Equal',
value: 'equal',
name: 'Not Ends With',
value: 'notEndsWith',
},
{
name: 'Not Contains',
value: 'notContains',
name: 'Equal',
value: 'equal',
},
{
name: 'Not Equal',
value: 'notEqual',
},
{
name: 'Regex',
name: 'Regex Match',
value: 'regex',
},
{
name: 'Regex Not Match',
value: 'notRegex',
},
{
name: 'Starts With',
value: 'startsWith',
},
{
name: 'Not Starts With',
value: 'notStartsWith',
},
],
default: 'equal',
description: 'Operation to decide where the the data should be mapped to.',
Expand All @@ -466,6 +478,7 @@ export class Switch implements INodeType {
hide: {
operation: [
'regex',
'notRegex',
],
},
},
Expand All @@ -480,6 +493,7 @@ export class Switch implements INodeType {
show: {
operation: [
'regex',
'notRegex',
],
},
},
Expand Down Expand Up @@ -571,13 +585,15 @@ export class Switch implements INodeType {
contains: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || '').toString().includes((value2 || '').toString()),
notContains: (value1: NodeParameterValue, value2: NodeParameterValue) => !(value1 || '').toString().includes((value2 || '').toString()),
endsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).endsWith(value2 as string),
notEndsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => !(value1 as string).endsWith(value2 as string),
equal: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 === value2,
notEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => value1 !== value2,
larger: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) > (value2 || 0),
largerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) >= (value2 || 0),
smaller: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) < (value2 || 0),
smallerEqual: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 || 0) <= (value2 || 0),
startsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => (value1 as string).startsWith(value2 as string),
notStartsWith: (value1: NodeParameterValue, value2: NodeParameterValue) => !(value1 as string).startsWith(value2 as string),
regex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));

Expand All @@ -592,6 +608,20 @@ export class Switch implements INodeType {

return !!(value1 || '').toString().match(regex);
},
notRegex: (value1: NodeParameterValue, value2: NodeParameterValue) => {
const regexMatch = (value2 || '').toString().match(new RegExp('^/(.*?)/([gimusy]*)$'));

let regex: RegExp;
if (!regexMatch) {
regex = new RegExp((value2 || '').toString());
} else if (regexMatch.length === 1) {
regex = new RegExp(regexMatch[1]);
} else {
regex = new RegExp(regexMatch[1], regexMatch[2]);
}

return !(value1 || '').toString().match(regex);
},
};

// Converts the input data of a dateTime into a number for easy compare
Expand Down Expand Up @@ -628,39 +658,39 @@ export class Switch implements INodeType {

if (mode === 'expression') {
// One expression decides how to route item

outputIndex = this.getNodeParameter('output', itemIndex) as number;
checkIndexRange(outputIndex);

returnData[outputIndex].push(item);
} else if (mode === 'rules') {
// Rules decide how to route item

const dataType = this.getNodeParameter('dataType', 0) as string;

value1 = this.getNodeParameter('value1', itemIndex) as NodeParameterValue;
if (dataType === 'dateTime') {
value1 = convertDateTime(value1);
}

for (ruleData of this.getNodeParameter('rules.rules', itemIndex, []) as INodeParameters[]) {
// Check if the values passes

value2 = ruleData.value2 as NodeParameterValue;
if (dataType === 'dateTime') {
value2 = convertDateTime(value2);
}

compareOperationResult = compareOperationFunctions[ruleData.operation as string](value1, value2);

if (compareOperationResult === true) {
// If rule matches add it to the correct output and continue with next item
checkIndexRange(ruleData.output as number);
returnData[ruleData.output as number].push(item);
continue itemLoop;
}
}

// Check if a fallback output got defined and route accordingly
outputIndex = this.getNodeParameter('fallbackOutput', itemIndex) as number;
if (outputIndex !== -1) {
Expand Down

0 comments on commit 6412546

Please sign in to comment.