Refactor format_section_override out of style-spec (#9543)

mapbox · Apr 10, 2020 · d9696a0 · d9696a0
1 parent 2b4a337
commit d9696a0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/...on/definitions/format_section_override.js → src/style/format_section_override.js b/...on/definitions/format_section_override.js → src/style/format_section_override.js
@@ -1,14 +1,16 @@
 // @flow
 
 import assert from 'assert';
-import type {Expression} from '../expression';
-import type EvaluationContext from '../evaluation_context';
-import type {Type} from '../types';
-import type {ZoomConstantExpression} from '../../expression';
-import {NullType} from '../types';
-import {PossiblyEvaluatedPropertyValue} from '../../../style/properties';
-import {register} from '../../../util/web_worker_transfer';
-
+import type {Expression} from '../style-spec/expression/expression';
+import type EvaluationContext from '../style-spec/expression/evaluation_context';
+import type {Type} from '../style-spec/expression/types';
+import type {ZoomConstantExpression} from '../style-spec/expression';
+import {NullType} from '../style-spec/expression/types';
+import {PossiblyEvaluatedPropertyValue} from './properties';
+import {register} from '../util/web_worker_transfer';
+
+// This is an internal expression class. It is only used in GL JS and
+// has GL JS dependencies which can break the standalone style-spec module
 export default class FormatSectionOverride<T> implements Expression {
     type: Type;
     defaultValue: PossiblyEvaluatedPropertyValue<T>;

diff --git a/src/style/style_layer/symbol_style_layer.js b/src/style/style_layer/symbol_style_layer.js
@@ -33,7 +33,7 @@ import type {CanonicalTileID} from '../../source/tile_id';
 import {FormattedType} from '../../style-spec/expression/types';
 import {typeOf} from '../../style-spec/expression/values';
 import Formatted from '../../style-spec/expression/types/formatted';
-import FormatSectionOverride from '../../style-spec/expression/definitions/format_section_override';
+import FormatSectionOverride from '../format_section_override';
 import FormatExpression from '../../style-spec/expression/definitions/format';
 import Literal from '../../style-spec/expression/definitions/literal';
 

diff --git a/...it/symbol/format_section_override.test.js → ...nit/style/format_section_override.test.js b/...it/symbol/format_section_override.test.js → ...nit/style/format_section_override.test.js
@@ -3,7 +3,7 @@ import {createExpression, ZoomConstantExpression} from '../../../src/style-spec/
 import EvaluationContext from '../../../src/style-spec/expression/evaluation_context';
 import properties from '../../../src/style/style_layer/symbol_style_layer_properties';
 import {PossiblyEvaluatedPropertyValue} from '../../../src/style/properties';
-import FormatSectionOverride from '../../../src/style-spec/expression/definitions/format_section_override';
+import FormatSectionOverride from '../../../src/style/format_section_override';
 
 test('evaluate', (t) => {
 

diff --git a/test/unit/symbol/symbol_style_layer.test.js b/test/unit/symbol/symbol_style_layer.test.js
@@ -1,6 +1,6 @@
 import {test} from '../../util/test';
 import SymbolStyleLayer from '../../../src/style/style_layer/symbol_style_layer';
-import FormatSectionOverride from '../../../src/style-spec/expression/definitions/format_section_override';
+import FormatSectionOverride from '../../../src/style/format_section_override';
 import properties from '../../../src/style/style_layer/symbol_style_layer_properties';
 
 function createSymbolLayer(layerProperties) {