Merge pull request #199 from appwrite/fix-deno-overall-improvements

fix(deno): overall improvements

Author: eldadfux

src/SDK/Language/Deno.php

@@ -95,9 +95,10 @@ public function getTypeName($type)
                 return 'boolean';
             break;
             case self::TYPE_ARRAY:
-            	return 'Array<any>';
-			case self::TYPE_OBJECT:
-				return 'DocumentData';
+                return 'string[]';
+            break;
+            case self::TYPE_OBJECT:
+                return 'object';
             break;
         }
 

templates/deno/src/client.ts.twig

@@ -1,13 +1,12 @@
 import { {{ spec.title | caseUcfirst}}Exception } from './exception.ts';
 
-export interface DocumentData {
+export interface Payload {
     [key: string]: any;
 }
 
 export class Client {
-
     endpoint: string = 'https://appwrite.io/v1';
-    headers: DocumentData = {
+    headers: Payload = {
         'content-type': '',
         'x-sdk-version': '{{spec.title | caseDash}}:{{ language.name | caseLower }}:{{ sdk.version }}',
 {% for key,header in spec.global.defaultHeaders %}
@@ -55,32 +54,32 @@ export class Client {
         return this;
     }
 
-    withoutHeader(key: string, headers: DocumentData): DocumentData {
-        return Object.keys(headers).reduce((acc: DocumentData, cv) => {
-            if (cv == 'content-type') return acc
-            acc[cv] = headers[cv]
-            return acc
+    withoutHeader(key: string, headers: Payload): Payload {
+        return Object.keys(headers).reduce((acc: Payload, cv) => {
+            if (cv == 'content-type') return acc;
+            acc[cv] = headers[cv];
+            return acc;
         }, {})
     }
 
-    async call(method: string, path: string = '', headers: DocumentData = {}, params: DocumentData = {}) {
-        headers = Object.assign(this.headers, headers);
+    async call(method: string, path: string = '', headers: Payload = {}, params: Payload = {}) {
+        headers = { ...this.headers, ...headers };
 
         let body;
-        const url = new URL(this.endpoint + path)
+        const url = new URL(this.endpoint + path);
         if (method.toUpperCase() === 'GET') {
-            url.search = new URLSearchParams(this.flatten(params)).toString()
-            body = null
+            url.search = new URLSearchParams(this.flatten(params)).toString();
+            body = null;
         } else if (headers['content-type'].toLowerCase().startsWith('multipart/form-data')) {
-            headers = this.withoutHeader('content-type', headers)
-            const formData = new FormData()
-            const flatParams = this.flatten(params)
+            headers = this.withoutHeader('content-type', headers);
+            const formData = new FormData();
+            const flatParams = this.flatten(params);
             for (const key in flatParams) {
                 formData.append(key, flatParams[key]);
             }
-            body = formData
+            body = formData;
         } else {
-            body = JSON.stringify(params)
+            body = JSON.stringify(params);
         }
 
         const options = {
@@ -99,7 +98,7 @@ export class Client {
                     throw new {{ spec.title | caseUcfirst}}Exception(res.message, res.status, res);
                 }
 
-                return response.json()
+                return response.json();
             } else {
                 if(response.status >= 400) {
                     let res = await response.text();
@@ -112,15 +111,15 @@ export class Client {
         }
     }
 
-    flatten(data: DocumentData, prefix = '') {
-        let output: DocumentData = {};
+    flatten(data: Payload, prefix = '') {
+        let output: Payload = {};
 
         for (const key in data) {
             let value = data[key];
             let finalKey = prefix ? prefix + '[' + key +']' : key;
 
             if (Array.isArray(value)) {
-                output = Object.assign(output, this.flatten(value, finalKey)); // @todo: handle name collision here if needed
+                output = { ...output, ...this.flatten(value, finalKey) }; // @todo: handle name collision here if needed
             }
             else {
                 output[finalKey] = value;

templates/deno/src/exception.ts.twig

@@ -3,7 +3,7 @@ export class {{ spec.title | caseUcfirst}}Exception {
     code: Number;
     response: any;
 
-    constructor(message: String, code: Number, response: any) {
+    constructor(message: String, code: Number = 0, response: any = "") {
         this.message = message;
         this.code = code;
         this.response = response;

templates/deno/src/services/service.ts.twig

@@ -1,5 +1,6 @@
-import { Service } from "../service.ts";
-import { DocumentData } from '../client.ts'
+import { Service } from '../service.ts';
+import { Payload } from '../client.ts';
+import { AppwriteException } from '../exception.ts';
 
 export class {{ service.name | caseUcfirst }} extends Service {
 {% for method in service.methods %}
@@ -12,32 +13,43 @@ export class {{ service.name | caseUcfirst }} extends Service {
      *
 {% endif %}
 {% for parameter in method.parameters.all %}
-     * @param {{ parameter.type | typeName }} {{ parameter.name | caseCamel }}
+     * @param {{ '{' }}{{ parameter.type | typeName }}{{ '}' }} {{ parameter.name | caseCamel }}
 {% endfor %}
-     * @throws Exception
-     * @return Promise<string>
+     * @throws {AppwriteException}
+     * @returns {Promise}
      */
-    async {{ method.name | caseCamel }}({% for parameter in method.parameters.all %}{{ parameter.name | caseCamel }}: {{ parameter.type | typeName }}{{ parameter | paramDefault }}{% if not loop.last %}, {% endif %}{% endfor %}): Promise<string> {
-        let path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replace(new RegExp('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', 'g'), {{ parameter.name | caseCamel }}){% endfor %};
-        
-        return await this.client.call('{{ method.method | caseLower }}', path, {
-{% for parameter in method.parameters.header %}
-                    '{{ parameter.name }}': ${{ parameter.name | caseCamel }},
-{% endfor %}
-{% for key, header in method.headers %}
-                    '{{ key }}': '{{ header }}',
+    async {{ method.name | caseCamel }}{% if method.type != "location" %}<T extends unknown>{% endif %}({% for parameter in method.parameters.all %}{{ parameter.name | caseCamel }}{% if not parameter.required%}?{% endif %}: {{ parameter.type | typeName }}{% if not loop.last %}, {% endif %}{% endfor %}): Promise<{% if method.type == 'location' %}Response{% else %}T{% endif %}> {
+{% for parameter in method.parameters.all %}
+{% if parameter.required %}
+        if (typeof {{ parameter.name | caseCamel }} === 'undefined') {
+            throw new {{spec.title | caseUcfirst}}Exception('Missing required parameter: "{{ parameter.name | caseCamel }}"');
+        }
+
+{% endif %}
 {% endfor %}
-               },
-               {
+        let path = '{{ method.path }}'{% for parameter in method.parameters.path %}.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel }}){% endfor %};
+        let payload: Payload = {};
+
 {% for parameter in method.parameters.query %}
-                '{{ parameter.name }}': {{ parameter.name | caseCamel }}{% if not loop.last %},{% endif %}
+        if (typeof {{ parameter.name | caseCamel }} !== 'undefined') {
+            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel }};
+        }
 
 {% endfor %}
 {% for parameter in method.parameters.body %}
-                '{{ parameter.name }}': {{ parameter.name | caseCamel }}{% if not loop.last %},{% endif %}
+        if (typeof {{ parameter.name | caseCamel }} !== 'undefined') {
+            payload['{{ parameter.name }}'] = {{ parameter.name | caseCamel }};
+        }
 
 {% endfor %}
-            });
+        return await this.client.call('{{ method.method | caseLower }}', path, {
+{% for parameter in method.parameters.header %}
+                    '{{ parameter.name }}': ${{ parameter.name | caseCamel }},
+{% endfor %}
+{% for key, header in method.headers %}
+                    '{{ key }}': '{{ header }}',
+{% endfor %}
+               }, payload);
     }
 {% endfor %}
 }