fundus 0.7.0 → 0.8.1

package/build/handler.js

@@ -2,9 +2,9 @@ import './shims.js';
 import 'node:fs';
 import 'node:path';
 import 'node:process';
-export { h as handler } from './server/chunks/handler-Bn4TsL93.js';
-import './server/chunks/index.js-DzYQtf0T.js';
-import './server/chunks/manifest.js-DewM2Q1D.js';
+export { h as handler } from './server/chunks/handler-DRroBRnU.js';
+import './server/chunks/index.js-C_qwAlbJ.js';
+import './server/chunks/manifest.js-BWmxuuCT.js';
 import './env.js';
 import 'node:buffer';
 import 'node:crypto';
@@ -12,11 +12,11 @@ import 'node:http';
 import 'node:timers';
 import 'node:querystring';
 import 'node:stream';
-import './server/chunks/chunks/shared.js-C34rGnTQ.js';
-import './server/chunks/chunks/internal.js-CdY4S4Uy.js';
-import './server/chunks/chunks/utils.js-BMCQVogA.js';
+import './server/chunks/chunks/shared.js-CkgrfauU.js';
+import './server/chunks/chunks/internal.js-BVOitVDG.js';
+import './server/chunks/chunks/utils.js-CWlaCLgA.js';
 import 'node:url';
 import './server/chunks/chunks/internal2.js-BlXt2rfE.js';
-import './server/chunks/chunks/exports.js-CAJ9ZQQx.js';
+import './server/chunks/chunks/exports.js-DTz2RvK4.js';
 import './server/chunks/chunks/routing.js-y-tryuip.js';
 //# sourceMappingURL=handler.js.map

package/build/index.js

@@ -1,7 +1,7 @@
 import http from 'node:http';
 import fs__default from 'node:fs';
 import process from 'node:process';
-import { p as polka, h as handler, f as format_listening_address } from './server/chunks/handler-Bn4TsL93.js';
+import { p as polka, h as handler, f as format_listening_address } from './server/chunks/handler-DRroBRnU.js';
 import { env, timeout_env } from './env.js';
 import { rm } from 'node:fs/promises';
 import './shims.js';
@@ -11,14 +11,14 @@ import 'node:path';
 import 'node:timers';
 import 'node:querystring';
 import 'node:stream';
-import './server/chunks/chunks/shared.js-C34rGnTQ.js';
-import './server/chunks/chunks/internal.js-CdY4S4Uy.js';
-import './server/chunks/chunks/utils.js-BMCQVogA.js';
-import './server/chunks/index.js-DzYQtf0T.js';
+import './server/chunks/chunks/shared.js-CkgrfauU.js';
+import './server/chunks/chunks/internal.js-BVOitVDG.js';
+import './server/chunks/chunks/utils.js-CWlaCLgA.js';
+import './server/chunks/index.js-C_qwAlbJ.js';
 import './server/chunks/chunks/internal2.js-BlXt2rfE.js';
-import './server/chunks/chunks/exports.js-CAJ9ZQQx.js';
+import './server/chunks/chunks/exports.js-DTz2RvK4.js';
 import './server/chunks/chunks/routing.js-y-tryuip.js';
-import './server/chunks/manifest.js-DewM2Q1D.js';
+import './server/chunks/manifest.js-BWmxuuCT.js';
 import 'node:url';
 
 const path = env('SOCKET_PATH', false);

package/build/server/chunks/chunks/{context.js-CLnT3cF3.js → context.js-CPdlcRhV.js}

@@ -1,12 +1,13 @@
 import { g as folderOfRawPath, h as rawFileNameOfPath, j as canonicalizeParameters, n as normalizeFolderPath, c as compareCodeUnits, E as typesForFileName, G as proposeAssetId, k as parentFolderPath, u as portableFolderPathKey } from './core.js-DNIuZ9y-.js';
-import { s as serverPluginsByType, i as isRecord, L as LibraryStore, a as serverPluginForType, S as SourceImportError, p as processAssets, g as generateManifestModules, d as descriptorsByType, r as readCurrentProxy, e as encodeRelativePathForUrl, b as invalidInput } from './contract.js-DGMufT2e.js';
+import { s as serverPluginsByType, i as isRecord, L as LibraryStore, a as serverPluginForType, S as SourceImportError, p as processAssets, g as generateManifestModules, d as descriptorsByType, r as readCurrentProxy, e as encodeRelativePathForUrl, b as invalidInput, c as parseLibrary } from './contract.js-nwG99Zzj.js';
 import { a as assetIdError, c as collectAllReferences, b as computeLibraryMembership, d as allDeliveredAssetIds } from './manifest-membership.js-CJnQXrL4.js';
 import { v as verifyStableRawFile, c as classifyRawDirectory } from './raw-reconciliation2.js-C2No1QIL.js';
-import { isAbsolute, resolve, join, extname } from 'node:path';
+import { isAbsolute, resolve, join, extname, relative, sep } from 'node:path';
 import { existsSync } from 'node:fs';
 import { createJiti } from 'jiti';
+import { realpath } from 'node:fs/promises';
 import { execFile } from 'node:child_process';
-import { promisify } from 'node:util';
+import { isDeepStrictEqual, promisify } from 'node:util';
 import sharp from 'sharp';
 import { lookup } from 'node:dns/promises';
 import { isIP } from 'node:net';
@@ -563,14 +564,31 @@ var serverImporters = new SourceImporterRegistry([fileSourceImporter, figmaSourc
 //#endregion
 //#region src/lib/server/git.ts
 var execFileAsync = promisify(execFile);
-async function git(projectRoot, args) {
+var MAX_LIBRARY_BLOB_BYTES = 64 * 1024 * 1024;
+async function git(projectRoot, args, options = {}) {
 	const { stdout } = await execFileAsync("git", [
 		"-C",
 		projectRoot,
 		...args
-	], { encoding: "utf8" });
+	], {
+		encoding: "utf8",
+		...options
+	});
 	return stdout;
 }
+async function gitBlob(projectRoot, objectId) {
+	const { stdout } = await execFileAsync("git", [
+		"-C",
+		projectRoot,
+		"cat-file",
+		"blob",
+		objectId
+	], {
+		encoding: null,
+		maxBuffer: MAX_LIBRARY_BLOB_BYTES
+	});
+	return new TextDecoder("utf-8", { fatal: true }).decode(stdout);
+}
 /** Current branch of the repository containing projectRoot; null outside Git or when detached. */
 async function currentGitBranch(projectRoot) {
 	try {
@@ -579,8 +597,8 @@ async function currentGitBranch(projectRoot) {
 		return null;
 	}
 }
-async function firstExistingRef(projectRoot, refs) {
-	for (const ref of refs) try {
+async function verifiedRef(projectRoot, ref) {
+	try {
 		await git(projectRoot, [
 			"rev-parse",
 			"--verify",
@@ -588,7 +606,12 @@ async function firstExistingRef(projectRoot, refs) {
 			ref
 		]);
 		return ref;
-	} catch {}
+	} catch {
+		return null;
+	}
+}
+async function firstExistingRef(projectRoot, refs) {
+	for (const ref of refs) if (await verifiedRef(projectRoot, ref)) return ref;
 	return null;
 }
 async function defaultBranchRef(projectRoot) {
@@ -596,10 +619,9 @@ async function defaultBranchRef(projectRoot) {
 		const remoteHead = (await git(projectRoot, [
 			"symbolic-ref",
 			"--quiet",
-			"--short",
 			"refs/remotes/origin/HEAD"
 		])).trim();
-		if (remoteHead) return remoteHead;
+		if (remoteHead && await verifiedRef(projectRoot, remoteHead)) return remoteHead;
 	} catch {}
 	return firstExistingRef(projectRoot, [
 		"refs/remotes/origin/main",
@@ -608,56 +630,79 @@ async function defaultBranchRef(projectRoot) {
 		"refs/heads/master"
 	]);
 }
-function parseDiffNames(output, root) {
-	const changes = /* @__PURE__ */ new Map();
-	const fields = output.split("\0");
-	for (let index = 0; index < fields.length;) {
-		const status = fields[index++];
-		if (!status) continue;
-		const sourcePath = fields[index++];
-		if (!sourcePath) continue;
-		if (status.startsWith("R") || status.startsWith("C")) {
-			const destinationPath = fields[index++];
-			if (!destinationPath) continue;
-			changes.set(resolve(root, destinationPath), status.startsWith("C") ? "new" : "edited");
-		} else if (status === "A") changes.set(resolve(root, sourcePath), "new");
-		else if (status !== "D") changes.set(resolve(root, sourcePath), "edited");
-	}
-	return changes;
+async function repositoryLibraryPath(repositoryRoot, libraryPath) {
+	const path = relative(repositoryRoot, await realpath(resolve(libraryPath)));
+	if (path === "" || isAbsolute(path) || path === ".." || path.startsWith(`..${sep}`)) return null;
+	return path.split(sep).join("/");
+}
+async function historicalLibrary(projectRoot, mergeBase, repositoryRelativeLibraryPath) {
+	let tree;
+	try {
+		tree = await git(projectRoot, [
+			"ls-tree",
+			"--full-tree",
+			"-z",
+			mergeBase,
+			"--",
+			`:(literal)${repositoryRelativeLibraryPath}`
+		]);
+	} catch {
+		return { kind: "unavailable" };
+	}
+	if (tree === "") return { kind: "missing" };
+	if (!tree.endsWith("\0")) return { kind: "unavailable" };
+	const entries = tree.slice(0, -1).split("\0");
+	if (entries.length !== 1) return { kind: "unavailable" };
+	const match = /^([0-7]{6}) (blob) ([0-9a-fA-F]+)\t([\s\S]+)$/.exec(entries[0]);
+	if (!match || match[4] !== repositoryRelativeLibraryPath) return { kind: "unavailable" };
+	try {
+		return {
+			kind: "available",
+			library: parseLibrary(await gitBlob(projectRoot, match[3]))
+		};
+	} catch {
+		return { kind: "unavailable" };
+	}
+}
+function comparableRecord(record) {
+	return {
+		...record,
+		manifests: [...new Set(record.manifests)].sort(compareCodeUnits)
+	};
 }
 /**
-* Raw Git file changes made since this branch diverged from the repository's
-* default branch. Staged, unstaged, and untracked files are included so the
-* editor updates immediately after an asset mutation, before the next commit.
+* Asset-record changes made since this branch diverged from the repository's
+* default branch. The current parsed library includes committed and local
+* changes; raw-file state is intentionally handled by raw reconciliation.
 */
-async function gitFileChanges(projectRoot) {
+async function gitAssetChanges(projectRoot, libraryPath, currentLibrary) {
 	try {
-		const root = resolve(projectRoot, ...(await git(projectRoot, ["rev-parse", "--show-prefix"])).trim().split("/").filter(Boolean).map(() => ".."));
+		const repositoryRoot = (await git(projectRoot, ["rev-parse", "--show-toplevel"])).trim();
+		if (!repositoryRoot) return /* @__PURE__ */ new Map();
+		const libraryGitPath = await repositoryLibraryPath(repositoryRoot, libraryPath);
+		if (!libraryGitPath) return /* @__PURE__ */ new Map();
 		const defaultRef = await defaultBranchRef(projectRoot);
-		let changes = /* @__PURE__ */ new Map();
-		if (defaultRef) try {
-			const mergeBase = (await git(projectRoot, [
-				"merge-base",
-				"HEAD",
-				defaultRef
-			])).trim();
-			if (mergeBase) changes = parseDiffNames(await git(projectRoot, [
-				"diff",
-				"--name-status",
-				"-z",
-				"--find-renames",
-				mergeBase,
-				"--"
-			]), root);
-		} catch {}
-		const untracked = await git(projectRoot, [
-			"ls-files",
-			"--others",
-			"--exclude-standard",
-			"--full-name",
-			"-z"
-		]);
-		for (const path of untracked.split("\0")) if (path) changes.set(resolve(root, path), "new");
+		if (!defaultRef) return /* @__PURE__ */ new Map();
+		const mergeBase = (await git(projectRoot, [
+			"merge-base",
+			"HEAD",
+			defaultRef
+		])).trim();
+		if (!mergeBase) return /* @__PURE__ */ new Map();
+		const historical = await historicalLibrary(projectRoot, mergeBase, libraryGitPath);
+		if (historical.kind === "unavailable") return /* @__PURE__ */ new Map();
+		const changes = /* @__PURE__ */ new Map();
+		for (const [assetId, currentRecord] of Object.entries(currentLibrary.assets)) {
+			if (historical.kind === "missing") {
+				changes.set(assetId, "new");
+				continue;
+			}
+			if (!Object.hasOwn(historical.library.assets, assetId)) {
+				changes.set(assetId, "new");
+				continue;
+			}
+			if (!isDeepStrictEqual(comparableRecord(currentRecord), comparableRecord(historical.library.assets[assetId]))) changes.set(assetId, "edited");
+		}
 		return changes;
 	} catch {
 		return /* @__PURE__ */ new Map();
@@ -1214,7 +1259,7 @@ var FundusOperations = class {
 		};
 	}
 	async #buildState(library, issues, classification) {
-		const [gitBranch, changedGitFiles] = await Promise.all([currentGitBranch(this.#config.projectRoot), gitFileChanges(this.#config.projectRoot)]);
+		const [gitBranch, changedGitAssets] = await Promise.all([currentGitBranch(this.#config.projectRoot), gitAssetChanges(this.#config.projectRoot, this.#config.library, library)]);
 		const referencesByAsset = collectAllReferences(library, descriptorsByType(this.#registry));
 		const membershipByManifest = computeLibraryMembership(library, referencesByAsset);
 		const delivered = allDeliveredAssetIds(membershipByManifest);
@@ -1262,7 +1307,7 @@ var FundusOperations = class {
 				folder: folderOfRawPath(record.raw),
 				rawUrl: `/files/raw/${encodeRelativePathForUrl(record.raw)}?v=${record.rawHash.slice(0, 12)}`,
 				rawHash: record.rawHash,
-				gitStatus: changedGitFiles.get(resolve(this.#config.rawDir, record.raw)) ?? null,
+				gitStatus: changedGitAssets.get(assetId) ?? null,
 				importSource: record.importSource,
 				parameters: record.parameters,
 				manifests: record.manifests,
@@ -1465,4 +1510,4 @@ async function createFundusContext() {
 }
 
 export { getFundusContext as g, initializeFundusContext as i };
-//# sourceMappingURL=context.js-CLnT3cF3.js.map
+//# sourceMappingURL=context.js-CPdlcRhV.js.map