@blinkk/root-cms 3.0.1-beta.3 → 3.0.1-beta.5

package/dist/chunk-BGTUWIV6.js

@@ -0,0 +1,187 @@
+import {
+  SearchIndexService
+} from "./chunk-C245C557.js";
+import {
+  RootCMSClient,
+  getCmsPlugin
+} from "./chunk-2BSW7SIH.js";
+
+// core/cron.ts
+import { Timestamp as Timestamp2 } from "firebase-admin/firestore";
+
+// core/versions.ts
+import fs from "fs";
+import path from "path";
+import { Timestamp } from "firebase-admin/firestore";
+import glob from "tiny-glob";
+var DOCUMENT_SAVE_OFFSET = 5 * 60 * 1e3;
+var VersionsService = class {
+  constructor(rootConfig) {
+    this.rootConfig = rootConfig;
+    const cmsPlugin = getCmsPlugin(rootConfig);
+    const cmsPluginOptions = cmsPlugin.getConfig();
+    const projectId = cmsPluginOptions.id || "default";
+    this.projectId = projectId;
+    this.db = cmsPlugin.getFirestore();
+  }
+  /**
+   * Saves a version of all documents that have been edited since the last run.
+   */
+  async saveVersions() {
+    const lastRun = await this.getLastRun();
+    const lastRunWithOffset = lastRun === 0 ? lastRun : lastRun - DOCUMENT_SAVE_OFFSET;
+    const changedDocs = await this.getDocsModifiedAfter(lastRunWithOffset);
+    const now = Timestamp.now().toMillis();
+    const versions = changedDocs.filter((doc) => {
+      const modifiedAt = doc.sys.modifiedAt.toMillis();
+      if (modifiedAt > now - DOCUMENT_SAVE_OFFSET) {
+        return false;
+      }
+      const publishedAt = doc.sys.publishedAt?.toMillis?.();
+      if (publishedAt && Math.abs(publishedAt - modifiedAt) < 5e3) {
+        return false;
+      }
+      return true;
+    });
+    if (versions.length > 0) {
+      this.saveVersionsToFirestore(versions);
+    }
+    this.saveLastRun(now);
+  }
+  async saveVersionsToFirestore(versions) {
+    const batch = this.db.batch();
+    versions.forEach((version) => {
+      if (!version.collection || !version.slug || !version.sys?.modifiedAt) {
+        return;
+      }
+      const modifiedAtMillis = version.sys.modifiedAt.toMillis();
+      const versionPath = `Projects/${this.projectId}/Collections/${version.collection}/Drafts/${version.slug}/Versions/${modifiedAtMillis}`;
+      console.log(versionPath);
+      const versionRef = this.db.doc(versionPath);
+      batch.set(versionRef, version);
+    });
+    await batch.commit();
+    console.log(`versions: saved ${versions.length} versions`);
+  }
+  /**
+   * Returns the last time (in millis) saveVersions() was run, or 0 if has
+   * never been run.
+   */
+  async getLastRun() {
+    const projectDocRef = this.db.collection("Projects").doc(this.projectId);
+    const projectDoc = await projectDocRef.get();
+    if (projectDoc.exists) {
+      const data = projectDoc.data() || {};
+      const ts = data.versionsLastRun;
+      if (ts) {
+        return ts.toMillis();
+      }
+    }
+    return 0;
+  }
+  /**
+   * Saves {versionLastRun: <timestamp>} to the Projects/<projectId> doc.
+   */
+  async saveLastRun(millis) {
+    const ts = Timestamp.fromMillis(millis);
+    const projectDocRef = this.db.collection("Projects").doc(this.projectId);
+    await projectDocRef.set({ versionsLastRun: ts }, { merge: true });
+  }
+  /**
+   * Returns a list of all docs that were edited after a certain time.
+   */
+  async getDocsModifiedAfter(millis) {
+    const ts = Timestamp.fromMillis(millis);
+    const results = [];
+    const collectionIds = await this.listCollections();
+    for (const collectionId of collectionIds) {
+      const collectionPath = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const query = this.db.collection(collectionPath).where("sys.modifiedAt", ">=", ts);
+      const querySnapshot = await query.get();
+      querySnapshot.forEach((doc) => {
+        results.push(doc.data());
+      });
+    }
+    return results;
+  }
+  /**
+   * Returns a list of collection ids for the Root project.
+   */
+  async listCollections() {
+    const collectionsDir = path.join(this.rootConfig.rootDir, "collections");
+    if (!fs.existsSync(collectionsDir)) {
+      return [];
+    }
+    const collectionIds = [];
+    const collectionFileNames = await glob("*.schema.ts", {
+      cwd: collectionsDir
+    });
+    collectionFileNames.forEach((filename) => {
+      collectionIds.push(filename.slice(0, -10));
+    });
+    return collectionIds;
+  }
+};
+
+// core/cron.ts
+var SEARCH_INDEX_MIN_INTERVAL_MS = 5 * 60 * 1e3;
+async function runCronJobs(rootConfig, options = {}) {
+  await Promise.all([
+    runCronJob("publishScheduledDocs", runPublishScheduledDocs, rootConfig),
+    runCronJob(
+      "syncScheduledDataSources",
+      runSyncScheduledDataSources,
+      rootConfig
+    ),
+    runCronJob("saveVersions", runSaveVersions, rootConfig),
+    runCronJob(
+      "incrementalSearchIndex",
+      runIncrementalSearchIndex,
+      rootConfig,
+      options.loadSchema
+    )
+  ]);
+}
+async function runCronJob(name, fn, ...args) {
+  try {
+    await fn(...args);
+  } catch (err) {
+    console.log(`cron failed: ${name}`);
+    console.error(String(err.stack || err));
+    throw err;
+  }
+}
+async function runPublishScheduledDocs(rootConfig) {
+  const cmsClient = new RootCMSClient(rootConfig);
+  await cmsClient.publishScheduledDocs();
+  await cmsClient.publishScheduledReleases();
+}
+async function runSyncScheduledDataSources(rootConfig) {
+  const cmsClient = new RootCMSClient(rootConfig);
+  await cmsClient.syncScheduledDataSources();
+}
+async function runSaveVersions(rootConfig) {
+  const service = new VersionsService(rootConfig);
+  await service.saveVersions();
+}
+async function runIncrementalSearchIndex(rootConfig, loadSchema) {
+  const service = new SearchIndexService(rootConfig, loadSchema);
+  const status = await service.getStatus();
+  if (status.lastRun !== null) {
+    const elapsed = Date.now() - status.lastRun;
+    if (elapsed < SEARCH_INDEX_MIN_INTERVAL_MS) {
+      return;
+    }
+    const hasChanges = await service.hasChangesSince(
+      Timestamp2.fromMillis(status.lastRun)
+    );
+    if (!hasChanges) {
+      return;
+    }
+  }
+  await service.rebuildIndex({ force: false });
+}
+
+export {
+  runCronJobs
+};

package/dist/{chunk-TRM4MQHU.js → chunk-C245C557.js}

@@ -1,10 +1,6 @@
 import {
-  RootCMSClient,
   getCmsPlugin
-} from "./chunk-F4SODS5S.js";
-
-// core/cron.ts
-import { Timestamp as Timestamp3 } from "firebase-admin/firestore";
+} from "./chunk-2BSW7SIH.js";
 
 // core/search-index.ts
 import fs from "fs";
@@ -677,8 +673,8 @@ var SearchIndexService = class {
   async listAllDocs(collectionIds) {
     const all = [];
     for (const collectionId of collectionIds) {
-      const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const snap = await this.db.collection(path3).get();
+      const path2 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const snap = await this.db.collection(path2).get();
       snap.forEach((d) => {
         const docId = `${collectionId}/${d.id}`;
         if (!this.isDocIndexable(docId)) {
@@ -700,8 +696,8 @@ var SearchIndexService = class {
   async listChangedDocs(collectionIds, lastRun) {
     const all = [];
     for (const collectionId of collectionIds) {
-      const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const q = this.db.collection(path3).where("sys.modifiedAt", ">=", lastRun);
+      const path2 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const q = this.db.collection(path2).where("sys.modifiedAt", ">=", lastRun);
       const snap = await q.get();
       snap.forEach((d) => {
         const docId = `${collectionId}/${d.id}`;
@@ -725,8 +721,8 @@ var SearchIndexService = class {
   async hasChangesSince(lastRun, docMap = null) {
     const collectionIds = await this.listCollectionIds();
     for (const collectionId of collectionIds) {
-      const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const q = this.db.collection(path3).where("sys.modifiedAt", ">=", lastRun).limit(1);
+      const path2 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const q = this.db.collection(path2).where("sys.modifiedAt", ">=", lastRun).limit(1);
       const snap = await q.get();
       if (!snap.empty) {
         return true;
@@ -739,8 +735,8 @@ var SearchIndexService = class {
     }
     const liveIds = /* @__PURE__ */ new Set();
     for (const collectionId of collectionIds) {
-      const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const snap = await this.db.collection(path3).select().get();
+      const path2 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const snap = await this.db.collection(path2).select().get();
       snap.forEach((d) => {
         const docId = `${collectionId}/${d.id}`;
         if (this.isDocIndexable(docId)) {
@@ -807,8 +803,8 @@ var SearchIndexService = class {
         );
         continue;
       }
-      const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const snap = await this.db.collection(path3).get();
+      const path2 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const snap = await this.db.collection(path2).get();
       snap.forEach((d) => {
         const data = d.data() || {};
         const slug = data.slug || d.id;
@@ -884,8 +880,8 @@ var SearchIndexService = class {
     }
     const liveIds = /* @__PURE__ */ new Set();
     for (const collectionId of collectionIds) {
-      const path3 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const snap = await this.db.collection(path3).select().get();
+      const path2 = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
+      const snap = await this.db.collection(path2).select().get();
       snap.forEach((d) => {
         const docId = `${collectionId}/${d.id}`;
         if (this.isDocIndexable(docId)) {
@@ -1001,180 +997,6 @@ var SearchIndexService = class {
   }
 };
 
-// core/versions.ts
-import fs2 from "fs";
-import path2 from "path";
-import { Timestamp as Timestamp2 } from "firebase-admin/firestore";
-import glob2 from "tiny-glob";
-var DOCUMENT_SAVE_OFFSET = 5 * 60 * 1e3;
-var VersionsService = class {
-  constructor(rootConfig) {
-    this.rootConfig = rootConfig;
-    const cmsPlugin = getCmsPlugin(rootConfig);
-    const cmsPluginOptions = cmsPlugin.getConfig();
-    const projectId = cmsPluginOptions.id || "default";
-    this.projectId = projectId;
-    this.db = cmsPlugin.getFirestore();
-  }
-  /**
-   * Saves a version of all documents that have been edited since the last run.
-   */
-  async saveVersions() {
-    const lastRun = await this.getLastRun();
-    const lastRunWithOffset = lastRun === 0 ? lastRun : lastRun - DOCUMENT_SAVE_OFFSET;
-    const changedDocs = await this.getDocsModifiedAfter(lastRunWithOffset);
-    const now = Timestamp2.now().toMillis();
-    const versions = changedDocs.filter((doc) => {
-      const modifiedAt = doc.sys.modifiedAt.toMillis();
-      if (modifiedAt > now - DOCUMENT_SAVE_OFFSET) {
-        return false;
-      }
-      const publishedAt = doc.sys.publishedAt?.toMillis?.();
-      if (publishedAt && Math.abs(publishedAt - modifiedAt) < 5e3) {
-        return false;
-      }
-      return true;
-    });
-    if (versions.length > 0) {
-      this.saveVersionsToFirestore(versions);
-    }
-    this.saveLastRun(now);
-  }
-  async saveVersionsToFirestore(versions) {
-    const batch = this.db.batch();
-    versions.forEach((version) => {
-      if (!version.collection || !version.slug || !version.sys?.modifiedAt) {
-        return;
-      }
-      const modifiedAtMillis = version.sys.modifiedAt.toMillis();
-      const versionPath = `Projects/${this.projectId}/Collections/${version.collection}/Drafts/${version.slug}/Versions/${modifiedAtMillis}`;
-      console.log(versionPath);
-      const versionRef = this.db.doc(versionPath);
-      batch.set(versionRef, version);
-    });
-    await batch.commit();
-    console.log(`versions: saved ${versions.length} versions`);
-  }
-  /**
-   * Returns the last time (in millis) saveVersions() was run, or 0 if has
-   * never been run.
-   */
-  async getLastRun() {
-    const projectDocRef = this.db.collection("Projects").doc(this.projectId);
-    const projectDoc = await projectDocRef.get();
-    if (projectDoc.exists) {
-      const data = projectDoc.data() || {};
-      const ts = data.versionsLastRun;
-      if (ts) {
-        return ts.toMillis();
-      }
-    }
-    return 0;
-  }
-  /**
-   * Saves {versionLastRun: <timestamp>} to the Projects/<projectId> doc.
-   */
-  async saveLastRun(millis) {
-    const ts = Timestamp2.fromMillis(millis);
-    const projectDocRef = this.db.collection("Projects").doc(this.projectId);
-    await projectDocRef.set({ versionsLastRun: ts }, { merge: true });
-  }
-  /**
-   * Returns a list of all docs that were edited after a certain time.
-   */
-  async getDocsModifiedAfter(millis) {
-    const ts = Timestamp2.fromMillis(millis);
-    const results = [];
-    const collectionIds = await this.listCollections();
-    for (const collectionId of collectionIds) {
-      const collectionPath = `Projects/${this.projectId}/Collections/${collectionId}/Drafts`;
-      const query = this.db.collection(collectionPath).where("sys.modifiedAt", ">=", ts);
-      const querySnapshot = await query.get();
-      querySnapshot.forEach((doc) => {
-        results.push(doc.data());
-      });
-    }
-    return results;
-  }
-  /**
-   * Returns a list of collection ids for the Root project.
-   */
-  async listCollections() {
-    const collectionsDir = path2.join(this.rootConfig.rootDir, "collections");
-    if (!fs2.existsSync(collectionsDir)) {
-      return [];
-    }
-    const collectionIds = [];
-    const collectionFileNames = await glob2("*.schema.ts", {
-      cwd: collectionsDir
-    });
-    collectionFileNames.forEach((filename) => {
-      collectionIds.push(filename.slice(0, -10));
-    });
-    return collectionIds;
-  }
-};
-
-// core/cron.ts
-var SEARCH_INDEX_MIN_INTERVAL_MS = 5 * 60 * 1e3;
-async function runCronJobs(rootConfig, options = {}) {
-  await Promise.all([
-    runCronJob("publishScheduledDocs", runPublishScheduledDocs, rootConfig),
-    runCronJob(
-      "syncScheduledDataSources",
-      runSyncScheduledDataSources,
-      rootConfig
-    ),
-    runCronJob("saveVersions", runSaveVersions, rootConfig),
-    runCronJob(
-      "incrementalSearchIndex",
-      runIncrementalSearchIndex,
-      rootConfig,
-      options.loadSchema
-    )
-  ]);
-}
-async function runCronJob(name, fn, ...args) {
-  try {
-    await fn(...args);
-  } catch (err) {
-    console.log(`cron failed: ${name}`);
-    console.error(String(err.stack || err));
-    throw err;
-  }
-}
-async function runPublishScheduledDocs(rootConfig) {
-  const cmsClient = new RootCMSClient(rootConfig);
-  await cmsClient.publishScheduledDocs();
-  await cmsClient.publishScheduledReleases();
-}
-async function runSyncScheduledDataSources(rootConfig) {
-  const cmsClient = new RootCMSClient(rootConfig);
-  await cmsClient.syncScheduledDataSources();
-}
-async function runSaveVersions(rootConfig) {
-  const service = new VersionsService(rootConfig);
-  await service.saveVersions();
-}
-async function runIncrementalSearchIndex(rootConfig, loadSchema) {
-  const service = new SearchIndexService(rootConfig, loadSchema);
-  const status = await service.getStatus();
-  if (status.lastRun !== null) {
-    const elapsed = Date.now() - status.lastRun;
-    if (elapsed < SEARCH_INDEX_MIN_INTERVAL_MS) {
-      return;
-    }
-    const hasChanges = await service.hasChangesSince(
-      Timestamp3.fromMillis(status.lastRun)
-    );
-    if (!hasChanges) {
-      return;
-    }
-  }
-  await service.rebuildIndex({ force: false });
-}
-
 export {
-  SearchIndexService,
-  runCronJobs
+  SearchIndexService
 };

package/dist/cli.js

@@ -5,8 +5,7 @@ import {
   RootCMSClient,
   getCmsPlugin,
   unmarshalData
-} from "./chunk-F4SODS5S.js";
-import "./chunk-CRK7N6RR.js";
+} from "./chunk-2BSW7SIH.js";
 import "./chunk-MLKGABMK.js";
 
 // cli/cli.ts

package/dist/client.js

@@ -12,8 +12,7 @@ import {
   translationsForLocale,
   unmarshalArray,
   unmarshalData
-} from "./chunk-F4SODS5S.js";
-import "./chunk-CRK7N6RR.js";
+} from "./chunk-2BSW7SIH.js";
 import "./chunk-MLKGABMK.js";
 export {
   BatchRequest,

package/dist/core.js

@@ -16,8 +16,7 @@ import {
   translationsForLocale,
   unmarshalArray,
   unmarshalData
-} from "./chunk-F4SODS5S.js";
-import "./chunk-CRK7N6RR.js";
+} from "./chunk-2BSW7SIH.js";
 import {
   __export
 } from "./chunk-MLKGABMK.js";

package/dist/functions.js

@@ -1,8 +1,8 @@
 import {
   runCronJobs
-} from "./chunk-TRM4MQHU.js";
-import "./chunk-F4SODS5S.js";
-import "./chunk-CRK7N6RR.js";
+} from "./chunk-BGTUWIV6.js";
+import "./chunk-C245C557.js";
+import "./chunk-2BSW7SIH.js";
 import "./chunk-MLKGABMK.js";
 
 // core/functions.ts

package/dist/plugin.js

@@ -12,17 +12,18 @@ import {
   serializeAiConfig,
   summarizeDiff,
   translateString
-} from "./chunk-NXEXOHBD.js";
+} from "./chunk-5CZBPART.js";
 import {
-  SearchIndexService,
   runCronJobs
-} from "./chunk-TRM4MQHU.js";
+} from "./chunk-BGTUWIV6.js";
+import {
+  SearchIndexService
+} from "./chunk-C245C557.js";
 import {
   RootCMSClient,
   parseDocId,
   unmarshalData
-} from "./chunk-F4SODS5S.js";
-import "./chunk-CRK7N6RR.js";
+} from "./chunk-2BSW7SIH.js";
 import "./chunk-MLKGABMK.js";
 
 // core/plugin.ts
@@ -546,11 +547,6 @@ function api(server, options) {
       return;
     }
     const body = req.body || {};
-    const messages = body.messages || [];
-    if (!Array.isArray(messages) || messages.length === 0) {
-      res.status(400).json({ success: false, error: "MISSING_MESSAGES" });
-      return;
-    }
     const model = findModel(aiConfig, body.modelId);
     if (!model) {
       res.status(400).json({ success: false, error: "UNKNOWN_MODEL" });
@@ -561,10 +557,12 @@ function api(server, options) {
     const store = new ChatStore(cmsClient, req.user.email);
     const requestedChatId = typeof body.chatId === "string" ? body.chatId.trim() : "";
     let chatId = "";
+    let storedMessages = [];
     if (requestedChatId) {
       const existing = await store.getChat(requestedChatId);
       if (existing) {
         chatId = existing.id;
+        storedMessages = existing.messages || [];
       } else {
         const created = await store.createChat({
           id: requestedChatId,
@@ -576,6 +574,15 @@ function api(server, options) {
       const created = await store.createChat({ modelId: model.id });
       chatId = created.id;
     }
+    let messages;
+    if (body.message && typeof body.message === "object") {
+      messages = [...storedMessages, body.message];
+    } else if (Array.isArray(body.messages) && body.messages.length > 0) {
+      messages = body.messages;
+    } else {
+      res.status(400).json({ success: false, error: "MISSING_MESSAGES" });
+      return;
+    }
     try {
       const streamResponse = await runChatStream({
         rootConfig: req.rootConfig,
@@ -585,7 +592,9 @@ function api(server, options) {
         messages,
         chatId,
         user: req.user.email,
-        executionMode
+        executionMode,
+        loadCollection: (collectionId) => getCollectionSchema(req, collectionId),
+        loadAllCollections: async () => (await options.getRenderer(req)).getCollections()
       });
       streamResponse.headers.set("x-root-cms-chat-id", chatId);
       await pipeWebResponse(streamResponse, res);
@@ -628,10 +637,14 @@ function api(server, options) {
       try {
         const streamResponse = await runEditObjectStream({
           rootConfig: req.rootConfig,
+          cmsClient: new RootCMSClient(req.rootConfig),
+          user: req.user.email,
           config: aiConfig,
           model,
           messages,
-          editData: body.editData
+          editData: body.editData,
+          loadCollection: (collectionId) => getCollectionSchema(req, collectionId),
+          loadAllCollections: async () => (await options.getRenderer(req)).getCollections()
         });
         await pipeWebResponse(streamResponse, res);
       } catch (err) {
@@ -1442,6 +1455,10 @@ function cmsPlugin(options) {
      * Attaches CMS-specific middleware to the Root.js server.
      */
     configureServer: async (server, serverOptions) => {
+      server.use(
+        ["/cms/api/ai.chat", "/cms/api/ai.edit_object"],
+        bodyParser.json({ limit: "4mb" })
+      );
       server.use(bodyParser.json());
       server.use(
         (err, req, res, next) => {