Update ExpressionSpecification type in flow definitions

mapbox · Nov 8, 2017 · 3b7187a · 3b7187a
1 parent df1b00b
commit 3b7187a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/build/generate-flow-typed-style-spec.js b/build/generate-flow-typed-style-spec.js
@@ -144,21 +144,19 @@ declare type CompositeFunctionSpecification<T> =
     | {| type: 'interval',    stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T |}
     | {| type: 'categorical', stops: Array<[{zoom: number, value: string | number | boolean}, T]>, property: string, default?: T |};
 
-declare type ExpressionFunctionSpecification = {|
-    expression: mixed
-|}
+declare type ExpressionSpecification = Array<mixed>;
 
 declare type PropertyValueSpecification<T> =
     | T
     | CameraFunctionSpecification<T>
-    | ExpressionFunctionSpecification;
+    | ExpressionSpecification;
 
 declare type DataDrivenPropertyValueSpecification<T> =
     | T
     | CameraFunctionSpecification<T>
     | SourceFunctionSpecification<T>
     | CompositeFunctionSpecification<T>
-    | ExpressionFunctionSpecification;
+    | ExpressionSpecification;
 
 ${flowObjectDeclaration('StyleSpecification', spec.$root)}
 

diff --git a/flow-typed/style-spec.js b/flow-typed/style-spec.js
@@ -35,21 +35,19 @@ declare type CompositeFunctionSpecification<T> =
     | {| type: 'interval',    stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T |}
     | {| type: 'categorical', stops: Array<[{zoom: number, value: string | number | boolean}, T]>, property: string, default?: T |};
 
-declare type ExpressionFunctionSpecification = {|
-    expression: mixed
-|}
+declare type ExpressionSpecification = Array<mixed>;
 
 declare type PropertyValueSpecification<T> =
     | T
     | CameraFunctionSpecification<T>
-    | ExpressionFunctionSpecification;
+    | ExpressionSpecification;
 
 declare type DataDrivenPropertyValueSpecification<T> =
     | T
     | CameraFunctionSpecification<T>
     | SourceFunctionSpecification<T>
     | CompositeFunctionSpecification<T>
-    | ExpressionFunctionSpecification;
+    | ExpressionSpecification;
 
 declare type StyleSpecification = {|
     "version": 8,