ol 9.0.0-dev.1707341212133 → 9.0.0-dev.1707494062569

package/layer/BaseVector.d.ts

@@ -68,18 +68,13 @@ export type Options<VectorSourceType extends import("../source/Vector.js").defau
      */
     map?: import("../Map.js").default | undefined;
     /**
-     * Declutter images and text. Decluttering is applied to all
-     * image and text styles of all Vector and VectorTile layers that have set this to `true`. The priority
-     * is defined by the z-index of the layer, the `zIndex` of the style and the render order of features.
-     * Higher z-index means higher priority. Within the same z-index, a feature rendered before another has
-     * higher priority.
-     *
-     * As an optimization decluttered features from layers with the same `className` are rendered above
-     * the fill and stroke styles of all of those layers regardless of z-index.  To opt out of this
-     * behavior and place declutterd features with their own layer configure the layer with a `className`
-     * other than `ol-layer`.
+     * Declutter images and text. Any truthy value will enable
+     * decluttering. Within a layer, a feature rendered before another has higher priority. All layers with the
+     * same `declutter` value will be decluttered together. The priority is determined by the drawing order of the
+     * layers with the same `declutter` value. Higher in the layer stack means higher priority. To declutter distinct
+     * layers or groups of layers separately, use different truthy values for `declutter`.
      */
-    declutter?: boolean | undefined;
+    declutter?: string | number | boolean | undefined;
     /**
      * Layer style. When set to `null`, only
      * features that have their own style will be rendered. See {@link module :ol/style/Style~Style} for the default style
@@ -129,7 +124,7 @@ declare class BaseVectorLayer<VectorSourceType extends import("../source/Vector.
     constructor(options?: Options<VectorSourceType> | undefined);
     /**
      * @private
-     * @type {boolean}
+     * @type {string}
      */
     private declutter_;
     /**
@@ -159,10 +154,6 @@ declare class BaseVectorLayer<VectorSourceType extends import("../source/Vector.
      * @private
      */
     private updateWhileInteracting_;
-    /**
-     * @return {boolean} Declutter.
-     */
-    getDeclutter(): boolean;
     /**
      * @return {number|undefined} Render buffer.
      */
@@ -195,12 +186,6 @@ declare class BaseVectorLayer<VectorSourceType extends import("../source/Vector.
      *     interacting.
      */
     getUpdateWhileInteracting(): boolean;
-    /**
-     * Render declutter items for this layer
-     * @param {import("../Map.js").FrameState} frameState Frame state.
-     * @param {import("../layer/Layer.js").State} layerState Layer state.
-     */
-    renderDeclutter(frameState: import("../Map.js").FrameState, layerState: import("../layer/Layer.js").State): void;
     /**
      * @param {import("../render.js").OrderFunction|null|undefined} renderOrder
      *     Render order.

package/layer/BaseVector.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BaseVector.d.ts","sourceRoot":"","sources":["BaseVector.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA6EA;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,6DA0DC;IA/CC;;;OAGG;IACH,mBAC6D;IAE7D;;;OAGG;IACH,sBACiE;IAEjE;;;;OAIG;IACH,eAAkB;IAElB;;;;OAIG;IACH,uBAA+B;IAI/B;;;OAGG;IACH,8BAGW;IAEX;;;OAGG;IACH,gCAGW;IAGb;;OAEG;IACH,gBAFY,OAAO,CAIlB;IAoBD;;OAEG;IACH,mBAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;;OAGG;IACH,yBAHqB,OAAO,eAAe,EAAE,OAAO,QAAE,OAAO,eAAe,EAAE,OAAO,KAAG,MAAM,GAAC,IAAI,GAAC,SAAS,CAO5G;IAED;;;;;OAKG;IACH,YAHY,OAAO,mBAAmB,EAAE,SAAS,GAAC,IAAI,GAAC,SAAS,CAK/D;IAED;;;;OAIG;IACH,oBAHY,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAK9D;IAED;;;OAGG;IACH,2BAHY,OAAO,CAKlB;IAED;;;OAGG;IACH,6BAHY,OAAO,CAKlB;IAED;;;;OAIG;IACH,4BAHW,OAAO,WAAW,EAAE,UAAU,cAC9B,OAAO,mBAAmB,EAAE,KAAK,QAU3C;IAED;;;OAGG;IACH,4BAHW,OAAO,cAAc,EAAE,aAAa,GAAC,IAAI,GAAC,SAAS,QAK7D;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,4HAKC;CACF;kBArRiB,YAAY"}
+{"version":3,"file":"BaseVector.d.ts","sourceRoot":"","sources":["BaseVector.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAwEA;;;;;;;;;;;GAWG;AACH;IACE;;OAEG;IACH,6DAyDC;IA9CC;;;OAGG;IACH,mBAA2E;IAE3E;;;OAGG;IACH,sBACiE;IAEjE;;;;OAIG;IACH,eAAkB;IAElB;;;;OAIG;IACH,uBAA+B;IAI/B;;;OAGG;IACH,8BAGW;IAEX;;;OAGG;IACH,gCAGW;IA4Bb;;OAEG;IACH,mBAFY,MAAM,GAAC,SAAS,CAI3B;IAED;;;OAGG;IACH,yBAHqB,OAAO,eAAe,EAAE,OAAO,QAAE,OAAO,eAAe,EAAE,OAAO,KAAG,MAAM,GAAC,IAAI,GAAC,SAAS,CAO5G;IAED;;;;;OAKG;IACH,YAHY,OAAO,mBAAmB,EAAE,SAAS,GAAC,IAAI,GAAC,SAAS,CAK/D;IAED;;;;OAIG;IACH,oBAHY,OAAO,mBAAmB,EAAE,aAAa,GAAC,SAAS,CAK9D;IAED;;;OAGG;IACH,2BAHY,OAAO,CAKlB;IAED;;;OAGG;IACH,6BAHY,OAAO,CAKlB;IAeD;;;OAGG;IACH,4BAHW,OAAO,cAAc,EAAE,aAAa,GAAC,IAAI,GAAC,SAAS,QAK7D;IAED;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,4HAKC;CACF;kBA7QiB,YAAY"}

package/layer/BaseVector.js

@@ -43,16 +43,11 @@ import {
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it managed by the map is to
  * use [map.addLayer()]{@link import("../Map.js").default#addLayer}.
- * @property {boolean} [declutter=false] Declutter images and text. Decluttering is applied to all
- * image and text styles of all Vector and VectorTile layers that have set this to `true`. The priority
- * is defined by the z-index of the layer, the `zIndex` of the style and the render order of features.
- * Higher z-index means higher priority. Within the same z-index, a feature rendered before another has
- * higher priority.
- *
- * As an optimization decluttered features from layers with the same `className` are rendered above
- * the fill and stroke styles of all of those layers regardless of z-index.  To opt out of this
- * behavior and place declutterd features with their own layer configure the layer with a `className`
- * other than `ol-layer`.
+ * @property {boolean|string|number} [declutter=false] Declutter images and text. Any truthy value will enable
+ * decluttering. Within a layer, a feature rendered before another has higher priority. All layers with the
+ * same `declutter` value will be decluttered together. The priority is determined by the drawing order of the
+ * layers with the same `declutter` value. Higher in the layer stack means higher priority. To declutter distinct
+ * layers or groups of layers separately, use different truthy values for `declutter`.
  * @property {import("../style/Style.js").StyleLike|import("../style/flat.js").FlatStyleLike|null} [style] Layer style. When set to `null`, only
  * features that have their own style will be rendered. See {@link module:ol/style/Style~Style} for the default style
  * which will be used if this is not set.
@@ -104,10 +99,9 @@ class BaseVectorLayer extends Layer {
 
     /**
      * @private
-     * @type {boolean}
+     * @type {string}
      */
-    this.declutter_ =
-      options.declutter !== undefined ? options.declutter : false;
+    this.declutter_ = options.declutter ? String(options.declutter) : undefined;
 
     /**
      * @type {number}
@@ -152,7 +146,7 @@ class BaseVectorLayer extends Layer {
   }
 
   /**
-   * @return {boolean} Declutter.
+   * @return {string} Declutter group.
    */
   getDeclutter() {
     return this.declutter_;
@@ -234,13 +228,11 @@ class BaseVectorLayer extends Layer {
    * @param {import("../layer/Layer.js").State} layerState Layer state.
    */
   renderDeclutter(frameState, layerState) {
-    if (!frameState.declutterTree) {
-      frameState.declutterTree = new RBush(9);
+    const declutterGroup = this.getDeclutter();
+    if (declutterGroup in frameState.declutter === false) {
+      frameState.declutter[declutterGroup] = new RBush(9);
     }
-    /** @type {*} */ (this.getRenderer()).renderDeclutter(
-      frameState,
-      layerState,
-    );
+    this.getRenderer().renderDeclutter(frameState, layerState);
   }
 
   /**

package/layer/Layer.d.ts

@@ -312,6 +312,18 @@ declare class Layer<SourceType extends import("../source/Source.js").default = i
      * Called when a layer is not visible during a map render.
      */
     unrender(): void;
+    /** @return {string} Declutter */
+    getDeclutter(): string;
+    /**
+     * @param {import("../Map.js").FrameState} frameState Frame state.
+     * @param {import("../layer/Layer.js").State} layerState Layer state.
+     */
+    renderDeclutter(frameState: import("../Map.js").FrameState, layerState: import("../layer/Layer.js").State): void;
+    /**
+     * When the renderer follows a layout -> render approach, do the final rendering here.
+     * @param {import('../Map.js').FrameState} frameState Frame state
+     */
+    renderDeferred(frameState: import('../Map.js').FrameState): void;
     /**
      * For use inside the library only.
      * @param {import("../Map.js").default|null} map Map.

package/layer/Layer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"Layer.d.ts","sourceRoot":"","sources":["Layer.js"],"names":[],"mappings":"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"}

package/layer/Layer.js

@@ -381,6 +381,29 @@ class Layer extends BaseLayer {
     this.rendered = false;
   }
 
+  /** @return {string} Declutter */
+  getDeclutter() {
+    return undefined;
+  }
+
+  /**
+   * @param {import("../Map.js").FrameState} frameState Frame state.
+   * @param {import("../layer/Layer.js").State} layerState Layer state.
+   */
+  renderDeclutter(frameState, layerState) {}
+
+  /**
+   * When the renderer follows a layout -> render approach, do the final rendering here.
+   * @param {import('../Map.js').FrameState} frameState Frame state
+   */
+  renderDeferred(frameState) {
+    const layerRenderer = this.getRenderer();
+    if (!layerRenderer) {
+      return;
+    }
+    layerRenderer.renderDeferred(frameState);
+  }
+
   /**
    * For use inside the library only.
    * @param {import("../Map.js").default|null} map Map.

package/layer/VectorImage.d.ts

@@ -68,9 +68,11 @@ export type Options<VectorSourceType extends import("../source/Vector.js").defau
      */
     map?: import("../Map.js").default | undefined;
     /**
-     * Declutter images and text on this layer. The priority is defined
-     * by the `zIndex` of the style and the render order of features. Higher z-index means higher priority.
-     * Within the same z-index, a feature rendered before another has higher priority.
+     * Declutter images and text on this layer. The priority
+     * is defined by the `zIndex` of the style and the render order of features. Higher z-index means higher
+     * priority. Within the same z-index, a feature rendered before another has higher priority. Items will
+     * not be decluttered against or together with items on other layers with the same `declutter` value. If
+     * that is needed, use {@link import ("../layer/Vector.js").default} instead.
      */
     declutter?: boolean | undefined;
     /**
@@ -122,9 +124,11 @@ export type Options<VectorSourceType extends import("../source/Vector.js").defau
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it managed by the map is to
  * use [map.addLayer()]{@link import("../Map.js").default#addLayer}.
- * @property {boolean} [declutter=false] Declutter images and text on this layer. The priority is defined
- * by the `zIndex` of the style and the render order of features. Higher z-index means higher priority.
- * Within the same z-index, a feature rendered before another has higher priority.
+ * @property {boolean} [declutter=false] Declutter images and text on this layer. The priority
+ * is defined by the `zIndex` of the style and the render order of features. Higher z-index means higher
+ * priority. Within the same z-index, a feature rendered before another has higher priority. Items will
+ * not be decluttered against or together with items on other layers with the same `declutter` value. If
+ * that is needed, use {@link import("../layer/Vector.js").default} instead.
  * @property {import("../style/Style.js").StyleLike|null} [style] Layer style. When set to `null`, only
  * features that have their own style will be rendered. See {@link module:ol/style/Style~Style} for the default style
  * which will be used if this is not set.

package/layer/VectorImage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorImage.d.ts","sourceRoot":"","sources":["VectorImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AAEH;;;;;;;;;;;;;;GAcG;AACH;IACE;;OAEG;IACH,6DAaC;IANC;;;OAGG;IACH,oBAC2D;IAG7D;;OAEG;IACH,iBAFY,MAAM,CAIjB;CAKF;2CAxF0C,wCAAwC;4BADvD,iBAAiB"}
+{"version":3,"file":"VectorImage.d.ts","sourceRoot":"","sources":["VectorImage.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AAEH;;;;;;;;;;;;;;GAcG;AACH;IACE;;OAEG;IACH,6DAaC;IANC;;;OAGG;IACH,oBAC2D;IAG7D;;OAEG;IACH,iBAFY,MAAM,CAIjB;CAKF;2CA1F0C,wCAAwC;4BADvD,iBAAiB"}

package/layer/VectorImage.js

@@ -35,9 +35,11 @@ import CanvasVectorImageLayerRenderer from '../renderer/canvas/VectorImageLayer.
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it managed by the map is to
  * use [map.addLayer()]{@link import("../Map.js").default#addLayer}.
- * @property {boolean} [declutter=false] Declutter images and text on this layer. The priority is defined
- * by the `zIndex` of the style and the render order of features. Higher z-index means higher priority.
- * Within the same z-index, a feature rendered before another has higher priority.
+ * @property {boolean} [declutter=false] Declutter images and text on this layer. The priority
+ * is defined by the `zIndex` of the style and the render order of features. Higher z-index means higher
+ * priority. Within the same z-index, a feature rendered before another has higher priority. Items will
+ * not be decluttered against or together with items on other layers with the same `declutter` value. If
+ * that is needed, use {@link import("../layer/Vector.js").default} instead.
  * @property {import("../style/Style.js").StyleLike|null} [style] Layer style. When set to `null`, only
  * features that have their own style will be rendered. See {@link module:ol/style/Style~Style} for the default style
  * which will be used if this is not set.

package/layer/VectorTile.d.ts

@@ -67,10 +67,11 @@ export type Options = {
      * Render mode for vector tiles:
      * * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
      * animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
-     * rotated views.
-     * * `'vector'`: Everything is rendered as vectors. Use this mode for improved performance on vector
-     * tile layers with only a few rendered features (e.g. for highlighting a subset of features of
-     * another layer with the same source).
+     * rotated views, but get lifted above all polygon and line elements.
+     * * `'vector'`: Everything is rendered as vectors and the original render order is maintained. Use
+     * this mode for improved performance and visual epxerience on vector tile layers with not too many
+     * rendered features (e.g. for highlighting a subset of features of another layer with the same
+     * source).
      */
     renderMode?: VectorTileRenderType | undefined;
     /**
@@ -85,18 +86,13 @@ export type Options = {
      */
     map?: import("../Map.js").default | undefined;
     /**
-     * Declutter images and text. Decluttering is applied to all
-     * image and text styles of all Vector and VectorTile layers that have set this to `true`. The priority
-     * is defined by the z-index of the layer, the `zIndex` of the style and the render order of features.
-     * Higher z-index means higher priority. Within the same z-index, a feature rendered before another has
-     * higher priority.
-     *
-     * As an optimization decluttered features from layers with the same `className` are rendered above
-     * the fill and stroke styles of all of those layers regardless of z-index.  To opt out of this
-     * behavior and place declutterd features with their own layer configure the layer with a `className`
-     * other than `ol-layer`.
-     */
-    declutter?: boolean | undefined;
+     * Declutter images and text. Any truthy value will enable
+     * decluttering. Within a layer, a feature rendered before another has higher priority. All layers with the
+     * same `declutter` value will be decluttered together. The priority is determined by the drawing order of the
+     * layers with the same `declutter` value. Higher in the layer stack means higher priority. To declutter distinct
+     * layers or groups of layers separately, use different truthy values for `declutter`.
+     */
+    declutter?: string | number | boolean | undefined;
     /**
      * Layer style. When set to `null`, only
      * features that have their own style will be rendered. See {@link module :ol/style/Style~Style} for the default style
@@ -178,25 +174,21 @@ export type Options = {
  * @property {VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
  *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
  *    animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
- *    rotated views.
- *  * `'vector'`: Everything is rendered as vectors. Use this mode for improved performance on vector
- *    tile layers with only a few rendered features (e.g. for highlighting a subset of features of
- *    another layer with the same source).
+ *    rotated views, but get lifted above all polygon and line elements.
+ *  * `'vector'`: Everything is rendered as vectors and the original render order is maintained. Use
+ *    this mode for improved performance and visual epxerience on vector tile layers with not too many
+ *    rendered features (e.g. for highlighting a subset of features of another layer with the same
+ *    source).
  * @property {import("../source/VectorTile.js").default} [source] Source.
  * @property {import("../Map.js").default} [map] Sets the layer as overlay on a map. The map will not manage
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it managed by the map is to
  * use [map.addLayer()]{@link import("../Map.js").default#addLayer}.
- * @property {boolean} [declutter=false] Declutter images and text. Decluttering is applied to all
- * image and text styles of all Vector and VectorTile layers that have set this to `true`. The priority
- * is defined by the z-index of the layer, the `zIndex` of the style and the render order of features.
- * Higher z-index means higher priority. Within the same z-index, a feature rendered before another has
- * higher priority.
- *
- * As an optimization decluttered features from layers with the same `className` are rendered above
- * the fill and stroke styles of all of those layers regardless of z-index.  To opt out of this
- * behavior and place declutterd features with their own layer configure the layer with a `className`
- * other than `ol-layer`.
+ * @property {boolean|string|number} [declutter=false] Declutter images and text. Any truthy value will enable
+ * decluttering. Within a layer, a feature rendered before another has higher priority. All layers with the
+ * same `declutter` value will be decluttered together. The priority is determined by the drawing order of the
+ * layers with the same `declutter` value. Higher in the layer stack means higher priority. To declutter distinct
+ * layers or groups of layers separately, use different truthy values for `declutter`.
  * @property {import("../style/Style.js").StyleLike|null} [style] Layer style. When set to `null`, only
  * features that have their own style will be rendered. See {@link module:ol/style/Style~Style} for the default style
  * which will be used if this is not set.

package/layer/VectorTile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorTile.d.ts","sourceRoot":"","sources":["VectorTile.js"],"names":[],"mappings":";;;;iDAUa,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,OAAa,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GACpI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,OAAa,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;mCAI3I,QAAQ,GAAG,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXhC;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgEG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,2CA4DC;IA/CC;;OAEG;IACH,IAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE5D;IAEP;;OAEG;IACH,MAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAET;;OAEG;IACH,IAFU,2BAA2B,IAAI,CAAC,CAEnC;IAQP;;;OAGG;IACH,oBAA6B;IA8C/B;;OAEG;IACH,iBAFY,oBAAoB,CAI/B;IAED;;;;;OAKG;IACH,cAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,6BAJY,OAAO,CAQlB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,kDAJW,OAAO,QAMjB;CACF;0CAvOyC,uCAAuC;4BADrD,iBAAiB"}
+{"version":3,"file":"VectorTile.d.ts","sourceRoot":"","sources":["VectorTile.js"],"names":[],"mappings":";;;;iDAUa,OAAO,eAAe,EAAE,WAAW,CAAC,OAAO,eAAe,EAAE,UAAU,EAAE,OAAO,oBAAoB,EAAE,OAAO,EAAE,MAAM,CAAC,GACjI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,QAAQ,EAAE,yBAAyB,GAClF,OAAa,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,EAAE,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,CAAC,GACpI,OAAW,eAAe,EAAE,WAAW,CAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,OAAO,iBAAiB,EAAE,OAAO,EAAE,MAAM,CAAC,GACvI,OAAW,eAAe,EAAE,mBAAmB,CAAC,OAAO,eAAe,EAAE,UAAU,GAAC,OAAO,QAAQ,EAAE,yBAAyB,GAC7H,OAAa,YAAY,EAAE,cAAc,GAAC,gBAAgB,GAAC,+BAA+B,GAAC,OAAO,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,CAAC;mCAI3I,QAAQ,GAAG,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAXhC;;;;;;;;GAQG;AAEH;;GAEG;AAEH;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4DG;AAEH;;;;;;;;;;GAUG;AACH;IACE;;OAEG;IACH,2CA4DC;IA/CC;;OAEG;IACH,IAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE5D;IAEP;;OAEG;IACH,MAFU,2BAA2B,OAAO,WAAW,EAAE,SAAS,CAAC,CAE1D;IAET;;OAEG;IACH,IAFU,2BAA2B,IAAI,CAAC,CAEnC;IAQP;;;OAGG;IACH,oBAA6B;IA8C/B;;OAEG;IACH,iBAFY,oBAAoB,CAI/B;IAED;;;;;OAKG;IACH,cAJY,MAAM,CAMjB;IAED;;;;;OAKG;IACH,6BAJY,OAAO,CAQlB;IAED;;;;;OAKG;IACH,oBAJW,MAAM,QAMhB;IAED;;;;;OAKG;IACH,kDAJW,OAAO,QAMjB;CACF;0CAnOyC,uCAAuC;4BADrD,iBAAiB"}

package/layer/VectorTile.js

@@ -50,25 +50,21 @@ import {assert} from '../asserts.js';
  * @property {VectorTileRenderType} [renderMode='hybrid'] Render mode for vector tiles:
  *  * `'hybrid'`: Polygon and line elements are rendered as images, so pixels are scaled during zoom
  *    animations. Point symbols and texts are accurately rendered as vectors and can stay upright on
- *    rotated views.
- *  * `'vector'`: Everything is rendered as vectors. Use this mode for improved performance on vector
- *    tile layers with only a few rendered features (e.g. for highlighting a subset of features of
- *    another layer with the same source).
+ *    rotated views, but get lifted above all polygon and line elements.
+ *  * `'vector'`: Everything is rendered as vectors and the original render order is maintained. Use
+ *    this mode for improved performance and visual epxerience on vector tile layers with not too many
+ *    rendered features (e.g. for highlighting a subset of features of another layer with the same
+ *    source).
  * @property {import("../source/VectorTile.js").default} [source] Source.
  * @property {import("../Map.js").default} [map] Sets the layer as overlay on a map. The map will not manage
  * this layer in its layers collection, and the layer will be rendered on top. This is useful for
  * temporary layers. The standard way to add a layer to a map and have it managed by the map is to
  * use [map.addLayer()]{@link import("../Map.js").default#addLayer}.
- * @property {boolean} [declutter=false] Declutter images and text. Decluttering is applied to all
- * image and text styles of all Vector and VectorTile layers that have set this to `true`. The priority
- * is defined by the z-index of the layer, the `zIndex` of the style and the render order of features.
- * Higher z-index means higher priority. Within the same z-index, a feature rendered before another has
- * higher priority.
- *
- * As an optimization decluttered features from layers with the same `className` are rendered above
- * the fill and stroke styles of all of those layers regardless of z-index.  To opt out of this
- * behavior and place declutterd features with their own layer configure the layer with a `className`
- * other than `ol-layer`.
+ * @property {boolean|string|number} [declutter=false] Declutter images and text. Any truthy value will enable
+ * decluttering. Within a layer, a feature rendered before another has higher priority. All layers with the
+ * same `declutter` value will be decluttered together. The priority is determined by the drawing order of the
+ * layers with the same `declutter` value. Higher in the layer stack means higher priority. To declutter distinct
+ * layers or groups of layers separately, use different truthy values for `declutter`.
  * @property {import("../style/Style.js").StyleLike|null} [style] Layer style. When set to `null`, only
  * features that have their own style will be rendered. See {@link module:ol/style/Style~Style} for the default style
  * which will be used if this is not set.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "9.0.0-dev.1707341212133",
+  "version": "9.0.0-dev.1707494062569",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/render/VectorContext.d.ts

@@ -16,8 +16,9 @@ declare class VectorContext {
      * @param {import("../Feature.js").FeatureLike} feature Feature.
      * @param {Function} renderer Renderer.
      * @param {Function} hitDetectionRenderer Renderer.
+     * @param {number} [index] Render order index.
      */
-    drawCustom(geometry: import("../geom/SimpleGeometry.js").default, feature: import("../Feature.js").FeatureLike, renderer: Function, hitDetectionRenderer: Function): void;
+    drawCustom(geometry: import("../geom/SimpleGeometry.js").default, feature: import("../Feature.js").FeatureLike, renderer: Function, hitDetectionRenderer: Function, index?: number | undefined): void;
     /**
      * Render a geometry.
      *
@@ -33,53 +34,63 @@ declare class VectorContext {
     /**
      * @param {import("../geom/Circle.js").default} circleGeometry Circle geometry.
      * @param {import("../Feature.js").default} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawCircle(circleGeometry: import("../geom/Circle.js").default, feature: import("../Feature.js").default): void;
+    drawCircle(circleGeometry: import("../geom/Circle.js").default, feature: import("../Feature.js").default, index?: number | undefined): void;
     /**
      * @param {import("../Feature.js").default} feature Feature.
      * @param {import("../style/Style.js").default} style Style.
+     * @param {number} [index] Render order index.
      */
-    drawFeature(feature: import("../Feature.js").default, style: import("../style/Style.js").default): void;
+    drawFeature(feature: import("../Feature.js").default, style: import("../style/Style.js").default, index?: number | undefined): void;
     /**
      * @param {import("../geom/GeometryCollection.js").default} geometryCollectionGeometry Geometry collection.
      * @param {import("../Feature.js").default} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawGeometryCollection(geometryCollectionGeometry: import("../geom/GeometryCollection.js").default, feature: import("../Feature.js").default): void;
+    drawGeometryCollection(geometryCollectionGeometry: import("../geom/GeometryCollection.js").default, feature: import("../Feature.js").default, index?: number | undefined): void;
     /**
      * @param {import("../geom/LineString.js").default|import("./Feature.js").default} lineStringGeometry Line string geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawLineString(lineStringGeometry: import("../geom/LineString.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawLineString(lineStringGeometry: import("../geom/LineString.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../geom/MultiLineString.js").default|import("./Feature.js").default} multiLineStringGeometry MultiLineString geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawMultiLineString(multiLineStringGeometry: import("../geom/MultiLineString.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawMultiLineString(multiLineStringGeometry: import("../geom/MultiLineString.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../geom/MultiPoint.js").default|import("./Feature.js").default} multiPointGeometry MultiPoint geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawMultiPoint(multiPointGeometry: import("../geom/MultiPoint.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawMultiPoint(multiPointGeometry: import("../geom/MultiPoint.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../geom/MultiPolygon.js").default} multiPolygonGeometry MultiPolygon geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawMultiPolygon(multiPolygonGeometry: import("../geom/MultiPolygon.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawMultiPolygon(multiPolygonGeometry: import("../geom/MultiPolygon.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../geom/Point.js").default|import("./Feature.js").default} pointGeometry Point geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawPoint(pointGeometry: import("../geom/Point.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawPoint(pointGeometry: import("../geom/Point.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../geom/Polygon.js").default|import("./Feature.js").default} polygonGeometry Polygon geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawPolygon(polygonGeometry: import("../geom/Polygon.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawPolygon(polygonGeometry: import("../geom/Polygon.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../geom/SimpleGeometry.js").default|import("./Feature.js").default} geometry Geometry.
      * @param {import("../Feature.js").FeatureLike} feature Feature.
+     * @param {number} [index] Render order index.
      */
-    drawText(geometry: import("../geom/SimpleGeometry.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike): void;
+    drawText(geometry: import("../geom/SimpleGeometry.js").default | import("./Feature.js").default, feature: import("../Feature.js").FeatureLike, index?: number | undefined): void;
     /**
      * @param {import("../style/Fill.js").default} fillStyle Fill style.
      * @param {import("../style/Stroke.js").default} strokeStyle Stroke style.

package/render/VectorContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"VectorContext.d.ts","sourceRoot":"","sources":["VectorContext.js"],"names":[],"mappings":";AAAA;;GAEG;AAEH;;;;;GAKG;AACH;IACE;;;;;;;OAOG;IACH,qBALW,OAAO,2BAA2B,EAAE,OAAO,WAC3C,OAAO,eAAe,EAAE,WAAW,4DAIkB;IAEhE;;;;OAIG;IACH,uBAFW,OAAO,qBAAqB,EAAE,OAAO,QAEvB;IAEzB;;;;OAIG;IACH,gBAFW,OAAO,mBAAmB,EAAE,OAAO,QAE5B;IAElB;;;OAGG;IACH,2BAHW,OAAO,mBAAmB,EAAE,OAAO,WACnC,OAAO,eAAe,EAAE,OAAO,QAEJ;IAEtC;;;OAGG;IACH,qBAHW,OAAO,eAAe,EAAE,OAAO,SAC/B,OAAO,mBAAmB,EAAE,OAAO,QAEhB;IAE9B;;;OAGG;IACH,mDAHW,OAAO,+BAA+B,EAAE,OAAO,WAC/C,OAAO,eAAe,EAAE,OAAO,QAEoB;IAE9D;;;OAGG;IACH,mCAHW,OAAO,uBAAuB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACtE,OAAO,eAAe,EAAE,WAAW,QAEA;IAE9C;;;OAGG;IACH,6CAHW,OAAO,4BAA4B,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WAC3E,OAAO,eAAe,EAAE,WAAW,QAEU;IAExD;;;OAGG;IACH,mCAHW,OAAO,uBAAuB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACtE,OAAO,eAAe,EAAE,WAAW,QAEA;IAE9C;;;OAGG;IACH,uCAHW,OAAO,yBAAyB,EAAE,OAAO,WACzC,OAAO,eAAe,EAAE,WAAW,QAEI;IAElD;;;OAGG;IACH,yBAHW,OAAO,kBAAkB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACjE,OAAO,eAAe,EAAE,WAAW,QAEV;IAEpC;;;OAGG;IACH,6BAHW,OAAO,oBAAoB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACnE,OAAO,eAAe,EAAE,WAAW,QAEN;IAExC;;;OAGG;IACH,mBAHW,OAAO,2BAA2B,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WAC1E,OAAO,eAAe,EAAE,WAAW,QAEhB;IAE9B;;;OAGG;IACH,8BAHW,OAAO,kBAAkB,EAAE,OAAO,eAClC,OAAO,oBAAoB,EAAE,OAAO,QAEF;IAE7C;;;OAGG;IACH,0BAHW,OAAO,mBAAmB,EAAE,OAAO;;yBAGM;IAEpD;;;OAGG;IACH,wBAHW,OAAO,kBAAkB,EAAE,OAAO;;yBAGK;CACnD"}
+{"version":3,"file":"VectorContext.d.ts","sourceRoot":"","sources":["VectorContext.js"],"names":[],"mappings":";AAAA;;GAEG;AAEH;;;;;GAKG;AACH;IACE;;;;;;;;OAQG;IACH,qBANW,OAAO,2BAA2B,EAAE,OAAO,WAC3C,OAAO,eAAe,EAAE,WAAW,wFAKyB;IAEvE;;;;OAIG;IACH,uBAFW,OAAO,qBAAqB,EAAE,OAAO,QAEvB;IAEzB;;;;OAIG;IACH,gBAFW,OAAO,mBAAmB,EAAE,OAAO,QAE5B;IAElB;;;;OAIG;IACH,2BAJW,OAAO,mBAAmB,EAAE,OAAO,WACnC,OAAO,eAAe,EAAE,OAAO,oCAGG;IAE7C;;;;OAIG;IACH,qBAJW,OAAO,eAAe,EAAE,OAAO,SAC/B,OAAO,mBAAmB,EAAE,OAAO,oCAGT;IAErC;;;;OAIG;IACH,mDAJW,OAAO,+BAA+B,EAAE,OAAO,WAC/C,OAAO,eAAe,EAAE,OAAO,oCAG2B;IAErE;;;;OAIG;IACH,mCAJW,OAAO,uBAAuB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACtE,OAAO,eAAe,EAAE,WAAW,oCAGO;IAErD;;;;OAIG;IACH,6CAJW,OAAO,4BAA4B,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WAC3E,OAAO,eAAe,EAAE,WAAW,oCAGiB;IAE/D;;;;OAIG;IACH,mCAJW,OAAO,uBAAuB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACtE,OAAO,eAAe,EAAE,WAAW,oCAGO;IAErD;;;;OAIG;IACH,uCAJW,OAAO,yBAAyB,EAAE,OAAO,WACzC,OAAO,eAAe,EAAE,WAAW,oCAGW;IAEzD;;;;OAIG;IACH,yBAJW,OAAO,kBAAkB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACjE,OAAO,eAAe,EAAE,WAAW,oCAGH;IAE3C;;;;OAIG;IACH,6BAJW,OAAO,oBAAoB,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WACnE,OAAO,eAAe,EAAE,WAAW,oCAGC;IAE/C;;;;OAIG;IACH,mBAJW,OAAO,2BAA2B,EAAE,OAAO,GAAC,OAAO,cAAc,EAAE,OAAO,WAC1E,OAAO,eAAe,EAAE,WAAW,oCAGT;IAErC;;;OAGG;IACH,8BAHW,OAAO,kBAAkB,EAAE,OAAO,eAClC,OAAO,oBAAoB,EAAE,OAAO,QAEF;IAE7C;;;OAGG;IACH,0BAHW,OAAO,mBAAmB,EAAE,OAAO;;yBAGM;IAEpD;;;OAGG;IACH,wBAHW,OAAO,kBAAkB,EAAE,OAAO;;yBAGK;CACnD"}

package/render/VectorContext.js

@@ -16,8 +16,9 @@ class VectorContext {
    * @param {import("../Feature.js").FeatureLike} feature Feature.
    * @param {Function} renderer Renderer.
    * @param {Function} hitDetectionRenderer Renderer.
+   * @param {number} [index] Render order index.
    */
-  drawCustom(geometry, feature, renderer, hitDetectionRenderer) {}
+  drawCustom(geometry, feature, renderer, hitDetectionRenderer, index) {}
 
   /**
    * Render a geometry.
@@ -36,62 +37,72 @@ class VectorContext {
   /**
    * @param {import("../geom/Circle.js").default} circleGeometry Circle geometry.
    * @param {import("../Feature.js").default} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawCircle(circleGeometry, feature) {}
+  drawCircle(circleGeometry, feature, index) {}
 
   /**
    * @param {import("../Feature.js").default} feature Feature.
    * @param {import("../style/Style.js").default} style Style.
+   * @param {number} [index] Render order index.
    */
-  drawFeature(feature, style) {}
+  drawFeature(feature, style, index) {}
 
   /**
    * @param {import("../geom/GeometryCollection.js").default} geometryCollectionGeometry Geometry collection.
    * @param {import("../Feature.js").default} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawGeometryCollection(geometryCollectionGeometry, feature) {}
+  drawGeometryCollection(geometryCollectionGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/LineString.js").default|import("./Feature.js").default} lineStringGeometry Line string geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawLineString(lineStringGeometry, feature) {}
+  drawLineString(lineStringGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/MultiLineString.js").default|import("./Feature.js").default} multiLineStringGeometry MultiLineString geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawMultiLineString(multiLineStringGeometry, feature) {}
+  drawMultiLineString(multiLineStringGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/MultiPoint.js").default|import("./Feature.js").default} multiPointGeometry MultiPoint geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawMultiPoint(multiPointGeometry, feature) {}
+  drawMultiPoint(multiPointGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/MultiPolygon.js").default} multiPolygonGeometry MultiPolygon geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawMultiPolygon(multiPolygonGeometry, feature) {}
+  drawMultiPolygon(multiPolygonGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/Point.js").default|import("./Feature.js").default} pointGeometry Point geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawPoint(pointGeometry, feature) {}
+  drawPoint(pointGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/Polygon.js").default|import("./Feature.js").default} polygonGeometry Polygon geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawPolygon(polygonGeometry, feature) {}
+  drawPolygon(polygonGeometry, feature, index) {}
 
   /**
    * @param {import("../geom/SimpleGeometry.js").default|import("./Feature.js").default} geometry Geometry.
    * @param {import("../Feature.js").FeatureLike} feature Feature.
+   * @param {number} [index] Render order index.
    */
-  drawText(geometry, feature) {}
+  drawText(geometry, feature, index) {}
 
   /**
    * @param {import("../style/Fill.js").default} fillStyle Fill style.

package/render/canvas/Builder.d.ts

@@ -111,8 +111,9 @@ declare class CanvasBuilder extends VectorContext {
      * @protected
      * @param {import("../../geom/Geometry").default|import("../Feature.js").default} geometry The geometry.
      * @param {import("../../Feature.js").FeatureLike} feature Feature.
+     * @param {number} index Render order index
      */
-    protected beginGeometry(geometry: import("../../geom/Geometry").default | import("../Feature.js").default, feature: import("../../Feature.js").FeatureLike): void;
+    protected beginGeometry(geometry: import("../../geom/Geometry").default | import("../Feature.js").default, feature: import("../../Feature.js").FeatureLike, index: number): void;
     /**
      * @return {import("../canvas.js").SerializableInstructions} the serializable instructions.
      */

package/render/canvas/Builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["Builder.js"],"names":[],"mappings":";AA8BA;IACE;;;;;OAKG;IACH,uBALW,MAAM,aACN,OAAO,iBAAiB,EAAE,MAAM,cAChC,MAAM,cACN,MAAM,EAoFhB;IA/EC;;;OAGG;IACH,qBAFU,MAAM,CAEU;IAE1B;;;;OAIG;IACH,qBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEhB;IAE1B;;;OAGG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,wBAFU,MAAM,CAEK;IAErB;;;;OAIG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,mCAAsC;IAEtC;;;OAGG;IACH,mCAAsC;IAEtC;;;OAGG;IACH,2BAA8B;IAE9B;;;OAGG;IACH,wBAFU,UAAQ,CAEI;IAEtB;;;OAGG;IACH,uBAFU,MAAM,MAAM,CAAC,CAEF;IAErB;;;OAGG;IACH,uBAAwB;IAExB;;;OAGG;IACH,oCAFU,UAAQ,CAEgB;IAElC;;;OAGG;IACH,iBAFU,OAAO,cAAc,EAAE,eAAe,CAEuB;IAGzE;;;;OAIG;IACH,qCAHW,MAAM,MAAM,CAAC,GACZ,MAAM,MAAM,CAAC,CASxB;IAED;;;;;OAKG;IACH,sDALW,MAAM,MAAM,CAAC,UACb,MAAM,GAEL,MAAM,CAgBjB;IAED;;;;;;;;;OASG;IACH,qDATW,MAAM,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,UACN,OAAO,aACP,OAAO,GAEN,MAAM,CAoDjB;IAED;;;;;;;OAOG;IACH,wCAPW,MAAM,MAAM,CAAC,UACb,MAAM,QACN,MAAM,MAAM,CAAC,UACb,MAAM,eACN,MAAM,MAAM,CAAC,GACZ,MAAM,CAiBjB;IAyKD;;;;OAIG;IACH,kCAHW,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,eAAe,EAAE,OAAO,WACrE,OAAO,kBAAkB,EAAE,WAAW,QAiBhD;IAED;;OAEG;IACH,UAFY,OAAO,cAAc,EAAE,wBAAwB,CAQ1D;IAED;;OAEG;IACH,wCAqBC;IAoED;;;OAGG;IACH,kBAHW,OAAO,cAAc,EAAE,eAAe,GACrC,UAAQ,CAWnB;IAED;;OAEG;IACH,mBAFW,OAAO,cAAc,EAAE,eAAe,QAIhD;IAED;;;OAGG;IACH,oBAHW,OAAO,cAAc,EAAE,eAAe,GACrC,UAAQ,CAanB;IAED;;;OAGG;IACH,uBAHW,OAAO,cAAc,EAAE,eAAe,qBACxB,aAAa,QAAE,OAAO,cAAc,EAAE,eAAe,KAAE,UAAQ,QAUvF;IAED;;;OAGG;IACH,yBAHW,OAAO,cAAc,EAAE,eAAe,sBACxB,aAAa,QAAE,OAAO,cAAc,EAAE,eAAe,KAAG,IAAI,QA+BpF;IAED;;OAEG;IACH,qBAFW,OAAO,kBAAkB,EAAE,WAAW,QAUhD;IAED;;;;;;OAMG;IACH,kCAHY,OAAO,iBAAiB,EAAE,MAAM,CAY3C;CACF;0BAzoByB,qBAAqB"}
+{"version":3,"file":"Builder.d.ts","sourceRoot":"","sources":["Builder.js"],"names":[],"mappings":";AA8BA;IACE;;;;;OAKG;IACH,uBALW,MAAM,aACN,OAAO,iBAAiB,EAAE,MAAM,cAChC,MAAM,cACN,MAAM,EAoFhB;IA/EC;;;OAGG;IACH,qBAFU,MAAM,CAEU;IAE1B;;;;OAIG;IACH,qBAFU,OAAO,iBAAiB,EAAE,MAAM,CAEhB;IAE1B;;;OAGG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,wBAFU,MAAM,CAEK;IAErB;;;;OAIG;IACH,sBAFU,MAAM,CAEY;IAE5B;;;OAGG;IACH,mCAAsC;IAEtC;;;OAGG;IACH,mCAAsC;IAEtC;;;OAGG;IACH,2BAA8B;IAE9B;;;OAGG;IACH,wBAFU,UAAQ,CAEI;IAEtB;;;OAGG;IACH,uBAFU,MAAM,MAAM,CAAC,CAEF;IAErB;;;OAGG;IACH,uBAAwB;IAExB;;;OAGG;IACH,oCAFU,UAAQ,CAEgB;IAElC;;;OAGG;IACH,iBAFU,OAAO,cAAc,EAAE,eAAe,CAEuB;IAGzE;;;;OAIG;IACH,qCAHW,MAAM,MAAM,CAAC,GACZ,MAAM,MAAM,CAAC,CASxB;IAED;;;;;OAKG;IACH,sDALW,MAAM,MAAM,CAAC,UACb,MAAM,GAEL,MAAM,CAgBjB;IAED;;;;;;;;;OASG;IACH,qDATW,MAAM,MAAM,CAAC,UACb,MAAM,OACN,MAAM,UACN,MAAM,UACN,OAAO,aACP,OAAO,GAEN,MAAM,CAoDjB;IAED;;;;;;;OAOG;IACH,wCAPW,MAAM,MAAM,CAAC,UACb,MAAM,QACN,MAAM,MAAM,CAAC,UACb,MAAM,eACN,MAAM,MAAM,CAAC,GACZ,MAAM,CAiBjB;IAsLD;;;;;OAKG;IACH,kCAJW,OAAO,qBAAqB,EAAE,OAAO,GAAC,OAAO,eAAe,EAAE,OAAO,WACrE,OAAO,kBAAkB,EAAE,WAAW,SACtC,MAAM,QAmBhB;IAED;;OAEG;IACH,UAFY,OAAO,cAAc,EAAE,wBAAwB,CAQ1D;IAED;;OAEG;IACH,wCAqBC;IAoED;;;OAGG;IACH,kBAHW,OAAO,cAAc,EAAE,eAAe,GACrC,UAAQ,CAWnB;IAED;;OAEG;IACH,mBAFW,OAAO,cAAc,EAAE,eAAe,QAIhD;IAED;;;OAGG;IACH,oBAHW,OAAO,cAAc,EAAE,eAAe,GACrC,UAAQ,CAanB;IAED;;;OAGG;IACH,uBAHW,OAAO,cAAc,EAAE,eAAe,qBACxB,aAAa,QAAE,OAAO,cAAc,EAAE,eAAe,KAAE,UAAQ,QAUvF;IAED;;;OAGG;IACH,yBAHW,OAAO,cAAc,EAAE,eAAe,sBACxB,aAAa,QAAE,OAAO,cAAc,EAAE,eAAe,KAAG,IAAI,QA+BpF;IAED;;OAEG;IACH,qBAFW,OAAO,kBAAkB,EAAE,WAAW,QAUhD;IAED;;;;;;OAMG;IACH,kCAHY,OAAO,iBAAiB,EAAE,MAAM,CAY3C;CACF;0BAzpByB,qBAAqB"}