@instantdb/core 0.22.97 → 0.22.98-experimental.drewh-ts-target.20762041587.1

package/dist/esm/StorageAPI.js

@@ -1,84 +1,65 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { jsonFetch } from './utils/fetch.js';
-export function uploadFile(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ apiURI, appId, path, file, refreshToken, contentType, contentDisposition, }) {
-        const headers = {
-            app_id: appId,
-            path,
-            authorization: `Bearer ${refreshToken}`,
-            'content-type': contentType || file.type,
-        };
-        if (contentDisposition) {
-            headers['content-disposition'] = contentDisposition;
-        }
-        const data = yield jsonFetch(`${apiURI}/storage/upload`, {
-            method: 'PUT',
-            headers,
-            body: file,
-        });
-        return data;
+export async function uploadFile({ apiURI, appId, path, file, refreshToken, contentType, contentDisposition, }) {
+    const headers = {
+        app_id: appId,
+        path,
+        authorization: `Bearer ${refreshToken}`,
+        'content-type': contentType || file.type,
+    };
+    if (contentDisposition) {
+        headers['content-disposition'] = contentDisposition;
+    }
+    const data = await jsonFetch(`${apiURI}/storage/upload`, {
+        method: 'PUT',
+        headers,
+        body: file,
     });
+    return data;
 }
-export function deleteFile(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ apiURI, appId, path, refreshToken, }) {
-        const { data } = yield jsonFetch(`${apiURI}/storage/files?app_id=${appId}&filename=${encodeURIComponent(path)}`, {
-            method: 'DELETE',
-            headers: {
-                'content-type': 'application/json',
-                authorization: `Bearer ${refreshToken}`,
-            },
-        });
-        return data;
+export async function deleteFile({ apiURI, appId, path, refreshToken, }) {
+    const { data } = await jsonFetch(`${apiURI}/storage/files?app_id=${appId}&filename=${encodeURIComponent(path)}`, {
+        method: 'DELETE',
+        headers: {
+            'content-type': 'application/json',
+            authorization: `Bearer ${refreshToken}`,
+        },
     });
+    return data;
 }
 // Deprecated Storage API (Jan 2025)
 // ---------------------------------
-export function getSignedUploadUrl(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ apiURI, appId, fileName, refreshToken, metadata = {}, }) {
-        const { data } = yield jsonFetch(`${apiURI}/storage/signed-upload-url`, {
-            method: 'POST',
-            headers: {
-                'content-type': 'application/json',
-                authorization: `Bearer ${refreshToken}`,
-            },
-            body: JSON.stringify({
-                app_id: appId,
-                filename: fileName,
-            }),
-        });
-        return data;
+export async function getSignedUploadUrl({ apiURI, appId, fileName, refreshToken, metadata = {}, }) {
+    const { data } = await jsonFetch(`${apiURI}/storage/signed-upload-url`, {
+        method: 'POST',
+        headers: {
+            'content-type': 'application/json',
+            authorization: `Bearer ${refreshToken}`,
+        },
+        body: JSON.stringify({
+            app_id: appId,
+            filename: fileName,
+        }),
     });
+    return data;
 }
-export function upload(presignedUrl, file) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const response = yield fetch(presignedUrl, {
-            method: 'PUT',
-            body: file,
-            headers: {
-                'Content-Type': file.type,
-            },
-        });
-        return response.ok;
+export async function upload(presignedUrl, file) {
+    const response = await fetch(presignedUrl, {
+        method: 'PUT',
+        body: file,
+        headers: {
+            'Content-Type': file.type,
+        },
     });
+    return response.ok;
 }
-export function getDownloadUrl(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ apiURI, appId, path, refreshToken, }) {
-        const { data } = yield jsonFetch(`${apiURI}/storage/signed-download-url?app_id=${appId}&filename=${encodeURIComponent(path)}`, {
-            method: 'GET',
-            headers: {
-                'content-type': 'application/json',
-                authorization: `Bearer ${refreshToken}`,
-            },
-        });
-        return data;
+export async function getDownloadUrl({ apiURI, appId, path, refreshToken, }) {
+    const { data } = await jsonFetch(`${apiURI}/storage/signed-download-url?app_id=${appId}&filename=${encodeURIComponent(path)}`, {
+        method: 'GET',
+        headers: {
+            'content-type': 'application/json',
+            authorization: `Bearer ${refreshToken}`,
+        },
     });
+    return data;
 }
 //# sourceMappingURL=StorageAPI.js.map

package/dist/esm/StorageAPI.js.map

@@ -1 +1 @@
-{"version":3,"file":"StorageAPI.js","sourceRoot":"","sources":["../../src/StorageAPI.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAc7C,MAAM,UAAgB,UAAU;yDAAC,EAC/B,MAAM,EACN,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,WAAW,EACX,kBAAkB,GASnB;QACC,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,KAAK;YACb,IAAI;YACJ,aAAa,EAAE,UAAU,YAAY,EAAE;YACvC,cAAc,EAAE,WAAW,IAAI,IAAI,CAAC,IAAI;SACzC,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO,CAAC,qBAAqB,CAAC,GAAG,kBAAkB,CAAC;QACtD,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,MAAM,iBAAiB,EAAE;YACvD,MAAM,EAAE,KAAK;YACb,OAAO;YACP,IAAI,EAAE,IAAI;SACX,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAED,MAAM,UAAgB,UAAU;yDAAC,EAC/B,MAAM,EACN,KAAK,EACL,IAAI,EACJ,YAAY,GAMb;QACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAC9B,GAAG,MAAM,yBAAyB,KAAK,aAAa,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAC9E;YACE,MAAM,EAAE,QAAQ;YAChB,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,YAAY,EAAE;aACxC;SACF,CACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAED,oCAAoC;AACpC,oCAAoC;AAEpC,MAAM,UAAgB,kBAAkB;yDAAC,EACvC,MAAM,EACN,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,QAAQ,GAAG,EAAE,GAOd;QACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,MAAM,4BAA4B,EAAE;YACtE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,YAAY,EAAE;aACxC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,MAAM,EAAE,KAAK;gBACb,QAAQ,EAAE,QAAQ;aACnB,CAAC;SACH,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAED,MAAM,UAAgB,MAAM,CAAC,YAAY,EAAE,IAAI;;QAC7C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;YACzC,MAAM,EAAE,KAAK;YACb,IAAI,EAAE,IAAI;YACV,OAAO,EAAE;gBACP,cAAc,EAAE,IAAI,CAAC,IAAI;aAC1B;SACF,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,EAAE,CAAC;IACrB,CAAC;CAAA;AAED,MAAM,UAAgB,cAAc;yDAAC,EACnC,MAAM,EACN,KAAK,EACL,IAAI,EACJ,YAAY,GAMb;QACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAC9B,GAAG,MAAM,uCAAuC,KAAK,aAAa,kBAAkB,CAClF,IAAI,CACL,EAAE,EACH;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,aAAa,EAAE,UAAU,YAAY,EAAE;aACxC;SACF,CACF,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;CAAA","sourcesContent":["import { jsonFetch } from './utils/fetch.js';\n\nexport type UploadFileResponse = {\n  data: {\n    id: string;\n  };\n};\n\nexport type DeleteFileResponse = {\n  data: {\n    id: string | null;\n  };\n};\n\nexport async function uploadFile({\n  apiURI,\n  appId,\n  path,\n  file,\n  refreshToken,\n  contentType,\n  contentDisposition,\n}: {\n  apiURI: string;\n  appId: string;\n  path: string;\n  file: File | Blob;\n  refreshToken?: string;\n  contentType?: string;\n  contentDisposition?: string;\n}): Promise<UploadFileResponse> {\n  const headers = {\n    app_id: appId,\n    path,\n    authorization: `Bearer ${refreshToken}`,\n    'content-type': contentType || file.type,\n  };\n  if (contentDisposition) {\n    headers['content-disposition'] = contentDisposition;\n  }\n\n  const data = await jsonFetch(`${apiURI}/storage/upload`, {\n    method: 'PUT',\n    headers,\n    body: file,\n  });\n\n  return data;\n}\n\nexport async function deleteFile({\n  apiURI,\n  appId,\n  path,\n  refreshToken,\n}: {\n  apiURI: string;\n  appId: string;\n  path: string;\n  refreshToken?: string;\n}): Promise<DeleteFileResponse> {\n  const { data } = await jsonFetch(\n    `${apiURI}/storage/files?app_id=${appId}&filename=${encodeURIComponent(path)}`,\n    {\n      method: 'DELETE',\n      headers: {\n        'content-type': 'application/json',\n        authorization: `Bearer ${refreshToken}`,\n      },\n    },\n  );\n\n  return data;\n}\n\n// Deprecated Storage API (Jan 2025)\n// ---------------------------------\n\nexport async function getSignedUploadUrl({\n  apiURI,\n  appId,\n  fileName,\n  refreshToken,\n  metadata = {},\n}: {\n  apiURI: string;\n  appId: string;\n  fileName: string;\n  refreshToken?: string;\n  metadata?: Record<string, any>;\n}) {\n  const { data } = await jsonFetch(`${apiURI}/storage/signed-upload-url`, {\n    method: 'POST',\n    headers: {\n      'content-type': 'application/json',\n      authorization: `Bearer ${refreshToken}`,\n    },\n    body: JSON.stringify({\n      app_id: appId,\n      filename: fileName,\n    }),\n  });\n\n  return data;\n}\n\nexport async function upload(presignedUrl, file) {\n  const response = await fetch(presignedUrl, {\n    method: 'PUT',\n    body: file,\n    headers: {\n      'Content-Type': file.type,\n    },\n  });\n\n  return response.ok;\n}\n\nexport async function getDownloadUrl({\n  apiURI,\n  appId,\n  path,\n  refreshToken,\n}: {\n  apiURI: string;\n  appId: string;\n  path: string;\n  refreshToken?: string;\n}) {\n  const { data } = await jsonFetch(\n    `${apiURI}/storage/signed-download-url?app_id=${appId}&filename=${encodeURIComponent(\n      path,\n    )}`,\n    {\n      method: 'GET',\n      headers: {\n        'content-type': 'application/json',\n        authorization: `Bearer ${refreshToken}`,\n      },\n    },\n  );\n\n  return data;\n}\n"]}
+{"version":3,"file":"StorageAPI.js","sourceRoot":"","sources":["../../src/StorageAPI.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAc7C,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAC/B,MAAM,EACN,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,YAAY,EACZ,WAAW,EACX,kBAAkB,GASnB;IACC,MAAM,OAAO,GAAG;QACd,MAAM,EAAE,KAAK;QACb,IAAI;QACJ,aAAa,EAAE,UAAU,YAAY,EAAE;QACvC,cAAc,EAAE,WAAW,IAAI,IAAI,CAAC,IAAI;KACzC,CAAC;IACF,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,CAAC,qBAAqB,CAAC,GAAG,kBAAkB,CAAC;IACtD,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,GAAG,MAAM,iBAAiB,EAAE;QACvD,MAAM,EAAE,KAAK;QACb,OAAO;QACP,IAAI,EAAE,IAAI;KACX,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,EAC/B,MAAM,EACN,KAAK,EACL,IAAI,EACJ,YAAY,GAMb;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAC9B,GAAG,MAAM,yBAAyB,KAAK,aAAa,kBAAkB,CAAC,IAAI,CAAC,EAAE,EAC9E;QACE,MAAM,EAAE,QAAQ;QAChB,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,UAAU,YAAY,EAAE;SACxC;KACF,CACF,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oCAAoC;AACpC,oCAAoC;AAEpC,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,EACvC,MAAM,EACN,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,QAAQ,GAAG,EAAE,GAOd;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAAC,GAAG,MAAM,4BAA4B,EAAE;QACtE,MAAM,EAAE,MAAM;QACd,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,UAAU,YAAY,EAAE;SACxC;QACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,MAAM,EAAE,KAAK;YACb,QAAQ,EAAE,QAAQ;SACnB,CAAC;KACH,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,YAAY,EAAE,IAAI;IAC7C,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,EAAE;QACzC,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,IAAI;QACV,OAAO,EAAE;YACP,cAAc,EAAE,IAAI,CAAC,IAAI;SAC1B;KACF,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,EAAE,CAAC;AACrB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACnC,MAAM,EACN,KAAK,EACL,IAAI,EACJ,YAAY,GAMb;IACC,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,SAAS,CAC9B,GAAG,MAAM,uCAAuC,KAAK,aAAa,kBAAkB,CAClF,IAAI,CACL,EAAE,EACH;QACE,MAAM,EAAE,KAAK;QACb,OAAO,EAAE;YACP,cAAc,EAAE,kBAAkB;YAClC,aAAa,EAAE,UAAU,YAAY,EAAE;SACxC;KACF,CACF,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import { jsonFetch } from './utils/fetch.js';\n\nexport type UploadFileResponse = {\n  data: {\n    id: string;\n  };\n};\n\nexport type DeleteFileResponse = {\n  data: {\n    id: string | null;\n  };\n};\n\nexport async function uploadFile({\n  apiURI,\n  appId,\n  path,\n  file,\n  refreshToken,\n  contentType,\n  contentDisposition,\n}: {\n  apiURI: string;\n  appId: string;\n  path: string;\n  file: File | Blob;\n  refreshToken?: string;\n  contentType?: string;\n  contentDisposition?: string;\n}): Promise<UploadFileResponse> {\n  const headers = {\n    app_id: appId,\n    path,\n    authorization: `Bearer ${refreshToken}`,\n    'content-type': contentType || file.type,\n  };\n  if (contentDisposition) {\n    headers['content-disposition'] = contentDisposition;\n  }\n\n  const data = await jsonFetch(`${apiURI}/storage/upload`, {\n    method: 'PUT',\n    headers,\n    body: file,\n  });\n\n  return data;\n}\n\nexport async function deleteFile({\n  apiURI,\n  appId,\n  path,\n  refreshToken,\n}: {\n  apiURI: string;\n  appId: string;\n  path: string;\n  refreshToken?: string;\n}): Promise<DeleteFileResponse> {\n  const { data } = await jsonFetch(\n    `${apiURI}/storage/files?app_id=${appId}&filename=${encodeURIComponent(path)}`,\n    {\n      method: 'DELETE',\n      headers: {\n        'content-type': 'application/json',\n        authorization: `Bearer ${refreshToken}`,\n      },\n    },\n  );\n\n  return data;\n}\n\n// Deprecated Storage API (Jan 2025)\n// ---------------------------------\n\nexport async function getSignedUploadUrl({\n  apiURI,\n  appId,\n  fileName,\n  refreshToken,\n  metadata = {},\n}: {\n  apiURI: string;\n  appId: string;\n  fileName: string;\n  refreshToken?: string;\n  metadata?: Record<string, any>;\n}) {\n  const { data } = await jsonFetch(`${apiURI}/storage/signed-upload-url`, {\n    method: 'POST',\n    headers: {\n      'content-type': 'application/json',\n      authorization: `Bearer ${refreshToken}`,\n    },\n    body: JSON.stringify({\n      app_id: appId,\n      filename: fileName,\n    }),\n  });\n\n  return data;\n}\n\nexport async function upload(presignedUrl, file) {\n  const response = await fetch(presignedUrl, {\n    method: 'PUT',\n    body: file,\n    headers: {\n      'Content-Type': file.type,\n    },\n  });\n\n  return response.ok;\n}\n\nexport async function getDownloadUrl({\n  apiURI,\n  appId,\n  path,\n  refreshToken,\n}: {\n  apiURI: string;\n  appId: string;\n  path: string;\n  refreshToken?: string;\n}) {\n  const { data } = await jsonFetch(\n    `${apiURI}/storage/signed-download-url?app_id=${appId}&filename=${encodeURIComponent(\n      path,\n    )}`,\n    {\n      method: 'GET',\n      headers: {\n        'content-type': 'application/json',\n        authorization: `Bearer ${refreshToken}`,\n      },\n    },\n  );\n\n  return data;\n}\n"]}

package/dist/esm/SyncTable.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { PersistedObject } from "./utils/PersistedObject.js";
 import * as s from "./store.js";
 import weakHash from "./utils/weakHash.js";
@@ -28,23 +19,24 @@ function syncSubFromStorage(sub, useDateObjects) {
     return sub;
 }
 function syncSubToStorage(_k, sub) {
-    var _a;
     if (sub.values) {
         const entities = [];
-        for (const e of (_a = sub.values) === null || _a === void 0 ? void 0 : _a.entities) {
+        for (const e of sub.values?.entities) {
             const store = s.toJSON(e.store);
-            entities.push(Object.assign(Object.assign({}, e), { store }));
+            entities.push({ ...e, store });
         }
-        return Object.assign(Object.assign({}, sub), { values: { attrsStore: sub.values.attrsStore.toJSON(), entities } });
+        return {
+            ...sub,
+            values: { attrsStore: sub.values.attrsStore.toJSON(), entities },
+        };
     }
     else {
         return sub;
     }
 }
 function onMergeSub(_key, storageSub, inMemorySub) {
-    var _a, _b;
-    const storageTxId = (_a = storageSub === null || storageSub === void 0 ? void 0 : storageSub.state) === null || _a === void 0 ? void 0 : _a.txId;
-    const memoryTxId = (_b = inMemorySub === null || inMemorySub === void 0 ? void 0 : inMemorySub.state) === null || _b === void 0 ? void 0 : _b.txId;
+    const storageTxId = storageSub?.state?.txId;
+    const memoryTxId = inMemorySub?.state?.txId;
     if (storageTxId && (!memoryTxId || storageTxId > memoryTxId)) {
         return storageSub;
     }
@@ -58,8 +50,7 @@ function queryEntity(sub, store, attrsStore) {
     return res.data[sub.table][0];
 }
 function getServerCreatedAt(sub, store, attrsStore, entityId) {
-    var _a;
-    const aid = (_a = s.getAttrByFwdIdentName(attrsStore, sub.table, 'id')) === null || _a === void 0 ? void 0 : _a.id;
+    const aid = s.getAttrByFwdIdentName(attrsStore, sub.table, 'id')?.id;
     if (!aid) {
         return -1;
     }
@@ -82,18 +73,17 @@ function applyChangesToStore(store, attrsStore, changes) {
     }
 }
 function changedFieldsOfChanges(store, attrsStore, changes) {
-    var _a, _b, _c, _d;
     // This will be more complicated when we include links, we can either add a
     // changedLinks field or we can have something like 'bookshelves.title`
     const changedFields = {};
     for (const { action, triple } of changes) {
         const [e, a, v] = triple;
-        const field = (_b = (_a = attrsStore.getAttr(a)) === null || _a === void 0 ? void 0 : _a['forward-identity']) === null || _b === void 0 ? void 0 : _b[2];
+        const field = attrsStore.getAttr(a)?.['forward-identity']?.[2];
         if (!field)
             continue;
-        const fields = (_c = changedFields[e]) !== null && _c !== void 0 ? _c : {};
+        const fields = changedFields[e] ?? {};
         changedFields[e] = fields;
-        const oldNew = (_d = fields[field]) !== null && _d !== void 0 ? _d : {};
+        const oldNew = fields[field] ?? {};
         switch (action) {
             case 'added':
                 oldNew.newValue = v;
@@ -123,13 +113,12 @@ function subData(sub, entities) {
 // and returns the type. We have to wait until the attrs
 // are loaded before we can determine the type.
 function orderFieldTypeMutative(sub, getAttrs) {
-    var _a;
     if (sub.orderFieldType) {
         return sub.orderFieldType;
     }
     const orderFieldType = sub.orderField === 'serverCreatedAt'
         ? 'number'
-        : (_a = s.getAttrByFwdIdentName(getAttrs(), sub.table, sub.orderField)) === null || _a === void 0 ? void 0 : _a['checked-data-type'];
+        : s.getAttrByFwdIdentName(getAttrs(), sub.table, sub.orderField)?.['checked-data-type'];
     sub.orderFieldType = orderFieldType;
     return orderFieldType;
 }
@@ -163,10 +152,16 @@ export var CallbackEventType;
     CallbackEventType["Error"] = "Error";
 })(CallbackEventType || (CallbackEventType = {}));
 export class SyncTable {
+    trySend;
+    subs;
+    // Using any for the SyncCallback because we'd need Reactor to be typed
+    callbacks = {};
+    config;
+    idToHash = {};
+    log;
+    createStore;
+    getAttrs;
     constructor(trySend, storage, config, log, createStore, getAttrs) {
-        // Using any for the SyncCallback because we'd need Reactor to be typed
-        this.callbacks = {};
-        this.idToHash = {};
         this.trySend = trySend;
         this.config = config;
         this.log = log;
@@ -177,13 +172,13 @@ export class SyncTable {
             merge: onMergeSub,
             serialize: syncSubToStorage,
             parse: (_key, x) => syncSubFromStorage(x, this.config.useDateObjects),
-            objectSize: (sub) => { var _a; return ((_a = sub.values) === null || _a === void 0 ? void 0 : _a.entities.length) || 0; },
+            objectSize: (sub) => sub.values?.entities.length || 0,
             logger: log,
             gc: {
                 maxAgeMs: 1000 * 60 * 60 * 24 * 7 * 52, // 1 year
                 maxEntries: 1000,
                 // Size of each sub is the number of entity
-                maxSize: 1000000, // 1 million entities
+                maxSize: 1_000_000, // 1 million entities
             },
         });
     }
@@ -196,7 +191,7 @@ export class SyncTable {
         this.callbacks[hash].push(cb);
         this.initSubscription(q, hash, cb);
         return (opts) => {
-            this.unsubscribe(hash, cb, opts === null || opts === void 0 ? void 0 : opts.keepSubscription);
+            this.unsubscribe(hash, cb, opts?.keepSubscription);
         };
     }
     unsubscribe(hash, cb, keepSubscription) {
@@ -205,7 +200,7 @@ export class SyncTable {
         if (!cbs.length) {
             delete this.callbacks[hash];
             const sub = this.subs.currentValue[hash];
-            if (sub === null || sub === void 0 ? void 0 : sub.state) {
+            if (sub?.state) {
                 this.clearSubscriptionData(sub.state.subscriptionId, !!keepSubscription);
             }
             if (!keepSubscription) {
@@ -238,52 +233,47 @@ export class SyncTable {
             'keep-subscription': keepSubscription,
         });
     }
-    initSubscription(query, hash, cb) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
-            // Wait for storage to load so that we know if we already have an existing subscription
-            yield this.subs.waitForKeyToLoad(hash);
-            const existingSub = this.subs.currentValue[hash];
-            if (existingSub && existingSub.state && existingSub.state.txId) {
-                this.sendResync(existingSub, existingSub.state, existingSub.state.txId);
-                if (((_a = existingSub.values) === null || _a === void 0 ? void 0 : _a.entities) && cb) {
-                    cb({
-                        type: CallbackEventType.LoadFromStorage,
-                        data: subData(existingSub, (_b = existingSub.values) === null || _b === void 0 ? void 0 : _b.entities),
-                    });
-                }
-                return;
+    async initSubscription(query, hash, cb) {
+        // Wait for storage to load so that we know if we already have an existing subscription
+        await this.subs.waitForKeyToLoad(hash);
+        const existingSub = this.subs.currentValue[hash];
+        if (existingSub && existingSub.state && existingSub.state.txId) {
+            this.sendResync(existingSub, existingSub.state, existingSub.state.txId);
+            if (existingSub.values?.entities && cb) {
+                cb({
+                    type: CallbackEventType.LoadFromStorage,
+                    data: subData(existingSub, existingSub.values?.entities),
+                });
             }
-            const table = Object.keys(query)[0];
-            const orderBy = ((_d = (_c = query[table]) === null || _c === void 0 ? void 0 : _c.$) === null || _d === void 0 ? void 0 : _d.order) || { serverCreatedAt: 'asc' };
-            const [orderField, orderDirection] = Object.entries(orderBy)[0];
-            this.subs.updateInPlace((prev) => {
-                prev[hash] = {
-                    query,
-                    hash: hash,
-                    table,
-                    orderDirection,
-                    orderField,
-                    createdAt: Date.now(),
-                    updatedAt: Date.now(),
-                };
-            });
-            this.sendStart(query);
+            return;
+        }
+        const table = Object.keys(query)[0];
+        const orderBy = query[table]?.$?.order || { serverCreatedAt: 'asc' };
+        const [orderField, orderDirection] = Object.entries(orderBy)[0];
+        this.subs.updateInPlace((prev) => {
+            prev[hash] = {
+                query,
+                hash: hash,
+                table,
+                orderDirection,
+                orderField,
+                createdAt: Date.now(),
+                updatedAt: Date.now(),
+            };
         });
+        this.sendStart(query);
     }
-    flushPending() {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const hash of Object.keys(this.callbacks)) {
-                yield this.subs.waitForKeyToLoad(hash);
-                const sub = this.subs.currentValue[hash];
-                if (sub) {
-                    yield this.initSubscription(sub.query, sub.hash);
-                }
-                else {
-                    this.log.error('Missing sub for hash in flushPending', hash);
-                }
+    async flushPending() {
+        for (const hash of Object.keys(this.callbacks)) {
+            await this.subs.waitForKeyToLoad(hash);
+            const sub = this.subs.currentValue[hash];
+            if (sub) {
+                await this.initSubscription(sub.query, sub.hash);
             }
-        });
+            else {
+                this.log.error('Missing sub for hash in flushPending', hash);
+            }
+        }
     }
     onStartSyncOk(msg) {
         const subscriptionId = msg['subscription-id'];
@@ -308,7 +298,6 @@ export class SyncTable {
         }
     }
     onSyncLoadBatch(msg) {
-        var _a;
         const subscriptionId = msg['subscription-id'];
         const joinRows = msg['join-rows'];
         const hash = this.idToHash[subscriptionId];
@@ -322,7 +311,7 @@ export class SyncTable {
             this.log.error('Missing sub for hash', hash, msg);
             return;
         }
-        const values = (_a = sub.values) !== null && _a !== void 0 ? _a : {
+        const values = sub.values ?? {
             entities: [],
             attrsStore: this.getAttrs(),
         };
@@ -353,7 +342,6 @@ export class SyncTable {
         }
     }
     onSyncInitFinish(msg) {
-        var _a;
         const subscriptionId = msg['subscription-id'];
         const hash = this.idToHash[subscriptionId];
         if (!hash) {
@@ -378,12 +366,11 @@ export class SyncTable {
         if (sub) {
             this.notifyCbs(hash, {
                 type: CallbackEventType.InitialSyncComplete,
-                data: subData(sub, ((_a = sub.values) === null || _a === void 0 ? void 0 : _a.entities) || []),
+                data: subData(sub, sub.values?.entities || []),
             });
         }
     }
     onSyncUpdateTriples(msg) {
-        var _a, _b, _c;
         const subscriptionId = msg['subscription-id'];
         const hash = this.idToHash[subscriptionId];
         if (!hash) {
@@ -409,11 +396,11 @@ export class SyncTable {
             // Note: this won't work as well when links are involved
             const byEid = {};
             for (const change of tx.changes) {
-                const eidChanges = (_a = byEid[change.triple[0]]) !== null && _a !== void 0 ? _a : [];
+                const eidChanges = byEid[change.triple[0]] ?? [];
                 byEid[change.triple[0]] = eidChanges;
                 eidChanges.push(change);
             }
-            const values = (_b = sub.values) !== null && _b !== void 0 ? _b : {
+            const values = sub.values ?? {
                 entities: [],
                 attrsStore: this.getAttrs(),
             };
@@ -474,7 +461,7 @@ export class SyncTable {
             sortEntitiesInPlace(sub, orderFieldType, entities);
             this.notifyCbs(hash, {
                 type: CallbackEventType.SyncTransaction,
-                data: subData(sub, (_c = sub.values) === null || _c === void 0 ? void 0 : _c.entities),
+                data: subData(sub, sub.values?.entities),
                 added,
                 removed,
                 updated,