feat: update @comapeo/schema to 1.2.0, adding alerts and server

drizzle/client/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "41e23fc3-463e-432a-9a5f-7c20366d6294",
+  "id": "0bef7cde-153c-4c79-bff6-965621d57ba9",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "localDeviceInfo": {

drizzle/client/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1725381616476,
-      "tag": "0000_chemical_star_brand",
+      "when": 1725385833462,
+      "tag": "0000_nervous_earthquake",
       "breakpoints": true
     }
   ]

drizzle/project/0000_tan_glorian.sql → drizzle/project/0000_late_radioactive_man.sql

@@ -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
@@ -126,12 +126,33 @@ 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
 );
 --> statement-breakpoint
+CREATE TABLE `remoteDetectionAlert_backlink` (
+	`versionId` text PRIMARY KEY NOT NULL
+);
+--> statement-breakpoint
+CREATE TABLE `remoteDetectionAlert` (
+	`docId` text PRIMARY KEY NOT NULL,
+	`versionId` text NOT NULL,
+	`originalVersionId` text NOT NULL,
+	`schemaName` text NOT NULL,
+	`createdAt` text NOT NULL,
+	`updatedAt` text NOT NULL,
+	`links` text NOT NULL,
+	`deleted` integer NOT NULL,
+	`detectionDateStart` text NOT NULL,
+	`detectionDateEnd` text NOT NULL,
+	`sourceId` text NOT NULL,
+	`metadata` text NOT NULL,
+	`geometry` text NOT NULL,
+	`forks` text NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE `role_backlink` (
 	`versionId` text PRIMARY KEY NOT NULL
 );

drizzle/project/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "5",
   "dialect": "sqlite",
-  "id": "b06de2c5-6a4c-4578-a8f0-d15f9f20e902",
+  "id": "b1562cc7-fbbe-444b-a0f5-bae25ecbfd26",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "coreOwnership_backlink": {
@@ -373,8 +373,9 @@
           "name": "universal",
           "type": "integer",
           "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
         },
         "placeholder": {
           "name": "placeholder",
@@ -756,7 +757,7 @@
           "name": "iconRef",
           "type": "text",
           "primaryKey": false,
-          "notNull": false,
+          "notNull": true,
           "autoincrement": false
         },
         "terms": {
@@ -786,6 +787,129 @@
       "compositePrimaryKeys": {},
       "uniqueConstraints": {}
     },
+    "remoteDetectionAlert_backlink": {
+      "name": "remoteDetectionAlert_backlink",
+      "columns": {
+        "versionId": {
+          "name": "versionId",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "remoteDetectionAlert": {
+      "name": "remoteDetectionAlert",
+      "columns": {
+        "docId": {
+          "name": "docId",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "versionId": {
+          "name": "versionId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "originalVersionId": {
+          "name": "originalVersionId",
+          "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
+        },
+        "deleted": {
+          "name": "deleted",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "detectionDateStart": {
+          "name": "detectionDateStart",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "detectionDateEnd": {
+          "name": "detectionDateEnd",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "sourceId": {
+          "name": "sourceId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "metadata": {
+          "name": "metadata",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "geometry": {
+          "name": "geometry",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "forks": {
+          "name": "forks",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "role_backlink": {
       "name": "role_backlink",
       "columns": {

drizzle/project/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "5",
-      "when": 1725381611574,
-      "tag": "0000_tan_glorian",
+      "when": 1725385829759,
+      "tag": "0000_late_radioactive_man",
       "breakpoints": true
     }
   ]

package.json

@@ -155,7 +155,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.26",
+    "@mapeo/schema": "file:mapeo-schema-3.0.0-next.25.tgz",
     "@mapeo/sqlite-indexer": "1.0.0-alpha.9",
     "@sinclair/typebox": "^0.29.6",
     "b4a": "^1.6.3",

src/constants.js

@@ -19,7 +19,7 @@ export const DATA_NAMESPACES = NAMESPACES.filter(
 )
 
 export const NAMESPACE_SCHEMAS = /** @type {const} */ ({
-  data: ['observation', 'track'],
+  data: ['observation', 'track', 'remoteDetectionAlert'],
   config: [
     'translation',
     'preset',

src/mapeo-project.js

@@ -24,6 +24,7 @@ import {
   roleTable,
   iconTable,
   translationTable,
+  remoteDetectionAlertTable,
 } from './schema/project.js'
 import {
   CoreOwnership,
@@ -168,6 +169,7 @@ export class MapeoProject extends TypedEmitter {
         deviceInfoTable,
         iconTable,
         translationTable,
+        remoteDetectionAlertTable,
       ],
       sqlite: this.#sqlite,
       getWinner,
@@ -224,6 +226,12 @@ export class MapeoProject extends TypedEmitter {
         db,
         getTranslations,
       }),
+      remoteDetectionAlert: new DataType({
+        dataStore: this.#dataStores.data,
+        table: remoteDetectionAlertTable,
+        db,
+        getTranslations,
+      }),
       preset: new DataType({
         dataStore: this.#dataStores.config,
         table: presetTable,
@@ -499,6 +507,10 @@ export class MapeoProject extends TypedEmitter {
     return this.#dataTypes.field
   }
 
+  get remoteDetectionAlert() {
+    return this.#dataTypes.remoteDetectionAlert
+  }
+
   get $member() {
     return this.#memberApi
   }

src/schema/project.js

@@ -15,6 +15,10 @@ export const observationTable = sqliteTable(
   toColumns(schemas.observation)
 )
 export const trackTable = sqliteTable('track', toColumns(schemas.track))
+export const remoteDetectionAlertTable = sqliteTable(
+  'remoteDetectionAlert',
+  toColumns(schemas.remoteDetectionAlert)
+)
 export const presetTable = sqliteTable('preset', toColumns(schemas.preset))
 export const fieldTable = sqliteTable('field', toColumns(schemas.field))
 export const coreOwnershipTable = sqliteTable(
@@ -31,6 +35,9 @@ export const iconTable = sqliteTable('icon', toColumns(schemas.icon))
 export const translationBacklinkTable = backlinkTable(translationTable)
 export const observationBacklinkTable = backlinkTable(observationTable)
 export const trackBacklinkTable = backlinkTable(trackTable)
+export const remoteDetectionAlertBacklinkTable = backlinkTable(
+  remoteDetectionAlertTable
+)
 export const presetBacklinkTable = backlinkTable(presetTable)
 export const fieldBacklinkTable = backlinkTable(fieldTable)
 export const coreOwnershipBacklinkTable = backlinkTable(coreOwnershipTable)

test-e2e/project-crud.js

@@ -53,6 +53,14 @@ const fixtures = [
     tags: {},
     locations: Array.from({ length: 10 }, trackPositionFixture),
   },
+  {
+    schemaName: 'remoteDetectionAlert',
+    detectionDateStart: new Date().toISOString(),
+    detectionDateEnd: new Date().toISOString(),
+    sourceId: randomBytes(32).toString('hex'),
+    metadata: { alert_type: 'fire' },
+    geometry: {},
+  },
 ]
 
 /**
@@ -115,8 +123,10 @@ test('CRUD operations', async (t) => {
       let i = 0
       while (i++ < CREATE_COUNT) {
         const mocked =
-          // TODO: add tracks to @mapeo/mock-data
-          schemaName === 'track' ? value : valueOf(generate(schemaName)[0])
+          // TODO: add tracks and remoteDetectionAlert to @mapeo/mock-data
+          schemaName === 'track' || schemaName === 'remoteDetectionAlert'
+            ? value
+            : valueOf(generate(schemaName)[0])
         writePromises.push(
           // @ts-ignore
           project[schemaName].create(mocked)
@@ -182,8 +192,10 @@ test('CRUD operations', async (t) => {
       const writePromises = []
       for (let i = 0; i < CREATE_COUNT; i++) {
         const mocked =
-          // TODO: add tracks to @mapeo/mock-data
-          schemaName === 'track' ? value : valueOf(generate(schemaName)[0])
+          // TODO: add tracks and remoteDetectionAlert to @mapeo/mock-data
+          schemaName === 'track' || schemaName === 'remoteDetectionAlert'
+            ? value
+            : valueOf(generate(schemaName)[0])
         writePromises.push(
           // @ts-ignore
           project[schemaName].create(mocked)
@@ -291,8 +303,10 @@ test('CRUD operations', async (t) => {
       let i = 0
       while (i++ < CREATE_COUNT) {
         const mocked =
-          // TODO: add tracks to @mapeo/mock-data
-          schemaName === 'track' ? value : valueOf(generate(schemaName)[0])
+          // TODO: add tracks and remoteDetectionAlert to @mapeo/mock-data
+          schemaName === 'track' || schemaName === 'remoteDetectionAlert'
+            ? value
+            : valueOf(generate(schemaName)[0])
         writePromises.push(
           // @ts-ignore
           project[schemaName].create(mocked)