Skip to content

Commit

Permalink
Allow sdk packages (dart-lang#7609)
Browse files Browse the repository at this point in the history
* Allow SDK dependencies

* tests for missing dependencies and SDK-dependencies
  • Loading branch information
jonasfj authored Apr 5, 2024
1 parent 880fba5 commit 19ded2e
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 4 deletions.
16 changes: 12 additions & 4 deletions app/lib/package/backend.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import 'package:pub_dev/shared/versions.dart';
import 'package:pub_dev/task/backend.dart';
import 'package:pub_package_reader/pub_package_reader.dart';
import 'package:pub_semver/pub_semver.dart';
import 'package:pubspec_parse/pubspec_parse.dart' as pubspec_parse;

import '../account/agent.dart';
import '../account/backend.dart';
Expand Down Expand Up @@ -940,10 +941,17 @@ class PackageBackend {
}

// check existences of referenced packages
final dependencies = <String>{
...pubspec.dependencies.keys,
};
for (final name in dependencies) {
for (final MapEntry(key: name, :value) in pubspec.dependencies.entries) {
if (value is! pubspec_parse.HostedDependency) {
// We disallow git/path dependencies elsewhere, but for the purpose
// of checking of the dependency exists we can skip them.
continue;
}
if (value.hosted?.url != null) {
// we disallow hosted dependencies with a URL elsewhere, but for the
// purpose of checking if the dependency exists, we skip them.
continue;
}
if (isSoftRemoved(name)) {
continue;
}
Expand Down
26 changes: 26 additions & 0 deletions app/test/package/upload_test.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1049,6 +1049,32 @@ void main() {
);
});

testWithProfile('has dependency does not exist', fn: () async {
final tarball = await packageArchiveBytes(
pubspecContent:
generatePubspecYaml('xyz', '1.0.0') + ' abc: ^1.0.0\n');
final rs = createPubApiClient(authToken: adminClientToken)
.uploadPackageBytes(tarball);
await expectApiException(
rs,
status: 400,
code: 'PackageRejected',
message: 'Dependency `abc` does not exist.',
);
});

testWithProfile('has SDK-dependency', fn: () async {
final tarball = await packageArchiveBytes(
pubspecContent: generatePubspecYaml('xyz', '1.2.3') +
' my_sdk_dep:\n'
' sdk: dart\n');
final message = await createPubApiClient(authToken: adminClientToken)
.uploadPackageBytes(tarball);
expect(message.success.message, contains('Successfully uploaded'));
expect(message.success.message, contains('xyz'));
expect(message.success.message, contains('1.2.3'));
});

testWithProfile('has git dependency', fn: () async {
final tarball = await packageArchiveBytes(
pubspecContent: generatePubspecYaml('xyz', '1.0.0') +
Expand Down

0 comments on commit 19ded2e

Please sign in to comment.