fix some error for parse json5 header

inhere · Nov 12, 2021 · aa91adc · aa91adc
1 parent 6412d38
commit aa91adc
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/app/Console/Component/ContentsAutoReader.php b/app/Console/Component/ContentsAutoReader.php
@@ -65,14 +65,15 @@ public function read(string $source, array $opts = []): string
         if (!$source) {
             $this->srcType = self::TYPE_STDIN;
             $print && Cli::info('try read contents from STDIN');
-            $str = Kite::cliApp()->getInput()->readAll();
+            $str = Kite::cliApp()->getInput()->readAll(false);
+            // $str = File::readStdinBody();
 
             // is one line text
         } elseif (!str_contains($source, "\n")) {
             if (KiteUtil::isStdinAlias($source)) {
                 $this->srcType = self::TYPE_STDIN;
                 $print && Cli::info('try read contents from STDIN');
-                $str = Kite::cliApp()->getInput()->readAll();
+                $str = Kite::cliApp()->getInput()->readAll(false);
                 // $str = File::streamReadAll(STDIN);
                 // $str = File::readAll('php://stdin');
                 // vdump($str);

diff --git a/app/Lib/Generate/Java/JavaType.php b/app/Lib/Generate/Java/JavaType.php
@@ -2,6 +2,9 @@
 
 namespace Inhere\Kite\Lib\Generate\Java;
 
+use Toolkit\Stdlib\Type;
+use function ucfirst;
+
 /**
  * class JavaType
  */
@@ -18,6 +21,12 @@ class JavaType
      */
     public static function php2javaType(string $type): string
     {
-        return $type;
+        if ($type === 'int') {
+            $type = Type::INTEGER;
+        } elseif ($type === Type::ARRAY) {
+            $type = Type::OBJECT;
+        }
+
+        return ucfirst($type);
     }
 }
diff --git a/app/Lib/Generate/Json5Data.php b/app/Lib/Generate/Json5Data.php
@@ -47,7 +47,7 @@ public function loadFrom(string $json): self
                 ->setBeforeParseHeader(function (string $header) {
                     if ($pos = strpos($header, "//##\n")) {
                         $header = substr($header, $pos + 4);
-                        $header = str_replace("\n//", '', $header);
+                        $header = str_replace("\n//", "\n", $header);
                     }
 
                     return $header;