Skip to content

Merge sdk and baseUri into the SDK index's _Library object. #8775

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 20, 2025
Merged

Merge sdk and baseUri into the SDK index's _Library object. #8775

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c4c3704
Merge sdk and baseUri into the SDK index's _Library object.
isoos May 20, 2025
09a1d93
Fix base Uri issue.
isoos May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 18 additions & 14 deletions app/lib/search/sdk_mem_index.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ const _defaultApiPageDirWeights = {

/// In-memory index for SDK library search queries.
class SdkMemIndex {
final String _sdk;
final Uri _baseUri;
final _libraries = <String, _Library>{};
final Map<String, double> _apiPageDirWeights;

Expand All @@ -43,10 +41,8 @@ class SdkMemIndex {
required DartdocIndex index,
Set<String>? allowedLibraries,
Map<String, double>? apiPageDirWeights,
}) : _sdk = sdk,
_baseUri = baseUri,
_apiPageDirWeights = apiPageDirWeights ?? _defaultApiPageDirWeights {
_addDartdocIndex(index, allowedLibraries);
}) : _apiPageDirWeights = apiPageDirWeights ?? _defaultApiPageDirWeights {
_addDartdocIndex(sdk, baseUri, index, allowedLibraries);
}

static SdkMemIndex dart({required DartdocIndex index}) {
Expand All @@ -72,11 +68,13 @@ class SdkMemIndex {
Uri.parse('https://api.flutter.dev/flutter/index.json');

void _addDartdocIndex(
String sdk,
Uri baseUri,
DartdocIndex index,
Set<String>? allowedLibraries,
) {
final textsPerLibrary = <String, Map<String, String>>{};
final baseUrls = <String, String>{};
final baseUris = <String, Uri>{};
final descriptions = <String, String>{};

for (final f in index.entries) {
Expand All @@ -89,7 +87,7 @@ class SdkMemIndex {
continue;
}
if (f.isLibrary) {
baseUrls[library] = _baseUri.resolve(f.href!).toString();
baseUris[library] = baseUri.resolve(f.href!);

final desc = f.desc?.replaceAll(RegExp(r'\s+'), ' ').trim();
if (desc != null && desc.isNotEmpty) {
Expand All @@ -105,8 +103,10 @@ class SdkMemIndex {
}
for (final e in textsPerLibrary.entries) {
_libraries[e.key] = _Library(
sdk: sdk,
sdkBaseUri: baseUri,
name: e.key,
baseUrl: baseUrls[e.key],
libraryUrl: (baseUris[e.key] ?? baseUri).toString(),
description: descriptions[e.key],
tokenIndex: TokenIndex.fromMap(e.value),
);
Expand Down Expand Up @@ -156,16 +156,16 @@ class SdkMemIndex {
.take(limit)
.where((h) => h.score >= minScore)
.map((hit) => SdkLibraryHit(
sdk: _sdk,
sdk: hit.library.sdk,
library: hit.library.name,
description: hit.library.description,
url: hit.library.baseUrl ?? _baseUri.toString(),
url: hit.library.libraryUrl,
score: hit.score,
apiPages: hit.top.entries
.map(
(e) => ApiPageRef(
path: e.key,
url: _baseUri.resolve(e.key).toString(),
url: hit.library.sdkBaseUri.resolve(e.key).toString(),
),
)
.toList(),
Expand All @@ -188,14 +188,18 @@ class _Hit {
}

class _Library {
final String sdk;
final Uri sdkBaseUri;
final String name;
final String? baseUrl;
final String libraryUrl;
final String? description;
final TokenIndex<String> tokenIndex;

_Library({
required this.sdk,
required this.sdkBaseUri,
required this.name,
required this.baseUrl,
required this.libraryUrl,
required this.description,
required this.tokenIndex,
});
Expand Down