👔 up: update some logic gen DTO and modify text parser

inhere · Mar 26, 2024 · 9c2a015 · 9c2a015
1 parent 204573f
commit 9c2a015
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 811 deletions.
diff --git a/app/Console/Controller/JsonController.php b/app/Console/Controller/JsonController.php
@@ -16,9 +16,9 @@
 use Inhere\Kite\Console\Component\ContentsAutoReader;
 use Inhere\Kite\Console\Component\ContentsAutoWriter;
 use Inhere\Kite\Kite;
-use Inhere\Kite\Lib\Generate\JsonToCode;
+use Inhere\Kite\Lib\Generate\DTOGenerator;
 use Inhere\Kite\Lib\Parser\Text\Json5ItemParser;
-use Inhere\Kite\Lib\Parser\Text\TextParser;
+use Inhere\Kite\Lib\Parser\TextParser;
 use InvalidArgumentException;
 use Throwable;
 use Toolkit\FsUtil\File;
@@ -417,7 +417,7 @@ public function toClassCommand(FlagsParser $fs, Output $output): void
         $output->aList($config);
 
         // @user-custom/template/java-service-tpl/dto.tpl
-        $gen = JsonToCode::create($type)
+        $gen = DTOGenerator::create($type)
             ->setSource($json)
             ->configThis($config)
             ->loadVarsFromStrings($fs->getOpt('ctx'))

diff --git a/app/Console/Controller/StringController.php b/app/Console/Controller/StringController.php
@@ -22,7 +22,7 @@
 use Inhere\Kite\Helper\KiteUtil;
 use Inhere\Kite\Kite;
 use Inhere\Kite\Lib\Parser\Text\Json5ItemParser;
-use Inhere\Kite\Lib\Parser\Text\TextParser;
+use Inhere\Kite\Lib\Parser\TextParser;
 use Inhere\Kite\Lib\Stream\ListStream;
 use Inhere\Kite\Lib\Stream\StringStream;
 use InvalidArgumentException;

diff --git a/app/Console/SubCmd/GolangCmd/GenerateStructCmd.php b/app/Console/SubCmd/GolangCmd/GenerateStructCmd.php
@@ -13,7 +13,7 @@
 use Inhere\Kite\Lib\Generate\DTOGenerator;
 use Inhere\Kite\Lib\Parser\Text\Json5ItemParser;
 use Inhere\Kite\Lib\Parser\Text\TextItemParser;
-use Inhere\Kite\Lib\Parser\Text\TextParser;
+use Inhere\Kite\Lib\Parser\TextParser;
 use InvalidArgumentException;
 use PhpPkg\Config\ConfigUtil;
 use Toolkit\PFlag\FlagsParser;

diff --git a/app/Lib/Convert/JavaProperties.php b/app/Lib/Convert/JavaProperties.php
@@ -3,7 +3,6 @@
 namespace Inhere\Kite\Lib\Convert;
 
 use Toolkit\Stdlib\Arr;
-use Traversable;
 use function array_shift;
 use function count;
 use function explode;
@@ -20,6 +19,16 @@
  */
 class JavaProperties
 {
+    /**
+     * @param string $text
+     *
+     * @return array
+     */
+    public static function parseString(string $text): array
+    {
+        return (new self())->decode($text);
+    }
+
     /**
      * @param string $str
      *
@@ -28,7 +37,7 @@ class JavaProperties
     public function decode(string $str): array
     {
         $decoded = [];
-        $rawData = (array)parse_ini_string($str, false);
+        $rawData = (array)parse_ini_string($str);
 
         foreach ($rawData as $path => $value) {
             $path = trim($path, '.');

diff --git a/app/Lib/Generate/DTOGenerator.php b/app/Lib/Generate/DTOGenerator.php
@@ -5,7 +5,7 @@
 use Inhere\Kite\Lib\Defines\FieldMeta;
 use Inhere\Kite\Lib\Parser\DBTable;
 use Inhere\Kite\Lib\Parser\MySQL\TableField;
-use Inhere\Kite\Lib\Parser\Text\TextParser;
+use Inhere\Kite\Lib\Parser\TextParser;
 use InvalidArgumentException;
 use PhpPkg\Config\ConfigUtil;
 use Toolkit\Stdlib\Helper\Assert;

diff --git a/app/Lib/Generate/Json5Data.php b/app/Lib/Generate/Json5Data.php
@@ -6,7 +6,7 @@
 use ColinODell\Json5\SyntaxError;
 use Inhere\Kite\Lib\Defines\DataField\JsonField;
 use Inhere\Kite\Lib\Parser\Text\Json5ItemParser;
-use Inhere\Kite\Lib\Parser\Text\TextParser;
+use Inhere\Kite\Lib\Parser\TextParser;
 use Toolkit\Stdlib\Obj\AbstractObj;
 use Toolkit\Stdlib\Type;
 use function count;

diff --git a/app/Lib/Generate/JsonToCode.php b/app/Lib/Generate/JsonToCode.php
diff --git a/app/Lib/Parser/Text/TextItemParser.php b/app/Lib/Parser/Text/TextItemParser.php
@@ -2,6 +2,7 @@
 
 namespace Inhere\Kite\Lib\Parser\Text;
 
+use Inhere\Kite\Lib\Parser\TextParser;
 use Toolkit\Stdlib\Str;
 use function array_combine;
 use function count;