Fix scope resolution for the nested imports (internal-2460)

stepankuzmin · stepankuzmin · commit 249a791cca47 · 2025-05-08T15:46:54.000+03:00
diff --git a/src/style/style.ts b/src/style/style.ts
@@ -55,7 +55,7 @@ import {
 import PauseablePlacement from './pauseable_placement';
 import CrossTileSymbolIndex from '../symbol/cross_tile_symbol_index';
 import {validateCustomStyleLayer} from './style_layer/custom_style_layer';
-import {isFQID, makeFQID, getNameFromFQID, getScopeFromFQID} from '../util/fqid';
+import {isFQID, makeFQID, getNameFromFQID, getInnerScopeFromFQID, getOuterScopeFromFQID} from '../util/fqid';
 import {shadowDirectionFromProperties} from '../../3d-style/render/shadow_renderer';
 import ModelManager from '../../3d-style/render/model_manager';
 import {DEFAULT_MAX_ZOOM, DEFAULT_MIN_ZOOM} from '../geo/transform';
@@ -2236,7 +2236,7 @@ class Style extends Evented<MapEvents> {
         if (fragmentId == null || (fragmentId === '' && this.isRootStyle())) return this;
 
         if (isFQID(fragmentId)) {
-            const scope = getScopeFromFQID(fragmentId);
+            const scope = getInnerScopeFromFQID(fragmentId);
             const fragment = this.fragments.find(({id}) => id === scope);
             assert(fragment, `Fragment with id ${scope} not found in the style.`);
             if (!fragment) return undefined;
@@ -3211,13 +3211,12 @@ class Style extends Evented<MapEvents> {
         const renderedFeatures = this._queryRenderedFeatures(queryGeometry, queries, transform);
         const sortedFeatures = this._flattenAndSortRenderedFeatures(renderedFeatures);
 
-        const features = [];
+        const features: GeoJSONFeature[] = [];
         for (const feature of sortedFeatures) {
-            const scope = getScopeFromFQID(feature.layer.id);
+            const scope = getOuterScopeFromFQID(feature.layer.id);
             if (scope === this.scope) features.push(feature);
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return features;
     }
 
diff --git a/src/util/fqid.ts b/src/util/fqid.ts
@@ -11,9 +11,9 @@ export function isFQID(id: string): boolean {
     return id.indexOf(FQIDSeparator) >= 0;
 }
 
-export function makeFQID<T = string>(id: T, scope?: string | null): FQID<T> {
-    if (!scope) return id as FQID<T>;
-    return `${id}${FQIDSeparator}${scope}` as FQID<T>;
+export function makeFQID<T = string>(name: T, scope?: string | null): FQID<T> {
+    if (!scope) return name as FQID<T>;
+    return `${name}${FQIDSeparator}${scope}` as FQID<T>;
 }
 
 export function getNameFromFQID<T>(fqid: FQID<T>): T;
@@ -23,7 +23,30 @@ export function getNameFromFQID<T>(fqid: FQID<T> | string): T | string {
     return (sep >= 0 ? fqid.slice(0, sep) : fqid);
 }
 
-export function getScopeFromFQID(fqid: string): string {
+/**
+ * Extracts the scope portion from a Fully Qualified ID.
+ * When dealing with nested scopes, returns the rightmost scope segment.
+ * @param fqid - The Fully Qualified ID to extract from
+ * @returns The scope part of the FQID, or an empty string if no separator is found
+ * @example
+ * getInnerScopeFromFQID('name scope1') // returns 'scope1'
+ * getInnerScopeFromFQID('name scope2 scope1') // returns 'scope1'
+ */
+export function getInnerScopeFromFQID(fqid: string): string {
+    const sep = fqid.lastIndexOf(FQIDSeparator);
+    return sep >= 0 ? fqid.slice(sep + 1) : '';
+}
+
+/**
+ * Extracts the full scope portion from a Fully Qualified ID.
+ * When dealing with nested scopes, returns everything after the first separator, i.e. all nested scopes.
+ * @param fqid - The Fully Qualified ID to extract from
+ * @returns The full scope string, or an empty string if no separator is found
+ * @example
+ * getOuterScopeFromFQID('name scope1') // returns 'scope1'
+ * getOuterScopeFromFQID('name scope2 scope1') // returns 'scope2 scope1'
+ */
+export function getOuterScopeFromFQID(fqid: string): string {
     const sep = fqid.indexOf(FQIDSeparator);
     return sep >= 0 ? fqid.slice(sep + 1) : '';
 }
diff --git a/test/integration/render-tests/imports/config-reference-nested-parent/expected.png b/test/integration/render-tests/imports/config-reference-nested-parent/expected.png
diff --git a/test/integration/render-tests/imports/config-reference-nested-parent/style.json b/test/integration/render-tests/imports/config-reference-nested-parent/style.json
@@ -0,0 +1,71 @@
+{
+  "version": 8,
+  "metadata": {
+    "test": {
+      "width": 64,
+      "height": 32
+    }
+  },
+  "fragment": true,
+  "schema": {
+    "roadColor": {
+      "default": "green",
+      "type": "color"
+    }
+  },
+  "sources": {},
+  "layers": [],
+  "imports": [{
+      "id": "fragment",
+      "url": "",
+      "config": {
+        "roadColor": ["config", "roadColor"]
+      },
+      "data": {
+        "version": 8,
+        "schema": {
+          "roadColor": {
+            "default": "blue",
+            "type": "color"
+          }
+        },
+        "imports": [{
+          "id": "fragment",
+          "url": "",
+          "config": {
+            "roadColor": ["config", "roadColor"]
+          },
+          "data": {
+            "version": 8,
+            "schema": {
+              "roadColor": {
+                "default": "red",
+                "type": "color"
+              }
+            },
+            "sources": {
+              "geojson": {
+                "type": "geojson",
+                "data": {
+                  "type": "LineString",
+                  "coordinates": [[-15, 0], [15, 0]]
+                }
+              }
+            },
+            "layers": [
+              {
+                "id": "roads",
+                "type": "line",
+                "source": "geojson",
+                "paint": {
+                  "line-color": ["config", "roadColor"]
+                }
+              }
+            ]
+          }
+        }],
+        "sources": {},
+        "layers": []
+      }
+  }]
+}
