pushwork 2.0.0-a.sub.0 → 2.0.0-preview

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "pushwork",
-  "version": "2.0.0-a.sub.0",
+  "version": "2.0.0-preview",
   "description": "Bidirectional directory synchronization using Automerge CRDTs",
-  "type": "module",
   "main": "dist/index.js",
   "exports": {
     ".": "./dist/index.js"
@@ -10,7 +9,6 @@
   "bin": {
     "pushwork": "./dist/cli.js"
   },
-  "packageManager": "pnpm@8.15.0",
   "engines": {
     "node": ">=24.0.0",
     "pnpm": ">=8.0.0"
@@ -25,72 +23,41 @@
   "author": "Peter van Hardenberg",
   "license": "MIT",
   "dependencies": {
-    "@automerge/automerge": "^3.2.4",
-    "@automerge/automerge-repo": "2.6.0-subduction.3",
-    "@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.3",
-    "@automerge/automerge-repo-subduction-bridge": "2.6.0-subduction.3",
-    "@automerge/automerge-subduction": "*",
+    "@automerge/automerge": "^3.2.6",
+    "@automerge/automerge-repo": "2.6.0-subduction.15",
+    "@automerge/automerge-repo-network-websocket": "2.6.0-subduction.15",
+    "@automerge/automerge-repo-storage-nodefs": "2.6.0-subduction.15",
+    "@automerge/automerge-subduction": "0.8.1",
     "@commander-js/extra-typings": "^14.0.0",
     "chalk": "^5.3.0",
     "commander": "^14.0.2",
+    "debug": "^4.4.3",
     "diff": "^8.0.2",
-    "fake-indexeddb": "^6.2.5",
     "glob": "^10.3.0",
     "ignore": "^5.3.0",
     "mime-types": "^2.1.35",
     "ora": "^7.0.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.28.6",
-    "@babel/preset-env": "^7.28.6",
+    "@types/debug": "^4.1.13",
     "@types/diff": "^5.0.3",
-    "@types/jest": "^29.5.0",
     "@types/mime-types": "^2.1.1",
     "@types/node": "^20.0.0",
     "@types/tmp": "^0.2.4",
-    "babel-jest": "^30.2.0",
+    "@vitest/coverage-v8": "^2.1.0",
     "fast-check": "^4.3.0",
-    "jest": "^29.7.0",
     "tmp": "^0.2.1",
-    "ts-jest": "^29.1.0",
     "tsx": "^4.19.2",
-    "typescript": "^5.2.0"
-  },
-  "jest": {
-    "preset": "ts-jest",
-    "testEnvironment": "node",
-    "roots": [
-      "<rootDir>/src",
-      "<rootDir>/test"
-    ],
-    "testMatch": [
-      "**/__tests__/**/*.ts",
-      "**/*.(test|spec).ts"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.ts",
-      "!src/**/*.d.ts"
-    ],
-    "setupFilesAfterEnv": [
-      "<rootDir>/test/jest.setup.ts"
-    ],
-    "maxWorkers": "75%",
-    "maxConcurrency": 10,
-    "transformIgnorePatterns": [
-      "node_modules/(?!.*@automerge)"
-    ],
-    "transform": {
-      "^.+\\.tsx?$": "ts-jest",
-      "^.+\\.jsx?$": "babel-jest"
-    }
+    "typescript": "^5.2.0",
+    "vitest": "^2.1.0"
   },
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",
-    "test": "jest",
-    "test:bail": "jest --bail",
-    "test:watch": "jest --watch",
-    "test:coverage": "jest --coverage",
+    "test": "vitest run",
+    "test:bail": "vitest run --bail 1",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage",
     "lint": "eslint src --ext .ts",
     "lint:fix": "eslint src --ext .ts --fix",
     "clean": "rm -rf dist",

package/patches/@automerge__automerge-repo@2.6.0-subduction.15.patch

@@ -0,0 +1,26 @@
+diff --git a/dist/helpers/throttle.js b/dist/helpers/throttle.js
+index 92f3cc8ed8b0c870aa9f52fa6e3605d736364534..8822b477e3800f163b58a153e747f2a7090c0d38 100644
+--- a/dist/helpers/throttle.js
++++ b/dist/helpers/throttle.js
+@@ -31,7 +31,7 @@ export const throttle = (fn, delay) => {
+     let pendingArgs;
+     const throttled = function (...args) {
+         pendingArgs = args;
+-        wait = lastCall + delay - Date.now();
++        wait = Math.max(0, lastCall + delay - Date.now());
+         clearTimeout(timeout);
+         timeout = setTimeout(() => {
+             timeout = undefined;
+diff --git a/src/helpers/throttle.ts b/src/helpers/throttle.ts
+index a0933cdc809ed9944f2129c943ac0c9e90bcd195..43050dc0375031bc4490162a7314e3b3541a3f40 100644
+--- a/src/helpers/throttle.ts
++++ b/src/helpers/throttle.ts
+@@ -42,7 +42,7 @@ export const throttle = <F extends (...args: any[]) => any>(
+ 
+   const throttled = function (...args: Parameters<F>) {
+     pendingArgs = args
+-    wait = lastCall + delay - Date.now()
++    wait = Math.max(0, lastCall + delay - Date.now())
+     clearTimeout(timeout)
+     timeout = setTimeout(() => {
+       timeout = undefined

package/pnpm-workspace.yaml

@@ -0,0 +1,5 @@
+allowBuilds:
+  cbor-extract: true
+  esbuild: true
+patchedDependencies:
+  '@automerge/automerge-repo@2.6.0-subduction.15': patches/@automerge__automerge-repo@2.6.0-subduction.15.patch

package/src/branches.ts

@@ -0,0 +1,93 @@
+import * as fs from "fs/promises";
+import * as path from "path";
+import {
+	type AutomergeUrl,
+	type DocHandle,
+	type Repo,
+} from "@automerge/automerge-repo";
+import { log } from "./log.js";
+
+const dlog = log("branches");
+
+export const META = "@patchwork";
+export const DEFAULT_BRANCH = "default";
+
+export type BranchesDoc = {
+	"@patchwork": { type: "branches" };
+	branches: { [name: string]: AutomergeUrl };
+};
+
+export const isBranchesDoc = (doc: unknown): doc is BranchesDoc => {
+	if (!doc || typeof doc !== "object") return false;
+	const meta = (doc as Record<string, unknown>)[META];
+	return (
+		!!meta &&
+		typeof meta === "object" &&
+		(meta as Record<string, unknown>).type === "branches"
+	);
+};
+
+export function detectDocType(
+	doc: unknown,
+): "branches" | "folder" | "directory" | "unknown" {
+	if (!doc || typeof doc !== "object") return "unknown";
+	const meta = (doc as Record<string, unknown>)[META];
+	if (!meta || typeof meta !== "object") return "unknown";
+	const t = (meta as Record<string, unknown>).type;
+	if (t === "branches" || t === "folder" || t === "directory") return t;
+	return "unknown";
+}
+
+export async function resolveEffectiveRoot(
+	repo: Repo,
+	rootHandle: DocHandle<unknown>,
+	branchName: string | null,
+): Promise<DocHandle<unknown>> {
+	const doc = rootHandle.doc();
+	if (!isBranchesDoc(doc)) return rootHandle;
+	if (!branchName) {
+		throw new Error(
+			"pushwork repo uses branches but no branch name is set",
+		);
+	}
+	const url = doc.branches?.[branchName];
+	if (!url) {
+		throw new Error(
+			`branch "${branchName}" not found in branches doc ${rootHandle.url}`,
+		);
+	}
+	dlog("resolveEffectiveRoot branch=%s → %s", branchName, url);
+	return repo.find<unknown>(url);
+}
+
+export function listBranchNames(branchesDoc: BranchesDoc): string[] {
+	return Object.keys(branchesDoc.branches ?? {}).sort();
+}
+
+const BRANCH_FILE = path.join(".pushwork", "branch");
+
+export async function readBranchFile(root: string): Promise<string | null> {
+	try {
+		const text = await fs.readFile(path.join(root, BRANCH_FILE), "utf8");
+		return text.trim() || null;
+	} catch (err) {
+		if ((err as NodeJS.ErrnoException).code === "ENOENT") return null;
+		throw err;
+	}
+}
+
+export async function writeBranchFile(
+	root: string,
+	branchName: string,
+): Promise<void> {
+	await fs.mkdir(path.join(root, ".pushwork"), { recursive: true });
+	await fs.writeFile(path.join(root, BRANCH_FILE), branchName + "\n");
+}
+
+export async function deleteBranchFile(root: string): Promise<void> {
+	try {
+		await fs.unlink(path.join(root, BRANCH_FILE));
+	} catch (err) {
+		if ((err as NodeJS.ErrnoException).code !== "ENOENT") throw err;
+	}
+}