check constants

aqua/examples/constants.aqua

@@ -1,18 +1,16 @@
-import "println.aqua"
+import "@fluencelabs/aqua-lib/builtin.aqua"
 
 service Getter("test"):
-    getNum: -> u32
+    createStr: u32 -> string
 
-const c = "non-default string"
+service OpO("op"):
+    identity: string -> string
 
 -- a question mark means that this constant could be rewritten before this definition
-const c ?= "default string"
+const anotherConst ?= "default-str"
 
-const a = 1
+func callConstant() -> []string:
-
+    res: *string
-func callConstant(cb: string -> ()):
+    res <- Getter.createStr(uniqueConst)
-    n <- Getter.getNum()
+    res <- OpO.identity(anotherConst)
-    if n == a:
+    <- res
-        cb(c)
-    else:
-        cb(c)

package.json

@@ -20,8 +20,8 @@
     "examples": "node -r ts-node/register src/run-examples.ts",
     "exec": "npm run compile-aqua && node -r ts-node/register src/index.ts",
     "run": "node -r ts-node/register src/index.ts",
-    "compile-aqua": "aqua-cli -i ./aqua/ -o ./src/compiled",
+    "compile-aqua": "aqua-cli -i ./aqua/ -o ./src/compiled -c \"uniqueConst = 1\" -c \"anotherConst = \\\"ab\\\"\"",
-    "compile-aqua:air": "aqua-cli -i ./aqua/ -o ./compiled-air -a"
+    "compile-aqua:air": "aqua-cli -i ./aqua/ -o ./compiled-air -a  -c \"uniqueConst = 1\" -c \"anotherConst = \\\"ab\\\"\""
   },
   "devDependencies": {
     "@fluencelabs/aqua-cli": "^0.1.6-144",

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

src/compiled/examples/builtin.ts

@@ -1,53 +0,0 @@
-/**
- *
- * 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.1-110
- *
- */
-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 id(client: FluenceClient): Promise<void> {
-    let request: RequestFlow;
-    const promise = new Promise<void>((resolve, reject) => {
-        request = new RequestFlowBuilder()
-            .disableInjections()
-            .withRawScript(
-                `
-(xor
- (seq
-  (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
-  (call %init_peer_id% ("op" "identity") [])
- )
- (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-)
-
-            `,
-            )
-            .configHandler((h) => {
-                h.on('getDataSrv', '-relay-', () => {
-                    return client.relayPeerId!;
-                });
-                
-                
-                h.onEvent('errorHandlingSrv', 'error', (args) => {
-                    // assuming error is the single argument
-                    const [err] = args;
-                    reject(err);
-                });
-            })
-            .handleScriptError(reject)
-            .handleTimeout(() => {
-                reject('Request timed out for id');
-            })
-            .build();
-    });
-    await client.initiateFlow(request!);
-    return Promise.race([promise, Promise.resolve()]);
-}
-      

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

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.6-144
+ * Aqua version: 0.1.6-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.6-144
+ * Aqua version: 0.1.6-SNAPSHOT
  *
  */
 import { FluenceClient, PeerIdB58 } from '@fluencelabs/fluence';
@@ -12,9 +12,9 @@ import { RequestFlow } from '@fluencelabs/fluence/dist/internal/RequestFlow';
 
 
 
-export async function callConstant(client: FluenceClient, cb: (arg0: string) => void, config?: {ttl?: number}): Promise<void> {
+export async function callConstant(client: FluenceClient, config?: {ttl?: number}): Promise<string[]> {
     let request: RequestFlow;
-    const promise = new Promise<void>((resolve, reject) => {
+    const promise = new Promise<string[]>((resolve, reject) => {
         request = new RequestFlowBuilder()
             .disableInjections()
             .withTTL(config?.ttl || 5000)
@@ -23,34 +23,20 @@ export async function callConstant(client: FluenceClient, cb: (arg0: string) =>
 (xor
  (seq
   (seq
-   (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+   (seq
-   (call %init_peer_id% ("test" "getNum") [] n)
+    (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+    (call %init_peer_id% ("test" "createStr") [1] $res)
+   )
+   (call %init_peer_id% ("op" "identity") ["ab"] $res)
   )
   (xor
-   (match n 1
+   (call %init_peer_id% ("callbackSrv" "response") [$res])
-    (xor
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-     (xor
-      (call %init_peer_id% ("callbackSrv" "cb") ["non-default string"])
-      (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
-     )
-     (seq
-      (seq
-       (call -relay- ("op" "identity") [])
-       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
-      )
-      (call -relay- ("op" "identity") [])
-     )
-    )
-   )
-   (xor
-    (call %init_peer_id% ("callbackSrv" "cb") ["non-default string"])
-    (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
-   )
   )
  )
  (seq
   (call -relay- ("op" "identity") [])
-  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 4])
+  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
  )
 )
 
@@ -60,8 +46,12 @@ export async function callConstant(client: FluenceClient, cb: (arg0: string) =>
                 h.on('getDataSrv', '-relay-', () => {
                     return client.relayPeerId!;
                 });
-                h.on('callbackSrv', 'cb', (args) => {cb(args[0]); return {};});
                 
+                h.onEvent('callbackSrv', 'response', (args) => {
+  const [res] = args;
+  resolve(res);
+});
+
                 h.onEvent('errorHandlingSrv', 'error', (args) => {
                     // assuming error is the single argument
                     const [err] = args;
@@ -75,6 +65,6 @@ export async function callConstant(client: FluenceClient, cb: (arg0: string) =>
             .build();
     });
     await client.initiateFlow(request!);
-    return Promise.race([promise, Promise.resolve()]);
+    return promise;
 }
       

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

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

src/compiled/examples/tryCatch.ts

@@ -0,0 +1,94 @@
+/**
+ *
+ * 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.6-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 tryCatchTest(client: FluenceClient, node_id: string, config?: {ttl?: number}): Promise<string[]> {
+    let request: RequestFlow;
+    const promise = new Promise<string[]>((resolve, reject) => {
+        request = new RequestFlowBuilder()
+            .disableInjections()
+            .withTTL(config?.ttl || 5000)
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (seq
+      (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+      (call %init_peer_id% ("getDataSrv" "node_id") [] node_id)
+     )
+     (call -relay- ("op" "identity") [])
+    )
+    (xor
+     (xor
+      (call node_id ("unex" "getStr") [] $f)
+      (seq
+       (seq
+        (call node_id ("op" "identity") [%last_error%.$.msg!] $f)
+        (call node_id ("peer" "identify") [] i)
+       )
+       (call node_id ("op" "identity") [i.$.external_addresses.[0]!] $f)
+      )
+     )
+     (seq
+      (seq
+       (call -relay- ("op" "identity") [])
+       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+      )
+      (call -relay- ("op" "identity") [])
+     )
+    )
+   )
+   (call -relay- ("op" "identity") [])
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [$f])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+  )
+ )
+ (seq
+  (call -relay- ("op" "identity") [])
+  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+ )
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'node_id', () => {return node_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 tryCatchTest');
+            })
+            .build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

src/compiled/examples/tryOtherwise.ts

@@ -0,0 +1,88 @@
+/**
+ *
+ * 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.6-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 tryOtherwiseTest(client: FluenceClient, node_id: string, config?: {ttl?: number}): Promise<string> {
+    let request: RequestFlow;
+    const promise = new Promise<string>((resolve, reject) => {
+        request = new RequestFlowBuilder()
+            .disableInjections()
+            .withTTL(config?.ttl || 5000)
+            .withRawScript(
+                `
+(xor
+ (seq
+  (seq
+   (seq
+    (seq
+     (seq
+      (call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
+      (call %init_peer_id% ("getDataSrv" "node_id") [] node_id)
+     )
+     (call -relay- ("op" "identity") [])
+    )
+    (xor
+     (xor
+      (call node_id ("unex" "getStr") [] $f)
+      (call node_id ("op" "identity") ["error"] $f)
+     )
+     (seq
+      (seq
+       (call -relay- ("op" "identity") [])
+       (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 1])
+      )
+      (call -relay- ("op" "identity") [])
+     )
+    )
+   )
+   (call -relay- ("op" "identity") [])
+  )
+  (xor
+   (call %init_peer_id% ("callbackSrv" "response") [$f.$.[0]!])
+   (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 2])
+  )
+ )
+ (seq
+  (call -relay- ("op" "identity") [])
+  (call %init_peer_id% ("errorHandlingSrv" "error") [%last_error% 3])
+ )
+)
+
+            `,
+            )
+            .configHandler((h) => {
+                h.on('getDataSrv', '-relay-', () => {
+                    return client.relayPeerId!;
+                });
+                h.on('getDataSrv', 'node_id', () => {return node_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 tryOtherwiseTest');
+            })
+            .build();
+    });
+    await client.initiateFlow(request!);
+    return promise;
+}
+      

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

src/examples/constantsCall.ts

@@ -1,14 +1,11 @@
 import {FluenceClient, registerServiceFunction} from "@fluencelabs/fluence";
 import {callConstant} from "../compiled/examples/constants";
 
-export async function constantsCall(client: FluenceClient) {
+export async function constantsCall(client: FluenceClient): Promise<string[]> {
-    registerServiceFunction(client, "test", "getNum", (args: any[], _) => {
+    registerServiceFunction(client, "test", "createStr", (args: any[], _) => {
-        return 1
+        return "" + args[0]
     })
 
-    return new Promise<string>(async (resolve, reject) => {
+
-        await callConstant(client, (a: string) => {
+    return await callConstant(client);
-                resolve(a)
-        });
-    })
 }

src/run-examples.ts

@@ -141,7 +141,7 @@ const main = async () => {
 
   checkCall("complexCall", complexCallResult, ["some str", "3", "1", "4", "1", "1", "3", "2", "4", "2", "2"], cb)
 
-  checkCall("constantCall", constantCallResult, "non-default string", cb)
+  checkCall("constantCall", constantCallResult, ['1', 'ab'], cb)
 
   checkCall("streamCall", streamResult, ["first updated", "second updated", "third updated", "fourth updated"], cb)