replace spread operator by coping of properties (#1286)

* replace spread operator by coping of properties

* Update CHANGELOG to fix spread operator usage

Replaced spread operator in changelog due to esbuild limitations.

---------

Co-authored-by: Harel M <[email protected]>

Author: melitele

CHANGELOG.md

@@ -4,7 +4,7 @@
 - _...Add new stuff here..._
 
 ### 🐞 Bug fixes
-- _...Add new stuff here..._
+- Replace spread operator (`...`) due to esbuild limitations 
 
 ## 24.1.0
 

src/expression/index.test.ts

@@ -1,11 +1,12 @@
 
-import {normalizePropertyExpression} from '.'
+import {normalizePropertyExpression, StyleExpression} from '.'
 import {StylePropertySpecification} from '..';
 import {Color} from './types/color';
 import {ColorArray} from './types/color_array';
 import {NumberArray} from './types/number_array';
 import {Padding} from './types/padding';
-import {describe, test, expect} from 'vitest';
+import type {Expression} from './expression';
+import {describe, test, expect, vi} from 'vitest';
 
 function stylePropertySpecification(type): StylePropertySpecification {
     return {
@@ -119,4 +120,28 @@ describe('normalizePropertyExpression raw values', () => {
         expect(expression.evaluate({zoom: 0}).values).toEqual([1,2,1,2]);
     })
 
+});
+
+describe('StyleExpressions', () => {
+
+    test('ignore random fields when adding global state ', () => {
+        const expression = {
+            evaluate: vi.fn()
+        } as any as Expression;
+        const styleExpression = new StyleExpression(expression, {
+            type: null,
+            default: 42,
+            'property-type': 'data-driven',
+            transition: false
+        } as StylePropertySpecification, {x: 5} as Record<string, any>);
+
+        styleExpression.evaluate({zoom: 10, a: 20, b: 30} as any);
+        expect(expression.evaluate).toHaveBeenCalled();
+        const params = (expression.evaluate as any).mock.calls[0][0].globals;
+        expect(params).toHaveProperty('zoom', 10);
+        expect(params).toHaveProperty('globalState', {x: 5});
+        expect(params).not.toHaveProperty('a');
+        expect(params).not.toHaveProperty('b');
+    });
+
 });

src/expression/index.ts

@@ -93,7 +93,7 @@ export class StyleExpression {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         this._evaluator.globals = globals;
         this._evaluator.feature = feature;
@@ -114,7 +114,7 @@ export class StyleExpression {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         this._evaluator.globals = globals;
         this._evaluator.feature = feature || null;
@@ -196,7 +196,7 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -210,7 +210,7 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -244,7 +244,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -258,7 +258,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -551,3 +551,23 @@ function getDefaultValue(spec: StylePropertySpecification): Value {
             return (spec.default === undefined ? null : spec.default);
     }
 }
+
+function addGlobalState(globals: GlobalProperties, globalState: Record<string, any>): GlobalProperties {
+    const {
+        zoom,
+        heatmapDensity,
+        elevation,
+        lineProgress,
+        isSupportedScript,
+        accumulated
+    } = globals ?? {};
+    return {
+        zoom,
+        heatmapDensity,
+        elevation,
+        lineProgress,
+        isSupportedScript,
+        accumulated,
+        globalState
+    };
+}