Merge pull request #306 from sass/update-dart

Update Dart SDK constraint to 3.13.0

Author: nex3

analysis_options.yaml

@@ -1,3 +1 @@
-analyzer:
-  errors:
-    missing_js_lib_annotation: ignore
+include: package:sass_analysis/analysis_options.yaml

bin/sass_migrator.dart

@@ -9,10 +9,8 @@ import 'package:sass_migrator/src/node_interop_stub.dart'
 
 import 'package:sass_migrator/src/runner.dart';
 
-// We can't declare args as a List<String> or Iterable<String> beacause of
-// dart-lang/sdk#36627.
-main(Iterable args) {
+void main(Iterable<String> args) {
   var argv = process.argv;
-  if (argv != null) args = argv.skip(2);
+  if (argv != null) args = argv.skip(2).cast<String>();
   MigratorRunner().execute(args.cast<String>());
 }

lib/src/exception.dart

@@ -5,15 +5,13 @@
 // https://opensource.org/licenses/MIT.
 
 import 'package:sass_api/sass_api.dart';
-import 'package:source_span/source_span.dart';
 
 /// An exception thrown by a migrator.
-class MigrationException implements Exception {
+class MigrationException(
   /// An explanation of why migration failed.
-  final String message;
-
-  MigrationException(this.message);
-
+  final String message,
+) implements Exception {
+  @override
   String toString() => "Error: $message";
 }
 
@@ -24,8 +22,6 @@ class MigrationException implements Exception {
 ///
 /// This extends [SassException] to ensure that migrator exceptions are
 /// formatted the same way as the syntax errors Sass throws.
-class MigrationSourceSpanException extends SassException
-    implements MigrationException {
-  MigrationSourceSpanException(String message, FileSpan span)
-    : super(message, span);
-}
+class MigrationSourceSpanException(super.message, super.span)
+    extends SassException
+    implements MigrationException;

lib/src/io/node.dart

@@ -7,6 +7,7 @@
 import 'package:file/file.dart';
 import 'package:js/js.dart';
 import 'package:node_interop/node.dart';
+// ignore: implementation_imports
 import 'package:node_io/src/file_system.dart';
 
 export 'package:node_io/src/directory.dart';
@@ -22,7 +23,7 @@ external bool get supportsAnsiEscapes;
 void printStderr(Object message) => process.stderr.write("$message\n");
 
 int get exitCode => process.exitCode;
-void set exitCode(int code) {
+set exitCode(int code) {
   process.exitCode = code;
 }
 

lib/src/migration_visitor.dart

@@ -26,17 +26,15 @@ import 'util/scoped_ast_visitor.dart';
 /// If [migrateDependencies] is enabled, this visitor will construct and run a
 /// new instance of itself (using [newInstance]) each time it encounters an
 /// `@import` or `@use` rule.
-abstract class MigrationVisitor extends ScopedAstVisitor {
-  /// A mapping from URLs to migrated contents for stylesheets already migrated.
-  final _migrated = <Uri, String>{};
+abstract class MigrationVisitor(
+  /// Cache used to load stylesheets.
+  @protected final ImportCache importCache, {
 
   /// True if dependencies should be migrated as well.
-  @protected
-  final bool migrateDependencies;
-
-  /// Cache used to load stylesheets.
-  @protected
-  final ImportCache importCache;
+  @protected required final bool migrateDependencies,
+}) extends ScopedAstVisitor {
+  /// A mapping from URLs to migrated contents for stylesheets already migrated.
+  final _migrated = <Uri, String>{};
 
   /// Map of missing dependency URLs to the spans that import/use them.
   Map<Uri, FileSpan> get missingDependencies =>
@@ -69,8 +67,6 @@ abstract class MigrationVisitor extends ScopedAstVisitor {
   /// syntax, in which case this returns an empty string.
   String get semicolon => isIndented ? "" : ";";
 
-  MigrationVisitor(this.importCache, {required this.migrateDependencies});
-
   /// Runs a new migration on [stylesheet] (and its dependencies, if
   /// [migrateDependencies] is true) and returns a map of migrated contents.
   Map<Uri, String> run(Stylesheet stylesheet, Importer importer) {

lib/src/migrator.dart

@@ -30,11 +30,13 @@ import 'utils.dart';
 /// Most migrators will want to create a subclass of [MigrationVisitor] and
 /// implement [migrateFile] with `MyMigrationVisitor(this, entrypoint).run()`.
 abstract class Migrator extends Command<Map<Uri, String>> {
+  @override
   String get invocation => super.invocation.replaceFirst(
     "[arguments]",
     "[options] <entrypoints.scss...>",
   );
 
+  @override
   String get usage =>
       "${super.usage}\n\n"
       "See also https://sass-lang.com/documentation/cli/migrator#$name";
@@ -70,6 +72,7 @@ abstract class Migrator extends Command<Map<Uri, String>> {
   ///
   /// Entrypoints and dependencies that did not require any changes will not be
   /// included in the results.
+  @override
   Map<Uri, String> run() {
     var allMigrated = <Uri, String>{};
     var importer = FilesystemImporter('.');
@@ -79,7 +82,7 @@ abstract class Migrator extends Command<Map<Uri, String>> {
         for (var item in globalResults!['pkg-importer'] as List<String>)
           if (item == 'node') NodePackageImporter('.'),
       ],
-      loadPaths: globalResults!['load-path'],
+      loadPaths: globalResults!['load-path'] as List<String>?,
     );
 
     var entrypoints = [

lib/src/migrators/calc_interpolation.dart

@@ -12,7 +12,9 @@ import '../patch.dart';
 
 /// Removes interpolation in calculation functions.
 class CalculationInterpolationMigrator extends Migrator {
+  @override
   final name = "calc-interpolation";
+  @override
   final description =
       r"Removes interpolation in calculation functions"
       r"`calc()`, `clamp()`, `min()`, and `max()`";
@@ -33,12 +35,10 @@ class CalculationInterpolationMigrator extends Migrator {
   }
 }
 
-class _CalculationInterpolationVisitor extends MigrationVisitor {
-  _CalculationInterpolationVisitor(
-    super.importCache, {
-    required super.migrateDependencies,
-  });
-
+class _CalculationInterpolationVisitor(
+  super.importCache, {
+  required super.migrateDependencies,
+}) extends MigrationVisitor {
   @override
   void visitFunctionExpression(FunctionExpression node) {
     const calcFunctions = ['calc', 'clamp', 'min', 'max'];
@@ -58,7 +58,7 @@ class _CalculationInterpolationVisitor extends MigrationVisitor {
         for (var match in interpolation.allMatches(newArg)) {
           var noInterpolation = match[0]!.substring(2, match[0]!.length - 1);
           if (hasOperation.hasMatch(noInterpolation)) {
-            noInterpolation = '(' + noInterpolation + ')';
+            noInterpolation = '($noInterpolation)';
           }
           newArg = newArg.toString().replaceAll(match[0]!, noInterpolation);
         }

lib/src/migrators/color.dart

@@ -16,7 +16,9 @@ import '../utils.dart';
 
 /// Migrates off of legacy color functions.
 class ColorMigrator extends Migrator {
+  @override
   final name = "color";
+  @override
   final description = "Migrates off of legacy color functions.";
 
   @override
@@ -40,15 +42,11 @@ class ColorMigrator extends Migrator {
 /// URL for the sass:color module.
 final _colorUrl = Uri(scheme: 'sass', path: 'color');
 
-class _ColorMigrationVisitor extends MigrationVisitor {
-  final References references;
-
-  _ColorMigrationVisitor(
-    this.references,
-    super.importCache, {
-    required super.migrateDependencies,
-  });
-
+class _ColorMigrationVisitor(
+  final References references,
+  super.importCache, {
+  required super.migrateDependencies,
+}) extends MigrationVisitor {
   /// The namespace of an existing `@use "sass:color"` rule in the current
   /// file, if any.
   String? _colorModuleNamespace;

lib/src/migrators/division.dart

@@ -42,7 +42,9 @@ const _calcFunctions = {
 /// Migrates stylesheets that use the `/` operator for division to use the
 /// `divide` function instead.
 class DivisionMigrator extends Migrator {
+  @override
   final name = "division";
+  @override
   final description = """
 Use the math.div() function instead of the / division operator
 
@@ -88,17 +90,12 @@ More info: https://sass-lang.com/d/slash-div""";
 /// The set of constant divisors that should be migrated to multiplication.
 const _allowedDivisors = {2, 4, 5, 8, 10, 20, 40, 50, 80, 100, 1000};
 
-class _DivisionMigrationVisitor extends MigrationVisitor {
-  final bool isPessimistic;
-  final bool useMultiplication;
-
-  _DivisionMigrationVisitor(
-    super.importCache,
-    this.isPessimistic,
-    this.useMultiplication, {
-    required super.migrateDependencies,
-  });
-
+class _DivisionMigrationVisitor(
+  super.importCache,
+  final bool isPessimistic,
+  final bool useMultiplication, {
+  required super.migrateDependencies,
+}) extends MigrationVisitor {
   /// True when division is allowed by the context the current node is in.
   var _isDivisionAllowed = false;
 
@@ -196,7 +193,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   /// operands.
   @override
   void visitBinaryOperationExpression(BinaryOperationExpression node) {
-    if (node.operator == BinaryOperator.dividedBy) {
+    if (node.operator == .dividedBy) {
       _visitSlashOperation(node);
     } else {
       _withContext(
@@ -255,7 +252,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   }) {
     _withContext(() {
       if (node.expression
-          case BinaryOperationExpression(operator: BinaryOperator.dividedBy) &&
+          case BinaryOperationExpression(operator: .dividedBy) &&
               var expression) {
         if (_visitSlashOperation(expression) && !negated) {
           addPatch(patchDelete(node.span, end: 1));
@@ -272,7 +269,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   @override
   void visitUnaryOperationExpression(UnaryOperationExpression node) {
     if (node case UnaryOperationExpression(
-      operator: UnaryOperator.minus,
+      operator: .minus,
       :ParenthesizedExpression operand,
     )) {
       visitParenthesizedExpression(operand, negated: true);
@@ -316,7 +313,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
 
     if (channels case ListExpression(
       hasBrackets: false,
-      separator: ListSeparator.space,
+      separator: .space,
       contents: [_, _, BinaryOperationExpression last],
     )) {
       // Handles cases like `rgb(10 20 30/2 / 0.5)`, since converting `30/2`
@@ -355,8 +352,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
     }
     var status = _NumberStatus.of(node);
 
-    if ((!_isDivisionAllowed && _onlySlash(node)) ||
-        status == _NumberStatus.no) {
+    if ((!_isDivisionAllowed && _onlySlash(node)) || status == .no) {
       // Definitely not division
       if (_isDivisionAllowed || _containsInterpolation(node)) {
         // We only want to convert a non-division slash operation to a
@@ -368,9 +364,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
       }
       return true;
     }
-    if (_expectsNumericResult ||
-        status == _NumberStatus.yes ||
-        !isPessimistic) {
+    if (_expectsNumericResult || status == .yes || !isPessimistic) {
       // Definitely division
       _withContext(
         () => super.visitBinaryOperationExpression(node),
@@ -397,10 +391,8 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   /// Returns true if patched and false otherwise.
   bool _tryMultiplication(BinaryOperationExpression node) {
     if (!useMultiplication) return false;
-    if (node.right case NumberExpression(
-      unit: null,
-      value: var divisor,
-    ) when _allowedDivisors.contains(divisor)) {
+    if (node.right case NumberExpression(unit: null, value: var divisor)
+        when _allowedDivisors.contains(divisor)) {
       var operatorSpan = node.left.span
           .extendThroughWhitespace()
           .end
@@ -418,7 +410,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   /// unnecessary interpolation.
   void _visitSlashListArguments(Expression node) {
     switch (node) {
-      case BinaryOperationExpression(operator: BinaryOperator.dividedBy):
+      case BinaryOperationExpression(operator: .dividedBy):
         _visitSlashListArguments(node.left);
         _patchOperatorToComma(node);
         _visitSlashListArguments(node.right);
@@ -435,24 +427,20 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   /// Returns true if we assume that [operator] always operators on numbers.
   ///
   /// This is true for `*`, `%`, `<`, `<=`, `>`, and `>=`.
-  bool _operatesOnNumbers(BinaryOperator operator) => {
-    BinaryOperator.times,
-    BinaryOperator.modulo,
-    BinaryOperator.lessThan,
-    BinaryOperator.lessThanOrEquals,
-    BinaryOperator.greaterThan,
-    BinaryOperator.greaterThanOrEquals,
+  bool _operatesOnNumbers(BinaryOperator operator) => <BinaryOperator>{
+    .times,
+    .modulo,
+    .lessThan,
+    .lessThanOrEquals,
+    .greaterThan,
+    .greaterThanOrEquals,
   }.contains(operator);
 
   /// Returns true if [node] is entirely composed of number literals and slash
   /// operations.
   bool _onlySlash(Expression node) => switch (node) {
     NumberExpression() => true,
-    BinaryOperationExpression(
-      operator: BinaryOperator.dividedBy,
-      :var left,
-      :var right,
-    ) =>
+    BinaryOperationExpression(operator: .dividedBy, :var left, :var right) =>
       _onlySlash(left) && _onlySlash(right),
     _ => false,
   };
@@ -490,9 +478,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
   void _patchParensIfAny(SassNode node) {
     switch (node) {
       case ParenthesizedExpression(
-        expression: BinaryOperationExpression(
-          operator: BinaryOperator.dividedBy,
-        ),
+        expression: BinaryOperationExpression(operator: .dividedBy),
       ):
         return;
       case ParenthesizedExpression():
@@ -503,7 +489,7 @@ class _DivisionMigrationVisitor extends MigrationVisitor {
 
   /// Runs [operation] with the given context.
   void _withContext(
-    void operation(), {
+    void Function() operation, {
     bool? isDivisionAllowed,
     bool? expectsNumericResult,
     bool? inCalcContext,
@@ -532,9 +518,7 @@ enum _NumberStatus {
   /// definitely not a number, and [maybe] otherwise.
   static _NumberStatus of(Expression node) => switch (node) {
     NumberExpression() ||
-    BinaryOperationExpression(
-      operator: BinaryOperator.times || BinaryOperator.modulo,
-    ) => yes,
+    BinaryOperationExpression(operator: .times || .modulo) => yes,
     BooleanExpression() ||
     ColorExpression() ||
     ListExpression() ||