@blinkk/root-cms 2.0.1 → 2.0.3

package/dist/app.js

@@ -7,7 +7,7 @@ import { render as renderToString } from "preact-render-to-string";
 // package.json
 var package_default = {
   name: "@blinkk/root-cms",
-  version: "2.0.1",
+  version: "2.0.3",
   author: "s@blinkk.com",
   license: "MIT",
   engines: {
@@ -103,6 +103,15 @@ var package_default = {
     "@firebase/app-compat": "0.2.19",
     "@firebase/app-types": "0.9.0",
     "@firebase/rules-unit-testing": "3.0.1",
+    "@lexical/code": "0.33.1",
+    "@lexical/html": "0.33.1",
+    "@lexical/link": "0.33.1",
+    "@lexical/list": "0.33.1",
+    "@lexical/markdown": "0.33.1",
+    "@lexical/react": "0.33.1",
+    "@lexical/rich-text": "0.33.1",
+    "@lexical/selection": "0.33.1",
+    "@lexical/utils": "0.33.1",
     "@mantine/core": "4.2.12",
     "@mantine/hooks": "4.2.12",
     "@mantine/modals": "4.2.12",
@@ -126,6 +135,7 @@ var package_default = {
     "firebase-tools": "12.9.1",
     "highlight.js": "11.6.0",
     "json-diff-kit": "1.0.29",
+    lexical: "0.33.1",
     marked: "9.1.1",
     "mdast-util-from-markdown": "2.0.1",
     "mdast-util-gfm": "3.0.0",
@@ -139,10 +149,11 @@ var package_default = {
     tsup: "8.0.1",
     typescript: "5.2.2",
     vite: "5.0.8",
-    vitest: "0.34.6"
+    vitest: "0.34.6",
+    yjs: "13.6.27"
   },
   peerDependencies: {
-    "@blinkk/root": "2.0.1",
+    "@blinkk/root": "2.0.3",
     "firebase-admin": ">=11",
     "firebase-functions": ">=4",
     preact: ">=10",
@@ -246,7 +257,6 @@ function App(props) {
   ] });
 }
 async function renderApp(req, res, options) {
-  var _a;
   const collections = {};
   Object.entries(getCollections()).forEach(([collectionId, collection]) => {
     collections[collectionId] = serializeCollection(collection);
@@ -266,7 +276,7 @@ async function renderApp(req, res, options) {
       gci,
       i18n: rootConfig.i18n,
       server: {
-        trailingSlash: (_a = rootConfig.server) == null ? void 0 : _a.trailingSlash
+        trailingSlash: rootConfig.server?.trailingSlash
       }
     },
     firebaseConfig: cmsConfig.firebaseConfig,

package/dist/client.js

@@ -64,11 +64,11 @@ var TranslationsManager = class {
         locale,
         sys: {
           modifiedAt: Timestamp.now(),
-          modifiedBy: (options == null ? void 0 : options.modifiedBy) || "root-cms-client"
+          modifiedBy: options?.modifiedBy || "root-cms-client"
         },
         strings: {}
       };
-      if ((options == null ? void 0 : options.tags) && options.tags.length > 0) {
+      if (options?.tags && options.tags.length > 0) {
         updates.tags = FieldValue.arrayUnion(...options.tags);
       }
       let numUpdates = 0;
@@ -108,13 +108,13 @@ var TranslationsManager = class {
       console.warn(`no translations to publish for ${id}`);
       return;
     }
-    const batch = (options == null ? void 0 : options.batch) || db.batch();
+    const batch = options?.batch || db.batch();
     res.docs.forEach((doc) => {
       const translationsLocaleDoc = doc.data();
       const sys = {
         ...translationsLocaleDoc.sys,
         publishedAt: Timestamp.now(),
-        publishedBy: (options == null ? void 0 : options.publishedBy) || "root-cms-client"
+        publishedBy: options?.publishedBy || "root-cms-client"
       };
       batch.update(doc.ref, { sys });
       const publishedDocPath = buildTranslationsLocaleDocDbPath({
@@ -126,7 +126,7 @@ var TranslationsManager = class {
       const publishedDocRef = db.doc(publishedDocPath);
       batch.set(publishedDocRef, { ...translationsLocaleDoc, sys });
     });
-    const shouldCommitBatch = !(options == null ? void 0 : options.batch);
+    const shouldCommitBatch = !options?.batch;
     if (shouldCommitBatch) {
       await batch.commit();
     }
@@ -167,19 +167,19 @@ var TranslationsManager = class {
    * ```
    */
   async loadTranslations(options) {
-    const mode = (options == null ? void 0 : options.mode) || "published";
+    const mode = options?.mode || "published";
     const dbPath = buildTranslationsDbPath({
       project: this.cmsClient.projectId,
       mode
     });
     let query = this.cmsClient.db.collection(dbPath);
-    if ((options == null ? void 0 : options.ids) && options.ids.length > 0) {
+    if (options?.ids && options.ids.length > 0) {
       query = query.where("id", "in", options.ids);
     }
-    if ((options == null ? void 0 : options.tags) && options.tags.length > 0) {
+    if (options?.tags && options.tags.length > 0) {
       query = query.where("tags", "array-contains", options.tags);
     }
-    if ((options == null ? void 0 : options.locales) && options.locales.length > 0) {
+    if (options?.locales && options.locales.length > 0) {
       query = query.where("locale", "in", options.locales);
     }
     const results = await query.get();
@@ -210,11 +210,11 @@ var TranslationsManager = class {
   async loadTranslationsForLocale(locale, options) {
     const localeSet = /* @__PURE__ */ new Set([
       locale,
-      ...(options == null ? void 0 : options.fallbackLocales) || []
+      ...options?.fallbackLocales || []
     ]);
     const fallbackLocales = Array.from(localeSet);
     const multiLocaleStrings = await this.loadTranslations({
-      mode: options == null ? void 0 : options.mode,
+      mode: options?.mode,
       locales: fallbackLocales
     });
     return this.toSingleLocaleMap(multiLocaleStrings, fallbackLocales);
@@ -285,7 +285,6 @@ var TranslationsManager = class {
    * Import translations from the v1 system to the TranslationsManager.
    */
   async importTranslationsFromV1() {
-    var _a;
     const projectId = this.cmsClient.projectId;
     const db = this.cmsClient.db;
     const dbPath = `Projects/${projectId}/Translations`;
@@ -326,7 +325,7 @@ var TranslationsManager = class {
         const doc = await this.cmsClient.getDoc(collection, slug, {
           mode: "draft"
         });
-        const linkedSheet = (_a = doc == null ? void 0 : doc.sys) == null ? void 0 : _a.l10nSheet;
+        const linkedSheet = doc?.sys?.l10nSheet;
         if (linkedSheet) {
           translationsDocs[docId].sys.linkedSheet = linkedSheet;
         }
@@ -429,7 +428,7 @@ var RootCMSClient = class {
     const { collection, slug } = parseDocId(docId);
     const draftDoc = await this.getRawDoc(collection, slug, { mode: "draft" }) || {};
     const draftSys = draftDoc.sys || {};
-    const modifiedBy = (options == null ? void 0 : options.modifiedBy) || "root-cms-client";
+    const modifiedBy = options?.modifiedBy || "root-cms-client";
     const fields = marshalData(fieldsData || {});
     const data = {
       id: docId,
@@ -441,7 +440,7 @@ var RootCMSClient = class {
         createdBy: draftSys.createdBy ?? modifiedBy,
         modifiedAt: Timestamp2.now(),
         modifiedBy,
-        locales: (options == null ? void 0 : options.locales) ?? draftSys.locales ?? ["en"]
+        locales: options?.locales ?? draftSys.locales ?? ["en"]
       },
       fields
     };
@@ -511,7 +510,7 @@ var RootCMSClient = class {
    */
   async publishDocs(docIds, options) {
     const projectCollectionsPath = `Projects/${this.projectId}/Collections`;
-    const publishedBy = (options == null ? void 0 : options.publishedBy) || "root-cms-client";
+    const publishedBy = options?.publishedBy || "root-cms-client";
     const docRefs = docIds.map((docId) => {
       const [collection, slug] = docId.split("/");
       if (!collection || !slug) {
@@ -534,9 +533,9 @@ var RootCMSClient = class {
       }
     }
     let batchCount = 0;
-    const batch = (options == null ? void 0 : options.batch) || this.db.batch();
+    const batch = options?.batch || this.db.batch();
     const versionTags = ["published"];
-    if (options == null ? void 0 : options.releaseId) {
+    if (options?.releaseId) {
       versionTags.push(`release:${options.releaseId}`);
     }
     const publishedDocs = [];
@@ -619,12 +618,11 @@ var RootCMSClient = class {
     const now = Math.ceil((/* @__PURE__ */ new Date()).getTime());
     const snapshot = await this.db.collectionGroup("Scheduled").get();
     const docs = snapshot.docs.filter((d) => {
-      var _a;
       if (!d.ref.path.startsWith(projectCollectionsPath)) {
         return false;
       }
       const data = d.data() || {};
-      const scheduledAt = (_a = data.sys) == null ? void 0 : _a.scheduledAt;
+      const scheduledAt = data.sys?.scheduledAt;
       return scheduledAt && scheduledAt.toMillis && scheduledAt.toMillis() <= now;
     }).map((d) => {
       const dbPath = d.ref.path;
@@ -755,8 +753,7 @@ var RootCMSClient = class {
    * Checks if a doc is currently "locked" for publishing.
    */
   testPublishingLocked(doc) {
-    var _a;
-    if ((_a = doc.sys) == null ? void 0 : _a.publishingLocked) {
+    if (doc.sys?.publishingLocked) {
       if (doc.sys.publishingLocked.until) {
         const now = Timestamp2.now().toMillis();
         const until = doc.sys.publishingLocked.until.toMillis();
@@ -781,9 +778,8 @@ var RootCMSClient = class {
    * replace the v1 translations system.
    */
   getTranslationsManager() {
-    var _a;
     const cmsPluginOptions = this.cmsPlugin.getConfig();
-    if ((_a = cmsPluginOptions.experiments) == null ? void 0 : _a.v2TranslationsManager) {
+    if (cmsPluginOptions.experiments?.v2TranslationsManager) {
       throw new Error(
         "`v2TranslationsManager` is not enabled. update root.config.ts and add: `{experiments: {v2TranslationsManager: true}}`"
       );
@@ -804,7 +800,7 @@ var RootCMSClient = class {
   async loadTranslations(options) {
     const dbPath = `Projects/${this.projectId}/Translations`;
     let query = this.db.collection(dbPath);
-    if (options == null ? void 0 : options.tags) {
+    if (options?.tags) {
       query = query.where("tags", "array-contains-any", options.tags);
     }
     const querySnapshot = await query.get();
@@ -922,7 +918,7 @@ var RootCMSClient = class {
     const dataDocRef = this.db.doc(
       `Projects/${this.projectId}/DataSources/${dataSourceId}/Data/draft`
     );
-    const syncedBy = (options == null ? void 0 : options.syncedBy) || "root-cms-client";
+    const syncedBy = options?.syncedBy || "root-cms-client";
     const updatedDataSource = {
       ...dataSource,
       syncedAt: Timestamp2.now(),
@@ -956,7 +952,7 @@ var RootCMSClient = class {
       `Projects/${this.projectId}/DataSources/${dataSourceId}/published`
     );
     const dataRes = await this.getFromDataSource(dataSourceId, { mode: "draft" });
-    const publishedBy = (options == null ? void 0 : options.publishedBy) || "root-cms-client";
+    const publishedBy = options?.publishedBy || "root-cms-client";
     const updatedDataSource = {
       ...dataSource,
       publishedAt: Timestamp2.now(),
@@ -965,8 +961,8 @@ var RootCMSClient = class {
     const batch = this.db.batch();
     batch.set(dataDocRefPublished, {
       dataSource: updatedDataSource,
-      data: (dataRes == null ? void 0 : dataRes.data) || null,
-      ...(dataRes == null ? void 0 : dataRes.headers) ? { headers: dataRes.headers } : {}
+      data: dataRes?.data || null,
+      ...dataRes?.headers ? { headers: dataRes.headers } : {}
     });
     batch.update(dataDocRefDraft, {
       dataSource: updatedDataSource
@@ -980,8 +976,8 @@ var RootCMSClient = class {
     console.log(`published by: ${publishedBy}`);
   }
   async publishDataSources(dataSourceIds, options) {
-    const publishedBy = (options == null ? void 0 : options.publishedBy) || "root-cms-client";
-    const batch = (options == null ? void 0 : options.batch) || this.db.batch();
+    const publishedBy = options?.publishedBy || "root-cms-client";
+    const batch = options?.batch || this.db.batch();
     for (const id of dataSourceIds) {
       const dataSource = await this.getDataSource(id);
       if (!dataSource) {
@@ -1004,8 +1000,8 @@ var RootCMSClient = class {
       };
       batch.set(dataDocRefPublished, {
         dataSource: updatedDataSource,
-        data: (dataRes == null ? void 0 : dataRes.data) || null,
-        ...(dataRes == null ? void 0 : dataRes.headers) ? { headers: dataRes.headers } : {}
+        data: dataRes?.data || null,
+        ...dataRes?.headers ? { headers: dataRes.headers } : {}
       });
       batch.update(dataDocRefDraft, { dataSource: updatedDataSource });
       batch.update(dataSourceDocRef, {
@@ -1013,7 +1009,7 @@ var RootCMSClient = class {
         publishedBy
       });
     }
-    if (!(options == null ? void 0 : options.batch) || (options == null ? void 0 : options.commitBatch)) {
+    if (!options?.batch || options?.commitBatch) {
       await batch.commit();
     }
   }
@@ -1024,15 +1020,14 @@ var RootCMSClient = class {
     throw new Error(`unsupported data source: ${dataSource.type}`);
   }
   async fetchHttpData(dataSource) {
-    var _a, _b, _c;
     const url = dataSource.url || "";
     if (!url.startsWith("https://")) {
       throw new Error(`url not supported: ${url}`);
     }
     const res = await fetch(url, {
-      method: ((_a = dataSource.httpOptions) == null ? void 0 : _a.method) || "GET",
-      headers: ((_b = dataSource.httpOptions) == null ? void 0 : _b.headers) || [],
-      body: ((_c = dataSource.httpOptions) == null ? void 0 : _c.body) || void 0
+      method: dataSource.httpOptions?.method || "GET",
+      headers: dataSource.httpOptions?.headers || [],
+      body: dataSource.httpOptions?.body || void 0
     });
     if (res.status !== 200) {
       const err = await res.text();
@@ -1048,7 +1043,7 @@ var RootCMSClient = class {
    * Fetches data from a data source.
    */
   async getFromDataSource(dataSourceId, options) {
-    const mode = (options == null ? void 0 : options.mode) || "published";
+    const mode = options?.mode || "published";
     if (!(mode === "draft" || mode === "published")) {
       throw new Error(`invalid mode: ${mode}`);
     }
@@ -1138,12 +1133,12 @@ var RootCMSClient = class {
     const data = {
       action,
       timestamp: Timestamp2.now(),
-      by: (options == null ? void 0 : options.by) || "system",
-      metadata: (options == null ? void 0 : options.metadata) || {}
+      by: options?.by || "system",
+      metadata: options?.metadata || {}
     };
     const colRef = this.db.collection(`Projects/${this.projectId}/ActionLogs`);
     await colRef.add(data);
-    const metaStr = (options == null ? void 0 : options.metadata) ? stringifyObj(options.metadata) : "";
+    const metaStr = options?.metadata ? stringifyObj(options.metadata) : "";
     console.log(`[${data.timestamp.toMillis()}] action: ${action} ${metaStr}`);
     const cmsPluginConfig = this.cmsPlugin.getConfig();
     if (cmsPluginConfig.onAction) {
@@ -1243,7 +1238,7 @@ function toArrayObject(arr) {
 }
 var marshalArray = toArrayObject;
 function unmarshalArray(arrObject) {
-  if (!Array.isArray(arrObject == null ? void 0 : arrObject._array)) {
+  if (!Array.isArray(arrObject?._array)) {
     return [];
   }
   const arr = arrObject._array.map((k) => arrObject[k]);

package/dist/core.js

@@ -70,11 +70,11 @@ var TranslationsManager = class {
         locale,
         sys: {
           modifiedAt: Timestamp.now(),
-          modifiedBy: (options == null ? void 0 : options.modifiedBy) || "root-cms-client"
+          modifiedBy: options?.modifiedBy || "root-cms-client"
         },
         strings: {}
       };
-      if ((options == null ? void 0 : options.tags) && options.tags.length > 0) {
+      if (options?.tags && options.tags.length > 0) {
         updates.tags = FieldValue.arrayUnion(...options.tags);
       }
       let numUpdates = 0;
@@ -114,13 +114,13 @@ var TranslationsManager = class {
       console.warn(`no translations to publish for ${id}`);
       return;
     }
-    const batch = (options == null ? void 0 : options.batch) || db.batch();
+    const batch = options?.batch || db.batch();
     res.docs.forEach((doc) => {
       const translationsLocaleDoc = doc.data();
       const sys = {
         ...translationsLocaleDoc.sys,
         publishedAt: Timestamp.now(),
-        publishedBy: (options == null ? void 0 : options.publishedBy) || "root-cms-client"
+        publishedBy: options?.publishedBy || "root-cms-client"
       };
       batch.update(doc.ref, { sys });
       const publishedDocPath = buildTranslationsLocaleDocDbPath({
@@ -132,7 +132,7 @@ var TranslationsManager = class {
       const publishedDocRef = db.doc(publishedDocPath);
       batch.set(publishedDocRef, { ...translationsLocaleDoc, sys });
     });
-    const shouldCommitBatch = !(options == null ? void 0 : options.batch);
+    const shouldCommitBatch = !options?.batch;
     if (shouldCommitBatch) {
       await batch.commit();
     }
@@ -173,19 +173,19 @@ var TranslationsManager = class {
    * ```
    */
   async loadTranslations(options) {
-    const mode = (options == null ? void 0 : options.mode) || "published";
+    const mode = options?.mode || "published";
     const dbPath = buildTranslationsDbPath({
       project: this.cmsClient.projectId,
       mode
     });
     let query = this.cmsClient.db.collection(dbPath);
-    if ((options == null ? void 0 : options.ids) && options.ids.length > 0) {
+    if (options?.ids && options.ids.length > 0) {
       query = query.where("id", "in", options.ids);
     }
-    if ((options == null ? void 0 : options.tags) && options.tags.length > 0) {
+    if (options?.tags && options.tags.length > 0) {
       query = query.where("tags", "array-contains", options.tags);
     }
-    if ((options == null ? void 0 : options.locales) && options.locales.length > 0) {
+    if (options?.locales && options.locales.length > 0) {
       query = query.where("locale", "in", options.locales);
     }
     const results = await query.get();
@@ -216,11 +216,11 @@ var TranslationsManager = class {
   async loadTranslationsForLocale(locale, options) {
     const localeSet = /* @__PURE__ */ new Set([
       locale,
-      ...(options == null ? void 0 : options.fallbackLocales) || []
+      ...options?.fallbackLocales || []
     ]);
     const fallbackLocales = Array.from(localeSet);
     const multiLocaleStrings = await this.loadTranslations({
-      mode: options == null ? void 0 : options.mode,
+      mode: options?.mode,
       locales: fallbackLocales
     });
     return this.toSingleLocaleMap(multiLocaleStrings, fallbackLocales);
@@ -291,7 +291,6 @@ var TranslationsManager = class {
    * Import translations from the v1 system to the TranslationsManager.
    */
   async importTranslationsFromV1() {
-    var _a;
     const projectId = this.cmsClient.projectId;
     const db = this.cmsClient.db;
     const dbPath = `Projects/${projectId}/Translations`;
@@ -332,7 +331,7 @@ var TranslationsManager = class {
         const doc = await this.cmsClient.getDoc(collection2, slug, {
           mode: "draft"
         });
-        const linkedSheet = (_a = doc == null ? void 0 : doc.sys) == null ? void 0 : _a.l10nSheet;
+        const linkedSheet = doc?.sys?.l10nSheet;
         if (linkedSheet) {
           translationsDocs[docId].sys.linkedSheet = linkedSheet;
         }
@@ -435,7 +434,7 @@ var RootCMSClient = class {
     const { collection: collection2, slug } = parseDocId(docId);
     const draftDoc = await this.getRawDoc(collection2, slug, { mode: "draft" }) || {};
     const draftSys = draftDoc.sys || {};
-    const modifiedBy = (options == null ? void 0 : options.modifiedBy) || "root-cms-client";
+    const modifiedBy = options?.modifiedBy || "root-cms-client";
     const fields = marshalData(fieldsData || {});
     const data = {
       id: docId,
@@ -447,7 +446,7 @@ var RootCMSClient = class {
         createdBy: draftSys.createdBy ?? modifiedBy,
         modifiedAt: Timestamp2.now(),
         modifiedBy,
-        locales: (options == null ? void 0 : options.locales) ?? draftSys.locales ?? ["en"]
+        locales: options?.locales ?? draftSys.locales ?? ["en"]
       },
       fields
     };
@@ -517,7 +516,7 @@ var RootCMSClient = class {
    */
   async publishDocs(docIds, options) {
     const projectCollectionsPath = `Projects/${this.projectId}/Collections`;
-    const publishedBy = (options == null ? void 0 : options.publishedBy) || "root-cms-client";
+    const publishedBy = options?.publishedBy || "root-cms-client";
     const docRefs = docIds.map((docId) => {
       const [collection2, slug] = docId.split("/");
       if (!collection2 || !slug) {
@@ -540,9 +539,9 @@ var RootCMSClient = class {
       }
     }
     let batchCount = 0;
-    const batch = (options == null ? void 0 : options.batch) || this.db.batch();
+    const batch = options?.batch || this.db.batch();
     const versionTags = ["published"];
-    if (options == null ? void 0 : options.releaseId) {
+    if (options?.releaseId) {
       versionTags.push(`release:${options.releaseId}`);
     }
     const publishedDocs = [];
@@ -625,12 +624,11 @@ var RootCMSClient = class {
     const now = Math.ceil((/* @__PURE__ */ new Date()).getTime());
     const snapshot = await this.db.collectionGroup("Scheduled").get();
     const docs = snapshot.docs.filter((d) => {
-      var _a;
       if (!d.ref.path.startsWith(projectCollectionsPath)) {
         return false;
       }
       const data = d.data() || {};
-      const scheduledAt = (_a = data.sys) == null ? void 0 : _a.scheduledAt;
+      const scheduledAt = data.sys?.scheduledAt;
       return scheduledAt && scheduledAt.toMillis && scheduledAt.toMillis() <= now;
     }).map((d) => {
       const dbPath = d.ref.path;
@@ -761,8 +759,7 @@ var RootCMSClient = class {
    * Checks if a doc is currently "locked" for publishing.
    */
   testPublishingLocked(doc) {
-    var _a;
-    if ((_a = doc.sys) == null ? void 0 : _a.publishingLocked) {
+    if (doc.sys?.publishingLocked) {
       if (doc.sys.publishingLocked.until) {
         const now = Timestamp2.now().toMillis();
         const until = doc.sys.publishingLocked.until.toMillis();
@@ -787,9 +784,8 @@ var RootCMSClient = class {
    * replace the v1 translations system.
    */
   getTranslationsManager() {
-    var _a;
     const cmsPluginOptions = this.cmsPlugin.getConfig();
-    if ((_a = cmsPluginOptions.experiments) == null ? void 0 : _a.v2TranslationsManager) {
+    if (cmsPluginOptions.experiments?.v2TranslationsManager) {
       throw new Error(
         "`v2TranslationsManager` is not enabled. update root.config.ts and add: `{experiments: {v2TranslationsManager: true}}`"
       );
@@ -810,7 +806,7 @@ var RootCMSClient = class {
   async loadTranslations(options) {
     const dbPath = `Projects/${this.projectId}/Translations`;
     let query = this.db.collection(dbPath);
-    if (options == null ? void 0 : options.tags) {
+    if (options?.tags) {
       query = query.where("tags", "array-contains-any", options.tags);
     }
     const querySnapshot = await query.get();
@@ -928,7 +924,7 @@ var RootCMSClient = class {
     const dataDocRef = this.db.doc(
       `Projects/${this.projectId}/DataSources/${dataSourceId}/Data/draft`
     );
-    const syncedBy = (options == null ? void 0 : options.syncedBy) || "root-cms-client";
+    const syncedBy = options?.syncedBy || "root-cms-client";
     const updatedDataSource = {
       ...dataSource,
       syncedAt: Timestamp2.now(),
@@ -962,7 +958,7 @@ var RootCMSClient = class {
       `Projects/${this.projectId}/DataSources/${dataSourceId}/published`
     );
     const dataRes = await this.getFromDataSource(dataSourceId, { mode: "draft" });
-    const publishedBy = (options == null ? void 0 : options.publishedBy) || "root-cms-client";
+    const publishedBy = options?.publishedBy || "root-cms-client";
     const updatedDataSource = {
       ...dataSource,
       publishedAt: Timestamp2.now(),
@@ -971,8 +967,8 @@ var RootCMSClient = class {
     const batch = this.db.batch();
     batch.set(dataDocRefPublished, {
       dataSource: updatedDataSource,
-      data: (dataRes == null ? void 0 : dataRes.data) || null,
-      ...(dataRes == null ? void 0 : dataRes.headers) ? { headers: dataRes.headers } : {}
+      data: dataRes?.data || null,
+      ...dataRes?.headers ? { headers: dataRes.headers } : {}
     });
     batch.update(dataDocRefDraft, {
       dataSource: updatedDataSource
@@ -986,8 +982,8 @@ var RootCMSClient = class {
     console.log(`published by: ${publishedBy}`);
   }
   async publishDataSources(dataSourceIds, options) {
-    const publishedBy = (options == null ? void 0 : options.publishedBy) || "root-cms-client";
-    const batch = (options == null ? void 0 : options.batch) || this.db.batch();
+    const publishedBy = options?.publishedBy || "root-cms-client";
+    const batch = options?.batch || this.db.batch();
     for (const id of dataSourceIds) {
       const dataSource = await this.getDataSource(id);
       if (!dataSource) {
@@ -1010,8 +1006,8 @@ var RootCMSClient = class {
       };
       batch.set(dataDocRefPublished, {
         dataSource: updatedDataSource,
-        data: (dataRes == null ? void 0 : dataRes.data) || null,
-        ...(dataRes == null ? void 0 : dataRes.headers) ? { headers: dataRes.headers } : {}
+        data: dataRes?.data || null,
+        ...dataRes?.headers ? { headers: dataRes.headers } : {}
       });
       batch.update(dataDocRefDraft, { dataSource: updatedDataSource });
       batch.update(dataSourceDocRef, {
@@ -1019,7 +1015,7 @@ var RootCMSClient = class {
         publishedBy
       });
     }
-    if (!(options == null ? void 0 : options.batch) || (options == null ? void 0 : options.commitBatch)) {
+    if (!options?.batch || options?.commitBatch) {
       await batch.commit();
     }
   }
@@ -1030,15 +1026,14 @@ var RootCMSClient = class {
     throw new Error(`unsupported data source: ${dataSource.type}`);
   }
   async fetchHttpData(dataSource) {
-    var _a, _b, _c;
     const url = dataSource.url || "";
     if (!url.startsWith("https://")) {
       throw new Error(`url not supported: ${url}`);
     }
     const res = await fetch(url, {
-      method: ((_a = dataSource.httpOptions) == null ? void 0 : _a.method) || "GET",
-      headers: ((_b = dataSource.httpOptions) == null ? void 0 : _b.headers) || [],
-      body: ((_c = dataSource.httpOptions) == null ? void 0 : _c.body) || void 0
+      method: dataSource.httpOptions?.method || "GET",
+      headers: dataSource.httpOptions?.headers || [],
+      body: dataSource.httpOptions?.body || void 0
     });
     if (res.status !== 200) {
       const err = await res.text();
@@ -1054,7 +1049,7 @@ var RootCMSClient = class {
    * Fetches data from a data source.
    */
   async getFromDataSource(dataSourceId, options) {
-    const mode = (options == null ? void 0 : options.mode) || "published";
+    const mode = options?.mode || "published";
     if (!(mode === "draft" || mode === "published")) {
       throw new Error(`invalid mode: ${mode}`);
     }
@@ -1144,12 +1139,12 @@ var RootCMSClient = class {
     const data = {
       action,
       timestamp: Timestamp2.now(),
-      by: (options == null ? void 0 : options.by) || "system",
-      metadata: (options == null ? void 0 : options.metadata) || {}
+      by: options?.by || "system",
+      metadata: options?.metadata || {}
     };
     const colRef = this.db.collection(`Projects/${this.projectId}/ActionLogs`);
     await colRef.add(data);
-    const metaStr = (options == null ? void 0 : options.metadata) ? stringifyObj(options.metadata) : "";
+    const metaStr = options?.metadata ? stringifyObj(options.metadata) : "";
     console.log(`[${data.timestamp.toMillis()}] action: ${action} ${metaStr}`);
     const cmsPluginConfig = this.cmsPlugin.getConfig();
     if (cmsPluginConfig.onAction) {
@@ -1249,7 +1244,7 @@ function toArrayObject(arr) {
 }
 var marshalArray = toArrayObject;
 function unmarshalArray(arrObject) {
-  if (!Array.isArray(arrObject == null ? void 0 : arrObject._array)) {
+  if (!Array.isArray(arrObject?._array)) {
     return [];
   }
   const arr = arrObject._array.map((k) => arrObject[k]);
@@ -1591,12 +1586,11 @@ async function publishScheduledDocs(rootConfig) {
   const now = Math.ceil((/* @__PURE__ */ new Date()).getTime());
   const snapshot = await db.collectionGroup("Scheduled").get();
   const docs = snapshot.docs.filter((d) => {
-    var _a;
     if (!d.ref.path.startsWith(projectCollectionsPath)) {
       return false;
     }
     const data = d.data() || {};
-    const scheduledAt = (_a = data.sys) == null ? void 0 : _a.scheduledAt;
+    const scheduledAt = data.sys?.scheduledAt;
     return scheduledAt && scheduledAt.toMillis && scheduledAt.toMillis() <= now;
   }).map((d) => {
     const dbPath = d.ref.path;
@@ -1672,7 +1666,7 @@ async function loadTranslations(rootConfig, options) {
   const db = cmsPlugin.getFirestore();
   const dbPath = `Projects/${projectId}/Translations`;
   let query = db.collection(dbPath);
-  if (options == null ? void 0 : options.tags) {
+  if (options?.tags) {
     query = query.where("tags", "array-contains-any", options.tags);
   }
   const querySnapshot = await query.get();