Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[port] remove dynamic #1942

Merged
merged 5 commits into from
Mar 24, 2020
Merged

[port] remove dynamic #1942

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b2992b5
port C# remove dynamic
Danieladu Mar 24, 2020
ae9f7b8
update
Danieladu Mar 24, 2020
b033571
Merge branch 'master' into hond/remove-dynamic
Danieladu Mar 24, 2020
3d516f0
retrigger ci
Danieladu Mar 24, 2020
055b0c4
update
Danieladu Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 11 additions & 23 deletions libraries/adaptive-expressions/src/expressionFunctions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,24 +1029,6 @@ export class ExpressionFunctions {
}
}

private static canBeModified(value: any, property: string, expected?: number): boolean {
let modifiable = false;
if (expected !== undefined) {
// Modifiable list
modifiable = Array.isArray(value);
} else {
// Modifiable object
modifiable = value instanceof Map;
if (!modifiable) {
if (typeof value === 'object') {
modifiable = value.hasOwnProperty(property);
}
}
}

return modifiable;
}

private static setPathToValue(expression: Expression, state: MemoryInterface): { value: any; error: string } {
let path: string;
let left: Expression;
Expand Down Expand Up @@ -2985,12 +2967,18 @@ export class ExpressionFunctions {
(expression: Expression): void => ExpressionFunctions.validateOrder(expression, undefined, ReturnType.String)),
new ExpressionEvaluator(
ExpressionType.AddProperty,
ExpressionFunctions.apply(
ExpressionFunctions.applyWithError(
(args: any []): any => {
let error: string;
const temp: any = args[0];
temp[String(args[1])] = args[2];
const prop = String(args[1]);
if (prop in temp) {
error = `${ prop } already exists`;
} else {
temp[String(args[1])] = args[2];
}

return temp;
return {value: temp, error};
}),
ReturnType.Object,
(expression: Expression): void => ExpressionFunctions.validateOrder(expression, undefined, ReturnType.Object, ReturnType.String, ReturnType.Object)),
Expand Down Expand Up @@ -3056,12 +3044,12 @@ export class ExpressionFunctions {
value = false;
error = 'regular expression is empty.';
} else {
const regex: RegExp = CommonRegex.CreateRegex(args[1]);
const regex: RegExp = CommonRegex.CreateRegex(args[1].toString());
value = regex.test(args[0].toString());
}

return {value, error};
}),
}, ExpressionFunctions.verifyStringOrNull),
ReturnType.Boolean,
ExpressionFunctions.validateIsMatch),

Expand Down