Drop support for bogus combinators

This also improves the way SassExceptions thrown from within custom
functions are handled. If the wrapped exception already has a span,
it's turned into a MultiSpanSassException with an additional span
pointing to the function invocation.

Author: nex3

CHANGELOG.md

@@ -4,6 +4,13 @@
   parsing associated with it. It is now parsed like any other unknown plain CSS
   at-rule, where Sass features are only allowed within `#{}` interpolation.
 
+### Dart API
+
+* Remove `Value.assertSelector()`, `.assertSimpleSelector()`,
+  `.assertCompoundSelector()`, and `.assertComplexSelector()`. This is now only
+  available through the expanded `sass_api` package, since that package also
+  exposes the selector AST that it returns.
+
 ## 1.85.2-dev
 
 * No user-visible changes.

lib/src/ast/css/node.dart

@@ -35,16 +35,6 @@ abstract class CssNode implements AstNode {
         const _IsInvisibleVisitor(includeBogus: true, includeComments: false),
       );
 
-  // Whether this node would be invisible even if style rule selectors within it
-  // didn't have bogus combinators.
-  ///
-  /// Note that this doesn't consider nodes that contain loud comments to be
-  /// invisible even though they're omitted in compressed mode.
-  @internal
-  bool get isInvisibleOtherThanBogusCombinators => accept(
-        const _IsInvisibleVisitor(includeBogus: false, includeComments: false),
-      );
-
   // Whether this node will be invisible when loud comments are stripped.
   @internal
   bool get isInvisibleHidingComments => accept(
@@ -92,8 +82,5 @@ class _IsInvisibleVisitor with EveryCssVisitor {
       includeComments && !comment.isPreserved;
 
   bool visitCssStyleRule(CssStyleRule rule) =>
-      (includeBogus
-          ? rule.selector.isInvisible
-          : rule.selector.isInvisibleOtherThanBogusCombinators) ||
-      super.visitCssStyleRule(rule);
+      rule.selector.isInvisible || super.visitCssStyleRule(rule);
 }

lib/src/ast/sass/parameter_list.dart

@@ -12,7 +12,7 @@ import '../../utils.dart';
 import 'parameter.dart';
 import 'node.dart';
 
-/// An parameter declaration, as for a function or mixin definition.
+/// A parameter declaration, as for a function or mixin definition.
 ///
 /// {@category AST}
 /// {@category Parsing}

lib/src/ast/selector.dart

@@ -5,14 +5,10 @@
 import 'package:meta/meta.dart';
 import 'package:source_span/source_span.dart';
 
-import '../deprecation.dart';
-import '../evaluation_context.dart';
-import '../exception.dart';
 import '../visitor/any_selector.dart';
 import '../visitor/interface/selector.dart';
 import '../visitor/serialize.dart';
 import 'node.dart';
-import 'selector/complex.dart';
 import 'selector/list.dart';
 import 'selector/placeholder.dart';
 import 'selector/pseudo.dart';
@@ -47,58 +43,12 @@ abstract base class Selector implements AstNode {
   ///
   /// @nodoc
   @internal
-  bool get isInvisible => accept(const _IsInvisibleVisitor(includeBogus: true));
-
-  // Whether this selector would be invisible even if it didn't have bogus
-  // combinators.
-  ///
-  /// @nodoc
-  @internal
-  bool get isInvisibleOtherThanBogusCombinators =>
-      accept(const _IsInvisibleVisitor(includeBogus: false));
-
-  /// Whether this selector is not valid CSS.
-  ///
-  /// This includes both selectors that are useful exclusively for build-time
-  /// nesting (`> .foo)` and selectors with invalid combiantors that are still
-  /// supported for backwards-compatibility reasons (`.foo + ~ .bar`).
-  bool get isBogus =>
-      accept(const _IsBogusVisitor(includeLeadingCombinator: true));
-
-  /// Whether this selector is bogus other than having a leading combinator.
-  ///
-  /// @nodoc
-  @internal
-  bool get isBogusOtherThanLeadingCombinator =>
-      accept(const _IsBogusVisitor(includeLeadingCombinator: false));
-
-  /// Whether this is a useless selector (that is, it's bogus _and_ it can't be
-  /// transformed into valid CSS by `@extend` or nesting).
-  ///
-  /// @nodoc
-  @internal
-  bool get isUseless => accept(const _IsUselessVisitor());
+  bool get isInvisible => accept(const _IsInvisibleVisitor());
 
   final FileSpan span;
 
   Selector(this.span);
 
-  /// Prints a warning if `this` is a bogus selector.
-  ///
-  /// This may only be called from within a custom Sass function. This will
-  /// throw a [SassException] in Dart Sass 2.0.0.
-  void assertNotBogus({String? name}) {
-    if (!isBogus) return;
-    warnForDeprecation(
-      (name == null ? '' : '\$$name: ') +
-          '$this is not valid CSS.\n'
-              'This will be an error in Dart Sass 2.0.0.\n'
-              '\n'
-              'More info: https://sass-lang.com/d/bogus-combinators',
-      Deprecation.bogusCombinators,
-    );
-  }
-
   /// Calls the appropriate visit method on [visitor].
   T accept<T>(SelectorVisitor<T> visitor);
 
@@ -107,18 +57,11 @@ abstract base class Selector implements AstNode {
 
 /// The visitor used to implement [Selector.isInvisible].
 class _IsInvisibleVisitor with AnySelectorVisitor {
-  /// Whether to consider selectors with bogus combinators invisible.
-  final bool includeBogus;
-
-  const _IsInvisibleVisitor({required this.includeBogus});
+  const _IsInvisibleVisitor();
 
   bool visitSelectorList(SelectorList list) =>
       list.components.every(visitComplexSelector);
 
-  bool visitComplexSelector(ComplexSelector complex) =>
-      super.visitComplexSelector(complex) ||
-      (includeBogus && complex.isBogusOtherThanLeadingCombinator);
-
   bool visitPlaceholderSelector(PlaceholderSelector placeholder) => true;
 
   bool visitPseudoSelector(PseudoSelector pseudo) {
@@ -127,58 +70,9 @@ class _IsInvisibleVisitor with AnySelectorVisitor {
       // it means "doesn't match this selector that matches nothing", so it's
       // equivalent to *. If the entire compound selector is composed of `:not`s
       // with invisible lists, the serializer emits it as `*`.
-      return pseudo.name == 'not'
-          ? (includeBogus && selector.isBogus)
-          : selector.accept(this);
+      return pseudo.name != 'not' && selector.accept(this);
     } else {
       return false;
     }
   }
 }
-
-/// The visitor used to implement [Selector.isBogus].
-class _IsBogusVisitor with AnySelectorVisitor {
-  /// Whether to consider selectors with leading combinators as bogus.
-  final bool includeLeadingCombinator;
-
-  const _IsBogusVisitor({required this.includeLeadingCombinator});
-
-  bool visitComplexSelector(ComplexSelector complex) {
-    if (complex.components.isEmpty) {
-      return complex.leadingCombinators.isNotEmpty;
-    } else {
-      return complex.leadingCombinators.length >
-              (includeLeadingCombinator ? 0 : 1) ||
-          complex.components.last.combinators.isNotEmpty ||
-          complex.components.any(
-            (component) =>
-                component.combinators.length > 1 ||
-                component.selector.accept(this),
-          );
-    }
-  }
-
-  bool visitPseudoSelector(PseudoSelector pseudo) {
-    var selector = pseudo.selector;
-    if (selector == null) return false;
-
-    // The CSS spec specifically allows leading combinators in `:has()`.
-    return pseudo.name == 'has'
-        ? selector.isBogusOtherThanLeadingCombinator
-        : selector.isBogus;
-  }
-}
-
-/// The visitor used to implement [Selector.isUseless]
-class _IsUselessVisitor with AnySelectorVisitor {
-  const _IsUselessVisitor();
-
-  bool visitComplexSelector(ComplexSelector complex) =>
-      complex.leadingCombinators.length > 1 ||
-      complex.components.any(
-        (component) =>
-            component.combinators.length > 1 || component.selector.accept(this),
-      );
-
-  bool visitPseudoSelector(PseudoSelector pseudo) => pseudo.isBogus;
-}