-
Notifications
You must be signed in to change notification settings - Fork 83
[native_assets_cli] Prevent non src imports from src #2238
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.
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
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
pkgs/native_assets_cli/lib/src/avoid_import_outside_src_rule_test.dart
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| // Copyright (c) 2025, the Dart project authors. Please see the AUTHORS file | ||
| // for details. All rights reserved. Use of this source code is governed by a | ||
| // BSD-style license that can be found in the LICENSE file. | ||
|
|
||
| // expect_lint: avoid_import_outside_src | ||
| import '../native_assets_cli.dart'; | ||
|
|
||
| const x = Builder; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // Copyright (c) 2024, the Dart project authors. Please see the AUTHORS file | ||
| // for details. All rights reserved. Use of this source code is governed by a | ||
| // BSD-style license that can be found in the LICENSE file. | ||
|
|
||
| import 'dart:async'; | ||
| import 'dart:convert'; | ||
| import 'dart:io'; | ||
|
|
||
| import 'package:yaml/yaml.dart'; | ||
|
|
||
| import 'config.dart'; | ||
| import 'validation.dart'; | ||
|
|
||
| /// Validate a build hook; this will throw an exception on validation errors. | ||
| /// | ||
| /// This is intended to be used from tests, e.g.: | ||
| /// | ||
| /// ``` | ||
| /// test('test my build hook', () async { | ||
| /// await testCodeBuildHook( | ||
| /// ... | ||
| /// ); | ||
| /// }); | ||
| /// ``` | ||
| Future<void> testBuildHook({ | ||
| required void Function(BuildInputBuilder) extraInputSetup, | ||
| required FutureOr<void> Function(List<String> arguments) mainMethod, | ||
| required FutureOr<void> Function(BuildInput input, BuildOutput output) check, | ||
| bool? linkingEnabled, | ||
| }) async { | ||
| const keepTempKey = 'KEEP_TEMPORARY_DIRECTORIES'; | ||
|
|
||
| final tempDir = await Directory.systemTemp.createTemp(); | ||
|
|
||
| try { | ||
| // Deal with Windows temp folder aliases. | ||
| final tempUri = Directory( | ||
| await tempDir.resolveSymbolicLinks(), | ||
| ).uri.normalizePath(); | ||
| final outputDirectory = tempUri.resolve('output/'); | ||
| final outputDirectoryShared = tempUri.resolve('output_shared/'); | ||
| final outputFile = tempUri.resolve('output.json'); | ||
|
|
||
| await Directory.fromUri(outputDirectory).create(); | ||
| await Directory.fromUri(outputDirectoryShared).create(); | ||
|
|
||
| final inputBuilder = BuildInputBuilder(); | ||
| inputBuilder | ||
| ..setupShared( | ||
| packageRoot: Directory.current.uri, | ||
| packageName: _readPackageNameFromPubspec(), | ||
| outputFile: outputFile, | ||
| outputDirectoryShared: outputDirectoryShared, | ||
| ) | ||
| ..config.setupBuild(linkingEnabled: true); | ||
| extraInputSetup(inputBuilder); | ||
|
|
||
| final input = BuildInput(inputBuilder.json); | ||
|
|
||
| final inputUri = tempUri.resolve('input.json'); | ||
| _writeJsonTo(inputUri, input.json); | ||
| await mainMethod(['--config=${inputUri.toFilePath()}']); | ||
| final output = BuildOutput(_readJsonFrom(input.outputFile)); | ||
|
|
||
| // Test conformance of protocol invariants. | ||
| final validationErrors = await validateBuildOutput(input, output); | ||
| if (validationErrors.isNotEmpty) { | ||
| throw ValidationFailure( | ||
| 'encountered build output validation issues: $validationErrors', | ||
| ); | ||
| } | ||
|
|
||
| // Run user-defined tests. | ||
| await check(input, output); | ||
| } finally { | ||
| final keepTempDir = (Platform.environment[keepTempKey] ?? '').isNotEmpty; | ||
| if (!keepTempDir) { | ||
| tempDir.deleteSync(recursive: true); | ||
| } else { | ||
| print('$keepTempKey ${tempDir.uri}'); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void _writeJsonTo(Uri uri, Map<String, Object?> json) { | ||
| final encoder = const JsonEncoder().fuse(const Utf8Encoder()); | ||
| File.fromUri(uri).writeAsBytesSync(encoder.convert(json)); | ||
| } | ||
|
|
||
| Map<String, Object?> _readJsonFrom(Uri uri) { | ||
| final decoder = const Utf8Decoder().fuse(const JsonDecoder()); | ||
| final bytes = File.fromUri(uri).readAsBytesSync(); | ||
| return decoder.convert(bytes) as Map<String, Object?>; | ||
| } | ||
|
|
||
| String _readPackageNameFromPubspec() { | ||
| final uri = Directory.current.uri.resolve('pubspec.yaml'); | ||
| final readAsString = File.fromUri(uri).readAsStringSync(); | ||
| final yaml = loadYaml(readAsString) as YamlMap; | ||
| return yaml['name'] as String; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.