@deck.gl/carto 9.0.35 → 9.1.0-beta.1

package/src/layers/raster-layer-vertex.glsl.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 export default `\
 #version 300 es
 #define SHADER_NAME raster-layer-vertex-shader
@@ -11,16 +15,6 @@ in vec4 instanceLineColors;
 
 in vec3 instancePickingColors;
 
-// Custom uniforms
-uniform float opacity;
-uniform bool extruded;
-uniform bool stroked;
-uniform bool isStroke;
-uniform float coverage;
-uniform float elevationScale;
-uniform float widthScale;
-uniform vec3 offset;
-
 // Result
 out vec4 vColor;
 #ifdef FLAT_SHADING
@@ -29,25 +23,25 @@ out vec4 position_commonspace;
 
 void main(void) {
   // Rather than positioning using attribute, layout pixel grid using gl_InstanceID
-  vec2 common_position = offset.xy;
-  float scale = offset.z;
+  vec2 common_position = column.offset.xy;
+  float scale = column.widthScale; // Re-use widthScale prop to pass cell scale
 
   int yIndex = - (gl_InstanceID / BLOCK_WIDTH);
   int xIndex = gl_InstanceID + (yIndex * BLOCK_WIDTH);
   common_position += scale * vec2(float(xIndex), float(yIndex - 1));
 
-  vec4 color = isStroke ? instanceLineColors : instanceFillColors;
+  vec4 color = column.isStroke ? instanceLineColors : instanceFillColors;
 
   // if alpha == 0.0 or z < 0.0, do not render element
   float shouldRender = float(color.a > 0.0 && instanceElevations >= 0.0);
-  float cellWidth = coverage * scale;
+  float cellWidth = column.coverage * scale;
 
   // Get position directly from quadbin, rather than projecting
   // Important to set geometry.position before using project_ methods below
   // as geometry.worldPosition is not set (we don't know our lat/long)
   geometry.position = vec4(common_position, 0.0, 1.0);
-  if (project_uProjectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
-    geometry.position.xyz -= project_uCommonOrigin;
+  if (project.projectionMode == PROJECTION_MODE_WEB_MERCATOR_AUTO_OFFSET) {
+    geometry.position.xyz -= project.commonOrigin;
   }
 
   // calculate elevation, if 3d not enabled set to 0
@@ -56,11 +50,11 @@ void main(void) {
   // calculate stroke offset
   float strokeOffsetRatio = 1.0;
 
-  if (extruded) {
-    elevation = instanceElevations * (positions.z + 1.0) / 2.0 * elevationScale;
-  } else if (stroked) {
-    float halfOffset = project_pixel_size(widthScale) / cellWidth;
-    if (isStroke) {
+  if (column.extruded) {
+    elevation = instanceElevations * (positions.z + 1.0) / 2.0 * column.elevationScale;
+  } else if (column.stroked) {
+    float halfOffset = project_pixel_size(column.widthScale) / cellWidth;
+    if (column.isStroke) {
       strokeOffsetRatio -= sign(positions.z) * halfOffset;
     } else {
       strokeOffsetRatio -= halfOffset;
@@ -81,16 +75,16 @@ void main(void) {
   DECKGL_FILTER_GL_POSITION(gl_Position, geometry);
 
   // Light calculations
-  if (extruded && !isStroke) {
+  if (column.extruded && !column.isStroke) {
 #ifdef FLAT_SHADING
     position_commonspace = geometry.position;
-    vColor = vec4(color.rgb, color.a * opacity);
+    vColor = vec4(color.rgb, color.a * layer.opacity);
 #else
-    vec3 lightColor = lighting_getLightColor(color.rgb, project_uCameraPosition, geometry.position.xyz, geometry.normal);
-    vColor = vec4(lightColor, color.a * opacity);
+    vec3 lightColor = lighting_getLightColor(color.rgb, project.cameraPosition, geometry.position.xyz, geometry.normal);
+    vColor = vec4(lightColor, color.a * layer.opacity);
 #endif
   } else {
-    vColor = vec4(color.rgb, color.a * opacity);
+    vColor = vec4(color.rgb, color.a * layer.opacity);
   }
 
   DECKGL_FILTER_COLOR(vColor, geometry);

package/src/layers/raster-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {
   Accessor,
   CompositeLayer,
@@ -113,7 +117,8 @@ export default class RasterLayer<DataT = any, ExtraProps = {}> extends Composite
 
     const blockSize = data.blockSize ?? 0;
     const [xOffset, yOffset, scale] = quadbinToOffset(tileIndex);
-    const offset = [xOffset, yOffset, scale / blockSize];
+    const offset = [xOffset, yOffset];
+    const lineWidthScale = scale / blockSize;
 
     // Filled Column Layer
     const CellLayer = this.getSubLayerClass('column', RasterColumnLayer);
@@ -136,6 +141,7 @@ export default class RasterLayer<DataT = any, ExtraProps = {}> extends Composite
         },
         dataComparator: wrappedDataComparator,
         offset,
+        lineWidthScale, // Re-use widthScale prop to pass cell scale,
         highlightedObjectIndex,
         highlightColor
       }

package/src/layers/raster-tile-layer.ts

@@ -1,7 +1,11 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {CompositeLayer, CompositeLayerProps, DefaultProps, Layer, LayersList} from '@deck.gl/core';
 import RasterLayer, {RasterLayerProps} from './raster-layer';
 import QuadbinTileset2D from './quadbin-tileset-2d';
-import type {TilejsonResult} from '../sources/types';
+import type {TilejsonResult} from '@carto/api-client';
 import {injectAccessToken, TilejsonPropType} from './utils';
 import {DEFAULT_TILE_SIZE} from '../constants';
 import {TileLayer, TileLayerProps} from '@deck.gl/geo-layers';

package/src/layers/schema/carto-properties-tile-loader.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 
 import {Tile, TileReader} from './carto-properties-tile';

package/src/layers/schema/carto-properties-tile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {NumericProp, NumericPropKeyValueReader, PropertiesReader} from './carto-tile';
 
 // Tile ========================================

package/src/layers/schema/carto-raster-tile-loader.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 
 import {TileReader} from './carto-raster-tile';

package/src/layers/schema/carto-raster-tile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {readPackedTypedArray} from './fast-pbf';
 
 const ARRAY_TYPES = {

package/src/layers/schema/carto-spatial-tile-loader.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 
 import {Tile, TileReader} from './carto-spatial-tile';

package/src/layers/schema/carto-spatial-tile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {readPackedTypedArray} from './fast-pbf';
 import {Indices, IndexScheme} from './spatialjson-utils';
 import {NumericProp, NumericPropKeyValueReader, PropertiesReader} from './carto-tile';

package/src/layers/schema/carto-tile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {readPackedTypedArray} from './fast-pbf';
 
 // KeyValueObject ========================================

package/src/layers/schema/carto-vector-tile-loader.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import earcut from 'earcut';
 import {LoaderOptions, LoaderWithParser} from '@loaders.gl/loader-utils';
 import type {BinaryFeatureCollection, BinaryPolygonFeature, TypedArray} from '@loaders.gl/schema';

package/src/layers/schema/fast-pbf.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 // Optimized (100X speed improvement) reading function for binary data
 export function readPackedTypedArray(TypedArray, pbf, obj) {
   const end = pbf.type === 2 ? pbf.readVarint() + pbf.pos : pbf.pos + 1;

package/src/layers/schema/spatialjson-utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {bigIntToHex} from 'quadbin';
 
 export type IndexScheme = 'h3' | 'quadbin';

package/src/layers/schema/tile-loader-utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import Protobuf from 'pbf';
 
 export function parsePbf(buffer: ArrayBuffer, TileReader) {

package/src/layers/spatial-index-tile-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {registerLoaders} from '@loaders.gl/core';
 import {DefaultProps, LayerProps} from '@deck.gl/core';
 import CartoRasterTileLoader from './schema/carto-raster-tile-loader';

package/src/layers/utils.ts

@@ -1,8 +1,12 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {log} from '@deck.gl/core';
 import {Tile as PropertiesTile} from './schema/carto-properties-tile';
 import {Tile as VectorTile} from './schema/carto-tile';
 import {_deepEqual as deepEqual} from '@deck.gl/core';
-import type {TilejsonResult} from '../sources/types';
+import type {TilejsonResult} from '@carto/api-client';
 
 /**
  * Adds access token to Authorization header in loadOptions

package/src/layers/vector-tile-layer.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {registerLoaders} from '@loaders.gl/core';
 import CartoPropertiesTileLoader from './schema/carto-properties-tile-loader';
 import CartoVectorTileLoader from './schema/carto-vector-tile-loader';
@@ -15,7 +19,7 @@ import {
 } from '@deck.gl/geo-layers';
 import {GeoJsonLayer} from '@deck.gl/layers';
 
-import type {TilejsonResult} from '../sources/types';
+import type {TilejsonResult} from '@carto/api-client';
 import {TilejsonPropType, injectAccessToken, mergeBoundaryData} from './utils';
 import {DEFAULT_TILE_SIZE} from '../constants';
 

package/src/style/color-bins-style.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {scaleThreshold} from 'd3-scale';
 import {AccessorFunction, Color} from '@deck.gl/core';
 import {Feature} from 'geojson';

package/src/style/color-categories-style.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {AccessorFunction, Color} from '@deck.gl/core';
 import {Feature} from 'geojson';
 import getPalette, {DEFAULT_PALETTE, NULL_COLOR, OTHERS_COLOR} from './palette';

package/src/style/color-continuous-style.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {AccessorFunction, Color} from '@deck.gl/core';
 import {scaleLinear} from 'd3-scale';
 import {Feature} from 'geojson';

package/src/style/palette.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import * as cartoColors from 'cartocolor';
 import {assert} from '../utils';
 import {Color} from '@deck.gl/core';

package/src/style/utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {Feature} from 'geojson';
 import {assert} from '../utils';
 

package/src/utils.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {log} from '@deck.gl/core';
 import type {Properties, NumericProps} from './layers/schema/spatialjson-utils';
 

package/src/workers/cartoRasterTile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {createLoaderWorker} from '@loaders.gl/loader-utils';
 import CartoRasterTileLoader from '../layers/schema/carto-raster-tile-loader';
 

package/src/workers/cartoSpatialTile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {createLoaderWorker} from '@loaders.gl/loader-utils';
 import CartoSpatialTileLoader from '../layers/schema/carto-spatial-tile-loader';
 

package/src/workers/cartoVectorTile.ts

@@ -1,3 +1,7 @@
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+
 import {createLoaderWorker} from '@loaders.gl/loader-utils';
 import CartoVectorTileLoader from '../layers/schema/carto-vector-tile-loader';
 

package/dist/api/carto-api-error.d.ts

@@ -1,19 +0,0 @@
-import type { APIErrorContext } from "./types.js";
-/**
- *
- * Custom error for reported errors in CARTO Maps API.
- * Provides useful debugging information in console and context for applications.
- *
- */
-export declare class CartoAPIError extends Error {
-    /** Source error from server */
-    error: Error;
-    /** Context (API call & parameters) in which error occured */
-    errorContext: APIErrorContext;
-    /** Response from server */
-    response?: Response;
-    /** JSON Response from server */
-    responseJson?: any;
-    constructor(error: Error, errorContext: APIErrorContext, response?: Response, responseJson?: any);
-}
-//# sourceMappingURL=carto-api-error.d.ts.map

package/dist/api/carto-api-error.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"carto-api-error.d.ts","sourceRoot":"","sources":["../../src/api/carto-api-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAE7C;;;;;GAKG;AACH,qBAAa,aAAc,SAAQ,KAAK;IACtC,+BAA+B;IAC/B,KAAK,EAAE,KAAK,CAAC;IAEb,6DAA6D;IAC7D,YAAY,EAAE,eAAe,CAAC;IAE9B,2BAA2B;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,gCAAgC;IAChC,YAAY,CAAC,EAAE,GAAG,CAAC;gBAGjB,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,eAAe,EAC7B,QAAQ,CAAC,EAAE,QAAQ,EACnB,YAAY,CAAC,EAAE,GAAG;CAmCrB"}

package/dist/api/carto-api-error.js

@@ -1,48 +0,0 @@
-/**
- *
- * Custom error for reported errors in CARTO Maps API.
- * Provides useful debugging information in console and context for applications.
- *
- */
-export class CartoAPIError extends Error {
-    constructor(error, errorContext, response, responseJson) {
-        let responseString = 'Failed to connect';
-        if (response) {
-            responseString = 'Server returned: ';
-            if (response.status === 400) {
-                responseString += 'Bad request';
-            }
-            else if (response.status === 401 || response.status === 403) {
-                responseString += 'Unauthorized access';
-            }
-            else if (response.status === 404) {
-                responseString += 'Not found';
-            }
-            else {
-                responseString += 'Error';
-            }
-            responseString += ` (${response.status}):`;
-        }
-        responseString += ` ${error.message || error}`;
-        let message = `${errorContext.requestType} API request failed`;
-        message += `\n${responseString}`;
-        for (const key of Object.keys(errorContext)) {
-            if (key === 'requestType')
-                continue; // eslint-disable-line no-continue
-            message += `\n${formatErrorKey(key)}: ${errorContext[key]}`;
-        }
-        message += '\n';
-        super(message);
-        this.name = 'CartoAPIError';
-        this.response = response;
-        this.responseJson = responseJson;
-        this.error = error;
-        this.errorContext = errorContext;
-    }
-}
-/**
- * Converts camelCase to Camel Case
- */
-function formatErrorKey(key) {
-    return key.replace(/([A-Z])/g, ' $1').replace(/^./, s => s.toUpperCase());
-}

package/dist/api/common.d.ts

@@ -1,5 +0,0 @@
-export declare const DEFAULT_API_BASE_URL = "https://gcp-us-east1.api.carto.com";
-export declare const DEFAULT_CLIENT = "deck-gl-carto";
-export declare const V3_MINOR_VERSION = "3.4";
-export declare const DEFAULT_MAX_LENGTH_URL = 7000;
-//# sourceMappingURL=common.d.ts.map

package/dist/api/common.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/api/common.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,oBAAoB,uCAAuC,CAAC;AACzE,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,gBAAgB,QAAQ,CAAC;AAGtC,eAAO,MAAM,sBAAsB,OAAO,CAAC"}

package/dist/api/common.js

@@ -1,5 +0,0 @@
-export const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';
-export const DEFAULT_CLIENT = 'deck-gl-carto';
-export const V3_MINOR_VERSION = '3.4';
-// Fastly default limit is 8192; leave some padding.
-export const DEFAULT_MAX_LENGTH_URL = 7000;

package/dist/api/endpoints.d.ts

@@ -1,23 +0,0 @@
-import { MapType } from "./types.js";
-export type V3Endpoint = 'maps' | 'stats' | 'sql';
-export declare function buildPublicMapUrl({ apiBaseUrl, cartoMapId }: {
-    apiBaseUrl: string;
-    cartoMapId: string;
-}): string;
-export declare function buildStatsUrl({ attribute, apiBaseUrl, connectionName, source, type }: {
-    attribute: string;
-    apiBaseUrl: string;
-    connectionName: string;
-    source: string;
-    type: MapType;
-}): string;
-export declare function buildSourceUrl({ apiBaseUrl, connectionName, endpoint }: {
-    apiBaseUrl: string;
-    connectionName: string;
-    endpoint: MapType;
-}): string;
-export declare function buildQueryUrl({ apiBaseUrl, connectionName }: {
-    apiBaseUrl: string;
-    connectionName: string;
-}): string;
-//# sourceMappingURL=endpoints.d.ts.map

package/dist/api/endpoints.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"endpoints.d.ts","sourceRoot":"","sources":["../../src/api/endpoints.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAC,mBAAgB;AAEhC,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,OAAO,GAAG,KAAK,CAAC;AAelD,wBAAgB,iBAAiB,CAAC,EAChC,UAAU,EACV,UAAU,EACX,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAET;AAED,wBAAgB,aAAa,CAAC,EAC5B,SAAS,EACT,UAAU,EACV,cAAc,EACd,MAAM,EACN,IAAI,EACL,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,MAAM,CAOT;AAED,wBAAgB,cAAc,CAAC,EAC7B,UAAU,EACV,cAAc,EACd,QAAQ,EACT,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,MAAM,CAET;AAED,wBAAgB,aAAa,CAAC,EAC5B,UAAU,EACV,cAAc,EACf,EAAE;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB,GAAG,MAAM,CAET"}

package/dist/api/endpoints.js

@@ -1,22 +0,0 @@
-function joinPath(...args) {
-    return args.map(part => (part.endsWith('/') ? part.slice(0, -1) : part)).join('/');
-}
-function buildV3Path(apiBaseUrl, version, endpoint, ...rest) {
-    return joinPath(apiBaseUrl, version, endpoint, ...rest);
-}
-export function buildPublicMapUrl({ apiBaseUrl, cartoMapId }) {
-    return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);
-}
-export function buildStatsUrl({ attribute, apiBaseUrl, connectionName, source, type }) {
-    if (type === 'query') {
-        return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);
-    }
-    // type === 'table'
-    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);
-}
-export function buildSourceUrl({ apiBaseUrl, connectionName, endpoint }) {
-    return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);
-}
-export function buildQueryUrl({ apiBaseUrl, connectionName }) {
-    return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
-}

package/dist/api/query.d.ts

@@ -1,4 +0,0 @@
-import type { SourceOptions, QuerySourceOptions, QueryResult } from "../sources/types.js";
-export type QueryOptions = SourceOptions & Omit<QuerySourceOptions, 'spatialDataColumn'>;
-export declare const query: (options: QueryOptions) => Promise<QueryResult>;
-//# sourceMappingURL=query.d.ts.map

package/dist/api/query.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/api/query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,aAAa,EAAE,kBAAkB,EAAE,WAAW,EAAC,4BAAyB;AAKrF,MAAM,MAAM,YAAY,GAAG,aAAa,GAAG,IAAI,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;AAGzF,eAAO,MAAM,KAAK,YAA4B,YAAY,KAAG,QAAQ,WAAW,CAgC/E,CAAC"}

package/dist/api/query.js

@@ -1,26 +0,0 @@
-import { SOURCE_DEFAULTS } from "../sources/index.js";
-import { buildQueryUrl } from "./endpoints.js";
-import { requestWithParameters } from "./request-with-parameters.js";
-export const query = async function (options) {
-    const { apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl, clientId = SOURCE_DEFAULTS.clientId, maxLengthURL = SOURCE_DEFAULTS.maxLengthURL, connectionName, sqlQuery, queryParameters } = options;
-    const urlParameters = { q: sqlQuery };
-    if (queryParameters) {
-        urlParameters.queryParameters = JSON.stringify(queryParameters);
-    }
-    const baseUrl = buildQueryUrl({ apiBaseUrl, connectionName });
-    const headers = { Authorization: `Bearer ${options.accessToken}`, ...options.headers };
-    const parameters = { client: clientId, ...urlParameters };
-    const errorContext = {
-        requestType: 'SQL',
-        connection: options.connectionName,
-        type: 'query',
-        source: JSON.stringify(parameters, undefined, 2)
-    };
-    return await requestWithParameters({
-        baseUrl,
-        parameters,
-        headers,
-        errorContext,
-        maxLengthURL
-    });
-};

package/dist/api/request-with-parameters.d.ts

@@ -1,9 +0,0 @@
-import type { APIErrorContext } from "./types.js";
-export declare function requestWithParameters<T = any>({ baseUrl, parameters, headers: customHeaders, errorContext, maxLengthURL }: {
-    baseUrl: string;
-    parameters?: Record<string, unknown>;
-    headers?: Record<string, string>;
-    errorContext: APIErrorContext;
-    maxLengthURL?: number;
-}): Promise<T>;
-//# sourceMappingURL=request-with-parameters.d.ts.map

package/dist/api/request-with-parameters.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"request-with-parameters.d.ts","sourceRoot":"","sources":["../../src/api/request-with-parameters.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,eAAe,EAAC,mBAAgB;AAmB7C,wBAAsB,qBAAqB,CAAC,CAAC,GAAG,GAAG,EAAE,EACnD,OAAO,EACP,UAAe,EACf,OAAO,EAAE,aAAkB,EAC3B,YAAY,EACZ,YAAqC,EACtC,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,YAAY,EAAE,eAAe,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,OAAO,CAAC,CAAC,CAAC,CAsCb"}

package/dist/api/request-with-parameters.js

@@ -1,86 +0,0 @@
-import { VERSION } from '@deck.gl/core';
-import { isPureObject } from "../utils.js";
-import { CartoAPIError } from "./carto-api-error.js";
-import { DEFAULT_MAX_LENGTH_URL, V3_MINOR_VERSION } from "./common.js";
-/**
- * Parameters added to all requests issued with `requestWithParameters()`.
- * These parameters override parameters already in the base URL, but not
- * user-provided parameters.
- */
-const DEFAULT_PARAMETERS = {
-    v: V3_MINOR_VERSION,
-    deckglVersion: VERSION
-};
-const DEFAULT_HEADERS = {
-    Accept: 'application/json',
-    'Content-Type': 'application/json'
-};
-const REQUEST_CACHE = new Map();
-export async function requestWithParameters({ baseUrl, parameters = {}, headers: customHeaders = {}, errorContext, maxLengthURL = DEFAULT_MAX_LENGTH_URL }) {
-    parameters = { ...DEFAULT_PARAMETERS, ...parameters };
-    baseUrl = excludeURLParameters(baseUrl, Object.keys(parameters));
-    const key = createCacheKey(baseUrl, parameters, customHeaders);
-    if (REQUEST_CACHE.has(key)) {
-        return REQUEST_CACHE.get(key);
-    }
-    const url = createURLWithParameters(baseUrl, parameters);
-    const headers = { ...DEFAULT_HEADERS, ...customHeaders };
-    /* global fetch */
-    const fetchPromise = url.length > maxLengthURL
-        ? fetch(baseUrl, { method: 'POST', body: JSON.stringify(parameters), headers })
-        : fetch(url, { headers });
-    let response;
-    let responseJson;
-    const jsonPromise = fetchPromise
-        .then((_response) => {
-        response = _response;
-        return response.json();
-    })
-        .then((json) => {
-        responseJson = json;
-        if (!response || !response.ok) {
-            throw new Error(json.error);
-        }
-        return json;
-    })
-        .catch((error) => {
-        REQUEST_CACHE.delete(key);
-        throw new CartoAPIError(error, errorContext, response, responseJson);
-    });
-    REQUEST_CACHE.set(key, jsonPromise);
-    return jsonPromise;
-}
-function createCacheKey(baseUrl, parameters, headers) {
-    const parameterEntries = Object.entries(parameters).sort(([a], [b]) => (a > b ? 1 : -1));
-    const headerEntries = Object.entries(headers).sort(([a], [b]) => (a > b ? 1 : -1));
-    return JSON.stringify({ baseUrl, parameters: parameterEntries, headers: headerEntries });
-}
-/**
- * Appends query string parameters to a URL. Existing URL parameters are kept,
- * unless there is a conflict, in which case the new parameters override
- * those already in the URL.
- */
-function createURLWithParameters(baseUrlString, parameters) {
-    const baseUrl = new URL(baseUrlString);
-    for (const [key, value] of Object.entries(parameters)) {
-        if (isPureObject(value) || Array.isArray(value)) {
-            baseUrl.searchParams.set(key, JSON.stringify(value));
-        }
-        else {
-            baseUrl.searchParams.set(key, value.toString());
-        }
-    }
-    return baseUrl.toString();
-}
-/**
- * Deletes query string parameters from a URL.
- */
-function excludeURLParameters(baseUrlString, parameters) {
-    const baseUrl = new URL(baseUrlString);
-    for (const param of parameters) {
-        if (baseUrl.searchParams.has(param)) {
-            baseUrl.searchParams.delete(param);
-        }
-    }
-    return baseUrl.toString();
-}

package/dist/sources/base-source.d.ts

@@ -1,5 +0,0 @@
-import type { MapType } from "../api/types.js";
-import type { GeojsonResult, JsonResult, SourceOptionalOptions, SourceRequiredOptions, TilejsonResult } from "./types.js";
-export declare const SOURCE_DEFAULTS: SourceOptionalOptions;
-export declare function baseSource<UrlParameters extends Record<string, unknown>>(endpoint: MapType, options: Partial<SourceOptionalOptions> & SourceRequiredOptions, urlParameters: UrlParameters): Promise<TilejsonResult | GeojsonResult | JsonResult>;
-//# sourceMappingURL=base-source.d.ts.map