yamlite 0.35.0 → 0.36.0

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { I as isLoopback, L as loopbackHosts, P as createHandler, R as check, a as query, c as exportSite, i as formatTable, n as formatCsv, o as generateConfig, r as formatJson, s as init, t as open } from "./src-DKu7thkC.mjs";
-import { n as guide, r as envKeys, t as createWorkspace } from "./workspace-BHg_GGkH.mjs";
+import { I as isLoopback, L as loopbackHosts, P as createHandler, R as check, a as query, c as exportSite, i as formatTable, n as formatCsv, o as generateConfig, r as formatJson, s as init, t as open } from "./src-O1FTGCot.mjs";
+import { n as guide, r as envKeys, t as createWorkspace } from "./workspace-1vCIMAfl.mjs";
 import { createRequire } from "node:module";
 import { relative, resolve } from "node:path";
 import { homedir } from "node:os";

package/dist/core.d.mts

@@ -277,8 +277,13 @@ interface GitDriver {
     afterTreeChange: () => Promise<void>;
   }): Promise<ReviewOutcome>;
   readonly namesBranch?: boolean;
+  readonly defaultBranchFiles?: DefaultBranchFiles;
   readonly steps?: StepRunner;
 }
+interface DefaultBranchFiles {
+  changes(): Promise<GitStatus["changes"]>;
+  file(rootPath: string): Promise<Uint8Array | null>;
+}
 interface StepRunner {
   readonly repo: Repo;
   validate(raw: unknown): Promise<{
@@ -524,4 +529,4 @@ interface Workspace {
 }
 export declare function createWorkspace(o: WorkspaceOptions): Promise<Workspace>;
 //#endregion
-export { type AiOptions, type ApiContext, CONFIG_NAMES, type Capture, type Change, type ChangeOp, type CheckResult, type CheckTable, type ColumnType, type Config, type ConflictInfo, type Credentials, type Decision, type DeclaredTable, type DiffResult, type ExportOptions, type ExportResult, type Extract, type Extracted, type GitDriver, type GitStatus, type GitStep, type HistoryEntry, type HistoryPage, type HistoryTarget, type IndexSpec, type InitOptions, type OpenOptions, type PageSpec, type QueryOptions, type QueryResult, type Repo, type ReviewOutcome, type ReviewRequest, type RunOptions, type SchemaChange, type StepResult, type StepRunner, type TableInput, type TableLocation, type TableResult, type TableSpec, type WatchHandlers, type WatchOptions, type Watcher, type Workspace, type WorkspaceOptions, Yamlite, check, exportSite, formatCsv, formatJson, formatTable, generateConfig, init, open, parseConfig, query, readsFile };
+export { type AiOptions, type ApiContext, CONFIG_NAMES, type Capture, type Change, type ChangeOp, type CheckResult, type CheckTable, type ColumnType, type Config, type ConflictInfo, type Credentials, type Decision, type DeclaredTable, type DefaultBranchFiles, type DiffResult, type ExportOptions, type ExportResult, type Extract, type Extracted, type GitDriver, type GitStatus, type GitStep, type HistoryEntry, type HistoryPage, type HistoryTarget, type IndexSpec, type InitOptions, type OpenOptions, type PageSpec, type QueryOptions, type QueryResult, type Repo, type ReviewOutcome, type ReviewRequest, type RunOptions, type SchemaChange, type StepResult, type StepRunner, type TableInput, type TableLocation, type TableResult, type TableSpec, type WatchHandlers, type WatchOptions, type Watcher, type Workspace, type WorkspaceOptions, Yamlite, check, exportSite, formatCsv, formatJson, formatTable, generateConfig, init, open, parseConfig, query, readsFile };

package/dist/core.mjs

@@ -1,3 +1,3 @@
-import { C as fieldChanges, F as HttpError, H as readsFile, R as check, S as describeChange, V as parseConfig, a as query, c as exportSite, f as ReviewRefused, i as formatTable, n as formatCsv, o as generateConfig, r as formatJson, s as init, t as open, w as worthShowing, z as CONFIG_NAMES } from "./src-DKu7thkC.mjs";
-import { t as createWorkspace } from "./workspace-BHg_GGkH.mjs";
+import { C as fieldChanges, F as HttpError, H as readsFile, R as check, S as describeChange, V as parseConfig, a as query, c as exportSite, f as ReviewRefused, i as formatTable, n as formatCsv, o as generateConfig, r as formatJson, s as init, t as open, w as worthShowing, z as CONFIG_NAMES } from "./src-O1FTGCot.mjs";
+import { t as createWorkspace } from "./workspace-1vCIMAfl.mjs";
 export { CONFIG_NAMES, HttpError, ReviewRefused, check, createWorkspace, describeChange, exportSite, fieldChanges, formatCsv, formatJson, formatTable, generateConfig, init, open, parseConfig, query, readsFile, worthShowing };

package/dist/index.mjs

@@ -1 +1 @@
-export { R as check, c as exportSite, n as formatCsv, r as formatJson, i as formatTable, o as generateConfig, s as init, t as open, a as query } from "./src-DKu7thkC.mjs";
+export { R as check, c as exportSite, n as formatCsv, r as formatJson, i as formatTable, o as generateConfig, s as init, t as open, a as query } from "./src-O1FTGCot.mjs";

package/dist/{src-DKu7thkC.mjs → src-O1FTGCot.mjs}

@@ -6015,6 +6015,12 @@ async function localDriver(root, gh) {
 		if (!f) throw new NoRepository();
 		return f;
 	};
+	const defaultName = async () => {
+		const f = await lookup();
+		if (!f) return null;
+		base ??= await defaultBranch(f.repo);
+		return base;
+	};
 	await lookup();
 	return {
 		namesBranch: true,
@@ -6053,12 +6059,7 @@ async function localDriver(root, gh) {
 				changes
 			};
 		},
-		async defaultBranch() {
-			const f = await lookup();
-			if (!f) return null;
-			base ??= await defaultBranch(f.repo);
-			return base;
-		},
+		defaultBranch: defaultName,
 		async baseContent(rootPath) {
 			const { repo } = await need();
 			const top = insideRoot(repo, rootPath);
@@ -6070,35 +6071,41 @@ async function localDriver(root, gh) {
 			}
 		},
 		async baseFile(rootPath) {
-			const { repo } = await need();
-			const top = insideRoot(repo, rootPath);
-			if (top === null) throw new GitError(`${rootPath} is outside the repository`);
-			let entry;
-			try {
-				entry = await runGit(repo.top, [
-					"ls-tree",
+			return blobAt((await need()).repo, "HEAD", rootPath);
+		},
+		defaultBranchFiles: {
+			async changes() {
+				const f = await lookup();
+				if (!f) return [];
+				const [branch, name] = [await currentBranch(f.repo), await defaultName()];
+				if (branch === null || name === null || branch === name) return [];
+				const parts = (await runGit(f.repo.top, [
+					"diff",
+					"--name-status",
+					"--no-renames",
 					"-z",
-					"HEAD",
+					`${await defaultRef(f.repo, name)}...HEAD`,
 					"--",
-					top
-				]);
-			} catch (e) {
-				if (!await runGit(repo.top, [
-					"rev-parse",
-					"-q",
-					"--verify",
-					"HEAD"
-				]).then(() => true, () => false)) return null;
-				throw e;
+					f.repo.prefix || "."
+				])).split("\0");
+				const changes = [];
+				for (let i = 0; i + 1 < parts.length; i += 2) {
+					const path = toRoot(f.repo, parts[i + 1]);
+					if (path === null) continue;
+					const code = parts[i];
+					changes.push({
+						path,
+						status: code === "A" ? "added" : code === "D" ? "deleted" : "modified"
+					});
+				}
+				return changes;
+			},
+			async file(rootPath) {
+				const { repo } = await need();
+				const name = await defaultName();
+				if (name === null) throw new GitError("the default branch is not known");
+				return blobAt(repo, await defaultRef(repo, name), rootPath);
 			}
-			if (entry === "") return null;
-			const type = entry.split(" ")[1];
-			if (type !== "blob") throw new GitError(`${rootPath} is a ${type === "commit" ? "submodule" : "folder"}`);
-			return runGitBytes(repo.top, [
-				"cat-file",
-				"--filters",
-				`HEAD:${top}`
-			], { timeoutMs: SLOW_MS });
 		},
 		history: (t, extract, o) => recordHistory(t, extract, o),
 		fileDiff: (t, rev) => fileDiff(t, rev),
@@ -6112,6 +6119,45 @@ async function localDriver(root, gh) {
 		}
 	};
 }
+async function defaultRef(repo, name) {
+	for (const ref of [`refs/remotes/origin/${name}`, `refs/heads/${name}`]) if (await runGit(repo.top, [
+		"rev-parse",
+		"-q",
+		"--verify",
+		`${ref}^{commit}`
+	]).then(() => true, () => false)) return ref;
+	throw new GitError(`the default branch ${name} is not in this clone`);
+}
+async function blobAt(repo, rev, rootPath) {
+	const top = insideRoot(repo, rootPath);
+	if (top === null) throw new GitError(`${rootPath} is outside the repository`);
+	let entry;
+	try {
+		entry = await runGit(repo.top, [
+			"ls-tree",
+			"-z",
+			rev,
+			"--",
+			top
+		]);
+	} catch (e) {
+		if (!await runGit(repo.top, [
+			"rev-parse",
+			"-q",
+			"--verify",
+			rev
+		]).then(() => true, () => false)) return null;
+		throw e;
+	}
+	if (entry === "") return null;
+	const type = entry.split(" ")[1];
+	if (type !== "blob") throw new GitError(`${rootPath} is a ${type === "commit" ? "submodule" : "folder"}`);
+	return runGitBytes(repo.top, [
+		"cat-file",
+		"--filters",
+		`${rev}:${top}`
+	], { timeoutMs: SLOW_MS });
+}
 //#endregion
 //#region src/serve/gitrecords.ts
 function ownerOf(tables, file) {
@@ -6268,14 +6314,59 @@ const gitRoutes = (router, ctx) => {
 			...summary(await recordChanges(git, ctx.root, ctx.y.tables, c.path))
 		})));
 		changes.sort((a, b) => a.path.localeCompare(b.path));
+		const defaultBranch = await git.defaultBranch();
 		return { git: {
 			branch: status.branch,
-			defaultBranch: await git.defaultBranch(),
+			defaultBranch,
 			upstream: status.upstream,
 			namesBranch: git.namesBranch === true,
+			restoresDefault: git.defaultBranchFiles !== void 0 && status.branch !== null && defaultBranch !== null && status.branch !== defaultBranch,
 			changes
 		} };
 	});
+	router.add("GET", "/api/git/default", async () => {
+		const from = ctx.git?.defaultBranchFiles;
+		if (!from) throw new HttpError(404, "this host cannot read the default branch");
+		const [changes, status] = await Promise.all([from.changes().catch(notFound), ctx.git.status()]);
+		const unsent = new Set(status.changes.map((c) => c.path));
+		return { files: changes.map((c) => ({
+			path: c.path,
+			status: c.status,
+			table: ownerOf(ctx.y.tables, join(ctx.root, c.path))?.spec.name ?? null,
+			unsent: unsent.has(c.path)
+		})).sort((a, b) => a.path.localeCompare(b.path)) };
+	});
+	router.add("POST", "/api/git/restore-default", async ({ body }) => {
+		const from = ctx.git?.defaultBranchFiles;
+		if (!from) throw new HttpError(404, "this host cannot read the default branch");
+		const paths = objectBody(body, "body").files;
+		if (!Array.isArray(paths) || paths.length === 0 || paths.some((p) => typeof p !== "string")) throw new HttpError(400, "choose at least one file", { field: "files" });
+		return ctx.proposals.exclusive(async () => {
+			const changed = new Set((await from.changes().catch(notFound)).map((c) => c.path));
+			const files = await Promise.all(paths.map(async (path) => {
+				const file = resolve(ctx.root, path);
+				const rel = relative(ctx.root, file);
+				if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) throw new HttpError(400, `${path} is outside the data folder`);
+				if (!changed.has(path)) throw new HttpError(400, `${path} is the same as on the default branch`);
+				const content = await from.file(path).catch(notFound);
+				if (content === null && existsSync(file) && lstatSync(file).isDirectory()) throw new HttpError(409, `${path} is a folder; remove it with git`);
+				return {
+					path,
+					file,
+					content
+				};
+			}));
+			assertSynced(await ctx.y.sync(), "could not write the latest edits to files for", "; nothing was restored");
+			for (const f of files) if (f.content === null) rmSync(f.file, { force: true });
+			else {
+				mkdirSync(dirname(f.file), { recursive: true });
+				writeAtomic(f.file, f.content);
+			}
+			if (files.some((f) => f.file === resolve(ctx.configFile))) ctx.reloadConfig();
+			assertSynced(await ctx.y.sync({ force: true }), "the database could not follow the files for");
+			return { files: files.map((f) => f.path) };
+		});
+	});
 	router.add("GET", "/api/git/diff", async ({ query }) => {
 		const git = ctx.git;
 		if (!git) throw new HttpError(404, "the data folder is not in a git repository");