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
11 changes: 11 additions & 0 deletions packages/database/src/__tests__/crossAppValidators.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
CrossAppRelation,
CrossAppRelationTripleSchema,
CrossAppRelationTypeSchema,
CrossAppUpsertData,
} from "../crossAppContracts";
import {
obsidianOriginNodeExample,
Expand All @@ -17,6 +18,7 @@ import {
crossAppRelationTripleSchemaValidator,
crossAppRelationTypeSchemaValidator,
crossAppRelationValidator,
crossAppUpsertDataValidator,
} from "../crossAppValidators";

type JsonObject = Record<string, unknown>;
Expand Down Expand Up @@ -109,6 +111,9 @@ describe("cross-app validators", () => {
expectTypeOf<
z.output<typeof crossAppRelationValidator>
>().branded.toEqualTypeOf<CrossAppRelation>();
expectTypeOf<
z.output<typeof crossAppUpsertDataValidator>
>().branded.toEqualTypeOf<CrossAppUpsertData>();
});

it.each([
Expand Down Expand Up @@ -322,6 +327,12 @@ describe("cross-app validators", () => {
value: { ...toJson(relation), source: 42 },
path: ["source"],
},
{
validator: crossAppRelationValidator,
when: "relation local id is empty",
value: { ...toJson(relation), localId: "" },
path: ["localId"],
},
{
validator: crossAppRelationValidator,
when: "relation rid is not a RID",
Expand Down
9 changes: 9 additions & 0 deletions packages/database/src/crossAppContracts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,12 @@ export type CrossAppRelation = CrossAppBase & {
destination: LocalId | Rid;
/* eslint-enable @typescript-eslint/no-duplicate-type-constituents */
};

// The root types written to one space in a single upsert
export type CrossAppUpsertData = {
nodeSchemas?: CrossAppNodeSchema[];
relationTypeSchemas?: CrossAppRelationTypeSchema[];
relationTripleSchemas?: CrossAppRelationTripleSchema[];
nodes?: CrossAppNode[];
relations?: CrossAppRelation[];
};
15 changes: 13 additions & 2 deletions packages/database/src/crossAppValidators.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ const jsonValidator: z.ZodType<Json> = z.lazy(() =>
// `partial` keep the setting.
const crossAppBaseValidator = z
.object({
localId: z.string(),
rid: z.string().refine(isRid).optional(),
localId: z.string().min(1),
rid: z.string().refine(isRid, "Not an https:// or orn: RID").optional(),
createdAt: dateValidator,
modifiedAt: dateValidator.optional(),
authorId: z.string(),
Expand Down Expand Up @@ -122,3 +122,14 @@ export const crossAppRelationValidator = crossAppBaseValidator.extend({
source: z.string(),
destination: z.string(),
});

export const crossAppUpsertDataValidator = z
.object({
nodeSchemas: z.array(crossAppNodeSchemaValidator),
relationTypeSchemas: z.array(crossAppRelationTypeSchemaValidator),
relationTripleSchemas: z.array(crossAppRelationTripleSchemaValidator),
nodes: z.array(crossAppNodeValidator),
relations: z.array(crossAppRelationValidator),
})
.partial()
.strict();
87 changes: 86 additions & 1 deletion packages/database/src/lib/__tests__/crossAppConverters.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,18 @@
import { describe, expect, it } from "vitest";
import type { CrossAppNode, CrossAppNodeSchema } from "../../crossAppContracts";
import type {
CrossAppNode,
CrossAppNodeSchema,
CrossAppRelation,
CrossAppRelationTripleSchema,
CrossAppRelationTypeSchema,
} from "../../crossAppContracts";
import {
crossAppNodeSchemaToDbConcept,
crossAppNodeToDbConcept,
crossAppNodeToDbContent,
crossAppRelationToDbConcept,
crossAppRelationTripleSchemaToDbConcept,
crossAppRelationTypeSchemaToDbConcept,
} from "../crossAppConverters";

const baseSchema: CrossAppNodeSchema = {
Expand Down Expand Up @@ -139,3 +149,78 @@ describe("crossAppNodeToDbConcept", () => {
).toEqual(["direct"]);
});
});

describe("an item without modifiedAt", () => {
const CREATED = "2026-06-14T11:00:00.000Z";
const relationType: CrossAppRelationTypeSchema = {
localId: "supports",
createdAt: new Date(CREATED),
authorId: "account-local-1",
label: "supports",
complement: "is supported by",
};
const triple: CrossAppRelationTripleSchema = {
localId: "node-supports-concept",
createdAt: new Date(CREATED),
authorId: "account-local-1",
label: "supports",
complement: "is supported by",
sourceType: "concept-1",
destinationType: "concept-1",
};
const relation: CrossAppRelation = {
localId: "relation-1",
createdAt: new Date(CREATED),
authorId: "account-local-1",
relationType: "node-supports-concept",
source: "node-2",
destination: "node-1",
};

it.each([
{
converter: "crossAppNodeSchemaToDbConcept",
convert: () => crossAppNodeSchemaToDbConcept(baseSchema),
},
{
converter: "crossAppNodeToDbConcept",
convert: () => crossAppNodeToDbConcept(baseNode),
},
{
converter: "crossAppRelationTypeSchemaToDbConcept",
convert: () => crossAppRelationTypeSchemaToDbConcept(relationType),
},
{
converter: "crossAppRelationTripleSchemaToDbConcept",
convert: () => crossAppRelationTripleSchemaToDbConcept(triple),
},
{
converter: "crossAppRelationToDbConcept",
convert: () => crossAppRelationToDbConcept(relation),
},
])("$converter writes its createdAt as last_modified", ({ convert }) => {
expect(convert()).toMatchObject({
created: CREATED,
last_modified: CREATED,
});
});

it("crossAppNodeToDbContent writes the content's own createdAt as last_modified", () => {
const content = crossAppNodeToDbContent(
{
...baseNode,
content: {
direct: {
value: "EVD - REM sleep and recall",
createdAt: new Date("2026-06-15T09:00:00Z"),
},
},
},
"direct",
);
expect(content).toMatchObject({
created: "2026-06-15T09:00:00.000Z",
last_modified: "2026-06-15T09:00:00.000Z",
});
});
});
Loading
Loading