Merge some changes from #276

commit e0acafd
Author: Tofandel <[email protected]>
Date:   Wed Apr 9 14:02:44 2025 +0200

    Simplify unprefix cognitive complexity

commit 601ee43
Author: Tofandel <[email protected]>
Date:   Wed Apr 9 12:19:02 2025 +0200

    No need to run privateToPublic twice

commit 8775fc9
Author: Tofandel <[email protected]>
Date:   Wed Apr 9 10:48:32 2025 +0200

    Add tests and fix behavior of remove prefix

Author: jathak

lib/src/migrators/module.dart

@@ -357,8 +357,8 @@ class _ModuleMigrationVisitor extends MigrationVisitor {
 
     var name = declaration.name;
     name = _unprefix(name,
-        // Private members can't be accessed outside the module they're declared
-        // in.
+        // Private members can't be accessed outside the module they're
+        // declared in.
         forcePublic:
             references.referencedOutsideDeclaringStylesheet(declaration));
     if (name != declaration.name) {
@@ -376,16 +376,18 @@ class _ModuleMigrationVisitor extends MigrationVisitor {
 
   /// Converts a private identifier to a public one.
   String _privateToPublic(String identifier) {
-    assert(_isPrivate(identifier));
-    for (var i = 0; i < identifier.length; i++) {
-      var char = identifier.codeUnitAt(i);
-      if (char != $dash && char != $underscore) {
-        return identifier.substring(i);
+    if (_isPrivate(identifier)) {
+      for (var i = 0; i < identifier.length; i++) {
+        var char = identifier.codeUnitAt(i);
+        if (char != $dash && char != $underscore) {
+          return identifier.substring(i);
+        }
       }
-    }
 
-    _generatedVariables++;
-    return 'var${_generatedVariables}';
+      _generatedVariables++;
+      return 'var${_generatedVariables}';
+    }
+    return identifier;
   }
 
   /// Returns whether the member named [name] should be forwarded in the
@@ -1246,6 +1248,7 @@ class _ModuleMigrationVisitor extends MigrationVisitor {
 
   /// If [name] starts with any of [prefixesToRemove], returns it with the
   /// longest matching prefix removed.
+  /// If forcePublic is true, any leading dash or underscore will be removed.
   ///
   /// Otherwise, returns [name] unaltered.
   ///

test/migrators/module/remove_prefix_flag/with_dash.hrx

@@ -0,0 +1,25 @@
+<==> arguments
+--migrate-deps --remove-prefix=--app-
+<==> input/entrypoint.scss
+@import "library";
+a {
+  color: $--app-var;
+  background: $__app-var2;
+}
+
+<==> input/_library.scss
+$--app-red: red;
+$--app-var: $--app-red;
+$__app-var2: blue;
+
+<==> output/entrypoint.scss
+@use "library";
+a {
+  color: library.$var;
+  background: library.$var2;
+}
+
+<==> output/_library.scss
+$red: red;
+$var: $red;
+$var2: blue;

test/migrators/module/scope/pseudoprivate/dash.hrx

@@ -7,7 +7,8 @@ a {
 }
 
 <==> input/_library.scss
-$-var: red;
+$-red: red;
+$-var: $-red;
 
 <==> output/entrypoint.scss
 @use "library";
@@ -16,4 +17,5 @@ a {
 }
 
 <==> output/_library.scss
-$var: red;
+$-red: red;
+$var: $-red;

test/migrators/module/scope/pseudoprivate/with_prefix.hrx

@@ -0,0 +1,21 @@
+<==> arguments
+--migrate-deps --remove-prefix=app
+<==> input/entrypoint.scss
+@import "library";
+a {
+  color: $app-var;
+}
+
+<==> input/_library.scss
+$_app-red: red;
+$app-var: $_app-red;
+
+<==> output/entrypoint.scss
+@use "library";
+a {
+  color: library.$var;
+}
+
+<==> output/_library.scss
+$_red: red;
+$var: $_red;