Fix Tests

proto/observation/v5.proto

@@ -14,8 +14,8 @@ message Observation_5 {
 
   Common_1 common = 1;
 
-  optional float lat = 5;
-  optional float lon = 6;
+  optional double lat = 5;
+  optional double lon = 6;
 
   message Ref {
     bytes id = 1;
@@ -47,12 +47,12 @@ message Observation_5 {
       bool mocked = 2;
 
       message Coords {
-        float latitude = 1;
-        float longitude = 2;
-        float altitude = 3;
-        float heading = 4;
-        float speed = 5;
-        float acurracy = 6;
+        double latitude = 1;
+        double longitude = 2;
+        double altitude = 3;
+        double heading = 4;
+        double speed = 5;
+        double accuracy = 6;
       }
       optional Coords coords = 3;
     }

schema/preset/v2.json

@@ -83,7 +83,7 @@
         "type": "string"
       }
     },
-    "icon": {
+    "iconId": {
       "description": "hex-encoded string. ID of preset icon which represents this preset",
       "type": "string"
     },

src/lib/decode-conversions.ts

@@ -32,12 +32,12 @@ export const convertProject: ConvertFunction<'project'> = (
     ...jsonSchemaCommon,
     ...rest,
     defaultPresets: {
-      point: message.defaultPresets?.point.map(p => p.toString('hex')),
-      area: message.defaultPresets?.area.map(a => a.toString('hex')),
-      vertex: message.defaultPresets?.vertex.map(v => v.toString('hex')),
-      line: message.defaultPresets?.line.map(l => l.toString('hex')),
-      relation: message.defaultPresets?.relation.map(r => r.toString('hex')),
-    }
+      point: message.defaultPresets?.point.map((p) => p.toString('hex')),
+      area: message.defaultPresets?.area.map((a) => a.toString('hex')),
+      vertex: message.defaultPresets?.vertex.map((v) => v.toString('hex')),
+      line: message.defaultPresets?.line.map((l) => l.toString('hex')),
+      relation: message.defaultPresets?.relation.map((r) => r.toString('hex')),
+    },
   }
 }
 
@@ -113,26 +113,24 @@ export const convertPreset: ConvertFunction<'preset'> = (
     ...jsonSchemaCommon,
     ...rest,
     geometry,
+    iconId: rest.iconId ? rest.iconId.toString('hex') : undefined,
     tags: convertTags(rest.tags),
     addTags: convertTags(rest.addTags),
     removeTags: convertTags(rest.removeTags),
     fieldIds: rest.fieldIds.map((id) => id.toString('hex')),
   }
 }
 
-export const convertRole: ConvertFunction<'role'> = (
-message,
-versionObj
-) => {
-    const { common, schemaVersion, ...rest } = message
-    const jsonSchemaCommon = convertCommon(common, versionObj)
-    return {
-      ...jsonSchemaCommon,
-      ...rest,
+export const convertRole: ConvertFunction<'role'> = (message, versionObj) => {
+  const { common, schemaVersion, ...rest } = message
+  const jsonSchemaCommon = convertCommon(common, versionObj)
+  return {
+    ...jsonSchemaCommon,
+    ...rest,
     role: rest.role,
     projectId: message.projectId.toString('hex'),
-    authorId: message.authorId.toString('hex')
-    }
+    authorId: message.authorId.toString('hex'),
+  }
 }
 
 export const convertDevice: ConvertFunction<'device'> = (
@@ -145,7 +143,7 @@ export const convertDevice: ConvertFunction<'device'> = (
     ...jsonSchemaCommon,
     ...rest,
     authorId: message.authorId.toString('hex'),
-    projectId: message.projectId.toString('hex')
+    projectId: message.projectId.toString('hex'),
   }
 }
 
@@ -160,9 +158,8 @@ export const convertCoreOwnership: ConvertFunction<'coreOwnership'> = (
     ...rest,
     coreId: message.coreId.toString('hex'),
     projectId: message.projectId.toString('hex'),
-    authorId: message.authorId.toString('hex')
+    authorId: message.authorId.toString('hex'),
   }
-
 }
 
 function convertTags(tags: { [key: string]: TagValue_1 } | undefined): {

src/lib/encode-converstions.ts

@@ -26,12 +26,22 @@ export const convertProject: ConvertFunction<'project'> = (mapeoDoc) => {
     common: convertCommon(mapeoDoc),
     ...mapeoDoc,
     defaultPresets: {
-      point: (mapeoDoc.defaultPresets.point || []).map(p => Buffer.from(p,'hex')),
-      area: (mapeoDoc.defaultPresets.area || []).map(a => Buffer.from(a,'hex')),
-      vertex: (mapeoDoc.defaultPresets.area || []).map(v => Buffer.from(v,'hex')),
-      line: (mapeoDoc.defaultPresets.area || []).map(l => Buffer.from(l, 'hex')),
-      relation: (mapeoDoc.defaultPresets.area || []).map(r => Buffer.from(r, 'hex'))
-    }
+      point: (mapeoDoc.defaultPresets.point || []).map((p) =>
+        Buffer.from(p, 'hex')
+      ),
+      area: (mapeoDoc.defaultPresets.area || []).map((a) =>
+        Buffer.from(a, 'hex')
+      ),
+      vertex: (mapeoDoc.defaultPresets.vertex || []).map((v) =>
+        Buffer.from(v, 'hex')
+      ),
+      line: (mapeoDoc.defaultPresets.line || []).map((l) =>
+        Buffer.from(l, 'hex')
+      ),
+      relation: (mapeoDoc.defaultPresets.relation || []).map((r) =>
+        Buffer.from(r, 'hex')
+      ),
+    },
   }
 }
 
@@ -64,7 +74,7 @@ export const convertPreset: ConvertFunction<'preset'> = (mapeoDoc) => {
     addTags: convertTags(mapeoDoc.addTags),
     removeTags: convertTags(mapeoDoc.removeTags),
     fieldIds: mapeoDoc.fieldIds.map((field) => Buffer.from(field, 'hex')),
-    iconId: mapeoDoc.icon ? Buffer.from(mapeoDoc.icon, 'hex') : undefined,
+    iconId: mapeoDoc.iconId ? Buffer.from(mapeoDoc.iconId, 'hex') : undefined,
   }
 }
 
@@ -94,26 +104,21 @@ export const convertObservation: ConvertFunction<'observation'> = (
   }
 }
 
-export const convertRole: ConvertFunction<'role'> = (
-  mapeoDoc
-) => {
+export const convertRole: ConvertFunction<'role'> = (mapeoDoc) => {
   return {
     common: convertCommon(mapeoDoc),
     ...mapeoDoc,
-    projectId: Buffer.from(mapeoDoc.projectId,'hex'),
-    authorId: Buffer.from(mapeoDoc.authorId,'hex')
-
+    projectId: Buffer.from(mapeoDoc.projectId, 'hex'),
+    authorId: Buffer.from(mapeoDoc.authorId, 'hex'),
   }
 }
 
-export const convertDevice: ConvertFunction<'device'> = (
-  mapeoDoc
-) => {
+export const convertDevice: ConvertFunction<'device'> = (mapeoDoc) => {
   return {
     common: convertCommon(mapeoDoc),
     ...mapeoDoc,
     authorId: Buffer.from(mapeoDoc.authorId, 'hex'),
-    projectId: Buffer.from(mapeoDoc.projectId, 'hex')
+    projectId: Buffer.from(mapeoDoc.projectId, 'hex'),
   }
 }
 
@@ -125,7 +130,7 @@ export const convertCoreOwnership: ConvertFunction<'coreOwnership'> = (
     ...mapeoDoc,
     coreId: Buffer.from(mapeoDoc.coreId, 'hex'),
     projectId: Buffer.from(mapeoDoc.projectId, 'hex'),
-    authorId: Buffer.from(mapeoDoc.authorId,'hex')
+    authorId: Buffer.from(mapeoDoc.authorId, 'hex'),
   }
 }
 
@@ -145,14 +150,10 @@ function convertTags(tags: {
 }): {
   [key: string]: TagValue_1
 } {
-  return Object.keys(tags).reduce(
-    (acc: { [key: string]: TagValue_1 }, k: string) => {
-      return {
-        [k]: convertTagValue(tags[k]),
-      }
-    },
-    {}
-  )
+  return Object.keys(tags).reduce<{ [key: string]: TagValue_1 }>((acc, k) => {
+    acc[k] = convertTagValue(tags[k])
+    return acc
+  }, {})
 }
 
 function convertTagValue(tagValue: JsonTagValue): TagValue_1 {

test/fixtures/bad-docs.js

@@ -0,0 +1,26 @@
+// @ts-check
+import { randomBytes } from 'node:crypto'
+import { cachedValues } from './cached.js'
+
+export const badDocs = [
+  {
+    text: 'test encoding of record with missing fields',
+    doc: { docId: randomBytes(32).toString('hex') },
+  },
+  {
+    text: 'test encoding of wrong schema name',
+    /** @type Omit<import('../../dist/index.js').Observation, 'schemaName'> & { schemaName: string }} */
+    doc: {
+      docId: cachedValues.docId,
+      versionId: cachedValues.versionId,
+      schemaName: 'observOtion',
+      createdAt: cachedValues.createdAt,
+      updatedAt: cachedValues.updatedAt,
+      links: [],
+      refs: [],
+      attachments: [],
+      tags: {},
+      metadata: {},
+    },
+  },
+]

test/fixtures/cached.js

@@ -0,0 +1,28 @@
+import { randomBytes } from 'node:crypto'
+
+// For stuff like dates or generated random Ids, so I can compare with an expected doc
+const date = new Date().toJSON()
+export const cachedValues = {
+  docId: randomBytes(32).toString('hex'),
+  versionId: `${randomBytes(32).toString('hex')}/0`,
+  projectId: randomBytes(32).toString('hex'),
+  authorId: randomBytes(32).toString('hex'),
+  coreId: randomBytes(32).toString('hex'),
+  createdAt: date,
+  updatedAt: date,
+  attachments: { driveId: randomBytes(32).toString('hex') },
+  metadata: {
+    position: {
+      timestamp: date,
+    },
+  },
+  defaultPresets: {
+    point: [randomBytes(32).toString('hex')],
+    area: [randomBytes(32).toString('hex')],
+    vertex: [randomBytes(32).toString('hex')],
+    line: [randomBytes(32).toString('hex')],
+    relation: [randomBytes(32).toString('hex')],
+  },
+  fieldIds: [randomBytes(32).toString('hex')],
+  iconId: randomBytes(32).toString('hex'),
+}