oo-loop 1.0.2 → 1.0.3

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Loop changelog
 
+## 1.0.3: 2022-04-05
+
+### Feature
+- Set up function to return the alias information
+### Fixes
+- Return the reference value and send a warning if the alias function cannot be performed
+
 ## 1.0.2: 2022-04-04
 
 ### Fixes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oo-loop",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Loop CSS framework, flexible and expressive CSS",
   "keywords": [
     "scss",

package/scss/functions/_ooAlias.scss

@@ -2,12 +2,12 @@ $ooAlias: (
   (
     name: 'ooDarken',
     function: 'darken',
-    params: ('color', 'number'),
+    paramType: ('color', 'number'),
   ),
   (
     name: 'ooLighten',
     function: 'lighten',
-    params: ('color', 'number'),
+    paramType: ('color', 'number'),
   ),
 );
 
@@ -48,49 +48,79 @@ $ooAlias: (
   @return $isAlias;
 }
 
+/// getAliasInfo
+/// retrieve the alias information
+/// @param string $aliasFunction The complete alias function
+/// @return map|null
+
+@function getAliasInfo($aliasFunction) {
+  @each $alias in $ooAlias {
+    $aliasName: getMapValue($alias, 'name');
+    $aliasLength: str-length($aliasName);
+    $aliasFunctionName: stripSpaces(str-slice($aliasFunction, 1, $aliasLength));
+
+    @if $aliasFunctionName == $aliasName {
+      $currentAlias: $alias;
+      $functionName: getMapValue($alias, 'function');
+
+      @return (
+        name: $aliasName,
+        nameLength: $aliasLength,
+        function: if(function-exists('get-function'), get-function($functionName), $functionName),
+        functionName: $functionName,
+        paramType: getMapValue($alias, 'paramType'),
+      );
+    }
+  }
+
+  @return null;
+}
 
 /// getAliasValue
 /// retrieve the value of an alias function
-/// @param string $string The complete alias function
+/// @param string $aliasFunction The complete alias function
 /// @param string $value Value of the 1st parameter
 /// @return bool
 
-/// @todo review, simplify
-
-@function getAliasValue($string, $param:null) {
-  $currentAlias: null;
+@function getAliasValue($aliasFunction, $value:null) {
+  $name: null;
+  $paramType: null;
   $function: null;
-  $params: split(',', inspect($string));
-
+  $params: split(',', inspect($aliasFunction));
   $param1: nth($params, 1);
-  @each $alias in $ooAlias {
-    $aliasName: getMapValue($alias, 'name');
-    $aliasLength: str-length($aliasName);
-    @if str-slice($string, 1, $aliasLength) == $aliasName {
-      $currentAlias: $alias;
-      $function: getMapValue($alias, 'function');
-      $param1: stripSpaces(str-slice($param1, $aliasLength + 2, str-length($param1)));
-      @if function-exists('get-function') {
-        $function: get-function($function);
-      }
-    }
+
+  $aliasInfo: getAliasInfo($aliasFunction);
+
+  @if $aliasInfo != null {
+    $name: getMapValue($aliasInfo, 'name');
+    $function: getMapValue($aliasInfo, 'function');
+    $paramType: getMapValue($aliasInfo, 'paramType');
+    $param1: stripSpaces(str-slice($param1, getMapValue($aliasInfo, 'nameLength') + 2, str-length($param1)));
   }
 
-  $param1: if($param == null, $param1, $param);
+  $param1: if($value==null, $param1, $value);
 
   @if length($params) > 1 {
-    $paramLeft: removeInList($params, 1);
-    $param2: stripSpaces(str-slice(#{$paramLeft}, 1, -2));
+    $param2: stripSpaces(str-slice(#{nth($params, 2)}, 1, -2));
+
+    $param1Type: null;
+    $param2Type: null;
 
-    $currentAliasParams: getMapValue($currentAlias, 'params');
-    $param1: toType(nth($currentAliasParams, 1), $param1);
-    $param2: toType(nth($currentAliasParams, 2), $param2);
+    @if $paramType != null {
+      $param1Type: nth($paramType, 1);
+      $param2Type: nth($paramType, 2);
+    }
 
-    @if type-of($param1) != nth($currentAliasParams, 1) or type-of($param2) != nth($currentAliasParams, 2) {
-      @return $string;
+    $param1: toType($param1Type, $param1);
+    $param2: toType($param2Type, $param2);
+ 
+    @if type-of($param1) != $param1Type or type-of($param2) != $param2Type {
+      @warn('The alias `#{$aliasFunction}` is targetting `#{$value}` and therefore cannot be used with the sass function `#{getMapValue($aliasInfo, 'functionName')}`');
+      @return $value;
     }
 
     @return call($function, $param1, $param2);
   }
+
   @return call($function, $param1);
-}
+}