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.

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

Implement in expression #7197

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions docs/components/expression-metadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ const types = {
type: 'ItemType',
parameters: ['number', 'array']
}],
in: [{
type: 'boolean',
parameters: ['value', 'array']
}],
case: [{
type: 'OutputType',
parameters: [{ repeat: ['condition: boolean', 'output: OutputType'] }, 'default: OutputType']
Expand Down
56 changes: 56 additions & 0 deletions src/style-spec/expression/definitions/in.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// @flow

import { array, ValueType, BooleanType } from '../types';

import type { Expression } from '../expression';
import type ParsingContext from '../parsing_context';
import type EvaluationContext from '../evaluation_context';
import type { Type } from '../types';
import type { Value } from '../values';

class In implements Expression {
type: Type;
needle: Expression;
haystack: Expression;

constructor(needle: Expression, haystack: Expression) {
this.type = BooleanType;
this.needle = needle;
this.haystack = haystack;
}

static parse(args: Array<mixed>, context: ParsingContext) {
if (args.length !== 3)
return context.error(`Expected 2 arguments, but found ${args.length - 1} instead.`);

const needle = context.parse(args[1], 1, ValueType);
const haystack = context.parse(args[2], 2, array(ValueType));

if (!needle || !haystack) return null;

return new In(needle, haystack);
}

evaluate(ctx: EvaluationContext) {
const needle = (this.needle.evaluate(ctx): any);
const haystack = ((this.haystack.evaluate(ctx): any): Array<Value>);

return haystack.indexOf(needle) >= 0;
}

eachChild(fn: (Expression) => void) {
fn(this.needle);
fn(this.haystack);
}

possibleOutputs() {
return [true, false];
}

serialize() {
return ["in", this.needle.serialize(), this.haystack.serialize()];
}
}

export default In;

2 changes: 2 additions & 0 deletions src/style-spec/expression/definitions/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import Literal from './literal';
import Assertion from './assertion';
import Coercion from './coercion';
import At from './at';
import In from './in';
import Match from './match';
import Case from './case';
import Step from './step';
Expand Down Expand Up @@ -47,6 +48,7 @@ const expressions: ExpressionRegistry = {
'coalesce': Coalesce,
'collator': CollatorExpression,
'format': FormatExpression,
'in': In,
'interpolate': Interpolate,
'interpolate-hcl': Interpolate,
'interpolate-lab': Interpolate,
Expand Down
2 changes: 2 additions & 0 deletions src/style-spec/feature_filter/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ function isExpressionFilter(filter: any) {
return filter.length >= 2 && filter[1] !== '$id' && filter[1] !== '$type';

case 'in':
return filter.length === 3 && Array.isArray(filter[2]);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can imagine us adding a collator argument to "in". We introduced a bug when we we did that for string comparison operators. Let's future-proof this line by checking filter.length >= 3.


case '!in':
case '!has':
case 'none':
Expand Down
9 changes: 9 additions & 0 deletions src/style-spec/reference/v8.json
Original file line number Diff line number Diff line change
Expand Up @@ -2345,6 +2345,15 @@
}
}
},
"in": {
"doc": "Determines whether an item exists in an array.",
"group": "Lookup",
"sdk-support": {
"basic functionality": {
"js": "0.49.0"
}
}
},
"case": {
"doc": "Selects the first output whose corresponding test condition evaluates to true.",
"group": "Decision",
Expand Down
30 changes: 30 additions & 0 deletions test/integration/expression-tests/in/basic/test.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"expression": [
"boolean",
["in", ["get", "i"], ["array", ["get", "arr"]]]
],
"inputs": [
[{}, {"properties": {"i": null, "arr": [9, 8, 7]}}],
[{}, {"properties": {"i": 1, "arr": [9, 8, 7]}}],
[{}, {"properties": {"i": 9, "arr": [9, 8, 7]}}],
[{}, {"properties": {"i": 1, "arr": null}}]
],
"expected": {
"compiled": {
"result": "success",
"isFeatureConstant": false,
"isZoomConstant": true,
"type": "boolean"
},
"outputs": [
false,
false,
true,
{"error":"Expected value to be of type array, but found null instead."}
],
"serialized": [
"boolean",
["in", ["get", "i"], ["array", ["get", "arr"]]]
]
}
}