Skip to content

Expressions: Refinements to new functions #1217

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

Merged
olemartinorg merged 15 commits into from
May 31, 2023
Merged

Expressions: Refinements to new functions #1217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
dc02747
Removing the LookupNotFound error, replacing it with ExprRuntimeError
May 31, 2023
7b4a7fe
Fixing type error
May 31, 2023
35443c9
Making the last parameter of 'round' optional
May 31, 2023
7e86524
Merge branch 'main' into chore/expr-functions-review
May 31, 2023
7e08d63
Adding test for default language if no profile is set
May 31, 2023
7256854
Adding tests with mocked text resources, along with some tests I had …
May 31, 2023
ad5b3f8
Avoiding runtime errors as much as possible - we should not fail exce…
May 31, 2023
6cf64fe
Adding JsonSchema for new expression functions
May 31, 2023
cd70a2a
Fixing style issue in layout schema test
May 31, 2023
98f9e13
Adding a test to make sure the expression.schema.v1.json file is in s…
May 31, 2023
9307473
Merge branch 'main' into chore/expr-functions-review
May 31, 2023
5a320f9
Using anyOf to fix a problem where vscode is not displaying suggestio…
May 31, 2023
e309671
Adding back the 'additionalItems' functionality that invalidates extr…
May 31, 2023
0f32e15
Adding test-cases for empty strings and null in startsWith/endsWidth/…
May 31, 2023
048a609
Adding test-case for null in commaContains
May 31, 2023
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
148 changes: 137 additions & 11 deletions schemas/json/layout/expression.schema.v1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"definitions": {
"any": {
"title": "Any expression",
"oneOf": [
"anyOf": [
{ "type": "null", "title": "Null/missing value" },
{ "$ref": "#/definitions/strict-string" },
{ "$ref": "#/definitions/strict-boolean" },
Expand All @@ -51,7 +51,7 @@
},
"string": {
"title": "Any expression returning string",
"oneOf": [
"anyOf": [
{ "type": "null", "title": "Null/missing value" },
{ "$ref": "#/definitions/strict-string" },
{ "$ref": "#/definitions/func-if" },
Expand All @@ -61,18 +61,23 @@
},
"strict-string": {
"title": "Any expression returning string (strict)",
"oneOf": [
"anyOf": [
{ "type": "string", "title": "String constant" },
{ "$ref": "#/definitions/func-component" },
{ "$ref": "#/definitions/func-dataModel" },
{ "$ref": "#/definitions/func-instanceContext" },
{ "$ref": "#/definitions/func-frontendSettings" },
{ "$ref": "#/definitions/func-concat" }
{ "$ref": "#/definitions/func-concat" },
{ "$ref": "#/definitions/func-round" },
{ "$ref": "#/definitions/func-text" },
{ "$ref": "#/definitions/func-language" },
{ "$ref": "#/definitions/func-lowerCase" },
{ "$ref": "#/definitions/func-upperCase" }
]
},
"boolean": {
"title": "Any expression returning boolean",
"oneOf": [
"anyOf": [
{ "type": "null", "title": "Null/missing value" },
{ "$ref": "#/definitions/strict-boolean" },
{ "$ref": "#/definitions/func-if" },
Expand All @@ -82,7 +87,7 @@
},
"strict-boolean": {
"title": "Any expression returning boolean (strict)",
"oneOf": [
"anyOf": [
{ "type": "boolean", "title": "Boolean constant" },
{ "$ref": "#/definitions/func-equals" },
{ "$ref": "#/definitions/func-notEquals" },
Expand All @@ -93,12 +98,17 @@
{ "$ref": "#/definitions/func-not" },
{ "$ref": "#/definitions/func-and" },
{ "$ref": "#/definitions/func-or" },
{ "$ref": "#/definitions/func-authContext" }
{ "$ref": "#/definitions/func-authContext" },
{ "$ref": "#/definitions/func-contains" },
{ "$ref": "#/definitions/func-notContains" },
{ "$ref": "#/definitions/func-endsWith" },
{ "$ref": "#/definitions/func-startsWith" },
{ "$ref": "#/definitions/func-commaContains" }
]
},
"number": {
"title": "Any expression returning a number",
"oneOf": [
"anyOf": [
{ "type": "null", "title": "Null/missing value" },
{ "$ref": "#/definitions/strict-number" },
{ "$ref": "#/definitions/func-if" },
Expand All @@ -107,14 +117,15 @@
},
"strict-number": {
"title": "Any expression returning a number (strict)",
"oneOf": [
{ "type": "number", "title": "Numeric constant" }
"anyOf": [
{ "type": "number", "title": "Numeric constant" },
{ "$ref": "#/definitions/func-stringLength" }
]
},
"func-if": {
"title": "If/else conditional expression",
"description": "This function will evaluate and return the result of either branch. If else is not given, null will be returned instead.",
"oneOf": [
"anyOf": [
{ "$ref": "#/definitions/func-if-with-else" },
{ "$ref": "#/definitions/func-if-without-else" }
]
Expand Down Expand Up @@ -293,6 +304,121 @@
{ "$ref": "#/definitions/boolean" }
],
"additionalItems": { "$ref": "#/definitions/boolean" }
},
"func-round": {
"title": "Round function",
"description": "This function rounds a number to the nearest integer, or to the specified number of decimals",
"type": "array",
"items": [
{ "const": "round" },
{ "$ref": "#/definitions/number" },
{ "$ref": "#/definitions/number" }
],
"additionalItems": false
},
"func-text": {
"title": "Text function",
"description": "This function retrieves the value of a text resource key, or returns the key if no text resource is found",
"type": "array",
"items": [
{ "const": "text" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-language": {
"title": "Language function",
"description": "This function retrieves the current language (usually 'nb', 'nn' or 'en')",
"type": "array",
"items": [
{ "const": "language" }
],
"additionalItems": false
},
"func-contains": {
"title": "Contains function",
"description": "This function checks if the first string contains the second string",
"type": "array",
"items": [
{ "const": "contains" },
{ "$ref": "#/definitions/string" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-notContains": {
"title": "Not contains function",
"description": "This function checks if the first string does not contain the second string",
"type": "array",
"items": [
{ "const": "notContains" },
{ "$ref": "#/definitions/string" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-startsWith": {
"title": "Starts with function",
"description": "This function checks if the first string starts with the second string",
"type": "array",
"items": [
{ "const": "startsWith" },
{ "$ref": "#/definitions/string" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-endsWith": {
"title": "Ends with function",
"description": "This function checks if the first string ends with the second string",
"type": "array",
"items": [
{ "const": "endsWith" },
{ "$ref": "#/definitions/string" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-stringLength": {
"title": "String length function",
"description": "This function returns the length of a string",
"type": "array",
"items": [
{ "const": "stringLength" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-commaContains": {
"title": "Comma contains function",
"description": "This function checks if the first comma-separated string contains the second string",
"type": "array",
"items": [
{ "const": "commaContains" },
{ "$ref": "#/definitions/string" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-lowerCase": {
"title": "Lower case function",
"description": "This function converts a string to lower case",
"type": "array",
"items": [
{ "const": "lowerCase" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
},
"func-upperCase": {
"title": "Upper case function",
"description": "This function converts a string to upper case",
"type": "array",
"items": [
{ "const": "upperCase" },
{ "$ref": "#/definitions/string" }
],
"additionalItems": false
}
}
}
6 changes: 0 additions & 6 deletions src/features/expressions/errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ export class ExprRuntimeError extends Error {
}
}

export class LookupNotFound extends ExprRuntimeError {
public constructor(context: ExprContext, message: string) {
super(context, message);
}
}

export class UnknownTargetType extends ExprRuntimeError {
public constructor(context: ExprContext, type: string) {
super(context, `Cannot cast to unknown type '${type}'`);
Expand Down
Loading