Merge pull request #468 from appwrite/feat-improve-deno-file-upload

Feat: More options for deno file upload

Author: TorstenDittmann

composer.lock

@@ -36,6 +36,12 @@ public function getFiles()
                 'template'      => 'deno/src/query.ts.twig',
                 'minify'        => false,
             ],
+            [
+                'scope'         => 'default',
+                'destination'   => 'src/inputFile.ts',
+                'template'      => 'deno/src/inputFile.ts.twig',
+                'minify'        => false,
+            ],
             [
                 'scope'         => 'default',
                 'destination'   => '/src/service.ts',
@@ -101,7 +107,7 @@ public function getTypeName($type)
                 return 'string';
             break;
             case self::TYPE_FILE:
-                return 'string';
+                return 'InputFile';
             break;
             case self::TYPE_BOOLEAN:
                 return 'boolean';

src/SDK/Language/Deno.php

@@ -1,5 +1,6 @@
 import { Client } from "./src/client.ts";
 import { Query } from "./src/query.ts";
+import { InputFile } from "./src/inputFile.ts";
 import { {{spec.title | caseUcfirst}}Exception } from "./src/exception.ts";
 {% for service in spec.services %}
 import { {{service.name | caseUcfirst}} } from "./src/services/{{service.name | caseDash}}.ts";
@@ -8,6 +9,7 @@ import { {{service.name | caseUcfirst}} } from "./src/services/{{service.name |
 export {
     Client,
     Query,
+    InputFile,
     {{spec.title | caseUcfirst}}Exception,
 {% for service in spec.services %}
     {{service.name | caseUcfirst}},

templates/deno/mod.ts.twig

@@ -78,7 +78,13 @@ export class Client {
             const formData = new FormData();
             const flatParams = this.flatten(params);
             for (const key in flatParams) {
-                formData.append(key, flatParams[key]);
+                const value = flatParams[key];
+
+                if(value && value.type && value.type === 'file') {
+                    formData.append(key, value.file, value.filename);
+                } else {
+                    formData.append(key, flatParams[key]);
+                }
             }
             body = formData;
         } else {

templates/deno/src/client.ts.twig

@@ -0,0 +1,42 @@
+import { readableStreamFromReader } from "https://deno.land/std/streams/conversion.ts";
+
+const _bufferToString = (buffer: Uint8Array): ReadableStream<Uint8Array> => {
+    return new ReadableStream({
+        start(controller) {
+            controller.enqueue(buffer);
+            controller.close();
+        }
+    });
+};
+
+export class InputFile {
+    stream: ReadableStream<Uint8Array>; // Content of file as a stream
+    size: number; // Total final size of the file content
+    filename: string; // File name
+
+    static fromPath = (filePath: string, filename: string): InputFile => {
+        const file = Deno.openSync(filePath);
+        const stream = readableStreamFromReader(file);
+        const size = Deno.statSync(filePath).size;
+        return new InputFile(stream, filename, size);
+    };
+
+    static fromBuffer = (buffer: Uint8Array, filename: string): InputFile => {
+        const stream = _bufferToString(buffer);
+        const size = buffer.byteLength;
+        return new InputFile(stream, filename, size);
+    };
+
+    static fromPlainText = (content: string, filename: string): InputFile => {
+        const buffer = new TextEncoder().encode(content);
+        const stream = _bufferToString(buffer);
+        const size = buffer.byteLength;
+        return new InputFile(stream, filename, size);
+    };
+
+    constructor(stream: ReadableStream<Uint8Array>, filename: string, size: number) {
+        this.stream = stream;
+        this.filename = filename;
+        this.size = size;
+    }
+}