feat: add some new common methods

Author: inhere

src/Contract/ParserInterface.php

@@ -100,12 +100,23 @@ public function addArg(
     public function parse(?array $flags = null): bool;
 
     /**
+     * Whether defined the option
+     *
      * @param string $name
      *
      * @return bool
      */
     public function hasOpt(string $name): bool;
 
+    /**
+     * Whether input argument
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasInputOpt(string $name): bool;
+
     /**
      * Get an option value by name
      *
@@ -134,12 +145,30 @@ public function setOpt(string $name, $value): void;
     public function setTrustedOpt(string $name, $value): void;
 
     /**
+     * Whether defined the argument
+     *
      * @param string|int $nameOrIndex
      *
      * @return bool
      */
     public function hasArg($nameOrIndex): bool;
 
+    /**
+     * Whether input argument
+     *
+     * @param string|int $nameOrIndex
+     *
+     * @return bool
+     */
+    public function hasInputArg($nameOrIndex): bool;
+
+    /**
+     * @param string|int $nameOrIndex
+     *
+     * @return int Will return -1 if arg not exists
+     */
+    public function getArgIndex($nameOrIndex): int;
+
     /**
      * Get an argument value by name
      *

src/Flags.php

@@ -634,7 +634,7 @@ public function getArgument($nameOrIndex): ?Argument
     {
         if (is_string($nameOrIndex)) {
             if (!isset($this->name2index[$nameOrIndex])) {
-                throw new FlagException("flag argument '$nameOrIndex' is undefined");
+                return null;
             }
 
             $index = $this->name2index[$nameOrIndex];
@@ -645,6 +645,38 @@ public function getArgument($nameOrIndex): ?Argument
         return $this->arguments[$index] ?? null;
     }
 
+    /**
+     * @param string|int $nameOrIndex
+     *
+     * @return int
+     */
+    public function getArgIndex($nameOrIndex): int
+    {
+        if (is_string($nameOrIndex)) {
+            return $this->name2index[$nameOrIndex] ?? -1;
+        }
+
+        $index = (int)$nameOrIndex;
+        return isset($this->arguments[$index]) ? $index : -1;
+    }
+
+    /**
+     * Whether input argument
+     *
+     * @param string|int $nameOrIndex
+     *
+     * @return bool
+     */
+    public function hasInputArg($nameOrIndex): bool
+    {
+        $arg = $this->getArgument($nameOrIndex);
+        if (!$arg) {
+            return false;
+        }
+
+        return $arg->hasValue();
+    }
+
     /**
      * @return array
      */
@@ -820,16 +852,6 @@ public function hasOpt(string $name): bool
         return isset($this->options[$name]);
     }
 
-    /**
-     * @param string $name
-     *
-     * @return bool
-     */
-    public function hasMatched(string $name): bool
-    {
-        return isset($this->matched[$name]);
-    }
-
     /**
      * @param string     $name
      * @param null|mixed $default
@@ -839,7 +861,7 @@ public function hasMatched(string $name): bool
     public function getOpt(string $name, $default = null)
     {
         $opt = $this->getDefinedOption($name);
-        if (!$opt) { // not exist option
+        if (!$opt) { // not exist
             throw new FlagException("flag option '$name' is undefined");
         }
 
@@ -857,7 +879,7 @@ public function getOpt(string $name, $default = null)
     public function setOpt(string $name, $value): void
     {
         $opt = $this->getDefinedOption($name);
-        if (!$opt) { // not exist option
+        if (!$opt) { // not exist
             throw new FlagException("flag option '$name' is undefined");
         }
 
@@ -885,7 +907,27 @@ public function setTrustedOpt(string $name, $value): void
      */
     public function getOption(string $name): ?Option
     {
-        return $this->matched[$name] ?? null;
+        return $this->options[$name] ?? null;
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasInputOpt(string $name): bool
+    {
+        return isset($this->matched[$name]);
+    }
+
+    /**
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasMatched(string $name): bool
+    {
+        return isset($this->matched[$name]);
     }
 
     /**
@@ -977,4 +1019,14 @@ public function getMatchedOptions(): array
     {
         return $this->matched;
     }
+
+    /**
+     * @param string $name
+     *
+     * @return Option|null
+     */
+    public function getMatchedOption(string $name): ?Option
+    {
+        return $this->matched[$name] ?? null;
+    }
 }

src/SFlags.php

@@ -927,7 +927,7 @@ public function getArg($nameOrIndex, $default = null)
      *
      * @return int Will return -1 if arg not exists
      */
-    protected function getArgIndex($nameOrIndex): int
+    public function getArgIndex($nameOrIndex): int
     {
         if (!is_string($nameOrIndex)) {
             $index = (int)$nameOrIndex;
@@ -982,6 +982,20 @@ public function getOptsHelpData(): array
         return $helpData;
     }
 
+    /**
+     * Whether input argument
+     *
+     * @param string|int $nameOrIndex
+     *
+     * @return bool
+     */
+    public function hasInputArg($nameOrIndex): bool
+    {
+        $index = $this->getArgIndex($nameOrIndex);
+
+        return isset($this->args[$index]);
+    }
+
     /**
      * @param string|int $nameOrIndex
      *
@@ -1002,6 +1016,18 @@ public function getArgDefines(): array
         return $this->argDefines;
     }
 
+    /**
+     * Whether input argument
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public function hasInputOpt(string $name): bool
+    {
+        return isset($this->opts[$name]);
+    }
+
     /**
      * @param string $name
      *