alinea 2.0.0-preview.12 → 2.0.0-preview.13

package/dist/backend/api/GithubApi.js

@@ -8,8 +8,11 @@ import {
   normalizeGithubSourceOptions
 } from "alinea/core/source/GithubSource";
 import { ShaMismatchError } from "alinea/core/source/ShaMismatchError";
+import { ReadonlyTree } from "alinea/core/source/Tree";
+import { assert } from "alinea/core/util/Assert";
 import { base64, btoa } from "alinea/core/util/Encoding";
 import { fileVersions } from "alinea/core/util/EntryFilenames";
+import { isRecord } from "alinea/core/util/Objects";
 import { join, relative } from "alinea/core/util/Paths";
 var GithubApi = class extends GithubSource {
   #options;
@@ -18,9 +21,15 @@ var GithubApi = class extends GithubSource {
     super(normalized);
     this.#options = normalized;
   }
-  async write(request) {
-    const currentCommit = await this.#getLatestCommitOid();
-    const currentSha = await this.shaAt(currentCommit);
+  write(request) {
+    return this.spending("save", () => this.#write(request));
+  }
+  /**
+   * Commit through GraphQL, which also answers the content sha before and
+   * after: a save spends none of the REST rate limit.
+   */
+  async #write(request) {
+    const { oid: currentCommit, contentSha: currentSha } = await this.#getLatestCommit();
     if (currentSha !== request.fromSha)
       throw new ShaMismatchError(currentSha, request.fromSha);
     const { user } = request;
@@ -35,13 +44,16 @@ Co-authored-by: ${user.name} <${user.email}>`;
       request.changes,
       commitMessage
     );
-    return { sha: await this.shaAt(newCommit) };
+    return { sha: newCommit.contentSha };
   }
-  async revisions(file) {
-    return this.#getFileCommitHistory(file);
+  revisions(file) {
+    return this.spending("history", () => this.#getFileCommitHistory(file));
   }
   async revisionData(file, revisionId) {
-    const content = await this.#getFileContentAtCommit(file, revisionId);
+    const content = await this.spending(
+      "revision",
+      () => this.#getFileContentAtCommit(file, revisionId)
+    );
     try {
       return content ? JSON.parse(content) : void 0;
     } catch (error) {
@@ -49,7 +61,7 @@ Co-authored-by: ${user.name} <${user.email}>`;
     }
   }
   async #graphQL(query, variables, token) {
-    return fetch("https://api.github.com/graphql", {
+    return this.githubFetch("https://api.github.com/graphql", {
       method: "POST",
       headers: {
         Authorization: `Bearer ${token}`,
@@ -60,9 +72,12 @@ Co-authored-by: ${user.name} <${user.email}>`;
       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);
+      const errors = Array.isArray(result.errors) ? result.errors.filter((error) => !isMissingFile(error)) : [];
+      if (errors.length > 0) {
+        const message = errors.map(
+          (error) => isRecord(error) && typeof error.message === "string" ? error.message : JSON.stringify(error)
+        ).join("; ");
+        console.trace(errors);
         throw new Error(message);
       }
       return result;
@@ -119,7 +134,7 @@ Co-authored-by: ${user.name} <${user.email}>`;
           }))
         );
         const earliest = commits[commits.length - 1].oid;
-        const res = await fetch(
+        const res = await this.githubFetch(
           `https://api.github.com/repos/${owner}/${repo}/commits/${earliest}`,
           { headers: { Authorization: `Bearer ${authToken}` } }
         );
@@ -157,10 +172,10 @@ Co-authored-by: ${user.name} <${user.email}>`;
     const { additions, deletions } = await this.#processChanges(changes);
     const { owner, repo, branch, authToken } = this.#options;
     return this.#graphQL(
-      `mutation CreateCommitOnBranch($input: CreateCommitOnBranchInput!) {
+      `mutation CreateCommitOnBranch($input: CreateCommitOnBranchInput!, $content: String!) {
       createCommitOnBranch(input: $input) {
         commit {
-          oid
+          ${commitStateFields}
         }
       }
     }`,
@@ -173,13 +188,11 @@ Co-authored-by: ${user.name} <${user.email}>`;
           message: { headline: commitMessage },
           fileChanges: { additions, deletions },
           expectedHeadOid
-        }
+        },
+        content: this.contentLocation
       },
       authToken
-    ).then((result) => {
-      const commitId = result.data.createCommitOnBranch.commit.oid;
-      return commitId;
-    }).catch((error) => {
+    ).then((result) => commitState(result.data.createCommitOnBranch.commit)).catch((error) => {
       if (error instanceof Error) {
         const mismatchMessage = /is at ([a-z0-9]+) but expected ([a-z0-9]+)/;
         const match = error.message.match(mismatchMessage);
@@ -238,21 +251,21 @@ Co-authored-by: ${user.name} <${user.email}>`;
     }
     return { additions, deletions };
   }
-  async #getLatestCommitOid() {
+  async #getLatestCommit() {
     const { owner, repo, branch, authToken } = this.#options;
     return this.#graphQL(
-      `query GetLatestCommit($owner: String!, $repo: String!, $branch: String!) {
+      `query GetLatestCommit($owner: String!, $repo: String!, $branch: String!, $content: String!) {
       repository(owner: $owner, name: $repo) {
         ref(qualifiedName: $branch) {
           target {
-            oid
+            ${commitStateFields}
           }
         }
       }
     }`,
-      { owner, repo, branch },
+      { owner, repo, branch, content: this.contentLocation },
       authToken
-    ).then((result) => result.data.repository.ref.target.oid);
+    ).then((result) => commitState(result.data.repository.ref.target));
   }
   async #fetchUploadedContent(url) {
     const response = await fetch(url);
@@ -264,6 +277,16 @@ Co-authored-by: ${user.name} <${user.email}>`;
 function repositoryPath(...segments) {
   return relative("/", join("/", ...segments));
 }
+var commitStateFields = `oid ... on Commit { file(path: $content) { oid } }`;
+function commitState(commit) {
+  assert(isRecord(commit) && typeof commit.oid === "string");
+  const file = commit.file;
+  const contentSha = isRecord(file) && typeof file.oid === "string" ? file.oid : ReadonlyTree.EMPTY.sha;
+  return { oid: commit.oid, contentSha };
+}
+function isMissingFile(error) {
+  return isRecord(error) && error.type === "NOT_FOUND" && Array.isArray(error.path) && error.path.at(-1) === "file";
+}
 export {
   GithubApi
 };

package/dist/backend/api/database.js

@@ -1,15 +1,15 @@
 import {
   driver_exports
-} 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";
+} from "../../chunks/chunk-4ZA6KZHS.js";
+import "../../chunks/chunk-VA6NC3MI.js";
+import "../../chunks/chunk-A2I6MCCS.js";
+import "../../chunks/chunk-RAR44T5O.js";
+import "../../chunks/chunk-PTYZMV5G.js";
 import "../../chunks/chunk-N47Y62CI.js";
 import "../../chunks/chunk-QBPYWU6C.js";
 import "../../chunks/chunk-2BJ2IFQM.js";
 import "../../chunks/chunk-XCZXR3C2.js";
-import "../../chunks/chunk-MOWR65LM.js";
+import "../../chunks/chunk-PYDOMKJZ.js";
 import "../../chunks/chunk-76VMZTLN.js";
 import "../../chunks/chunk-2PIFHEYR.js";
 import "../../chunks/chunk-K62JP6HR.js";