Skip to content

Commit

Permalink
update verdant for op overlays
Browse files Browse the repository at this point in the history
  • Loading branch information
@a-type
a-type committed Jun 18, 2024
1 parent 1ef430a commit fa6e32a
Show file tree
Hide file tree
Showing 19 changed files with 1,103 additions and 382 deletions.
6 changes: 3 additions & 3 deletions apps/gnocchi/verdant/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
"@0no-co/graphqlsp": "1.12.8",
"@biscuits/client": "workspace:*",
"@verdant-web/cli": "^4.4.0",
"@verdant-web/common": "2.3.1",
"@verdant-web/react": "32.0.0",
"@verdant-web/store": "3.6.4",
"@verdant-web/common": "2.3.2",
"@verdant-web/react": "33.0.0",
"@verdant-web/store": "3.7.0",
"cuid": "^2.1.8",
"stopword": "^2.0.8"
},
Expand Down
2 changes: 1 addition & 1 deletion apps/gnocchi/web/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"@use-gesture/react": "^10.2.24",
"@vercel/analytics": "^0.1.6",
"@verdant-web/react-router": "^0.6.2",
"@verdant-web/store": "^3.6.4",
"@verdant-web/store": "^3.7.0",
"@zip.js/zip.js": "^2.7.6",
"classnames": "^2.3.2",
"convert-units": "^3.0.0-beta.4",
Expand Down
6 changes: 3 additions & 3 deletions apps/humding/verdant/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
},
"dependencies": {
"@verdant-web/cli": "4.4.0",
"@verdant-web/common": "2.3.1",
"@verdant-web/react": "32.0.0",
"@verdant-web/store": "^3.6.3"
"@verdant-web/common": "2.3.2",
"@verdant-web/react": "33.0.0",
"@verdant-web/store": "^3.7.0"
}
}
90 changes: 57 additions & 33 deletions apps/humding/verdant/src/client/client.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,35 +91,46 @@ export type SongLinesItemWordsItem = ObjectEntity<
SongLinesItemWordsItemDestructured,
SongLinesItemWordsItemSnapshot
>;
export type SongLinesItemWordsItemId = string;
export type SongLinesItemWordsItemText = string;
export type SongLinesItemWordsItemGap = number;
export type SongLinesItemChords = ListEntity<
SongLinesItemChordsInit,
SongLinesItemChordsDestructured,
SongLinesItemChordsSnapshot
export type SongLinesItemWordsItemGapStart = number;
export type SongLinesItemWordsItemGapEnd = number;
export type SongLinesItemWordsItemChords = ListEntity<
SongLinesItemWordsItemChordsInit,
SongLinesItemWordsItemChordsDestructured,
SongLinesItemWordsItemChordsSnapshot
>;
export type SongLinesItemChordsItem = ObjectEntity<
SongLinesItemChordsItemInit,
SongLinesItemChordsItemDestructured,
SongLinesItemChordsItemSnapshot
export type SongLinesItemWordsItemChordsItem = ObjectEntity<
SongLinesItemWordsItemChordsItemInit,
SongLinesItemWordsItemChordsItemDestructured,
SongLinesItemWordsItemChordsItemSnapshot
>;
export type SongLinesItemChordsItemValue = string;
export type SongLinesItemChordsItemGap = number;
export type SongLinesItemWordsItemChordsItemId = string;
export type SongLinesItemWordsItemChordsItemValue = string;
export type SongLinesItemWordsItemChordsItemOffset = number;
export type SongInit = {
id?: string;
createdAt?: number;
title: string;
lines?: SongLinesInit;
};

export type SongLinesItemWordsItemInit = { text: string; gap: number };
export type SongLinesItemWordsInit = SongLinesItemWordsItemInit[];
export type SongLinesItemChordsItemInit = { value: string; gap: number };
export type SongLinesItemChordsInit = SongLinesItemChordsItemInit[];
export type SongLinesItemInit = {
words?: SongLinesItemWordsInit;
chords?: SongLinesItemChordsInit;
export type SongLinesItemWordsItemChordsItemInit = {
id?: string;
value?: string;
offset?: number;
};
export type SongLinesItemWordsItemChordsInit =
SongLinesItemWordsItemChordsItemInit[];
export type SongLinesItemWordsItemInit = {
id?: string;
text?: string;
gapStart?: number;
gapEnd?: number;
chords?: SongLinesItemWordsItemChordsInit;
};
export type SongLinesItemWordsInit = SongLinesItemWordsItemInit[];
export type SongLinesItemInit = { words?: SongLinesItemWordsInit };
export type SongLinesInit = SongLinesItemInit[];
export type SongDestructured = {
id: string;
Expand All @@ -128,17 +139,22 @@ export type SongDestructured = {
lines: SongLines;
};

export type SongLinesItemWordsItemDestructured = { text: string; gap: number };
export type SongLinesItemWordsDestructured = SongLinesItemWordsItem[];
export type SongLinesItemChordsItemDestructured = {
export type SongLinesItemWordsItemChordsItemDestructured = {
id: string;
value: string;
gap: number;
offset: number;
};
export type SongLinesItemChordsDestructured = SongLinesItemChordsItem[];
export type SongLinesItemDestructured = {
words: SongLinesItemWords;
chords: SongLinesItemChords;
export type SongLinesItemWordsItemChordsDestructured =
SongLinesItemWordsItemChordsItem[];
export type SongLinesItemWordsItemDestructured = {
id: string;
text: string;
gapStart: number;
gapEnd: number;
chords: SongLinesItemWordsItemChords;
};
export type SongLinesItemWordsDestructured = SongLinesItemWordsItem[];
export type SongLinesItemDestructured = { words: SongLinesItemWords };
export type SongLinesDestructured = SongLinesItem[];
export type SongSnapshot = {
id: string;
Expand All @@ -147,14 +163,22 @@ export type SongSnapshot = {
lines: SongLinesSnapshot;
};

export type SongLinesItemWordsItemSnapshot = { text: string; gap: number };
export type SongLinesItemWordsSnapshot = SongLinesItemWordsItemSnapshot[];
export type SongLinesItemChordsItemSnapshot = { value: string; gap: number };
export type SongLinesItemChordsSnapshot = SongLinesItemChordsItemSnapshot[];
export type SongLinesItemSnapshot = {
words: SongLinesItemWordsSnapshot;
chords: SongLinesItemChordsSnapshot;
export type SongLinesItemWordsItemChordsItemSnapshot = {
id: string;
value: string;
offset: number;
};
export type SongLinesItemWordsItemChordsSnapshot =
SongLinesItemWordsItemChordsItemSnapshot[];
export type SongLinesItemWordsItemSnapshot = {
id: string;
text: string;
gapStart: number;
gapEnd: number;
chords: SongLinesItemWordsItemChordsSnapshot;
};
export type SongLinesItemWordsSnapshot = SongLinesItemWordsItemSnapshot[];
export type SongLinesItemSnapshot = { words: SongLinesItemWordsSnapshot };
export type SongLinesSnapshot = SongLinesItemSnapshot[];

/** Index filters for Song **/
Expand Down
44 changes: 30 additions & 14 deletions apps/humding/verdant/src/client/schemaVersions/v1.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,22 @@ export type SongSnapshot = {
lines: SongLinesSnapshot;
};

export type SongLinesItemWordsItemSnapshot = { text: string; gap: number };
export type SongLinesItemWordsSnapshot = SongLinesItemWordsItemSnapshot[];
export type SongLinesItemChordsItemSnapshot = { value: string; gap: number };
export type SongLinesItemChordsSnapshot = SongLinesItemChordsItemSnapshot[];
export type SongLinesItemSnapshot = {
words: SongLinesItemWordsSnapshot;
chords: SongLinesItemChordsSnapshot;
export type SongLinesItemWordsItemChordsItemSnapshot = {
id: string;
value: string;
offset: number;
};
export type SongLinesItemWordsItemChordsSnapshot =
SongLinesItemWordsItemChordsItemSnapshot[];
export type SongLinesItemWordsItemSnapshot = {
id: string;
text: string;
gapStart: number;
gapEnd: number;
chords: SongLinesItemWordsItemChordsSnapshot;
};
export type SongLinesItemWordsSnapshot = SongLinesItemWordsItemSnapshot[];
export type SongLinesItemSnapshot = { words: SongLinesItemWordsSnapshot };
export type SongLinesSnapshot = SongLinesItemSnapshot[];
export type SongInit = {
id?: string;
Expand All @@ -25,14 +33,22 @@ export type SongInit = {
lines?: SongLinesInit;
};

export type SongLinesItemWordsItemInit = { text: string; gap: number };
export type SongLinesItemWordsInit = SongLinesItemWordsItemInit[];
export type SongLinesItemChordsItemInit = { value: string; gap: number };
export type SongLinesItemChordsInit = SongLinesItemChordsItemInit[];
export type SongLinesItemInit = {
words?: SongLinesItemWordsInit;
chords?: SongLinesItemChordsInit;
export type SongLinesItemWordsItemChordsItemInit = {
id?: string;
value?: string;
offset?: number;
};
export type SongLinesItemWordsItemChordsInit =
SongLinesItemWordsItemChordsItemInit[];
export type SongLinesItemWordsItemInit = {
id?: string;
text?: string;
gapStart?: number;
gapEnd?: number;
chords?: SongLinesItemWordsItemChordsInit;
};
export type SongLinesItemWordsInit = SongLinesItemWordsItemInit[];
export type SongLinesItemInit = { words?: SongLinesItemWordsInit };
export type SongLinesInit = SongLinesItemInit[];

export type MigrationTypes = {
Expand Down
37 changes: 27 additions & 10 deletions apps/humding/verdant/src/client/schemaVersions/v1.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,33 @@ var songs = schema.collection({
words: schema.fields.array({
items: schema.fields.object({
properties: {
text: schema.fields.string(),
gap: schema.fields.number()
}
})
}),
chords: schema.fields.array({
items: schema.fields.object({
properties: {
value: schema.fields.string(),
gap: schema.fields.number()
id: schema.fields.string({
default: schema.generated.id
}),
text: schema.fields.string({
default: ""
}),
gapStart: schema.fields.number({
default: 0
}),
gapEnd: schema.fields.number({
default: 0
}),
chords: schema.fields.array({
items: schema.fields.object({
properties: {
id: schema.fields.string({
default: schema.generated.id
}),
value: schema.fields.string({
default: ""
}),
offset: schema.fields.number({
default: 0
})
}
})
})
}
})
})
Expand Down
38 changes: 28 additions & 10 deletions apps/humding/verdant/src/schema.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,34 @@ const songs = schema.collection({
words: schema.fields.array({
items: schema.fields.object({
properties: {
text: schema.fields.string(),
gap: schema.fields.number(),
},
}),
}),
chords: schema.fields.array({
items: schema.fields.object({
properties: {
value: schema.fields.string(),
gap: schema.fields.number(),
id: schema.fields.string({
default: schema.generated.id,
}),
text: schema.fields.string({
default: '',
}),
gapStart: schema.fields.number({
default: 0,
}),
gapEnd: schema.fields.number({
default: 0,
}),

chords: schema.fields.array({
items: schema.fields.object({
properties: {
id: schema.fields.string({
default: schema.generated.id,
}),
value: schema.fields.string({
default: '',
}),
offset: schema.fields.number({
default: 0,
}),
},
}),
}),
},
}),
}),
Expand Down
Loading

0 comments on commit fa6e32a

Please sign in to comment.