@mapbox/mapbox-gl-style-spec 14.14.0 → 14.15.0-alpha.ffa987fef46

package/dist/index.cjs

@@ -2872,6 +2872,7 @@
   		doc: "Name of image in sprite to use for drawing an image background.",
   		tokens: true,
   		appearance: true,
+  		"use-theme": true,
   		"sdk-support": {
   			"basic functionality": {
   				js: "0.10.0",
@@ -14044,7 +14045,7 @@
       'Polygon'
   ];
   class EvaluationContext {
-      constructor(scope, options) {
+      constructor(scope, options, iconImageUseTheme) {
           this.globals = null;
           this.feature = null;
           this.featureState = null;
@@ -14056,6 +14057,7 @@
           this.featureDistanceData = null;
           this.scope = scope;
           this.options = options;
+          this.iconImageUseTheme = iconImageUseTheme;
       }
       id() {
           return this.feature && this.feature.id !== void 0 ? this.feature.id : null;
@@ -14144,7 +14146,7 @@
                   continue;
               overloadParams.push(params);
               overloadIndex++;
-              signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, void 0, context._scope, context.options);
+              signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, void 0, context._scope, context.options, context.iconImageUseTheme);
               const parsedArgs = [];
               let argParseFailed = false;
               for (let i = 1; i < args.length; i++) {
@@ -16280,7 +16282,7 @@
   }
 
   class ParsingContext {
-      constructor(registry, path = [], expectedType, scope = new Scope(), errors = [], _scope, options) {
+      constructor(registry, path = [], expectedType, scope = new Scope(), errors = [], _scope, options, iconImageUseTheme) {
           this.registry = registry;
           this.path = path;
           this.key = path.map(part => {
@@ -16294,6 +16296,7 @@
           this.expectedType = expectedType;
           this._scope = _scope;
           this.options = options;
+          this.iconImageUseTheme = iconImageUseTheme;
       }
       /**
      * @param expr the JSON expression to parse
@@ -16356,7 +16359,7 @@
                       }
                   }
                   if (!(parsed instanceof Literal) && parsed.type.kind !== 'resolvedImage' && isConstant(parsed)) {
-                      const ec = new EvaluationContext(this._scope, this.options);
+                      const ec = new EvaluationContext(this._scope, this.options, this.iconImageUseTheme);
                       try {
                           parsed = new Literal(parsed.type, parsed.evaluate(ec));
                       } catch (e) {
@@ -16390,7 +16393,7 @@
           let path = typeof index === 'number' ? this.path.concat(index) : this.path;
           path = typeof key === 'string' ? path.concat(key) : path;
           const scope = bindings ? this.scope.concat(bindings) : this.scope;
-          return new ParsingContext(this.registry, path, expectedType || null, scope, this.errors, this._scope, this.options);
+          return new ParsingContext(this.registry, path, expectedType || null, scope, this.errors, this._scope, this.options, this.iconImageUseTheme);
       }
       /**
      * Push a parsing (or type checking) error into the `this.errors`
@@ -18774,10 +18777,10 @@
   }
 
   class StyleExpression {
-      constructor(expression, propertySpec, scope, options) {
+      constructor(expression, propertySpec, scope, options, iconImageUseTheme) {
           this.expression = expression;
           this._warningHistory = {};
-          this._evaluator = new EvaluationContext(scope, options);
+          this._evaluator = new EvaluationContext(scope, options, iconImageUseTheme);
           this._defaultValue = propertySpec ? getDefaultValue(propertySpec) : null;
           this._enumValues = propertySpec && propertySpec.type === 'enum' ? propertySpec.values : null;
           this.configDependencies = getConfigDependencies(expression);
@@ -18793,7 +18796,7 @@
           this._evaluator.featureDistanceData = featureDistanceData || null;
           return this.expression.evaluate(this._evaluator);
       }
-      evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, featureTileCoord, featureDistanceData) {
+      evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, featureTileCoord, featureDistanceData, iconImageUseTheme) {
           this._evaluator.globals = globals;
           this._evaluator.feature = feature || null;
           this._evaluator.featureState = featureState || null;
@@ -18802,6 +18805,7 @@
           this._evaluator.formattedSection = formattedSection || null;
           this._evaluator.featureTileCoord = featureTileCoord || null;
           this._evaluator.featureDistanceData = featureDistanceData || null;
+          this._evaluator.iconImageUseTheme = iconImageUseTheme || null;
           try {
               const val = this.expression.evaluate(this._evaluator);
               if (val === null || val === void 0 || typeof val === 'number' && val !== val) {
@@ -18825,13 +18829,13 @@
   function isExpression(expression) {
       return Array.isArray(expression) && expression.length > 0 && typeof expression[0] === 'string' && expression[0] in expressions;
   }
-  function createExpression(expression, propertySpec, scope, options) {
-      const parser = new ParsingContext(expressions, [], propertySpec ? getExpectedType(propertySpec) : void 0, void 0, void 0, scope, options);
+  function createExpression(expression, propertySpec, scope, options, iconImageUseTheme) {
+      const parser = new ParsingContext(expressions, [], propertySpec ? getExpectedType(propertySpec) : void 0, void 0, void 0, scope, options, iconImageUseTheme);
       const parsed = parser.parse(expression, void 0, void 0, void 0, propertySpec && propertySpec.type === 'string' ? { typeAnnotation: 'coerce' } : void 0);
       if (!parsed) {
           return error(parser.errors);
       }
-      return success(new StyleExpression(parsed, propertySpec, scope, options));
+      return success(new StyleExpression(parsed, propertySpec, scope, options, iconImageUseTheme));
   }
   class ZoomConstantExpression {
       constructor(kind, expression, isLightConstant, isLineProgressConstant) {
@@ -18845,8 +18849,8 @@
       evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection) {
           return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
       }
-      evaluate(globals, feature, featureState, canonical, availableImages, formattedSection) {
-          return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
+      evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, iconImageUseTheme) {
+          return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, void 0, void 0, iconImageUseTheme);
       }
   }
   class ZoomDependentExpression {
@@ -18874,8 +18878,8 @@
           }
       }
   }
-  function createPropertyExpression(expression, propertySpec, scope, options) {
-      expression = createExpression(expression, propertySpec, scope, options);
+  function createPropertyExpression(expression, propertySpec, scope, options, iconImageUseTheme) {
+      expression = createExpression(expression, propertySpec, scope, options, iconImageUseTheme);
       if (expression.result === 'error') {
           return expression;
       }
@@ -18931,11 +18935,11 @@
           };
       }
   }
-  function normalizePropertyExpression(value, specification, scope, options) {
+  function normalizePropertyExpression(value, specification, scope, options, iconImageUseTheme) {
       if (isFunction(value)) {
           return new StylePropertyFunction(value, specification);
       } else if (isExpression(value) || Array.isArray(value) && value.length > 0) {
-          const expression = createPropertyExpression(value, specification, scope, options);
+          const expression = createPropertyExpression(value, specification, scope, options, iconImageUseTheme);
           if (expression.result === 'error') {
               throw new Error(expression.value.map(err => `${ err.key }: ${ err.message }`).join(', '));
           }
@@ -21122,7 +21126,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       if (!layerSpec)
           return [];
       const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
-      if (propertyType === 'paint' && useThemeMatch && layerSpec[useThemeMatch[1]]) {
+      if (useThemeMatch && layerSpec[useThemeMatch[1]]) {
           if (isExpression(value)) {
               const errors2 = [];
               return errors2.concat(validate({