@windycom/plugin-devtools 3.0.0 → 3.0.2

package/types/client/Overlay.d.ts

@@ -1,12 +1,10 @@
-import type { Layer } from '@windy/Layer';
-import type { LayerMetricType, Layers } from '@windy/Layer.d';
+import type { LayerMetricType, Layers, Layer } from '@windy/Layer';
 import type { Metric } from '@windy/Metric';
 import type { DirectionFunction } from '@windy/format.d';
 import type { Iconfont } from '@windy/iconfont.d';
 import type { Overlays } from '@windy/rootScope.d';
 import type { RGBNumValues } from '@windy/interpolatorTypes';
-import type { LoadedTranslations, HTMLString } from '@windy/types';
-import type { RGBAString } from '@windy/Color.d';
+import type { LoadedTranslations, HTMLString, RGBString } from '@windy/types';
 export type UsedOverlays = Overlays | 'swell' | 'satelliteIRBT';
 export type OverlayInitParams = Pick<Overlay, 'ident'> & Partial<Overlay>;
 type LayerProperty<L extends Layer | undefined, P extends keyof Layer> = L extends Layer ? L[P] : undefined;
@@ -81,6 +79,10 @@ export declare class Overlay<I extends Overlays = Overlays, M extends I extends
      * Hides particle on/off switch in GUI (so far used only in desktop GUI)
      */
     hideParticles?: boolean;
+    /**
+     * Disables isolines on/off switch in GUI
+     */
+    hideIsolines?: boolean;
     /**
      * Given overlay display accumulation
      */
@@ -112,7 +114,7 @@ export declare class Overlay<I extends Overlays = Overlays, M extends I extends
      * Optional promo badge to be displayed in GUI
      */
     promoBadge?: string;
-    promoBadgeColor?: RGBAString;
+    promoBadgeColor?: RGBString;
     /**
      * Optional menu image thumbnail
      */
@@ -146,11 +148,6 @@ export declare class Overlay<I extends Overlays = Overlays, M extends I extends
      * Return ident of menu item (usualy `ident` but some inner overlays has `partOf` and are not directly in menu)
      */
     getMenuIdent(): Overlays;
-    /**
-     * Custom onopen methods, currently unused
-     */
-    onopen?(): void;
-    onclose?(): void;
     /**
      * Create part of inner text of picker
      * @param values Interpolated values

package/types/client/OverlayClasses.d.ts

@@ -31,3 +31,11 @@ export declare class CloudsOverlay<I extends Overlays = Overlays> extends Overla
     hidePickerElevation: boolean;
     createPickerHTML(values: RGBNumValues): string;
 }
+export declare class AqiOverlay<I extends Overlays = Overlays> extends Overlay<I> {
+    hidePickerElevation: boolean;
+    labels: {
+        [value: number]: keyof LoadedTranslations;
+    };
+    getAirQLabel(aqi: number): string;
+    createPickerHTML(values: RGBNumValues): string;
+}

package/types/client/Particles.d.ts

@@ -1,4 +1,4 @@
-import type { RGBAString, RGBA } from '@windy/Color.d';
+import type { RGBAString, RGBA } from '@windy/types.d';
 import type { Levels } from '@windy/rootScope.d';
 import type { ExtendedRenderParams } from '@windy/interfaces.d';
 import type { CustomParticles } from '@windy/dataSpecifications.d';

package/types/client/Plugin.d.ts

@@ -109,6 +109,10 @@ export declare class Plugin<P extends PluginIdent> {
      * Ready to be overloaded
      */
     paramsChanged(..._args: unknown[]): void;
+    /**
+     * Ready to be overloaded
+     */
+    onRenderStart(..._args: unknown[]): void;
     protected initProperties(): void;
 }
 export {};

package/types/client/Product.d.ts

@@ -1,50 +1,25 @@
 import { Calendar } from '@windy/Calendar';
-import * as http from '@windy/http';
-import type { MinifestObject } from '@windy/Calendar.d';
-import type { Layers } from '@windy/Layer.d';
+import type { MinifestObject } from '@windy/Calendar';
+import type { Layers } from '@windy/Layer';
 import type { LatLon } from '@windy/interfaces';
 import type { Isolines, Levels, Overlays, Products } from '@windy/rootScope.d';
-import type { ISODateString, ProductCategory, ProductIdent, Timestamp, YYYYMMDDHH } from '@windy/types';
+import type { ISODateString, ProductCategory, ProductIdent, Timestamp, Path, Minutes } from '@windy/types';
 export type DataQuality = 'normal' | 'high' | 'low' | 'ultra' | 'extreme';
 export type FileSuffix = 'png' | 'jpg' | 'webp';
-export type ProductInitParams = Pick<Product, 'modelName' | 'provider' | 'interval'> & Partial<Pick<Product, 'provider' | 'ident' | 'maxTileZoom' | 'animationSpeed' | 'animationSpeed1h' | 'fileSuffix' | 'fileSuffixFallback' | 'JPGtransparency' | 'PNGtransparency' | 'dataQuality' | 'betterDataQuality' | 'animation' | 'labelsTemp' | 'overlays' | 'preferredProduct' | 'pathGenerator' | 'isolines' | 'directory' | 'category' | 'modelIdent' | 'intervalPremium' | 'server' | 'metadataServer' | 'modelResolution' | 'levels' | 'levelsOverride' | 'logo' | 'preferredWaveProduct' | 'preferredAirProduct' | 'hasAccumulations' | 'freeProduct' | 'hideProductSwitch'>> & {
+export type ProductInitParams = Pick<Product, 'modelName' | 'provider' | 'interval'> & Partial<Pick<Product, 'provider' | 'ident' | 'maxTileZoom' | 'animationSpeed' | 'animationSpeed1h' | 'fileSuffix' | 'fileSuffixFallback' | 'JPGtransparency' | 'PNGtransparency' | 'dataQuality' | 'betterDataQuality' | 'animation' | 'labelsTemp' | 'overlays' | 'preferredProduct' | 'isolines' | 'directory' | 'category' | 'modelIdent' | 'intervalPremium' | 'server' | 'modelResolution' | 'levels' | 'levelsOverride' | 'logo' | 'preferredWaveProduct' | 'preferredAirProduct' | 'hasAccumulations' | 'hasMinifest' | 'freeProduct' | 'hideProductSwitch' | 'modelDescription'>> & {
     forecastSize?: number;
     bounds?: [number, number][][];
 };
 export declare class Product {
-    /**
-     * Minifest loading promise
-     */
-    protected loadingPromise?: null | Promise<Calendar | undefined | void>;
-    /**
-     * Version of minifest used
-     */
-    protected infoVersion?: string;
-    /**
-     * minifest loading timer
-     */
-    private refreshInterval?;
-    /**
-     *  Timestamp of last minifest check
-     */
-    private minifestTimestamp;
     /**
      * Boundaries of the product in a format [[north, west], [north, east], [south, east], [south, west]] or any more accurate polygon
      */
     private bounds?;
+    private minifestExpirationTime;
     /**
-     * Has binded listeners
-     */
-    private hasListeners;
-    private bindedCheckNewMinifest;
-    /**
-     * When the product will expire (in ms)
-     */
-    private productExpires;
-    /**
-     * Noneffective, but simple refTime solutions for data that are updated once a day
+     * Minifest loading promise
      */
-    protected dailyCache?: string;
+    protected loadingPromise?: null | Promise<Calendar | undefined | void>;
     /**
      * Must contain ident of self
      */
@@ -104,11 +79,15 @@ export declare class Product {
     modelName: string;
     modelResolution?: number;
     provider?: string;
+    /**
+     * Optional model description
+     */
+    modelDescription?: string;
     /**
      * Update interval (in minutes)
      */
-    interval: number;
-    intervalPremium?: number;
+    interval: Minutes;
+    intervalPremium?: Minutes;
     /**
      * Usual length of forecast in hours (used upon creation of backup minifest)
      */
@@ -164,21 +143,16 @@ export declare class Product {
      * Holder of the latest minifest
      */
     minifest?: MinifestObject | null;
-    /**
-     * How the data image path should be constructed
-     */
-    pathGenerator: string;
     /**
      * Alternative servers, where the data are loaded from
      */
     server?: string;
-    metadataServer?: string;
     /**
-     * Some product (f.ex. StaticProduct) doesn't have meaningful
+     * Some product doesn't have meaningful
      * information about the model and time of the next update.
      * Set this to false to hide the info where not relevant (f.ex. Info plugin)
      */
-    hasRefTime: boolean;
+    hasMinifest: boolean;
     /**
      * This product supper accumulations
      */
@@ -191,44 +165,28 @@ export declare class Product {
      * Hide product switch in GUI, when this product is selected
      */
     hideProductSwitch?: boolean;
+    /**
+     * Time when minifest was last updated
+     */
+    minifestLastUpdate?: Timestamp;
     constructor(params: ProductInitParams);
-    refTime(): YYYYMMDDHH | '';
-    getUpdateTimes(): {
-        refTime: ISODateString;
-        minUpdate: Timestamp;
-    } | null;
-    moveTs(moveRight: boolean, isAccu?: boolean): boolean | void;
-    getMinifestUrl(): string;
-    loadMinifest(): Promise<http.HttpPayload<MinifestObject>>;
-    loadAndGetReftime(): Promise<ISODateString | undefined>;
-    open(): Promise<void | Calendar>;
-    close(): void;
+    getRefTimeISOFormat(): Promise<ISODateString | undefined>;
+    getRefTime(): Promise<Path | undefined>;
     /**
-     * Checks if lat,lon is within bounds
+     * Loads & returns a minifest. Since our @windy/http module has its own cache, we don't need to
+     * cache ongoing requests promise and simplify the code as much as possible
      */
-    pointIsInBounds<T extends LatLon>(this: this, paramsMap: T): boolean;
-    boundsAreInViewport(map: L.Map): boolean;
-    printLogo(): void;
-    getCalendar(): Promise<Calendar>;
-    protected expire(): void;
+    loadMinifest(): Promise<MinifestObject>;
     /**
-     * Since dissemination of minifests is not instant, and can last for minutes,
-     * we have to double check, that incoming minifest
-     * is newer than the one we have in store. If not, we keep the old one.
-     *
-     * @returns Incoming, or stored minifest, which is newer
+     * Checks if lat,lon is within bounds
      */
-    protected getUpdatedMinifest(minifest: MinifestObject): Promise<MinifestObject>;
-    protected setExpireTime(): void;
+    pointIsInBounds<T extends LatLon>(this: this, paramsMap: T): boolean;
     /**
-     * Major reason for this error is user's bad connection, which is handled
-     * by standard no connection red message
-     *
-     * We delay 0.3 sec to test properly connection
+     * Detects if the the bounds are in viewport
      */
-    protected showErrorMessage(err: string): void;
-    protected loadAndProcessMinifest(forced?: boolean): Promise<void>;
-    private checkNewMinifest;
+    boundsAreInViewport(map: L.Map): boolean;
+    close(): void;
+    open(): void;
+    getCalendar(): Promise<Calendar | undefined>;
     private isPointInsidePolygon;
-    private removeLogo;
 }

package/types/client/ProductClasses.d.ts

@@ -0,0 +1,44 @@
+import { Calendar } from '@windy/Calendar';
+import { Product } from '@windy/Product';
+import type { ProductInitParams } from '@windy/Product';
+import type { MinifestObject } from '@windy/Calendar';
+import type { Overlays } from '@windy/rootScope.d';
+export declare class EcmwfProduct extends Product {
+    calendar: Calendar;
+    constructor(params: Partial<ProductInitParams>);
+}
+export declare class EcmwfForecastProduct extends EcmwfProduct {
+    /**
+     * Main goal for custom loadMInifest method is to speed up loading of default minifest little bit.
+     * Default minifests are loaded ASAP in inlined JS code inside (index|mobile).html so they are
+     * available faster, then when loaded after parsing all the rest of JS code.
+     *
+     * After any change in the code, check in DevTools, that this mechanism actually works.
+     */
+    loadMinifest(): Promise<MinifestObject>;
+}
+export declare class HrrrProducts extends Product {
+    constructor(params: Partial<ProductInitParams>);
+}
+export declare const iconOverlays: Overlays[];
+export declare class IconProducts extends Product {
+    constructor(params: Pick<ProductInitParams, 'modelName'> & Partial<ProductInitParams>);
+}
+export type SatelliteProductInitParams = Pick<SatAndRadarPlusProduct, 'urlSuff' | 'urlSuffFlow'> & ProductInitParams;
+export declare class SatAndRadarPlusProduct extends Product {
+    urlSuff: string;
+    urlSuffFlow: string;
+    constructor(params: SatelliteProductInitParams);
+}
+export declare class NamProducts extends Product {
+    constructor(params: Partial<ProductInitParams>);
+}
+export declare class AccessProduct extends Product {
+    constructor(params: Partial<ProductInitParams>);
+}
+export declare class AccessCProduct extends AccessProduct {
+    constructor(params: Partial<ProductInitParams>);
+}
+export declare class AromeProduct extends Product {
+    constructor(params: Partial<ProductInitParams>);
+}

package/types/client/Renderer.d.ts

@@ -1,9 +1,30 @@
-import type { FullRenderParameters } from './d.ts.files/Layer.d';
-import type { Renderers, AllowedUserControls, AllowedRenderPlugins, RendererInitParams } from './d.ts.files/Renderer.d';
-import type { InterpolatorFactory } from './d.ts.files/interpolator';
+import type { FullRenderParameters, WeatherParameters, TilePoint } from '@windy/interfaces';
+import type { Timestamp, TransformFunction } from '@windy/types';
+import type { Layers } from '@windy/Layer';
+import type { InterpolatorFactory } from '@windy/interpolator';
+import type { BottomSveltePlugins, Plugins, SveltePlugins } from '@windy/plugins.d';
+import type { TileLayerCanvas } from '@windy/TileLayerCanvas.d';
+export type AllowedRenderPlugins = Pick<Plugins, 'radar' | 'satellite' | 'radar-plus' | 'cap-alerts' | 'isolines' | 'gl-particles'>;
+export type Renderers = 'tileLayer' | 'radar' | 'satellite' | 'radarPlus' | 'capAlerts' | 'isolines' | 'particles' | 'accumulations' | 'daySwitcher' | 'noUserControl' | 'topoMap';
+export interface TileParams extends TilePoint {
+    url: string;
+    intX: number;
+    intY: number;
+    trans: number;
+    transformR: TransformFunction | null;
+    transformG: TransformFunction | null;
+    transformB: TransformFunction | null;
+}
+export type AllowedUserControls = keyof BottomSveltePlugins | keyof SveltePlugins | 'none';
+export interface RendererInitParams {
+    ident: Renderers;
+    dependency?: keyof AllowedRenderPlugins;
+    userControl?: AllowedUserControls;
+    requiresFullRenderParams?: boolean;
+}
 /**
- * Renderer class act as a proxy between renderController and code, which is responsible to
- * render particullar layer.
+ * Renderer class acts as a proxy between renderController and code, which is responsible for
+ * rendering a particular layer
  */
 export declare class Renderer<K extends keyof AllowedRenderPlugins | undefined = undefined, P extends K extends keyof AllowedRenderPlugins ? WPluginModules[`@plugins/${K}`] : undefined = K extends keyof AllowedRenderPlugins ? WPluginModules[`@plugins/${K}`] : undefined> {
     isOpen: boolean;
@@ -15,7 +36,7 @@ export declare class Renderer<K extends keyof AllowedRenderPlugins | undefined =
     /**
      * Dependency plugin that wil be loaded before renderer is launched
      *
-     * Dependency plugin can optinally export these methods:
+     * Dependency plugin can optionally export these methods:
      *
      *  - onRenderStart
      *  - onRenderEnd
@@ -27,7 +48,7 @@ export declare class Renderer<K extends keyof AllowedRenderPlugins | undefined =
     /**
      * Loaded version of plugin dependency
      */
-    loadedDependency?: P;
+    loadedDependency?: P | typeof TileLayerCanvas;
     /**
      * ID of plugin, that serve as user control, which can be attached to DOM
      * usually to #plugin-bottom div.
@@ -44,18 +65,25 @@ export declare class Renderer<K extends keyof AllowedRenderPlugins | undefined =
      */
     userControl?: AllowedUserControls;
     /**
-     * Picker ingerpolation factory
+     * Picker interpolation factory
      */
     interpolator?: InterpolatorFactory;
+    /**
+     * Instance of this renderer requires FullRenderParameters to be passed
+     * to renderer methods
+     */
+    requiresFullRenderParams: boolean;
     constructor(params: RendererInitParams);
-    open(params: FullRenderParameters): Promise<void>;
+    open(layerIdent: Layers, weatherParams: WeatherParameters, timestamp: Timestamp): Promise<void>;
     /**
-     * Called by rndrCtrl
-     * list of required renderers, so we kno who will replace us
+     * Called by rndrCtrl. Requires list of required renderers,
+     * so we kno who will replace us. This parameters is here just because of
+     * TileLayer, which is just wrapper around Leaflet GridLayer, and we want to
+     * keep this Leaflet instance alive.
      */
     close(_rqrdRenderers: Renderers[]): void;
-    onopen(params: FullRenderParameters): void;
+    onopen(params?: FullRenderParameters): void;
     onclose(): void;
-    paramsChanged(params: FullRenderParameters): void;
+    paramsChanged(layerIdent: Layers, weatherParams: WeatherParameters, timestamp: Timestamp): Promise<void>;
     redraw(): void;
 }

package/types/client/SveltePlugin.d.ts

@@ -2,13 +2,18 @@ import { WindowPlugin } from '@windy/WindowPlugin';
 import type { WindowPluginInitParams } from '@windy/WindowPlugin';
 import type { PluginsOpenParams, PluginsQsParams } from '@windy/plugin-params.d';
 import type { BottomSveltePlugins, SveltePanePlugins, SveltePlugins } from '@windy/plugins.d';
+import type { InterpolatorFactory } from '@windy/interpolator';
+import type { FullRenderParameters } from '@windy/interfaces';
 export declare class SvelteApp<P extends keyof SveltePlugins | keyof SveltePanePlugins | keyof BottomSveltePlugins> {
+    interpolator?: InterpolatorFactory;
     constructor(_args: {
         target: HTMLElement;
         anchor: HTMLElement;
     });
     onopen(params?: PluginsOpenParams[P], qs?: PluginsQsParams[P]): void;
     onclose(): void;
+    paramsChanged(params?: FullRenderParameters): void;
+    onRenderStart(params?: FullRenderParameters): void;
     $destroy(): void;
 }
 /**
@@ -39,6 +44,8 @@ export declare class SveltePlugin<P extends keyof SveltePlugins | keyof SveltePa
     });
     onopen(params?: PluginsOpenParams[P], _qs?: PluginsQsParams[P]): void;
     ondestroy(): void;
+    paramsChanged(params?: FullRenderParameters): void;
+    onRenderStart: (params?: FullRenderParameters) => void;
     protected mount(): void;
     protected unmount(): void;
 }

package/types/client/TileLayer.d.ts

@@ -1,6 +1,6 @@
 import { Renderer } from '@windy/Renderer';
-import type { FullRenderParameters } from '@windy/Layer.d';
-import type { RendererInitParams, Renderers } from '@windy/Renderer.d';
+import type { FullRenderParameters } from '@windy/interfaces';
+import type { RendererInitParams, Renderers } from '@windy/Renderer';
 export declare class TileLayer extends Renderer {
     constructor(params: RendererInitParams);
     onopen(params?: FullRenderParameters): void;

package/types/client/TopoMap.d.ts

@@ -1,9 +1,8 @@
 import { Renderer } from '@windy/Renderer';
-import type { FullRenderParameters } from '@windy/Layer.d';
-import type { Renderers } from '@windy/Renderer.d';
+import type { Renderers } from '@windy/Renderer';
 export declare class TopoMap extends Renderer {
     baseLayer: L.GridLayer | null;
-    open(_params: FullRenderParameters): Promise<void>;
+    open(): Promise<void>;
     close(rqrdRenderers: Renderers[]): void;
     addOrUpdateBaseLayer(): void;
     removeBaseLayer(): void;

package/types/client/WindowPlugin.d.ts

@@ -1,3 +1,4 @@
+import { BottomSlide } from '@windy/BottomSlide';
 import { Plugin } from '@windy/Plugin';
 import { Window } from '@windy/Window';
 import type { PluginInitParams } from '@windy/Plugin';
@@ -6,9 +7,8 @@ import type { PluginOpeningOptions, WindowClosingOptions } from '@windy/interfac
 import type { InterpolatorFactory } from '@windy/interpolator';
 import type { PluginsOpenParams, PluginsQsParams } from '@windy/plugin-params.d';
 import type { BottomSveltePlugins, SveltePanePlugins, SveltePlugins, TagPlugins } from '@windy/plugins.d';
-import type { ParsedQueryString } from '@windy/queryString';
 import type { ListeningPriority } from '@windy/singleclick.d';
-import type { LoadedTranslations } from '@windy/types';
+import type { LoadedTranslations, ParsedQueryString } from '@windy/types';
 export interface WindowPlugins extends TagPlugins, SveltePlugins, SveltePanePlugins, BottomSveltePlugins {
 }
 /** Allowed params to WindowPlugin constructor (private and protected props are omited by default) */
@@ -26,6 +26,7 @@ export declare abstract class WindowPlugin<P extends keyof WindowPlugins> extend
      * ID of CSS style
      */
     protected cssID: `plugin-css-${string}`;
+    protected bottomSlide?: BottomSlide;
     /**
      * Was CSS inserted into the DOM
      */
@@ -145,10 +146,13 @@ export declare abstract class WindowPlugin<P extends keyof WindowPlugins> extend
     beforeLoad(..._args: unknown[]): void;
     /**
      * Called by router when URL matches plugin's router (feel free to overload it)
+     *
+     * Typing is difficult here, because captured groups provide just object with string values
+     * and we dunno that it adheres to PluginsOpenParams[P] type.
+     *
+     * Yet the return type MUST BE PluginsOpenParams[P] so it can be used
      */
-    onRouteMatch({ groups }: string[] & {
-        groups: PluginsOpenParams[P];
-    }, _qs?: ParsedQueryString): PluginsOpenParams[P] | undefined;
+    onRouteMatch(regExpGroups: Record<string, string>, _qs?: ParsedQueryString): PluginsOpenParams[P];
     /**
      * When called with params, it will create valid URL for plugin
      * as defined in router property.

package/types/client/colorGradients.d.ts

@@ -1,13 +1,8 @@
 /**
  * Reusable color gradients
  */
-import type { RGBA, ColorGradient } from '@windy/Color.d';
-import type { NumValue } from '@windy/types';
-export declare const moistureAnomaly: RGBA[];
-export declare const airPollutant: RGBA[];
-export declare const cloudBaseAndVisibility: RGBA[];
-export declare const radarGradientAndValues: ColorGradient;
-/**
- * Creates a color gradient from array of prepared ones
- */
-export declare const createColorGradient: (gradient: RGBA[], numValues: NumValue[]) => ColorGradient;
+import type { RGBString, ColorGradientString } from '@windy/types.d';
+export declare const moistureAnomaly: RGBString[];
+export declare const airPollutant: RGBString[];
+export declare const cloudBaseAndVisibility: RGBString[];
+export declare const radarGradientAndValues: ColorGradientString;

package/types/client/colors.d.ts

@@ -1,4 +1,3 @@
-import { Color } from '@windy/Color';
-import type { ColorIdent } from '@windy/Color.d';
+import { Color, type ColorIdent } from '@windy/Color';
 declare const colors: Record<ColorIdent, Color>;
 export default colors;

package/types/client/compatibilityCheck.d.ts

@@ -0,0 +1 @@
+export {};

package/types/client/connection.d.ts

@@ -1,4 +1,4 @@
 /**
  * Connection is lost, user is offline
  */
-export declare function testNetworkConnection(): void;
+export declare function testNetworkConnection(): Promise<void>;

package/types/client/d.ts.files/LabelsLayer.d.ts

@@ -1,4 +1,4 @@
-import { Timestamp } from '@windy/types.d';
+import { Timestamp, type NumOrNull } from '@windy/types.d';
 
 type CityDivId = string; // `${x}:${y}`
 type CityLabelId = string; // `${lat}/${lon}`
@@ -18,7 +18,7 @@ export interface CityLabel {
     el: HTMLDivElement;
 
     /** Forecast data with temperature in K, it is lazy loaded with forecast request */
-    data?: number[];
+    data?: NumOrNull[];
 }
 
 /** Representation of one leaflet tile with its CityLabels */

package/types/client/d.ts.files/Metric.d.ts

@@ -6,6 +6,7 @@ import {
     SatelliteMetric,
     UVIndexMetric,
 } from '@windy/MetricClasses';
+import { Metric } from '@windy/Metric';
 import { NumValue } from '@windy/types.d';
 
 /*
@@ -53,7 +54,9 @@ export type MetricItem =
     | 'uvindex'
     | 'EDR'
     | 'km²'
-    | 'acres';
+    | 'acres'
+    | 'AQI'
+    | 'gr./m³';
 
 /**
  * # @windy/metrics
@@ -121,6 +124,8 @@ export interface MetricTypes {
     turbulence: NumberedMetric;
     icing: NumberedMetric;
     area: NumberedMetric;
+    aqi: NumberedMetric;
+    pollen: NumberedMetric;
 }
 
 /** @ignore */
@@ -190,4 +195,18 @@ export interface Conversion {
 export type ConvObj = { [K in MetricItem]?: Conversion };
 
 /** @ignore */
-export type MetricInitParams = Pick<NumberedMetric, 'ident'> & Partial<NumberedMetric>;
+export type MetricInitParams = Pick<Metric, 'ident'> &
+    Partial<
+        Pick<
+            Metric,
+            | 'lines'
+            | 'conv'
+            | 'backConv'
+            | 'defaults'
+            | 'cohesion'
+            | 'nativeSync'
+            | 'description'
+            | 'separator'
+            | 'discreteLegend'
+        >
+    >;

package/types/client/d.ts.files/TileLayerCanvas.d.ts

@@ -1,7 +1,7 @@
 import { DataTile } from '@windy/dataLoader';
 
-import { FullRenderParameters } from '@windy/Layer.d';
-import { TileParams } from '@windy/Renderer.d';
+import { FullRenderParameters } from '@windy/interfaces';
+import { TileParams } from '@windy/Renderer';
 
 export type InternalTile = L.InternalTiles[string] & { el: HTMLCanvasElement };
 
@@ -34,7 +34,7 @@ export class TileLayerCanvas extends L.GridLayer {
     _tilesToLoad: number;
 
     /**
-     * Owerwriting TileLayer method to disable redrawing layers w/o params
+     * Overwriting TileLayer method to disable redrawing layers w/o params
      */
     // @ts-expect-error We rape TS with overloading properties with properties of different input and output (TODO fix)
     onAdd(this: this, map: L.Map): this;

package/types/client/d.ts.files/alerts.d.ts

@@ -20,10 +20,9 @@ export interface AlertRequest {
     priority?: number;
     suspended: boolean;
     userInterest: UserInterest;
+    hasCustomDescription?: boolean;
 }
 
-type Extends<T, U extends T> = U;
-
 export type GlobalProductWithWaves = Extends<Products, 'ecmwf' | 'gfs' | 'icon' | 'mblue'>;
 
 export interface AlertCheckResponse {
@@ -40,6 +39,7 @@ export interface NumberRange {
 
 export interface AlertConditionBase {
     type: AlertConditionType;
+    valid?: boolean;
 }
 
 export interface CloudinessAlertCondition extends AlertConditionBase {