alinea 2.0.0-preview.8 → 2.0.0-preview.9

package/dist/adapter/next/renderStats.js

@@ -1,27 +1,78 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/adapter/next/renderStats.ts
+var slowestCount = 5;
 var RenderStats = class {
   rows = [];
   statements = 0;
   sqlMs = 0;
+  slowest = [];
+  /** The bundled database that answered, once a query reached it. */
+  database;
+  startedAt = Date.now();
   #pending = 0;
   #idleSince = Date.now();
+  #renderStart = Number.POSITIVE_INFINITY;
+  #renderEnd = Number.NEGATIVE_INFINITY;
+  #executedUntil = Number.NEGATIVE_INFINITY;
+  /** Syncs in progress: their statements run before any query's. */
+  #syncing = [];
+  /** Queries executing or waiting to, in the order they run. */
+  #executing = [];
   /** Add a row and count it as pending until `run` settles; see `timed`. */
   async track(stat, run) {
     const row = { ...stat, durationMs: 0 };
     this.rows.push(row);
     this.#pending++;
+    this.#renderStart = Math.min(this.#renderStart, performance.now());
+    if (row.kind === "sync") this.#syncing.push(row);
     try {
       return await run(row);
     } finally {
+      if (row.kind === "sync") remove(this.#syncing, row);
       this.#pending--;
       this.#idleSince = Date.now();
+      this.#renderEnd = Math.max(this.#renderEnd, performance.now());
     }
   }
-  statement(durationMs) {
+  /**
+   * Time a database query without the time it waited behind the others:
+   * queries of a render run one at a time in the order they were called, so
+   * one starts executing once the previous one finished, or when it was
+   * called if that is later.
+   */
+  async executed(row, run) {
+    const start = performance.now();
+    this.#executing.push(row);
+    try {
+      return await run();
+    } finally {
+      remove(this.#executing, row);
+      const end = performance.now();
+      row.durationMs = end - Math.max(start, this.#executedUntil);
+      this.#executedUntil = end;
+    }
+  }
+  /**
+   * Count a statement towards the render, and towards the row that ran it:
+   * a sync in progress, or else the query executing, which is the earliest
+   * one called that has not finished (see `executed`).
+   */
+  statement(durationMs, sql) {
     this.statements++;
     this.sqlMs += durationMs;
+    const row = this.#syncing.at(-1) ?? this.#executing[0];
+    if (row) {
+      row.statements = (row.statements ?? 0) + 1;
+      row.sqlMs = (row.sqlMs ?? 0) + durationMs;
+    }
+    if (sql === void 0) return;
+    const { slowest } = this;
+    if (slowest.length >= slowestCount && durationMs <= slowest[slowest.length - 1].durationMs)
+      return;
+    slowest.push({ sql: summarizeSql(sql), durationMs, query: row?.summary });
+    slowest.sort((a, b) => b.durationMs - a.durationMs);
+    slowest.length = Math.min(slowest.length, slowestCount);
   }
   /**
    * Resolves once nothing ran for `quietMs`, so queries of server components
@@ -36,10 +87,22 @@ var RenderStats = class {
         (resolve) => setTimeout(resolve, Math.min(wait, deadline - now))
       );
     }
-    const { rows, statements, sqlMs } = this;
-    return { rows: [...rows], statements, sqlMs };
+    const { rows, statements, sqlMs, slowest, database } = this;
+    const renderMs = Math.max(0, this.#renderEnd - this.#renderStart);
+    return {
+      rows: rows.map((row) => ({ ...row })),
+      statements,
+      sqlMs,
+      renderMs,
+      slowest: [...slowest],
+      database
+    };
   }
 };
+function summarizeSql(sql, maxLength = 200) {
+  const text = sql.replace(/\s+/g, " ").replaceAll('"', "").replace(/^select .*? from /i, "select \u2026 from ").replace(/\b\w+\.(\w+)/g, "$1").trim();
+  return text.length > maxLength ? `${text.slice(0, maxLength - 1)}\u2026` : text;
+}
 async function timed(row, run) {
   if (!row) return run();
   const start = performance.now();
@@ -67,8 +130,13 @@ function summarizeQuery(query) {
   );
   return `${mode}(${parts.join(", ")})`;
 }
+function remove(items, item) {
+  const index = items.indexOf(item);
+  if (index !== -1) items.splice(index, 1);
+}
 export {
   RenderStats,
   summarizeQuery,
+  summarizeSql,
   timed
 };

package/dist/adapter/next/syncCheck.js

@@ -1,10 +1,8 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/adapter/next/syncCheck.ts
-import { ReadonlyTree } from "alinea/core/source/Tree";
 var CONTENT_SHA_TAG = "alinea-content-sha";
 var SHA_REVALIDATE_SECONDS = 60;
-var SENTINEL_SHA = ReadonlyTree.EMPTY.sha;
 var inflight;
 function latestSha(client) {
   if (inflight) return inflight;
@@ -17,18 +15,14 @@ async function loadLatestSha(client) {
   try {
     const { unstable_cache } = await import("next/cache.js");
     const getSha = unstable_cache(
-      async () => {
-        const tree = await client.getTreeIfDifferent(SENTINEL_SHA);
-        return tree?.sha;
-      },
+      () => client.getSha(),
       ["alinea-content-sha"],
       { revalidate: SHA_REVALIDATE_SECONDS, tags: [CONTENT_SHA_TAG] }
     );
     return await getSha();
   } catch {
     try {
-      const tree = await client.getTreeIfDifferent(SENTINEL_SHA);
-      return tree?.sha;
+      return await client.getSha();
     } catch {
       return void 0;
     }

package/dist/adapter/next/with-alinea.js

@@ -41,7 +41,8 @@ function withAlinea(config = {}) {
         ...config.experimental,
         serverComponentsExternalPackages: [
           ...config.experimental?.serverComponentsExternalPackages ?? [],
-          "@alinea/generated"
+          "@alinea/generated",
+          "@alinea/sqlite-wasm"
         ]
       },
       rewrites,
@@ -52,7 +53,10 @@ function withAlinea(config = {}) {
     ...config,
     serverExternalPackages: [
       ...config.serverExternalPackages ?? [],
-      "@alinea/generated"
+      "@alinea/generated",
+      // Loads its native extension from the package directory, which file
+      // tracing then includes.
+      "@alinea/sqlite-wasm"
     ],
     rewrites,
     images,

package/dist/backend/HandleAction.d.ts

@@ -11,6 +11,6 @@ export declare enum HandleAction {
     Mutate = "mutate",
     Upload = "upload",
     Tree = "tree",
-    Commit = "commit",
+    Sha = "sha",
     Blob = "blob"
 }

package/dist/backend/HandleAction.js

@@ -14,7 +14,7 @@ var HandleAction = /* @__PURE__ */ ((HandleAction2) => {
   HandleAction2["Mutate"] = "mutate";
   HandleAction2["Upload"] = "upload";
   HandleAction2["Tree"] = "tree";
-  HandleAction2["Commit"] = "commit";
+  HandleAction2["Sha"] = "sha";
   HandleAction2["Blob"] = "blob";
   return HandleAction2;
 })(HandleAction || {});

package/dist/backend/Handler.js

@@ -32,7 +32,7 @@ import { isRecord } from "alinea/core/util/Objects";
 import { isAbsolute, normalize } from "alinea/core/util/Paths";
 import { InvalidCredentialsError, MissingCredentialsError } from "./Auth.js";
 import { HandleAction } from "./HandleAction.js";
-import { isRedirectStatus, proxyMediaUrl } from "./api/ProxyMedia.js";
+import { proxyMediaUrl } from "./api/ProxyMedia.js";
 import { applyPreview, decodePreviewRequest } from "./resolver/ParsePreview.js";
 import { compressResponse } from "./router/Router.js";
 import { createThrottledSync } from "./util/Syncable.js";
@@ -124,7 +124,7 @@ function createHandler({
         if (typeof location !== "string")
           return new Response("Not found", { status: 404 });
         const previewSource = typeof previewUrl === "string" && previewUrl ? new URL(previewUrl, request.url).href : void 0;
-        async function proxyMedia(source2, cacheControl, isAllowed) {
+        async function proxyMedia(source2, cacheControl) {
           const previewEntryId = uploadPreviewEntryId(
             source2,
             context.handlerUrl
@@ -135,13 +135,12 @@ function createHandler({
           } else {
             response = await proxyMediaUrl(
               request,
-              new URL(source2, request.url),
-              isAllowed
+              new URL(source2, request.url)
             );
           }
           return mediaResponse(request, response, cacheControl);
         }
-        if (!wasBuilt && previewSource) {
+        if (!context.isDev && !wasBuilt && previewSource) {
           if (proxy) return proxyMedia(previewSource, "private, no-store");
           return redirectFile(previewSource, "private, no-store");
         }
@@ -153,18 +152,10 @@ function createHandler({
         if (!source || source === requestedUrl)
           return new Response("Not found", { status: 404 });
         if (!proxy) return redirectFile(source, "public, max-age=60");
-        const configuredBase = Config.baseUrl(
-          cms.config,
-          context.isDev ? "development" : "production"
-        );
-        const deliveryBase = configuredBase ?? context.handlerUrl;
-        const sourceUrl = new URL(source, deliveryBase);
-        const deliveryOrigin = new URL(deliveryBase).origin;
-        const handlerPath = context.handlerUrl.pathname;
+        const deliveryBase = !context.isDev && Config.baseUrl(cms.config, "production") || context.handlerUrl;
         return proxyMedia(
-          sourceUrl.href,
-          "public, max-age=60",
-          (url2) => url2.origin === deliveryOrigin && url2.pathname !== handlerPath && !url2.pathname.startsWith(`${handlerPath}/`)
+          new URL(source, deliveryBase).href,
+          "public, max-age=60"
         );
       }
       const action = params.get("action");
@@ -315,23 +306,6 @@ function createHandler({
         }
         return Response.json({ sha });
       }
-      if (action === HandleAction.Commit && request.method === "POST") {
-        if (!context.isDev)
-          throw new HttpError(400, "Commits are only accepted in development");
-        const developmentKey = request.headers.get(developmentKeyHeader);
-        if (!context.apiKey || developmentKey !== context.apiKey)
-          throw new HttpError(401, "Invalid development commit credentials");
-        const user = expectUser();
-        expectJson();
-        const commit = {
-          ...await body,
-          user: user.claims
-        };
-        let { sha } = await cnx.write(commit);
-        if (sha === commit.intoSha) await local.write(commit);
-        else sha = await local.syncWith(cnx);
-        return Response.json({ sha });
-      }
       if (action === HandleAction.History && request.method === "GET") {
         expectUser();
         expectJson();
@@ -347,6 +321,11 @@ function createHandler({
         const tree = await local.getTreeIfDifferent(sha);
         return compressResponse(request, Response.json(tree ?? null));
       }
+      if (action === HandleAction.Sha && request.method === "GET") {
+        expectJson();
+        await syncForRead(cnx);
+        return Response.json(await local.sha);
+      }
       if (action === HandleAction.Blob && request.method === "POST") {
         const { shas } = object({ shas: array(string) })(await body);
         await periodicSync(cnx);
@@ -452,8 +431,6 @@ function uploadPreviewEntryId(previewSource, handlerUrl) {
   return previewUrl.searchParams.get("entryId") ?? void 0;
 }
 function mediaResponse(request, upstream, cacheControl) {
-  if (isRedirectStatus(upstream.status))
-    return new Response("Media backend returned a redirect", { status: 502 });
   const responseHeaders = new Headers({
     "cache-control": upstream.ok || upstream.status === 304 ? cacheControl : "no-store"
   });

package/dist/backend/api/CreateBackend.js

@@ -1,15 +1,15 @@
 import {
   driver_exports
-} from "../../chunks/chunk-2U43BB6P.js";
-import "../../chunks/chunk-A42DP5T7.js";
-import "../../chunks/chunk-NLZLRQ5U.js";
-import "../../chunks/chunk-IL7FJQAY.js";
-import "../../chunks/chunk-M7KDJEGH.js";
+} from "../../chunks/chunk-QJGGYF6E.js";
+import "../../chunks/chunk-QSN6RH6X.js";
+import "../../chunks/chunk-ETWOY4AL.js";
+import "../../chunks/chunk-66YZ47TY.js";
+import "../../chunks/chunk-AIU6CMVT.js";
 import "../../chunks/chunk-N47Y62CI.js";
 import "../../chunks/chunk-QBPYWU6C.js";
 import "../../chunks/chunk-2BJ2IFQM.js";
 import "../../chunks/chunk-XCZXR3C2.js";
-import "../../chunks/chunk-TFMUSWGG.js";
+import "../../chunks/chunk-MOWR65LM.js";
 import "../../chunks/chunk-76VMZTLN.js";
 import "../../chunks/chunk-2PIFHEYR.js";
 import "../../chunks/chunk-K62JP6HR.js";

package/dist/backend/api/DatabaseApi.js

@@ -7,7 +7,7 @@ import {
   integer,
   text,
   varchar
-} from "../../chunks/chunk-K7LHQXI4.js";
+} from "../../chunks/chunk-ASYKC6IE.js";
 import {
   Builder
 } from "../../chunks/chunk-2BJ2IFQM.js";
@@ -16,7 +16,7 @@ import {
 } from "../../chunks/chunk-XCZXR3C2.js";
 import {
   table
-} from "../../chunks/chunk-TFMUSWGG.js";
+} from "../../chunks/chunk-MOWR65LM.js";
 import "../../chunks/chunk-76VMZTLN.js";
 import "../../chunks/chunk-2PIFHEYR.js";
 import "../../chunks/chunk-K62JP6HR.js";

package/dist/backend/api/ProxyMedia.d.ts

@@ -1,3 +1,2 @@
-import { type Request, Response } from '@alinea/iso';
-export declare function proxyMediaUrl(request: Request, source: URL, isAllowed?: (url: URL) => boolean): Promise<Response>;
-export declare function isRedirectStatus(status: number): boolean;
+import { type Request } from '@alinea/iso';
+export declare function proxyMediaUrl(request: Request, source: URL): Promise<Response>;

package/dist/backend/api/ProxyMedia.js

@@ -1,8 +1,8 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/backend/api/ProxyMedia.ts
-import { Headers, Response } from "@alinea/iso";
-async function proxyMediaUrl(request, source, isAllowed = (url) => url.origin === source.origin) {
+import { Headers } from "@alinea/iso";
+function proxyMediaUrl(request, source) {
   const headers = new Headers();
   for (const name of [
     "range",
@@ -13,27 +13,12 @@ async function proxyMediaUrl(request, source, isAllowed = (url) => url.origin ==
     const value = request.headers.get(name);
     if (value) headers.set(name, value);
   }
-  let current = source;
-  for (let redirects = 0; ; redirects++) {
-    if (!isAllowed(current))
-      return new Response("Invalid media source", { status: 502 });
-    const response = await fetch(current, {
-      method: request.method,
-      headers,
-      redirect: "manual",
-      signal: request.signal
-    });
-    const location = response.headers.get("location");
-    if (!isRedirectStatus(response.status) || !location) return response;
-    if (redirects === 3)
-      return new Response("Too many media redirects", { status: 502 });
-    current = new URL(location, current);
-  }
-}
-function isRedirectStatus(status) {
-  return status === 301 || status === 302 || status === 303 || status === 307 || status === 308;
+  return fetch(source, {
+    method: request.method,
+    headers,
+    signal: request.signal
+  });
 }
 export {
-  isRedirectStatus,
   proxyMediaUrl
 };

package/dist/backend/api/database.js

@@ -1,15 +1,15 @@
 import {
   driver_exports
-} from "../../chunks/chunk-2U43BB6P.js";
-import "../../chunks/chunk-A42DP5T7.js";
-import "../../chunks/chunk-NLZLRQ5U.js";
-import "../../chunks/chunk-IL7FJQAY.js";
-import "../../chunks/chunk-M7KDJEGH.js";
+} from "../../chunks/chunk-QJGGYF6E.js";
+import "../../chunks/chunk-QSN6RH6X.js";
+import "../../chunks/chunk-ETWOY4AL.js";
+import "../../chunks/chunk-66YZ47TY.js";
+import "../../chunks/chunk-AIU6CMVT.js";
 import "../../chunks/chunk-N47Y62CI.js";
 import "../../chunks/chunk-QBPYWU6C.js";
 import "../../chunks/chunk-2BJ2IFQM.js";
 import "../../chunks/chunk-XCZXR3C2.js";
-import "../../chunks/chunk-TFMUSWGG.js";
+import "../../chunks/chunk-MOWR65LM.js";
 import "../../chunks/chunk-76VMZTLN.js";
 import "../../chunks/chunk-2PIFHEYR.js";
 import "../../chunks/chunk-K62JP6HR.js";

package/dist/backend/store/GeneratedDatabase.d.ts

@@ -1,5 +1,8 @@
 import type { Config } from 'alinea/core/Config';
+import type { DatabaseHandle } from 'alinea/database/driver/DatabaseHandle';
 import { EntryStore } from 'alinea/database/EntryStore';
-import type { Database } from 'rado';
-/** Add one writable, connection-local layer over a generated database. */
-export declare function createGeneratedDatabase(config: Config, db: Database): Promise<EntryStore>;
+/**
+ * Serve a generated database from a connection that keeps its writes in
+ * memory, so syncs and commits never reach the generated file.
+ */
+export declare function createGeneratedDatabase(config: Config, { database: db, fork, driver }: DatabaseHandle): Promise<EntryStore>;

package/dist/backend/store/GeneratedDatabase.js

@@ -1,28 +1,30 @@
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/backend/store/GeneratedDatabase.ts
+import { DatabaseSource } from "alinea/database/DatabaseSource";
 import { assertReadableData } from "alinea/database/entry/EntryData";
 import { EntryDatabase } from "alinea/database/EntryDatabase";
 import { EntryStore } from "alinea/database/EntryStore";
-async function createGeneratedDatabase(config, db) {
+async function createGeneratedDatabase(config, { database: db, fork, driver }) {
   let initialTree;
-  const base = new EntryDatabase(config, db, {
+  const database = new EntryDatabase(config, db, {
+    fork,
     includedAtBuild(filePath) {
       return initialTree?.has(filePath) ?? false;
-    }
+    },
+    // Nothing reopens the in-memory writes: skip storing the synced tree.
+    recordsTree: false
   });
   try {
     await assertReadableData(db);
-    initialTree = await base.getTree();
-    const overlay = await base.createOverlay();
-    return new EntryStore(config, overlay.database, overlay.source, {
-      close: async () => {
-        await overlay.close();
-        await base.close();
-      }
+    initialTree = await database.getTree();
+    return new EntryStore(config, database, new DatabaseSource(database), {
+      ownsDatabase: true,
+      sourceFollowsDatabase: true,
+      driver
     });
   } catch (error) {
-    await base.close();
+    await database.close();
     throw error;
   }
 }

package/dist/backend/store/GeneratedDatabaseNode.d.ts

@@ -1,4 +1,4 @@
 import type { Config } from 'alinea/core/Config';
 import type { DatabaseOptions } from 'rado';
-/** Open the traced generated file through the native SQLite driver. */
+/** Open the traced generated file as an in-memory overlay. */
 export declare function generatedDatabase(config: Config, options?: DatabaseOptions): Promise<import("../../database/EntryStore.js").EntryStore>;

package/dist/backend/store/GeneratedDatabaseNode.js

@@ -19,7 +19,7 @@ function generatedDatabase(config, options = {}) {
     store = generatedDatabasePath().then(
       (path) => runtimeDatabase({
         path,
-        readonly: true,
+        overlay: true,
         logQuery: (query, durationMs) => loggers.get(config)?.(query, durationMs)
       })
     ).then((db) => createGeneratedDatabase(config, db));