Skip to content

Commit fb483b3

Browse files
committed
Merge branch 'master' of https://github.com/appwrite/sdk-generator into feat-add-path-keyword
2 parents f2c7387 + 115f6a9 commit fb483b3

File tree

10 files changed

+49
-11
lines changed

10 files changed

+49
-11
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ env:
2727
- SDK=CLINode16
2828
- SDK=DartBeta
2929
- SDK=DartStable
30-
- SDK=Deno1171
30+
- SDK=Deno1193
31+
- SDK=Deno1303
3132
- SDK=FlutterStable
3233
- SDK=FlutterBeta
3334
- SDK=Go112

templates/android/library/src/main/java/io/appwrite/services/ServiceTemplate.kt.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,15 @@ class {{ service.name | caseUcfirst }} : Service {
6262
{%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
6363
"{{ parameter.name }}" to {{ parameter.name | caseCamel }},
6464
{%~ endfor %}
65+
{%~ if method.type == 'location' or method.type == 'webAuth' %}
6566
{%~ if method.auth | length > 0 %}
6667
{%~ for node in method.auth %}
6768
{%~ for key,header in node | keys %}
6869
"{{ header | caseLower }}" to client.config["{{ header | caseLower }}"],
6970
{%~ endfor %}
7071
{%~ endfor %}
7172
{%~ endif %}
73+
{%~ endif %}
7274
)
7375
{%~ if method.type == 'webAuth' %}
7476
val query = mutableListOf<String>()

templates/dart/lib/package.dart.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ library {{ language.params.packageName }};
22

33
import 'dart:async';
44
import 'dart:typed_data';
5+
56
import 'src/enums.dart';
6-
import 'src/client.dart';
77
import 'src/service.dart';
88
import 'src/input_file.dart';
99
import 'src/upload_progress.dart';

templates/dart/lib/src/client_browser.dart.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
119119
}
120120

121121
while (offset < size) {
122-
var chunk;
122+
List<int> chunk;
123123
final end = min(offset + CHUNK_SIZE, size);
124124
chunk = file.bytes!.getRange(offset, end).toList();
125125
params[paramName] =

templates/deno/README.md.twig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ import * as sdk from "https://deno.land/x/{{ spec.title | caseDash }}/mod.ts";
3232
{{ sdk.gettingStarted|raw }}
3333
{% endif %}
3434

35+
> Minimal supported version for Deno SDK is 1.19.0.
36+
3537
## Contribution
3638

3739
This library is auto-generated by Appwrite custom [SDK Generator](https://github.com/appwrite/sdk-generator). To learn more about how you can help us improve this SDK, please check the [contribution guide](https://github.com/appwrite/sdk-generator/blob/master/CONTRIBUTING.md) before sending a pull-request.

templates/deno/src/inputFile.ts.twig

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import { readableStreamFromReader } from "https://deno.land/std/streams/conversion.ts";
2-
31
const _bufferToString = (buffer: Uint8Array): ReadableStream<Uint8Array> => {
42
return new ReadableStream({
53
start(controller) {
@@ -16,7 +14,7 @@ export class InputFile {
1614

1715
static fromPath = (filePath: string, filename: string): InputFile => {
1816
const file = Deno.openSync(filePath);
19-
const stream = readableStreamFromReader(file);
17+
const stream = file.readable;
2018
const size = Deno.statSync(filePath).size;
2119
return new InputFile(stream, filename, size);
2220
};

templates/flutter/.travis.yml.twig

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ dart: stable
55
os: linux
66

77
install:
8+
- cd ~
9+
- git clone https://github.com/flutter/flutter.git -b stable --depth 1
10+
- export PATH="$PATH:$(pwd)/flutter/bin/cache/dart-sdk/bin"
11+
- export PATH="$PATH:$(pwd)/flutter/bin"
12+
- flutter doctor
813
- mkdir -p ~/.config/dart
914
- |
1015
cat <<EOF > ~/.config/dart/pub-credentials.json
@@ -19,6 +24,6 @@ install:
1924
deploy:
2025
provider: script
2126
skip_cleanup: true
22-
script: dart format ./lib/ && dart pub publish -f
27+
script: dart format ./lib/ && flutter pub publish -f
2328
on:
24-
tags: true
29+
tags: true

templates/swift/base/params.twig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010
{%- else -%} let
1111
{%- endif %} params: [String: Any?] = [
1212
{%~ for parameter in method.parameters.query | merge(method.parameters.body) %}
13-
"{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or method.auth | length > 0 %},{% endif %}
13+
"{{ parameter.name }}": {{ parameter.name | caseCamel | escapeKeyword }}{% if not loop.last or (method.type == 'location' or method.type == 'webAuth' and method.auth | length > 0) %},{% endif %}
1414

1515
{%~ endfor %}
16+
{%~ if method.type == 'location' or method.type == 'webAuth' %}
1617
{%~ if method.auth | length > 0 %}
1718
{%~ for node in method.auth %}
1819
{%~ for key,header in node | keys %}
@@ -21,5 +22,6 @@
2122
{%~ endfor %}
2223
{%~ endfor %}
2324
{%~ endif %}
25+
{%~ endif %}
2426
]
2527
{%~ endif %}

tests/Deno1171Test.php renamed to tests/Deno1193Test.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace Tests;
44

5-
class Deno1171Test extends Base
5+
class Deno1193Test extends Base
66
{
77
protected string $sdkName = 'deno';
88
protected string $sdkPlatform = 'server';
@@ -13,7 +13,7 @@ class Deno1171Test extends Base
1313
protected string $class = 'Appwrite\SDK\Language\Deno';
1414
protected array $build = [];
1515
protected string $command =
16-
'docker run --rm -v $(pwd):/app -w /app denoland/deno:alpine-1.17.1 run --allow-net --allow-read tests/languages/deno/tests.ts';
16+
'docker run --rm -v $(pwd):/app -w /app denoland/deno:alpine-1.19.3 run --allow-net --allow-read tests/languages/deno/tests.ts';
1717

1818
protected array $expectedOutput = [
1919
...Base::FOO_RESPONSES,

tests/Deno1303Test.php

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace Tests;
4+
5+
class Deno1303Test extends Base
6+
{
7+
protected string $sdkName = 'deno';
8+
protected string $sdkPlatform = 'server';
9+
protected string $sdkLanguage = 'deno';
10+
protected string $version = '0.0.1';
11+
12+
protected string $language = 'deno';
13+
protected string $class = 'Appwrite\SDK\Language\Deno';
14+
protected array $build = [];
15+
protected string $command =
16+
'docker run --rm -v $(pwd):/app -w /app denoland/deno:alpine-1.30.3 run --allow-net --allow-read tests/languages/deno/tests.ts';
17+
18+
protected array $expectedOutput = [
19+
...Base::FOO_RESPONSES,
20+
...Base::BAR_RESPONSES,
21+
...Base::GENERAL_RESPONSES,
22+
...Base::LARGE_FILE_RESPONSES,
23+
...Base::EXCEPTION_RESPONSES,
24+
...Base::QUERY_HELPER_RESPONSES,
25+
...Base::PERMISSION_HELPER_RESPONSES,
26+
...Base::ID_HELPER_RESPONSES
27+
];
28+
}

0 commit comments

Comments
 (0)