@fluid-app/fluid-cli-theme-dev 0.1.32 → 0.1.34

package/dist/index.mjs

@@ -1304,8 +1304,25 @@ function formatError(e) {
 }
 //#endregion
 //#region src/theme/syncer.ts
+/**
+* Server rejected the push because the CLI's `base_sha` no longer
+* matches the theme's current `content_version_sha` (someone else
+* wrote to the theme since our last pull). Callers surface a
+* "pull first" message; no partial state has been written when this
+* throws from the preflight, and the per-file variant preserves the
+* atomicity guarantee mid-loop by short-circuiting the remaining
+* files on the first conflicting response.
+*/
+var PushConflictError = class extends Error {
+	constructor(remoteSha) {
+		super(remoteSha ? `Your local is behind the server. Server is at ${remoteSha}; local is stale.` : "Your local is behind the server.");
+		this.remoteSha = remoteSha;
+		this.name = "PushConflictError";
+	}
+};
 var Syncer = class {
 	checksums = /* @__PURE__ */ new Map();
+	lastKnownRemoteSha = null;
 	constructor(api, themeId, themeRoot) {
 		this.api = api;
 		this.themeId = themeId;
@@ -1314,6 +1331,14 @@ var Syncer = class {
 	async fetchChecksums() {
 		const body = await listThemeResources(this.api, this.themeId);
 		this.updateChecksums(body.application_theme_resources ?? []);
+		this.lastKnownRemoteSha = body.content_version_sha ?? null;
+	}
+	/**
+	* Server's `content_version_sha` captured on the last `fetchChecksums()`
+	* or `downloadAll()`. `null` when talking to a pre-003a server.
+	*/
+	remoteSha() {
+		return this.lastKnownRemoteSha;
 	}
 	updateChecksums(resources) {
 		for (const r of resources) if (r.key && r.checksum) this.checksums.set(r.key, r.checksum);
@@ -1329,14 +1354,71 @@ var Syncer = class {
 	remoteChecksums() {
 		return Object.fromEntries(this.checksums);
 	}
-	async uploadFile(file) {
-		if (file.isText) await updateThemeResource(this.api, this.themeId, { application_theme_resource: {
+	async uploadFile(file, baseSha) {
+		if (file.isText) await this.putResource({
 			key: file.relativePath,
 			content: file.read()
-		} });
-		else await this.uploadBinaryFile(file);
+		}, baseSha);
+		else await this.uploadBinaryFile(file, baseSha);
+	}
+	/**
+	* Wraps the generated `updateThemeResource` client with the two
+	* merge-aware Phase 003 additions: sending `base_sha` on the request
+	* and reading the server's fresh `content_version_sha` off the
+	* response so the caller can thread it forward on the next PUT.
+	*
+	* Accepts any `application_theme_resource` shape — text uploads pass
+	* `{ key, content }`; binary uploads (after DAM + ImageKit
+	* orchestration) pass `{ key, dam_asset: { ... } }`. Both must route
+	* through here so `lastKnownRemoteSha` stays in lockstep with every
+	* write the server has ack'd, mixed text/binary pushes included.
+	*
+	* The typed client hasn't been regenerated against the new OpenAPI
+	* spec yet, so `base_sha` is threaded through as an extra property
+	* (server accepts unknown fields on this endpoint) and the response
+	* is cast to read the extra `content_version_sha`. Regeneration is
+	* a follow-up; that PR will drop these casts.
+	*
+	* `PushConflictError` is thrown on a 409 so callers can distinguish
+	* "server rejected because of stale base" from generic upload
+	* failures.
+	*/
+	async putResource(resource, baseSha) {
+		const body = { application_theme_resource: resource };
+		if (baseSha) body["base_sha"] = baseSha;
+		try {
+			const response = await updateThemeResource(this.api, this.themeId, body);
+			if (response.content_version_sha) this.lastKnownRemoteSha = response.content_version_sha;
+		} catch (e) {
+			throw this.rethrowIfConflict(e);
+		}
+	}
+	/**
+	* Server-side push preflight (Phase 003a). Runs once at the start of
+	* a push loop. On 200 the server's fresh `remote_sha` is stashed on
+	* the syncer so subsequent per-file PUTs can carry it. On 409 a
+	* `PushConflictError` is thrown carrying the server's `remote_sha`
+	* from the `meta` payload — the caller renders "pull first".
+	*
+	* Skipped when `baseSha` is null/undefined so old-behavior pushes
+	* (no stored `baseSha` in `.fluid-theme.json`) and `--force` pushes
+	* short-circuit past the check.
+	*/
+	async preflightPush(baseSha) {
+		if (!baseSha) return;
+		try {
+			const response = await this.api.post(`/api/application_themes/${this.themeId}/resources/check_push`, { base_sha: baseSha });
+			if (response.remote_sha) this.lastKnownRemoteSha = response.remote_sha;
+		} catch (e) {
+			throw this.rethrowIfConflict(e);
+		}
+	}
+	rethrowIfConflict(e) {
+		if ((e?.status ?? e?.response?.status) !== 409) return e;
+		const meta = e?.data?.meta;
+		return new PushConflictError(meta?.remote_sha ?? null);
 	}
-	async uploadBinaryFile(file) {
+	async uploadBinaryFile(file, baseSha) {
 		const asset = (await this.api.post("/api/dam/assets", { placeholder_asset: {
 			description: `Uploaded via Fluid CLI: ${file.name}`,
 			mime_type: file.mime.name,
@@ -1371,7 +1453,7 @@ var Syncer = class {
 		if (ikBody.height) backfillPayload["asset"]["height"] = ikBody.height;
 		if (ikBody.width) backfillPayload["asset"]["width"] = ikBody.width;
 		const backfillBody = await this.api.post("/api/dam/assets/backfill_imagekit", backfillPayload);
-		await updateThemeResource(this.api, this.themeId, { application_theme_resource: {
+		await this.putResource({
 			key: file.relativePath,
 			dam_asset: {
 				dam_asset_code: backfillBody.asset.code,
@@ -1382,7 +1464,7 @@ var Syncer = class {
 				url: backfillBody.asset.default_variant_url,
 				preview_image_url: ikBody.thumbnailUrl
 			}
-		} });
+		}, baseSha);
 	}
 	canonicalPathToImageKitFolder(canonicalPath) {
 		const parts = canonicalPath.split(".");
@@ -1397,13 +1479,22 @@ var Syncer = class {
 			files: "files"
 		}[category] ?? "files"}/${assetCode}`;
 	}
-	async deleteRemoteFile(relativePath) {
-		await deleteThemeResource(this.api, this.themeId, { application_theme_resource: { key: relativePath } });
+	async deleteRemoteFile(relativePath, baseSha) {
+		const body = { application_theme_resource: { key: relativePath } };
+		if (baseSha) body["base_sha"] = baseSha;
+		try {
+			const response = await deleteThemeResource(this.api, this.themeId, body);
+			if (response.content_version_sha) this.lastKnownRemoteSha = response.content_version_sha;
+		} catch (e) {
+			throw this.rethrowIfConflict(e);
+		}
 		this.checksums.delete(relativePath);
 	}
 	async downloadAll() {
-		const resources = (await listThemeResources(this.api, this.themeId)).application_theme_resources ?? [];
+		const body = await listThemeResources(this.api, this.themeId);
+		const resources = body.application_theme_resources ?? [];
 		this.updateChecksums(resources);
+		this.lastKnownRemoteSha = body.content_version_sha ?? null;
 		return resources;
 	}
 	async downloadBinaryAsset(url) {
@@ -1413,6 +1504,8 @@ var Syncer = class {
 	}
 	async uploadTheme(opts = {}) {
 		await this.fetchChecksums();
+		await this.preflightPush(opts.baseSha);
+		let baseSha = opts.baseSha ?? null;
 		const localFiles = this.themeRoot.files();
 		const result = {
 			uploaded: 0,
@@ -1436,9 +1529,11 @@ var Syncer = class {
 		let done = 0;
 		for (const file of toUpload) {
 			try {
-				await this.uploadFile(file);
+				await this.uploadFile(file, baseSha);
+				baseSha = this.lastKnownRemoteSha;
 				result.uploaded++;
 			} catch (e) {
+				if (e instanceof PushConflictError) throw e;
 				result.errors.push(`Upload ${file.relativePath}: ${formatError(e)}`);
 			}
 			opts.onProgress?.(++done, toUpload.length);
@@ -1447,9 +1542,11 @@ var Syncer = class {
 			const localPaths = new Set(localFiles.map((f) => f.relativePath));
 			const toDelete = this.remoteKeys().filter((k) => !localPaths.has(k));
 			for (const key of toDelete) try {
-				await this.deleteRemoteFile(key);
+				await this.deleteRemoteFile(key, baseSha);
+				baseSha = this.lastKnownRemoteSha;
 				result.deleted++;
 			} catch (e) {
+				if (e instanceof PushConflictError) throw e;
 				result.errors.push(`Delete ${key}: ${formatError(e)}`);
 			}
 		}
@@ -1853,7 +1950,7 @@ function detectRemoteDrift(storedChecksums, remoteChecksums, themeRoot) {
 	return conflicts;
 }
 function createPushCommand() {
-	return new Command("push").description("Push local theme files to a remote theme").option("-t, --theme <name-or-id>", "Theme name or ID to push to").option("-n, --nodelete", "Do not delete remote files missing locally").option("-f, --force", "Skip schema validation").option("-p, --publish", "Publish the theme after pushing").option("-u, --unpublished", "Create a new unpublished theme and push to it").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
+	return new Command("push").description("Push local theme files to a remote theme").option("-t, --theme <name-or-id>", "Theme name or ID to push to").option("-n, --nodelete", "Do not delete remote files missing locally").option("-f, --force", "Skip schema validation and the server-side merge check").option("-p, --publish", "Publish the theme after pushing").option("-u, --unpublished", "Create a new unpublished theme and push to it").option("--root <path>", "Theme root directory", ".").action(async (opts) => {
 		requireToken();
 		let rootPath = opts.root;
 		if (rootPath === ".") {
@@ -1888,6 +1985,7 @@ function createPushCommand() {
 			console.log(`  Using theme from .fluid-theme.json: ${chalk.bold(config.themeName)} (#${config.themeId})`);
 			theme = (await getApplicationTheme(api, config.themeId)).application_theme;
 		} else theme = await selectTheme(api, "Select a theme to push to");
+		let overrideMergeCheck = false;
 		if (config?.checksums && !opts.force) {
 			const driftSpinner = ora("Checking for remote changes…").start();
 			const driftSyncer = new Syncer(api, theme.id, themeRoot);
@@ -1926,17 +2024,33 @@ function createPushCommand() {
 					console.log(`Run ${chalk.cyan("fluid theme pull")} first, then push again.`);
 					process.exit(0);
 				}
+				if (resolution === "push") overrideMergeCheck = true;
 			}
 		}
 		const syncer = new Syncer(api, theme.id, themeRoot);
 		const spinner = ora(`Pushing to ${theme.name} (#${theme.id})…`).start();
-		const result = await syncer.uploadTheme({
-			delete: !opts.nodelete,
-			validate: !opts.force,
-			onProgress: (d, total) => {
-				spinner.text = `Pushing ${d}/${total} files…`;
+		const baseSha = opts.force || overrideMergeCheck ? null : config?.baseSha ?? null;
+		let result;
+		try {
+			result = await syncer.uploadTheme({
+				delete: !opts.nodelete,
+				validate: !opts.force,
+				baseSha,
+				onProgress: (d, total) => {
+					spinner.text = `Pushing ${d}/${total} files…`;
+				}
+			});
+		} catch (e) {
+			if (e instanceof PushConflictError) {
+				spinner.fail("Server has changed since your last pull. Push aborted.");
+				console.log();
+				console.log(`  ${chalk.cyan("Run `fluid theme pull` first")} to sync down the remote changes,`);
+				console.log(`  then push again. Use ${chalk.cyan("fluid theme push --force")} to overwrite anyway.`);
+				console.log();
+				process.exit(1);
 			}
-		});
+			throw e;
+		}
 		if (result.validationFailed) {
 			spinner.fail(`Schema validation failed (${result.errors.length} error(s)). Use --force to skip.`);
 			for (const e of result.errors) console.error(`  ${e}`);
@@ -1945,10 +2059,14 @@ function createPushCommand() {
 			spinner.warn(`Pushed with ${result.errors.length} error(s).`);
 			for (const e of result.errors) console.error(`  ${e}`);
 		} else spinner.succeed(`Pushed ${result.uploaded} file(s), deleted ${result.deleted} remote file(s).`);
-		if (config) writeThemeConfig(themeRoot.root, {
-			...config,
-			checksums: syncer.remoteChecksums()
-		});
+		if (config) {
+			const remoteSha = syncer.remoteSha();
+			writeThemeConfig(themeRoot.root, {
+				...config,
+				checksums: syncer.remoteChecksums(),
+				baseSha: remoteSha ?? config.baseSha
+			});
+		}
 		if (opts.publish) {
 			const pubSpinner = ora("Publishing theme…").start();
 			try {
@@ -2005,7 +2123,7 @@ function detectConflicts(storedChecksums, remoteChecksums, themeRoot) {
 	return conflicts;
 }
 function createPullCommand() {
-	return new Command("pull").description("Pull a remote theme to your local directory").option("-t, --theme <name-or-id>", "Theme name or ID to pull").option("-n, --nodelete", "Do not delete local files missing on remote").option("--root <path>", "Theme root directory").option("-y, --yes", "Skip confirmation prompt").action(async (opts) => {
+	return new Command("pull").description("Pull a remote theme to your local directory").option("-t, --theme <name-or-id>", "Theme name or ID to pull").option("-n, --nodelete", "Do not delete local files missing on remote").option("--root <path>", "Theme root directory").option("-y, --yes", "Skip confirmation prompt").option("-f, --force", "Overwrite local changes without prompting on conflicts").action(async (opts) => {
 		requireToken();
 		const api = createApiClient();
 		const workspace = findWorkspace();
@@ -2025,7 +2143,7 @@ function createPullCommand() {
 		console.log();
 		const themeRoot = new ThemeRoot(root);
 		let skipKeys;
-		if (existingConfig?.checksums) {
+		if (existingConfig?.checksums && !opts.force) {
 			const fetchSpinner = ora("Checking for conflicts…").start();
 			const syncer = new Syncer(api, theme.id, themeRoot);
 			await syncer.fetchChecksums();
@@ -2088,12 +2206,14 @@ function createPullCommand() {
 			const oldChecksum = existingConfig.checksums[key];
 			if (oldChecksum) newChecksums[key] = oldChecksum;
 		}
+		const remoteSha = syncer.remoteSha();
 		writeThemeConfig(absoluteRoot, {
 			themeId: theme.id,
 			themeName: theme.name,
 			company: subdomain,
 			lastPulledAt: (/* @__PURE__ */ new Date()).toISOString(),
-			checksums: newChecksums
+			checksums: newChecksums,
+			baseSha: remoteSha ?? existingConfig?.baseSha
 		});
 		const parts = [`Downloaded ${result.downloaded} file(s)`];
 		if (result.deleted > 0) parts.push(`deleted ${result.deleted} local file(s)`);