@electric-sql/client 1.2.1 → 1.2.2

package/dist/index.legacy-esm.js

@@ -270,6 +270,10 @@ function makeNullableParser(parser, columnInfo, columnName) {
 }
 
 // src/column-mapper.ts
+function quoteIdentifier(identifier) {
+  const escaped = identifier.replace(/"/g, `""`);
+  return `"${escaped}"`;
+}
 function snakeToCamel(str) {
   var _a, _b, _c, _d;
   const leadingUnderscores = (_b = (_a = str.match(/^_+/)) == null ? void 0 : _a[0]) != null ? _b : ``;
@@ -1417,7 +1421,7 @@ requestShape_fn = async function() {
   return __privateMethod(this, _ShapeStream_instances, requestShape_fn).call(this);
 };
 constructUrl_fn = async function(url, resumingFromPause, subsetParams) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   const [requestHeaders, params] = await Promise.all([
     resolveHeaders(this.options.headers),
     this.options.params ? toInternalParams(convertWhereParamsToObj(this.options.params)) : void 0
@@ -1433,8 +1437,21 @@ constructUrl_fn = async function(url, resumingFromPause, subsetParams) {
       );
       setQueryParam(fetchUrl, WHERE_QUERY_PARAM, encodedWhere);
     }
-    if (params.columns)
-      setQueryParam(fetchUrl, COLUMNS_QUERY_PARAM, params.columns);
+    if (params.columns) {
+      const originalColumns = await resolveValue((_b = this.options.params) == null ? void 0 : _b.columns);
+      if (Array.isArray(originalColumns)) {
+        let encodedColumns = originalColumns.map(String);
+        if (this.options.columnMapper) {
+          encodedColumns = encodedColumns.map(
+            this.options.columnMapper.encode
+          );
+        }
+        const serializedColumns = encodedColumns.map(quoteIdentifier).join(`,`);
+        setQueryParam(fetchUrl, COLUMNS_QUERY_PARAM, serializedColumns);
+      } else {
+        setQueryParam(fetchUrl, COLUMNS_QUERY_PARAM, params.columns);
+      }
+    }
     if (params.replica) setQueryParam(fetchUrl, REPLICA_PARAM, params.replica);
     if (params.params)
       setQueryParam(fetchUrl, WHERE_PARAMS_PARAM, params.params);
@@ -1452,7 +1469,7 @@ constructUrl_fn = async function(url, resumingFromPause, subsetParams) {
     if (subsetParams.where && typeof subsetParams.where === `string`) {
       const encodedWhere = encodeWhereClause(
         subsetParams.where,
-        (_b = this.options.columnMapper) == null ? void 0 : _b.encode
+        (_c = this.options.columnMapper) == null ? void 0 : _c.encode
       );
       setQueryParam(fetchUrl, SUBSET_PARAM_WHERE, encodedWhere);
     }
@@ -1468,7 +1485,7 @@ constructUrl_fn = async function(url, resumingFromPause, subsetParams) {
     if (subsetParams.orderBy && typeof subsetParams.orderBy === `string`) {
       const encodedOrderBy = encodeWhereClause(
         subsetParams.orderBy,
-        (_c = this.options.columnMapper) == null ? void 0 : _c.encode
+        (_d = this.options.columnMapper) == null ? void 0 : _d.encode
       );
       setQueryParam(fetchUrl, SUBSET_PARAM_ORDER_BY, encodedOrderBy);
     }