Skip to content

Commit 349a9ce

Browse files
abnegateabnegate
committed
Merge remote-tracking branch 'origin/master' into 1.5.x
# Conflicts: # templates/android/docs/java/example.md.twig # templates/android/docs/kotlin/example.md.twig # templates/dart/docs/example.md.twig # templates/deno/docs/example.md.twig # templates/dotnet/docs/example.md.twig # templates/flutter/docs/example.md.twig # templates/kotlin/docs/java/example.md.twig # templates/node/docs/example.md.twig # templates/php/docs/example.md.twig # templates/python/docs/example.md.twig # templates/ruby/docs/example.md.twig # templates/swift/docs/example.md.twig # templates/web/docs/example.md.twig
2 parents 88db428 + 8d93209 commit 349a9ce

File tree

21 files changed

+85
-59
lines changed

21 files changed

+85
-59
lines changed

‎templates/android/docs/java/example.md.twig

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,15 @@ Client client = new Client(context)
4343
}));{% endif %}
4444

4545
{% for parameter in method.parameters.all %}
46-
{%~ if parameter.required -%}
4746
{%~ if parameter.enumValues is not empty -%}
4847
{%~ if parameter.enumName is not empty -%}
4948
{%~ set name = parameter.enumName -%}
5049
{%~ else -%}
5150
{%~ set name = parameter.name -%}
5251
{%~ endif %}
53-
{{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }},
52+
{{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }}, // {{ parameter.name }} {% if not parameter.required %}(optional){% endif %}
5453
{%~ else %}
55-
{{ parameter | paramExample }},
56-
{%~ endif -%}
54+
{{ parameter | paramExample }}, // {{ parameter.name }} {% if not parameter.required %}(optional){% endif %}
5755
{%~ endif -%}
5856
{%~ if loop.last %}
5957
new CoroutineCallback<>((result, error) -> {

‎templates/android/docs/kotlin/example.md.twig

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,16 @@ val {{ service.name | caseCamel }} = {{ service.name | caseUcfirst }}(client)
3636
{% if method.type == 'webAuth' %}
3737
{% elseif method.type == 'location' %}
3838
val result = {%~ else %}val response = {% endif %}{{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% if method.parameters.all | length == 0 %}){% endif %}
39-
40-
{% for parameter in method.parameters.all %}
41-
{%~ if parameter.required -%}
39+
{%~ for parameter in method.parameters.all %}
4240
{%~ if parameter.enumValues is not empty -%}
4341
{%~ if parameter.enumName is not empty -%}
4442
{%~ set name = parameter.enumName -%}
4543
{%~ else -%}
4644
{%~ set name = parameter.name -%}
4745
{%~ endif %}
48-
{{ parameter.name }} = {{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }},
46+
{{ parameter.name }} = {{ name }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }},{% if not parameter.required %} // (optional){% endif %}
4947
{%~ else %}
50-
{{ parameter.name }} = {{ parameter | paramExample }},
48+
{{ parameter.name }} = {{ parameter | paramExample }}, {% if not parameter.required %}// (optional){% endif %}
5149
{%~ endif -%}
52-
{%~ endif %}
53-
{%~ if loop.last %}
5450
)
55-
{%- endif %}
5651
{% endfor %}

‎templates/cli/base/params.twig

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
file: 'code.tar.gz'
3535
}, files);
3636

37+
let archivePath = fs.realpathSync('code.tar.gz')
38+
if (typeof archivePath !== 'undefined') {
39+
payload['{{ parameter.name }}'] = archivePath;
40+
{{ parameter.name | caseCamel | escapeKeyword }} = archivePath;
41+
}
42+
3743
{% endif %}
3844
const filePath = fs.realpathSync({{ parameter.name | caseCamel | escapeKeyword }});
3945
const nodeStream = fs.createReadStream(filePath);
@@ -70,7 +76,6 @@
7076
}
7177
{% endif %}
7278
{% endfor %}
73-
7479
{% if method.type == 'location' %}
7580
payload['project'] = localConfig.getProject().projectId
7681
payload['key'] = globalConfig.getKey();

‎templates/cli/base/requests/api.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let response = undefined;
2-
2+
33
response = await client.call('{{ method.method | caseLower }}', apiPath, {
44
{% for parameter in method.parameters.header %}
55
'{{ parameter.name }}': ${{ parameter.name | caseCamel | escapeKeyword }},
@@ -11,8 +11,8 @@
1111

1212
{% if method.type == 'location' %}
1313
fs.writeFileSync(destination, response);
14+
1415
{% endif %}
15-
1616
if (parseOutput) {
1717
parse(response)
1818
success()

‎templates/cli/base/requests/file.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% for parameter in method.parameters.all %}
22
{% if parameter.type == 'file' %}
3-
43
const size = {{ parameter.name | caseCamel | escapeKeyword }}.size;
54

65
const apiHeaders = {

‎templates/cli/lib/client.js.twig

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ class Client {
152152
return data;
153153
}
154154

155+
let cookies = response.headers.getSetCookie();
156+
if (cookies && cookies.length > 0) {
157+
globalConfig.setCookie(cookies[0]);
158+
}
159+
155160
const text = await response.text();
156161
let json = undefined;
157162
try {

‎templates/cli/lib/commands/command.js.twig

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function convertReadStreamToReadableStream(readStream) {
3737

3838
const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower }}").description(commandDescriptions['{{ service.name | caseLower }}']).configureHelp({
3939
helpWidth: process.stdout.columns || 80
40-
})
40+
})
4141

4242
{% for method in service.methods %}
4343
/**
@@ -51,7 +51,7 @@ const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower
5151
* @property {CallableFunction} onProgress
5252
{% endif %}
5353
{% if method.type == 'location' %}
54-
* @property {string} destination
54+
* @property {string} destination
5555
{% endif %}
5656
*/
5757

@@ -60,18 +60,15 @@ const {{ service.name | caseLower }} = new Command("{{ service.name | caseLower
6060
*/
6161
const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {% for parameter in method.parameters.all %}{{ parameter.name | caseCamel | escapeKeyword }}, {% endfor %}parseOutput = true, sdk = undefined{% if 'multipart/form-data' in method.consumes %}, onProgress = () => {}{% endif %}{% if method.type == 'location' %}, destination{% endif %}}) => {
6262
let client = !sdk ? await {% if service.name == "projects" %}sdkForConsole(){% else %}sdkForProject(){% endif %} : sdk;
63-
6463
let apiPath = '{{ method.path }}'{% for parameter in method.parameters.path %}.replace('{{ '{' }}{{ parameter.name | caseCamel }}{{ '}' }}', {{ parameter.name | caseCamel | escapeKeyword }}){% endfor %};
6564
{{ include ('cli/base/params.twig') }}
6665
{% if 'multipart/form-data' in method.consumes %}
67-
{{ include ('cli/base/requests/file.twig') }}
68-
{% else %}
66+
{{ include ('cli/base/requests/file.twig') }}{% else %}
6967
{{ include('cli/base/requests/api.twig') }}
7068
{% endif %}
7169
}
7270

7371
{% endfor %}
74-
7572
{% for method in service.methods %}
7673
{{service.name | caseLower }}
7774
.command(`{{ method.name | caseCamel }}`)
@@ -87,11 +84,10 @@ const {{ service.name | caseLower }}{{ method.name | caseUcfirst }} = async ({ {
8784
.action(actionRunner({{ service.name | caseLower }}{{ method.name | caseUcfirst }}))
8885

8986
{% endfor %}
90-
9187
module.exports = {
9288
{{ service.name | caseLower }},
9389
{% for method in service.methods %}
9490
{{ service.name | caseLower }}{{ method.name | caseUcfirst }}{% if not loop.last %},{% endif %}
95-
91+
9692
{% endfor %}
9793
};

‎templates/cli/lib/commands/generic.js.twig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ const client = new Command("client")
120120
success()
121121
}));
122122

123-
124123
module.exports = {
125124
{% if sdk.test != "true" %}
126125
login,

‎templates/dart/docs/example.md.twig

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,11 @@ void main() { // Init SDK
1717
{% endfor %} ;
1818

1919
{% endif %}
20-
Future result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}
21-
{% if loop.first %}
22-
23-
{% endif %}
24-
{% if parameter.required %}
25-
{{ parameter.name | caseCamel | overrideIdentifier }}:{% if parameter.enumValues | length > 0 %} {{ parameter.enumName }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseCamel | replace({'-': ''}) }}{% else %}{{ parameter | paramExample | replace({'<field-name>': (parameter.name | caseCamel) }) | raw }} {% endif %},
26-
{% endif %}
27-
{% endfor %}{% if method.parameters.all | length > 0 %} {% endif %});
20+
Future result = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}(
21+
{%~ for parameter in method.parameters.all %}
22+
{{ parameter.name | caseCamel | overrideIdentifier }}:{% if parameter.enumValues | length > 0 %} {{ parameter.enumName }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseCamel | replace({'-': ''}) }}{% else %}{{ parameter | paramExample | replace({'<field-name>': (parameter.name | caseCamel) }) | raw }} {% endif %},{% if not parameter.required %} // optional{% endif %}
23+
{%~ endfor %}
24+
);
2825

2926
result
3027
.then((response) {

‎templates/deno/docs/example.md.twig

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,18 @@ client
1616
.set{{header}}('{{node[header]['x-appwrite']['demo']}}') // {{node[header].description}}
1717
{% endfor %}
1818
{% endfor %};
19-
2019
{% endif %}
2120

22-
let promise = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}({% for parameter in method.parameters.all %}{% if parameter.required %}{% if not loop.first %}, {% endif %}{% if parameter.enumValues | length > 0%}{{parameter.enumName}}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }}{% else%}{{ parameter | paramExample }}{% endif %}{% endif %}{% endfor %});
21+
const promise = {{ service.name | caseCamel }}.{{ method.name | caseCamel }}(
22+
{%~ for parameter in method.parameters.all %}
23+
{%~ if parameter.enumValues | length > 0%}
24+
{{ parameter.enumName }}.{{ (parameter.enumKeys[0] ?? parameter.enumValues[0]) | caseEnumKey }}{% if not loop.last %}, {% endif %} // {{parameter.name}} {% if not parameter.required %}(optional){% endif %}
25+
{%~ else %}
26+
{{ parameter | paramExample }}{% if not loop.last %}, {% endif %} // {{parameter.name}} {% if not parameter.required %}(optional){% endif %}
27+
{%~ endif %}
28+
{%~ endif %}
29+
{%~ endfor %}
30+
);
2331

2432
promise.then(function (response) {
2533
console.log(response);

0 commit comments

Comments
 (0)