isomorphic-jj 1.4.3 → 1.7.0

package/CHANGELOG.md

@@ -0,0 +1,226 @@
+# Changelog
+
+All notable changes to isomorphic-jj are documented here. The project tracks the
+[Jujutsu (jj)](https://github.com/jj-vcs/jj) CLI; each release notes the upstream
+jj version whose semantics it targets.
+
+## [1.7.0] — Real revset parser, testable/UX-improved CLI, background-ops fix
+
+Closes out the remaining known-issue backlog.
+
+### Changed — revset engine rewritten around a real tokenizer + parser + AST
+
+`RevsetEngine.evaluate()` previously matched the whole trimmed expression
+against one long chain of regexes, one per construct. This had two real bugs:
+
+- **Nested function-call arguments silently mis-parsed.** A non-greedy regex
+  like `/^roots\((.+?)\)$/` truncates at the *first* `)` it sees, so
+  `roots(ancestors(x))` never worked — the previous "fix" for this was a
+  one-off hand-rolled paren-counter used only by `reachable()`.
+- **No real operator precedence.** Mixed `&`/`|`/`~` expressions were
+  resolved by checking `.includes(' & ')` before `' | '` before `' ~ '`
+  regardless of the expression's actual structure.
+
+The expression is now tokenized and parsed into a small AST via a real
+recursive-descent / precedence-climbing parser (`&`/`~` at one precedence
+tier, `|` lower, both left-associative), which is then evaluated by walking
+the tree. This is purely a parsing-layer replacement — every per-function
+filter/traversal method (`filterByAuthor`, `getAncestors`, `findForkPoint`,
+etc.) is untouched, and **all 183 pre-existing revset tests pass unchanged**.
+
+New capabilities (all strictly additive — nothing that worked before changed
+behavior):
+- Function-call arguments can nest arbitrarily deep: `roots(ancestors(x))`,
+  `heads(roots(ancestors(x)))`, etc.
+- Parenthesized grouping: `(a | b) & c`.
+- Quote-aware argument splitting: `description("a, b, and c")` no longer
+  mis-splits on the comma inside the quoted string.
+- Whitespace around `&`/`|`/`~` is now optional (`a|b` works, not just `a | b`).
+
+### Fixed — background-ops (td-488842)
+
+`enableAutoSnapshot()`'s timer callback awaited only `queue()`'s immediate
+`{ id, promise }` handle, not the operation's own settling `promise`. Since
+`queue()` resolves as soon as the operation is *enqueued* (not once it
+finishes), a later `describe()` rejection landed on the unobserved promise
+and became an unhandled promise rejection instead of reaching the
+surrounding `catch`. Now awaits the returned `promise` too.
+
+### Changed — CLI (`bin/isojj.js`) rewritten to be testable, with real bugs fixed
+
+The CLI had zero tests (calling `process.exit()` at import time made it
+untestable) and several real bugs:
+- **Made testable**: `parseArgs`/`formatOutput`/`findRepoRoot`/
+  `loadGitBackend`/`run` are now exported; `run()` returns an exit code
+  instead of calling `process.exit()` directly, guarded behind an
+  is-this-the-entrypoint check.
+- **Fixed a parsing bug**: boolean flags (`dryRun`, `json`, `force`,
+  `interactive`, etc.) used to swallow the next token as a fake "value",
+  silently dropping a following positional — `describe --dryRun "fix typo"`
+  lost the commit message. Boolean flags never consume the next token now;
+  `--flag=true`/`--flag=false` is coerced to a real boolean.
+- **Fixed a latent bug**: the CLI's own error message promised searching
+  "any parent up to mount point /" for a `.jj` repo but never actually did
+  so. Added `findRepoRoot()` to walk up parent directories like git/jj, so
+  the CLI now works from any subdirectory of a repo.
+- **Wired up the real Git backend**: the CLI never passed `git`/`http` to
+  `createJJ()`, so `isojj init` silently ran in storage-only "mock" mode
+  with no real `.git` directory. It now dynamically imports isomorphic-git
+  (an optional peer dependency) when present, falling back gracefully when
+  it isn't.
+- Added a full test suite (`tests/integration/cli.test.js`) and included
+  `bin/**/*.js` in coverage collection.
+
+### Testing
+
+1701 tests passing (was 1671); lint, format:check, typecheck, coverage
+(91.2% branches), and build all green.
+
+## [1.6.1] — Bugfix batch
+
+Fixes nine real, pre-existing defects that the v1.5/v1.6 coverage push
+surfaced and documented (each had a test asserting the buggy behavior with a
+`// BUG:` note — those tests now assert the corrected behavior instead).
+
+### Fixed
+
+- **`bookmarks([pattern])` revset returned `[undefined]`.** `filterBookmarks()`
+  read `bookmark.target`, but `BookmarkStore.list()` returns objects keyed
+  `changeId`. It now reads `bookmark.changeId`.
+- **`show()` never attributed bookmarks to a change**, for the same
+  `.target` vs. `.changeId` mismatch. Fixed the same way.
+- **`bookmark.delete()`'s not-found guard was dead code.** It called
+  `bookmarks.get(name)` without `await`, so the "truthy Promise" always
+  passed the guard; the store's own `BOOKMARK_NOT_FOUND` was reached
+  instead of the friendlier method-level `NOT_FOUND`. Added the missing
+  `await`.
+- **`operations.revert()` on a bookmark-move operation always threw
+  `BOOKMARK_EXISTS`.** Its "moved bookmark" branch called `bookmarks.set()`
+  (create-only) to move the bookmark back, but the bookmark still exists
+  during a move-revert. Changed to `bookmarks.move()`.
+- **`ChangeGraph.getAncestors()` returned duplicate ancestors on
+  diamond-shaped history** (e.g. `a<-b`, `a<-c`, `b,c<-d`). A node was only
+  marked visited when dequeued, so a shared ancestor reachable via two
+  parents could be enqueued twice. Nodes are now marked visited the moment
+  they're enqueued.
+- **`matchesPattern()` (merge driver registry) broke `**` glob patterns.**
+  Literal dots were escaped *after* `**` had already been converted to
+  `.*`, corrupting it into `\.*` (zero-or-more literal dots) instead of "any
+  characters". Dots are now escaped before the glob substitutions.
+- **`IsomorphicGitBackend.getCurrentTree()` always threw
+  `TREE_READ_FAILED`.** It called `git.writeTree({ fs, dir })` without the
+  library's required `tree` argument (`git.writeTree` writes a single,
+  already-built tree — it doesn't build one from the working directory).
+  Reimplemented to walk the git index (`STAGE`) and build the nested tree
+  bottom-up, verified to produce the same oid as an equivalent real commit.
+- **`ConflictModel._tryMergeDriver()`'s "no custom driver" guard never
+  matched.** It compared `driver === this.mergeDriverRegistry.defaultDriver`,
+  but `MergeDriverRegistry` never set a `defaultDriver` property (always
+  `undefined`), so every file was routed through the generic three-way
+  merge driver instead of falling back to the richer path-based conflict-type
+  detection. `MergeDriverRegistry` now exposes `defaultDriver`.
+- **`IsomorphicGitBackend.stageAll()` double-wrapped per-file errors.** A
+  specific `STAGE_FILE_FAILED` thrown for one file was immediately re-wrapped
+  by the surrounding `catch` as the generic `STAGE_FAILED`, hiding the more
+  useful code. The outer catch now re-throws an already-categorized
+  `JJError` as-is.
+
+## [1.6.0] — Automatic working-copy snapshotting
+
+Closes a long-standing fidelity gap: the library now **walks the working
+directory on disk** and reconciles tracked state before read/commit operations,
+so files created, modified, or deleted **out-of-band** (an editor, the shell,
+`git checkout`) are picked up — matching jj's "snapshot before every command".
+Previously only files written through `jj.write()` were ever tracked, so
+`status`/`describe`/`diff`/`file.search`/`read` couldn't see anything else.
+
+### Added
+
+- `WorkingCopy.walk()` — recursively lists working-directory files (excluding
+  `.git`, `.jj`, `node_modules`), robust across Node fs and in-memory fses.
+- `WorkingCopy.snapshot()` — reconciles tracked file state with disk, returning
+  `{ added, modified, deleted }`; honors sparse patterns.
+- `jj.snapshot()` — public method to trigger a snapshot explicitly.
+- `createJJ({ autoSnapshot })` option (default `true`) to opt out of the
+  automatic behavior.
+
+### Changed
+
+- `describe()`, `status()`, `diff()`, `read()`, `file.list()`, and
+  `file.search()` now auto-snapshot the working copy first (when operating on
+  `@`), so they reflect on-disk reality. `status()` now returns real `added` and
+  `removed` lists (previously always empty).
+- A tracked file deleted on disk is now gracefully untracked on the next
+  snapshot instead of making `describe()` throw `SNAPSHOT_FILE_FAILED` (that
+  path still applies under `{ autoSnapshot: false }`).
+
+## [1.5.0] — Parity refresh (tracks jj through v0.43)
+
+This release brings isomorphic-jj up to date with Jujutsu releases v0.31–v0.43,
+adds a batch of revset functions and commands, and cleans up the toolchain.
+
+### Added — revset functions (jj v0.31–v0.43)
+
+- `change_id(prefix)` / `commit_id(prefix)` — resolve a change by a hex prefix (jj v0.31).
+- `subject(pattern)` — match only the first line of a description (jj v0.26).
+- `author_name(x)`, `author_email(x)`, `committer(x)`, `committer_name(x)`,
+  `committer_email(x)` — fine-grained signature filters (jj v0.26).
+- `signed()` — cryptographically signed changes (jj v0.29).
+- `divergent()` — changes flagged as divergent (jj v0.38).
+- `merges()` — canonical alias of the existing `merge()`.
+- `forks()` — changes with more than one child.
+- `first_parent(x)` / `first_ancestors(x)` — first-parent navigation (jj v0.32).
+- `fork_point(x)` — youngest common ancestor of a set (jj v0.32).
+- `merge_point(x)` — youngest common descendant of a set.
+- `exactly(x, n)` — the set, but errors unless it has exactly `n` elements (jj v0.34).
+- `present(x)` — evaluate without erroring on unknown symbols.
+- `coalesce(a, b, …)` — the first argument that resolves to a non-empty set.
+- `remote_tags([pattern])` — remote (slash-qualified) tag targets (jj v0.38).
+- `ancestors(x, depth)` — generalized to accept any nested revset plus an
+  optional depth limit (previously accepted only a bare 32-hex change ID).
+
+### Added — commands
+
+- `revert({ revision })` — canonical replacement for `backout()` (jj renamed
+  `backout` → `revert` and removed `backout` in v0.35). `backout()` remains as a
+  deprecated alias.
+- `redo()` — progressively re-applies operations reverted by `undo()` (jj v0.33).
+- `sign()` / `unsign()` — record and clear signature metadata on a change (jj
+  v0.27). Previously hard `UNSUPPORTED_OPERATION` stubs; now implemented as
+  metadata operations that light up the `signed()` revset. (A pure-JS library
+  cannot verify GPG/SSH keys, so cryptographic verification is still delegated to
+  the Git layer.)
+- `file.search({ pattern })` — search tracked file contents, regex by default
+  with `{ kind: 'substring' }` for literal matches (jj v0.37 / v0.41).
+- `bookmark.advance({ name, to })` — move a bookmark forward only; refuses
+  non-descendant targets (jj v0.39).
+- `tag.set({ name, changeId })` — create-or-move (upsert) a tag (jj v0.35).
+
+### Fixed
+
+- **`tags()` revset now works.** It was a stub returning `[]` even though a
+  `TagStore` existed; the `RevsetEngine` is now wired to the tag store and
+  `tags()` / `tags(pattern)` return real results.
+- **Duplicate `conflicts` key in the API object.** The raw `ConflictModel` was
+  exposed under the same key as the public `conflicts` namespace and silently
+  shadowed. The raw model is now available as `jj.conflictModel`.
+- **`npm run lint` was completely broken** — the ESLint config was authored as an
+  ES module in a `"type": "module"` package. Renamed to `.eslintrc.cjs` and
+  fixed; the source tree now lints clean (0 errors).
+- Latent `fail()` calls in tests (removed from jest-circus) replaced with `throw`.
+- Removed an unnecessary try/catch, an empty catch block, an unused import, and
+  several unused variables flagged by the newly-working linter.
+
+### Changed
+
+- `tsconfig.json` now includes the DOM/WebWorker libs and Node types so the
+  type-check reflects the library's real isomorphic runtime.
+- Expanded the `isojj` CLI: `--version`, a far more complete `help`, positional
+  argument handling for `log`/`describe`/`file.*`, and generic pass-through of
+  all `--flags` so every API method is reachable from the CLI.
+
+## [1.4.3] and earlier
+
+See the git history and [ROADMAP.md](./ROADMAP.md) for the v0.1–v1.4 development
+record (core model, history editing, Git backend, first-class conflicts, revset
+query language, workspaces, browser support, events, and full v1.0 JJ CLI parity).

package/README.md

@@ -1,7 +1,7 @@
 # isomorphic-jj
 
 [![npm version](https://img.shields.io/npm/v/isomorphic-jj.svg)](https://www.npmjs.com/package/isomorphic-jj)
-[![test coverage](https://img.shields.io/badge/tests-460%20passing-brightgreen.svg)](https://github.com/johnhenry/isomorphic-jj)
+[![test coverage](https://img.shields.io/badge/tests-1701%20passing-brightgreen.svg)](https://github.com/johnhenry/isomorphic-jj)
 [![license](https://img.shields.io/npm/l/isomorphic-jj.svg)](LICENSE)
 
 > **Jujutsu version control for JavaScript**—stable change IDs, fearless undo, and no staging area. Works in Node.js and browsers.
@@ -88,7 +88,7 @@ isomorphic-jj v1.0 now implements virtually all commonly-used JJ CLI commands:
 See [JJ_CLI_PARITY.md](./JJ_CLI_PARITY.md) for complete feature comparison.
 
 ### Testing & Quality
-- **460 tests** passing - Complete test coverage for all v1.0 features
+- **1701 tests** passing — ~97% statement / 91% branch coverage (v1.0–v1.7)
 - **100% backward compatible** - All existing code continues to work
 - **Zero breaking changes** - Deprecated features show warnings but still function
 
@@ -898,8 +898,9 @@ repo/
 
 ## Project Status
 
-**Current Version**: v0.5.0
-**Test Coverage**: 351 tests, 100% passing
+**Current Version**: v1.7.0
+**Test Coverage**: 1701 tests, ~97% statements / 91% branches
+**JJ CLI parity**: tracks Jujutsu through v0.43
 **Status**: Ready for experimentation and prototyping
 
 **Completed:**
@@ -908,13 +909,10 @@ repo/
 - ✅ v0.3: Git backend, conflicts, workspaces, browser support
 - ✅ v0.4: Shallow clones, advanced revsets, event system
 - ✅ v0.5: Custom merge drivers, enhanced revsets (time-based, graph analytics), conflict resolution enhancements
+- ✅ v1.0: Full JJ CLI semantic parity, complete `file.*`/`operations.*`/`git.*` namespaces
+- ✅ v1.5: Parity refresh tracking jj through **v0.43** — new revsets (`change_id`, `commit_id`, `subject`, `author_name`/`email`, `committer*`, `signed`, `divergent`, `merges`, `forks`, `first_parent`, `first_ancestors`, `fork_point`, `merge_point`, `exactly`, `present`, `coalesce`, `remote_tags`, `ancestors(x, depth)`), working `tags()`/`remote_tags()` revsets, and new commands: `revert()`, `redo()`, `sign()`/`unsign()`, `file.search()`, `bookmark.advance()`, `tag.set()`. See [CHANGELOG.md](./CHANGELOG.md).
 
-**Coming Next (v0.6):**
-- Repository analytics and debugging tools
-- Interactive workflows
-- Performance optimizations
-
-See [ROADMAP.md](./ROADMAP.md) for detailed plans through v1.0.
+See [ROADMAP.md](./ROADMAP.md) for detailed plans, and [CHANGELOG.md](./CHANGELOG.md) for the release history.
 
 ---
 
@@ -922,7 +920,7 @@ See [ROADMAP.md](./ROADMAP.md) for detailed plans through v1.0.
 
 ### Requirements
 
-- **Node.js**: 18.0.0 or higher
+- **Node.js**: 20.0.0 or higher (uses the Web Crypto global, stabilized in Node 20; Node 18 is EOL)
 - **Browsers**: Chrome 90+, Firefox 88+, Safari 14+, Edge 90+
 - **Optional**: Git CLI (for JJ CLI interop testing)