@electric-sql/client 1.1.4 → 1.1.5

package/dist/cjs/index.cjs

@@ -256,15 +256,37 @@ var MessageParser = class {
   parse(messages, schema) {
     return JSON.parse(messages, (key, value) => {
       if ((key === `value` || key === `old_value`) && typeof value === `object` && value !== null) {
-        const row = value;
-        Object.keys(row).forEach((key2) => {
-          row[key2] = this.parseRow(key2, row[key2], schema);
-        });
-        if (this.transformer) value = this.transformer(value);
+        return this.transformMessageValue(value, schema);
       }
       return value;
     });
   }
+  /**
+   * Parse an array of ChangeMessages from a snapshot response.
+   * Applies type parsing and transformations to the value and old_value properties.
+   */
+  parseSnapshotData(messages, schema) {
+    return messages.map((message) => {
+      const msg = message;
+      if (msg.value && typeof msg.value === `object` && msg.value !== null) {
+        msg.value = this.transformMessageValue(msg.value, schema);
+      }
+      if (msg.old_value && typeof msg.old_value === `object` && msg.old_value !== null) {
+        msg.old_value = this.transformMessageValue(msg.old_value, schema);
+      }
+      return msg;
+    });
+  }
+  /**
+   * Transform a message value or old_value object by parsing its columns.
+   */
+  transformMessageValue(value, schema) {
+    const row = value;
+    Object.keys(row).forEach((key) => {
+      row[key] = this.parseRow(key, row[key], schema);
+    });
+    return this.transformer ? this.transformer(row) : row;
+  }
   // Parses the message values using the provided parser based on the schema information
   parseRow(key, value, schema) {
     var _b;
@@ -810,7 +832,7 @@ function canonicalShapeKey(url) {
   cleanUrl.searchParams.sort();
   return cleanUrl.toString();
 }
-var _error, _fetchClient2, _sseFetchClient, _messageParser, _subscribers, _started, _state, _lastOffset, _liveCacheBuster, _lastSyncedAt, _isUpToDate, _isMidStream, _connected, _shapeHandle, _mode, _schema, _onError, _requestAbortController, _isRefreshing, _tickPromise, _tickPromiseResolver, _tickPromiseRejecter, _messageChain, _snapshotTracker, _activeSnapshotRequests, _midStreamPromise, _midStreamPromiseResolver, _lastSseConnectionStartTime, _minSseConnectionDuration, _consecutiveShortSseConnections, _maxShortSseConnections, _sseFallbackToLongPolling, _sseBackoffBaseDelay, _sseBackoffMaxDelay, _unsubscribeFromVisibilityChanges, _ShapeStream_instances, start_fn, requestShape_fn, constructUrl_fn, createAbortListener_fn, onInitialResponse_fn, onMessages_fn, fetchShape_fn, requestShapeLongPoll_fn, requestShapeSSE_fn, pause_fn, resume_fn, nextTick_fn, waitForStreamEnd_fn, publish_fn, sendErrorToSubscribers_fn, subscribeToVisibilityChanges_fn, reset_fn, fetchSnapshot_fn;
+var _error, _fetchClient2, _sseFetchClient, _messageParser, _subscribers, _started, _state, _lastOffset, _liveCacheBuster, _lastSyncedAt, _isUpToDate, _isMidStream, _connected, _shapeHandle, _mode, _schema, _onError, _requestAbortController, _isRefreshing, _tickPromise, _tickPromiseResolver, _tickPromiseRejecter, _messageChain, _snapshotTracker, _activeSnapshotRequests, _midStreamPromise, _midStreamPromiseResolver, _lastSseConnectionStartTime, _minSseConnectionDuration, _consecutiveShortSseConnections, _maxShortSseConnections, _sseFallbackToLongPolling, _sseBackoffBaseDelay, _sseBackoffMaxDelay, _unsubscribeFromVisibilityChanges, _ShapeStream_instances, start_fn, requestShape_fn, constructUrl_fn, createAbortListener_fn, onInitialResponse_fn, onMessages_fn, fetchShape_fn, requestShapeLongPoll_fn, requestShapeSSE_fn, pause_fn, resume_fn, nextTick_fn, waitForStreamEnd_fn, publish_fn, sendErrorToSubscribers_fn, subscribeToVisibilityChanges_fn, reset_fn;
 var ShapeStream = class {
   constructor(options) {
     __privateAdd(this, _ShapeStream_instances);
@@ -957,7 +979,7 @@ var ShapeStream = class {
     });
   }
   /**
-   * Request a snapshot for subset of data.
+   * Request a snapshot for subset of data and inject it into the subscribed data stream.
    *
    * Only available when mode is `changes_only`.
    * Returns the insertion point & the data, but more importantly injects the data
@@ -984,8 +1006,7 @@ var ShapeStream = class {
         if (__privateGet(this, _activeSnapshotRequests) === 1) {
           __privateMethod(this, _ShapeStream_instances, pause_fn).call(this);
         }
-        const { fetchUrl, requestHeaders } = yield __privateMethod(this, _ShapeStream_instances, constructUrl_fn).call(this, this.options.url, true, opts);
-        const { metadata, data } = yield __privateMethod(this, _ShapeStream_instances, fetchSnapshot_fn).call(this, fetchUrl, requestHeaders);
+        const { metadata, data } = yield this.fetchSnapshot(opts);
         const dataWithEndBoundary = data.concat([
           { headers: __spreadValues({ control: `snapshot-end` }, metadata) }
         ]);
@@ -1006,6 +1027,44 @@ var ShapeStream = class {
       }
     });
   }
+  /**
+   * Fetch a snapshot for subset of data.
+   * Returns the metadata and the data, but does not inject it into the subscribed data stream.
+   *
+   * @param opts - The options for the snapshot request.
+   * @returns The metadata and the data for the snapshot.
+   */
+  fetchSnapshot(opts) {
+    return __async(this, null, function* () {
+      var _a;
+      const { fetchUrl, requestHeaders } = yield __privateMethod(this, _ShapeStream_instances, constructUrl_fn).call(this, this.options.url, true, opts);
+      const response = yield __privateGet(this, _fetchClient2).call(this, fetchUrl.toString(), {
+        headers: requestHeaders
+      });
+      if (!response.ok) {
+        throw new FetchError(
+          response.status,
+          void 0,
+          void 0,
+          Object.fromEntries([...response.headers.entries()]),
+          fetchUrl.toString()
+        );
+      }
+      const schema = (_a = __privateGet(this, _schema)) != null ? _a : getSchemaFromHeaders(response.headers, {
+        required: true,
+        url: fetchUrl.toString()
+      });
+      const { metadata, data: rawData } = yield response.json();
+      const data = __privateGet(this, _messageParser).parseSnapshotData(
+        rawData,
+        schema
+      );
+      return {
+        metadata,
+        data
+      };
+    });
+  }
 };
 _error = new WeakMap();
 _fetchClient2 = new WeakMap();
@@ -1180,7 +1239,8 @@ constructUrl_fn = function(url, resumingFromPause, subsetParams) {
     }
     fetchUrl.searchParams.set(OFFSET_QUERY_PARAM, __privateGet(this, _lastOffset));
     fetchUrl.searchParams.set(LOG_MODE_QUERY_PARAM, __privateGet(this, _mode));
-    if (__privateGet(this, _isUpToDate)) {
+    const isSnapshotRequest = subsetParams !== void 0;
+    if (__privateGet(this, _isUpToDate) && !isSnapshotRequest) {
       if (!__privateGet(this, _isRefreshing) && !resumingFromPause) {
         fetchUrl.searchParams.set(LIVE_QUERY_PARAM, `true`);
       }
@@ -1237,11 +1297,7 @@ onInitialResponse_fn = function(response) {
     if (liveCacheBuster) {
       __privateSet(this, _liveCacheBuster, liveCacheBuster);
     }
-    const getSchema = () => {
-      const schemaHeader = headers.get(SHAPE_SCHEMA_HEADER);
-      return schemaHeader ? JSON.parse(schemaHeader) : {};
-    };
-    __privateSet(this, _schema, (_a = __privateGet(this, _schema)) != null ? _a : getSchema());
+    __privateSet(this, _schema, (_a = __privateGet(this, _schema)) != null ? _a : getSchemaFromHeaders(headers));
     if (status === 204) {
       __privateSet(this, _lastSyncedAt, Date.now());
     }
@@ -1469,33 +1525,20 @@ reset_fn = function(handle) {
   __privateSet(this, _consecutiveShortSseConnections, 0);
   __privateSet(this, _sseFallbackToLongPolling, false);
 };
-fetchSnapshot_fn = function(url, headers) {
-  return __async(this, null, function* () {
-    const response = yield __privateGet(this, _fetchClient2).call(this, url.toString(), { headers });
-    if (!response.ok) {
-      throw new FetchError(
-        response.status,
-        void 0,
-        void 0,
-        Object.fromEntries([...response.headers.entries()]),
-        url.toString()
-      );
-    }
-    const { metadata, data } = yield response.json();
-    const batch = __privateGet(this, _messageParser).parse(
-      JSON.stringify(data),
-      __privateGet(this, _schema)
-    );
-    return {
-      metadata,
-      data: batch
-    };
-  });
-};
 ShapeStream.Replica = {
   FULL: `full`,
   DEFAULT: `default`
 };
+function getSchemaFromHeaders(headers, options) {
+  const schemaHeader = headers.get(SHAPE_SCHEMA_HEADER);
+  if (!schemaHeader) {
+    if ((options == null ? void 0 : options.required) && (options == null ? void 0 : options.url)) {
+      throw new MissingHeadersError(options.url, [SHAPE_SCHEMA_HEADER]);
+    }
+    return {};
+  }
+  return JSON.parse(schemaHeader);
+}
 function validateParams(params) {
   if (!params) return;
   const reservedParams = Object.keys(params).filter(