Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/build/neo4j/rows.ts
Original file line number Diff line number Diff line change
Expand Up @@ -109,14 +109,17 @@ export class RowBuilder {

finish(): GraphRows {
for (const e of this.deferred) if (this.keys.has(e.to.value)) this.edges.push(e);
const nodes = [...this.nodes.values()].sort((a, b) =>
`${a.labels[0]}\0${a.value}`.localeCompare(`${b.labels[0]}\0${b.value}`),
);
const edges = this.edges.sort((a, b) =>
`${a.type}\0${a.from.value}\0${a.to.value}`.localeCompare(
`${b.type}\0${b.from.value}\0${b.to.value}`,
),
);
const nodes = [...this.nodes.values()]
.map((row) => ({ row, sortKey: `${row.labels[0]}\0${row.value}` }))
.sort((a, b) => a.sortKey.localeCompare(b.sortKey))
.map(({ row }) => row);
const edges = this.edges
.map((row) => ({
row,
sortKey: `${row.type}\0${row.from.value}\0${row.to.value}`,
}))
.sort((a, b) => a.sortKey.localeCompare(b.sortKey))
.map(({ row }) => row);
return { nodes, edges };
}
}
Expand Down
18 changes: 18 additions & 0 deletions test/neo4j-edge-identity.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,21 @@ describe("edge identity discriminant (_k)", () => {
expect(ddg.length).toBe(2);
});
});

test("row sorting preserves composite-key collation across prefix values", () => {
const builder = new RowBuilder();
const target = builder.node(["CanNode"], "id", "target", {});
const file = builder.node(["CanNode"], "id", "file", {});
const nested = builder.node(["CanNode"], "id", "file/<anon>", {});
const slash = builder.node(["CanNode"], "id", "file/x", {});

builder.edge("TS_CALLS", file, target);
builder.edge("TS_CALLS", nested, target);
builder.edge("TS_CALLS", slash, target);

expect(builder.finish().edges.map((edge) => edge.from.value)).toEqual([
"file/<anon>",
"file/x",
"file",
]);
});