Merge branch 'main' into restart-autostop-timeout-for-blobs

digidem · Aug 27, 2024 · c71891f · c71891f
2 parents ff4fdc9 + 0e5c718
commit c71891f
Show file tree

Hide file tree

Showing 37 changed files with 1,181 additions and 2,002 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,7 +5,7 @@
 - Familiarity with [GitHub pull requests](https://help.github.com/articles/using-pull-requests) and issues.
 - Knowledge of JavaScript and JSDoc
 - Knowledge of [markdown](https://help.github.com/articles/markdown-basics/) for editing `.md` documents.
-- Understanding of or interest in learning technologies used in this project like [hypercore](https://npmjs.com/hypercore), [hyperswarm](https://npmjs.com/hyperswarm), and other dependencies.
+- Understanding of or interest in learning technologies used in this project like [hypercore](https://npmjs.com/hypercore) and other dependencies.
 
 ## Steps to contributing
 

diff --git a/drizzle/client/0000_organic_bloodstrike.sql → drizzle/client/0000_kind_imperial_guard.sql b/drizzle/client/0000_organic_bloodstrike.sql → drizzle/client/0000_kind_imperial_guard.sql
@@ -18,16 +18,17 @@ CREATE TABLE `projectKeys` (
 CREATE TABLE `projectSettings` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
 	`name` text,
 	`defaultPresets` text,
 	`configMetadata` text,
+	`isInitialProject` integer NOT NULL,
 	`forks` text NOT NULL
 );
 --> statement-breakpoint
-CREATE UNIQUE INDEX `localDeviceInfo_deviceId_unique` ON `localDeviceInfo` (`deviceId`);
+CREATE UNIQUE INDEX `localDeviceInfo_deviceId_unique` ON `localDeviceInfo` (`deviceId`);
diff --git a/drizzle/client/meta/0000_snapshot.json b/drizzle/client/meta/0000_snapshot.json
@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "c4f2efaa-b40a-4148-9b5f-b1a4fd9f7f8e",
+  "id": "aea2dc34-6de1-4de7-86d5-0fbe93b682ff",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "localDeviceInfo": {
@@ -113,22 +113,22 @@
           "notNull": true,
           "autoincrement": false
         },
-        "schemaName": {
-          "name": "schemaName",
+        "originalVersionId": {
+          "name": "originalVersionId",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "createdAt": {
-          "name": "createdAt",
+        "schemaName": {
+          "name": "schemaName",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
           "autoincrement": false
         },
-        "createdBy": {
-          "name": "createdBy",
+        "createdAt": {
+          "name": "createdAt",
           "type": "text",
           "primaryKey": false,
           "notNull": true,
@@ -176,6 +176,13 @@
           "notNull": false,
           "autoincrement": false
         },
+        "isInitialProject": {
+          "name": "isInitialProject",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
         "forks": {
           "name": "forks",
           "type": "text",
@@ -196,4 +203,4 @@
     "tables": {},
     "columns": {}
   }
-}
+}
diff --git a/drizzle/client/meta/_journal.json b/drizzle/client/meta/_journal.json
@@ -5,9 +5,9 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1722877616350,
-      "tag": "0000_organic_bloodstrike",
+      "when": 1724690323632,
+      "tag": "0000_kind_imperial_guard",
       "breakpoints": true
     }
   ]
-}
+}
diff --git a/.../project/0000_striped_roland_deschain.sql → drizzle/project/0000_harsh_bloodstrike.sql b/.../project/0000_striped_roland_deschain.sql → drizzle/project/0000_harsh_bloodstrike.sql
@@ -5,9 +5,9 @@ CREATE TABLE `coreOwnership_backlink` (
 CREATE TABLE `coreOwnership` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -31,9 +31,9 @@ CREATE TABLE `deviceInfo_backlink` (
 CREATE TABLE `deviceInfo` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -49,9 +49,9 @@ CREATE TABLE `field_backlink` (
 CREATE TABLE `field` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -61,7 +61,7 @@ CREATE TABLE `field` (
 	`appearance` text,
 	`snakeCase` integer,
 	`options` text,
-	`universal` integer,
+	`universal` integer DEFAULT false NOT NULL,
 	`placeholder` text,
 	`helperText` text,
 	`forks` text NOT NULL
@@ -74,9 +74,9 @@ CREATE TABLE `icon_backlink` (
 CREATE TABLE `icon` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -92,17 +92,17 @@ CREATE TABLE `observation_backlink` (
 CREATE TABLE `observation` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
-	`lat` real,
-	`lon` real,
+	`lat` real NOT NULL,
+	`lon` real NOT NULL,
 	`attachments` text NOT NULL,
 	`tags` text NOT NULL,
-	`metadata` text NOT NULL,
+	`metadata` text,
 	`presetRef` text,
 	`forks` text NOT NULL
 );
@@ -114,9 +114,9 @@ CREATE TABLE `preset_backlink` (
 CREATE TABLE `preset` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -126,7 +126,7 @@ CREATE TABLE `preset` (
 	`addTags` text NOT NULL,
 	`removeTags` text NOT NULL,
 	`fieldRefs` text NOT NULL,
-	`iconRef` text,
+	`iconRef` text NOT NULL,
 	`terms` text NOT NULL,
 	`color` text NOT NULL,
 	`forks` text NOT NULL
@@ -139,9 +139,9 @@ CREATE TABLE `role_backlink` (
 CREATE TABLE `role` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -157,9 +157,9 @@ CREATE TABLE `track_backlink` (
 CREATE TABLE `track` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,
@@ -177,9 +177,9 @@ CREATE TABLE `translation_backlink` (
 CREATE TABLE `translation` (
 	`docId` text PRIMARY KEY NOT NULL,
 	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
 	`schemaName` text NOT NULL,
 	`createdAt` text NOT NULL,
-	`createdBy` text NOT NULL,
 	`updatedAt` text NOT NULL,
 	`links` text NOT NULL,
 	`deleted` integer NOT NULL,