word_search: include data for cross references

lib/models/word_search/word_search_xref_entry.dart

@@ -1,3 +1,5 @@
+import 'package:jadb/models/word_search/word_search_result.dart';
+
 /// A cross-reference entry from one word-result to another entry.
 class WordSearchXrefEntry {
   /// The ID of the entry that this entry cross-references to.
@@ -13,11 +15,15 @@ class WordSearchXrefEntry {
   /// database (and hence might be incorrect).
   final bool ambiguous;
 
+  /// The result of the cross-reference, may or may not be included in the query.
+  final WordSearchResult? xrefResult;
+
   const WordSearchXrefEntry({
     required this.entryId,
     required this.ambiguous,
     required this.baseWord,
     required this.furigana,
+    required this.xrefResult,
   });
 
   Map<String, dynamic> toJson() => {
@@ -25,6 +31,7 @@ class WordSearchXrefEntry {
     'ambiguous': ambiguous,
     'baseWord': baseWord,
     'furigana': furigana,
+    'xrefResult': xrefResult?.toJson(),
   };
 
   factory WordSearchXrefEntry.fromJson(Map<String, dynamic> json) =>
@@ -33,5 +40,6 @@ class WordSearchXrefEntry {
         ambiguous: json['ambiguous'] as bool,
         baseWord: json['baseWord'] as String,
         furigana: json['furigana'] as String?,
+        xrefResult: null,
       );
 }

lib/search/word_search/data_query.dart

@@ -1,6 +1,5 @@
 import 'package:jadb/table_names/jmdict.dart';
 import 'package:jadb/table_names/tanos_jlpt.dart';
-import 'package:jadb/util/sqlite_utils.dart';
 import 'package:sqflite_common/sqflite.dart';
 
 class LinearWordQueryData {
@@ -25,6 +24,9 @@ class LinearWordQueryData {
   final List<Map<String, Object?>> readingElementRestrictions;
   final List<Map<String, Object?>> kanjiElementInfos;
 
+  final LinearWordQueryData? senseAntonymData;
+  final LinearWordQueryData? senseSeeAlsoData;
+
   const LinearWordQueryData({
     required this.senses,
     required this.readingElements,
@@ -46,13 +48,16 @@ class LinearWordQueryData {
     required this.readingElementInfos,
     required this.readingElementRestrictions,
     required this.kanjiElementInfos,
+    required this.senseAntonymData,
+    required this.senseSeeAlsoData,
   });
 }
 
 Future<LinearWordQueryData> fetchLinearWordQueryData(
   DatabaseExecutor connection,
-  List<int> entryIds,
-) async {
+  List<int> entryIds, {
+  bool fetchXrefData = true,
+}) async {
   late final List<Map<String, Object?>> senses;
   final Future<List<Map<String, Object?>>> senses_query = connection.query(
     JMdictTableNames.sense,
@@ -266,8 +271,35 @@ Future<LinearWordQueryData> fetchLinearWordQueryData(
         whereArgs: kanjiIds,
       );
 
+  // Xref data queries
   await Future.wait([
     senseAntonyms_query.then((value) => senseAntonyms = value),
+    senseSeeAlsos_query.then((value) => senseSeeAlsos = value),
+  ]);
+
+  late final LinearWordQueryData? senseAntonymData;
+  final Future<LinearWordQueryData?> senseAntonymData_query =
+      fetchXrefData
+      ? fetchLinearWordQueryData(
+          connection,
+          senseAntonyms
+              .map((antonym) => antonym['xrefEntryId'] as int)
+              .toList(),
+          fetchXrefData: false,
+        )
+      : Future.value(null);
+
+  late final LinearWordQueryData? senseSeeAlsoData;
+  final Future<LinearWordQueryData?> senseSeeAlsoData_query =
+      fetchXrefData
+      ? fetchLinearWordQueryData(
+          connection,
+          senseSeeAlsos.map((seeAlso) => seeAlso['xrefEntryId'] as int).toList(),
+          fetchXrefData: false,
+        )
+      : Future.value(null);
+
+  await Future.wait([
     senseDialects_query.then((value) => senseDialects = value),
     senseFields_query.then((value) => senseFields = value),
     senseGlossaries_query.then((value) => senseGlossaries = value),
@@ -281,13 +313,14 @@ Future<LinearWordQueryData> fetchLinearWordQueryData(
     senseRestrictedToReadings_query.then(
       (value) => senseRestrictedToReadings = value,
     ),
-    senseSeeAlsos_query.then((value) => senseSeeAlsos = value),
     exampleSentences_query.then((value) => exampleSentences = value),
     readingElementInfos_query.then((value) => readingElementInfos = value),
     readingElementRestrictions_query.then(
       (value) => readingElementRestrictions = value,
     ),
     kanjiElementInfos_query.then((value) => kanjiElementInfos = value),
+    senseAntonymData_query.then((value) => senseAntonymData = value),
+    senseSeeAlsoData_query.then((value) => senseSeeAlsoData = value),
   ]);
 
   return LinearWordQueryData(
@@ -311,5 +344,7 @@ Future<LinearWordQueryData> fetchLinearWordQueryData(
     readingElementInfos: readingElementInfos,
     readingElementRestrictions: readingElementRestrictions,
     kanjiElementInfos: kanjiElementInfos,
+    senseAntonymData: senseAntonymData,
+    senseSeeAlsoData: senseSeeAlsoData,
   );
 }

lib/search/word_search/regrouping.dart

@@ -12,47 +12,32 @@ import 'package:jadb/models/word_search/word_search_sense.dart';
 import 'package:jadb/models/word_search/word_search_sense_language_source.dart';
 import 'package:jadb/models/word_search/word_search_sources.dart';
 import 'package:jadb/models/word_search/word_search_xref_entry.dart';
+import 'package:jadb/search/word_search/data_query.dart';
 import 'package:jadb/search/word_search/entry_id_query.dart';
 
 List<WordSearchResult> regroupWordSearchResults({
   required List<ScoredEntryId> entryIds,
-  required List<Map<String, Object?>> readingElements,
-  required List<Map<String, Object?>> kanjiElements,
-  required List<Map<String, Object?>> jlptTags,
-  required List<Map<String, Object?>> commonEntries,
-  required List<Map<String, Object?>> senses,
-  required List<Map<String, Object?>> senseAntonyms,
-  required List<Map<String, Object?>> senseDialects,
-  required List<Map<String, Object?>> senseFields,
-  required List<Map<String, Object?>> senseGlossaries,
-  required List<Map<String, Object?>> senseInfos,
-  required List<Map<String, Object?>> senseLanguageSources,
-  required List<Map<String, Object?>> senseMiscs,
-  required List<Map<String, Object?>> sensePOSs,
-  required List<Map<String, Object?>> senseRestrictedToKanjis,
-  required List<Map<String, Object?>> senseRestrictedToReadings,
-  required List<Map<String, Object?>> senseSeeAlsos,
-  required List<Map<String, Object?>> exampleSentences,
-  required List<Map<String, Object?>> readingElementInfos,
-  required List<Map<String, Object?>> readingElementRestrictions,
-  required List<Map<String, Object?>> kanjiElementInfos,
+  required LinearWordQueryData linearWordQueryData,
 }) {
   final List<WordSearchResult> results = [];
 
-  final commonEntryIds = commonEntries
+  final commonEntryIds = linearWordQueryData.commonEntries
       .map((entry) => entry['entryId'] as int)
       .toSet();
 
   for (final scoredEntryId in entryIds) {
-    final List<Map<String, Object?>> entryReadingElements = readingElements
+    final List<Map<String, Object?>> entryReadingElements = linearWordQueryData
+        .readingElements
         .where((element) => element['entryId'] == scoredEntryId.entryId)
         .toList();
 
-    final List<Map<String, Object?>> entryKanjiElements = kanjiElements
+    final List<Map<String, Object?>> entryKanjiElements = linearWordQueryData
+        .kanjiElements
         .where((element) => element['entryId'] == scoredEntryId.entryId)
         .toList();
 
-    final List<Map<String, Object?>> entryJlptTags = jlptTags
+    final List<Map<String, Object?>> entryJlptTags = linearWordQueryData
+        .jlptTags
         .where((element) => element['entryId'] == scoredEntryId.entryId)
         .toList();
 
@@ -65,7 +50,7 @@ List<WordSearchResult> regroupWordSearchResults({
 
     final isCommon = commonEntryIds.contains(scoredEntryId.entryId);
 
-    final List<Map<String, Object?>> entrySenses = senses
+    final List<Map<String, Object?>> entrySenses = linearWordQueryData.senses
         .where((element) => element['entryId'] == scoredEntryId.entryId)
         .toList();
 
@@ -73,25 +58,28 @@ List<WordSearchResult> regroupWordSearchResults({
       entryId: scoredEntryId.entryId,
       readingElements: entryReadingElements,
       kanjiElements: entryKanjiElements,
-      readingElementInfos: readingElementInfos,
-      readingElementRestrictions: readingElementRestrictions,
-      kanjiElementInfos: kanjiElementInfos,
+      readingElementInfos: linearWordQueryData.readingElementInfos,
+      readingElementRestrictions:
+          linearWordQueryData.readingElementRestrictions,
+      kanjiElementInfos: linearWordQueryData.kanjiElementInfos,
     );
 
     final List<WordSearchSense> entrySensesGrouped = _regroup_senses(
       senses: entrySenses,
-      senseAntonyms: senseAntonyms,
-      senseDialects: senseDialects,
-      senseFields: senseFields,
-      senseGlossaries: senseGlossaries,
-      senseInfos: senseInfos,
-      senseLanguageSources: senseLanguageSources,
-      senseMiscs: senseMiscs,
-      sensePOSs: sensePOSs,
-      senseRestrictedToKanjis: senseRestrictedToKanjis,
-      senseRestrictedToReadings: senseRestrictedToReadings,
-      senseSeeAlsos: senseSeeAlsos,
-      exampleSentences: exampleSentences,
+      senseAntonyms: linearWordQueryData.senseAntonyms,
+      senseDialects: linearWordQueryData.senseDialects,
+      senseFields: linearWordQueryData.senseFields,
+      senseGlossaries: linearWordQueryData.senseGlossaries,
+      senseInfos: linearWordQueryData.senseInfos,
+      senseLanguageSources: linearWordQueryData.senseLanguageSources,
+      senseMiscs: linearWordQueryData.senseMiscs,
+      sensePOSs: linearWordQueryData.sensePOSs,
+      senseRestrictedToKanjis: linearWordQueryData.senseRestrictedToKanjis,
+      senseRestrictedToReadings: linearWordQueryData.senseRestrictedToReadings,
+      senseSeeAlsos: linearWordQueryData.senseSeeAlsos,
+      exampleSentences: linearWordQueryData.exampleSentences,
+      senseSeeAlsosXrefData: linearWordQueryData.senseSeeAlsoData,
+      senseAntonymsXrefData: linearWordQueryData.senseAntonymData,
     );
 
     results.add(
@@ -221,6 +209,8 @@ List<WordSearchSense> _regroup_senses({
   required List<Map<String, Object?>> senseRestrictedToReadings,
   required List<Map<String, Object?>> senseSeeAlsos,
   required List<Map<String, Object?>> exampleSentences,
+  required LinearWordQueryData? senseSeeAlsosXrefData,
+  required LinearWordQueryData? senseAntonymsXrefData,
 }) {
   final groupedSenseAntonyms = senseAntonyms.groupListsBy(
     (element) => element['senseId'] as int,
@@ -272,31 +262,58 @@ List<WordSearchSense> _regroup_senses({
         groupedSenseRestrictedToReadings[senseId] ?? [];
     final seeAlsos = groupedSenseSeeAlsos[senseId] ?? [];
 
+    final List<WordSearchResult> seeAlsosWordResults =
+        senseSeeAlsosXrefData != null
+        ? regroupWordSearchResults(
+            entryIds: seeAlsos
+                .map((e) => ScoredEntryId(e['xrefEntryId'] as int, 0))
+                .toList(),
+            linearWordQueryData: senseSeeAlsosXrefData,
+          )
+        : [];
+    final List<WordSearchResult> antonymsWordResults =
+        senseAntonymsXrefData != null
+        ? regroupWordSearchResults(
+            entryIds: antonyms
+                .map((e) => ScoredEntryId(e['xrefEntryId'] as int, 0))
+                .toList(),
+            linearWordQueryData: senseAntonymsXrefData,
+          )
+        : [];
+
     final resultSense = WordSearchSense(
       englishDefinitions: glossaries.map((e) => e['phrase'] as String).toList(),
       partsOfSpeech: pos
           .map((e) => JMdictPOS.fromId(e['pos'] as String))
           .toList(),
-      seeAlso: seeAlsos
-          .map(
-            (e) => WordSearchXrefEntry(
-              entryId: e['xrefEntryId'] as int,
-              baseWord: e['base'] as String,
-              furigana: e['furigana'] as String?,
-              ambiguous: e['ambiguous'] == 1,
-            ),
-          )
-          .toList(),
-      antonyms: antonyms
-          .map(
-            (e) => WordSearchXrefEntry(
-              entryId: e['xrefEntryId'] as int,
-              baseWord: e['base'] as String,
-              furigana: e['furigana'] as String?,
-              ambiguous: e['ambiguous'] == 1,
-            ),
-          )
-          .toList(),
+      seeAlso: seeAlsos.asMap().entries.map<WordSearchXrefEntry>((mapEntry) {
+        final i = mapEntry.key;
+        final e = mapEntry.value;
+
+        return WordSearchXrefEntry(
+          entryId: e['xrefEntryId'] as int,
+          baseWord: e['base'] as String,
+          furigana: e['furigana'] as String?,
+          ambiguous: e['ambiguous'] == 1,
+          xrefResult: seeAlsosWordResults.isNotEmpty
+              ? seeAlsosWordResults[i]
+              : null,
+        );
+      }).toList(),
+      antonyms: antonyms.asMap().entries.map<WordSearchXrefEntry>((mapEntry) {
+        final i = mapEntry.key;
+        final e = mapEntry.value;
+
+        return WordSearchXrefEntry(
+          entryId: e['xrefEntryId'] as int,
+          baseWord: e['base'] as String,
+          furigana: e['furigana'] as String?,
+          ambiguous: e['ambiguous'] == 1,
+          xrefResult: antonymsWordResults.isNotEmpty
+              ? antonymsWordResults[i]
+              : null,
+        );
+      }).toList(),
       restrictedToReading: restrictedToReadings
           .map((e) => e['reading'] as String)
           .toList(),

lib/search/word_search/word_search.dart

@@ -48,26 +48,7 @@ Future<List<WordSearchResult>?> searchWordWithDbConnection(
 
   final result = regroupWordSearchResults(
     entryIds: entryIds,
-    readingElements: linearWordQueryData.readingElements,
-    kanjiElements: linearWordQueryData.kanjiElements,
-    jlptTags: linearWordQueryData.jlptTags,
-    commonEntries: linearWordQueryData.commonEntries,
-    senses: linearWordQueryData.senses,
-    senseAntonyms: linearWordQueryData.senseAntonyms,
-    senseDialects: linearWordQueryData.senseDialects,
-    senseFields: linearWordQueryData.senseFields,
-    senseGlossaries: linearWordQueryData.senseGlossaries,
-    senseInfos: linearWordQueryData.senseInfos,
-    senseLanguageSources: linearWordQueryData.senseLanguageSources,
-    senseMiscs: linearWordQueryData.senseMiscs,
-    sensePOSs: linearWordQueryData.sensePOSs,
-    senseRestrictedToKanjis: linearWordQueryData.senseRestrictedToKanjis,
-    senseRestrictedToReadings: linearWordQueryData.senseRestrictedToReadings,
-    senseSeeAlsos: linearWordQueryData.senseSeeAlsos,
-    exampleSentences: linearWordQueryData.exampleSentences,
-    readingElementInfos: linearWordQueryData.readingElementInfos,
-    readingElementRestrictions: linearWordQueryData.readingElementRestrictions,
-    kanjiElementInfos: linearWordQueryData.kanjiElementInfos,
+    linearWordQueryData: linearWordQueryData,
   );
 
   return result;
@@ -115,26 +96,7 @@ Future<WordSearchResult?> getWordByIdWithDbConnection(
 
   final result = regroupWordSearchResults(
     entryIds: [ScoredEntryId(id, 0)],
-    readingElements: linearWordQueryData.readingElements,
-    kanjiElements: linearWordQueryData.kanjiElements,
-    jlptTags: linearWordQueryData.jlptTags,
-    commonEntries: linearWordQueryData.commonEntries,
-    senses: linearWordQueryData.senses,
-    senseAntonyms: linearWordQueryData.senseAntonyms,
-    senseDialects: linearWordQueryData.senseDialects,
-    senseFields: linearWordQueryData.senseFields,
-    senseGlossaries: linearWordQueryData.senseGlossaries,
-    senseInfos: linearWordQueryData.senseInfos,
-    senseLanguageSources: linearWordQueryData.senseLanguageSources,
-    senseMiscs: linearWordQueryData.senseMiscs,
-    sensePOSs: linearWordQueryData.sensePOSs,
-    senseRestrictedToKanjis: linearWordQueryData.senseRestrictedToKanjis,
-    senseRestrictedToReadings: linearWordQueryData.senseRestrictedToReadings,
-    senseSeeAlsos: linearWordQueryData.senseSeeAlsos,
-    exampleSentences: linearWordQueryData.exampleSentences,
-    readingElementInfos: linearWordQueryData.readingElementInfos,
-    readingElementRestrictions: linearWordQueryData.readingElementRestrictions,
-    kanjiElementInfos: linearWordQueryData.kanjiElementInfos,
+    linearWordQueryData: linearWordQueryData,
   );
 
   assert(
@@ -162,26 +124,7 @@ Future<Map<int, WordSearchResult>> getWordsByIdsWithDbConnection(
 
   final results = regroupWordSearchResults(
     entryIds: entryIds,
-    readingElements: linearWordQueryData.readingElements,
-    kanjiElements: linearWordQueryData.kanjiElements,
-    jlptTags: linearWordQueryData.jlptTags,
-    commonEntries: linearWordQueryData.commonEntries,
-    senses: linearWordQueryData.senses,
-    senseAntonyms: linearWordQueryData.senseAntonyms,
-    senseDialects: linearWordQueryData.senseDialects,
-    senseFields: linearWordQueryData.senseFields,
-    senseGlossaries: linearWordQueryData.senseGlossaries,
-    senseInfos: linearWordQueryData.senseInfos,
-    senseLanguageSources: linearWordQueryData.senseLanguageSources,
-    senseMiscs: linearWordQueryData.senseMiscs,
-    sensePOSs: linearWordQueryData.sensePOSs,
-    senseRestrictedToKanjis: linearWordQueryData.senseRestrictedToKanjis,
-    senseRestrictedToReadings: linearWordQueryData.senseRestrictedToReadings,
-    senseSeeAlsos: linearWordQueryData.senseSeeAlsos,
-    exampleSentences: linearWordQueryData.exampleSentences,
-    readingElementInfos: linearWordQueryData.readingElementInfos,
-    readingElementRestrictions: linearWordQueryData.readingElementRestrictions,
-    kanjiElementInfos: linearWordQueryData.kanjiElementInfos,
+    linearWordQueryData: linearWordQueryData,
   );
 
   return {for (var r in results) r.entryId: r};