Skip to content

Commit

Permalink
Merge branch 'main' into feat/mdns-discovery
Browse files Browse the repository at this point in the history
* main: (25 commits)
  add initial implementation of MemberApi (#232)
  feat: $blobs.getUrl and $blobs.create methods (#184)
  chore: update manager e2e tests (#237)
  feat: add capabilities (#231)
  feat: coreOwnership integration [3/3] (#230)
  feat: CoreOwnership class w getOwner & getCoreKey [2/3] (#229)
  feat: handle `coreOwnership` records in `IndexWriter` [1/3] (#214)
  fix: adjust storage options for MapeoManager and MapeoProject (#235)
  implement addProject method for MapeoManager class (#215)
  implement listProjects method for MapeoManager class (#208)
  feat: expose blobStore.writerDriveId (#219)
  implement wrapper client containing createProject and getProject methods (#199)
  add project settings functionality to MapeoProject (#187)
  feat: Add encode/decode for project keys [3/3] (#203)
  feat: update protobuf for RPC [2/3] (#202)
  chore: move protobuf messages into src/generated [1/3] (#201)
  feat: Add internal `dataType.createWithDocId()` (#192)
  chore: explicitly set "mode" opt for encryptionKeys column creation (#186)
  chore: fix linting and type checking (#183)
  chore: consolidate encryption key columns in projectKeys table (#181)
  ...
  • Loading branch information
gmaclennan committed Sep 6, 2023
2 parents 748f431 + ec1b381 commit 8fe03c7
Show file tree
Hide file tree
Showing 50 changed files with 3,436 additions and 170 deletions.
15 changes: 0 additions & 15 deletions .eslintrc.cjs

This file was deleted.

21 changes: 21 additions & 0 deletions drizzle/client/0000_steady_jackpot.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
CREATE TABLE `project_backlink` (
`versionId` text PRIMARY KEY NOT NULL
);
--> statement-breakpoint
CREATE TABLE `projectKeys` (
`projectId` text PRIMARY KEY NOT NULL,
`keysCipher` blob NOT NULL,
`projectInfo` text DEFAULT '{}' NOT NULL
);
--> statement-breakpoint
CREATE TABLE `project` (
`docId` text PRIMARY KEY NOT NULL,
`versionId` text NOT NULL,
`schemaName` text NOT NULL,
`createdAt` text NOT NULL,
`updatedAt` text NOT NULL,
`links` text NOT NULL,
`name` text,
`defaultPresets` text,
`forks` text NOT NULL
);
133 changes: 133 additions & 0 deletions drizzle/client/meta/0000_snapshot.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
{
"version": "5",
"dialect": "sqlite",
"id": "a4afa0b6-5fd1-4c8d-bc09-7e3f3fc1928f",
"prevId": "00000000-0000-0000-0000-000000000000",
"tables": {
"project_backlink": {
"name": "project_backlink",
"columns": {
"versionId": {
"name": "versionId",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"projectKeys": {
"name": "projectKeys",
"columns": {
"projectId": {
"name": "projectId",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"keysCipher": {
"name": "keysCipher",
"type": "blob",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"projectInfo": {
"name": "projectInfo",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false,
"default": "'{}'"
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
},
"project": {
"name": "project",
"columns": {
"docId": {
"name": "docId",
"type": "text",
"primaryKey": true,
"notNull": true,
"autoincrement": false
},
"versionId": {
"name": "versionId",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"schemaName": {
"name": "schemaName",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"createdAt": {
"name": "createdAt",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"updatedAt": {
"name": "updatedAt",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"links": {
"name": "links",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
},
"name": {
"name": "name",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"defaultPresets": {
"name": "defaultPresets",
"type": "text",
"primaryKey": false,
"notNull": false,
"autoincrement": false
},
"forks": {
"name": "forks",
"type": "text",
"primaryKey": false,
"notNull": true,
"autoincrement": false
}
},
"indexes": {},
"foreignKeys": {},
"compositePrimaryKeys": {},
"uniqueConstraints": {}
}
},
"enums": {},
"_meta": {
"schemas": {},
"tables": {},
"columns": {}
}
}
13 changes: 13 additions & 0 deletions drizzle/client/meta/_journal.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"version": "5",
"dialect": "sqlite",
"entries": [
{
"idx": 0,
"version": "5",
"when": 1693337118674,
"tag": "0000_steady_jackpot",
"breakpoints": true
}
]
}
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
CREATE TABLE `coreOwnership_backlink` (
`versionId` text PRIMARY KEY NOT NULL
);
--> statement-breakpoint
CREATE TABLE `coreOwnership` (
`docId` text PRIMARY KEY NOT NULL,
`versionId` text NOT NULL,
`schemaName` text NOT NULL,
`createdAt` text NOT NULL,
`updatedAt` text NOT NULL,
`links` text NOT NULL,
`authCoreId` text NOT NULL,
`configCoreId` text NOT NULL,
`dataCoreId` text NOT NULL,
`blobCoreId` text NOT NULL,
`blobIndexCoreId` text NOT NULL,
`forks` text NOT NULL
);
--> statement-breakpoint
CREATE TABLE `field_backlink` (
`versionId` text PRIMARY KEY NOT NULL
);
Expand All @@ -12,10 +31,10 @@ CREATE TABLE `field` (
`tagKey` text NOT NULL,
`type` text NOT NULL,
`label` text NOT NULL,
`appearance` text DEFAULT 'multiline',
`snakeCase` integer DEFAULT false,
`appearance` text,
`snakeCase` integer,
`options` text,
`universal` integer DEFAULT false,
`universal` integer,
`placeholder` text,
`helperText` text,
`forks` text NOT NULL
Expand Down Expand Up @@ -58,7 +77,23 @@ CREATE TABLE `preset` (
`addTags` text NOT NULL,
`removeTags` text NOT NULL,
`fieldIds` text NOT NULL,
`icon` text,
`iconId` text,
`terms` text NOT NULL,
`forks` text NOT NULL
);
--> statement-breakpoint
CREATE TABLE `role_backlink` (
`versionId` text PRIMARY KEY NOT NULL
);
--> statement-breakpoint
CREATE TABLE `role` (
`docId` text PRIMARY KEY NOT NULL,
`versionId` text NOT NULL,
`schemaName` text NOT NULL,
`createdAt` text NOT NULL,
`updatedAt` text NOT NULL,
`links` text NOT NULL,
`roleId` text NOT NULL,
`fromIndex` real NOT NULL,
`forks` text NOT NULL
);
Loading

0 comments on commit 8fe03c7

Please sign in to comment.