Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Integrate @mapeo/schema update #741

Merged
merged 20 commits into from
Aug 8, 2024
Merged

chore: Integrate @mapeo/schema update #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
4bd7d38
fix schema changes on config-import
Aug 1, 2024
7007bc7
iconApi.create returns a iconRef -> {docId, versionId}
Aug 1, 2024
254b7f8
fix most schema changes on mapeo-project
Aug 1, 2024
2c00b9e
* fix type errors on translation
Aug 1, 2024
880b90f
update mapeo/schema, fix tests, fix type errors, fix apis
Aug 5, 2024
1dfe247
fix type error on mapeo-project, fix translation-api tests
Aug 5, 2024
8065479
fix type errors on tests
Aug 5, 2024
e48f14f
update mapeo-mock-data version
Aug 6, 2024
a85d128
directly return dataType.create on icon-api.create
Aug 6, 2024
bb5534f
make passing docRef.versionId optional on `translationApi.get`
Aug 6, 2024
c8989dd
wrongly placed ts-ignore
Aug 6, 2024
e5ca3b8
comment
Aug 6, 2024
b29be63
make `docRef` optional in `translation.get`, fix tests
Aug 7, 2024
325841d
fix tests
Aug 7, 2024
f6a8dd1
revert wrong typo fix
Aug 7, 2024
c9cfcbf
rename `docRefType` to `schemaNamePlural` when it made sense
Aug 8, 2024
f56688a
remove 'size_unspecified' from possible sizes passed to IconApi
Aug 8, 2024
c27143c
make `docRef` mandatory on `translationApi.put`
Aug 8, 2024
4534206
fix wrongly exported type
Aug 8, 2024
fcd4b4b
added test case for calling `translationApi.get` without `docRef.vers…
Aug 8, 2024
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
1 change: 1 addition & 0 deletions .../client/0000_colossal_lady_mastermind.sql → drizzle/client/0000_organic_bloodstrike.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ CREATE TABLE `projectSettings` (
`deleted` integer NOT NULL,
`name` text,
`defaultPresets` text,
`configMetadata` text,
`forks` text NOT NULL
);
--> statement-breakpoint
Expand Down
9 changes: 8 additions & 1 deletion drizzle/client/meta/0000_snapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "5",
"dialect": "sqlite",
"id": "08c3a557-a1c3-4b8f-acbc-a3ea6f43682f",
"id": "c4f2efaa-b40a-4148-9b5f-b1a4fd9f7f8e",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"localDeviceInfo": {
Expand Down Expand Up @@ -169,6 +169,13 @@
"notNull": false,
"autoincrement": false
},
"configMetadata": {
"name": "configMetadata",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"forks": {
"name": "forks",
"type": "text",
Expand Down
4 changes: 2 additions & 2 deletions drizzle/client/meta/_journal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{
"idx": 0,
"version": "5",
"when": 1713308836015,
"tag": "0000_colossal_lady_mastermind",
"when": 1722877616350,
"tag": "0000_organic_bloodstrike",
"breakpoints": true
}
]
Expand Down
14 changes: 7 additions & 7 deletions ...zle/project/0000_complex_rocket_racer.sql → .../project/0000_striped_roland_deschain.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ CREATE TABLE `observation` (
`deleted` integer NOT NULL,
`lat` real,
`lon` real,
`refs` text NOT NULL,
`attachments` text NOT NULL,
`tags` text NOT NULL,
`metadata` text NOT NULL,
`presetRef` text,
`forks` text NOT NULL
);
--> statement-breakpoint
Expand All @@ -125,8 +125,8 @@ CREATE TABLE `preset` (
`tags` text NOT NULL,
`addTags` text NOT NULL,
`removeTags` text NOT NULL,
`fieldIds` text NOT NULL,
`iconId` text,
`fieldRefs` text NOT NULL,
`iconRef` text,
`terms` text NOT NULL,
`color` text NOT NULL,
`forks` text NOT NULL
Expand Down Expand Up @@ -164,7 +164,7 @@ CREATE TABLE `track` (
`links` text NOT NULL,
`deleted` integer NOT NULL,
`locations` text NOT NULL,
`refs` text NOT NULL,
`observationRefs` text NOT NULL,
`attachments` text NOT NULL,
`tags` text NOT NULL,
`forks` text NOT NULL
Expand All @@ -183,9 +183,9 @@ CREATE TABLE `translation` (
`updatedAt` text NOT NULL,
`links` text NOT NULL,
`deleted` integer NOT NULL,
`schemaNameRef` text NOT NULL,
`docIdRef` text NOT NULL,
`fieldRef` text NOT NULL,
`docRef` text NOT NULL,
`docRefType` text NOT NULL,
`propertyRef` text NOT NULL,
`languageCode` text NOT NULL,
`regionCode` text NOT NULL,
`message` text NOT NULL,
Expand Down
40 changes: 20 additions & 20 deletions drizzle/project/meta/0000_snapshot.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"version": "5",
"dialect": "sqlite",
"id": "faf22cd4-1533-466a-8037-6566a1adbf4d",
"id": "3ef67d9d-408c-424f-ac6d-a353df47bd86",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"coreOwnership_backlink": {
Expand Down Expand Up @@ -594,13 +594,6 @@
"notNull": false,
"autoincrement": false
},
"refs": {
"name": "refs",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"attachments": {
"name": "attachments",
"type": "text",
Expand All @@ -622,6 +615,13 @@
"notNull": true,
"autoincrement": false
},
"presetRef": {
"name": "presetRef",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"forks": {
"name": "forks",
"type": "text",
Expand Down Expand Up @@ -745,15 +745,15 @@
"notNull": true,
"autoincrement": false
},
"fieldIds": {
"name": "fieldIds",
"fieldRefs": {
"name": "fieldRefs",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"iconId": {
"name": "iconId",
"iconRef": {
"name": "iconRef",
"type": "text",
"primaryKey": false,
"notNull": false,
Expand Down Expand Up @@ -970,8 +970,8 @@
"notNull": true,
"autoincrement": false
},
"refs": {
"name": "refs",
"observationRefs": {
"name": "observationRefs",
"type": "text",
"primaryKey": false,
"notNull": true,
Expand Down Expand Up @@ -1079,22 +1079,22 @@
"notNull": true,
"autoincrement": false
},
"schemaNameRef": {
"name": "schemaNameRef",
"docRef": {
"name": "docRef",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"docIdRef": {
"name": "docIdRef",
"docRefType": {
"name": "docRefType",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"fieldRef": {
"name": "fieldRef",
"propertyRef": {
"name": "propertyRef",
"type": "text",
"primaryKey": false,
"notNull": true,
Expand Down
4 changes: 2 additions & 2 deletions drizzle/project/meta/_journal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
{
"idx": 0,
"version": "5",
"when": 1716828483595,
"tag": "0000_complex_rocket_racer",
"when": 1722877617120,
"tag": "0000_striped_roland_deschain",
"breakpoints": true
}
]
Expand Down
18 changes: 9 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
"devDependencies": {
"@bufbuild/buf": "^1.26.1",
"@mapeo/default-config": "4.0.0-alpha.5",
"@mapeo/mock-data": "^1.0.2",
"@mapeo/mock-data": "^1.0.3-alpha.1",
"@sinonjs/fake-timers": "^10.0.2",
"@types/b4a": "^1.6.0",
"@types/bogon": "^1.0.2",
Expand Down Expand Up @@ -157,7 +157,7 @@
"@fastify/type-provider-typebox": "^4.0.0",
"@hyperswarm/secret-stream": "^6.1.2",
"@mapeo/crypto": "1.0.0-alpha.10",
"@mapeo/schema": "^3.0.0-next.16",
"@mapeo/schema": "^3.0.0-next.19",
"@mapeo/sqlite-indexer": "1.0.0-alpha.9",
"@sinclair/typebox": "^0.29.6",
"b4a": "^1.6.3",
Expand Down
Loading
Loading