recompile, add tests for null

aqua/examples/option.aqua

@@ -1,5 +1,8 @@
+import "@fluencelabs/aqua-lib/builtin.aqua"
+
 service SomeS("test2"):
     getStr: ?string -> ?string
+    getStr1: -> ?string
     getStr2: string -> string
 
 func useOptional(opt: ?string) -> string:
@@ -7,3 +10,12 @@ func useOptional(opt: ?string) -> string:
     for i <- opt:
         SomeS.getStr2(i)
     <- res!
+
+func returnOptional() -> ?string:
+    res <- SomeS.getStr1()
+    <- res
+
+func returnNone() -> ?string:
+    result: *string
+    Op.noop()
+    <- result

src/compiled/examples/assignment.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -47,7 +47,7 @@ export async function doSmth(client: FluenceClient, arg: {value:string}, config?
                 });
                 h.on('getDataSrv', 'arg', () => {return arg;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/callArrow.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/co.ts

@@ -0,0 +1,84 @@
+/**
+ *
+ * This file is auto-generated. Do not edit manually: changes may be erased.
+ * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
+ * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
+ * Aqua version: 0.1.10-SNAPSHOT
+ *
+ */
+import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
+import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
+import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+
+
+
+export async function coFunc(client: FluenceClient, node: string, c: (arg0: {external_addresses:string[]}) => void, config?: {ttl?: number}): Promise<void> {
+    let request: RequestFlow;
+    const promise = new Promise<void>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (seq
+      (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+      (call %init_peer_id% ("getDataSrv" "node") [] node)
+     )
+     (call %init_peer_id% ("coservice-id" "call") [] y)
+    )
+    (call -relay- ("op" "noop") [])
+   )
+   (xor
+    (seq
+     (call node ("peer" "identify") [] t)
+     (par
+      (seq
+       (call -relay- ("op" "noop") [])
+       (xor
+        (call %init_peer_id% ("callbackSrv" "c") [t])
+        (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+       )
+      )
+      (null)
+     )
+    )
+    (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+   )
+  )
+  (call %init_peer_id% ("coservice-id" "call") [] x)
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'node', () => {return node;});
+h.on('callbackSrv', 'c', (args) => {c(args[0]); return {};});
+                
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for coFunc');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return Promise.race([promise, Promise.resolve()]);
+}
+      

src/compiled/examples/complex.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -44,7 +44,7 @@ export async function helloWorld(client: FluenceClient, name: string, config?: {
                 });
                 h.on('getDataSrv', 'name', () => {return name;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -145,7 +145,7 @@ export async function testFunc(client: FluenceClient, config?: {ttl?: number}):
                 });
                 
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -303,7 +303,7 @@ h.on('getDataSrv', 'e', () => {return e;});
 h.on('getDataSrv', 'g', () => {return g;});
 h.on('getDataSrv', 'str', () => {return str;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/constants.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -44,7 +44,7 @@ export async function callConstant(client: FluenceClient, config?: {ttl?: number
                 });
                 
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/dataAlias.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -41,7 +41,7 @@ export async function getAliasedData(client: FluenceClient, config?: {ttl?: numb
                 });
                 
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/example.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/fldist-sample.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/fold.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/foldJoin.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -82,7 +82,7 @@ export async function getTwoResults(client: FluenceClient, relay: string, config
                 });
                 h.on('getDataSrv', 'relay', () => {return relay;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/func.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -41,7 +41,7 @@ export async function testFunc(client: FluenceClient, config?: {ttl?: number}):
                 });
                 
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/helloWorld.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -44,7 +44,7 @@ export async function helloWorld(client: FluenceClient, name: string, config?: {
                 });
                 h.on('getDataSrv', 'name', () => {return name;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/if.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/nestedFuncs.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -44,7 +44,7 @@ export async function a(client: FluenceClient, b: string, config?: {ttl?: number
                 });
                 h.on('getDataSrv', 'b', () => {return b;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -101,7 +101,7 @@ export async function d(client: FluenceClient, e: string, config?: {ttl?: number
                 });
                 h.on('getDataSrv', 'e', () => {return e;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/on.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -56,7 +56,7 @@ export async function getPeerExternalAddresses(client: FluenceClient, otherNodeP
                 });
                 h.on('getDataSrv', 'otherNodePeerId', () => {return otherNodePeerId;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -141,7 +141,7 @@ export async function getDistantAddresses(client: FluenceClient, target: string,
                 h.on('getDataSrv', 'target', () => {return target;});
 h.on('getDataSrv', 'viaNode', () => {return viaNode;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/option.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -52,7 +52,7 @@ export async function useOptional(client: FluenceClient, opt: string | null, con
                 });
                 h.on('getDataSrv', 'opt', () => {return opt === null ? [] : [opt];});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -75,3 +75,121 @@ export async function useOptional(client: FluenceClient, opt: string | null, con
     return promise;
 }
       
+
+
+export async function returnOptional(client: FluenceClient, config?: {ttl?: number}): Promise<string | null> {
+    let request: RequestFlow;
+    const promise = new Promise<string | null>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+   (call %init_peer_id% ("test2" "getStr1") [] res)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [res])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                
+                h.onEvent('callbackSrv', 'response', (args) => {
+    let [opt] = args;
+  if (Array.isArray(opt)) {
+      if (opt.length === 0) { resolve(null); }
+      opt = opt[0];
+  }
+  if (opt === null) { resolve(null); }
+  return resolve(opt);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for returnOptional');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+export async function returnNone(client: FluenceClient, config?: {ttl?: number}): Promise<string | null> {
+    let request: RequestFlow;
+    const promise = new Promise<string | null>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+   (call %init_peer_id% ("op" "noop") [])
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [$result])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                
+                h.onEvent('callbackSrv', 'response', (args) => {
+    let [opt] = args;
+  if (Array.isArray(opt)) {
+      if (opt.length === 0) { resolve(null); }
+      opt = opt[0];
+  }
+  if (opt === null) { resolve(null); }
+  return resolve(opt);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for returnNone');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

src/compiled/examples/par.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/passArgs.ts

@@ -0,0 +1,134 @@
+/**
+ *
+ * This file is auto-generated. Do not edit manually: changes may be erased.
+ * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
+ * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
+ * Aqua version: 0.1.10-SNAPSHOT
+ *
+ */
+import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
+import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
+import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+
+
+
+export async function putHostValue(client: FluenceClient, key: string, value: string, service_id: string | null, config?: {ttl?: number}): Promise<string> {
+    let request: RequestFlow;
+    const promise = new Promise<string>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (seq
+      (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+      (call %init_peer_id% ("getDataSrv" "key") [] key)
+     )
+     (call %init_peer_id% ("getDataSrv" "value") [] value)
+    )
+    (call %init_peer_id% ("getDataSrv" "service_id") [] service_id)
+   )
+   (call %init_peer_id% ("test-dht" "put_host_value") [key value service_id] res)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [res])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'key', () => {return key;});
+h.on('getDataSrv', 'value', () => {return value;});
+h.on('getDataSrv', 'service_id', () => {return service_id === null ? [] : [service_id];});
+                h.onEvent('callbackSrv', 'response', (args) => {
+    const [res] = args;
+  resolve(res);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for putHostValue');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+export async function create_client_util(client: FluenceClient, service_id: string, config?: {ttl?: number}): Promise<string> {
+    let request: RequestFlow;
+    const promise = new Promise<string>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+    (call %init_peer_id% ("getDataSrv" "service_id") [] service_id)
+   )
+   (call %init_peer_id% ("test-dht" "put_host_value") ["client-util" service_id $nil] res)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [res])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'service_id', () => {return service_id;});
+                h.onEvent('callbackSrv', 'response', (args) => {
+    const [res] = args;
+  resolve(res);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for create_client_util');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

src/compiled/examples/println.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/compiled/examples/pushToStream.ts

@@ -0,0 +1,72 @@
+/**
+ *
+ * This file is auto-generated. Do not edit manually: changes may be erased.
+ * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
+ * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
+ * Aqua version: 0.1.10-SNAPSHOT
+ *
+ */
+import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
+import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
+import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+
+
+
+export async function get_results(client: FluenceClient, config?: {ttl?: number}): Promise<string[]> {
+    let request: RequestFlow;
+    const promise = new Promise<string[]>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+     (call %init_peer_id% ("op" "identity") ["hello"] $results)
+    )
+    (call %init_peer_id% ("pop" "get_str") [] str)
+   )
+   (call %init_peer_id% ("op" "identity") [str] $results)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [$results])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                
+                h.onEvent('callbackSrv', 'response', (args) => {
+    const [res] = args;
+  resolve(res);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for get_results');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

src/compiled/examples/stream.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -55,7 +55,7 @@ export async function checkStreams(client: FluenceClient, ch: string[], config?:
                 });
                 h.on('getDataSrv', 'ch', () => {return ch;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/streamArgs.ts

@@ -0,0 +1,128 @@
+/**
+ *
+ * This file is auto-generated. Do not edit manually: changes may be erased.
+ * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
+ * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
+ * Aqua version: 0.1.10-SNAPSHOT
+ *
+ */
+import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
+import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
+import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+
+
+
+export async function append_records(client: FluenceClient, peer: string, srum: string[][], config?: {ttl?: number}): Promise<void> {
+    let request: RequestFlow;
+    const promise = new Promise<void>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+     (call %init_peer_id% ("getDataSrv" "peer") [] peer)
+    )
+    (call %init_peer_id% ("getDataSrv" "srum") [] srum-iter)
+   )
+   (fold srum-iter srum-item
+    (seq
+     (call %init_peer_id% ("op" "identity") [srum-item] $srum)
+     (next srum-item)
+    )
+   )
+  )
+  (call %init_peer_id% ("test-service" "get_records") [peer] $srum)
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'peer', () => {return peer;});
+h.on('getDataSrv', 'srum', () => {return srum;});
+                
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for append_records');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return Promise.race([promise, Promise.resolve()]);
+}
+      
+
+
+export async function retrieve_records(client: FluenceClient, peer: string, config?: {ttl?: number}): Promise<string[][]> {
+    let request: RequestFlow;
+    const promise = new Promise<string[][]>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+    (call %init_peer_id% ("getDataSrv" "peer") [] peer)
+   )
+   (call %init_peer_id% ("test-service" "get_records") [peer] $records)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [$records])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'peer', () => {return peer;});
+                h.onEvent('callbackSrv', 'response', (args) => {
+    const [res] = args;
+  resolve(res);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for retrieve_records');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

src/compiled/examples/streamResults.ts

@@ -0,0 +1,141 @@
+/**
+ *
+ * This file is auto-generated. Do not edit manually: changes may be erased.
+ * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
+ * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
+ * Aqua version: 0.1.10-SNAPSHOT
+ *
+ */
+import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
+import { RequestFlowBuilder } from '@fluencelabs/fluence/dist/api.unstable';
+import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
+
+
+
+export async function use_name1(client: FluenceClient, name: string, config?: {ttl?: number}): Promise<string> {
+    let request: RequestFlow;
+    const promise = new Promise<string>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+    (call %init_peer_id% ("getDataSrv" "name") [] name)
+   )
+   (call %init_peer_id% ("get-dt" "get_dt") [name] results)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [results.$.field!])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'name', () => {return name;});
+                h.onEvent('callbackSrv', 'response', (args) => {
+    const [res] = args;
+  resolve(res);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for use_name1');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      
+
+
+export async function use_name2(client: FluenceClient, name: string, config?: {ttl?: number}): Promise<string[]> {
+    let request: RequestFlow;
+    const promise = new Promise<string[]>((resolve, reject) => {
+        const r = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (seq
+      (seq
+       (seq
+        (seq
+         (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+         (call %init_peer_id% ("getDataSrv" "name") [] name)
+        )
+        (call %init_peer_id% ("get-dt" "get_dt") [name] results0)
+       )
+       (call %init_peer_id% ("op" "identity") [results0.$.field!] $results)
+      )
+      (call %init_peer_id% ("get-dt" "get_dt") [name] results1)
+     )
+     (call %init_peer_id% ("op" "identity") [results1.$.field!] $results)
+    )
+    (call %init_peer_id% ("get-dt" "get_dt") [name] results2)
+   )
+   (call %init_peer_id% ("op" "identity") [results2.$.field!] $results)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [$results])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'name', () => {return name;});
+                h.onEvent('callbackSrv', 'response', (args) => {
+    const [res] = args;
+  resolve(res);
+});
+
+                h.onEvent('errorHandlingSrv', 'error', (args) => {
+                    // assuming error is the single argument
+                    const [err] = args;
+                    reject(err);
+                });
+            })
+            .handleScriptError(reject)
+            .handleTimeout(() => {
+                reject('Request timed out for use_name2');
+            })
+        if(config && config.ttl) {
+            r.withTTL(config.ttl)
+        }
+        request = r.build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

src/compiled/examples/topology.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -86,7 +86,7 @@ h.on('getDataSrv', 'myRelay', () => {return myRelay;});
 h.on('getDataSrv', 'friend', () => {return friend;});
 h.on('getDataSrv', 'friendRelay', () => {return friendRelay;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/tryCatch.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -65,7 +65,7 @@ export async function tryCatchTest(client: FluenceClient, node_id: string, confi
                 });
                 h.on('getDataSrv', 'node_id', () => {return node_id;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/tryOtherwise.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -59,7 +59,7 @@ export async function tryOtherwiseTest(client: FluenceClient, node_id: string, c
                 });
                 h.on('getDataSrv', 'node_id', () => {return node_id;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/compiled/examples/via.ts

@@ -3,7 +3,7 @@
  * This file is auto-generated. Do not edit manually: changes may be erased.
  * Generated by Aqua compiler: https://github.com/fluencelabs/aqua/. 
  * If you find any bugs, please write an issue on GitHub: https://github.com/fluencelabs/aqua/issues
- * Aqua version: 0.1.9-SNAPSHOT
+ * Aqua version: 0.1.10-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -87,7 +87,7 @@ export async function viaArr(client: FluenceClient, node_id: string, viaAr: stri
                 h.on('getDataSrv', 'node_id', () => {return node_id;});
 h.on('getDataSrv', 'viaAr', () => {return viaAr;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -195,7 +195,7 @@ export async function viaStream(client: FluenceClient, node_id: string, viaStr:
                 h.on('getDataSrv', 'node_id', () => {return node_id;});
 h.on('getDataSrv', 'viaStr', () => {return viaStr;});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 
@@ -299,7 +299,7 @@ export async function viaOpt(client: FluenceClient, relay: string, node_id: stri
 h.on('getDataSrv', 'node_id', () => {return node_id;});
 h.on('getDataSrv', 'viaOpt', () => {return viaOpt === null ? [] : [viaOpt];});
                 h.onEvent('callbackSrv', 'response', (args) => {
-  const [res] = args;
+    const [res] = args;
   resolve(res);
 });
 

src/examples/useOptionalCall.ts

@@ -1,5 +1,5 @@
 import {FluenceClient, registerServiceFunction} from "@fluencelabs/fluence";
-import {useOptional} from "../compiled/examples/option";
+import {returnNone, returnOptional, useOptional} from "../compiled/examples/option";
 
 export async function useOptionalCall(client: FluenceClient): Promise<string> {
     registerServiceFunction(client, "test2", "getStr", (args: any[], _) => {
@@ -12,3 +12,16 @@ export async function useOptionalCall(client: FluenceClient): Promise<string> {
 
     return await useOptional(client, "hello")
 }
+
+export async function returnOptionalCall(client: FluenceClient): Promise<string | null> {
+    registerServiceFunction(client, "test2", "getStr1", (args: any[], _) => {
+        return ["optional"]
+    })
+
+    return await returnOptional(client)
+}
+
+export async function returnNull(client: FluenceClient): Promise<string | null> {
+
+    return await returnNone(client)
+}

src/run-examples.ts

@@ -15,7 +15,7 @@ import {constantsCall} from "./examples/constantsCall";
 import {streamCall} from "./examples/streamCall";
 import {topologyCall} from "./examples/topologyCall";
 import {foldJoinCall} from "./examples/foldJoinCall";
-import {useOptionalCall} from "./examples/useOptionalCall";
+import {returnNull, returnOptionalCall, useOptionalCall} from "./examples/useOptionalCall";
 import {viaCall} from "./examples/viaCall";
 import {nestedFuncsCall} from "./examples/nestedFuncsCall";
 import {assignmentCall} from "./examples/assignment";
@@ -105,6 +105,8 @@ const main = async () => {
 
   // option.aqua
   let optionResult = await useOptionalCall(client)
+  let optionalResult = await returnOptionalCall(client)
+  let noneResult = await returnNull(client)
 
   // via.aqua
   let viaResult = await viaCall(client)
@@ -168,6 +170,8 @@ const main = async () => {
   checkCallBy("foldJoinCall", foldJoinResult, (res) => res.length == 3, cb)
 
   checkCall("useOptional", optionResult, "hello", cb)
+  checkCall("returnOptional", optionalResult, "optional", cb)
+  checkCall("returnNone", noneResult, null, cb)
 
   checkCallBy("via", viaResult, (res) => res.every( (val, i, arr) => deepEqual(val, arr[0]) ), cb)