Merge pull request #17 from angular-package/develop

v0.7.0-beta

Author: angularpackage

CHANGELOG.md

@@ -1,5 +1,18 @@
 # @angular-package/sass changelog
 
+### v0.7.0-beta [#](https://github.com/angular-package/sass/releases/tag/v0.7.0-beta)
+
+- Fix `map.set()` - add checking whether `$key` is comma-separated list to have ability to add space separated keys. [1d46564]
+- Add `query` module to search in `list` by using query. [3e2c20c]
+- Add experimental `object` module to handle multiple multiple `keys` in `map` variable as objects. [5274590] [6e16608]
+- Add `map.is()` function to check whether the `$value` is `map` of optionally `$length`. [1a3c52c]
+
+[6e16608]: https://github.com/angular-package/sass/commit/6e166083a52cdafc4c338d3a0e65a2467f7915c8
+[1d46564]: https://github.com/angular-package/sass/commit/1d46564fce0eb819a331f74b691e62320b6d001a
+[3e2c20c]: https://github.com/angular-package/sass/commit/3e2c20c300f1daa4317a4ec6861bf2982cd9f245
+[5274590]: https://github.com/angular-package/sass/commit/52745909997a1c514b348183a07cbb3203acd169
+[1a3c52c]: https://github.com/angular-package/sass/commit/1a3c52cf6fe2b24119cca6325e6c5fc59242b3fd
+
 ### v0.6.1-beta [#](https://github.com/angular-package/sass/releases/tag/v0.6.1-beta)
 
 - Fix `color.hsla-color()` and `color.retrieve()` by removing `values.map` import and change `values.map` to `list.to-map()`. [e8fe993]

index.scss

@@ -8,8 +8,10 @@
 @forward 'math' as math-*;
 @forward 'meta' as meta-*;
 @forward 'number' as number-*;
+@forward 'object' as object-*;
 @forward 'property' as property-* hide property;
 @forward 'property/property.mixin';
+@forward 'query' as query-*;
 @forward 'selector' as selector-*;
 @forward 'string' as string-*;
 @forward 'translator' as translator-*;

map/_map.is.function.scss

@@ -0,0 +1,19 @@
+// Sass.
+@use 'sass:list';
+
+// Status: DONE
+// The `map.is()` function checks whether `$value` is `map` type, optionally of `$length`.
+// @param `$value` The value to check against `map` type.
+// @returns The returned value is a `bool` indicating whether `$value` is a map, optionally of `$length`.
+@function is($value, $length: null) {
+  @return if(
+    $length,
+    type-of($value) == map and list.length($value) == $length,
+    type-of($value) == map
+  );
+}
+
+// Examples.
+// @debug is((a: 1, b: 2, c: 3));
+// @debug is((a: 1, b: 2, c: 3), 2);
+// @debug is((a: 1, b: 2, c: 3), 3);

map/_map.set.function.scss

@@ -5,20 +5,26 @@
 
 // Status: DONE
 // The `map.set()` function sets `$allowed` `$value` under `$key` in `$map`.
-// ? Original sass `map.set()` function modified, by adding `$allowed...` arbitrary argument to check if `$value` is allowed to be set.
 // @param `$map` A map to set `$value` at `$key`.
 // @param `$key` A key under which `$value` is set.
 // @param `$value` The value to set in `$map` under `key`.
 // @arbitrary `$allowed...` Allowed value types and/or values to set in `$map`.
-// @return The return value is updated `$map` with `$value` at `$key`.
+// @returns The return value is updated `$map` with `$value` at `$key`.
 @function set($map, $key, $value, $allowed...) {
   @return if(
     if(
       list.length($allowed) > 0,
       if(list.index($allowed, meta.type-of($value)) or list.index($allowed, $value), true, false),
       true
     ),
-    map.set($map, list.append($key, $value, comma)...),
+    map.set(
+      $map,
+      list.append(
+        if(meta.type-of($key) == list and list.separator($key) == comma, $key, ($key,)),
+        $value,
+        comma
+      )...
+    ),
     $map
   );
 }

ng-package.json

@@ -15,7 +15,9 @@
     "./math/**/*.scss",
     "./meta/**/*.scss",
     "./number/**/*.scss",
+    "./object/**/*.scss",
     "./property/**/*.scss",
+    "./query/**/*.scss",
     "./selector/**/*.scss",
     "./string/**/*.scss",
     "./translator/**/*.scss",

object/_index.scss

@@ -0,0 +1,13 @@
+@forward 'object.copy.function';
+@forward 'object.create.function';
+@forward 'object.get.function';
+@forward 'object.keys.function';
+@forward 'object.last-id.function';
+@forward 'object.last-name.function';
+@forward 'object.merge.function';
+@forward 'object.move.function';
+@forward 'object.pick.function';
+@forward 'object.remove.function';
+@forward 'object.set.function';
+@forward 'object.use.function';
+@forward 'object.var';

object/_object.copy.function.scss

@@ -0,0 +1,22 @@
+// Sass.
+@use 'sass:list';
+
+// Variables.
+@use 'object.var' as object;
+
+// Modules.
+@use '../map';
+
+// Functions.
+@use 'object.get.function' as *;
+@use 'object.set.function' as *;
+@use 'object.use.function' as *;
+
+// Status: DONE
+// The `object.copy()` function.
+// @param `$from`
+// @param `$to`
+// @returns
+@function copy($from, $to) {
+  @return set($to, get($from));
+}

object/_object.create.function.scss

@@ -0,0 +1,23 @@
+// Sass.
+@use 'sass:list';
+@use 'sass:map';
+@use 'sass:meta';
+
+// Object.
+@use 'object.var' as object;
+
+// Functions.
+@use 'object.get.function' as *;
+
+// Status: DONE
+// The `object.create()` function sets `map` type object in `object.$object` variable under `$name` key.
+// @param `$object` A `map` type value to set in `object.$object` under `$name`.
+// @param `$name` The name under which `$object` of `map` type is stored, `null` indicates add new object under incremented `number`.
+// @returns The returned value is `$object` of `map` type under `$name` key of `object.$object`.
+@function create($object, $name: list.length(object.$object) + 1) {
+  $object: if(meta.type-of(list) and list.length($object) == 0, map.remove((1:1), 1), $object);
+  @if type-of($object) == map {
+    object.$object: map.set(object.$object, $name, $object);
+  }
+  @return get();
+}

object/_object.get.function.scss

@@ -0,0 +1,28 @@
+// Sass.
+@use 'sass:list';
+
+// Object.
+@use 'object.var' as object;
+
+// Modules.
+@use '../map';
+
+// Functions.
+@use 'object.last-name.function' as *;
+@use 'object.use.function' as *;
+
+// Status: DONE
+// The `object.get()` function gets `map` from `object.$object` variable of key `$name`, where by default is last created or set by `object.use()`.
+// @param `$key` An optional key of `map` from `object.$object` to get.
+// @param `$fallback` Fallback value if retrieved is `null`.
+// // @param `$name` A name of `map` in `object.$object` to get, `null` indicates last created object.
+// @returns The returned value is a `map` retrieved from `object.$object` of `$name`, optionally value retrieved from `$key`.
+@function get($key: null, $fallback: null) {
+  $name: object.$name or last-name();
+  @if type-of($key) == map {
+    @each $name, $key in $key {
+      @return map.get(object.$object, list.append($name, $key, comma), $fallback);
+    }
+  }
+  @return map.get(object.$object, if($key, list.append($name, $key, comma), $name), $fallback);
+}

object/_object.keys.function.scss

@@ -0,0 +1,18 @@
+// Sass.
+@use 'sass:list';
+@use 'sass:map';
+
+// Object.
+@use 'object.var' as object;
+
+// Functions.
+@use 'object.get.function' as *;
+@use 'object.last-name.function' as *;
+
+// Status: DONE
+// The `object.keys()` function.
+// @param `$key`
+// @returns
+@function keys($key: null) {
+  @return map.keys(get($key));
+}