From 20cd9ca5b05e5a98533053e790f2d3c3efa80c9f Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Mon, 19 May 2025 12:16:25 +0200 Subject: [PATCH 1/3] Remove the SDK version from SDK hits and index. --- app/lib/frontend/templates/views/pkg/package_list.dart | 7 ++----- app/lib/search/sdk_mem_index.dart | 7 ------- app/lib/search/search_service.dart | 2 -- app/lib/search/search_service.g.dart | 2 -- app/test/frontend/templates_test.dart | 1 - app/test/search/result_combiner_test.dart | 1 - app/test/search/sdk_mem_index_test.dart | 1 - 7 files changed, 2 insertions(+), 19 deletions(-) diff --git a/app/lib/frontend/templates/views/pkg/package_list.dart b/app/lib/frontend/templates/views/pkg/package_list.dart index 95b97754e..e3e5cd070 100644 --- a/app/lib/frontend/templates/views/pkg/package_list.dart +++ b/app/lib/frontend/templates/views/pkg/package_list.dart @@ -47,10 +47,6 @@ d.Node listOfPackagesNode({ d.Node _sdkLibraryItem(SdkLibraryHit hit) { final sdkDict = getSdkDict(hit.sdk!); - final metadataText = [ - if (hit.version != null) 'v ${hit.version}', - sdkDict.libraryTypeLabel, - ].join(' • '); return _item( url: hit.url!, @@ -60,7 +56,8 @@ d.Node _sdkLibraryItem(SdkLibraryHit hit) { labeledScoresNode: null, description: hit.description ?? '', metadataNode: d.fragment([ - d.span(classes: ['packages-metadata-block'], text: metadataText), + d.span( + classes: ['packages-metadata-block'], text: sdkDict.libraryTypeLabel), coreLibraryBadgeNode, nullSafeBadgeNode(), ]), diff --git a/app/lib/search/sdk_mem_index.dart b/app/lib/search/sdk_mem_index.dart index b27e0c7ff..bfd390897 100644 --- a/app/lib/search/sdk_mem_index.dart +++ b/app/lib/search/sdk_mem_index.dart @@ -10,7 +10,6 @@ import 'package:pana/src/dartdoc/dartdoc_index.dart'; import 'package:path/path.dart' as p; import 'package:pub_dev/search/flutter_sdk_mem_index.dart'; -import '../shared/versions.dart'; import 'search_service.dart'; import 'token_index.dart'; @@ -34,7 +33,6 @@ const _defaultApiPageDirWeights = { /// In-memory index for SDK library search queries. class SdkMemIndex { final String _sdk; - final String? _version; final Uri _baseUri; final _tokensPerLibrary = >{}; final _baseUriPerLibrary = {}; @@ -43,13 +41,11 @@ class SdkMemIndex { SdkMemIndex({ required String sdk, - required String? version, required Uri baseUri, required DartdocIndex index, Set? allowedLibraries, Map? apiPageDirWeights, }) : _sdk = sdk, - _version = version, _baseUri = baseUri, _apiPageDirWeights = apiPageDirWeights ?? _defaultApiPageDirWeights { _addDartdocIndex(index, allowedLibraries); @@ -58,7 +54,6 @@ class SdkMemIndex { static SdkMemIndex dart({required DartdocIndex index}) { return SdkMemIndex( sdk: 'dart', - version: runtimeSdkVersion, baseUri: Uri.parse('https://api.dart.dev/stable/latest/'), index: index, ); @@ -67,7 +62,6 @@ class SdkMemIndex { factory SdkMemIndex.flutter({required DartdocIndex index}) { return SdkMemIndex( sdk: 'flutter', - version: null, baseUri: Uri.parse('https://api.flutter.dev/flutter/'), index: index, allowedLibraries: flutterSdkAllowedLibraries, @@ -159,7 +153,6 @@ class SdkMemIndex { .where((h) => h.score >= minScore) .map((hit) => SdkLibraryHit( sdk: _sdk, - version: _version, library: hit.library, description: _descriptionPerLibrary[hit.library], url: _baseUriPerLibrary[hit.library] ?? _baseUri.toString(), diff --git a/app/lib/search/search_service.dart b/app/lib/search/search_service.dart index b19df49c7..13bfaecab 100644 --- a/app/lib/search/search_service.dart +++ b/app/lib/search/search_service.dart @@ -427,7 +427,6 @@ class PackageSearchResult { @JsonSerializable(includeIfNull: false, explicitToJson: true) class SdkLibraryHit { final String? sdk; - final String? version; final String? library; final String? description; final String? url; @@ -436,7 +435,6 @@ class SdkLibraryHit { SdkLibraryHit({ required this.sdk, - required this.version, required this.library, required this.description, required this.url, diff --git a/app/lib/search/search_service.g.dart b/app/lib/search/search_service.g.dart index a0c62103f..9ebddeace 100644 --- a/app/lib/search/search_service.g.dart +++ b/app/lib/search/search_service.g.dart @@ -109,7 +109,6 @@ Map _$PackageSearchResultToJson( SdkLibraryHit _$SdkLibraryHitFromJson(Map json) => SdkLibraryHit( sdk: json['sdk'] as String?, - version: json['version'] as String?, library: json['library'] as String?, description: json['description'] as String?, url: json['url'] as String?, @@ -122,7 +121,6 @@ SdkLibraryHit _$SdkLibraryHitFromJson(Map json) => Map _$SdkLibraryHitToJson(SdkLibraryHit instance) => { if (instance.sdk case final value?) 'sdk': value, - if (instance.version case final value?) 'version': value, if (instance.library case final value?) 'library': value, if (instance.description case final value?) 'description': value, if (instance.url case final value?) 'url': value, diff --git a/app/test/frontend/templates_test.dart b/app/test/frontend/templates_test.dart index d37d9bc02..ea8301fb3 100644 --- a/app/test/frontend/templates_test.dart +++ b/app/test/frontend/templates_test.dart @@ -469,7 +469,6 @@ void main() { sdkLibraryHits: [ SdkLibraryHit( sdk: 'dart', - version: '2.14.0', library: 'dart:core', description: 'core description', url: 'https://api.dart.dev/library-page.html', diff --git a/app/test/search/result_combiner_test.dart b/app/test/search/result_combiner_test.dart index 0b95d5995..80fb886ce 100644 --- a/app/test/search/result_combiner_test.dart +++ b/app/test/search/result_combiner_test.dart @@ -32,7 +32,6 @@ void main() { primaryIndex: primaryIndex, dartSdkMemIndex: SdkMemIndex( sdk: 'dart', - version: runtimeSdkVersion, baseUri: Uri.parse('https://api.dart.dev/stable/$runtimeSdkVersion/'), index: DartdocIndex.fromJsonList([ { diff --git a/app/test/search/sdk_mem_index_test.dart b/app/test/search/sdk_mem_index_test.dart index 7182b508c..891b69aa8 100644 --- a/app/test/search/sdk_mem_index_test.dart +++ b/app/test/search/sdk_mem_index_test.dart @@ -14,7 +14,6 @@ void main() { setUpAll(() async { index = SdkMemIndex( sdk: 'dart', - version: '', baseUri: Uri.parse('https://api.dart.dev/x/'), index: DartdocIndex.fromJsonList([ { From 06c4795b1c0a4d7d900bfb8922036d240ad1b147 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Mon, 19 May 2025 12:37:14 +0200 Subject: [PATCH 2/3] fix tests --- app/test/search/result_combiner_test.dart | 1 - app/test/search/sdk_mem_index_test.dart | 3 --- 2 files changed, 4 deletions(-) diff --git a/app/test/search/result_combiner_test.dart b/app/test/search/result_combiner_test.dart index 80fb886ce..fd332ac3e 100644 --- a/app/test/search/result_combiner_test.dart +++ b/app/test/search/result_combiner_test.dart @@ -110,7 +110,6 @@ void main() { 'sdkLibraryHits': [ { 'sdk': 'dart', - 'version': isNotEmpty, 'library': 'dart:core', 'url': contains('dart-core-library.html'), 'score': closeTo(0.98, 0.01), diff --git a/app/test/search/sdk_mem_index_test.dart b/app/test/search/sdk_mem_index_test.dart index 891b69aa8..b6f2f9d20 100644 --- a/app/test/search/sdk_mem_index_test.dart +++ b/app/test/search/sdk_mem_index_test.dart @@ -90,7 +90,6 @@ void main() { [ { 'sdk': 'dart', - 'version': '', 'library': 'dart:async', 'description': 'async description', 'url': 'https://api.dart.dev/x/dart-async/dart-async-library.html', @@ -123,7 +122,6 @@ void main() { [ { 'sdk': 'dart', - 'version': '', 'library': 'dart:async', 'description': 'async description', 'url': 'https://api.dart.dev/x/dart-async/dart-async-library.html', @@ -147,7 +145,6 @@ void main() { [ { 'sdk': 'dart', - 'version': '', 'library': 'dart:async', 'description': 'async description', 'url': 'https://api.dart.dev/x/dart-async/dart-async-library.html', From 9e475dc36b4d284731fb1d7f05c4e591365ea5c4 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Mon, 19 May 2025 12:49:29 +0200 Subject: [PATCH 3/3] fix template test --- app/test/frontend/golden/pkg_index_page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/test/frontend/golden/pkg_index_page.html b/app/test/frontend/golden/pkg_index_page.html index 670d5a12b..be4a3a622 100644 --- a/app/test/frontend/golden/pkg_index_page.html +++ b/app/test/frontend/golden/pkg_index_page.html @@ -443,7 +443,7 @@

core description