pushwork 1.1.8 → 1.2.2

package/test/unit/repo-factory.test.ts

@@ -0,0 +1,111 @@
+/**
+ * Tests for repo-factory.ts Subduction configuration.
+ *
+ * The actual Repo construction requires Wasm initialization via real ESM
+ * dynamic imports. We test by invoking the CLI as a subprocess (which runs
+ * in a real Node.js context) and inspecting the results.
+ *
+ * Non-sub (WebSocket) init is tested elsewhere (init-sync.test.ts).
+ * These tests focus on the --sub path.
+ */
+
+import * as path from "path";
+import * as fs from "fs/promises";
+import * as tmp from "tmp";
+import { execSync } from "child_process";
+
+describe("createRepo with --sub", () => {
+  let tmpDir: string;
+  let cleanup: () => void;
+  const cliPath = path.join(__dirname, "../../dist/cli.js");
+
+  beforeAll(() => {
+    execSync("pnpm build", { cwd: path.join(__dirname, "../.."), stdio: "pipe" });
+  });
+
+  beforeEach(async () => {
+    const tmpObj = tmp.dirSync({ unsafeCleanup: true });
+    tmpDir = tmpObj.name;
+    cleanup = tmpObj.removeCallback;
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  it("should create a working repo with --sub flag", async () => {
+    await fs.writeFile(path.join(tmpDir, "test.txt"), "hello");
+
+    execSync(`node "${cliPath}" init --sub "${tmpDir}"`, {
+      stdio: "pipe",
+      timeout: 30000,
+    });
+
+    const snapshotPath = path.join(tmpDir, ".pushwork", "snapshot.json");
+    const stat = await fs.stat(snapshotPath);
+    expect(stat.isFile()).toBe(true);
+  });
+
+  it("should produce a valid automerge URL", async () => {
+    await fs.writeFile(path.join(tmpDir, "test.txt"), "hello");
+
+    execSync(`node "${cliPath}" init --sub "${tmpDir}"`, {
+      stdio: "pipe",
+      timeout: 30000,
+    });
+
+    const url = execSync(`node "${cliPath}" url "${tmpDir}"`, {
+      encoding: "utf8",
+      timeout: 10000,
+    }).trim();
+
+    expect(url).toMatch(/^automerge:/);
+  });
+
+  it("should track files in the snapshot", async () => {
+    await fs.writeFile(path.join(tmpDir, "a.txt"), "aaa");
+    await fs.mkdir(path.join(tmpDir, "sub"), { recursive: true });
+    await fs.writeFile(path.join(tmpDir, "sub", "b.txt"), "bbb");
+
+    execSync(`node "${cliPath}" init --sub "${tmpDir}"`, {
+      stdio: "pipe",
+      timeout: 30000,
+    });
+
+    const ls = execSync(`node "${cliPath}" ls "${tmpDir}"`, {
+      encoding: "utf8",
+      timeout: 10000,
+    });
+
+    expect(ls).toContain("a.txt");
+    expect(ls).toContain("b.txt");
+  });
+
+  it("should be able to sync after init", async () => {
+    await fs.writeFile(path.join(tmpDir, "initial.txt"), "first");
+
+    execSync(`node "${cliPath}" init --sub "${tmpDir}"`, {
+      stdio: "pipe",
+      timeout: 30000,
+    });
+
+    // Add a new file
+    await fs.writeFile(path.join(tmpDir, "added.txt"), "second");
+
+    // Sync should not throw. The `sync` command has no --sub flag — it
+    // reads the backend choice from .pushwork/config.json (persisted by
+    // the init --sub above).
+    execSync(`node "${cliPath}" sync "${tmpDir}"`, {
+      stdio: "pipe",
+      timeout: 30000,
+    });
+
+    const ls = execSync(`node "${cliPath}" ls "${tmpDir}"`, {
+      encoding: "utf8",
+      timeout: 10000,
+    });
+
+    expect(ls).toContain("initial.txt");
+    expect(ls).toContain("added.txt");
+  });
+});

package/test/unit/subduction-config.test.ts

@@ -0,0 +1,69 @@
+import * as path from "path";
+import * as fs from "fs/promises";
+import * as tmp from "tmp";
+import { ConfigManager } from "../../src/core/config";
+import { DEFAULT_SUBDUCTION_SERVER, DEFAULT_SYNC_SERVER } from "../../src/types/config";
+
+describe("Subduction configuration", () => {
+  let tmpDir: string;
+  let cleanup: () => void;
+
+  beforeEach(async () => {
+    const tmpObj = tmp.dirSync({ unsafeCleanup: true });
+    tmpDir = tmpObj.name;
+    cleanup = tmpObj.removeCallback;
+
+    // Set up .pushwork directory structure
+    await fs.mkdir(path.join(tmpDir, ".pushwork", "automerge"), { recursive: true });
+  });
+
+  afterEach(() => {
+    cleanup();
+  });
+
+  describe("DEFAULT_SUBDUCTION_SERVER", () => {
+    it("should be the subduction sync endpoint", () => {
+      expect(DEFAULT_SUBDUCTION_SERVER).toBe("wss://subduction.sync.inkandswitch.com");
+    });
+
+    it("should differ from the default WebSocket sync server", () => {
+      expect(DEFAULT_SUBDUCTION_SERVER).not.toBe(DEFAULT_SYNC_SERVER);
+    });
+  });
+
+  describe("ConfigManager defaults", () => {
+    it("should use the WebSocket server as default sync_server", async () => {
+      const configManager = new ConfigManager(tmpDir);
+      const config = configManager.getDefaultDirectoryConfig();
+      expect(config.sync_server).toBe(DEFAULT_SYNC_SERVER);
+    });
+
+    it("should not default to the subduction server", async () => {
+      const configManager = new ConfigManager(tmpDir);
+      const config = configManager.getDefaultDirectoryConfig();
+      expect(config.sync_server).not.toBe(DEFAULT_SUBDUCTION_SERVER);
+    });
+  });
+
+  describe("sub flag option types", () => {
+    // These tests verify that the option interfaces accept `sub` on the
+    // commands that actually have a --sub flag (init and clone). The flag
+    // is NOT on SyncOptions or WatchOptions because sync/watch read the
+    // backend choice from persisted config (see `setupCommandContext`).
+    // If the type definitions are wrong, these will fail at compile time.
+    it("should accept sub on InitOptions", () => {
+      const opts: import("../../src/types/config").InitOptions = { sub: true };
+      expect(opts.sub).toBe(true);
+    });
+
+    it("should accept sub on CloneOptions", () => {
+      const opts: import("../../src/types/config").CloneOptions = { sub: true };
+      expect(opts.sub).toBe(true);
+    });
+
+    it("should default sub to undefined (not required) on InitOptions", () => {
+      const opts: import("../../src/types/config").InitOptions = {};
+      expect(opts.sub).toBeUndefined();
+    });
+  });
+});

package/dist/cli/commands.d.ts

@@ -1,71 +0,0 @@
-import { Repo } from "@automerge/automerge-repo";
-import { CloneOptions, SyncOptions, DiffOptions, LogOptions, CheckoutOptions, DirectoryConfig } from "../types";
-import { SyncEngine } from "../core";
-/**
- * Shared context that commands can use
- */
-export interface CommandContext {
-    repo: Repo;
-    syncEngine: SyncEngine;
-    config: DirectoryConfig;
-    workingDir: string;
-}
-/**
- * Shared pre-action that ensures repository and sync engine are properly initialized
- * This function always works, with or without network connectivity
- */
-export declare function setupCommandContext(workingDir?: string, customSyncServer?: string, customStorageId?: string, enableNetwork?: boolean): Promise<CommandContext>;
-/**
- * Safely shutdown a repository with proper error handling
- */
-export declare function safeRepoShutdown(repo: Repo, context?: string): Promise<void>;
-/**
- * Common progress message helpers
- */
-export declare const ProgressMessages: {
-    directoryFound: () => void;
-    configLoaded: () => void;
-    repoConnected: () => void;
-    syncServer: (server: string) => void;
-    storageId: (id: string) => void;
-    rootUrl: (url: string) => void;
-    changesWritten: () => void;
-    syncCompleted: (duration: number) => void;
-    directoryStructureCreated: () => void;
-    configSaved: () => void;
-    repoCreated: () => void;
-};
-/**
- * Initialize sync in a directory
- */
-export declare function init(targetPath: string, syncServer?: string, syncServerStorageId?: string): Promise<void>;
-/**
- * Run bidirectional sync
- */
-export declare function sync(options: SyncOptions): Promise<void>;
-/**
- * Show differences between local and remote
- */
-export declare function diff(targetPath: string | undefined, options: DiffOptions): Promise<void>;
-/**
- * Show sync status
- */
-export declare function status(): Promise<void>;
-/**
- * Show sync history
- */
-export declare function log(targetPath: string | undefined, options: LogOptions): Promise<void>;
-/**
- * Checkout/restore from previous sync
- */
-export declare function checkout(syncId: string, targetPath: string | undefined, options: CheckoutOptions): Promise<void>;
-/**
- * Clone an existing synced directory from an AutomergeUrl
- */
-export declare function clone(rootUrl: string, targetPath: string, options: CloneOptions): Promise<void>;
-/**
- * Get the root URL for the current pushwork repository
- */
-export declare function url(targetPath?: string): Promise<void>;
-export declare function commit(targetPath: string, dryRun?: boolean): Promise<void>;
-//# sourceMappingURL=commands.d.ts.map

package/dist/cli/commands.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"commands.d.ts","sourceRoot":"","sources":["../../src/cli/commands.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAA2B,MAAM,2BAA2B,CAAC;AAI1E,OAAO,EAEL,YAAY,EACZ,WAAW,EACX,WAAW,EACX,UAAU,EACV,eAAe,EACf,eAAe,EAEhB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrC;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,IAAI,CAAC;IACX,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,GAAE,MAAsB,EAClC,gBAAgB,CAAC,EAAE,MAAM,EACzB,eAAe,CAAC,EAAE,MAAM,EACxB,aAAa,GAAE,OAAc,GAC5B,OAAO,CAAC,cAAc,CAAC,CAqCzB;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,IAAI,EACV,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,IAAI,CAAC,CAqBf;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;yBAON,MAAM;oBAEX,MAAM;mBACP,MAAM;;8BAKK,MAAM;;;;CAOjC,CAAC;AA+DF;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,EACnB,mBAAmB,CAAC,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC,CA6Hf;AAED;;GAEG;AACH,wBAAsB,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAgM9D;AAED;;GAEG;AACH,wBAAsB,IAAI,CACxB,UAAU,oBAAM,EAChB,OAAO,EAAE,WAAW,GACnB,OAAO,CAAC,IAAI,CAAC,CA6Df;AAED;;GAEG;AACH,wBAAsB,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CA6H5C;AAED;;GAEG;AACH,wBAAsB,GAAG,CACvB,UAAU,oBAAM,EAChB,OAAO,EAAE,UAAU,GAClB,OAAO,CAAC,IAAI,CAAC,CA2Cf;AAED;;GAEG;AACH,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,UAAU,oBAAM,EAChB,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC,IAAI,CAAC,CAkBf;AAED;;GAEG;AACH,wBAAsB,KAAK,CACzB,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,IAAI,CAAC,CA6Hf;AAED;;GAEG;AACH,wBAAsB,GAAG,CAAC,UAAU,SAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAuCzD;AAED,wBAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,EAClB,MAAM,GAAE,OAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAgEf"}