Improvements

Author: Wazabii

Dom/Document.php

@@ -62,11 +62,22 @@ public function get(): string
     public static function dom(string $key): self
     {
         if (empty(self::$inst[$key])) {
-            self::$inst[$key] = new self();
+            self::$inst[$key] = self::withDom($key);
         }
         return self::$inst[$key];
     }
 
+    /**
+     * Init DOM instance
+     * @param  string $key DOM access key
+     * @return self
+     */
+    public static function withDom(string $key): self
+    {
+        self::$inst[$key] = new self();
+        return self::$inst[$key];
+    }
+
     /**
      * Create and bind tag to a key so it can be overwritten
      * @param  string       $tag     HTML tag (without brackets)

SwiftRender.php

@@ -223,29 +223,22 @@ public function withView(string $file, array $args = array()): self
      */
     public function setPartial(string $partial, array $args = array()): self
     {
-
-        $file = $key2 = $key = $partial;
-
-        $partial = explode(".", $file);
-        if(count($partial) > 1) {
-            $key2 = $file = $partial[1];
-            $key = $partial[0];
-
-            if(isset($partial[2])) {
-                $key2 = "{$key}-{$partial[2]}";
-
-            }
-        }
-        
+        $keys = $this->selectPartial($partial, $file);
         if (is_null($this->file)) {
             $this->setFile($file);
         }
         $func = $this->build($this->file, $args);
-        $this->partial[$key][$key2] = $func;
+        $this->partial[$keys[0]][$keys[1]] = $func;
 
         return $this;
     }
 
+    public function hasPartial($partial): bool
+    {
+        $keys = $this->selectPartial($partial);
+        return isset($this->partial[$keys[0]][$keys[1]]);
+    }
+
     /**
      * Unset a setted partial
      * @param  string $key Partal key, example: ("sidebar", "breadcrumb")
@@ -406,10 +399,8 @@ private function buildView(): void
      */
     private function build(string|callable $file, array $args = array()): callable
     {
-
         $this->arguments = $args;
         $func = function ($argsFromFile) use ($file, $args) {
-
             if (($dir = ($this->dir[$this->get] ?? null)) || !is_null($dir)) {
                 if (is_callable($file)) {
                     $out = $file($this, $args);
@@ -523,4 +514,44 @@ public function isEl($elem): bool
     {
         return ($elem instanceof Element);
     }
+
+
+    /**
+     * Get partial keys
+     * @param  string      $partialKey
+     * @param  string|null &$file
+     * @return array
+     */
+    final protected function selectPartial(string $partialKey, ?string &$file = null): array
+    {
+        $key = $partialKey;
+        $partial = explode(".", $partialKey);
+        $file = $key2 = $key = $this->cleanKey($key);
+
+        if (count($partial) > 1) {
+            $key2 = $partial[1];
+            $file = $key2 = $this->cleanKey($key2);
+            $key = $partial[0];
+            if (isset($partial[2])) {
+                $key2 = "{$key}-{$partial[2]}";
+            }
+            if (($pos = strpos($key2, "|")) !== false) {
+                $key2 = substr($key2, 0, $pos);
+            }
+        }
+        return [$key, $key2];
+    }
+
+    /**
+     * Clean key
+     * @param  string $key
+     * @return string
+     */
+    final protected function cleanKey(string $key): string
+    {
+        if(strpos($key, "!") === 0) {
+            return substr($key, 1);
+        }
+        return $key;
+    }
 }