Merge pull request #340 from MizouziE/fix/remove-depracated-sass-if

fix: Remove Depracated Sass `if()` usages

Author: jgerigmeyer

sass/assert/_utils.scss

@@ -22,11 +22,11 @@
   @include data.output-context($type);
 
   $block: map.get(config.$output, $type);
-  $start: if(
-    $description or ($block == 'ASSERT'),
-    '#{$block}: #{$description}',
-    $block
-  );
+  $start: $block;
+
+  @if ($description or ($block == 'ASSERT')) {
+    $start: '#{$block}: #{$description}';
+  }
 
   @include config.message('  #{$start}  ', 'comments');
 
@@ -127,7 +127,10 @@
   $not: (not not $assert);
   $list: ($assert != ());
   $string: ($assert != '');
-  $truthy: if(($not and $list and $string), true, false);
 
-  @return $truthy;
+  @if ($not and $list and $string) {
+    @return true;
+  }
+
+  @return false;
 }

sass/config/_throw.scss

@@ -23,7 +23,11 @@ $catch-errors: false !default;
 
 // Format an error prefix, with source if available
 @function _prefix($source) {
-  @return if($source, 'ERROR [#{$source}]:', 'ERROR:');
+  @if $source {
+    @return 'ERROR [#{$source}]:';
+  }
+
+  @return 'ERROR:';
 }
 
 /// Use in place of `@error` statements inside functions.

sass/data/_details.scss

@@ -31,7 +31,11 @@
 /// @param {bool} $terminal [$terminal-output] -
 ///   whether to use the terminal as an output stream
 @mixin fail-details($assert, $expected, $terminal: config.$terminal-output) {
-  $location: if($terminal, ('comments', 'debug'), 'comments');
+  $location: 'comments';
+
+  @if $terminal {
+    $location: ('comments', 'debug');
+  }
 
   // Title Messages
   $assertion: data.context('assert');

sass/data/_results.scss

@@ -13,10 +13,14 @@
 ///   Set to `true` if the comparison is expected to fail
 /// @return {'pass' | 'fail'} The result of a test
 @function get-result($assert, $expected, $unequal: false) {
-  $equal: $assert == $expected;
-  $pass: if($unequal, not $equal, $equal);
+  $is-equal: $assert == $expected;
+  $assert-equal: not $unequal;
 
-  @return if($pass, 'pass', 'fail');
+  @if ($assert-equal != $is-equal) {
+    @return 'fail';
+  }
+
+  @return 'pass';
 }
 
 // Results
@@ -82,26 +86,41 @@ $test-result: null;
 ///   Single or multi-line message for reporting
 @function results-message($linebreak: false, $results: $results) {
   $run: map.get($results, 'run');
+  $items-label: 'Tests';
+
+  @if ($run == 1) {
+    $items-label: 'Test';
+  }
+
   $pass: map.get($results, 'pass');
   $fail: map.get($results, 'fail');
   $output-to-css: map.get($results, 'output-to-css');
-  $items: if($run == 1, 'Test', 'Tests');
-  $items: '#{$run} #{$items}';
+  $items: '#{$run} #{$items-label}';
   $passed: '#{$pass} Passed';
   $failed: '#{$fail} Failed';
-  $compiled: if($output-to-css > 0, '#{$output-to-css} Output to CSS', null);
+  $compiled: null;
+
+  @if ($output-to-css > 0) {
+    $compiled: '#{$output-to-css} Output to CSS';
+  }
 
   // Linebreaks
   @if $linebreak {
     $message: ('#{$items}:', '- #{$passed}', '- #{$failed}');
-    $message: if($compiled, list.append($message, '- #{$compiled}'), $message);
+
+    @if $compiled {
+      $message: list.append($message, '- #{$compiled}');
+    }
 
     @return $message;
   }
 
   // No Linebreaks
   $message: '#{$items}, #{$passed}, #{$failed}';
-  $message: if($compiled, '#{$message}, #{$compiled}', $message);
+
+  @if $compiled {
+    $message: '#{$message}, #{$compiled}';
+  }
 
   @return $message;
 }

sass/data/_stats.scss

@@ -43,9 +43,23 @@ $stats: (
   $assertions: map.get($stats, 'assertions');
 
   // Pluralize Labels
-  $modules-label: if($modules == 1, 'Module', 'Modules');
-  $tests-label: if($tests == 1, 'Test', 'Tests');
-  $assertions-label: if($assertions == 1, 'Assertion', 'Assertions');
+  $modules-label: 'Modules';
+
+  @if ($modules == 1) {
+    $modules-label: 'Module';
+  }
+
+  $tests-label: 'Tests';
+
+  @if ($tests == 1) {
+    $tests-label: 'Test';
+  }
+
+  $assertions-label: 'Assertions';
+
+  @if ($assertions == 1) {
+    $assertions-label: 'Assertion';
+  }
 
   // Combine Results with Labels
   $modules: '#{$modules} #{$modules-label}';

sass/data/_utilities.scss

@@ -16,12 +16,11 @@
     $value: map.get($add, $key);
 
     @if $value {
-      $base-value: map.get($base, $key);
-      $new-value: if($base-value, $base-value + $value, $value);
+      $base-value: map.get($base, $key) or 0;
       $base: map.merge(
         $base,
         (
-          $key: $new-value,
+          $key: $base-value + $value,
         )
       );
     }

sass/module/_utils.scss

@@ -48,7 +48,10 @@
 /// @return {string} - Underline dashes of the same length as string param
 @function underline($string) {
   $underline: '';
-  $string: if(meta.type-of($string) == 'string', $string, '#{$string}');
+
+  @if (meta.type_of($string) != 'string') {
+    $string: '#{$string}';
+  }
 
   @for $i from 1 through string.length($string) {
     $underline: '#{$underline}-';

sass/report/_report.scss

@@ -53,7 +53,11 @@
   }
 
   @if $fail-on-error and ($fail > 0) {
-    $plural: if(($fail == 1), 'test', 'tests');
+    $plural: 'tests';
+
+    @if ($fail == 1) {
+      $plural: 'test';
+    }
 
     @include config.error('#{$fail} #{$plural} failed', 'report');
   }