Merge pull request #155 from appwrite/feat-cli-issue-fixes

feat: added wildcard param to cli

Author: eldadfux

templates/cli/app/services/client.php.twig

@@ -6,7 +6,7 @@ require_once './vendor/autoload.php';
 
 use {{ spec.title | caseUcfirst }}\Client;
 use Utopia\CLI\CLI;
-use Utopia\Validator\Mock;
+use Utopia\Validator\Wildcard;
 use Utopia\CLI\Console;
 use {{ spec.title | caseUcfirst }}\Parser;
 
@@ -37,7 +37,7 @@ $cli->
 
 $cli
     ->task('setEndpoint')
-    ->param('endpoint', '', new Mock(), 'Your {{ spec.title | title }} endpoint', false)
+    ->param('endpoint', '', new Wildcard(), 'Your {{ spec.title | title }} endpoint', false)
     ->action(function($endpoint) use ($client) {
         $result = $client->setPreference('endpoint', $endpoint)
                          ->savePreferences();
@@ -50,7 +50,7 @@ $cli
 
 $cli
     ->task('setSelfSigned')
-    ->param('value', '', new Mock(), 'A boolean representing whether you are using a self signed certificate', false)
+    ->param('value', '', new Wildcard(), 'A boolean representing whether you are using a self signed certificate', false)
     ->action(function($value) use ($client) {
         $result = $client->setPreference('selfSigned', $value)
                          ->savePreferences();
@@ -65,7 +65,7 @@ $cli
 {% for header in spec.global.headers %}
 $cli
     ->task('set{{ header.key }}')
-    ->param('{{ header.key | lower }}', '', new Mock(), '{{ header.description }}', false)
+    ->param('{{ header.key | lower }}', '', new Wildcard(), '{{ header.description }}', false)
     ->action(function(${{ header.key | lower }}) use ($client) {
         $result = $client->setPreference('{{ header.name }}', ${{ header.key | lower }})
                          ->savePreferences();

templates/cli/app/services/init.php.twig

@@ -6,7 +6,7 @@ require_once './vendor/autoload.php';
 
 use Exception;
 use Utopia\CLI\CLI;
-use Utopia\Validator\Mock;
+use Utopia\Validator\Wildcard;
 use Utopia\CLI\Console;
 use {{ spec.title | caseUcfirst }}\Parser;
 
@@ -168,9 +168,9 @@ $cli->
 $cli
     ->task('init')
     ->label('description', "The init command is used to initialise your CLI\n")
-    ->param('endpoint', '', new Mock(), 'Your {{ spec.title | caseUcfirst }} endpoint', true)
+    ->param('endpoint', '', new Wildcard(), 'Your {{ spec.title | caseUcfirst }} endpoint', true)
 {% for header in spec.global.headers %}
-    ->param('{{ header.key | lower }}', '', new Mock(), '{{ header.description }}', true)
+    ->param('{{ header.key | lower }}', '', new Wildcard(), '{{ header.description }}', true)
 {% endfor %}
     ->action(function( $endpoint, {% for header in spec.global.headers %} ${{ header.key | lower }}{% if not loop.last %},{% endif %}{% endfor %} ) {
         /* Check if enviroment variables exist

templates/cli/app/services/service.php.twig

@@ -9,7 +9,7 @@ use {{ spec.title | caseUcfirst }}\Client;
 use {{ spec.title | caseUcfirst }}\Parser;
 use Utopia\CLI\CLI;
 use Utopia\CLI\Console;
-use Utopia\Validator\Mock;
+use Utopia\Validator\Wildcard;
 
 $parser = new Parser();
 $cli = new CLI();
@@ -40,9 +40,12 @@ $cli
     ->task('{{ method.name | caseCamel }}')
     ->label('description', "{{ method.description | replace({'"':'\''}) | raw }}\n\n")
 {% for parameter in method.parameters.all %}
-    ->param('{{ parameter.name }}', {{ parameter | paramDefault }} , new Mock(), '{{ parameter.description}}', {% if not parameter.required %} true{% else %} false{% endif %})
+    ->param('{{ parameter.name }}', {{ parameter | paramDefault }} , new Wildcard() , '{{ parameter.description}}', {% if not parameter.required %} true{% else %} false{% endif %})
+{% endfor %}
+    ->action(function ({% for parameter in method.parameters.all %} ${{ parameter.name}}{% if not loop.last %},{% endif %}{% endfor %} ) use ($parser) {
+{% for parameter in method.parameters.all %}
+        /** @var {{ parameter.type }} ${{ parameter.name }} */
 {% endfor %}
-    ->action(function ({% for parameter in method.parameters.all %} ${{ parameter.name}}{% if not loop.last %},{% endif %}{% endfor %} ) use ($parser) {        
         $client = new Client();
         $path   = str_replace([{% for parameter in method.parameters.path %}'{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}'{% if not loop.last %}, {% endif %}{% endfor %}], [{% for parameter in method.parameters.path %}${{ parameter.name | caseCamel }}{% if not loop.last %}, {% endif %}{% endfor %}], '{{ method.path }}');
         $params = [];
@@ -71,7 +74,7 @@ $cli
         $cFile = new \CURLFile(${{ parameter.name | caseCamel }}, {% if method.packaging %} 'application/x-gzip' {% else %} 'image/png' {% endif %}, basename(${{ parameter.name | caseCamel }}));
         $params['{{ parameter.name }}'] = $cFile;
 {% else %}
-        $params['{{ parameter.name }}'] = ${{ parameter.name | caseCamel }};
+        $params['{{ parameter.name }}'] = {% if parameter.type == 'integer' %}(int){% endif %} ${{ parameter.name | caseCamel }};
 {% endif %}
 {% endfor %}
 {% for parameter in method.parameters.formData %}