@pierre/storage 0.2.3 → 0.3.0

package/package.json

@@ -1,39 +1,40 @@
 {
-  "name": "@pierre/storage",
-  "version": "0.2.3",
-  "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"
-  }
-}
+	"name": "@pierre/storage",
+	"version": "0.3.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"
+	}
+}

package/src/commit.ts

@@ -20,6 +20,7 @@ import type {
 	CreateCommitOptions,
 	LegacyCreateCommitOptions,
 } from './types';
+import { getUserAgent } from './version';
 
 const DEFAULT_TTL_SECONDS = 60 * 60;
 const HEADS_REF_PREFIX = 'refs/heads/';
@@ -294,6 +295,7 @@ export class FetchCommitTransport implements CommitTransport {
 				Authorization: `Bearer ${request.authorization}`,
 				'Content-Type': 'application/x-ndjson',
 				Accept: 'application/json',
+				'Code-Storage-Agent': getUserAgent(),
 			},
 			body: body as any,
 			signal: request.signal,

package/src/diff-commit.ts

@@ -16,6 +16,7 @@ import type {
 	CreateCommitFromDiffOptions,
 	DiffSource,
 } from './types';
+import { getUserAgent } from './version';
 
 interface DiffCommitMetadataPayload {
 	target_branch: string;
@@ -190,6 +191,7 @@ export class FetchDiffCommitTransport implements DiffCommitTransport {
 				Authorization: `Bearer ${request.authorization}`,
 				'Content-Type': 'application/x-ndjson',
 				Accept: 'application/json',
+				'Code-Storage-Agent': getUserAgent(),
 			},
 			body: body as any,
 			signal: request.signal,

package/src/fetch.ts

@@ -1,5 +1,6 @@
 import { errorEnvelopeSchema } from './schemas';
 import type { ValidAPIVersion, ValidMethod, ValidPath } from './types';
+import { getUserAgent } from './version';
 
 interface RequestOptions {
 	allowedStatus?: number[];
@@ -59,6 +60,7 @@ export class ApiFetcher {
 			headers: {
 				Authorization: `Bearer ${jwt}`,
 				'Content-Type': 'application/json',
+				'Code-Storage-Agent': getUserAgent(),
 			},
 		};
 

package/src/index.ts

@@ -53,7 +53,6 @@ import type {
 	ListCommitsResult,
 	ListFilesOptions,
 	ListFilesResult,
-	OverrideableGitStorageOptions,
 	PullUpstreamOptions,
 	RawBranchInfo,
 	RawCommitInfo,
@@ -346,22 +345,20 @@ class RepoImpl implements Repo {
 		) => Promise<string>,
 	) {
 		this.api = getApiInstance(
-			this.options.apiBaseUrl ?? API_BASE_URL,
+			this.options.apiBaseUrl ?? GitStorage.getDefaultAPIBaseUrl(options.name),
 			this.options.apiVersion ?? API_VERSION,
 		);
 	}
 
 	async getRemoteURL(urlOptions?: GetRemoteURLOptions): Promise<string> {
-		const storageBaseUrl = this.options.storageBaseUrl ?? STORAGE_BASE_URL;
-		const url = new URL(`https://${this.options.name}.${storageBaseUrl}/${this.id}.git`);
+		const url = new URL(`https://${this.options.storageBaseUrl}/${this.id}.git`);
 		url.username = `t`;
 		url.password = await this.generateJWT(this.id, urlOptions);
 		return url.toString();
 	}
 
 	async getEphemeralRemoteURL(urlOptions?: GetRemoteURLOptions): Promise<string> {
-		const storageBaseUrl = this.options.storageBaseUrl ?? STORAGE_BASE_URL;
-		const url = new URL(`https://${this.options.name}.${storageBaseUrl}/${this.id}+ephemeral.git`);
+		const url = new URL(`https://${this.options.storageBaseUrl}/${this.id}+ephemeral.git`);
 		url.username = `t`;
 		url.password = await this.generateJWT(this.id, urlOptions);
 		return url.toString();
@@ -384,6 +381,9 @@ class RepoImpl implements Repo {
 		if (typeof options.ephemeral === 'boolean') {
 			params.ephemeral = String(options.ephemeral);
 		}
+		if (typeof options.ephemeralBase === 'boolean') {
+			params.ephemeral_base = String(options.ephemeralBase);
+		}
 
 		// Return the raw fetch Response for streaming
 		return this.api.get({ path: 'repos/file', params }, jwt);
@@ -488,6 +488,12 @@ class RepoImpl implements Repo {
 		if (options.base) {
 			params.base = options.base;
 		}
+		if (typeof options.ephemeral === 'boolean') {
+			params.ephemeral = String(options.ephemeral);
+		}
+		if (typeof options.ephemeralBase === 'boolean') {
+			params.ephemeral_base = String(options.ephemeralBase);
+		}
 
 		const response = await this.api.get({ path: 'repos/branches/diff', params }, jwt);
 
@@ -506,6 +512,10 @@ class RepoImpl implements Repo {
 			sha: options.sha,
 		};
 
+		if (options.baseSha) {
+			params.baseSha = options.baseSha;
+		}
+
 		const response = await this.api.get({ path: 'repos/diff', params }, jwt);
 
 		const raw = commitDiffResponseSchema.parse(await response.json());
@@ -653,7 +663,7 @@ class RepoImpl implements Repo {
 
 	createCommit(options: CreateCommitOptions): CommitBuilder {
 		const version = this.options.apiVersion ?? API_VERSION;
-		const baseUrl = this.options.apiBaseUrl ?? API_BASE_URL;
+		const baseUrl = this.options.apiBaseUrl ?? GitStorage.getDefaultAPIBaseUrl(this.options.name);
 		const transport = new FetchCommitTransport({ baseUrl, version });
 		const ttl = resolveCommitTtlSeconds(options);
 		const builderOptions: CreateCommitOptions = {
@@ -675,7 +685,7 @@ class RepoImpl implements Repo {
 
 	async createCommitFromDiff(options: CreateCommitFromDiffOptions): Promise<CommitResult> {
 		const version = this.options.apiVersion ?? API_VERSION;
-		const baseUrl = this.options.apiBaseUrl ?? API_BASE_URL;
+		const baseUrl = this.options.apiBaseUrl ?? GitStorage.getDefaultAPIBaseUrl(this.options.name);
 		const transport = new FetchDiffCommitTransport({ baseUrl, version });
 		const ttl = resolveCommitTtlSeconds(options);
 		const requestOptions: CreateCommitFromDiffOptions = {
@@ -697,7 +707,6 @@ class RepoImpl implements Repo {
 }
 
 export class GitStorage {
-	private static overrides: OverrideableGitStorageOptions = {};
 	private options: GitStorageOptions;
 	private api: ApiFetcher;
 
@@ -722,12 +731,11 @@ export class GitStorage {
 			throw new Error('GitStorage key must be a non-empty string.');
 		}
 
-		const resolvedApiBaseUrl =
-			options.apiBaseUrl ?? GitStorage.overrides.apiBaseUrl ?? API_BASE_URL;
-		const resolvedApiVersion = options.apiVersion ?? GitStorage.overrides.apiVersion ?? API_VERSION;
+		const resolvedApiBaseUrl = options.apiBaseUrl ?? GitStorage.getDefaultAPIBaseUrl(options.name);
+		const resolvedApiVersion = options.apiVersion ?? API_VERSION;
 		const resolvedStorageBaseUrl =
-			options.storageBaseUrl ?? GitStorage.overrides.storageBaseUrl ?? STORAGE_BASE_URL;
-		const resolvedDefaultTtl = options.defaultTTL ?? GitStorage.overrides.defaultTTL;
+			options.storageBaseUrl ?? GitStorage.getDefaultStorageBaseUrl(options.name);
+		const resolvedDefaultTtl = options.defaultTTL;
 
 		this.api = getApiInstance(resolvedApiBaseUrl, resolvedApiVersion);
 
@@ -741,8 +749,12 @@ export class GitStorage {
 		};
 	}
 
-	static override(options: OverrideableGitStorageOptions): void {
-		this.overrides = Object.assign({}, this.overrides, options);
+	static getDefaultAPIBaseUrl(name: string): string {
+		return API_BASE_URL.replace('{{org}}', name);
+	}
+
+	static getDefaultStorageBaseUrl(name: string): string {
+		return STORAGE_BASE_URL.replace('{{org}}', name);
 	}
 
 	/**
@@ -853,5 +865,8 @@ export function createClient(options: GitStorageOptions): GitStorage {
 	return new GitStorage(options);
 }
 
+// Export CodeStorage as an alias for GitStorage
+export { GitStorage as CodeStorage };
+
 // Type alias for backward compatibility
 export type StorageOptions = GitStorageOptions;

package/src/types.ts

@@ -93,6 +93,7 @@ export interface GetFileOptions extends GitStorageInvocationOptions {
 	path: string;
 	ref?: string;
 	ephemeral?: boolean;
+	ephemeralBase?: boolean;
 }
 
 export interface PullUpstreamOptions extends GitStorageInvocationOptions {
@@ -184,6 +185,8 @@ export interface ListCommitsResult {
 export interface GetBranchDiffOptions extends GitStorageInvocationOptions {
 	branch: string;
 	base?: string;
+	ephemeral?: boolean;
+	ephemeralBase?: boolean;
 }
 
 export type GetBranchDiffResponse = GetBranchDiffResponseRaw;
@@ -199,6 +202,7 @@ export interface GetBranchDiffResult {
 // Commit Diff API types
 export interface GetCommitDiffOptions extends GitStorageInvocationOptions {
 	sha: string;
+	baseSha?: string;
 }
 
 export type GetCommitDiffResponse = GetCommitDiffResponseRaw;

package/src/version.ts

@@ -0,0 +1,8 @@
+import packageJson from '../package.json';
+
+export const PACKAGE_NAME = 'code-storage-sdk';
+export const PACKAGE_VERSION = packageJson.version;
+
+export function getUserAgent(): string {
+	return `${PACKAGE_NAME}/${PACKAGE_VERSION}`;
+}