Merge branch 'master' into dart-fl-upgrade-dependencies

Author: lohanidamodar

composer.lock

@@ -2,6 +2,7 @@
 
 namespace Appwrite\SDK\Language;
 
+use Twig\TwigFilter;
 use Twig\TwigFunction;
 
 class CLI extends Node
@@ -364,6 +365,14 @@ public function getParamExample(array $param): string
         return $output;
     }
 
+    public function getFilters(): array
+    {
+        return array_merge(parent::getFilters(), [
+            new TwigFilter('caseKebab', function ($value) {
+                return strtolower(preg_replace('/(?<!^)([A-Z][a-z]|(?<=[a-z])[^a-z]|(?<=[A-Z])[0-9_])/', '-$1', $value));
+            })
+        ]);
+    }
     /**
      * Language specific filters.
      * @return array

src/SDK/Language/CLI.php

@@ -63,11 +63,6 @@ public function getFiles(): array
                 'destination'   => 'go.mod',
                 'template'      => 'go/go.mod.twig',
             ],
-            [
-                'scope'         => 'default',
-                'destination'   => 'example/main.go',
-                'template'      => 'go/main.go.twig',
-            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'README.md',
@@ -83,6 +78,11 @@ public function getFiles(): array
                 'destination'   => 'LICENSE',
                 'template'      => 'go/LICENSE.twig',
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'appwrite/appwrite.go',
+                'template'      => 'go/appwrite.go.twig',
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => 'client/client.go',
@@ -145,7 +145,9 @@ public function getTypeName(array $parameter, array $spec = []): string
             self::TYPE_STRING => 'string',
             self::TYPE_BOOLEAN => 'bool',
             self::TYPE_OBJECT => 'interface{}',
-            self::TYPE_ARRAY => '[]interface{}',
+            self::TYPE_ARRAY => (!empty(($parameter['array'] ?? [])['type']) && !\is_array($parameter['array']['type']))
+            ? '[]' . $this->getTypeName($parameter['array'])
+            : '[]string',
             default => $parameter['type'],
         };
     }
@@ -170,8 +172,10 @@ public function getParamDefault(array $param): string
             switch ($type) {
                 case self::TYPE_NUMBER:
                 case self::TYPE_INTEGER:
+                    $output .= "0";
+                    break;
                 case self::TYPE_BOOLEAN:
-                    $output .= 'null';
+                    $output .= 'false';
                     break;
                 case self::TYPE_STRING:
                     $output .= '""';
@@ -283,25 +287,34 @@ public function getFilters(): array
                 }
                 return implode("\n" . $indent, $value);
             }, ['is_safe' => ['html']]),
-            new TwigFilter('propertyType', function (array $property, array $spec, string $generic = 'interface{}') {
+            new TwigFilter('propertyType', function (array $property, array $spec, string $generic = 'map[string]interface{}') {
                 return $this->getPropertyType($property, $spec, $generic);
             }),
-            new TwigFilter('returnType', function (array $method, array $spec, string $namespace, string $generic = 'T') {
+            new TwigFilter('returnType', function (array $method, array $spec, string $namespace, string $generic = 'map[string]interface{}') {
                 return $this->getReturnType($method, $spec, $namespace, $generic);
             }),
             new TwigFilter('caseEnumKey', function (string $value) {
                 return $this->toUpperSnakeCase($value);
-            })
+            }),
         ];
     }
 
-    protected function getPropertyType(array $property, array $spec, string $generic = 'interface{}'): string
+    protected function getPropertyType(array $property, array $spec, string $generic = 'map[string]interface{}'): string
     {
-        $type = $this->getTypeName($property);
+        if (\array_key_exists('sub_schema', $property)) {
+            $type = $this->toPascalCase($property['sub_schema']);
+
+            if ($property['type'] === 'array') {
+                $type = '[]' . $type;
+            }
+        } else {
+            $type = $this->getTypeName($property);
+        }
+
         return $type;
     }
 
-    protected function getReturnType(array $method, array $spec, string $namespace, string $generic = 'T'): string
+    protected function getReturnType(array $method, array $spec, string $namespace, string $generic = 'map[string]interface{}'): string
     {
         if ($method['type'] === 'webAuth') {
             return 'bool';
@@ -322,4 +335,27 @@ protected function getReturnType(array $method, array $spec, string $namespace,
 
         return 'models.' . $ret;
     }
+
+    protected function hasGenericType(?string $model, array $spec): string
+    {
+        if (empty($model) || $model === 'any') {
+            return false;
+        }
+
+        $model = $spec['definitions'][$model];
+
+        if ($model['additionalProperties']) {
+            return true;
+        }
+
+        foreach ($model['properties'] as $property) {
+            if (!\array_key_exists('sub_schema', $property) || !$property['sub_schema']) {
+                continue;
+            }
+
+            return $this->hasGenericType($property['sub_schema'], $spec);
+        }
+
+        return false;
+    }
 }

src/SDK/Language/Go.php

@@ -24,11 +24,9 @@
             );
          } else {
             parse(response)
-            success()
         }
     {%~ else %}
         parse(response)
-        success()
     {%~ endif %}
     }
 

templates/cli/base/requests/api.twig

@@ -107,7 +107,6 @@
 
     if (parseOutput) {
         parse(response)
-        success()
     }
 
     return response;

templates/cli/base/requests/file.twig

@@ -16,7 +16,7 @@ const { login, logout, whoami, migrate, register } = require("./lib/commands/gen
 const { init } = require("./lib/commands/init");
 const { pull } = require("./lib/commands/pull");
 const { run } = require("./lib/commands/run");
-const { push } = require("./lib/commands/push");
+const { push, deploy } = require("./lib/commands/push");
 {% else %}
 const { migrate } = require("./lib/commands/generic");
 {% endif %}
@@ -30,15 +30,16 @@ program
   .description(commandDescriptions['main'])
   .configureHelp({
     helpWidth: process.stdout.columns || 80,
-    sortSubcommands: true
+    sortSubcommands: true,
   })
-  .version(version, "-v, --version")
+  .helpOption('-h, --help', "Display help for command")
+  .version(version, "-v, --version", "Output the version number")
   .option("-V, --verbose", "Show complete error log")
   .option("-j, --json", "Output in JSON format")
   .hook('preAction', migrate)
   .option("-f,--force", "Flag to confirm all warnings")
   .option("-a,--all", "Flag to push all resources")
-  .option("--id [id...]", "Flag to pass list of ids for a giving action")
+  .option("--id [id...]", "Flag to pass a list of ids for a given action")
   .option("--report", "Enable reporting in case of CLI errors")
   .on("option:json", () => {
     cliConfig.json = true;
@@ -67,6 +68,7 @@ program
   .addCommand(init)
   .addCommand(pull)
   .addCommand(push)
+  .addCommand(deploy)
   .addCommand(run)
   .addCommand(logout)
 {% endif %}