update: update some template logic

inhere · Nov 8, 2021 · c51197b · c51197b
1 parent bc57878
commit c51197b
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 43 deletions.
diff --git a/app/Console/Controller/JsonController.php b/app/Console/Controller/JsonController.php
@@ -70,7 +70,7 @@ protected function init(): void
     {
         parent::init();
 
-        $this->dumpfile = Kite::getPath('tmp/json-load.json');
+        $this->dumpfile = Kite::getTmpPath('json-load.json');
     }
 
     protected function jsonRender(): JSONPretty
@@ -311,7 +311,7 @@ public function toClassCommand(FlagsParser $fs, Output $output): void
             'tplDir'  => $tplDir,
             'tplFile' => $tplFile,
         ]));
-// vdump($config);
+
         // @user-custom/template/java-service-tpl/req-resp-dto.tpl
         $gen = JsonToCode::create($type)
             ->setSource($json)

diff --git a/app/Lib/Generate/JsonToJavaClass.php b/app/Lib/Generate/JsonToJavaClass.php
@@ -2,8 +2,6 @@
 
 namespace Inhere\Kite\Lib\Generate;
 
-use function random_int;
-
 /**
  * class JsonToJavaClass
  * - json(5) to java DTO class
@@ -18,7 +16,8 @@ class JsonToJavaClass extends AbstractJsonToCode
     public function generate(): string
     {
         // todo
-        $this->contexts['pkgName'] = 'YOUR.PKG.NAME';
+        $this->contexts['package'] = 'YOUR.PKG.NAME';
+        $this->contexts['pkgName'] = 'PKG_NAME';
         $this->contexts['className'] = 'YourClass';
 
         return parent::generate();

diff --git a/app/Lib/Template/AbstractTemplate.php b/app/Lib/Template/AbstractTemplate.php
@@ -3,6 +3,7 @@
 namespace Inhere\Kite\Lib\Template;
 
 use Inhere\Kite\Lib\Template\Contract\TemplateInterface;
+use Toolkit\Stdlib\Obj;
 
 /**
  * Class AbstractTemplate
@@ -15,7 +16,25 @@ abstract class AbstractTemplate implements TemplateInterface
     /**
      * @var array
      */
-    protected $globalVars = [];
+    protected array $globalVars = [];
+
+    /**
+     * @return static
+     */
+    public static function new(array $config = []): self
+    {
+        return new static($config);
+    }
+
+    /**
+     * Class constructor.
+     *
+     * @param array $config
+     */
+    public function __construct(array $config = [])
+    {
+        Obj::init($this, $config);
+    }
 
     /**
      * @return array

diff --git a/app/Lib/Template/HtmlTemplate.php b/app/Lib/Template/HtmlTemplate.php
@@ -15,21 +15,21 @@
 class HtmlTemplate extends TextTemplate
 {
     /**
-     * @var string
+     * @var string[]
      */
-    protected string $viewsDir = '';
+    protected array $allowExt = ['.html', '.phtml', '.php'];
 
     /**
-     * @var string[]
+     * @var string
      */
-    protected array $allowExt = ['.html', '.phtml', '.php'];
+    protected string $viewsDir = '';
 
     /**
      * manual set view files
      *
      * @var array
      */
-    protected $viewsFiles = [];
+    protected array $viewsFiles = [];
 
     /**
      * @param string $viewPath
@@ -79,7 +79,7 @@ protected function findViewFile(string $viewName): string
                 return $viewFile;
             }
 
-            throw new InvalidArgumentException("the view file '$viewName' not found");
+            throw new InvalidArgumentException("no such view file: $viewName");
         }
 
         foreach ($this->allowExt as $ext) {
@@ -89,7 +89,7 @@ protected function findViewFile(string $viewName): string
             }
         }
 
-        throw new InvalidArgumentException("the view file '$viewName' not found");
+        throw new InvalidArgumentException("no such view file: $viewName");
     }
 
     /**

diff --git a/app/Lib/Template/SimpleTemplate.php b/app/Lib/Template/SimpleTemplate.php
@@ -3,11 +3,11 @@
 namespace Inhere\Kite\Lib\Template;
 
 use InvalidArgumentException;
-use Toolkit\Stdlib\Obj;
 use function array_merge;
 use function file_exists;
 use function file_get_contents;
 use function sprintf;
+use function str_contains;
 use function strtr;
 
 /**
@@ -19,19 +19,11 @@
 class SimpleTemplate extends AbstractTemplate
 {
     /**
+     * template var format
+     *
      * @var string
      */
-    protected string $varTpl = '{{%s}}';
-
-    /**
-     * Class constructor.
-     *
-     * @param array $config
-     */
-    public function __construct(array $config = [])
-    {
-        Obj::init($this, $config);
-    }
+    protected string $format = '{{%s}}';
 
     /**
      * @param string $tplFile
@@ -42,7 +34,7 @@ public function __construct(array $config = [])
     public function renderFile(string $tplFile, array $tplVars): string
     {
         if (!file_exists($tplFile)) {
-            throw new InvalidArgumentException('the template file is not exist. file:' . $tplFile);
+            throw new InvalidArgumentException('No such template file:' . $tplFile);
         }
 
         $tplCode = file_get_contents($tplFile);
@@ -64,7 +56,7 @@ public function renderString(string $tplCode, array $tplVars): string
 
         $fmtVars = [];
         foreach ($tplVars as $name => $var) {
-            $name = sprintf($this->varTpl, (string)$name);
+            $name = sprintf($this->format, (string)$name);
             // add
             $fmtVars[$name] = $var;
         }
@@ -75,16 +67,20 @@ public function renderString(string $tplCode, array $tplVars): string
     /**
      * @return string
      */
-    public function getVarTpl(): string
+    public function getFormat(): string
     {
-        return $this->varTpl;
+        return $this->format;
     }
 
     /**
-     * @param string $varTpl
+     * @param string $format
      */
-    public function setVarTpl(string $varTpl): void
+    public function setFormat(string $format): void
     {
-        $this->varTpl = $varTpl;
+        if (!str_contains($format, '%s')) {
+            throw new InvalidArgumentException('var format must contains %s');
+        }
+
+        $this->format = $format;
     }
 }
diff --git a/app/Lib/Template/TextTemplate.php b/app/Lib/Template/TextTemplate.php
@@ -6,7 +6,6 @@
 use RuntimeException;
 use Throwable;
 use Toolkit\FsUtil\Dir;
-use Toolkit\Stdlib\Obj;
 use Toolkit\Sys\Sys;
 use function array_merge;
 use function date;
@@ -48,16 +47,6 @@ class TextTemplate extends AbstractTemplate
      */
     private string $tmpPhpFile = '';
 
-    /**
-     * Class constructor.
-     *
-     * @param array $config
-     */
-    public function __construct(array $config = [])
-    {
-        Obj::init($this, $config);
-    }
-
     /**
      * @param string $tplCode
      * @param array  $tplVars