@deck.gl/carto 8.9.32 → 8.9.33

package/package.json

@@ -2,7 +2,7 @@
   "name": "@deck.gl/carto",
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
-  "version": "8.9.32",
+  "version": "8.9.33",
   "publishConfig": {
     "access": "public"
   },
@@ -65,5 +65,5 @@
     "@deck.gl/layers": "^8.0.0",
     "@loaders.gl/core": "^3.4.13"
   },
-  "gitHead": "148b3b04a065a70f4d92a079b095e2194b979fda"
+  "gitHead": "20c3e14cb5b0b2021125f2cf9056e57466d473eb"
 }

package/src/api/maps-api-common.ts

@@ -94,3 +94,23 @@ export type NamedQueryParameter = Record<string, QueryParameterValue>;
 export type PositionalQueryParameter = QueryParameterValue[];
 
 export type QueryParameters = NamedQueryParameter | PositionalQueryParameter;
+
+export interface Filters {
+  [column: string]: Filter;
+}
+
+interface Filter {
+  [FilterTypes.In]: number[];
+  [FilterTypes.Between]: number[][];
+  [FilterTypes.ClosedOpen]: number[][];
+  [FilterTypes.Time]: number[][];
+  [FilterTypes.StringSearch]: string[];
+}
+
+export enum FilterTypes {
+  In = 'in',
+  Between = 'between', // [a, b] both are included
+  ClosedOpen = 'closed_open', // [a, b) a is included, b is not
+  Time = 'time',
+  StringSearch = 'stringSearch'
+}

package/src/api/maps-v3-client.ts

@@ -21,7 +21,8 @@ import {
   REQUEST_TYPES,
   SchemaField,
   TileFormat,
-  TILE_FORMATS
+  TILE_FORMATS,
+  Filters
 } from './maps-api-common';
 
 import {APIErrorContext, CartoAPIError} from './carto-api-error';
@@ -134,6 +135,7 @@ type FetchLayerDataParams = {
   aggregationExp?: string;
   aggregationResLevel?: number;
   queryParameters?: QueryParameters;
+  filters?: Filters;
 };
 
 type MapsAPIParameters = {
@@ -146,6 +148,7 @@ type MapsAPIParameters = {
   columns?: string;
   aggregationExp?: string;
   aggregationResLevel?: number;
+  filters?: Filters;
 };
 
 /**
@@ -159,7 +162,8 @@ function getParameters({
   clientId,
   aggregationExp,
   aggregationResLevel,
-  queryParameters
+  queryParameters,
+  filters
 }: Omit<FetchLayerDataParams, 'connection' | 'credentials'>): MapsAPIParameters {
   const parameters: MapsAPIParameters = {
     client: clientId || DEFAULT_CLIENT,
@@ -188,6 +192,9 @@ function getParameters({
   if (aggregationResLevel) {
     parameters.aggregationResLevel = aggregationResLevel;
   }
+  if (filters) {
+    parameters.filters = filters;
+  }
 
   return parameters;
 }
@@ -208,7 +215,8 @@ export async function mapInstantiation({
   headers,
   aggregationExp,
   aggregationResLevel,
-  queryParameters
+  queryParameters,
+  filters
 }: FetchLayerDataParams): Promise<MapInstantiation> {
   const baseUrl = `${credentials.mapsUrl}/${connection}/${type}`;
   const parameters = getParameters({
@@ -219,7 +227,8 @@ export async function mapInstantiation({
     clientId,
     aggregationResLevel,
     aggregationExp,
-    queryParameters
+    queryParameters,
+    filters
   });
   const encodedParameters = Object.entries(parameters).map(([key, value]) => {
     if (typeof value !== 'string') {
@@ -263,7 +272,8 @@ function checkFetchLayerDataParameters({
   geoColumn,
   columns,
   aggregationExp,
-  aggregationResLevel
+  aggregationResLevel,
+  filters
 }: FetchLayerDataParams) {
   assert(connection, 'Must define connection');
   assert(type, 'Must define a type');
@@ -288,6 +298,12 @@ function checkFetchLayerDataParameters({
     assert(!aggregationExp, 'Have aggregationExp, but geoColumn parameter is missing');
     assert(!aggregationResLevel, 'Have aggregationResLevel, but geoColumn parameter is missing');
   }
+  if (filters) {
+    assert(
+      type === MAP_TYPES.TABLE || type === MAP_TYPES.QUERY,
+      'The filters parameter is only supported by type table and query'
+    );
+  }
 }
 
 export interface FetchLayerDataResult {
@@ -308,7 +324,8 @@ export async function fetchLayerData({
   headers,
   aggregationExp,
   aggregationResLevel,
-  queryParameters
+  queryParameters,
+  filters
 }: FetchLayerDataParams): Promise<FetchLayerDataResult> {
   // Internally we split data fetching into two parts to allow us to
   // conditionally fetch the actual data, depending on the metadata state
@@ -325,7 +342,8 @@ export async function fetchLayerData({
     headers,
     aggregationExp,
     aggregationResLevel,
-    queryParameters
+    queryParameters,
+    filters
   });
 
   const errorContext = {requestType: REQUEST_TYPES.DATA, connection, type, source};
@@ -347,7 +365,8 @@ async function _fetchDataUrl({
   headers,
   aggregationExp,
   aggregationResLevel,
-  queryParameters
+  queryParameters,
+  filters
 }: FetchLayerDataParams) {
   const defaultCredentials = getDefaultCredentials();
   // Only pick up default credentials if they have been defined for
@@ -364,7 +383,8 @@ async function _fetchDataUrl({
     geoColumn,
     columns,
     aggregationExp,
-    aggregationResLevel
+    aggregationResLevel,
+    filters
   });
 
   if (!localCreds.mapsUrl) {
@@ -382,7 +402,8 @@ async function _fetchDataUrl({
     headers,
     aggregationExp,
     aggregationResLevel,
-    queryParameters
+    queryParameters,
+    filters
   });
   let url: string | null = null;
   let mapFormat: Format | undefined;

package/typed/api/maps-api-common.d.ts

@@ -73,5 +73,22 @@ export declare type QueryParameterValue = string | number | boolean | Array<Quer
 export declare type NamedQueryParameter = Record<string, QueryParameterValue>;
 export declare type PositionalQueryParameter = QueryParameterValue[];
 export declare type QueryParameters = NamedQueryParameter | PositionalQueryParameter;
+export interface Filters {
+    [column: string]: Filter;
+}
+interface Filter {
+    [FilterTypes.In]: number[];
+    [FilterTypes.Between]: number[][];
+    [FilterTypes.ClosedOpen]: number[][];
+    [FilterTypes.Time]: number[][];
+    [FilterTypes.StringSearch]: string[];
+}
+export declare enum FilterTypes {
+    In = "in",
+    Between = "between",
+    ClosedOpen = "closed_open",
+    Time = "time",
+    StringSearch = "stringSearch"
+}
 export {};
 //# sourceMappingURL=maps-api-common.d.ts.map

package/typed/api/maps-api-common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-api-common.d.ts","sourceRoot":"","sources":["../../src/api/maps-api-common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,WAAW,CAAC;AACtD,eAAO,MAAM,+BAA+B,aAAa,CAAC;AAE1D,oBAAY,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAChD,eAAO,MAAM,YAAY;;;;CAIf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,uBAAuB;;;CAG1B,CAAC;AAEX,eAAO,MAAM,SAAS;;;;;CAKZ,CAAC;AACX,oBAAY,OAAO,GAAG,QAAQ,CAAC,OAAO,SAAS,CAAC,CAAC;AACjD,eAAO,MAAM,eAAe,EAAE,OAAO,EAAsB,CAAC;AAC5D,eAAO,MAAM,kBAAkB,EAAE,OAAO,EAAuC,CAAC;AAGhF,eAAO,MAAM,OAAO;;;;;CAKV,CAAC;AACX,oBAAY,MAAM,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,CAAC;AAG9C,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,oBAAY,eAAe;IACzB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AACD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,MAAM,WAAW,gBAAiB,SAAQ,uBAAuB;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,aAAK,uBAAuB,GAAG,MAAM,CACnC,MAAM,EACN;IACE,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CACF,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;CAKhB,CAAC;AACX,oBAAY,WAAW,GAAG,QAAQ,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzD;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAEtF;AAED,oBAAY,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC;AAElG,oBAAY,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAEtE,oBAAY,wBAAwB,GAAG,mBAAmB,EAAE,CAAC;AAE7D,oBAAY,eAAe,GAAG,mBAAmB,GAAG,wBAAwB,CAAC"}
+{"version":3,"file":"maps-api-common.d.ts","sourceRoot":"","sources":["../../src/api/maps-api-common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B,WAAW,CAAC;AACtD,eAAO,MAAM,+BAA+B,aAAa,CAAC;AAE1D,oBAAY,QAAQ,CAAC,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAChD,eAAO,MAAM,YAAY;;;;CAIf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,eAAO,MAAM,uBAAuB;;;CAG1B,CAAC;AAEX,eAAO,MAAM,SAAS;;;;;CAKZ,CAAC;AACX,oBAAY,OAAO,GAAG,QAAQ,CAAC,OAAO,SAAS,CAAC,CAAC;AACjD,eAAO,MAAM,eAAe,EAAE,OAAO,EAAsB,CAAC;AAC5D,eAAO,MAAM,kBAAkB,EAAE,OAAO,EAAuC,CAAC;AAGhF,eAAO,MAAM,OAAO;;;;;CAKV,CAAC;AACX,oBAAY,MAAM,GAAG,QAAQ,CAAC,OAAO,OAAO,CAAC,CAAC;AAG9C,eAAO,MAAM,YAAY;;;;;CAKf,CAAC;AACX,oBAAY,UAAU,GAAG,QAAQ,CAAC,OAAO,YAAY,CAAC,CAAC;AAEvD,oBAAY,eAAe;IACzB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,SAAS,cAAc;IACvB,MAAM,WAAW;IACjB,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AACD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,eAAe,CAAC;CACvB;AAED,MAAM,WAAW,gBAAiB,SAAQ,uBAAuB;IAC/D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,aAAK,uBAAuB,GAAG,MAAM,CACnC,MAAM,EACN;IACE,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,CACF,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;CAKhB,CAAC;AACX,oBAAY,WAAW,GAAG,QAAQ,CAAC,OAAO,aAAa,CAAC,CAAC;AAEzD;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,CAEtF;AAED,oBAAY,mBAAmB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAAC;AAElG,oBAAY,mBAAmB,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;AAEtE,oBAAY,wBAAwB,GAAG,mBAAmB,EAAE,CAAC;AAE7D,oBAAY,eAAe,GAAG,mBAAmB,GAAG,wBAAwB,CAAC;AAE7E,MAAM,WAAW,OAAO;IACtB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC;CAC1B;AAED,UAAU,MAAM;IACd,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAClC,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IACrC,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC;IAC/B,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;CACtC;AAED,oBAAY,WAAW;IACrB,EAAE,OAAO;IACT,OAAO,YAAY;IACnB,UAAU,gBAAgB;IAC1B,IAAI,SAAS;IACb,YAAY,iBAAiB;CAC9B"}

package/typed/api/maps-v3-client.d.ts

@@ -2,7 +2,7 @@
  * Maps API Client for Carto 3
  */
 import { CloudNativeCredentials } from '../config';
-import { Format, MapInstantiation, MapType, QueryParameters, SchemaField, TileFormat } from './maps-api-common';
+import { Format, MapInstantiation, MapType, QueryParameters, SchemaField, TileFormat, Filters } from './maps-api-common';
 export declare type Headers = Record<string, string>;
 declare type FetchLayerDataParams = {
     type: MapType;
@@ -18,14 +18,15 @@ declare type FetchLayerDataParams = {
     aggregationExp?: string;
     aggregationResLevel?: number;
     queryParameters?: QueryParameters;
+    filters?: Filters;
 };
-export declare function mapInstantiation({ type, source, connection, credentials, geoColumn, columns, clientId, headers, aggregationExp, aggregationResLevel, queryParameters }: FetchLayerDataParams): Promise<MapInstantiation>;
+export declare function mapInstantiation({ type, source, connection, credentials, geoColumn, columns, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, filters }: FetchLayerDataParams): Promise<MapInstantiation>;
 export interface FetchLayerDataResult {
     data: any;
     format?: Format;
     schema: SchemaField[];
 }
-export declare function fetchLayerData({ type, source, connection, credentials, geoColumn, columns, format, formatTiles, clientId, headers, aggregationExp, aggregationResLevel, queryParameters }: FetchLayerDataParams): Promise<FetchLayerDataResult>;
+export declare function fetchLayerData({ type, source, connection, credentials, geoColumn, columns, format, formatTiles, clientId, headers, aggregationExp, aggregationResLevel, queryParameters, filters }: FetchLayerDataParams): Promise<FetchLayerDataResult>;
 export declare function fetchMap({ cartoMapId, clientId, credentials, headers, autoRefresh, onNewData }: {
     cartoMapId: string;
     clientId: string;
@@ -35,9 +36,6 @@ export declare function fetchMap({ cartoMapId, clientId, credentials, headers, a
     onNewData?: (map: any) => void;
 }): Promise<{
     stopAutoRefresh: (() => void) | undefined;
-    /**
-     * Request against Maps API
-     */
     id: any;
     title: any;
     description: any;

package/typed/api/maps-v3-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"maps-v3-client.d.ts","sourceRoot":"","sources":["../../src/api/maps-v3-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAIL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,MAAM,EAGN,gBAAgB,EAChB,OAAO,EAEP,eAAe,EAEf,WAAW,EACX,UAAU,EAEX,MAAM,mBAAmB,CAAC;AAY3B,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAsF7C,aAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,sBAAsB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,CAAC;AA+DF,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkClD;AA+CD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AACD,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EAChB,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAuBtD;AAgOD,wBAAsB,QAAQ,CAAC,EAC7B,UAAU,EACV,QAAQ,EACR,WAAW,EACX,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;4BA+B6B,IAAI;IA7iBlC;;OAEG;;;;;;;;;;GA+lBF"}
+{"version":3,"file":"maps-v3-client.d.ts","sourceRoot":"","sources":["../../src/api/maps-v3-client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAIL,sBAAsB,EACvB,MAAM,WAAW,CAAC;AACnB,OAAO,EAIL,MAAM,EAGN,gBAAgB,EAChB,OAAO,EAEP,eAAe,EAEf,WAAW,EACX,UAAU,EAEV,OAAO,EACR,MAAM,mBAAmB,CAAC;AAY3B,oBAAY,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAsF7C,aAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,sBAAsB,CAAC;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CAAC;AAoEF,wBAAsB,gBAAgB,CAAC,EACrC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,OAAO,EACR,EAAE,oBAAoB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAmClD;AAsDD,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,GAAG,CAAC;IACV,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AACD,wBAAsB,cAAc,CAAC,EACnC,IAAI,EACJ,MAAM,EACN,UAAU,EACV,WAAW,EACX,SAAS,EACT,OAAO,EACP,MAAM,EACN,WAAW,EACX,QAAQ,EACR,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,OAAO,EACR,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAwBtD;AAmOD,wBAAsB,QAAQ,CAAC,EAC7B,UAAU,EACV,QAAQ,EACR,WAAW,EACX,OAAO,EACP,WAAW,EACX,SAAS,EACV,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,sBAAsB,CAAC;IACrC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,IAAI,CAAC;CAChC;4BA+B6B,IAAI;;;;;;;;;;GAoDjC"}