mini lcm refactor

backend/FwLite/FwDataMiniLcmBridge.Tests/Fixtures/MockFwProjectList.cs

@@ -1,5 +1,5 @@
 using Microsoft.Extensions.Options;
-using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwDataMiniLcmBridge.Tests.Fixtures;
 

backend/FwLite/FwDataMiniLcmBridge.Tests/PartOfSpeechTests.cs

@@ -1,6 +1,7 @@
 using FwDataMiniLcmBridge.Api;
 using FwDataMiniLcmBridge.Tests.Fixtures;
 using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwDataMiniLcmBridge.Tests;
 
@@ -64,12 +65,11 @@ public async Task Sense_UpdatesPartOfSpeech()
         var sense = entry.Senses.First(s => !string.IsNullOrEmpty(s.PartOfSpeech));
         var newPartOfSpeech = await _api.GetPartsOfSpeech().FirstAsync(po => po.Id != sense.PartOfSpeechId);
 
-        var update = _api.CreateUpdateBuilder<Sense>()
+        var update = new UpdateObjectInput<Sense>()
             .Set(s => s.PartOfSpeech,
                 newPartOfSpeech.Name
                     ["en"]) //this won't actually update the part of speech, but it shouldn't cause an issue either.
-            .Set(s => s.PartOfSpeechId, newPartOfSpeech.Id)
-            .Build();
+            .Set(s => s.PartOfSpeechId, newPartOfSpeech.Id);
         await _api.UpdateSense(entry.Id, sense.Id, update);
 
         entry = await _api.GetEntry(entry.Id);

backend/FwLite/FwDataMiniLcmBridge.Tests/SemanticDomainTests.cs

@@ -1,6 +1,7 @@
 using FwDataMiniLcmBridge.Api;
 using FwDataMiniLcmBridge.Tests.Fixtures;
 using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwDataMiniLcmBridge.Tests;
 
@@ -73,9 +74,8 @@ public async Task Sense_AddSemanticDomain()
         var currentSemanticDomain = sense.SemanticDomains.First();
         var newSemanticDomain = await _api.GetSemanticDomains().FirstAsync(sd => sd.Id != currentSemanticDomain.Id);
 
-        var update = _api.CreateUpdateBuilder<Sense>()
-            .Add(s => s.SemanticDomains, newSemanticDomain)
-            .Build();
+        var update = new UpdateObjectInput<Sense>()
+            .Add(s => s.SemanticDomains, newSemanticDomain);
         await _api.UpdateSense(entry.Id, sense.Id, update);
 
         entry = await _api.GetEntry(entry.Id);
@@ -91,9 +91,8 @@ public async Task Sense_RemoveSemanticDomain()
         var sense = entry.Senses.First(s => s.SemanticDomains.Any());
         var domainToRemove = sense.SemanticDomains[0];
 
-        var update = _api.CreateUpdateBuilder<Sense>()
-            .Remove(s => s.SemanticDomains, 0)
-            .Build();
+        var update = new UpdateObjectInput<Sense>()
+            .Remove(s => s.SemanticDomains, 0);
         await _api.UpdateSense(entry.Id, sense.Id, update);
 
         entry = await _api.GetEntry(entry.Id);

backend/FwLite/FwDataMiniLcmBridge.Tests/WritingSystemTests.cs

@@ -1,6 +1,6 @@
 using FwDataMiniLcmBridge.Api;
 using FwDataMiniLcmBridge.Tests.Fixtures;
-using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwDataMiniLcmBridge.Tests;
 

backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs

@@ -3,6 +3,7 @@
 using FwDataMiniLcmBridge.Api.UpdateProxy;
 using Microsoft.Extensions.Logging;
 using MiniLcm;
+using MiniLcm.Models;
 using SIL.LCModel;
 using SIL.LCModel.Core.KernelInterfaces;
 using SIL.LCModel.Core.Text;
@@ -12,7 +13,7 @@
 
 namespace FwDataMiniLcmBridge.Api;
 
-public class FwDataMiniLcmApi(Lazy<LcmCache> cacheLazy, bool onCloseSave, ILogger<FwDataMiniLcmApi> logger, FwDataProject project) : ILexboxApi, IDisposable
+public class FwDataMiniLcmApi(Lazy<LcmCache> cacheLazy, bool onCloseSave, ILogger<FwDataMiniLcmApi> logger, FwDataProject project) : IMiniLcmApi, IDisposable
 {
     private LcmCache Cache => cacheLazy.Value;
     public FwDataProject Project { get; } = project;
@@ -538,10 +539,4 @@ private static void ValidateOwnership(ILexExampleSentence lexExampleSentence, Gu
                                                 lexExampleSentence.Owner.ClassName);
         }
     }
-
-
-    public UpdateBuilder<T> CreateUpdateBuilder<T>() where T : class
-    {
-        return new UpdateBuilder<T>();
-    }
 }

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateDictionaryProxy.cs

@@ -1,5 +1,5 @@
 using System.Collections;
-using MiniLcm;
+using MiniLcm.Models;
 using SIL.LCModel.Core.KernelInterfaces;
 using SIL.LCModel.Core.Text;
 

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateEntryProxy.cs

@@ -1,4 +1,4 @@
-using MiniLcm;
+using MiniLcm.Models;
 using SIL.LCModel;
 using SIL.LCModel.Core.KernelInterfaces;
 

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateExampleSentenceProxy.cs

@@ -1,4 +1,4 @@
-using MiniLcm;
+using MiniLcm.Models;
 using SIL.LCModel;
 using SIL.LCModel.Core.Text;
 

backend/FwLite/FwDataMiniLcmBridge/Api/UpdateProxy/UpdateSenseProxy.cs

@@ -1,5 +1,5 @@
  using System.Diagnostics.CodeAnalysis;
-using MiniLcm;
+ using MiniLcm.Models;
 using SIL.LCModel;
 using SIL.LCModel.DomainServices;
 

backend/FwLite/FwDataMiniLcmBridge/FieldWorksProjectList.cs

@@ -1,6 +1,6 @@
 using FwDataMiniLcmBridge.LcmUtils;
 using Microsoft.Extensions.Options;
-using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwDataMiniLcmBridge;
 

backend/FwLite/FwDataMiniLcmBridge/FwDataBridgeKernel.cs

@@ -15,7 +15,7 @@ public static IServiceCollection AddFwDataBridge(this IServiceCollection service
         services.AddSingleton<FwDataFactory>();
         services.AddSingleton<FieldWorksProjectList>();
         services.AddSingleton<IProjectLoader, ProjectLoader>();
-        services.AddKeyedScoped<ILexboxApi>(FwDataApiKey, (provider, o) => provider.GetRequiredService<FwDataFactory>().GetCurrentFwDataMiniLcmApi(true));
+        services.AddKeyedScoped<IMiniLcmApi>(FwDataApiKey, (provider, o) => provider.GetRequiredService<FwDataFactory>().GetCurrentFwDataMiniLcmApi(true));
         services.AddSingleton<FwDataProjectContext>();
         return services;
     }

backend/FwLite/FwDataMiniLcmBridge/FwDataProject.cs

@@ -1,4 +1,4 @@
-using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwDataMiniLcmBridge;
 

backend/FwLite/FwLiteProjectSync.Tests/Fixtures/MultiStringOverride.cs

@@ -1,4 +1,4 @@
-using MiniLcm;
+using MiniLcm.Models;
 using Soenneker.Utils.AutoBogus.Context;
 using Soenneker.Utils.AutoBogus.Override;
 

backend/FwLite/FwLiteProjectSync.Tests/Fixtures/SyncFixture.cs

@@ -57,15 +57,15 @@ public async Task InitializeAsync()
         var crdtProject = await _services.ServiceProvider.GetRequiredService<ProjectsService>()
             .CreateProject(new(_projectName, projectGuid));
         _services.ServiceProvider.GetRequiredService<ProjectContext>().Project = crdtProject;
-        CrdtApi = _services.ServiceProvider.GetRequiredService<ILexboxApi>();
+        CrdtApi = _services.ServiceProvider.GetRequiredService<IMiniLcmApi>();
     }
 
     public async Task DisposeAsync()
     {
         await _services.DisposeAsync();
     }
 
-    public ILexboxApi CrdtApi { get; set; } = null!;
+    public IMiniLcmApi CrdtApi { get; set; } = null!;
     public FwDataMiniLcmApi FwDataApi { get; set; } = null!;
 }
 

backend/FwLite/FwLiteProjectSync.Tests/MultiStringDiffTests.cs

@@ -1,4 +1,4 @@
-using MiniLcm;
+using MiniLcm.Models;
 using Spart.Parsers;
 using SystemTextJsonPatch.Operations;
 

backend/FwLite/FwLiteProjectSync.Tests/SyncTests.cs

@@ -1,5 +1,6 @@
 using FwLiteProjectSync.Tests.Fixtures;
 using MiniLcm;
+using MiniLcm.Models;
 using SystemTextJsonPatch;
 
 namespace FwLiteProjectSync.Tests;
@@ -88,13 +89,9 @@ public async Task UpdatingAnEntryInEachProjectSyncsAcrossBoth()
         await fwdataApi.CreateWritingSystem(WritingSystemType.Vernacular, new WritingSystem() { Id = new WritingSystemId("fr"), Name = "French", Abbreviation = "fr", Font = "Arial" });
         await _syncService.Sync(crdtApi, fwdataApi);
 
-        var jsonPatchDocument = new JsonPatchDocument<Entry>();
-        jsonPatchDocument.Replace(entry => entry.LexemeForm["es"], "Manzana");
-        await crdtApi.UpdateEntry(_testEntry.Id, new JsonPatchUpdateInput<Entry>(jsonPatchDocument));
+        await crdtApi.UpdateEntry(_testEntry.Id, new UpdateObjectInput<Entry>().Set(entry => entry.LexemeForm["es"],"Manzana"));
 
-        var fwdataPatch = new JsonPatchDocument<Entry>();
-        fwdataPatch.Replace(entry => entry.LexemeForm["fr"], "Pomme");
-        await fwdataApi.UpdateEntry(_testEntry.Id, new JsonPatchUpdateInput<Entry>(fwdataPatch));
+        await fwdataApi.UpdateEntry(_testEntry.Id, new UpdateObjectInput<Entry>().Set(entry => entry.LexemeForm["fr"], "Pomme"));
         var results = await _syncService.Sync(crdtApi, fwdataApi);
         results.CrdtChanges.Should().Be(1);
         results.FwdataChanges.Should().Be(1);

backend/FwLite/FwLiteProjectSync.Tests/UpdateDiffTests.cs

@@ -1,5 +1,5 @@
 using FwLiteProjectSync.Tests.Fixtures;
-using MiniLcm;
+using MiniLcm.Models;
 using Soenneker.Utils.AutoBogus;
 using Soenneker.Utils.AutoBogus.Config;
 

backend/FwLite/FwLiteProjectSync/CrdtFwdataProjectSyncService.cs

@@ -4,6 +4,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MiniLcm;
+using MiniLcm.Models;
 using SystemTextJsonPatch;
 using SystemTextJsonPatch.Operations;
 
@@ -13,7 +14,7 @@ public class CrdtFwdataProjectSyncService(IOptions<LcmCrdtConfig> lcmCrdtConfig,
 {
     public record SyncResult(int CrdtChanges, int FwdataChanges);
 
-    public async Task<SyncResult> Sync(ILexboxApi crdtApi, FwDataMiniLcmApi fwdataApi, bool dryRun = false)
+    public async Task<SyncResult> Sync(IMiniLcmApi crdtApi, FwDataMiniLcmApi fwdataApi, bool dryRun = false)
     {
         var projectSnapshot = await GetProjectSnapshot(fwdataApi.Project.Name);
         SyncResult result = await Sync(crdtApi, fwdataApi, dryRun, fwdataApi.EntryCount, projectSnapshot);
@@ -26,7 +27,7 @@ await SaveProjectSnapshot(fwdataApi.Project.Name,
         return result;
     }
 
-    private async Task<SyncResult> Sync(ILexboxApi crdtApi, ILexboxApi fwdataApi, bool dryRun, int entryCount, ProjectSnapshot? projectSnapshot)
+    private async Task<SyncResult> Sync(IMiniLcmApi crdtApi, IMiniLcmApi fwdataApi, bool dryRun, int entryCount, ProjectSnapshot? projectSnapshot)
     {
         if (dryRun)
         {
@@ -53,7 +54,7 @@ private async Task<SyncResult> Sync(ILexboxApi crdtApi, ILexboxApi fwdataApi, bo
         return new SyncResult(crdtChanges, fwdataChanges);
     }
 
-    private void LogDryRun(ILexboxApi api, string type)
+    private void LogDryRun(IMiniLcmApi api, string type)
     {
         if (api is not DryRunMiniLcmApi dryRunApi) return;
         foreach (var dryRunRecord in dryRunApi.DryRunRecords)
@@ -83,7 +84,7 @@ private async Task SaveProjectSnapshot(string projectName, ProjectSnapshot proje
 
     private async Task<int> EntrySync(Entry[] currentEntries,
         Entry[] previousEntries,
-        ILexboxApi api)
+        IMiniLcmApi api)
     {
         return await DiffCollection(api,
             previousEntries,
@@ -110,7 +111,7 @@ private async Task<int> EntrySync(Entry[] currentEntries,
     private async Task<int> SenseSync(Guid entryId,
         IList<Sense> currentSenses,
         IList<Sense> previousSenses,
-        ILexboxApi api)
+        IMiniLcmApi api)
     {
         return await DiffCollection(api,
             previousSenses,
@@ -142,7 +143,7 @@ private async Task<int> ExampleSentenceSync(Guid entryId,
         Guid senseId,
         IList<ExampleSentence> currentExampleSentences,
         IList<ExampleSentence> previousExampleSentences,
-        ILexboxApi api)
+        IMiniLcmApi api)
     {
         return await DiffCollection(api,
             previousExampleSentences,
@@ -182,7 +183,7 @@ private async Task<int> ExampleSentenceSync(Guid entryId,
             previousEntry.LiteralMeaning,
             currentEntry.LiteralMeaning));
         if (patchDocument.Operations.Count == 0) return null;
-        return new JsonPatchUpdateInput<Entry>(patchDocument);
+        return new UpdateObjectInput<Entry>(patchDocument);
     }
 
     public static async Task<UpdateObjectInput<Sense>?> SenseDiffToUpdate(Sense previousSense, Sense currentSense)
@@ -223,7 +224,7 @@ await DiffCollection(null!,
                 return Task.FromResult(0);
             });
         if (patchDocument.Operations.Count == 0) return null;
-        return new JsonPatchUpdateInput<Sense>(patchDocument);
+        return new UpdateObjectInput<Sense>(patchDocument);
     }
 
     public static UpdateObjectInput<ExampleSentence>? ExampleDiffToUpdate(ExampleSentence previousExampleSentence,
@@ -242,7 +243,7 @@ await DiffCollection(null!,
         }
 
         if (patchDocument.Operations.Count == 0) return null;
-        return new JsonPatchUpdateInput<ExampleSentence>(patchDocument);
+        return new UpdateObjectInput<ExampleSentence>(patchDocument);
     }
 
     public static IEnumerable<Operation<T>> GetMultiStringDiff<T>(string path, MultiString previous, MultiString current)
@@ -271,12 +272,12 @@ public static IEnumerable<Operation<T>> GetMultiStringDiff<T>(string path, Multi
     }
 
     private static async Task<int> DiffCollection<T>(
-        ILexboxApi api,
+        IMiniLcmApi api,
         IList<T> previous,
         IList<T> current,
-        Func<ILexboxApi, T, Task<int>> add,
-        Func<ILexboxApi, T, Task<int>> remove,
-        Func<ILexboxApi, T, T, Task<int>> replace) where T : IObjectWithId
+        Func<IMiniLcmApi, T, Task<int>> add,
+        Func<IMiniLcmApi, T, Task<int>> remove,
+        Func<IMiniLcmApi, T, T, Task<int>> replace) where T : IObjectWithId
     {
         var changes = 0;
         var currentEntriesDict = current.ToDictionary(entry => entry.Id);

backend/FwLite/FwLiteProjectSync/DryRunMiniLcmApi.cs

@@ -1,8 +1,9 @@
 using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwLiteProjectSync;
 
-public class DryRunMiniLcmApi(ILexboxApi api) : ILexboxApi
+public class DryRunMiniLcmApi(IMiniLcmApi api) : IMiniLcmApi
 {
     public List<DryRunRecord> DryRunRecords { get; } = [];
 
@@ -136,9 +137,4 @@ public Task DeleteExampleSentence(Guid entryId, Guid senseId, Guid exampleSenten
         DryRunRecords.Add(new DryRunRecord(nameof(DeleteExampleSentence), $"Delete example sentence {exampleSentenceId}"));
         return Task.CompletedTask;
     }
-
-    public UpdateBuilder<T> CreateUpdateBuilder<T>() where T : class
-    {
-        return api.CreateUpdateBuilder<T>();
-    }
 }

backend/FwLite/FwLiteProjectSync/MiniLcmImport.cs

@@ -1,12 +1,13 @@
 using LcmCrdt;
 using Microsoft.Extensions.Logging;
 using MiniLcm;
+using MiniLcm.Models;
 
 namespace FwLiteProjectSync;
 
 public class MiniLcmImport(ILogger<MiniLcmImport> logger)
 {
-    public async Task ImportProject(ILexboxApi importTo, ILexboxApi importFrom, int entryCount)
+    public async Task ImportProject(IMiniLcmApi importTo, IMiniLcmApi importFrom, int entryCount)
     {
         var writingSystems = await importFrom.GetWritingSystems();
         foreach (var ws in writingSystems.Analysis)
@@ -30,7 +31,7 @@ public async Task ImportProject(ILexboxApi importTo, ILexboxApi importFrom, int
 
         var semanticDomains = importFrom.GetSemanticDomains();
         var entries = importFrom.GetEntries(new QueryOptions(Count: 100_000, Offset: 0));
-        if (importTo is CrdtLexboxApi crdtLexboxApi)
+        if (importTo is CrdtMiniLcmApi crdtLexboxApi)
         {
             logger.LogInformation("Importing semantic domains");
             await crdtLexboxApi.BulkImportSemanticDomains(semanticDomains.ToBlockingEnumerable());

backend/FwLite/FwLiteProjectSync/Program.cs

@@ -58,7 +58,7 @@
         await services.GetRequiredService<CurrentProjectService>().PopulateProjectDataCache();
         var syncService = services.GetRequiredService<CrdtFwdataProjectSyncService>();
 
-        var result = await syncService.Sync(services.GetRequiredService<ILexboxApi>(), fwdataApi, dryRun);
+        var result = await syncService.Sync(services.GetRequiredService<IMiniLcmApi>(), fwdataApi, dryRun);
         logger.LogInformation("Sync result, CrdtChanges: {CrdtChanges}, FwdataChanges: {FwdataChanges}", result.CrdtChanges, result.FwdataChanges);
     },
     crdtOption,