[core] Implement image expression (#15877)
* [core] Bump gl-js version * [core] Implement image expression * [core] Use new image expression * [core] Coerce image expression to / from string * [core] Serialize evaluated image * [core] Pass available images to layout * [core] Pass images to evaluation context * [core] Set available flag value based on image availability * [core] Allow image coercion to boolean to indicate image availability * [core] Coalesce image expression * [core] Add image expression to next build system * [core] Align serialization format and evaluated type with gl-js * [core] Add images to expression evaluation method * [core] Add support for Image expression to expression test runner * [core] Unskip image expression tests * [core] Update unit tests * [core] Use image expression in annotation manager * [core] Add string to ImageExpression conversion * [core] Add image expression to expression dsl * [core] Convert tokens for implicitly created Image literal * [core] Fix clang format * [core] Split generated style code lines that are over 120 characters * [core] Add unit test for image expression equality * [core] Add image property expression evaluation unit test * [core] Unskip image expression render test * [core] Skip 'in' expression tests * [core] Ignore fill-pattern/update-feature-state render test * [core] Rename Image::serialize to Image::toValue
This commit is contained in:
@@ -35,8 +35,9 @@ global.expressionType = function (property) {
|
||||
case 'number':
|
||||
case 'enum':
|
||||
return 'NumberType';
|
||||
case 'image':
|
||||
return 'ImageType';
|
||||
case 'string':
|
||||
case 'image': // TODO: replace once we implement image expressions
|
||||
return 'StringType';
|
||||
case 'color':
|
||||
return `ColorType`;
|
||||
@@ -66,10 +67,11 @@ global.evaluatedType = function (property) {
|
||||
return 'bool';
|
||||
case 'number':
|
||||
return 'float';
|
||||
case 'resolvedImage':
|
||||
return 'expression::Image';
|
||||
case 'formatted':
|
||||
return 'expression::Formatted';
|
||||
case 'string':
|
||||
case 'image': // TODO: replace once we implement image expressions
|
||||
return 'std::string';
|
||||
case 'enum':
|
||||
return (isLightProperty(property) ? 'Light' : '') + `${camelize(property.name)}Type`;
|
||||
@@ -168,8 +170,8 @@ global.defaultValue = function (property) {
|
||||
}
|
||||
case 'formatted':
|
||||
case 'string':
|
||||
case 'image': // TODO: replace once we implement image expressions
|
||||
return JSON.stringify(property.default || "");
|
||||
case 'resolvedImage':
|
||||
return property.default ? `{${JSON.stringify(property.default)}}` : '{}';
|
||||
case 'enum':
|
||||
if (property.default === undefined) {
|
||||
return `${evaluatedType(property)}::Undefined`;
|
||||
@@ -191,9 +193,9 @@ global.defaultValue = function (property) {
|
||||
case 'array':
|
||||
const defaults = (property.default || []).map((e) => defaultValue({ type: property.value, default: e }));
|
||||
if (property.length) {
|
||||
return `{{ ${defaults.join(', ')} }}`;
|
||||
return `{{${defaults.join(', ')}}}`;
|
||||
} else {
|
||||
return `{ ${defaults.join(', ')} }`;
|
||||
return `{${defaults.join(', ')}}`;
|
||||
}
|
||||
default:
|
||||
return property.default;
|
||||
|
||||
Reference in New Issue
Block a user