update, add test for assignment

aqua/examples/assignment.aqua

@@ -0,0 +1,10 @@
+data Prod:
+   value: string
+
+service OpHa("op"):
+    identity(a: string) -> string
+
+func doSmth(arg: Prod) -> string:
+    v = arg.value
+    a <- OpHa.identity(v)
+    <- a

aqua/examples/callArrow.aqua

@@ -4,7 +4,6 @@ import "@fluencelabs/aqua-lib/builtin.aqua"
 -- functions like `c` are called an 'arrow function' in Aqua
 -- `c` passed to a function from a client, so, it could be called only on a client
 func passFunctionAsArg(node: string, str: string, c: string -> string):
-    Op.identity()
     on node:
         Peer.identify()
         -- we go here back on a client

src/compiled/examples/assignment.ts

@@ -0,0 +1,69 @@
+/**
+ *
+ * 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.5-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 doSmth(client: FluenceClient, arg: {value:string}): Promise<string> {
+    let request: RequestFlow;
+    const promise = new Promise<string>((resolve, reject) => {
+        request = new RequestFlowBuilder()
+            .disableInjections()
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+    (call %init_peer_id% ("getDataSrv" "arg") [] arg)
+   )
+   (call %init_peer_id% ("op" "identity") [arg.$.value!] a)
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [a])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+  )
+ )
+ (seq
+  (call -relay- ("op" "identity") [])
+  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+ )
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'arg', () => {return arg;});
+                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 doSmth');
+            })
+            .build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -68,7 +68,6 @@ export async function passFunctionAsArg(client: FluenceClient, node: string, str
   (seq
    (seq
     (seq
-     (seq
      (seq
       (seq
        (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
@@ -76,8 +75,6 @@ export async function passFunctionAsArg(client: FluenceClient, node: string, str
       )
       (call %init_peer_id% ("getDataSrv" "str") [] str)
      )
-      (call %init_peer_id% ("op" "identity") [])
-     )
      (call -relay- ("op" "identity") [])
     )
     (xor

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-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.4-136
+ * Aqua version: 0.1.5-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.4-136
+ * Aqua version: 0.1.5-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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -86,7 +86,7 @@ export async function d(client: FluenceClient, e: string): Promise<string> {
    (call %init_peer_id% ("opa" "identity") [e] c)
   )
   (xor
-   (call %init_peer_id% ("callbackSrv" "response") [f])
+   (call %init_peer_id% ("callbackSrv" "response") [c])
    (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
   )
  )

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

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.4-136
+ * Aqua version: 0.1.5-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';

src/examples/assignment.ts

@@ -0,0 +1,7 @@
+import {FluenceClient} from "@fluencelabs/fluence";
+import {passFunctionAsArg} from "../compiled/examples/callArrow";
+import {doSmth} from "../compiled/examples/assignment";
+
+export async function assignmentCall(client: FluenceClient): Promise<string> {
+  return await doSmth(client, {value: "abc"})
+}

src/run-examples.ts

@@ -18,6 +18,7 @@ import {foldJoinCall} from "./examples/foldJoinCall";
 import {useOptionalCall} from "./examples/useOptionalCall";
 import {viaCall} from "./examples/viaCall";
 import {nestedFuncsCall} from "./examples/nestedFuncsCall";
+import {assignmentCall} from "./examples/assignment";
 let deepEqual = require('deep-equal')
 
 function checkCall(name: string, expected: any, actual: any, callBackOnError: () => void) {
@@ -104,6 +105,9 @@ const main = async () => {
   // nestedFuncs.aqua
   let nestedFuncsResult = await nestedFuncsCall(client)
 
+  // assignment.aqua
+  let assignmentResult = await assignmentCall(client)
+
   await client.disconnect();
 
   let success = true;
@@ -141,6 +145,8 @@ const main = async () => {
 
   checkCall("nestedFuncsCall", nestedFuncsResult, "some-str", cb)
 
+  checkCall("assignmentCall", assignmentResult, "abc", cb)
+
   if (success) {
     process.exit(0)
   } else {