5da12e89f9
Closes the architecture item from the #119 review: drop the "vendored from docmost-sync" framing and the CJS↔ESM `Function('import()')` bridge so the engine is a normal first-class gitmost package. Part 1 — vendoring markers removed (prose only, zero behavior change): reworded "VENDORED into gitmost" / "vendored from docmost-sync" / "Engine LOGIC is byte-identical" / "it's a port" comments across the engine. Behavior-bearing strings are untouched: BOT_AUTHOR_NAME/EMAIL and the `Docmost-Sync-Source:` provenance trailers (changing them would break git authorship + the loop-guard). Part 2 — the package is now ESM (matching the sibling @docmost/mcp): `type: module`, tsconfig Node16, `.js` extensions on relative imports, and a static `import { marked }` replacing the `new Function('return import(...)')` / `loadMarked` hack — the bridge is GONE from the package. The CommonJS NestJS server loads the now-ESM engine via a new `git-sync.loader.ts` that mirrors the existing `docmost-client.loader.ts` mcp loader exactly (Function-indirected dynamic import + cached promise + retry-on-reject). The 4 server consumers (orchestrator/datasource/vault-registry/git-http-backend) call `await loadGitSync()` for value exports; types stay `import type` (erased). The converter-gate spec — which needs the real converter — loads the package's TS source via a jest moduleNameMapper + isolatedModules (documented in that spec); the other git-sync specs mock the loader. Verified: engine builds pure ESM (no Function/require leftover), vitest 614, editor-ext build, server + client tsc, full server jest 1397/0. Live stand smoke-test: server starts clean on the ESM engine (no ERR_REQUIRE_ESM), a real sync cycle runs through the loader, and the basic e2e suite is 12/12 (clone via git-http-backend, push, pull, delete, 3-way merge — all through the new loader). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
76 lines
2.1 KiB
TypeScript
76 lines
2.1 KiB
TypeScript
/**
|
|
* Pure, IO-free comparison helpers for the idempotency round-trip checks. The
|
|
* round-trip harness that drives these lives in the package's tests, not in the
|
|
* engine.
|
|
*/
|
|
|
|
/**
|
|
* Recursively strip every `attrs.id` from a ProseMirror node tree. Block ids
|
|
* are regenerated by `markdownToProseMirror` (SPEC §11), so they must be
|
|
* ignored when comparing the semantic shape of two documents. Returns a NEW
|
|
* tree; the input is not mutated.
|
|
*/
|
|
export function stripBlockIds(node: any): any {
|
|
if (Array.isArray(node)) {
|
|
return node.map(stripBlockIds);
|
|
}
|
|
if (node && typeof node === "object") {
|
|
const out: any = {};
|
|
for (const key of Object.keys(node)) {
|
|
if (key === "attrs" && node.attrs && typeof node.attrs === "object") {
|
|
// Drop the `id` attr; keep every other attribute.
|
|
const { id, ...rest } = node.attrs as Record<string, unknown>;
|
|
void id;
|
|
out.attrs = stripBlockIds(rest);
|
|
} else {
|
|
out[key] = stripBlockIds(node[key]);
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
return node;
|
|
}
|
|
|
|
/**
|
|
* Find the first divergence between two values via a recursive deep compare.
|
|
* Returns a short path + the two differing values, or null if they are equal.
|
|
*/
|
|
export function firstDivergence(
|
|
a: any,
|
|
b: any,
|
|
path = "$",
|
|
): { path: string; a: any; b: any } | null {
|
|
if (a === b) return null;
|
|
|
|
const ta = typeof a;
|
|
const tb = typeof b;
|
|
if (ta !== tb || a === null || b === null) {
|
|
return { path, a, b };
|
|
}
|
|
if (ta !== "object") {
|
|
return { path, a, b };
|
|
}
|
|
|
|
const aIsArr = Array.isArray(a);
|
|
const bIsArr = Array.isArray(b);
|
|
if (aIsArr !== bIsArr) return { path, a, b };
|
|
|
|
if (aIsArr) {
|
|
if (a.length !== b.length) {
|
|
return { path: `${path}.length`, a: a.length, b: b.length };
|
|
}
|
|
for (let i = 0; i < a.length; i++) {
|
|
const d = firstDivergence(a[i], b[i], `${path}[${i}]`);
|
|
if (d) return d;
|
|
}
|
|
return null;
|
|
}
|
|
|
|
const keys = new Set([...Object.keys(a), ...Object.keys(b)]);
|
|
for (const k of keys) {
|
|
const d = firstDivergence(a[k], b[k], `${path}.${k}`);
|
|
if (d) return d;
|
|
}
|
|
return null;
|
|
}
|