@bounded-sh/core 0.0.4 → 0.0.5

package/dist/index.mjs

@@ -4257,6 +4257,87 @@ const pendingRequests = {};
 const GET_CACHE_TTL = 500; // Adjust this value as needed (in milliseconds)
 // Last time we cleaned up the cache
 let lastCacheCleanup = Date.now();
+/**
+ * Return the leaf document key (last path segment) for a document path.
+ *
+ * Bounded rows carry `_id` (and `pathId`) set to the FULL document path
+ * (e.g. `"rooms/r1/prompts/8rd49se3sg"`). Apps that build a child path from a
+ * row naturally want the bare doc key, not the whole path — using the full path
+ * doubles it (`rooms/r1/prompts/rooms/r1/prompts/8rd.../votes/...`) → 403/404.
+ * `docId` extracts that leaf key. Tolerates leading slashes and a trailing `*`.
+ *
+ * @example docId("rooms/r1/prompts/8rd49se3sg") // "8rd49se3sg"
+ */
+function docId(path) {
+    if (typeof path !== 'string')
+        return '';
+    let p = path.startsWith('/') ? path.slice(1) : path;
+    if (p.endsWith('*') && p.length > 1)
+        p = p.slice(0, -1);
+    if (p.endsWith('/'))
+        p = p.slice(0, -1);
+    const segments = p.split('/').filter(Boolean);
+    return segments.length ? segments[segments.length - 1] : '';
+}
+/**
+ * Additively attach a convenience bare `id` (the leaf doc key) to a returned row.
+ *
+ * Rows already carry `_id`/`pathId` = the full document path; this leaves those
+ * untouched and adds `id` = the last path segment so `row.id` is the doc key apps
+ * expect. No-ops for non-objects, arrays, and rows that already define `id`
+ * (never clobber a user field named `id`). Source for the leaf is `_id` (falling
+ * back to `pathId`/`relativePath`/`absolutePath`).
+ */
+function withBareId(row) {
+    var _a, _b, _c;
+    if (!row || typeof row !== 'object' || Array.isArray(row))
+        return row;
+    const r = row;
+    if ('id' in r)
+        return row; // don't clobber an explicit user field
+    const source = (_c = (_b = (_a = r._id) !== null && _a !== void 0 ? _a : r.pathId) !== null && _b !== void 0 ? _b : r.relativePath) !== null && _c !== void 0 ? _c : r.absolutePath;
+    if (typeof source !== 'string' || source.length === 0)
+        return row;
+    const leaf = docId(source);
+    if (!leaf)
+        return row;
+    return Object.assign(Object.assign({}, r), { id: leaf });
+}
+/**
+ * Normalize a raw read response from the worker into the SDK's stable shape and
+ * attach the bare `id` to every returned row (Bug 1 + Bug 2).
+ *
+ * - Single-document path: returns EXACTLY ONE shape — the resolved document, or
+ *   `null` if missing (Firebase/Mongo convention). Unwraps the ambiguous
+ *   `{ data, status }` envelope the worker sometimes emits for a single doc so a
+ *   single-doc `get` never sometimes-returns the doc and sometimes the envelope.
+ * - Collection path: preserves the `{ data, nextCursor, ... }` envelope and maps
+ *   the bare `id` onto each row in `data`.
+ */
+function normalizeReadResult(responseData, pathIsDocument) {
+    if (pathIsDocument) {
+        let doc = responseData;
+        // Unwrap the single-doc envelope `{ data, status }` (Bug 2). A real document
+        // never has the exact shape `{ data, status }` with nothing else meaningful,
+        // so detect the envelope by `data` being present alongside a numeric `status`.
+        if (doc && typeof doc === 'object' && !Array.isArray(doc) &&
+            'data' in doc && 'status' in doc && typeof doc.status === 'number') {
+            doc = doc.data;
+        }
+        if (doc === undefined || doc === null)
+            return null;
+        return withBareId(doc);
+    }
+    // Collection read. The worker body is `{ data: rows[], nextCursor?, status? }`.
+    if (responseData && typeof responseData === 'object' && !Array.isArray(responseData) && Array.isArray(responseData.data)) {
+        return Object.assign(Object.assign({}, responseData), { data: responseData.data.map((row) => withBareId(row)) });
+    }
+    // Some paths return a bare array of rows — map id onto each.
+    if (Array.isArray(responseData)) {
+        return responseData.map((row) => withBareId(row));
+    }
+    return responseData;
+}
 function hashForKey$1(value) {
     let h = 5381;
     for (let i = 0; i < value.length; i++) {
@@ -4681,7 +4762,7 @@ async function get(path, opts = {}) {
                         if (hasActiveConnection()) {
                             if (pathIsDocument) {
                                 const wsResult = await wsGet(normalizedPath);
-                                const responseData = wsResult;
+                                const responseData = normalizeReadResult(wsResult, true);
                                 if (!opts.bypassCache) {
                                     getCache[cacheKey] = { data: responseData, expiresAt: now + GET_CACHE_TTL };
                                 }
@@ -4693,7 +4774,7 @@ async function get(path, opts = {}) {
                                     sort: undefined,
                                     includeSubPaths: opts.includeSubPaths,
                                 });
-                                const responseData = wsResult;
+                                const responseData = normalizeReadResult(wsResult, false);
                                 if (!opts.bypassCache) {
                                     getCache[cacheKey] = { data: responseData, expiresAt: now + GET_CACHE_TTL };
                                 }
@@ -4724,7 +4805,11 @@ async function get(path, opts = {}) {
                     const apiPath = `items?path=${path}${promptQueryParam}${filterParam}${sortParam}${includeSubPathsParam}${shapeParam}${limitParam}${cursorParam}`;
                     response = await makeApiRequest('GET', apiPath, null, opts._overrides);
                 }
-                const responseData = response.data;
+                // Normalize the worker's raw body into the SDK's stable shape:
+                //   - single-doc path → the resolved document or null (Bug 2), and
+                //   - collection path → `{ data, nextCursor }` preserved,
+                // with the bare `id` (leaf doc key) attached to every returned row (Bug 1).
+                const responseData = normalizeReadResult(response.data, pathIsDocument);
                 // Cache the response (unless bypassing cache)
                 if (!opts.bypassCache) {
                     getCache[cacheKey] = {
@@ -4822,11 +4907,16 @@ async function getMany(paths, opts = {}) {
                 const normalizedPath = uncachedPaths[i];
                 const serverResult = serverResultsMap.get(normalizedPath);
                 if (serverResult) {
-                    results[originalIndex] = serverResult;
-                    if (!serverResult.error && !opts.bypassCache) {
+                    // getMany batches single-doc paths — attach the bare `id` (leaf doc
+                    // key) to each returned doc, additive (Bug 1), matching get().
+                    const normalizedResult = serverResult.error
+                        ? serverResult
+                        : Object.assign(Object.assign({}, serverResult), { data: withBareId(serverResult.data) });
+                    results[originalIndex] = normalizedResult;
+                    if (!normalizedResult.error && !opts.bypassCache) {
                         const cacheKey = `${principalKey}|${normalizedPath}:`;
                         getCache[cacheKey] = {
-                            data: serverResult.data,
+                            data: normalizedResult.data,
                             expiresAt: now + GET_CACHE_TTL
                         };
                     }
@@ -5371,6 +5461,7 @@ var operations = /*#__PURE__*/Object.freeze({
     aggregate: aggregate,
     clearReadCacheForAuthChange: clearReadCacheForAuthChange,
     count: count,
+    docId: docId,
     get: get,
     getFiles: getFiles,
     getMany: getMany,
@@ -5958,14 +6049,46 @@ function handleServerMessage(connection, message) {
         }
     }
 }
+/**
+ * Additively attach the bare `id` (leaf doc key) to a subscription row (Bug 1).
+ * Rows carry `_id`/`pathId` = the full document path; this leaves those as-is and
+ * adds `id` = the last path segment so `row.id` is the doc key apps expect. No-ops
+ * for non-objects and rows that already define `id`.
+ */
+function withSubscriptionId(row) {
+    var _a, _b, _c;
+    if (!row || typeof row !== 'object' || Array.isArray(row))
+        return row;
+    if ('id' in row)
+        return row;
+    const source = (_c = (_b = (_a = row._id) !== null && _a !== void 0 ? _a : row.pathId) !== null && _b !== void 0 ? _b : row.relativePath) !== null && _c !== void 0 ? _c : row.absolutePath;
+    if (typeof source !== 'string' || source.length === 0)
+        return row;
+    const leaf = docId(source);
+    if (!leaf)
+        return row;
+    return Object.assign(Object.assign({}, row), { id: leaf });
+}
+/**
+ * The `onData` payload follows the path: a collection delivers a bare array of
+ * rows, a single-doc path delivers the document (or null). Attach the bare `id`
+ * to each returned row in either case, additive (Bug 1).
+ */
+function addIdsToSubscriptionData(data) {
+    if (Array.isArray(data))
+        return data.map(withSubscriptionId);
+    return withSubscriptionId(data);
+}
 function notifyCallbacks(subscription, data) {
     var _a;
+    // Attach the bare `id` (leaf doc key) to every delivered row (Bug 1).
+    const decorated = addIdsToSubscriptionData(data);
     // Snapshot the callbacks array so that unsubscriptions during
     // notification don't cause callbacks to be skipped.
     const callbacks = subscription.callbacks.slice();
     for (const callback of callbacks) {
         try {
-            (_a = callback.onData) === null || _a === void 0 ? void 0 : _a.call(callback, data);
+            (_a = callback.onData) === null || _a === void 0 ? void 0 : _a.call(callback, decorated);
         }
         catch (error) {
             console.error('[WS v2] Error in subscription callback:', error);
@@ -6056,7 +6179,7 @@ async function subscribeV2(path, subscriptionOptions, roomRoutePath) {
     if (cachedEntry && Date.now() - cachedEntry.timestamp < CACHE_TTL && subscriptionOptions.onData) {
         setTimeout(() => {
             var _a;
-            (_a = subscriptionOptions.onData) === null || _a === void 0 ? void 0 : _a.call(subscriptionOptions, cachedEntry.data);
+            (_a = subscriptionOptions.onData) === null || _a === void 0 ? void 0 : _a.call(subscriptionOptions, addIdsToSubscriptionData(cachedEntry.data));
         }, 0);
     }
     // Get or create connection for this routing target (room-scoped when a
@@ -6086,7 +6209,7 @@ async function subscribeV2(path, subscriptionOptions, roomRoutePath) {
         if (existingSubscription.lastData !== undefined && subscriptionOptions.onData) {
             setTimeout(() => {
                 var _a;
-                (_a = subscriptionOptions.onData) === null || _a === void 0 ? void 0 : _a.call(subscriptionOptions, existingSubscription.lastData);
+                (_a = subscriptionOptions.onData) === null || _a === void 0 ? void 0 : _a.call(subscriptionOptions, addIdsToSubscriptionData(existingSubscription.lastData));
             }, 0);
         }
         return async () => {
@@ -7845,5 +7968,5 @@ function defineLiveModule(mod) {
     return mod;
 }
 
-export { EFFECT_INTENT_ADDRESS, FunctionInvokeError, InsufficientBalanceError, LiveIntentError, ReactNativeSessionManager, RealtimeStore, ServerSessionManager, WebSessionManager, aggregate, buildSetDocumentsTransaction, clearCache, closeAllSubscriptions, convertRemainingAccounts, count, createSessionWithSignature, defineLiveModule, deriveUserIdentityFromIdToken, functions, genAuthNonce, genSolanaMessage, get, getActiveSessionManager, getCachedData, getConfig, getFiles, getIdToken, getMany, getRealtimeStore, getWebhookKeysUrl, hasActiveConnection, increment, init, invoke as invokeFunction, isEffectResult, live, intent as liveIntent, status as liveStatus, now, queryAggregate, reconnectWithNewAuth, refreshSession, resetRealtimeStore, revokeSession, runExpression, runExpressionMany, runQuery, runQueryMany, search, serverTimestamp, set, setFile, setMany, signAndSubmitTransaction, signMessage, signSessionCreateMessage, signTransaction, subscribe, subscribeView as subscribeLiveView, toMillis, toSeconds, withEffects, wsDelete, wsGet, wsGetMany, wsQuery, wsSet };
+export { EFFECT_INTENT_ADDRESS, FunctionInvokeError, InsufficientBalanceError, LiveIntentError, ReactNativeSessionManager, RealtimeStore, ServerSessionManager, WebSessionManager, aggregate, buildSetDocumentsTransaction, clearCache, closeAllSubscriptions, convertRemainingAccounts, count, createSessionWithSignature, defineLiveModule, deriveUserIdentityFromIdToken, docId, functions, genAuthNonce, genSolanaMessage, get, getActiveSessionManager, getCachedData, getConfig, getFiles, getIdToken, getMany, getRealtimeStore, getWebhookKeysUrl, hasActiveConnection, increment, init, invoke as invokeFunction, isEffectResult, live, intent as liveIntent, status as liveStatus, now, queryAggregate, reconnectWithNewAuth, refreshSession, resetRealtimeStore, revokeSession, runExpression, runExpressionMany, runQuery, runQueryMany, search, serverTimestamp, set, setFile, setMany, signAndSubmitTransaction, signMessage, signSessionCreateMessage, signTransaction, subscribe, subscribeView as subscribeLiveView, toMillis, toSeconds, withEffects, wsDelete, wsGet, wsGetMany, wsQuery, wsSet };
 //# sourceMappingURL=index.mjs.map