alinea 2.0.0-rc1 → 2.0.0-rc2

package/dist/.init/content/pages/welcome.json

@@ -1,5 +1,5 @@
 {
-  "_id": "3KgiHxzm2cdTeGlC66cfjP7DF7E",
+  "_id": "3LPm4jGH99HwrI2UuHOH2RWkGp8",
   "_type": "Page",
   "_index": "a0",
   "_seeded": "welcome.json",

package/dist/.mcp/later/dev.json

@@ -1 +1 @@
-{"url":"http://localhost:1","pid":3049}
+{"url":"http://localhost:1","pid":2823}

package/dist/.mcp/online/dev.json

@@ -1 +1 @@
-{"url":"http://localhost:38103","pid":3049}
+{"url":"http://localhost:44703","pid":2823}

package/dist/adapter/next/cms.js

@@ -15,6 +15,7 @@ import { CMS } from "alinea/core/CMS";
 import {
   withDevelopmentKey
 } from "alinea/core/Connection";
+import { loggedSync, syncStats } from "alinea/core/db/SyncStats";
 import { outcome } from "alinea/core/Outcome";
 import { getScope } from "alinea/core/Scope";
 import { trace } from "alinea/core/Trace";
@@ -93,25 +94,27 @@ var NextCMS = class extends CMS {
     return { isBuild, useLocalDb: !isEdge && (!context.isDev || isBuild) };
   }
   /** Renders keep serving the current content when the handler is unreachable. */
-  async #syncDb(db, client, stats) {
-    if (stats)
-      return stats.track(
-        { kind: "sync", summary: "sync" },
-        (row) => timed(row, () => this.#syncDb(db, client, void 0))
-      );
-    try {
-      const sha = await within(
-        db.syncWith(client, preValidatedRemote),
-        syncWait
-      );
-      this.#syncedAt = Date.now();
-      return sha;
-    } catch (error) {
-      console.warn(
-        `Alinea could not sync with the handler, serving current content: ${error instanceof Error ? error.message : String(error)}`
-      );
-      return db.sha;
-    }
+  async #syncDb(db, client, reason, render) {
+    const stats = syncStats();
+    const sync = async () => {
+      try {
+        const options = { ...preValidatedRemote, stats };
+        const synced = process.env.NODE_ENV === "production" ? loggedSync(db, client, reason, options) : db.syncWith(client, options);
+        const sha = await within(synced, syncWait);
+        this.#syncedAt = Date.now();
+        return sha;
+      } catch (error) {
+        console.warn(
+          `Alinea could not sync with the handler, serving current content: ${error instanceof Error ? error.message : String(error)}`
+        );
+        return db.sha;
+      }
+    };
+    if (!render) return sync();
+    return render.track(
+      { kind: "sync", summary: `sync (${reason})`, sync: stats },
+      (row) => timed(row, sync)
+    );
   }
   #applyPreview = cache(async () => {
     const context = await requestContext(this.config);
@@ -153,6 +156,7 @@ var NextCMS = class extends CMS {
       await this.#syncDb(
         db,
         createClient(this.config, context),
+        `preview at ${decoded.contentHash.slice(0, 7)}`,
         this.#render().stats
       );
     return applyPreviewUpdate(db, decoded);
@@ -184,7 +188,7 @@ var NextCMS = class extends CMS {
   async #resolve(query, row) {
     let status = query.status;
     const { context, hasPreview, isDraft, isBuild, preview, useLocalDb } = await this.#applyPreview();
-    if (isDraft && !status) status = "preferDraft";
+    if (isDraft && !status) status = "preview";
     const request = { ...query, preview, status };
     const client = createClient(this.config, context);
     if (row) row.source = useLocalDb ? "database" : "handler";
@@ -214,7 +218,7 @@ var NextCMS = class extends CMS {
     } else {
       const tracked = {
         sha: db.sha,
-        syncWith: () => this.#syncDb(db, client, stats)
+        syncWith: () => this.#syncDb(db, client, "stale", stats)
       };
       const settled = !isDraft && await syncIfStale(
         tracked,
@@ -223,7 +227,10 @@ var NextCMS = class extends CMS {
         contentShaWindow(this.config.syncInterval)
       );
       if (!settled)
-        await this.throttle(() => this.#syncDb(db, client, stats), syncInterval);
+        await this.throttle(
+          () => this.#syncDb(db, client, "interval", stats),
+          syncInterval
+        );
     }
     return answer();
   }

package/dist/adapter/next/handler.js

@@ -52,6 +52,7 @@ function createHandlerWithDatabase(input, openGeneratedDatabase) {
     ...options,
     remote,
     db,
+    logSyncs: process.env.NODE_ENV === "production",
     afterCommit
   });
   async function handleDevelopment(request, context) {

package/dist/backend/Handler.d.ts

@@ -32,6 +32,8 @@ export interface HandlerOptions extends HandlerHooks {
     cms: CMS;
     db: LocalStore | Promise<LocalStore>;
     remote?: (context: RequestContext) => RemoteConnection;
+    /** Log why and how long each sync took, for a deployed handler */
+    logSyncs?: boolean;
     forwardMutations?(request: Request, context: AuthedContext): Promise<Response | undefined>;
 }
-export declare function createHandler({ cms, remote, db, forwardMutations, ...hooks }: HandlerOptions): Handler;
+export declare function createHandler({ cms, remote, db, forwardMutations, logSyncs, ...hooks }: HandlerOptions): Handler;

package/dist/backend/Handler.js

@@ -19,6 +19,7 @@ import {
 } from "alinea/core/BlobTransport";
 import { Config } from "alinea/core/Config";
 import { developmentKeyHeader } from "alinea/core/Connection";
+import { loggedSync } from "alinea/core/db/SyncStats";
 import {
   committedEntries,
   removedEntries
@@ -26,7 +27,7 @@ import {
 import { Entry } from "alinea/core/Entry";
 import { ErrorCode, HttpError } from "alinea/core/HttpError";
 import { MediaLocation } from "alinea/core/media/MediaLocation";
-import { MediaFile } from "alinea/core/media/MediaTypes";
+import { FileData } from "alinea/core/media/MediaTypes";
 import { assertUploadSize } from "alinea/core/media/UploadLimits";
 import { Permission, Policy } from "alinea/core/Role";
 import { getScope } from "alinea/core/Scope";
@@ -52,6 +53,7 @@ function createHandler({
   remote = (context) => new CloudRemote(context, cms.config),
   db,
   forwardMutations,
+  logSyncs = false,
   ...hooks
 }) {
   const throttle = createThrottledSync();
@@ -60,18 +62,22 @@ function createHandler({
     const local = await db;
     const simulateLatency = process.env.ALINEA_LATENCY;
     if (simulateLatency) await new Promise((resolve) => setTimeout(resolve, 2e3));
-    async function syncForRead(sync) {
+    async function syncForRead(sync2) {
       try {
-        await within(sync, syncWait);
+        await within(sync2, syncWait);
       } catch (error) {
         console.warn(
           `Alinea could not sync with the remote, serving current content: ${error instanceof Error ? error.message : String(error)}`
         );
       }
     }
+    function sync(remote2, reason) {
+      if (dev || !logSyncs) return local.syncWith(remote2);
+      return loggedSync(local, remote2, reason);
+    }
     async function periodicSync(cnx, syncInterval) {
       if (dev) return;
-      return syncForRead(throttle(() => local.syncWith(cnx), syncInterval));
+      return syncForRead(throttle(() => sync(cnx, "interval"), syncInterval));
     }
     try {
       const previews = new JWTPreviews(context.apiKey);
@@ -109,11 +115,11 @@ function createHandler({
           url: Entry.url,
           filePath: Entry.filePath,
           workspace: Entry.workspace,
-          location: MediaFile.location,
-          previewUrl: MediaFile.previewUrl
+          location: FileData.location,
+          previewUrl: FileData.previewUrl
         };
         const query = {
-          type: MediaFile,
+          type: Config.fileTypes(cms.config),
           status: "published",
           main: true,
           select
@@ -265,7 +271,9 @@ function createHandler({
         } else {
           const preview = await decodePreviewRequest(query.preview);
           if ("contentHash" in preview && await local.sha !== preview.contentHash)
-            await syncForRead(local.syncWith(cnx));
+            await syncForRead(
+              sync(cnx, `preview at ${preview.contentHash.slice(0, 7)}`)
+            );
           query.preview = await applyPreview(local, preview);
         }
         return Response.json(await local.resolve(query) ?? null);
@@ -279,7 +287,7 @@ function createHandler({
         expectJson();
         const policy = await user.policy;
         let mutations = await body;
-        await local.syncWith(cnx);
+        await sync(cnx, "commit");
         const adjusted = await hooks.beforeCommit?.({
           mutations,
           user: user.claims
@@ -287,7 +295,7 @@ function createHandler({
         if (adjusted) mutations = adjusted;
         const before = hooks.afterCommit ? await committedEntries(local, mutations) : [];
         const attempt = async (retry = 0) => {
-          if (retry > 0) await local.syncWith(cnx);
+          if (retry > 0) await sync(cnx, "commit retry");
           const request2 = {
             ...await local.request(mutations, policy),
             user: user.claims
@@ -302,9 +310,9 @@ function createHandler({
           }
           try {
             if (sha2 === request2.intoSha) await local.write(request2);
-            else sha2 = await local.syncWith(cnx);
+            else sha2 = await sync(cnx, "after commit");
           } catch {
-            sha2 = await local.syncWith(cnx).catch(() => sha2);
+            sha2 = await sync(cnx, "after commit").catch(() => sha2);
           }
           return sha2;
         };
@@ -335,7 +343,7 @@ function createHandler({
         const owners = () => historyEntries(local, contentDir, file, record);
         let entries = await owners();
         if (entries.length === 0) {
-          await syncForRead(local.syncWith(cnx));
+          await syncForRead(sync(cnx, "history of an unknown entry"));
           entries = await owners();
         }
         if (entries.length === 0)
@@ -349,26 +357,29 @@ function createHandler({
         expectJson();
         const sha = string(url.searchParams.get("sha"));
         let source = cnx;
+        const start = performance.now();
         try {
           const remoteTree = await cnx.getTreeIfDifferent(sha);
           if (!remoteTree) return Response.json(null);
           source = sourceAtTree(cnx, remoteTree);
         } catch {
         }
-        await syncForRead(local.syncWith(source));
+        const remoteMs = Math.round(performance.now() - start);
+        const reason = `tree from ${sha.slice(0, 7)}, remote tree ${remoteMs} ms`;
+        await syncForRead(sync(source, reason));
         const tree = await local.getTreeIfDifferent(sha);
         return compressResponse(request, Response.json(tree ?? null));
       }
       if (action === HandleAction.Sha && request.method === "GET") {
         expectJson();
-        await syncForRead(local.syncWith(cnx));
+        await syncForRead(sync(cnx, "sha"));
         return Response.json(await local.sha);
       }
       if (action === HandleAction.Blob && request.method === "POST") {
         const { shas } = object({ shas: array(string) })(await body);
         let tree = await local.source.getTree();
         if (!dev && shas.some((sha) => !tree.hasSha(sha))) {
-          await syncForRead(local.syncWith(cnx));
+          await syncForRead(sync(cnx, "blobs of a newer tree"));
           tree = await local.source.getTree();
         }
         const fromLocal = [];

package/dist/backend/api/CreateBackend.js

@@ -1,8 +1,8 @@
 import {
   driver_exports
-} from "../../chunks/chunk-6FQ5IMNA.js";
-import "../../chunks/chunk-A2I6MCCS.js";
+} from "../../chunks/chunk-4ZA6KZHS.js";
 import "../../chunks/chunk-VA6NC3MI.js";
+import "../../chunks/chunk-A2I6MCCS.js";
 import "../../chunks/chunk-RAR44T5O.js";
 import "../../chunks/chunk-PTYZMV5G.js";
 import "../../chunks/chunk-N47Y62CI.js";

package/dist/backend/api/GithubApi.js

@@ -38,12 +38,12 @@ var GithubApi = class extends GithubSource {
     if (currentSha !== request.fromSha)
       throw new ShaMismatchError(currentSha, request.fromSha);
     const { user } = request;
-    let commitMessage = request.description;
-    if (user?.name && user.email) {
-      commitMessage += `
+    let commitMessage = `${request.description}
 
+Alinea-Content: ${request.intoSha}`;
+    if (user?.name && user.email)
+      commitMessage += `
 Co-authored-by: ${user.name} <${user.email}>`;
-    }
     const newCommit = this.#options.author ? await this.#commitThroughRest(
       current,
       request.changes,

package/dist/backend/api/database.js

@@ -1,8 +1,8 @@
 import {
   driver_exports
-} from "../../chunks/chunk-6FQ5IMNA.js";
-import "../../chunks/chunk-A2I6MCCS.js";
+} from "../../chunks/chunk-4ZA6KZHS.js";
 import "../../chunks/chunk-VA6NC3MI.js";
+import "../../chunks/chunk-A2I6MCCS.js";
 import "../../chunks/chunk-RAR44T5O.js";
 import "../../chunks/chunk-PTYZMV5G.js";
 import "../../chunks/chunk-N47Y62CI.js";

package/dist/backend/store/GeneratedDatabase.js

@@ -12,8 +12,10 @@ async function createGeneratedDatabase(config, { database: db, fork, driver }) {
     includedAtBuild(filePath) {
       return initialTree?.has(filePath) ?? false;
     },
-    // Nothing reopens the in-memory writes: skip storing the synced tree.
-    recordsTree: false
+    // Nothing reopens the in-memory writes: skip storing the synced tree,
+    // and keep the statistics of the build instead of analyzing them.
+    recordsTree: false,
+    analyzes: false
   });
   try {
     await assertReadableData(db);