@electric-sql/client 1.2.0 → 1.2.2

package/dist/cjs/index.cjs

@@ -327,6 +327,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 : ``;
@@ -1491,7 +1495,7 @@ requestShape_fn = function() {
 };
 constructUrl_fn = function(url, resumingFromPause, subsetParams) {
   return __async(this, null, function* () {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const [requestHeaders, params] = yield Promise.all([
       resolveHeaders(this.options.headers),
       this.options.params ? toInternalParams(convertWhereParamsToObj(this.options.params)) : void 0
@@ -1507,8 +1511,21 @@ constructUrl_fn = 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 = yield 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);
@@ -1526,7 +1543,7 @@ constructUrl_fn = 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);
       }
@@ -1542,7 +1559,7 @@ constructUrl_fn = 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);
       }
@@ -1693,10 +1710,13 @@ requestShapeSSE_fn = function(opts) {
     const { fetchUrl, requestAbortController, headers } = opts;
     const fetch2 = __privateGet(this, _sseFetchClient);
     __privateSet(this, _lastSseConnectionStartTime, Date.now());
+    const sseHeaders = __spreadProps(__spreadValues({}, headers), {
+      Accept: `text/event-stream`
+    });
     try {
       let buffer = [];
       yield (0, import_fetch_event_source.fetchEventSource)(fetchUrl.toString(), {
-        headers,
+        headers: sseHeaders,
         fetch: fetch2,
         onopen: (response) => __async(this, null, function* () {
           __privateSet(this, _connected, true);