Complex forms in miniLcm

LexBox.sln

@@ -47,6 +47,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FwLiteProjectSync", "backen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FwLiteProjectSync.Tests", "backend\FwLite\FwLiteProjectSync.Tests\FwLiteProjectSync.Tests.csproj", "{5352D1CC-14C5-4589-9389-731F55E4FFDF}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LcmDebugger", "backend\LfNext\LcmDebugger\LcmDebugger.csproj", "{5A9011D8-6EC1-4550-BDD7-AFF00DB2B921}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -127,6 +129,10 @@ Global
 		{5352D1CC-14C5-4589-9389-731F55E4FFDF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5352D1CC-14C5-4589-9389-731F55E4FFDF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5352D1CC-14C5-4589-9389-731F55E4FFDF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A9011D8-6EC1-4550-BDD7-AFF00DB2B921}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A9011D8-6EC1-4550-BDD7-AFF00DB2B921}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A9011D8-6EC1-4550-BDD7-AFF00DB2B921}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A9011D8-6EC1-4550-BDD7-AFF00DB2B921}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -144,6 +150,7 @@ Global
 		{9001FE0F-DBBF-4A78-9EB9-9B5042CF8A78} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
 		{2245BAB6-753A-48AE-B929-6D8C35CB9804} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
 		{5352D1CC-14C5-4589-9389-731F55E4FFDF} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
+		{5A9011D8-6EC1-4550-BDD7-AFF00DB2B921} = {7B6E21C4-5AF4-4505-B7D9-59A3886C5090}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {440AE83C-6DB0-4F18-B2C1-BCD33F0645B6}

backend/FwLite/FwDataMiniLcmBridge/Api/FwDataMiniLcmApi.cs

@@ -9,12 +9,13 @@
 using SIL.LCModel.Core.WritingSystems;
 using SIL.LCModel.DomainServices;
 using SIL.LCModel.Infrastructure;
+using EntryType = MiniLcm.EntryType;
 
 namespace FwDataMiniLcmBridge.Api;
 
 public class FwDataMiniLcmApi(Lazy<LcmCache> cacheLazy, bool onCloseSave, ILogger<FwDataMiniLcmApi> logger, FwDataProject project) : ILexboxApi, IDisposable
 {
-    private LcmCache Cache => cacheLazy.Value;
+    public LcmCache Cache => cacheLazy.Value;
     public FwDataProject Project { get; } = project;
     public Guid ProjectId => Cache.LangProject.Guid;
 
@@ -27,6 +28,7 @@
     private ILexExampleSentenceFactory LexExampleSentenceFactory => Cache.ServiceLocator.GetInstance<ILexExampleSentenceFactory>();
     private IMoMorphTypeRepository MorphTypeRepository => Cache.ServiceLocator.GetInstance<IMoMorphTypeRepository>();
     private IPartOfSpeechRepository PartOfSpeechRepository => Cache.ServiceLocator.GetInstance<IPartOfSpeechRepository>();
+    private ILexEntryTypeRepository LexEntryTypeRepository => Cache.ServiceLocator.GetInstance<ILexEntryTypeRepository>();
     private ICmSemanticDomainRepository SemanticDomainRepository => Cache.ServiceLocator.GetInstance<ICmSemanticDomainRepository>();
     private ICmTranslationFactory CmTranslationFactory => Cache.ServiceLocator.GetInstance<ICmTranslationFactory>();
     private ICmPossibilityRepository CmPossibilityRepository => Cache.ServiceLocator.GetInstance<ICmPossibilityRepository>();
@@ -167,7 +169,7 @@
         throw new NotImplementedException();
     }
 
     public async IAsyncEnumerable<PartOfSpeech> GetPartsOfSpeech()
     {
         foreach (var partOfSpeech in PartOfSpeechRepository.AllInstances().OrderBy(p => p.Name.BestAnalysisAlternative.Text))
         {
@@ -175,7 +177,7 @@
         }
     }
 
     public async Task CreatePartOfSpeech(PartOfSpeech partOfSpeech)
     {
         if (partOfSpeech.Id == default) partOfSpeech.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.Do("Create Part of Speech",
@@ -189,7 +191,7 @@
             });
     }
 
     public async IAsyncEnumerable<SemanticDomain> GetSemanticDomains()
     {
         foreach (var semanticDomain in SemanticDomainRepository.AllInstances().OrderBy(p => p.Abbreviation.UiString))
         {
@@ -202,7 +204,7 @@
         }
     }
 
     public async Task CreateSemanticDomain(SemanticDomain semanticDomain)
     {
         if (semanticDomain.Id == Guid.Empty) semanticDomain.Id = Guid.NewGuid();
         UndoableUnitOfWorkHelper.Do("Create Semantic Domain",
@@ -231,7 +233,51 @@
             LexemeForm = FromLcmMultiString(entry.LexemeFormOA.Form),
             CitationForm = FromLcmMultiString(entry.CitationForm),
             LiteralMeaning = FromLcmMultiString(entry.LiteralMeaning),
-            Senses = entry.AllSenses.Select(FromLexSense).ToList()
+            Senses = entry.AllSenses.Select(FromLexSense).ToList(),
+            ComplexForm = ToComplexForm(entry)
+        };
+    }
+
+    private ComplexForm? ToComplexForm(ILexEntry entry)
+    {
+        var complexEntryRef = entry.ComplexFormEntryRefs.SingleOrDefault();
+        if (complexEntryRef is null) return null;
+        return new ComplexForm
+        {
+            Id = complexEntryRef.Guid,
+            Components =
+            [
+                ..complexEntryRef.ComponentLexemesRS.Select(o => o switch
+                {
+                    ILexEntry e => ToEntryReference(e),
+                    ILexSense s => ToSenseReference(s),
+                    _ => throw new NotSupportedException($"object type {o.ClassName} not supported")
+                })
+            ],
+            Types =
+            [
+                ..complexEntryRef.ComplexEntryTypesRS.Select(t =>
+                    new EntryType() { Id = t.Guid, Name = FromLcmMultiString(t.Name), })
+            ]
+        };
+    }
+
+    private EntryReference ToEntryReference(ILexEntry entry)
+    {
+        return new EntryReference
+        {
+            EntryId = entry.Guid,
+            Headword = entry.HeadWord.Text
+        };
+    }
+
+    private EntryReference ToSenseReference(ILexSense sense)
+    {
+        return new EntryReference
+        {
+            EntryId = sense.Entry.Guid,
+            SenseId = sense.Guid,
+            Headword = sense.Entry.HeadWord.Text,
         };
     }
 
@@ -285,7 +331,7 @@
         return GetEntries(null, options);
     }
 
     public async IAsyncEnumerable<Entry> GetEntries(
         Func<ILexEntry, bool>? predicate, QueryOptions? options = null)
     {
         var entries = EntriesRepository.AllInstances();

backend/FwLite/MiniLcm/Entry.cs

@@ -12,6 +12,7 @@ public class Entry : IObjectWithId
     public virtual IList<Sense> Senses { get; set; } = [];
 
     public virtual MultiString Note { get; set; } = new();
+    public virtual ComplexForm? ComplexForm { get; set; }
 
     public bool MatchesQuery(string query) =>
         LexemeForm.SearchValue(query)
@@ -25,3 +26,23 @@ public string Headword()
         return word?.Trim() ?? "(Unknown)";
     }
 }
+
+public class EntryReference
+{
+    public required Guid EntryId { get; set; }
+    public Guid? SenseId { get; set; } = null;
+    public required string Headword { get; set; }
+}
+
+public class ComplexForm
+{
+    public IList<EntryReference> Components { get; set; } = [];
+    public IList<EntryType> Types { get; set; } = [];
+    public Guid Id { get; set; }
+}
+
+public class EntryType
+{
+    public required Guid Id { get; set; }
+    public required MultiString Name { get; set; }
+}

backend/LfNext/LcmDebugger/LcmDebugger.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\..\FwLite\FwDataMiniLcmBridge\FwDataMiniLcmBridge.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    </ItemGroup>
+
+</Project>

backend/LfNext/LcmDebugger/Program.cs

@@ -0,0 +1,15 @@
+// See https://aka.ms/new-console-template for more information
+
+using FwDataMiniLcmBridge;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+
+var builder = Host.CreateApplicationBuilder();
+builder.Services.AddFwDataBridge();
+
+var app = builder.Build();
+
+var fwDataFactory = app.Services.GetRequiredService<FwDataFactory>();
+var miniLcmApi = fwDataFactory.GetFwDataMiniLcmApi("fruit", false);
+await miniLcmApi.GetEntries().ToArrayAsync();
+var complexEntryTypesOa = miniLcmApi.Cache.LangProject.LexDbOA.ComplexEntryTypesOA;