@electric-sql/client 1.2.1 → 1.3.0

package/dist/index.d.ts

@@ -45,13 +45,22 @@ type MoveOutPattern = {
     pos: number;
     value: string;
 };
+type SubsetParams = {
+    where?: string;
+    params?: Record<string, string>;
+    limit?: number;
+    offset?: number;
+    orderBy?: string;
+};
 type ControlMessage = {
     headers: (Header & {
         control: `up-to-date` | `must-refetch`;
         global_last_seen_lsn?: string;
     }) | (Header & {
         control: `snapshot-end`;
-    } & PostgresSnapshot);
+    } & PostgresSnapshot) | (Header & {
+        control: `subset-end`;
+    } & SubsetParams);
 };
 type EventMessage = {
     headers: Header & {
@@ -377,13 +386,6 @@ type ExternalParamsRecord<T extends Row<unknown> = Row> = {
 } & Partial<PostgresParams<T>> & {
     [K in ReservedParamKeys]?: never;
 };
-type SubsetParams = {
-    where?: string;
-    params?: Record<string, string>;
-    limit?: number;
-    offset?: number;
-    orderBy?: string;
-};
 type ReservedParamKeys = typeof LIVE_CACHE_BUSTER_QUERY_PARAM | typeof SHAPE_HANDLE_QUERY_PARAM | typeof LIVE_QUERY_PARAM | typeof OFFSET_QUERY_PARAM | `subset__${string}`;
 /**
  * External headers type - what users provide.

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 : ``;
@@ -425,11 +429,9 @@ function isUpToDateMessage(message) {
   return isControlMessage(message) && message.headers.control === `up-to-date`;
 }
 function getOffset(message) {
+  if (message.headers.control != `up-to-date`) return;
   const lsn = message.headers.global_last_seen_lsn;
-  if (!lsn) {
-    return;
-  }
-  return `${lsn}_0`;
+  return lsn ? `${lsn}_0` : void 0;
 }
 function isVisibleInSnapshot(txid, snapshot) {
   const xid = BigInt(txid);
@@ -599,6 +601,7 @@ function createFetchWithChunkBuffer(fetchClient, prefetchOptions = ChunkPrefetch
       return prefetchedRequest;
     }
     prefetchQueue == null ? void 0 : prefetchQueue.abort();
+    prefetchQueue = void 0;
     const response = await fetchClient(...args);
     const nextUrl = getNextChunkUrl(url, response);
     if (nextUrl) {
@@ -671,12 +674,17 @@ var PrefetchQueue = class {
   }
   abort() {
     __privateGet(this, _prefetchQueue).forEach(([_, aborter]) => aborter.abort());
+    __privateGet(this, _prefetchQueue).clear();
   }
   consume(...args) {
-    var _a;
     const url = args[0].toString();
-    const request = (_a = __privateGet(this, _prefetchQueue).get(url)) == null ? void 0 : _a[0];
-    if (!request || url !== __privateGet(this, _queueHeadUrl)) return;
+    const entry = __privateGet(this, _prefetchQueue).get(url);
+    if (!entry || url !== __privateGet(this, _queueHeadUrl)) return;
+    const [request, aborter] = entry;
+    if (aborter.signal.aborted) {
+      __privateGet(this, _prefetchQueue).delete(url);
+      return;
+    }
     __privateGet(this, _prefetchQueue).delete(url);
     request.then((response) => {
       const nextUrl = getNextChunkUrl(url, response);
@@ -1227,7 +1235,8 @@ var ShapeStream = class {
       }
       const { metadata, data } = await this.fetchSnapshot(opts);
       const dataWithEndBoundary = data.concat([
-        { headers: __spreadValues({ control: `snapshot-end` }, metadata) }
+        { headers: __spreadValues({ control: `snapshot-end` }, metadata) },
+        { headers: __spreadValues({ control: `subset-end` }, opts) }
       ]);
       __privateGet(this, _snapshotTracker).addSnapshot(
         metadata,
@@ -1417,7 +1426,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 +1442,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 +1474,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 +1490,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);
     }
@@ -1674,7 +1696,11 @@ pause_fn = function() {
   }
 };
 resume_fn = function() {
+  var _a;
   if (__privateGet(this, _started) && (__privateGet(this, _state) === `paused` || __privateGet(this, _state) === `pause-requested`)) {
+    if ((_a = this.options.signal) == null ? void 0 : _a.aborted) {
+      return;
+    }
     if (__privateGet(this, _state) === `pause-requested`) {
       __privateSet(this, _state, `active`);
     }