Added namespaces and shortcodes for property trees

7 files changed, 475 insertions, 250 deletions

diff --git a/README.md b/README.md
index 7c04922..f02f6a7 100644
--- a/README.md
+++ b/README.md
@@ -214,7 +214,7 @@ It's a very simple feature, but it makes managing large sets of structured data
 Example usage:
 
 ```scss
-@include iro-props-save((
+@include iro-props-store((
     --accent:      #f00,
     --accent-text: #fff,
 
diff --git a/package.json b/package.json
index d4eb18b..c93a3b3 100644
--- a/package.json
+++ b/package.json
@@ -25,9 +25,9 @@
         },
         "homepage": "https://git.vulpes.one/Feuerfuchs/iro-sass",
         "devDependencies": {
-                "mocha": "^8.2.0",
-                "nodemon": "^2.0.6",
-                "sass": "^1.28.0",
+                "mocha": "^8.3.2",
+                "nodemon": "^2.0.7",
+                "sass": "^1.32.8",
                 "sass-lint": "^1.12.1",
                 "sass-true": "^6.0.1",
                 "sassdoc": "^2.7.3"
diff --git a/src/_contexts.scss b/src/_contexts.scss
index 556fde3..9fe0e8c 100644
--- a/src/_contexts.scss
+++ b/src/_contexts.scss
@@ -124,9 +124,9 @@ $iro-context-stacks: ();
         @error 'Context stack "#{inspect($stack-id)}" does not exist.';
     }
 
-    $context:           $id $data;
-    $context-stack:     map-get($iro-context-stacks, $stack-id);
-    $context-stack:     append($context-stack, $context);
+    $context:            $id $data;
+    $context-stack:      map-get($iro-context-stacks, $stack-id);
+    $context-stack:      append($context-stack, $context);
     $iro-context-stacks: map-merge($iro-context-stacks, ($stack-id: $context-stack)) !global;
 
     @return $context;
diff --git a/src/_props.scss b/src/_props.scss
index 86530f7..86a2215 100644
--- a/src/_props.scss
+++ b/src/_props.scss
@@ -41,26 +41,71 @@ $iro-props-default-tree: 'default' !default;
 ///
 $iro-props-trees: ();
 
+///
+/// Default context name used for the namespace context.
+///
+/// @type string
+///
+$iro-props-namespace-context-id: 'namespace' !default;
+
+///
+/// Declare a namespace, meaning that all variables declared and accessed.
+///
+/// @param {string} $name - Name of the namespace
+///
+@mixin iro-props-namespace($name) {
+    $key: '--#{$name}';
+
+    $ns-key: iro-props-get-ns-key();
+
+    @if $ns-key != null {
+        $key: append($ns-key, $key);
+    } @else {
+        $key: ($key);
+    }
+
+    @include iro-context-push($iro-props-namespace-context-id, 'namespace', (
+        'name': $name,
+        'key':  $key
+    ));
+
+    @content;
+
+    @include iro-context-pop($iro-props-namespace-context-id);
+}
+
+///
+/// Get the current namespace name.
+///
+@function iro-props-ns-name() {
+    $noop: iro-context-assert-stack-must-contain($iro-props-namespace-context-id, 'namespace');
+
+    $data: nth(iro-context-get($iro-props-namespace-context-id, 'namespace'), 2);
+    $name: map-get($data, 'name');
+
+    @return $name;
+}
+
 /// 
 /// Save a property tree. If a tree with the sane name already exists, the trees
 /// will be merged.
 ///
-/// @param {map}    $map                            - Map containing properties
+/// @param {map}    $map                             - Map containing properties
 /// @param {string} $tree  [$iro-props-default-tree] - ID the map is saved as
-/// @param {bool}   $merge [false]                  - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted.
+/// @param {bool}   $merge [false]                   - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted.
 ///
-@mixin iro-props-save($map, $tree: $iro-props-default-tree, $merge: false) {
-    $noop: iro-props-save($map, $tree, $merge);
+@mixin iro-props-store($map, $tree: $iro-props-default-tree, $merge: false, $global: false) {
+    $noop: iro-props-store($map, $tree, $merge, $global);
 }
 
 /// 
 /// Save a property tree.
 ///
-/// @param {map}    $map                            - Map containing properties
+/// @param {map}    $map                             - Map containing properties
 /// @param {string} $tree  [$iro-props-default-tree] - ID the map is saved as
-/// @param {bool}   $merge [false]                  - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted.
+/// @param {bool}   $merge [false]                   - If a tree named $tree already exists and this value is set to true, they will be merged. Otherwise an error will be emitted.
 ///
-@function iro-props-save($map, $tree: $iro-props-default-tree, $merge: false) {
+@function iro-props-store($map, $tree: $iro-props-default-tree, $merge: false, $global: false) {
     $prop-map: null;
 
     @if $iro-props-enforce-double-dashes {
@@ -69,6 +114,14 @@ $iro-props-trees: ();
         }
     }
 
+    @if not $global {
+        $ns-key: iro-props-get-ns-key();
+
+        @if $ns-key != null {
+            $map: ($ns-key: $map)
+        }
+    }
+
     @if map-has-key($iro-props-trees, $tree) {
         @if $merge {
             $map: iro-map-merge-recursive(map-get($iro-props-trees, $tree), $map);
@@ -87,18 +140,18 @@ $iro-props-trees: ();
 ///
 /// @param {string} $tree [$iro-props-default-tree] - ID of the tree to be deleted
 ///
-@mixin iro-props-delete($tree: $iro-props-default-tree) {
-    $noop: iro-props-delete($tree);
+@mixin iro-props-clear($tree: $iro-props-default-tree) {
+    $noop: iro-props-clear($tree);
 }
 
 /// 
-/// Unset a property tree.
+/// Delete a property tree.
 ///
 /// @param {string} $tree [$iro-props-default-tree] - ID of the tree to be deleted
 ///
 /// @throw If the property tree does not exist
 ///
-@function iro-props-delete($tree: $iro-props-default-tree) {
+@function iro-props-clear($tree: $iro-props-default-tree) {
     @if not map-has-key($iro-props-trees, $tree) {
         @error 'Property tree "#{inspect($tree)}" does not exist.';
     }
@@ -111,33 +164,50 @@ $iro-props-trees: ();
 /// 
 /// Access a whole property or a subsection (i.e. value) of it.
 ///
-/// @param {string | list} $key     [null]                   - Key of the property to read. If this is a list of keys, the map will be traversed in that order.
+/// @param {string | list} $key     [null]                    - Key of the property to read. If this is a list of keys, the map will be traversed in that order.
 /// @param {string}        $tree    [$iro-props-default-tree] - ID of the property tree to use
-/// @param {any}           $default [null]                   - Default value to return of no match was found. If null, this function will throw an error instead.
+/// @param {any}           $default [null]                    - Default value to return of no match was found. If null, this function will throw an error instead.
 ///
 /// @return {any} Value assigned to property or $default
 ///
 /// @throw If there was no match for $key and $default is null
 ///
-@function iro-props-get($key: (), $tree: $iro-props-default-tree, $default: null) {
+@function iro-props-get($key: (), $tree: $iro-props-default-tree, $default: null, $global: false) {
     @if not map-has-key($iro-props-trees, $tree) {
         @error 'Unknown tree "#{$tree}".';
     }
 
     $result: map-get($iro-props-trees, $tree);
 
+    @if not $global {
+        $ns-key: iro-props-get-ns-key();
+
+        @if $ns-key != null {
+            $orig-key: $key;
+            $key:      $ns-key;
+
+            @if type-of($orig-key) == list {
+                @each $subkey in $orig-key {
+                    $key: append($key, $subkey);
+                }
+            } @else {
+                $key: append($key, $orig-key);
+            }
+        }
+    }
+
     @if type-of($key) == list {
         $stop: false;
 
         @each $k in $key {
-            @if map-has-key($result, $k) and not $stop {
+            @if not $stop and map-has-key($result, $k) {
                 $result: map-get($result, $k);
 
                 @if type-of($result) == list and nth($result, 1) == 'iro-prop-ref' {
                     @if length($result) == 2 {
-                        $result: iro-props-get($tree: nth($result, 2));
+                        $result: iro-props-get