chore!: improve decoding of required fields

package.json

@@ -42,7 +42,6 @@
     "@json-schema-tools/dereferencer": "^1.6.3",
     "@types/compact-encoding": "^2.15.0",
     "@types/json-schema": "^7.0.12",
-    "ajv": "^8.12.0",
     "c8": "^8.0.1",
     "cpy-cli": "^5.0.0",
     "eslint": "^8.46.0",
@@ -61,6 +60,7 @@
     "typescript": "^5.5.4"
   },
   "dependencies": {
+    "ajv": "^8.12.0",
     "compact-encoding": "^2.12.0",
     "protobufjs": "^7.2.5",
     "type-fest": "^4.26.0"

proto/coreOwnership/v1.proto

@@ -13,12 +13,12 @@ message CoreOwnership_1 {
 
   Common_1 common = 1;
 
-  bytes authCoreId = 5;
-  bytes configCoreId = 6;
-  bytes dataCoreId = 7;
-  bytes blobCoreId = 8;
-  bytes blobIndexCoreId = 9;
-  CoreSignatures coreSignatures = 10;
+  bytes authCoreId = 5 [(required) = true];
+  bytes configCoreId = 6 [(required) = true];
+  bytes dataCoreId = 7 [(required) = true];
+  bytes blobCoreId = 8 [(required) = true];
+  bytes blobIndexCoreId = 9 [(required) = true];
+  CoreSignatures coreSignatures = 10 [(required) = true];
   bytes identitySignature = 11;
 
   message CoreSignatures {

proto/deviceInfo/v1.proto

@@ -21,6 +21,6 @@ message DeviceInfo_1 {
     selfHostedServer = 4;
   }
 
-  string name = 5;
-  optional DeviceType deviceType = 6;
+  string name = 5 [(required) = true];
+  DeviceType deviceType = 6;
 }

proto/preset/v1.proto

@@ -15,15 +15,15 @@ message Preset_1 {
 
   Common_1 common = 1;
 
-  string name = 5;
+  string name = 5 [(required) = true];
   repeated Geometry geometry = 6;
   map<string, TagValue_1> tags = 7;
   map<string, TagValue_1> addTags = 8;
   map<string, TagValue_1> removeTags = 9;
   repeated FieldRef fieldRefs = 10;
   optional IconRef iconRef = 11;
   repeated string terms = 12;
-  string color = 13;
+  string color = 13 [(required) = true];
 
   enum Geometry {
     geometry_unspecified = 0;

proto/projectSettings/v1.proto

@@ -30,5 +30,4 @@ message ProjectSettings_1 {
   optional DefaultPresets defaultPresets = 2;
   optional ConfigMetadata configMetadata = 3;
   optional string name = 4;
-  bool isInitialProject = 5;
 }

proto/role/v1.proto

@@ -13,6 +13,6 @@ message Role_1 {
 
   Common_1 common = 1;
 
-  bytes roleId = 5;
-  uint32 fromIndex = 6;
+  bytes roleId = 5 [(required) = true];
+  optional uint32 fromIndex = 6 [(required) = true];
 }

proto/translation/v1.proto

@@ -13,10 +13,10 @@ message Translation_1 {
   Common_1 common = 1;
   DocRef docRef = 2;
 
-  string propertyRef = 3;
-  string languageCode = 4;
-  string regionCode = 5;
-  string message = 6;
+  string propertyRef = 3 [(required) = true];
+  string languageCode = 4 [(required) = true];
+  optional string regionCode = 5;
+  string message = 6 [(required) = true];
 
   message DocRef {
     bytes docId = 1;

schema/common/v1.json

@@ -7,19 +7,23 @@
   "properties": {
     "docId": {
       "description": "Hex-encoded 32-byte buffer",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "versionId": {
       "description": "core discovery id (hex-encoded 32-byte buffer) and core index number, separated by '/'",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "originalVersionId": {
       "description": "Version ID of the original version of this document. For the original version, matches `versionId`.",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "schemaName": {
       "description": "Name of Mapeo data type / schema",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "createdAt": {
       "description": "RFC3339-formatted datetime of when the first version of the element was created",

schema/coreOwnership/v1.json

@@ -11,23 +11,28 @@
     },
     "authCoreId": {
       "type": "string",
-      "description": "Hex-encoded key of auth store writer core"
+      "description": "Hex-encoded key of auth store writer core",
+      "minLength": 1
     },
     "configCoreId": {
       "type": "string",
-      "description": "Hex-encoded key of config store writer core"
+      "description": "Hex-encoded key of config store writer core",
+      "minLength": 1
     },
     "dataCoreId": {
       "type": "string",
-      "description": "Hex-encoded key of data store writer core"
+      "description": "Hex-encoded key of data store writer core",
+      "minLength": 1
     },
     "blobCoreId": {
       "type": "string",
-      "description": "Hex-encoded key of blob store writer core"
+      "description": "Hex-encoded key of blob store writer core",
+      "minLength": 1
     },
     "blobIndexCoreId": {
       "type": "string",
-      "description": "Hex-encoded key of blobIndex store writer core"
+      "description": "Hex-encoded key of blobIndex store writer core",
+      "minLength": 1
     }
   },
   "required": [

schema/deviceInfo/v1.json

@@ -10,7 +10,8 @@
     },
     "name": {
       "type": "string",
-      "description": "Name of the device"
+      "description": "Name of the device",
+      "minLength": 1
     },
     "deviceType": {
       "type": "string",

schema/field/v1.json

@@ -12,7 +12,8 @@
     },
     "tagKey": {
       "description": "They key in a tags object that this field applies to",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "type": {
       "description": "Type of field - defines how the field is displayed to the user.",
@@ -35,7 +36,8 @@
     },
     "label": {
       "description": "Default language label for the form field label",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "appearance": {
       "description": "For text fields, display as a single-line or multi-line field",
@@ -66,7 +68,8 @@
         "type": "object",
         "properties": {
           "label": {
-            "type": "string"
+            "type": "string",
+            "minLength": 1
           },
           "value": {
             "anyOf": [

schema/icon/v1.json

@@ -11,7 +11,8 @@
     },
     "blobVersionId": {
       "description": "Version id of the icon blob. Each id is id (hex-encoded 32 byte buffer) and index number, separated by '/'",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     }
   },
   "properties": {
@@ -21,7 +22,8 @@
       "const": "icon"
     },
     "name": {
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "variants": {
       "type": "array",

schema/observation/v1.json

@@ -77,11 +77,13 @@
         "properties": {
           "driveDiscoveryId": {
             "type": "string",
-            "description": "core discovery id for the drive that the attachment belongs to"
+            "description": "core discovery id for the drive that the attachment belongs to",
+            "minLength": 1
           },
           "name": {
             "type": "string",
-            "description": "name of the attachment"
+            "description": "name of the attachment",
+            "minLength": 1
           },
           "type": {
             "type": "string",
@@ -99,7 +101,8 @@
           },
           "hash": {
             "type": "string",
-            "description": "SHA256 hash of the attachment"
+            "description": "SHA256 hash of the attachment",
+            "minLength": 1
           }
         },
         "required": ["driveDiscoveryId", "name", "type", "hash"]
@@ -192,11 +195,13 @@
       "properties": {
         "docId": {
           "description": "hex-encoded id of the element that this observation references",
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         },
         "versionId": {
           "description": "core discovery id (hex-encoded 32-byte buffer) and core index number, separated by '/'",
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         }
       },
       "required": ["docId", "versionId"]

schema/preset/v1.json

@@ -53,7 +53,8 @@
     },
     "name": {
       "description": "Name for the feature in default language.",
-      "type": "string"
+      "type": "string",
+      "minLength": 1
     },
     "geometry": {
       "description": "Valid geometry types for the feature - this preset will only match features of this geometry type `\"point\", \"vertex\", \"line\", \"area\", \"relation\"`",
@@ -84,11 +85,13 @@
         "properties": {
           "docId": {
             "description": "hex-encoded id of the element that this observation references",
-            "type": "string"
+            "type": "string",
+            "minLength": 1
           },
           "versionId": {
             "description": "core discovery id (hex-encoded 32-byte buffer) and core index number, separated by '/'",
-            "type": "string"
+            "type": "string",
+            "minLength": 1
           }
         },
         "required": ["docId", "versionId"]
@@ -100,11 +103,13 @@
       "properties": {
         "docId": {
           "description": "hex-encoded id of the element that this observation references",
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         },
         "versionId": {
           "description": "core discovery id (hex-encoded 32-byte buffer) and core index number, separated by '/'",
-          "type": "string"
+          "type": "string",
+          "minLength": 1
         }
       },
       "required": ["docId", "versionId"]

schema/projectSettings/v1.json

@@ -30,7 +30,8 @@
       "properties": {
         "name": {
           "type": "string",
-          "description": "Name of the configuration"
+          "description": "Name of the configuration",
+          "minLength": 1
         },
         "buildDate": {
           "type": "string",
@@ -44,17 +45,14 @@
         },
         "fileVersion": {
           "type": "string",
-          "description": "version of the configuration file format as comver (MAJOR.MINOR)"
+          "description": "version of the configuration file format as comver (MAJOR.MINOR)",
+          "minLength": 1
         }
       },
       "additionalProperties": false,
       "required": ["name", "buildDate", "importDate", "fileVersion"]
-    },
-    "isInitialProject": {
-      "type": "boolean",
-      "description": "this allows for checking if the user has already joined a project or if its on the initial 'default' project"
     }
   },
-  "required": ["schemaName", "isInitialProject"],
+  "required": ["schemaName"],
   "additionalProperties": false
 }