From fb996f9654b1915fa20c41da8a0078c6b5f254f0 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Thu, 8 May 2025 14:25:29 -0700
Subject: [PATCH 1/2] Lexicons, move title out of defs

---
 lexicons/my/spoor/content/external.json             | 2 +-
 lexicons/my/spoor/content/media.json                | 2 +-
 lexicons/my/spoor/content/{defs.json => title.json} | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename lexicons/my/spoor/content/{defs.json => title.json} (78%)

diff --git a/lexicons/my/spoor/content/external.json b/lexicons/my/spoor/content/external.json
index fd272af..fc6f470 100644
--- a/lexicons/my/spoor/content/external.json
+++ b/lexicons/my/spoor/content/external.json
@@ -14,7 +14,7 @@
             "minLength": 1,
             "items": {
               "type": "ref",
-              "ref": "my.spoor.content.defs#title"
+              "ref": "my.spoor.content.title"
             }
           },
           "source": {
diff --git a/lexicons/my/spoor/content/media.json b/lexicons/my/spoor/content/media.json
index ec383d1..e8897c2 100644
--- a/lexicons/my/spoor/content/media.json
+++ b/lexicons/my/spoor/content/media.json
@@ -14,7 +14,7 @@
             "minLength": 1,
             "items": {
               "type": "ref",
-              "ref": "my.spoor.content.defs#title"
+              "ref": "my.spoor.content.title"
             }
           },
           "durationData": {
diff --git a/lexicons/my/spoor/content/defs.json b/lexicons/my/spoor/content/title.json
similarity index 78%
rename from lexicons/my/spoor/content/defs.json
rename to lexicons/my/spoor/content/title.json
index f13f8fd..3368a47 100644
--- a/lexicons/my/spoor/content/defs.json
+++ b/lexicons/my/spoor/content/title.json
@@ -1,17 +1,15 @@
 {
   "lexicon": 1,
-  "id": "my.spoor.content.defs",
+  "id": "my.spoor.content.title",
   "defs": {
-    "title": {
+    "main": {
       "type": "object",
       "properties": {
         "translationType": { 
           "type": "string",
           "format": "nsid",
           "knownValues": [
-            "my.spoor.content.defs#titleHomophonic",
-            "my.spoor.content.defs#titleNative",
-            "my.spoor.content.defs#titleTranslation"
+            "#titleHomophonic", "#titleNative", "#titleTranslation"
           ]
         },
         "lang": {

From e0a510afadaa2c62b2834020046bcfa21b1871a4 Mon Sep 17 00:00:00 2001
From: Julia Lange <public@julialange.org>
Date: Thu, 8 May 2025 14:27:17 -0700
Subject: [PATCH 2/2] Lexicons, remove invalid concrete schema

---
 lexicons/my/spoor/log/activity.json | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lexicons/my/spoor/log/activity.json b/lexicons/my/spoor/log/activity.json
index f3035fb..adb3a1e 100644
--- a/lexicons/my/spoor/log/activity.json
+++ b/lexicons/my/spoor/log/activity.json
@@ -15,7 +15,7 @@
           "progress": {
             "type": "union",
             "refs": [
-              "my.spoor.log.activity#indexProgress"
+              "#progressIndex"
             ]
           },
           "performedAt": {
@@ -31,9 +31,13 @@
         }
       }
     },
-    "indexProgress": {
-      "type": "integer",
-      "description": "The index of the content consumed. Content must be indexable"
+    "progressIndex": {
+      "type": "object",
+      "description": "The index of the content consumed. Content must be indexable",
+      "required": [ "index" ],
+      "properties": {
+        "index": { "type": "integer" }
+      }
     }
   }
 }