alinea 1.4.0-preview.0 → 1.4.0

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

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

package/dist/LICENSES.md

@@ -81,29 +81,6 @@ SOFTWARE.
 
 ===
 
-# htmlparser2@9.1.0 (MIT)
-
-Copyright 2010, 2011, Chris Winberry <chris@winberry.net>. All rights reserved.
-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-query@3.39.3 (MIT)
 
 MIT License
@@ -131,7 +108,30 @@ SOFTWARE.
 
 ===
 
-# domutils@3.1.0 (BSD-2-Clause)
+# htmlparser2@9.1.0 (MIT)
+
+Copyright 2010, 2011, Chris Winberry <chris@winberry.net>. All rights reserved.
+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.
+
+===
+
+# domhandler@5.0.3 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -148,7 +148,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# domhandler@5.0.3 (BSD-2-Clause)
+# entities@4.5.0 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -165,7 +165,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 ===
 
-# entities@4.5.0 (BSD-2-Clause)
+# domutils@3.1.0 (BSD-2-Clause)
 
 Copyright (c) Felix Böhm
 All rights reserved.
@@ -440,6 +440,23 @@ SOFTWARE.
    limitations under the License.
 
 
+===
+
+# dom-serializer@2.0.0 (MIT)
+
+License
+
+(The MIT License)
+
+Copyright (c) 2014 The cheeriojs contributors
+
+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-is@16.13.1 (MIT)
@@ -467,23 +484,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 
 
-===
-
-# dom-serializer@2.0.0 (MIT)
-
-License
-
-(The MIT License)
-
-Copyright (c) 2014 The cheeriojs contributors
-
-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.
-
-
 ===
 
 # @headless-tree/core@0.0.15 (MIT)
@@ -553,7 +553,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ===
 
-# @react-aria/focus@3.19.1 (Apache-2.0)
+# @react-aria/interactions@3.23.0 (Apache-2.0)
 
                                  Apache License
                            Version 2.0, January 2004
@@ -760,7 +760,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ===
 
-# @react-aria/interactions@3.23.0 (Apache-2.0)
+# @react-aria/focus@3.19.1 (Apache-2.0)
 
                                  Apache License
                            Version 2.0, January 2004
@@ -1585,33 +1585,6 @@ 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)
@@ -1817,3 +1790,30 @@ SOFTWARE.
    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/backend/api/GithubApi.d.ts

@@ -3,7 +3,6 @@ import type { EntryRecord } from 'alinea/core/EntryRecord';
 import type { CommitRequest } from 'alinea/core/db/CommitRequest';
 import { GithubSource, type GithubSourceOptions } from 'alinea/core/source/GithubSource';
 export interface GithubOptions extends GithubSourceOptions {
-    rootDir: string;
     author?: {
         name: string;
         email: string;

package/dist/backend/api/GithubApi.js

@@ -1,12 +1,14 @@
 import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/backend/api/GithubApi.ts
+import { parseCoAuthoredBy } from "alinea/cli/util/CommitMessage";
 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 { fileVersions } from "alinea/core/util/EntryFilenames";
 import { join } from "alinea/core/util/Paths";
 var GithubApi = class extends GithubSource {
   #options;
@@ -15,7 +17,7 @@ var GithubApi = class extends GithubSource {
     this.#options = options;
   }
   async write(request) {
-    const currentCommit = await getLatestCommitOid(this.#options);
+    const currentCommit = await this.#getLatestCommitOid();
     const currentSha = await this.shaAt(currentCommit);
     if (currentSha !== request.fromSha)
       throw new ShaMismatchError(currentSha, request.fromSha);
@@ -26,8 +28,7 @@ var GithubApi = class extends GithubSource {
 
 Co-authored-by: ${author.name} <${author.email}>`;
     }
-    const newCommit = await applyChangesToRepo(
-      this.#options,
+    const newCommit = await this.#applyChangesToRepo(
       currentCommit,
       request.changes,
       commitMessage
@@ -35,79 +36,108 @@ Co-authored-by: ${author.name} <${author.email}>`;
     return { sha: await this.shaAt(newCommit) };
   }
   async revisions(file) {
-    return getFileCommitHistory(this.#options, file);
+    return this.#getFileCommitHistory(file);
   }
   async revisionData(file, revisionId) {
-    const content = await getFileContentAtCommit(
-      this.#options,
-      file,
-      revisionId
-    );
+    const content = await this.#getFileContentAtCommit(file, revisionId);
     try {
       return content ? JSON.parse(content) : void 0;
     } catch (error) {
       return void 0;
     }
   }
-};
-function graphQL(query, variables, token) {
-  return fetch("https://api.github.com/graphql", {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({ query, variables })
-  }).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) {
-  const result = await graphQL(
-    `query GetFileHistory($owner: String!, $repo: String!, $branch: String!, $path: String!) {
-      repository(owner: $owner, name: $repo) {
-        ref(qualifiedName: $branch) {
-          target {
-            ... on Commit {
-              history(path: $path, first: 100) {
-                nodes {
-                  oid
-                  committedDate
-                  message
-                  author {
-                    name
-                    email
-                  }
-                }
-              }
+  async #graphQL(query, variables, token) {
+    return fetch("https://api.github.com/graphql", {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${token}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify({ query, variables })
+    }).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 #getFileCommitHistory(file) {
+    const { owner, repo, branch, authToken, rootDir } = this.#options;
+    const seen = /* @__PURE__ */ new Set();
+    const queue = fileVersions(file);
+    const allRevisions = Array();
+    const maxRequests = 3;
+    let requestCount = 0;
+    while (queue.length) {
+      if (requestCount === maxRequests) break;
+      requestCount++;
+      const versions = [...queue].filter((v) => !seen.has(v));
+      for (const v of versions) seen.add(v);
+      queue.length = 0;
+      const aliasMap = versions.map((v, idx) => ({
+        alias: `file${idx}`,
+        version: v,
+        path: join(rootDir, v)
+      }));
+      const query = aliasMap.map(
+        ({ alias, path }) => `
+          ${alias}: history(path: "${path}", first: 100) {
+            nodes {
+              oid
+              committedDate
+              message
+              author { name email }
+            }
+          }`
+      ).join("");
+      const gql = `
+        query GetFileHistory($owner: String!, $repo: String!, $branch: String!) {
+          repository(owner: $owner, name: $repo) {
+            ref(qualifiedName: $branch) {
+              target { ... on Commit {${query}} }
             }
           }
+        }`;
+      const result = await this.#graphQL(gql, { owner, repo, branch }, authToken);
+      for (const { alias, version, path } of aliasMap) {
+        const commits = result.data.repository.ref.target[alias]?.nodes || [];
+        if (!commits.length) continue;
+        allRevisions.push(
+          ...commits.map((commit) => ({
+            ref: commit.oid,
+            createdAt: new Date(commit.committedDate).getTime(),
+            file: version,
+            user: parseCoAuthoredBy(commit.message) ?? (commit.author ? { name: commit.author.name, email: commit.author.email } : void 0),
+            description: commit.message
+          }))
+        );
+        const earliest = commits[commits.length - 1].oid;
+        const res = await fetch(
+          `https://api.github.com/repos/${owner}/${repo}/commits/${earliest}`,
+          { headers: { Authorization: `Bearer ${authToken}` } }
+        );
+        if (!res.ok) throw new HttpError(res.status, await res.text());
+        const commitData = await res.json();
+        const fileEntry = Array.isArray(commitData.files) ? commitData.files.find((f) => f.filename === path) : void 0;
+        const prev = fileEntry?.previous_filename;
+        if (prev) {
+          const prefix = rootDir ? `${rootDir}/` : "";
+          const relative = prev.startsWith(prefix) ? prev.slice(prefix.length) : prev;
+          queue.push(...fileVersions(relative));
         }
       }
-    }`,
-    { owner, repo, branch, path: join(rootDir, file) },
-    authToken
-  );
-  const commits = result.data.repository.ref.target.history.nodes;
-  return commits.map((commit) => ({
-    ref: commit.oid,
-    createdAt: new Date(commit.committedDate).getTime(),
-    file,
-    user: commit.author ? { name: commit.author.name, email: commit.author.email } : void 0,
-    description: commit.message
-  }));
-}
-async function getFileContentAtCommit({ owner, repo, authToken, rootDir }, file, ref) {
-  const result = await graphQL(
-    `query GetFileContent($owner: String!, $repo: String!, $expression: String!) {
+    }
+    return allRevisions.sort((a, b) => b.createdAt - a.createdAt);
+  }
+  async #getFileContentAtCommit(file, ref) {
+    const { owner, repo, authToken, rootDir } = this.#options;
+    const result = await this.#graphQL(
+      `query GetFileContent($owner: String!, $repo: String!, $expression: String!) {
       repository(owner: $owner, name: $repo) {
         object(expression: $expression) {
           ... on Blob {
@@ -116,97 +146,94 @@ async function getFileContentAtCommit({ owner, repo, authToken, rootDir }, file,
         }
       }
     }`,
-    { owner, repo, expression: `${ref}:${join(rootDir, file)}` },
-    authToken
-  );
-  return result.data.repository.object?.text;
-}
-async function applyChangesToRepo(options, expectedHeadOid, changes, commitMessage) {
-  const { additions, deletions } = await processChanges(options, changes);
-  const { owner, repo, branch, authToken } = options;
-  return graphQL(
-    `mutation CreateCommitOnBranch($input: CreateCommitOnBranchInput!) {
+      { owner, repo, expression: `${ref}:${join(rootDir, file)}` },
+      authToken
+    );
+    return result.data.repository.object?.text;
+  }
+  async #applyChangesToRepo(expectedHeadOid, changes, commitMessage) {
+    const { additions, deletions } = await this.#processChanges(changes);
+    const { owner, repo, branch, authToken } = this.#options;
+    return this.#graphQL(
+      `mutation CreateCommitOnBranch($input: CreateCommitOnBranchInput!) {
       createCommitOnBranch(input: $input) {
         commit {
           oid
         }
       }
     }`,
-    {
-      input: {
-        branch: {
-          repositoryNameWithOwner: `${owner}/${repo}`,
-          branchName: branch
-        },
-        message: { headline: commitMessage },
-        fileChanges: { additions, deletions },
-        expectedHeadOid
-      }
-    },
-    authToken
-  ).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();
-  const deletions = Array();
-  for (const change of changes) {
-    switch (change.op) {
-      case "addContent": {
-        additions.push({
-          path: join(contentDir, change.path),
-          contents: btoa(change.contents)
-        });
-        break;
-      }
-      case "uploadFile": {
-        const file = join(rootDir, change.location);
-        additions.push({
-          path: file,
-          contents: await fetchUploadedContent(change.url)
-        });
-        break;
-      }
-      case "deleteContent": {
-        const file = join(contentDir, change.path);
-        deletions.push({ path: file });
-        break;
+      {
+        input: {
+          branch: {
+            repositoryNameWithOwner: `${owner}/${repo}`,
+            branchName: branch
+          },
+          message: { headline: commitMessage },
+          fileChanges: { additions, deletions },
+          expectedHeadOid
+        }
+      },
+      authToken
+    ).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);
+        }
       }
-      case "removeFile": {
-        const file = join(rootDir, change.location);
-        deletions.push({ path: file });
-        break;
+      throw error;
+    });
+  }
+  async #processChanges(changes) {
+    const { rootDir } = this.#options;
+    const additions = Array();
+    const deletions = Array();
+    for (const change of changes) {
+      switch (change.op) {
+        case "addContent": {
+          additions.push({
+            path: join(this.contentLocation, change.path),
+            contents: btoa(change.contents)
+          });
+          break;
+        }
+        case "uploadFile": {
+          const file = join(rootDir, change.location);
+          additions.push({
+            path: file,
+            contents: await this.#fetchUploadedContent(change.url)
+          });
+          break;
+        }
+        case "deleteContent": {
+          const file = join(this.contentLocation, change.path);
+          deletions.push({ path: file });
+          break;
+        }
+        case "removeFile": {
+          const file = join(rootDir, change.location);
+          deletions.push({ path: file });
+          break;
+        }
       }
     }
+    return { additions, deletions };
   }
-  return { additions, deletions };
-}
-async function getLatestCommitOid({
-  owner,
-  repo,
-  branch,
-  authToken
-}) {
-  return graphQL(
-    `query GetLatestCommit($owner: String!, $repo: String!, $branch: String!) {
+  async #getLatestCommitOid() {
+    const { owner, repo, branch, authToken } = this.#options;
+    return this.#graphQL(
+      `query GetLatestCommit($owner: String!, $repo: String!, $branch: String!) {
       repository(owner: $owner, name: $repo) {
         ref(qualifiedName: $branch) {
           target {
@@ -215,14 +242,15 @@ async function getLatestCommitOid({
         }
       }
     }`,
-    { owner, repo, branch },
-    authToken
-  ).then((result) => result.data.repository.ref.target.oid);
-}
-async function fetchUploadedContent(url) {
-  const response = await fetch(url);
-  return base64.stringify(new Uint8Array(await response.arrayBuffer()));
-}
+      { owner, repo, branch },
+      authToken
+    ).then((result) => result.data.repository.ref.target.oid);
+  }
+  async #fetchUploadedContent(url) {
+    const response = await fetch(url);
+    return base64.stringify(new Uint8Array(await response.arrayBuffer()));
+  }
+};
 export {
   GithubApi
 };

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

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

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-LIA6NPBB.js";
+} from "../chunks/chunk-OO7VJEA4.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-LIA6NPBB.js";
+} from "../chunks/chunk-OO7VJEA4.js";
 import "../chunks/chunk-NZLE2WMY.js";
 
 // node_modules/mri/lib/index.mjs

package/dist/cli/serve/GitHistory.js

@@ -3,6 +3,8 @@ import "../../chunks/chunk-NZLE2WMY.js";
 // src/cli/serve/GitHistory.ts
 import { JsonLoader } from "alinea/backend/loader/JsonLoader";
 import { execGit } from "alinea/backend/util/ExecGit";
+import { fileVersions } from "alinea/core/util/EntryFilenames";
+import { parseCoAuthoredBy } from "../util/CommitMessage.js";
 var encoder = new TextEncoder();
 var GitHistory = class {
   constructor(config, rootDir) {
@@ -10,34 +12,34 @@ var GitHistory = class {
     this.rootDir = rootDir;
   }
   async revisions(file) {
-    const output = await execGit(this.rootDir, [
-      "log",
-      "--follow",
-      "--name-status",
-      "--pretty=format:%H%n%at%n%s%n%ae%n%an%n%f",
-      "--",
-      file
-    ]);
-    const revisions = output.split("\n\n").filter((entry) => {
-      return entry.includes("\n");
-    }).map((entry) => {
-      const [hash, timestamp, message, email, name, changedFile, ...rest] = entry.split("\n");
-      const fileLocation = rest.length ? rest[rest.length - 1].split("	").pop().trim() : file;
-      const user = { name, email };
-      if (message?.includes("Co-authored-by")) {
-        const coAuthors = message.split("Co-authored-by:").slice(1).map((line) => line.split("<").pop().split(">")[0]);
-        user.email = coAuthors[0] || email;
-        user.name = coAuthors[1] || name;
-      }
-      return {
-        ref: hash,
-        createdAt: Number.parseInt(timestamp) * 1e3,
-        description: message,
-        file: fileLocation,
-        user
-      };
-    });
-    return revisions;
+    const versions = fileVersions(file);
+    const results = Array();
+    for (const versioned of versions) {
+      const output = await execGit(this.rootDir, [
+        "log",
+        "--follow",
+        "--name-status",
+        "--pretty=format:%H%n%at%n%s%n%ae%n%an%n%f",
+        "--",
+        versioned
+      ]);
+      const revisions = output.split("\n\n").filter((entry) => {
+        return entry.includes("\n");
+      }).map((entry) => {
+        const [ref, timestamp, message, email, name, changedFile, ...rest] = entry.split("\n");
+        const fileLocation = rest.length ? rest[rest.length - 1].split("	").pop().trim() : versioned;
+        const user = parseCoAuthoredBy(message) ?? { name, email };
+        return {
+          ref,
+          createdAt: Number.parseInt(timestamp) * 1e3,
+          description: message,
+          file: fileLocation,
+          user
+        };
+      });
+      results.push(...revisions);
+    }
+    return results;
   }
   async revisionData(file, ref) {
     const { config } = this;

package/dist/cli/util/CommitMessage.d.ts

@@ -0,0 +1,4 @@
+export declare function parseCoAuthoredBy(commitMessage: string): {
+    email: string;
+    name: string;
+} | undefined;

package/dist/cli/util/CommitMessage.js

@@ -0,0 +1,16 @@
+import "../../chunks/chunk-NZLE2WMY.js";
+
+// src/cli/util/CommitMessage.ts
+function parseCoAuthoredBy(commitMessage) {
+  const regex = /Co-authored-by:\s*(.+?)\s*<(\S+@\S+\.\S+)>/;
+  const match = commitMessage.match(regex);
+  if (match && match.length >= 3) {
+    const name = match[1].trim();
+    const email = match[2].trim();
+    return { name, email };
+  }
+  return void 0;
+}
+export {
+  parseCoAuthoredBy
+};

package/dist/cli/util/CommitMessage.test.d.ts

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

package/dist/cloud/CloudRemote.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-LIA6NPBB.js";
+} from "../chunks/chunk-OO7VJEA4.js";
 import {
   PLazy
 } from "../chunks/chunk-IKINPSS5.js";

package/dist/core/db/EntryTransaction.js

@@ -273,20 +273,23 @@ var EntryTransaction = class {
     this.#tx.remove(entry.filePath);
     const record = createRecord({ ...entry, path }, "published");
     const contents = new TextEncoder().encode(JSON.stringify(record, null, 2));
-    this.#tx.add(`${childrenDir}.json`, contents);
     if (pathChange) {
       this.#tx.remove(`${entry.parentDir}/${entry.path}.json`);
       this.#tx.rename(entry.childrenDir, childrenDir);
     }
+    this.#tx.add(`${childrenDir}.json`, contents);
     this.#messages.push(this.#reportOp("publish", entry.title));
     return this;
   }
   unpublish({ id, locale }) {
     const index = this.#index;
-    const entry = index.findFirst((entry2) => {
-      return entry2.id === id && entry2.locale === locale && entry2.status === "published";
-    });
+    const versions = index.byId.get(id)?.locales.get(locale);
+    const entry = versions?.main;
     assert(entry, `Entry not found: ${id}`);
+    for (const version of versions.values()) {
+      if (version.main) continue;
+      this.#tx.remove(version.filePath);
+    }
     this.#checks.push([entry.filePath, entry.fileHash]);
     this.#tx.rename(entry.filePath, `${entry.childrenDir}.draft.json`);
     this.#messages.push(this.#reportOp("unpublish", entry.title));
@@ -294,10 +297,13 @@ var EntryTransaction = class {
   }
   archive({ id, locale }) {
     const index = this.#index;
-    const entry = index.findFirst((entry2) => {
-      return entry2.id === id && entry2.locale === locale && entry2.status === "published";
-    });
+    const versions = index.byId.get(id)?.locales.get(locale);
+    const entry = versions?.main;
     assert(entry, `Entry not found: ${id}`);
+    for (const version of versions.values()) {
+      if (version.main) continue;
+      this.#tx.remove(version.filePath);
+    }
     this.#checks.push([entry.filePath, entry.fileHash]);
     this.#tx.rename(entry.filePath, `${entry.childrenDir}.archived.json`);
     this.#messages.push(this.#reportOp("archive", entry.title));

package/dist/core/source/GithubSource.d.ts

@@ -6,11 +6,13 @@ export interface GithubSourceOptions {
     owner: string;
     repo: string;
     branch: string;
+    rootDir: string;
     contentDir: string;
 }
 export declare class GithubSource implements Source {
     #private;
     constructor(options: GithubSourceOptions);
+    protected get contentLocation(): string;
     getTree(): Promise<ReadonlyTree>;
     shaAt(ref: string): Promise<string>;
     getTreeIfDifferent(sha: string): Promise<ReadonlyTree | undefined>;

package/dist/core/source/GithubSource.js

@@ -14,6 +14,12 @@ var GithubSource = class {
   constructor(options) {
     this.#options = options;
   }
+  get contentLocation() {
+    const { contentDir, rootDir } = this.#options;
+    if (contentDir.startsWith("/")) return contentDir.slice(1);
+    if (rootDir.endsWith("/")) return rootDir + contentDir;
+    return `${rootDir}/${contentDir}`;
+  }
   async getTree() {
     const current = this.#current;
     const newTree = await this.getTreeIfDifferent(current.sha);
@@ -21,8 +27,8 @@ var GithubSource = class {
     return current;
   }
   async shaAt(ref) {
-    const { contentDir, owner, repo, authToken } = this.#options;
-    const parentDir = contentDir.split("/").slice(0, -1).join("/");
+    const { owner, repo, authToken } = this.#options;
+    const parentDir = this.contentLocation.split("/").slice(0, -1).join("/");
     const parentInfo = await fetch(
       `https://api.github.com/repos/${owner}/${repo}/contents/${parentDir}?ref=${ref}`,
       { headers: { Authorization: `Bearer ${authToken}` } }
@@ -30,7 +36,7 @@ var GithubSource = class {
     assert(parentInfo.ok, `Failed to get parent: ${parentInfo.statusText}`);
     const parents = await parentInfo.json();
     assert(Array.isArray(parents));
-    const parent = parents.find((entry) => entry.path === contentDir);
+    const parent = parents.find((entry) => entry.path === this.contentLocation);
     if (!parent) return ReadonlyTree.EMPTY.sha;
     assert(typeof parent.sha === "string");
     return parent.sha;

package/dist/core/source/Tree.js

@@ -85,7 +85,8 @@ var TreeBase = class _TreeBase {
   }
   equals(other) {
     if (other instanceof ReadonlyTree) return this.sha === other.sha;
-    if (this.sha === other.sha) return true;
+    const canCompare = this.sha && other.sha;
+    if (canCompare && this.sha === other.sha) return true;
     if (this.nodes.size !== other.nodes.size) return false;
     for (const [name, entry] of this.nodes) {
       const otherEntry = other.nodes.get(name);

package/dist/core/util/EntryFilenames.d.ts

@@ -29,3 +29,4 @@ export declare function entryFile(config: Config, entry: EntryRow): string;
 export declare function entryUrl(type: Type, meta: EntryUrlMeta): string;
 export declare function pathSuffix(path: string, conflictingPaths: Array<string>): number | undefined;
 export declare function applySuffix(path: string, suffix: number): string;
+export declare function fileVersions(file: string): string[];

package/dist/core/util/EntryFilenames.js

@@ -1,6 +1,7 @@
 import "../../chunks/chunk-NZLE2WMY.js";
 
 // src/core/util/EntryFilenames.ts
+import * as paths from "alinea/core/util/Paths";
 import { entryStatuses } from "../Entry.js";
 import { ALT_STATUS } from "../EntryRow.js";
 import { getRoot, getType } from "../Internal.js";
@@ -74,6 +75,16 @@ function pathSuffix(path, conflictingPaths) {
 function applySuffix(path, suffix) {
   return `${path}-${suffix}`;
 }
+function fileVersions(file) {
+  const dir = paths.dirname(file);
+  const base = paths.basename(file, ".json");
+  const [name] = entryInfo(base);
+  return [
+    `${dir}/${name}.json`,
+    `${dir}/${name}.draft.json`,
+    `${dir}/${name}.archived.json`
+  ];
+}
 export {
   applySuffix,
   entryChildrenDir,
@@ -82,6 +93,7 @@ export {
   entryFilepath,
   entryInfo,
   entryUrl,
+  fileVersions,
   pathSuffix,
   workspaceMediaDir
 };

package/dist/dashboard/Routes.d.ts

@@ -38,7 +38,7 @@ export declare const entryRoute: Route<{
         unPublish: import("jotai").WritableAtom<null, [], Promise<void>> & {
             init: null;
         };
-        archivePublished: import("jotai").WritableAtom<null, [], Promise<void>> & {
+        archive: import("jotai").WritableAtom<null, [], Promise<void>> & {
             init: null;
         };
         publishArchived: import("jotai").WritableAtom<null, [], Promise<void>> & {
@@ -50,7 +50,7 @@ export declare const entryRoute: Route<{
         deleteMediaLibrary: import("jotai").WritableAtom<null, [], Promise<void>> & {
             init: null;
         };
-        deleteArchived: import("jotai").WritableAtom<null, [], Promise<void>> & {
+        deleteEntry: import("jotai").WritableAtom<null, [], Promise<void>> & {
             init: null;
         };
         saveTranslation: import("jotai").WritableAtom<null, [locale: string], Promise<void>> & {

package/dist/dashboard/atoms/DashboardAtoms.js

@@ -1,9 +1,9 @@
-import "../../chunks/chunk-WDCPVJJC.js";
 import {
   useAtomValue,
   useSetAtom,
   useStore
 } from "../../chunks/chunk-TOJF2G3X.js";
+import "../../chunks/chunk-WDCPVJJC.js";
 import {
   atom
 } from "../../chunks/chunk-WJ67RR7S.js";

package/dist/dashboard/atoms/DbAtoms.js

@@ -1,9 +1,9 @@
-import {
-  atomFamily
-} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   useAtomValue
 } from "../../chunks/chunk-TOJF2G3X.js";
+import {
+  atomFamily
+} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   atom
 } from "../../chunks/chunk-WJ67RR7S.js";

package/dist/dashboard/atoms/EntryEditorAtoms.d.ts

@@ -28,7 +28,7 @@ export declare enum EntryTransition {
     ArchivePublished = 7,
     PublishArchived = 8,
     DeleteFile = 9,
-    DeleteArchived = 10
+    DeleteEntry = 10
 }
 export declare const entryEditorAtoms: import("jotai/vanilla/utils/atomFamily.js").AtomFamily<EntryEditorParams, import("jotai").Atom<Promise<{
     transition: import("jotai").PrimitiveAtom<EntryTransition | undefined> & {
@@ -68,7 +68,7 @@ export declare const entryEditorAtoms: import("jotai/vanilla/utils/atomFamily.js
     unPublish: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
-    archivePublished: import("jotai").WritableAtom<null, [], Promise<void>> & {
+    archive: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
     publishArchived: import("jotai").WritableAtom<null, [], Promise<void>> & {
@@ -80,7 +80,7 @@ export declare const entryEditorAtoms: import("jotai/vanilla/utils/atomFamily.js
     deleteMediaLibrary: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
-    deleteArchived: import("jotai").WritableAtom<null, [], Promise<void>> & {
+    deleteEntry: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
     saveTranslation: import("jotai").WritableAtom<null, [locale: string], Promise<void>> & {
@@ -190,7 +190,7 @@ export declare function createEntryEditor(entryData: EntryData): {
     unPublish: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
-    archivePublished: import("jotai").WritableAtom<null, [], Promise<void>> & {
+    archive: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
     publishArchived: import("jotai").WritableAtom<null, [], Promise<void>> & {
@@ -202,7 +202,7 @@ export declare function createEntryEditor(entryData: EntryData): {
     deleteMediaLibrary: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
-    deleteArchived: import("jotai").WritableAtom<null, [], Promise<void>> & {
+    deleteEntry: import("jotai").WritableAtom<null, [], Promise<void>> & {
         init: null;
     };
     saveTranslation: import("jotai").WritableAtom<null, [locale: string], Promise<void>> & {

package/dist/dashboard/atoms/EntryEditorAtoms.js

@@ -51,7 +51,7 @@ var EntryTransition = /* @__PURE__ */ ((EntryTransition2) => {
   EntryTransition2[EntryTransition2["ArchivePublished"] = 7] = "ArchivePublished";
   EntryTransition2[EntryTransition2["PublishArchived"] = 8] = "PublishArchived";
   EntryTransition2[EntryTransition2["DeleteFile"] = 9] = "DeleteFile";
-  EntryTransition2[EntryTransition2["DeleteArchived"] = 10] = "DeleteArchived";
+  EntryTransition2[EntryTransition2["DeleteEntry"] = 10] = "DeleteEntry";
   return EntryTransition2;
 })(EntryTransition || {});
 var entryTransitionAtoms = atomFamily((id) => {
@@ -396,7 +396,7 @@ function createEntryEditor(entryData) {
       errorMessage: "Could not complete unpublish action, please try again later"
     });
   });
-  const archivePublished = atom(null, async (get, set) => {
+  const archive = atom(null, async (get, set) => {
     const db = get(dbAtom);
     return set(action, {
       transition: 7 /* ArchivePublished */,
@@ -426,7 +426,7 @@ function createEntryEditor(entryData) {
     if (!result) return;
     const db = get(dbAtom);
     return set(action, {
-      transition: 10 /* DeleteArchived */,
+      transition: 10 /* DeleteEntry */,
       result: db.remove(activeVersion.id),
       errorMessage: "Could not complete delete action, please try again later"
     });
@@ -441,10 +441,10 @@ function createEntryEditor(entryData) {
       errorMessage: "Could not complete delete action, please try again later"
     });
   });
-  const deleteArchived = atom(null, async (get, set) => {
+  const deleteEntry = atom(null, async (get, set) => {
     const db = get(dbAtom);
     return set(action, {
-      transition: 10 /* DeleteArchived */,
+      transition: 10 /* DeleteEntry */,
       result: db.remove(activeVersion.id),
       errorMessage: "Could not complete delete action, please try again later"
     });
@@ -581,11 +581,11 @@ function createEntryEditor(entryData) {
     publishDraft,
     discardDraft,
     unPublish,
-    archivePublished,
+    archive,
     publishArchived,
     deleteFile,
     deleteMediaLibrary,
-    deleteArchived,
+    deleteEntry,
     saveTranslation,
     discardEdits,
     showHistory,

package/dist/dashboard/atoms/EntrySummaryAtoms.js

@@ -1,9 +1,9 @@
-import {
-  atomFamily
-} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   require_dataloader
 } from "../../chunks/chunk-3TNMMA3W.js";
+import {
+  atomFamily
+} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   atom
 } from "../../chunks/chunk-WJ67RR7S.js";

package/dist/dashboard/atoms/LocationAtoms.js

@@ -1,11 +1,11 @@
-import {
-  atomFamily
-} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   useAtom,
   useAtomValue,
   useSetAtom
 } from "../../chunks/chunk-TOJF2G3X.js";
+import {
+  atomFamily
+} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   atom
 } from "../../chunks/chunk-WJ67RR7S.js";

package/dist/dashboard/atoms/NavigationAtoms.js

@@ -1,9 +1,9 @@
-import {
-  atomWithStorage
-} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   useAtom
 } from "../../chunks/chunk-TOJF2G3X.js";
+import {
+  atomWithStorage
+} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   atom
 } from "../../chunks/chunk-WJ67RR7S.js";

package/dist/dashboard/view/entry/EntryHeader.js

@@ -113,7 +113,7 @@ var transitions = {
   [EntryTransition.ArchivePublished]: "Archiving",
   [EntryTransition.PublishArchived]: "Publishing",
   [EntryTransition.DeleteFile]: "Deleting",
-  [EntryTransition.DeleteArchived]: "Deleting"
+  [EntryTransition.DeleteEntry]: "Deleting"
 };
 var variantIcon = {
   draft: IcRoundEdit,
@@ -144,9 +144,9 @@ function EntryHeader({ editor, editable = true }) {
   const restoreRevision = useSetAtom(editor.restoreRevision);
   const discardDraft = useSetAtom(editor.discardDraft);
   const unPublish = useSetAtom(editor.unPublish);
-  const archivePublished = useSetAtom(editor.archivePublished);
+  const archive = useSetAtom(editor.archive);
   const publishArchived = useSetAtom(editor.publishArchived);
-  const deleteArchived = useSetAtom(editor.deleteArchived);
+  const deleteEntry = useSetAtom(editor.deleteEntry);
   const deleteFile = useSetAtom(editor.deleteFile);
   const deleteMediaLibrary = useSetAtom(editor.deleteMediaLibrary);
   const queryClient = useQueryClient();
@@ -191,6 +191,7 @@ function EntryHeader({ editor, editable = true }) {
     };
     input.click();
   }
+  const isParentUnpublished = editor.parents.some((p) => p.status === "draft");
   const options = variant === "draft" ? /* @__PURE__ */ jsx(
     DropdownMenu.Item,
     {
@@ -231,14 +232,7 @@ function EntryHeader({ editor, editable = true }) {
         children: "Unpublish"
       }
     ),
-    /* @__PURE__ */ jsx(
-      DropdownMenu.Item,
-      {
-        className: styles.root.action(),
-        onClick: archivePublished,
-        children: "Archive"
-      }
-    )
+    /* @__PURE__ */ jsx(DropdownMenu.Item, { className: styles.root.action(), onClick: archive, children: "Archive" })
   ] }) : variant === "archived" ? /* @__PURE__ */ jsxs(Fragment, { children: [
     canPublish && /* @__PURE__ */ jsx(
       DropdownMenu.Item,
@@ -252,11 +246,18 @@ function EntryHeader({ editor, editable = true }) {
       DropdownMenu.Item,
       {
         className: styles.root.action(),
-        onClick: deleteArchived,
+        onClick: deleteEntry,
         children: "Delete"
       }
     )
-  ] }) : null;
+  ] }) : variant === "unpublished" ? isParentUnpublished ? /* @__PURE__ */ jsx(
+    DropdownMenu.Item,
+    {
+      className: styles.root.action(),
+      onClick: deleteEntry,
+      children: "Delete"
+    }
+  ) : /* @__PURE__ */ jsx(DropdownMenu.Item, { className: styles.root.action(), onClick: archive, children: "Archive" }) : null;
   const inTransition = currentTransition !== void 0;
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     isReplacing && /* @__PURE__ */ jsx(FileUploader, {}),

package/dist/dashboard/view/entry/EntryPreview.js

@@ -1,9 +1,9 @@
-import {
-  unwrap
-} from "../../../chunks/chunk-WDCPVJJC.js";
 import {
   useAtomValue
 } from "../../../chunks/chunk-TOJF2G3X.js";
+import {
+  unwrap
+} from "../../../chunks/chunk-WDCPVJJC.js";
 import "../../../chunks/chunk-WJ67RR7S.js";
 import "../../../chunks/chunk-NZLE2WMY.js";
 

package/dist/field/list/ListField.view.js

@@ -18,12 +18,12 @@ import {
 import {
   dist_default
 } from "../../chunks/chunk-A5O3N2GS.js";
-import {
-  atomWithStorage
-} from "../../chunks/chunk-WDCPVJJC.js";
 import {
   useAtom
 } from "../../chunks/chunk-TOJF2G3X.js";
+import {
+  atomWithStorage
+} from "../../chunks/chunk-WDCPVJJC.js";
 import "../../chunks/chunk-WJ67RR7S.js";
 import "../../chunks/chunk-NZLE2WMY.js";
 

package/package.json

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