@pierre/storage 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -568,14 +568,26 @@ interface FileDiff extends DiffFileBase {
 }
 interface FilteredFile extends DiffFileBase {
 }
-interface CreateCommitOptions extends GitStorageInvocationOptions {
-    targetBranch: string;
+interface CreateCommitBaseOptions extends GitStorageInvocationOptions {
     commitMessage: string;
     expectedHeadSha?: string;
+    baseBranch?: string;
     author: CommitSignature;
     committer?: CommitSignature;
     signal?: AbortSignal;
 }
+interface CreateCommitBranchOptions extends CreateCommitBaseOptions {
+    targetBranch: string;
+    targetRef?: never;
+}
+/**
+ * @deprecated Use {@link CreateCommitBranchOptions} instead.
+ */
+interface LegacyCreateCommitOptions extends CreateCommitBaseOptions {
+    targetBranch?: never;
+    targetRef: string;
+}
+type CreateCommitOptions = CreateCommitBranchOptions | LegacyCreateCommitOptions;
 interface CommitSignature {
     name: string;
     email: string;
@@ -830,4 +842,4 @@ declare class GitStorage {
 declare function createClient(options: GitStorageOptions): GitStorage;
 type StorageOptions = GitStorageOptions;
 
-export { ApiError, type BaseRepo, type BlobLike, type BranchInfo, type CommitBuilder, type CommitFileOptions, type CommitFileSource, type CommitInfo, type CommitResult, type CommitSignature, type CommitTextFileOptions, type CreateCommitOptions, type CreateRepoOptions, type DiffFileBase, type DiffFileState, type DiffStats, type FileDiff, type FileLike, type FilteredFile, type FindOneOptions, type GetBranchDiffOptions, type GetBranchDiffResponse, type GetBranchDiffResult, type GetCommitDiffOptions, type GetCommitDiffResponse, type GetCommitDiffResult, type GetFileOptions, type GetRemoteURLOptions, type GitFileMode, GitStorage, type GitStorageOptions, type ListBranchesOptions, type ListBranchesResponse, type ListBranchesResult, type ListCommitsOptions, type ListCommitsResponse, type ListCommitsResult, type ListFilesOptions, type ListFilesResponse, type ListFilesResult, type OverrideableGitStorageOptions, type ParsedWebhookSignature, type PullUpstreamOptions, type RawBranchInfo, type RawCommitInfo, type RawFileDiff, type RawFilteredFile, type RawWebhookPushEvent, type ReadableStreamLike, type ReadableStreamReaderLike, type RefUpdate, RefUpdateError, type RefUpdateReason, type Repo, type RestoreCommitOptions, type RestoreCommitResult, type StorageOptions, type SupportedRepoProvider, type TextEncoding, type ValidAPIVersion, type ValidMethod, type ValidPath, type WebhookEventPayload, type WebhookPushEvent, type WebhookUnknownEvent, type WebhookValidationOptions, type WebhookValidationResult, createClient, parseSignatureHeader, validateWebhook, validateWebhookSignature };
+export { ApiError, type BaseRepo, type BlobLike, type BranchInfo, type CommitBuilder, type CommitFileOptions, type CommitFileSource, type CommitInfo, type CommitResult, type CommitSignature, type CommitTextFileOptions, type CreateCommitBranchOptions, type CreateCommitOptions, type CreateRepoOptions, type DiffFileBase, type DiffFileState, type DiffStats, type FileDiff, type FileLike, type FilteredFile, type FindOneOptions, type GetBranchDiffOptions, type GetBranchDiffResponse, type GetBranchDiffResult, type GetCommitDiffOptions, type GetCommitDiffResponse, type GetCommitDiffResult, type GetFileOptions, type GetRemoteURLOptions, type GitFileMode, GitStorage, type GitStorageOptions, type LegacyCreateCommitOptions, type ListBranchesOptions, type ListBranchesResponse, type ListBranchesResult, type ListCommitsOptions, type ListCommitsResponse, type ListCommitsResult, type ListFilesOptions, type ListFilesResponse, type ListFilesResult, type OverrideableGitStorageOptions, type ParsedWebhookSignature, type PullUpstreamOptions, type RawBranchInfo, type RawCommitInfo, type RawFileDiff, type RawFilteredFile, type RawWebhookPushEvent, type ReadableStreamLike, type ReadableStreamReaderLike, type RefUpdate, RefUpdateError, type RefUpdateReason, type Repo, type RestoreCommitOptions, type RestoreCommitResult, type StorageOptions, type SupportedRepoProvider, type TextEncoding, type ValidAPIVersion, type ValidMethod, type ValidPath, type WebhookEventPayload, type WebhookPushEvent, type WebhookUnknownEvent, type WebhookValidationOptions, type WebhookValidationResult, createClient, parseSignatureHeader, validateWebhook, validateWebhookSignature };

package/dist/index.js

@@ -151,6 +151,7 @@ var errorEnvelopeSchema = z.object({
 // src/commit.ts
 var MAX_CHUNK_BYTES = 4 * 1024 * 1024;
 var DEFAULT_TTL_SECONDS = 60 * 60;
+var HEADS_REF_PREFIX = "refs/heads/";
 var BufferCtor = globalThis.Buffer;
 var CommitBuilderImpl = class {
   options;
@@ -159,26 +160,18 @@ var CommitBuilderImpl = class {
   operations = [];
   sent = false;
   constructor(deps) {
-    this.options = { ...deps.options };
+    this.options = normalizeCommitOptions(deps.options);
     this.getAuthToken = deps.getAuthToken;
     this.transport = deps.transport;
-    const trimmedTarget = this.options.targetBranch?.trim();
     const trimmedMessage = this.options.commitMessage?.trim();
     const trimmedAuthorName = this.options.author?.name?.trim();
     const trimmedAuthorEmail = this.options.author?.email?.trim();
-    if (!trimmedTarget) {
-      throw new Error("createCommit targetBranch is required");
-    }
-    if (trimmedTarget.startsWith("refs/")) {
-      throw new Error("createCommit targetBranch must not include refs/ prefix");
-    }
     if (!trimmedMessage) {
       throw new Error("createCommit commitMessage is required");
     }
     if (!trimmedAuthorName || !trimmedAuthorEmail) {
       throw new Error("createCommit author name and email are required");
     }
-    this.options.targetBranch = trimmedTarget;
     this.options.commitMessage = trimmedMessage;
     this.options.author = {
       name: trimmedAuthorName,
@@ -187,6 +180,17 @@ var CommitBuilderImpl = class {
     if (typeof this.options.expectedHeadSha === "string") {
       this.options.expectedHeadSha = this.options.expectedHeadSha.trim();
     }
+    if (typeof this.options.baseBranch === "string") {
+      const trimmedBase = this.options.baseBranch.trim();
+      if (trimmedBase === "") {
+        delete this.options.baseBranch;
+      } else {
+        if (trimmedBase.startsWith("refs/")) {
+          throw new Error("createCommit baseBranch must not include refs/ prefix");
+        }
+        this.options.baseBranch = trimmedBase;
+      }
+    }
   }
   addFile(path, source, options) {
     this.ensureNotSent();
@@ -271,6 +275,9 @@ var CommitBuilderImpl = class {
     if (this.options.expectedHeadSha) {
       metadata.expected_head_sha = this.options.expectedHeadSha;
     }
+    if (this.options.baseBranch) {
+      metadata.base_branch = this.options.baseBranch;
+    }
     if (this.options.committer) {
       metadata.committer = {
         name: this.options.committer.name,
@@ -300,7 +307,7 @@ var FetchCommitTransport = class {
   async send(request) {
     const bodyIterable = buildMessageIterable(request.metadata, request.blobs);
     const body = toRequestBody(bodyIterable);
-    const response = await fetch(this.url, {
+    const init = {
       method: "POST",
       headers: {
         Authorization: `Bearer ${request.authorization}`,
@@ -309,7 +316,11 @@ var FetchCommitTransport = class {
       },
       body,
       signal: request.signal
-    });
+    };
+    if (requiresDuplex(body)) {
+      init.duplex = "half";
+    }
+    const response = await fetch(this.url, init);
     if (!response.ok) {
       const { statusMessage, statusLabel, refUpdate } = await parseCommitPackError(response);
       throw new RefUpdateError(statusMessage, {
@@ -366,6 +377,19 @@ function buildMessageIterable(metadata, blobs) {
     }
   };
 }
+function requiresDuplex(body) {
+  if (!body || typeof body !== "object") {
+    return false;
+  }
+  if (typeof body[Symbol.asyncIterator] === "function") {
+    return true;
+  }
+  const readableStreamCtor = globalThis.ReadableStream;
+  if (readableStreamCtor && body instanceof readableStreamCtor) {
+    return true;
+  }
+  return false;
+}
 function buildCommitResult(ack) {
   const refUpdate = toRefUpdate(ack.result);
   if (!ack.result.success) {
@@ -551,6 +575,62 @@ function randomContentId() {
   const random = Math.random().toString(36).slice(2);
   return `cid-${Date.now().toString(36)}-${random}`;
 }
+function normalizeCommitOptions(options) {
+  return {
+    targetBranch: resolveTargetBranch(options),
+    commitMessage: options.commitMessage,
+    expectedHeadSha: options.expectedHeadSha,
+    baseBranch: options.baseBranch,
+    author: options.author,
+    committer: options.committer,
+    signal: options.signal,
+    ttl: options.ttl
+  };
+}
+function resolveTargetBranch(options) {
+  const branchCandidate = typeof options.targetBranch === "string" ? options.targetBranch.trim() : "";
+  if (branchCandidate) {
+    return normalizeBranchName(branchCandidate);
+  }
+  if (hasLegacyTargetRef(options)) {
+    return normalizeLegacyTargetRef(options.targetRef);
+  }
+  throw new Error("createCommit targetBranch is required");
+}
+function normalizeBranchName(value) {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new Error("createCommit targetBranch is required");
+  }
+  if (trimmed.startsWith(HEADS_REF_PREFIX)) {
+    const branch = trimmed.slice(HEADS_REF_PREFIX.length).trim();
+    if (!branch) {
+      throw new Error("createCommit targetBranch is required");
+    }
+    return branch;
+  }
+  if (trimmed.startsWith("refs/")) {
+    throw new Error("createCommit targetBranch must not include refs/ prefix");
+  }
+  return trimmed;
+}
+function normalizeLegacyTargetRef(ref) {
+  const trimmed = ref.trim();
+  if (!trimmed) {
+    throw new Error("createCommit targetRef is required");
+  }
+  if (!trimmed.startsWith(HEADS_REF_PREFIX)) {
+    throw new Error("createCommit targetRef must start with refs/heads/");
+  }
+  const branch = trimmed.slice(HEADS_REF_PREFIX.length).trim();
+  if (!branch) {
+    throw new Error("createCommit targetRef must include a branch name");
+  }
+  return branch;
+}
+function hasLegacyTargetRef(options) {
+  return typeof options.targetRef === "string";
+}
 function createCommitBuilder(deps) {
   return new CommitBuilderImpl(deps);
 }