@pierre/storage 0.8.0 → 0.9.1

package/package.json

@@ -1,40 +1,39 @@
 {
-	"name": "@pierre/storage",
-	"version": "0.8.0",
-	"description": "Pierre Git Storage SDK",
-	"license": "MIT",
-	"type": "module",
-	"main": "./dist/index.cjs",
-	"module": "./dist/index.js",
-	"types": "./dist/index.d.ts",
-	"exports": {
-		".": {
-			"types": "./dist/index.d.ts",
-			"import": "./dist/index.js",
-			"require": "./dist/index.cjs",
-			"default": "./dist/index.js"
-		}
-	},
-	"files": [
-		"dist",
-		"src"
-	],
-	"scripts": {
-		"build": "tsup",
-		"dev": "tsup --watch",
-		"prepublishOnly": "pnpm build"
-	},
-	"dependencies": {
-		"jose": "^5.10.0",
-		"snakecase-keys": "^9.0.2",
-		"zod": "^3.23.8"
-	},
-	"devDependencies": {
-		"tsup": "8.5.0",
-		"typescript": "5.8.3",
-		"vitest": "3.2.4"
-	},
-	"publishConfig": {
-		"access": "public"
-	}
-}
+  "name": "@pierre/storage",
+  "version": "0.9.1",
+  "description": "Pierre Git Storage SDK",
+  "license": "MIT",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs",
+      "default": "./dist/index.js"
+    }
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
+  "dependencies": {
+    "jose": "^5.10.0",
+    "snakecase-keys": "^9.0.2",
+    "zod": "^3.23.8"
+  },
+  "devDependencies": {
+    "tsup": "8.5.0",
+    "typescript": "5.8.3",
+    "vitest": "3.2.4"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch"
+  }
+}

package/src/index.ts

@@ -1197,23 +1197,51 @@ export class GitStorage {
 			ttl,
 		});
 
-		const baseRepoOptions = options?.baseRepo
-			? {
+		const baseRepo = options?.baseRepo;
+		const isFork = baseRepo ? 'id' in baseRepo : false;
+		let baseRepoOptions: Record<string, unknown> | null = null;
+		let resolvedDefaultBranch: string | undefined;
+
+		if (baseRepo) {
+			if ('id' in baseRepo) {
+				const baseRepoToken = await this.generateJWT(baseRepo.id, {
+					permissions: ['git:read'],
+					ttl,
+				});
+				baseRepoOptions = {
+					provider: 'code',
+					owner: this.options.name,
+					name: baseRepo.id,
+					operation: 'fork',
+					auth: { token: baseRepoToken },
+					...(baseRepo.ref ? { ref: baseRepo.ref } : {}),
+					...(baseRepo.sha ? { sha: baseRepo.sha } : {}),
+				};
+			} else {
+				baseRepoOptions = {
 					provider: 'github',
-					...snakecaseKeys(options.baseRepo as unknown as Record<string, unknown>),
-				}
-			: null;
+					...snakecaseKeys(baseRepo as unknown as Record<string, unknown>),
+				};
+				resolvedDefaultBranch = baseRepo.defaultBranch;
+			}
+		}
 
 		// Match backend priority: baseRepo.defaultBranch > options.defaultBranch > 'main'
-		const defaultBranch = options?.baseRepo?.defaultBranch ?? options?.defaultBranch ?? 'main';
+		if (!resolvedDefaultBranch) {
+			if (options?.defaultBranch) {
+				resolvedDefaultBranch = options.defaultBranch;
+			} else if (!isFork) {
+				resolvedDefaultBranch = 'main';
+			}
+		}
 
 		const createRepoPath =
-			baseRepoOptions || defaultBranch
+			baseRepoOptions || resolvedDefaultBranch
 				? {
 						path: 'repos',
 						body: {
 							...(baseRepoOptions && { base_repo: baseRepoOptions }),
-							default_branch: defaultBranch,
+							...(resolvedDefaultBranch && { default_branch: resolvedDefaultBranch }),
 						},
 					}
 				: 'repos';
@@ -1224,7 +1252,12 @@ export class GitStorage {
 			throw new Error('Repository already exists');
 		}
 
-		return new RepoImpl(repoId, defaultBranch, this.options, this.generateJWT.bind(this));
+		return new RepoImpl(
+			repoId,
+			resolvedDefaultBranch ?? 'main',
+			this.options,
+			this.generateJWT.bind(this),
+		);
 	}
 
 	/**

package/src/types.ts

@@ -83,7 +83,7 @@ export interface FindOneOptions {
 
 export type SupportedRepoProvider = 'github';
 
-export interface BaseRepo {
+export interface GitHubBaseRepo {
 	/**
 	 * @default github
 	 */
@@ -93,6 +93,14 @@ export interface BaseRepo {
 	defaultBranch?: string;
 }
 
+export interface ForkBaseRepo {
+	id: string;
+	ref?: string;
+	sha?: string;
+}
+
+export type BaseRepo = GitHubBaseRepo | ForkBaseRepo;
+
 export interface ListReposOptions extends GitStorageInvocationOptions {
 	cursor?: string;
 	limit?: number;