update: update easy template gen tmp file logic

inhere · Nov 10, 2021 · da70490 · da70490
1 parent 7634022
commit da70490
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 185 deletions.
diff --git a/app/Helper/KiteUtil.php b/app/Helper/KiteUtil.php
@@ -4,6 +4,7 @@
 
 use Inhere\Kite\Kite;
 use Inhere\Kite\Lib\Template\EasyTemplate;
+use Inhere\Kite\Lib\Template\TextTemplate;
 use Toolkit\FsUtil\FS;
 use Toolkit\Stdlib\OS;
 use Toolkit\Stdlib\Str;
@@ -18,10 +19,10 @@
 class KiteUtil
 {
 
-    public const NL_CHAR = 'NL';
+    public const NL_CHAR    = 'NL';
     public const SPACE_CHAR = 'SPACE';
 
-    public const STDIN_ALIAS  = [
+    public const STDIN_ALIAS = [
         '@i',
         '@stdin',
         'stdin',
@@ -98,8 +99,7 @@ public static function userConfigDir(string $path = ''): string
      */
     public static function newTplEngine(array $config = []): EasyTemplate
     {
-        return EasyTemplate::new($config)
-            ->disableEchoFilter()
+        return TextTemplate::new($config)
             ->setPathResolver([Kite::class, 'resolve'])
             ->configThis(function (EasyTemplate $tpl) {
                 $tpl->tmpDir = Kite::getTmpPath('tplCache');

diff --git a/app/Lib/Template/AbstractTemplate.php b/app/Lib/Template/AbstractTemplate.php
@@ -112,7 +112,6 @@ protected function findTplFile(string $tplName): string
 
         $suffix  = '';
         $tplFile = $this->tplDir . '/' . $tplName;
-
         if (strpos($tplName, '.') > 0) {
             $suffix = File::getExtension($tplName);
         }

diff --git a/app/Lib/Template/EasyTemplate.php b/app/Lib/Template/EasyTemplate.php
@@ -6,15 +6,22 @@
 use Inhere\Kite\Lib\Template\Contract\CompilerInterface;
 use Inhere\Kite\Lib\Template\Contract\EasyTemplateInterface;
 use InvalidArgumentException;
+use Toolkit\FsUtil\File;
+use function basename;
 use function is_string;
 
 /**
  * Class EasyTemplate
  *
  * @author inhere
  */
-class EasyTemplate extends TextTemplate implements EasyTemplateInterface
+class EasyTemplate extends PhpTemplate implements EasyTemplateInterface
 {
+    /**
+     * @var string[]
+     */
+    protected array $allowExt = ['.html', '.phtml', '.php', '.tpl'];
+
     /**
      * @var CompilerInterface
      */
@@ -115,10 +122,10 @@ public function compileFile(string $tplFile): string
         $tplFile = $this->findTplFile($tplFile);
 
         // compile contents
-        $tplCode = $this->compiler->compileFile($tplFile);
+        $phpCode = $this->compiler->compileFile($tplFile);
 
         // generate temp php file
-        return $this->genTempPhpFile($tplCode);
+        return $this->genTmpPhpFile($phpCode, File::getName($tplFile, true));
     }
 
     /**

diff --git a/app/Lib/Template/HtmlTemplate.php b/app/Lib/Template/HtmlTemplate.php
diff --git a/app/Lib/Template/README.md b/app/Lib/Template/README.md
diff --git a/app/Lib/Template/TextTemplate.php b/app/Lib/Template/TextTemplate.php
@@ -2,130 +2,28 @@
 
 namespace Inhere\Kite\Lib\Template;
 
-use InvalidArgumentException;
-use RuntimeException;
-use Throwable;
-use Toolkit\FsUtil\Dir;
-use Toolkit\Sys\Sys;
-use function array_merge;
-use function date;
-use function extract;
-use function file_exists;
-use function file_put_contents;
-use function md5;
-use function ob_clean;
-use function ob_get_clean;
-use function ob_start;
-use function sprintf;
-use const EXTR_OVERWRITE;
-use const PHP_EOL;
-
 /**
- * Class TextTemplate
+ * class TextTemplate
  *
  * @author inhere
- * @package Inhere\Kite\Model\Logic
  */
-class TextTemplate extends AbstractTemplate
+class TextTemplate extends EasyTemplate
 {
     /**
-     * The dir for auto generated temp php file
-     *
-     * @var string
-     */
-    public string $tmpDir = '';
-
-    /**
-     * The auto generated temp php file
-     *
-     * @var string
-     */
-    private string $tmpPhpFile = '';
-
-    /**
-     * @param string $tplCode
-     * @param array  $tplVars
-     *
-     * @return string
-     */
-    public function renderString(string $tplCode, array $tplVars): string
-    {
-        $tempFile = $this->genTempPhpFile($tplCode);
-
-        return $this->doRenderFile($tempFile, $tplVars);
-    }
-
-    /**
-     * @param string $tplFile
-     * @param array  $tplVars
-     *
-     * @return string
-     */
-    public function renderFile(string $tplFile, array $tplVars): string
-    {
-        return $this->doRenderFile($tplFile, $tplVars);
-    }
-
-    /**
-     * @param string $tplFile
-     * @param array  $tplVars
-     *
-     * @return string
+     * @var string[]
      */
-    protected function doRenderFile(string $tplFile, array $tplVars): string
-    {
-        if (!file_exists($tplFile)) {
-            throw new InvalidArgumentException('no such template file:' . $tplFile);
-        }
-
-        if ($this->globalVars) {
-            $tplVars = array_merge($this->globalVars, $tplVars);
-        }
-
-        ob_start();
-        extract($tplVars, EXTR_OVERWRITE);
-        try {
-            // require \BASE_PATH . '/runtime/go-snippets-0709.tpl.php';
-            require $tplFile;
-            return ob_get_clean();
-        } catch (Throwable $e) {
-            ob_clean();
-            throw new RuntimeException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
+    protected array $allowExt = ['.php', '.tpl'];
 
     /**
-     * generate temp php file
+     * Class constructor.
      *
-     * @param string $tplCode
-     *
-     * @return string
+     * @param array $config
      */
-    protected function genTempPhpFile(string $tplCode): string
+    public function __construct(array $config = [])
     {
-        $tmpDir  = $this->tmpDir ?: Sys::getTempDir() . '/php-tpl-gen';
-        $tmpFile = sprintf('%s/%s-%s.php', $tmpDir, date('ymd_his'), md5($tplCode));
-
-        if (!file_exists($tmpFile)) {
-            Dir::create($tmpDir);
-
-            // write contents
-            $num = file_put_contents($tmpFile, $tplCode . PHP_EOL);
-            if ($num < 1) {
-                throw new RuntimeException('write template contents to temp file error');
-            }
-        }
+        parent::__construct($config);
 
-        $this->tmpPhpFile = $tmpFile;
-        return $tmpFile;
+        // use raw echo for text template
+        $this->getCompiler()->disableEchoFilter();
     }
-
-    /**
-     * @return string
-     */
-    public function getTmpPhpFile(): string
-    {
-        return $this->tmpPhpFile;
-    }
-
 }
diff --git a/app/Lib/Template/easy-template.md b/app/Lib/Template/easy-template.md
@@ -1,42 +0,0 @@
-# EasyTemplate
-
-## Using the filters
-
-You can use the filters in any of your blade templates.
-
-#### Regular usage:
-
-```php
-{{ 'john' | ucfirst }} // John
-```
-
-#### Chained usage:
-
-```php
-{{ 'john' | ucfirst | substr:0,1 }} // J
-{{ '1999-12-31' | date:'Y/m/d' }} // 1999/12/31
-```
-
-#### Passing non-static values:
-
-```php
-{{ $name | ucfirst | substr:0,1 }}
-{{ $user['name'] | ucfirst | substr:0,1 }}
-{{ $currentUser->name | ucfirst | substr:0,1 }}
-{{ getName() | ucfirst | substr:0,1 }}
-```
-
-#### Passing variables as filter parameters:
-
-```php
-$currency = 'HUF'
-{{ '12.75' | currency:$currency }} // HUF 12.75
-```
-
-#### Built-in Laravel functionality:
-
-```php
-{{ 'This is a title' | slug }} // this-is-a-title
-{{ 'This is a title' | title }} // This Is A Title
-{{ 'foo_bar' | studly }} // FooBar
-```

diff --git a/test/unittest/Lib/Template/TextTemplateTest.php b/test/unittest/Lib/Template/TextTemplateTest.php
@@ -3,7 +3,7 @@
 namespace Inhere\KiteTest\Lib\Template;
 
 use Inhere\Kite\Kite;
-use Inhere\Kite\Lib\Template\TextTemplate;
+use Inhere\Kite\Lib\Template\PhpTemplate;
 use Inhere\KiteTest\BaseKiteTestCase;
 use Toolkit\FsUtil\File;
 use function vdump;
@@ -15,7 +15,7 @@ class TextTemplateTest extends BaseKiteTestCase
 {
     public function testRenderFile():void
     {
-        $t = new TextTemplate();
+        $t = new PhpTemplate();
 
         $tplFile = Kite::alias('@resource-tpl/gen-by-parse/gen-go-funcs.tpl');
         $tplVars = ['vars' => ['Info', 'Error', 'Warn']];