alinea 2.0.0-preview.1 → 2.0.0-preview.3

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

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

package/dist/LICENSES.md

@@ -55,7 +55,7 @@ SOFTWARE.
 
 ===
 
-# react-stately@3.46.0 (Apache-2.0)
+# react-aria-components@1.17.0 (Apache-2.0)
 
                                  Apache License
                            Version 2.0, January 2004
@@ -469,7 +469,34 @@ SOFTWARE.
 
 ===
 
-# react-aria-components@1.17.0 (Apache-2.0)
+# @tiptap/core@3.30.5 (MIT)
+
+MIT License
+
+Copyright (c) 2025, Tiptap GmbH
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+===
+
+# react-stately@3.46.0 (Apache-2.0)
 
                                  Apache License
                            Version 2.0, January 2004
@@ -937,7 +964,7 @@ SOFTWARE.
 
 ===
 
-# @tiptap/core@3.27.3 (MIT)
+# @tiptap/extension-list@3.30.5 (MIT)
 
 MIT License
 
@@ -964,11 +991,11 @@ SOFTWARE.
 
 ===
 
-# fp16@1.0.0 (MIT)
+# use-sync-external-store@1.6.0 (MIT)
 
 MIT License
 
-Copyright (c) 2021 Joel Gustafson
+Copyright (c) Meta Platforms, Inc. and affiliates.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -1014,11 +1041,11 @@ IN THE SOFTWARE.
 
 ===
 
-# use-sync-external-store@1.6.0 (MIT)
+# fp16@1.0.0 (MIT)
 
 MIT License
 
-Copyright (c) Meta Platforms, Inc. and affiliates.
+Copyright (c) 2021 Joel Gustafson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/adapter/next/DevRemote.d.ts

@@ -0,0 +1,3 @@
+import type { RemoteConnection, RequestContext } from 'alinea/core/Connection';
+import type { Config } from 'alinea/core/Config';
+export declare function createDevRemote(context: RequestContext, config: Config): RemoteConnection;

package/dist/adapter/next/DevRemote.js

@@ -0,0 +1,37 @@
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/adapter/next/DevRemote.ts
+import { composeBackend } from "alinea/backend/api/CreateBackend";
+import { MissingCredentialsError } from "alinea/backend/Auth";
+import { AuthResultType } from "alinea/cloud/AuthResult";
+import { Client } from "alinea/core/Client";
+function createDevRemote(context, config) {
+  const client = new Client({
+    config,
+    url: context.handlerUrl.href,
+    applyAuth: context.applyAuth
+  });
+  const auth = {
+    async authenticate() {
+      return Response.json({ type: AuthResultType.Authenticated });
+    },
+    async verify() {
+      const user = await client.user();
+      if (!user)
+        throw new MissingCredentialsError(
+          "Missing forwarded development authentication"
+        );
+      return { ...context, user, token: "dev" };
+    }
+  };
+  const connection = {
+    getTreeIfDifferent: (sha) => client.getTreeIfDifferent(sha),
+    getBlobs: (shas, options) => client.getBlobs(shas, options),
+    write: (request) => client.write(request),
+    enrichUser: async (input) => input
+  };
+  return composeBackend(connection, auth);
+}
+export {
+  createDevRemote
+};

package/dist/adapter/next/ForwardCredentials.d.ts

@@ -0,0 +1 @@
+export declare function forwardDevelopmentCredentials(request: Request | undefined, apiKey: string, init?: RequestInit): RequestInit;

package/dist/adapter/next/ForwardCredentials.js

@@ -0,0 +1,17 @@
+import "../../chunks/chunk-CQ52GEHY.js";
+
+// src/adapter/next/ForwardCredentials.ts
+import { developmentKeyHeader } from "alinea/core/Connection";
+import { Headers } from "@alinea/iso";
+function forwardDevelopmentCredentials(request, apiKey, init) {
+  const headers = new Headers(init?.headers);
+  const cookie = request?.headers.get("cookie");
+  const authorization = request?.headers.get("authorization");
+  if (cookie) headers.set("cookie", cookie);
+  if (authorization) headers.set("authorization", authorization);
+  headers.set(developmentKeyHeader, apiKey);
+  return { ...init, headers };
+}
+export {
+  forwardDevelopmentCredentials
+};

package/dist/adapter/next/cms.js

@@ -4,14 +4,20 @@ import {
 import "../../chunks/chunk-CQ52GEHY.js";
 
 // src/adapter/next/cms.tsx
+import {
+  applyPreview as applyPreviewUpdate,
+  decodePreviewRequest
+} from "alinea/backend/resolver/ParsePreview";
 import { createThrottledSync } from "alinea/backend/util/Syncable";
 import { Client } from "alinea/core/Client";
 import { CMS } from "alinea/core/CMS";
 import { Config } from "alinea/core/Config";
 import { LocalDB } from "alinea/core/db/LocalDB";
 import { outcome } from "alinea/core/Outcome";
+import { trace } from "alinea/core/Trace";
 import { getPreviewPayloadFromCookies } from "alinea/preview/PreviewCookies";
 import { Headers } from "@alinea/iso";
+import { cache } from "react";
 import { requestContext } from "./context.js";
 import { jsx } from "react/jsx-runtime";
 var NextCMS = class extends CMS {
@@ -22,46 +28,75 @@ var NextCMS = class extends CMS {
   bundledDb = PLazy.from(async () => {
     if (process.env.NEXT_RUNTIME === "edge")
       throw new Error("Local DB is not supported in Edge runtime environments.");
-    const { generatedSource } = await import("alinea/backend/store/GeneratedSource");
-    const source = await generatedSource;
-    const db = new LocalDB(this.config, source);
-    await db.sync();
-    return db;
-  });
-  async resolve(query) {
-    let status = query.status;
-    const { handlerUrl, apiKey } = await requestContext(this.config);
-    const client = new Client({
-      config: this.config,
-      url: handlerUrl.href,
-      applyAuth: (init) => {
-        const headers = new Headers(init?.headers);
-        headers.set("Authorization", `Bearer ${apiKey}`);
-        return { ...init, headers };
-      }
+    const span = trace(this.config, "alinea.next.cms.db");
+    return span(async () => {
+      const { generatedSource } = await import("alinea/backend/store/GeneratedSource");
+      const source = await generatedSource;
+      const db = new LocalDB(this.config, source);
+      await db.sync();
+      return db;
     });
-    let preview;
+  });
+  #applyPreview = cache(async () => {
+    const context = await requestContext(this.config);
+    const isEdge = process.env.NEXT_RUNTIME === "edge";
+    const { PHASE_PRODUCTION_BUILD } = await import("next/constants.js");
+    const isBuild = process.env.NEXT_PHASE === PHASE_PRODUCTION_BUILD;
+    const useLocalDb = !isEdge && (!context.isDev || isBuild);
     const { cookies, draftMode } = await import("next/headers.js");
     const [isDraft] = await outcome(async () => (await draftMode()).isEnabled);
-    if (isDraft) {
-      if (!status) status = "preferDraft";
-      const cookie = await cookies();
-      const payload = getPreviewPayloadFromCookies(cookie.getAll());
-      if (payload) preview = { payload };
+    if (!isDraft)
+      return { context, hasPreview: false, isDraft, isBuild, useLocalDb };
+    const cookie = await cookies();
+    const payload = getPreviewPayloadFromCookies(cookie.getAll());
+    if (!payload)
+      return {
+        context,
+        hasPreview: false,
+        isDraft,
+        isBuild,
+        preview: void 0,
+        useLocalDb
+      };
+    let preview = { payload };
+    if (useLocalDb) {
+      const db = await this.bundledDb;
+      const decoded = await decodePreviewRequest(preview);
+      preview = await this.#prepareLocalPreview(db, decoded, context);
+    }
+    return { context, hasPreview: true, isDraft, isBuild, preview, useLocalDb };
+  });
+  async #prepareLocalPreview(db, decoded, context) {
+    if ("entry" in decoded) return decoded;
+    if (db.sha === decoded.contentHash) return applyPreviewUpdate(db, decoded);
+    const source = await db.source.getTree();
+    if (source.sha === decoded.contentHash) {
+      await db.sync();
+      return applyPreviewUpdate(db, decoded);
+    }
+    const applied = await applyPreviewUpdate(db, decoded);
+    if (applied) return applied;
+    await db.syncWith(createClient(this.config, context));
+    return applyPreviewUpdate(db, decoded);
+  }
+  async resolve(query) {
+    let status = query.status;
+    const { context, hasPreview, isDraft, isBuild, preview, useLocalDb } = await this.#applyPreview();
+    if (isDraft && !status) status = "preferDraft";
+    const request = { ...query, preview, status };
+    const client = createClient(this.config, context);
+    if (!useLocalDb) {
+      const span = trace(this.config, "alinea.cms.resolve.client");
+      return span(() => client.resolve(request));
     }
-    const { PHASE_PRODUCTION_SERVER, PHASE_PRODUCTION_BUILD } = await import("next/constants.js");
-    const isEdge = process.env.NEXT_RUNTIME === "edge";
-    const isServer = process.env.NEXT_PHASE === PHASE_PRODUCTION_SERVER;
-    const isBuild = process.env.NEXT_PHASE === PHASE_PRODUCTION_BUILD;
-    const request = { preview, ...query, status };
-    const useLocalDb = !isEdge && (isServer || isBuild);
-    if (!useLocalDb) return client.resolve(request);
     const db = await this.bundledDb;
-    await this.throttle(() => db.syncWith(client), request.syncInterval);
+    const syncInterval = request.disableSync ? Number.POSITIVE_INFINITY : request.syncInterval ?? this.config.syncInterval;
+    if (hasPreview) return db.resolve(request);
+    if (!isBuild) await this.throttle(() => db.syncWith(client), syncInterval);
     return db.resolve(request);
   }
   async #authenticatedClient() {
-    const { handlerUrl, apiKey } = await requestContext(this.config);
+    const context = await requestContext(this.config);
     const authCookies = [];
     try {
       const { cookies } = await import("next/headers.js");
@@ -75,16 +110,16 @@ var NextCMS = class extends CMS {
     }
     return new Client({
       config: this.config,
-      url: handlerUrl.href,
+      url: context.handlerUrl.href,
       applyAuth: (init) => {
         const headers = new Headers(init?.headers);
-        headers.set("Authorization", `Bearer ${apiKey}`);
         if (authCookies.length) {
-          for (const [name, value] of authCookies) {
-            headers.set("Cookie", `${name}=${value}`);
-          }
+          headers.set(
+            "Cookie",
+            authCookies.map(([name, value]) => `${name}=${value}`).join("; ")
+          );
         }
-        return { ...init, headers };
+        return applyContextAuth(context, { ...init, headers });
       }
     });
   }
@@ -126,6 +161,19 @@ var NextCMS = class extends CMS {
 function createCMS(config) {
   return new NextCMS(config);
 }
+function createClient(config, context) {
+  return new Client({
+    config,
+    url: context.handlerUrl.href,
+    applyAuth: (init) => applyContextAuth(context, init)
+  });
+}
+function applyContextAuth(context, init) {
+  if (context.applyAuth) return context.applyAuth(init);
+  const headers = new Headers(init?.headers);
+  headers.set("Authorization", `Bearer ${context.apiKey}`);
+  return { ...init, headers };
+}
 export {
   NextCMS,
   createCMS

package/dist/adapter/next/context.d.ts

@@ -1,3 +1,3 @@
 import { Config } from 'alinea/core/Config';
 import type { RequestContext } from 'alinea/core/Connection';
-export declare function requestContext(config: Config): Promise<RequestContext>;
+export declare function requestContext(config: Config, request?: Request): Promise<RequestContext>;

package/dist/adapter/next/context.js

@@ -3,16 +3,24 @@ import "../../chunks/chunk-CQ52GEHY.js";
 // src/adapter/next/context.ts
 import { generatedRelease } from "alinea/backend/store/GeneratedRelease";
 import { Config } from "alinea/core/Config";
-async function requestContext(config) {
+import { forwardDevelopmentCredentials } from "./ForwardCredentials.js";
+async function requestContext(config, request) {
   const apiKey = process.env.ALINEA_API_KEY || (process.env.NODE_ENV === "development" ? "dev" : await generatedRelease);
   const dev = process.env.ALINEA_DEV_SERVER;
-  if (dev) return { isDev: true, handlerUrl: new URL("/api", dev), apiKey };
+  if (dev) {
+    return {
+      isDev: true,
+      handlerUrl: new URL("/api", dev),
+      apiKey,
+      applyAuth: (init) => forwardDevelopmentCredentials(request, apiKey, init)
+    };
+  }
   const nodeEnv = process.env.NODE_ENV;
   const baseUrl = Config.baseUrl(config, nodeEnv);
   if (!baseUrl) throw new Error(`Missing baseUrl in config for ${nodeEnv}`);
   return {
     isDev: false,
-    handlerUrl: new URL(config.handlerUrl ?? "/api/cms", baseUrl),
+    handlerUrl: new URL(Config.handlerUrl(config), baseUrl),
     apiKey
   };
 }

package/dist/adapter/next/handler.d.ts

@@ -1,5 +1,6 @@
 import { type BackendFactory, type BackendOptions } from 'alinea/backend/api/CreateBackend';
 import { type HandlerHooks } from 'alinea/backend/Handler';
+import { Config } from 'alinea/core/Config';
 import { NextCMS } from './cms.js';
 type Handler = (request: Request) => Promise<Response>;
 export interface NextHandlerOptions extends HandlerHooks {
@@ -7,4 +8,5 @@ export interface NextHandlerOptions extends HandlerHooks {
     backend?: BackendFactory | BackendOptions;
 }
 export declare function createHandler(input: NextCMS | NextHandlerOptions): Handler;
+export declare function handlerPathname(config: Config, requestUrl: URL): string;
 export {};

package/dist/adapter/next/handler.js

@@ -13,22 +13,26 @@ import {
 import { generatedSource } from "alinea/backend/store/GeneratedSource";
 import { JWTPreviews } from "alinea/backend/util/JWTPreviews";
 import { CloudRemote } from "alinea/cloud/CloudRemote";
+import { Config } from "alinea/core/Config";
 import { LocalDB } from "alinea/core/db/LocalDB";
+import { trace } from "alinea/core/Trace";
 import { NextCMS } from "./cms.js";
 import { requestContext } from "./context.js";
-var handlers = /* @__PURE__ */ new WeakMap();
+import { createDevRemote } from "./DevRemote.js";
 function createHandler(input) {
   const options = input instanceof NextCMS ? { cms: input } : input;
-  if (handlers.has(options.cms)) return handlers.get(options.cms);
   const config = options.cms.config;
   const backend = typeof options.backend === "function" ? options.backend : options.backend ? backendFromOptions(options.backend) : (context) => new CloudRemote(context, config);
-  const remote = (context) => backend(context, config);
-  const db = PLazy.from(async () => {
-    const source = await generatedSource;
-    const db2 = new LocalDB(config, source);
-    await db2.sync();
-    return db2;
-  });
+  const remote = (context) => context.isDev ? createDevRemote(context, config) : backend(context, config);
+  const span = trace(config, "alinea.next.handler.db");
+  const db = PLazy.from(
+    () => span(async () => {
+      const source = await generatedSource;
+      const db2 = new LocalDB(config, source);
+      await db2.sync();
+      return db2;
+    })
+  );
   const handleBackend = createCoreHandler({
     ...options,
     remote,
@@ -37,9 +41,9 @@ function createHandler(input) {
   const handle = async (request) => {
     const url = new URL(request.url);
     const { searchParams } = url;
-    const context = await requestContext(config);
-    const handlerPath = config.handlerUrl ?? "/api/cms";
-    if (!url.pathname.startsWith(handlerPath))
+    const context = await requestContext(config, request);
+    const handlerPath = handlerPathname(config, url);
+    if (url.pathname !== handlerPath)
       return new Response(`Expected handler to be served on ${handlerPath}`, {
         status: 400
       });
@@ -48,7 +52,8 @@ function createHandler(input) {
       const previewToken = searchParams.get("preview");
       if (previewToken) {
         const { draftMode } = await import("next/headers");
-        await previews.verify(previewToken);
+        const dm = await draftMode();
+        if (!dm.isEnabled) await previews.verify(previewToken);
         const source = new URL(request.url);
         if (source.hostname === "0.0.0.0") source.hostname = "localhost";
         const returnTo = searchParams.get("returnTo") ?? "/";
@@ -57,7 +62,6 @@ function createHandler(input) {
         const location = new URL(returnTo, source.origin);
         if (location.origin !== source.origin)
           throw new Error("Invalid preview return origin");
-        const dm = await draftMode();
         dm.enable();
         return new Response("Redirecting...", {
           status: 302,
@@ -70,9 +74,12 @@ function createHandler(input) {
       return new Response("Internal server error", { status: 500 });
     }
   };
-  handlers.set(options.cms, handle);
   return handle;
 }
+function handlerPathname(config, requestUrl) {
+  return new URL(Config.handlerUrl(config), requestUrl).pathname;
+}
 export {
-  createHandler
+  createHandler,
+  handlerPathname
 };

package/dist/adapter/next/previews.js

@@ -37,12 +37,14 @@ function NextPreviews({
     if (widget) registerPreviewWidget();
   }, [widget]);
   if (!widget) return null;
+  const isFullPage = window.parent === window;
+  if (isFullPage && isPreviewing && !previewDisabled) return null;
   return /* @__PURE__ */ jsx(
     "alinea-preview",
     {
       adminUrl: String(adminUrl),
       editUrl: String(editUrl),
-      livePreview: isLoading ? "loading" : isPreviewing ? previewDisabled ? "warning" : "connected" : void 0
+      livePreview: isPreviewing ? isLoading ? "loading" : previewDisabled ? "warning" : "connected" : void 0
     }
   );
 }

package/dist/adapter/next/previews.spec.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -10,12 +10,13 @@ function createCMS() {
   );
 }
 function withAlinea(config = {}) {
-  const adminPath = resolveAdminPath();
-  if (!adminPath) {
+  const settings = resolveSettings(config);
+  if (!settings) {
     console.warn(
-      "Alinea dashboard settings could not be loaded; dashboard routing is disabled. Run Next.js through the Alinea CLI and deploy @alinea/generated."
+      "Alinea dashboard settings were not provided; dashboard routing is disabled. Run Next.js through the Alinea CLI."
     );
   }
+  const adminPath = settings?.adminPath;
   let nextVersion = 15;
   try {
     const require2 = createRequire(resolve("./index.js"));
@@ -39,6 +40,10 @@ function withAlinea(config = {}) {
   };
   const redirects = adminPath ? createRedirects(config, adminPath) : config.redirects;
   const rewrites = adminPath ? createRewrites(config, adminPath) : config.rewrites;
+  const env = settings ? {
+    ...config.env,
+    ALINEA_ADMIN_PATH: settings.adminPath
+  } : config.env;
   if (nextVersion < 15)
     return {
       ...config,
@@ -51,7 +56,8 @@ function withAlinea(config = {}) {
       },
       images,
       redirects,
-      rewrites
+      rewrites,
+      env
     };
   return {
     ...config,
@@ -61,7 +67,8 @@ function withAlinea(config = {}) {
     ],
     images,
     redirects,
-    rewrites
+    rewrites,
+    env
   };
 }
 function createRedirects(config, adminPath) {
@@ -124,17 +131,12 @@ function createRewrites(config, adminPath) {
     };
   };
 }
-function resolveAdminPath() {
-  try {
-    const require2 = createRequire(resolve("./index.js"));
-    const location = require2.resolve("@alinea/generated/settings.json");
-    const settings = JSON.parse(
-      readFileSync(location, "utf-8")
-    );
-    if (typeof settings.adminPath === "string" && settings.adminPath)
-      return normalizeBasePath(settings.adminPath);
-  } catch {
-  }
+function resolveSettings(config) {
+  const adminPath = config.env?.ALINEA_ADMIN_PATH ?? process.env.ALINEA_ADMIN_PATH;
+  if (!adminPath) return;
+  return {
+    adminPath: normalizeBasePath(adminPath)
+  };
 }
 function normalizeBasePath(value) {
   return value.startsWith("/") ? value : `/${value}`;

package/dist/backend/Handler.d.ts

@@ -1,24 +1,25 @@
-import type { Entry } from 'alinea/core';
 import type { CMS } from 'alinea/core/CMS';
-import type { RemoteConnection, RequestContext } from 'alinea/core/Connection';
-import type { LocalDB } from 'alinea/core/db/LocalDB';
+import type { AuthedContext, RemoteConnection, RequestContext } from 'alinea/core/Connection';
+import { LocalDB } from 'alinea/core/db/LocalDB';
+import type { Mutation } from 'alinea/core/db/Mutation';
 export interface Handler {
     (request: Request, context: RequestContext): Promise<Response>;
 }
-export type HookResponse<T = void> = void | T | Promise<T> | Promise<void>;
+export type HookResponse<T = void> = void | T | Promise<void | T>;
+export interface BeforeCommitContext {
+    mutations: ReadonlyArray<Mutation>;
+}
+export interface AfterCommitContext extends BeforeCommitContext {
+    sha: string;
+}
 export interface HandlerHooks {
-    beforeCreate?(entry: Entry): HookResponse<Entry>;
-    afterCreate?(entry: Entry): HookResponse;
-    beforeUpdate?(entry: Entry): HookResponse<Entry>;
-    afterUpdate?(entry: Entry): HookResponse;
-    beforeArchive?(entryId: string): HookResponse;
-    afterArchive?(entryId: string): HookResponse;
-    beforeRemove?(entryId: string): HookResponse;
-    afterRemove?(entryId: string): HookResponse;
+    beforeCommit?(context: BeforeCommitContext): HookResponse<ReadonlyArray<Mutation>>;
+    afterCommit?(context: AfterCommitContext): HookResponse;
 }
 export interface HandlerOptions extends HandlerHooks {
     cms: CMS;
     db: LocalDB | Promise<LocalDB>;
     remote?: (context: RequestContext) => RemoteConnection;
+    forwardMutations?(request: Request, context: AuthedContext): Promise<Response | undefined>;
 }
-export declare function createHandler({ cms, remote, db, ...hooks }: HandlerOptions): Handler;
+export declare function createHandler({ cms, remote, db, forwardMutations, ...hooks }: HandlerOptions): Handler;