alinea 1.3.1 → 1.4.0-preview.0

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

@@ -1,5 +1,5 @@
 {
-  "_id": "2ygHI5LHHVmR2H8kYrePnoHLbcB",
+  "_id": "2zEEsGEasvfbFJSwme8hbd6n5z2",
   "_type": "Page",
   "_index": "a0",
   "_seeded": "welcome.json",

package/dist/LICENSES.md

@@ -26,33 +26,6 @@ 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-query@3.39.3 (MIT)
-
-MIT License
-
-Copyright (c) 2019 Tanner Linsley
-
-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.
-
-
 ===
 
 # lib0@0.2.88 (MIT)
@@ -131,28 +104,29 @@ IN THE SOFTWARE.
 
 ===
 
-# @popperjs/core@2.11.8 (MIT)
+# react-query@3.39.3 (MIT)
 
-The MIT License (MIT)
+MIT License
 
-Copyright (c) 2019 Federico Zivolo
+Copyright (c) 2019 Tanner Linsley
 
-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:
+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.
+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.
 
 
 ===
@@ -206,6 +180,32 @@ THIS IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRE
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+===
+
+# @popperjs/core@2.11.8 (MIT)
+
+The MIT License (MIT)
+
+Copyright (c) 2019 Federico Zivolo
+
+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.
+
+
 ===
 
 # prop-types@15.8.1 (MIT)
@@ -440,18 +440,6 @@ SOFTWARE.
    limitations under the License.
 
 
-===
-
-# @headless-tree/react@0.0.15 (MIT)
-
-MIT
-
-===
-
-# @headless-tree/core@0.0.15 (MIT)
-
-MIT
-
 ===
 
 # react-is@16.13.1 (MIT)
@@ -496,6 +484,18 @@ The above copyright notice and this permission notice shall be included in all c
 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.
 
 
+===
+
+# @headless-tree/core@0.0.15 (MIT)
+
+MIT
+
+===
+
+# @headless-tree/react@0.0.15 (MIT)
+
+MIT
+
 ===
 
 # y-prosemirror@1.2.15 (MIT)
@@ -1585,6 +1585,33 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+===
+
+# @tanstack/virtual-core@3.10.6 (MIT)
+
+MIT License
+
+Copyright (c) 2021-present Tanner Linsley
+
+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/utils@3.10.5 (Apache-2.0)
@@ -1790,30 +1817,3 @@ limitations under the License.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-
-
-===
-
-# @tanstack/virtual-core@3.10.6 (MIT)
-
-MIT License
-
-Copyright (c) 2021-present Tanner Linsley
-
-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.

package/dist/adapter/next/cms.js

@@ -63,7 +63,7 @@ var NextCMS = class extends CMS {
     const { PHASE_PRODUCTION_BUILD } = await import("next/constants");
     const isBuild = process.env.NEXT_PHASE === PHASE_PRODUCTION_BUILD;
     const { db, previews } = await this.init;
-    const sync = () => db.syncWith(client);
+    const sync = () => db.syncWith(client).catch(console.error);
     if (!isBuild) {
       if (preview) {
         preview = await previews.parse(preview, sync);

package/dist/backend/Handler.js

@@ -16,6 +16,7 @@ import { JWTPreviews } from "alinea/backend/util/JWTPreviews";
 import { CloudRemote } from "alinea/cloud/CloudRemote";
 import { HttpError } from "alinea/core/HttpError";
 import { getScope } from "alinea/core/Scope";
+import { ShaMismatchError } from "alinea/core/source/ShaMismatchError";
 import { base64 } from "alinea/core/util/Encoding";
 import { HandleAction } from "./HandleAction.js";
 import { createPreviewParser } from "./resolver/ParsePreview.js";
@@ -118,14 +119,24 @@ function createHandler({
         expectUser();
         expectJson();
         const mutations = await body;
-        const request2 = await local.request(mutations);
-        const { sha } = await cnx.write(request2);
-        if (sha === request2.intoSha) {
-          await local.write(request2);
-        } else {
+        const attempt = async (retry = 0) => {
           await local.syncWith(cnx);
-        }
-        return Response.json({ sha });
+          const request2 = await local.request(mutations);
+          try {
+            let { sha } = await cnx.write(request2);
+            if (sha === request2.intoSha) {
+              await local.write(request2);
+            } else {
+              sha = await local.syncWith(cnx);
+            }
+            return sha;
+          } catch (error) {
+            if (error instanceof ShaMismatchError && retry < 3)
+              return attempt(retry + 1);
+            throw error;
+          }
+        };
+        return Response.json({ sha: await attempt() });
       }
       if (action === HandleAction.Commit && request.method === "POST") {
         throw new Error("Mutations expected");
@@ -141,7 +152,7 @@ function createHandler({
       if (action === HandleAction.Tree && request.method === "GET") {
         expectJson();
         const sha = string(url.searchParams.get("sha"));
-        await periodicSync(cnx);
+        await local.syncWith(cnx);
         const tree = await local.getTreeIfDifferent(sha);
         return Response.json(tree ?? null);
       }

package/dist/backend/api/GithubApi.js

@@ -5,6 +5,7 @@ import { HttpError } from "alinea/core/HttpError";
 import {
   GithubSource
 } from "alinea/core/source/GithubSource";
+import { ShaMismatchError } from "alinea/core/source/ShaMismatchError";
 import { base64, btoa } from "alinea/core/util/Encoding";
 import { join } from "alinea/core/util/Paths";
 var GithubApi = class extends GithubSource {
@@ -14,6 +15,10 @@ var GithubApi = class extends GithubSource {
     this.#options = options;
   }
   async write(request) {
+    const currentCommit = await getLatestCommitOid(this.#options);
+    const currentSha = await this.shaAt(currentCommit);
+    if (currentSha !== request.fromSha)
+      throw new ShaMismatchError(currentSha, request.fromSha);
     const { author } = this.#options;
     let commitMessage = request.description;
     if (author) {
@@ -21,8 +26,13 @@ var GithubApi = class extends GithubSource {
 
 Co-authored-by: ${author.name} <${author.email}>`;
     }
-    await applyChangesToRepo(this.#options, request.changes, commitMessage);
-    return this.getTree().then((tree) => ({ sha: tree.sha }));
+    const newCommit = await applyChangesToRepo(
+      this.#options,
+      currentCommit,
+      request.changes,
+      commitMessage
+    );
+    return { sha: await this.shaAt(newCommit) };
   }
   async revisions(file) {
     return getFileCommitHistory(this.#options, file);
@@ -51,6 +61,13 @@ function graphQL(query, variables, token) {
   }).then(async (response) => {
     if (response.ok) return response.json();
     throw new HttpError(response.status, await response.text());
+  }).then((result) => {
+    if (Array.isArray(result.errors) && result.errors.length > 0) {
+      const message = result.errors.map((e) => e.message).join("; ");
+      console.trace(result.errors);
+      throw new Error(message);
+    }
+    return result;
   });
 }
 async function getFileCommitHistory({ owner, repo, branch, authToken, rootDir }, file) {
@@ -104,7 +121,7 @@ async function getFileContentAtCommit({ owner, repo, authToken, rootDir }, file,
   );
   return result.data.repository.object?.text;
 }
-async function applyChangesToRepo(options, changes, commitMessage) {
+async function applyChangesToRepo(options, expectedHeadOid, changes, commitMessage) {
   const { additions, deletions } = await processChanges(options, changes);
   const { owner, repo, branch, authToken } = options;
   return graphQL(
@@ -121,18 +138,32 @@ async function applyChangesToRepo(options, changes, commitMessage) {
           repositoryNameWithOwner: `${owner}/${repo}`,
           branchName: branch
         },
-        message: {
-          headline: commitMessage
-        },
-        fileChanges: {
-          additions,
-          deletions
-        },
-        expectedHeadOid: await getLatestCommitOid(options)
+        message: { headline: commitMessage },
+        fileChanges: { additions, deletions },
+        expectedHeadOid
       }
     },
     authToken
-  ).then((result) => result.data.createCommitOnBranch.commit.oid);
+  ).then((result) => {
+    const commitId = result.data.createCommitOnBranch.commit.oid;
+    return commitId;
+  }).catch((error) => {
+    if (error instanceof Error) {
+      const mismatchMessage = /is at ([a-z0-9]+) but expected ([a-z0-9]+)/;
+      const match = error.message.match(mismatchMessage);
+      if (match) {
+        const [_, actual, expected] = match;
+        throw new ShaMismatchError(actual, expected);
+      }
+      const expectedMessage = /Expected branch to point to "([a-z0-9]+)"/;
+      const expectedMatch = error.message.match(expectedMessage);
+      if (expectedMatch) {
+        const actualSha = expectedMatch[1];
+        throw new ShaMismatchError(actualSha, expectedHeadOid);
+      }
+    }
+    throw error;
+  });
 }
 async function processChanges({ rootDir, contentDir }, changes) {
   const additions = Array();

package/dist/chunks/{chunk-V4O6S3PC.js → chunk-LIA6NPBB.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "1.3.1",
+  version: "1.4.0-preview.0",
   description: "Headless git-based CMS",
   repository: {
     type: "git",

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-V4O6S3PC.js";
+} from "../chunks/chunk-LIA6NPBB.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // src/cli/Serve.ts

package/dist/cli/bin.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-V4O6S3PC.js";
+} from "../chunks/chunk-LIA6NPBB.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // node_modules/mri/lib/index.mjs

package/dist/cloud/CloudRemote.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-V4O6S3PC.js";
+} from "../chunks/chunk-LIA6NPBB.js";
 import {
   PLazy
 } from "../chunks/chunk-IKINPSS5.js";
@@ -18,6 +18,7 @@ import {
 import { HttpError } from "alinea/core/HttpError";
 import { Outcome, outcome } from "alinea/core/Outcome";
 import { Workspace } from "alinea/core/Workspace";
+import { ShaMismatchError } from "alinea/core/source/ShaMismatchError";
 import { ReadonlyTree } from "alinea/core/source/Tree";
 import { base64 } from "alinea/core/util/Encoding";
 import { verify } from "alinea/core/util/JWT";
@@ -100,7 +101,14 @@ var CloudRemote = class {
           })
         })
       )
-    );
+    ).catch((error) => {
+      if (error instanceof HttpError && error.code === 409) {
+        const actual = "actualSha" in error && error.actualSha;
+        const expected = "expectedSha" in error && error.expectedSha;
+        if (actual && expected) throw new ShaMismatchError(actual, expected);
+      }
+      throw error;
+    });
   }
   async authenticate(request) {
     const ctx = this.#context;
@@ -325,15 +333,21 @@ function json(init = {}) {
   headers.set("accept", "application/json");
   return { ...init, headers };
 }
-async function failOnHttpError(res) {
-  if (res.status >= 400) throw new HttpError(res.status, await res.text());
-  return res;
+async function failOnHttpError(response) {
+  if (!response.ok) throw new HttpError(response.status, await response.text());
+  return response;
 }
-function parseJson(res) {
-  return res.json();
-}
-function parseOutcome(res) {
-  return res.then(failOnHttpError).then(parseJson).then(Outcome.fromJSON).then(Outcome.unpack);
+async function parseOutcome(expected) {
+  const response = await expected;
+  const contentType = response.headers.get("content-type");
+  const isJson = contentType?.includes("application/json");
+  if (!response.ok && !isJson) {
+    const message = await response.text();
+    throw new HttpError(response.status, message);
+  }
+  const output = await response.json();
+  const outcome2 = Outcome.fromJSON(output, response.status);
+  return Outcome.unpack(outcome2);
 }
 export {
   COOKIE_NAME,

package/dist/core/Graph.js

@@ -9,8 +9,9 @@ var Graph = class {
     return this.resolve({ ...query, first: true });
   }
   async get(query) {
+    const error = globalThis.Bun ? new Error("Entry not found") : void 0;
     const result = await this.resolve({ ...query, get: true });
-    if (!result) throw new Error("Entry not found");
+    if (!result) throw error ?? new Error("Entry not found");
     return result;
   }
   count(query) {

package/dist/core/Outcome.d.ts

@@ -1,3 +1,4 @@
+import { type ErrorCode } from './HttpError.js';
 type ErrorObject = {
     stack?: string;
     message?: string;
@@ -21,7 +22,7 @@ export declare namespace outcome {
 }
 export type Outcome<T = void> = Outcome.OutcomeImpl<T> & Pair<T>;
 export declare namespace Outcome {
-    export function fromJSON<T>(json: OutcomeJSON<T>): Outcome<T>;
+    export function fromJSON<T>(json: OutcomeJSON<T>, status?: ErrorCode): Outcome<T>;
     export function unpack<T>(outcome: Outcome<T>): T;
     export function isOutcome(value: any): value is Outcome;
     export function Success<T>(data: T): Outcome<T>;

package/dist/core/Outcome.js

@@ -2,6 +2,7 @@ import "../chunks/chunk-NZLE2WMY.js";
 
 // src/core/Outcome.ts
 import { HttpError } from "./HttpError.js";
+import { assign } from "./util/Objects.js";
 function outcome(run) {
   try {
     if (typeof run === "function") {
@@ -37,16 +38,21 @@ function isPromiseLike(value) {
 })(outcome || (outcome = {}));
 var Outcome;
 ((Outcome2) => {
-  function fromJSON(json) {
+  function fromJSON(json, status) {
     if (json.success) return Success(json.data);
-    const error = new HttpError(json.error.status, json.error.message);
-    error.stack = json.error.stack;
+    const error = new HttpError(
+      json.error.status ?? status ?? 500,
+      json.error.message ?? "Unknown error"
+    );
+    assign(error, json.error);
+    if (json.error.stack) error.stack = json.error.stack;
     return Failure(error);
   }
   Outcome2.fromJSON = fromJSON;
   function unpack(outcome2) {
     if (outcome2.isSuccess()) return outcome2.value;
-    throw outcome2.error;
+    if (outcome2.isFailure()) throw outcome2.error;
+    throw new Error("Outcome is neither success nor failure");
   }
   Outcome2.unpack = unpack;
   function isOutcome(value) {

package/dist/core/db/EntryIndex.d.ts

@@ -1,6 +1,5 @@
 import { Config } from 'alinea/core/Config';
-import type { Entry } from 'alinea/core/Entry';
-import type { EntryStatus } from 'alinea/core/Entry';
+import type { Entry, EntryStatus } from 'alinea/core/Entry';
 import type { ChangesBatch } from '../source/Change.js';
 import { type Source } from '../source/Source.js';
 import { ReadonlyTree } from '../source/Tree.js';
@@ -31,12 +30,19 @@ export declare class EntryIndex extends EventTarget {
     indexChanges(batch: ChangesBatch): Promise<string>;
     updateSearch(entry: Entry): Promise<void>;
 }
+declare class Versions extends Map<EntryStatus, Entry> {
+    inheritedStatus: EntryStatus | undefined;
+    setInherited(parentStatus: EntryStatus | undefined): void;
+    get active(): Entry | undefined;
+    get main(): Entry | undefined;
+    versions(): Generator<Entry>;
+}
 declare class EntryNode {
     #private;
     id: string;
     type: string;
     byFile: Map<string, Entry>;
-    locales: Map<string | null, Map<EntryStatus, Entry>>;
+    locales: Map<string | null, Versions>;
     constructor(config: Config, from: Entry);
     get index(): string;
     get parentId(): string | null;