@carto/api-client 0.5.10-alpha.PR193.4 → 0.5.11

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 0.5
 
+### 0.5.10
+
+- fix(widgets): orderBy support in WidgetRasterSource.getCategory (#210)
+
 ### 0.5.9
 
 - feat(widgets): orderBy support in WidgetSource.getCategory (#203)

package/build/api-client.cjs

@@ -6084,8 +6084,7 @@ async function requestWithParameters({
   headers: customHeaders = {},
   errorContext,
   maxLengthURL = DEFAULT_MAX_LENGTH_URL,
-  localCache,
-  signal
+  localCache
 }) {
   parameters = {
     v: V3_MINOR_VERSION,
@@ -6108,9 +6107,8 @@ async function requestWithParameters({
   const fetchPromise = url.length > maxLengthURL ? fetch(baseUrl, {
     method: "POST",
     body: JSON.stringify(parameters),
-    headers,
-    signal
-  }) : fetch(url, { headers, signal });
+    headers
+  }) : fetch(url, { headers });
   let response;
   let responseJson;
   const jsonPromise = fetchPromise.then((_response) => {
@@ -6162,12 +6160,10 @@ function createURLWithParameters(baseUrlString, parameters) {
     if (isPureObject(value) || Array.isArray(value)) {
       baseUrl.searchParams.set(key, JSON.stringify(value));
     } else {
-      if (value !== null && value !== void 0) {
-        baseUrl.searchParams.set(
-          key,
-          value.toString()
-        );
-      }
+      baseUrl.searchParams.set(
+        key,
+        value.toString()
+      );
     }
   }
   return baseUrl.toString();
@@ -6211,7 +6207,7 @@ async function baseSource(endpoint, options, urlParameters) {
     Authorization: `Bearer ${options.accessToken}`,
     ...options.headers
   };
-  const parameters = { client: clientId, ...options.tags, ...urlParameters };
+  const parameters = { client: clientId, ...urlParameters };
   const errorContext = {
     requestType: "Map instantiation",
     connection: options.connectionName,
@@ -6432,8 +6428,7 @@ function executeModel(props) {
     filtersLogicalOperator = "and",
     spatialDataType = "geo",
     spatialDataColumn = DEFAULT_GEO_COLUMN,
-    spatialFiltersMode = "intersects",
-    tags
+    spatialFiltersMode = "intersects"
   } = source;
   const queryParams = {
     type,
@@ -6442,8 +6437,7 @@ function executeModel(props) {
     params,
     queryParameters: source.queryParameters || "",
     filters,
-    filtersLogicalOperator,
-    ...tags ?? {}
+    filtersLogicalOperator
   };
   queryParams.spatialDataType = spatialDataType;
   queryParams.spatialDataColumn = spatialDataColumn;
@@ -6578,8 +6572,7 @@ var WidgetRemoteSource = class extends WidgetSource {
       filters: getApplicableFilters(filterOwner, filters || props.filters),
       filtersLogicalOperator: props.filtersLogicalOperator,
       spatialDataType: props.spatialDataType,
-      spatialDataColumn: props.spatialDataColumn,
-      tags: props.tags
+      spatialDataColumn: props.spatialDataColumn
     };
   }
   async getCategories(options) {
@@ -7078,17 +7071,20 @@ function groupValuesByColumn({
 function getSorter(orderBy) {
   switch (orderBy) {
     case "frequency_asc":
-      return (a, b) => a.value - b.value || localeCompare(a.name, b.name);
+      return (a, b) => a.value - b.value || nameCompare(a.name, b.name);
     case "frequency_desc":
-      return (a, b) => b.value - a.value || localeCompare(a.name, b.name);
+      return (a, b) => b.value - a.value || nameCompare(a.name, b.name);
     case "alphabetical_asc":
-      return (a, b) => localeCompare(a.name, b.name) || b.value - a.value;
+      return (a, b) => nameCompare(a.name, b.name) || b.value - a.value;
     case "alphabetical_desc":
-      return (a, b) => localeCompare(b.name, a.name) || b.value - a.value;
+      return (a, b) => nameCompare(b.name, a.name) || b.value - a.value;
   }
 }
-function localeCompare(a, b) {
-  return (a ?? "null").localeCompare(b ?? "null");
+function nameCompare(a, b) {
+  if (typeof a === "number" && typeof b === "number") {
+    return a - b;
+  }
+  return String(a ?? "null").localeCompare(String(b ?? "null"));
 }
 
 // src/operations/groupByDate.ts
@@ -8418,8 +8414,7 @@ var query = async function(options) {
     localCache,
     connectionName,
     sqlQuery,
-    queryParameters,
-    internalParameters
+    queryParameters
   } = options;
   const urlParameters = { q: sqlQuery };
   if (queryParameters) {
@@ -8430,12 +8425,7 @@ var query = async function(options) {
     Authorization: `Bearer ${options.accessToken}`,
     ...options.headers
   };
-  const parameters = {
-    client: clientId,
-    ...options.tags,
-    ...internalParameters,
-    ...urlParameters
-  };
+  const parameters = { client: clientId, ...urlParameters };
   const errorContext = {
     requestType: "SQL",
     connection: options.connectionName,
@@ -8448,8 +8438,7 @@ var query = async function(options) {
     headers,
     errorContext,
     maxLengthURL,
-    localCache,
-    signal: options.signal
+    localCache
   });
 };