From 5a330bbc79e46b4d92aed2c80037da7e79f707d3 Mon Sep 17 00:00:00 2001 From: Pavel Murygin Date: Mon, 18 Oct 2021 15:24:06 +0300 Subject: [PATCH] update version one more time --- package-lock.json | 26 +- package.json | 3 +- src/compiled/dht/dht-example.ts | 95 +++---- src/compiled/examples/aliases.ts | 74 +++--- src/compiled/examples/assignment.ts | 34 +-- src/compiled/examples/callArrow.ts | 37 +-- src/compiled/examples/co.ts | 40 +-- src/compiled/examples/complex.ts | 69 +++--- src/compiled/examples/constants.ts | 29 +-- src/compiled/examples/dataAlias.ts | 11 +- src/compiled/examples/example.ts | 40 ++- src/compiled/examples/fldist-sample.ts | 21 +- src/compiled/examples/fold.ts | 40 +-- src/compiled/examples/foldJoin.ts | 21 +- src/compiled/examples/func.ts | 11 +- src/compiled/examples/helloWorld.ts | 21 +- src/compiled/examples/if.ts | 16 +- .../examples/imports_exports/declare.ts | 8 +- .../examples/imports_exports/exports.ts | 11 +- .../examples/imports_exports/gen/OneMore.ts | 8 +- .../examples/imports_exports/import2.ts | 6 +- .../examples/imports_exports/import3.ts | 3 +- .../examples/imports_exports/imports-empty.ts | 146 ++++++----- .../examples/imports_exports/imports.ts | 21 +- .../examples/imports_exports/subImport.ts | 16 +- src/compiled/examples/multiReturn.ts | 85 ++++--- src/compiled/examples/nestedFuncs.ts | 29 ++- src/compiled/examples/new-api-full.ts | 231 +++++++++--------- src/compiled/examples/new-api.ts | 54 ++-- src/compiled/examples/on.ts | 21 +- src/compiled/examples/option.ts | 38 ++- src/compiled/examples/options/option_gen.ts | 35 ++- src/compiled/examples/par.ts | 40 +-- src/compiled/examples/passArgs.ts | 49 ++-- src/compiled/examples/println.ts | 21 +- src/compiled/examples/pushToStream.ts | 11 +- src/compiled/examples/returnLiteral.ts | 3 +- src/compiled/examples/stream.ts | 33 ++- src/compiled/examples/streamArgs.ts | 34 +-- src/compiled/examples/streamResults.ts | 29 ++- src/compiled/examples/subImportUsage.ts | 26 +- src/compiled/examples/topology.ts | 49 ++-- src/compiled/examples/tryCatch.ts | 29 +-- src/compiled/examples/tryOtherwise.ts | 29 +-- src/compiled/examples/via.ts | 57 +++-- 45 files changed, 856 insertions(+), 854 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4aefb9c..dae93a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,7 @@ "license": "MIT", "dependencies": { "@fluencelabs/aqua-dht-ts": "0.1.36", - "@fluencelabs/fluence": "0.10.4-async-478.0", + "@fluencelabs/fluence": "0.10.4-async-488.0", "@fluencelabs/fluence-network-environment": "^1.0.10", "deep-equal": "^2.0.5" }, @@ -1531,9 +1531,9 @@ } }, "node_modules/@fluencelabs/fluence": { - "version": "0.10.4-async-478.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.10.4-async-478.0.tgz", - "integrity": "sha512-4/RvTQV7pQYXfc9geWU7k71VvB9RF+bEIe25yDYUpp8F0yRVivU0rfLJrBNtRHIopcQORwOxx72LIS79WRNo0Q==", + "version": "0.10.4-async-488.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.10.4-async-488.0.tgz", + "integrity": "sha512-l7gc/E9YPQye1oqwb7Wc0vKBL2aSuSQxSWMT221ebjlmxiFnT76pWFQYRgH7cvRm2SLF6NCd7CASp+CdcXDaoQ==", "dependencies": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.15.4", @@ -1551,6 +1551,7 @@ "multiaddr": "10.0.0", "peer-id": "0.15.3", "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" } }, @@ -8182,6 +8183,11 @@ "typescript": ">=2.7" } }, + "node_modules/ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "node_modules/tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", @@ -9987,9 +9993,9 @@ } }, "@fluencelabs/fluence": { - "version": "0.10.4-async-478.0", - "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.10.4-async-478.0.tgz", - "integrity": "sha512-4/RvTQV7pQYXfc9geWU7k71VvB9RF+bEIe25yDYUpp8F0yRVivU0rfLJrBNtRHIopcQORwOxx72LIS79WRNo0Q==", + "version": "0.10.4-async-488.0", + "resolved": "https://registry.npmjs.org/@fluencelabs/fluence/-/fluence-0.10.4-async-488.0.tgz", + "integrity": "sha512-l7gc/E9YPQye1oqwb7Wc0vKBL2aSuSQxSWMT221ebjlmxiFnT76pWFQYRgH7cvRm2SLF6NCd7CASp+CdcXDaoQ==", "requires": { "@chainsafe/libp2p-noise": "4.0.0", "@fluencelabs/avm": "0.15.4", @@ -10007,6 +10013,7 @@ "multiaddr": "10.0.0", "peer-id": "0.15.3", "rxjs": "^7.3.0", + "ts-pattern": "^3.3.3", "uuid": "8.3.0" }, "dependencies": { @@ -15242,6 +15249,11 @@ "yn": "3.1.1" } }, + "ts-pattern": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-3.3.3.tgz", + "integrity": "sha512-Z5EFi6g6wyX3uDFHqxF5W5c5h663oZg9O6aOiAT7fqNu0HPSfCxtHzrQ7SblTy738Mrg2Ezorky8H5aUOm8Pvg==" + }, "tslib": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.1.0.tgz", diff --git a/package.json b/package.json index 5bed410..4a027ac 100644 --- a/package.json +++ b/package.json @@ -38,8 +38,7 @@ }, "dependencies": { "@fluencelabs/aqua-dht-ts": "0.1.36", - "@fluencelabs/fluence": "0.10.4-async-479 - .0", + "@fluencelabs/fluence": "0.10.4-async-488.0", "@fluencelabs/fluence-network-environment": "^1.0.10", "deep-equal": "^2.0.5" }, diff --git a/src/compiled/dht/dht-example.ts b/src/compiled/dht/dht-example.ts index fc73a67..127352e 100644 --- a/src/compiled/dht/dht-example.ts +++ b/src/compiled/dht/dht-example.ts @@ -86,19 +86,20 @@ export function put_value(...args: any) { { functionName: 'put_value', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'initial_peer', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'value', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -200,34 +201,38 @@ export function registerKeyPutValue(...args: any) { { functionName: 'registerKeyPutValue', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'key', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'value', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'relay_id', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, { name: 'service_id', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], names: { @@ -293,19 +298,20 @@ export function getNeighbours(...args: any) { { functionName: 'getNeighbours', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'topic', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -430,19 +436,20 @@ export function findSubscribers(...args: any) { { functionName: 'findSubscribers', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'topic', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -541,34 +548,38 @@ export function initTopicAndSubscribe(...args: any) { { functionName: 'initTopicAndSubscribe', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'topic', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'value', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'relay_id', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, { name: 'service_id', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], names: { diff --git a/src/compiled/examples/aliases.ts b/src/compiled/examples/aliases.ts index 143586f..3645fcf 100644 --- a/src/compiled/examples/aliases.ts +++ b/src/compiled/examples/aliases.ts @@ -29,7 +29,7 @@ export function registerComplexService(peer: FluencePeer, service: ComplexServic export function registerComplexService(peer: FluencePeer, serviceId: string, service: ComplexServiceDef): void; export function registerComplexService(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op-ha', functions: [ { @@ -37,31 +37,30 @@ export function registerComplexService(...args: any) { argDefs: [ { name: 'd', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'sd', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { functionName: 'identity', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -128,44 +127,49 @@ export function doSmth(...args: any) { { functionName: 'doSmth', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'd', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'd2', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'sd', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + { + name: 'arg1', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'primitive', }, - { - name: 'arg1', - isOptional: false, - callbackDef: null, - }, - ], - returnType: { - isVoid: false, - isOptional: false, }, }, }, diff --git a/src/compiled/examples/assignment.ts b/src/compiled/examples/assignment.ts index 372db63..7997b55 100644 --- a/src/compiled/examples/assignment.ts +++ b/src/compiled/examples/assignment.ts @@ -25,7 +25,7 @@ export function registerOpHa(peer: FluencePeer, service: OpHaDef): void; export function registerOpHa(peer: FluencePeer, serviceId: string, service: OpHaDef): void; export function registerOpHa(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { @@ -33,18 +33,19 @@ export function registerOpHa(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -52,18 +53,17 @@ export function registerOpHa(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -98,14 +98,14 @@ export function doSmth(...args: any) { { functionName: 'doSmth', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'arg', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/callArrow.ts b/src/compiled/examples/callArrow.ts index efe61f8..8362b73 100644 --- a/src/compiled/examples/callArrow.ts +++ b/src/compiled/examples/callArrow.ts @@ -81,34 +81,37 @@ export function passFunctionAsArg(...args: any) { { functionName: 'passFunctionAsArg', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'node', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'str', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'primitive', }, - ], - returnType: { - isVoid: false, - isOptional: false, }, }, }, diff --git a/src/compiled/examples/co.ts b/src/compiled/examples/co.ts index 8def7bd..92bbd3c 100644 --- a/src/compiled/examples/co.ts +++ b/src/compiled/examples/co.ts @@ -24,20 +24,18 @@ export function registerCoService(peer: FluencePeer, service: CoServiceDef): voi export function registerCoService(peer: FluencePeer, serviceId: string, service: CoServiceDef): void; export function registerCoService(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'coservice-id', functions: [ { functionName: 'call', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -95,29 +93,31 @@ export function coFunc(...args: any) { { functionName: 'coFunc', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'node', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, diff --git a/src/compiled/examples/complex.ts b/src/compiled/examples/complex.ts index 1b928e2..1ef9e33 100644 --- a/src/compiled/examples/complex.ts +++ b/src/compiled/examples/complex.ts @@ -25,7 +25,7 @@ export function registerTestS(peer: FluencePeer, service: TestSDef): void; export function registerTestS(peer: FluencePeer, serviceId: string, service: TestSDef): void; export function registerTestS(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'some-id', functions: [ { @@ -33,23 +33,25 @@ export function registerTestS(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -57,18 +59,17 @@ export function registerTestS(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -213,44 +214,50 @@ export function doStuff(...args: any) { { functionName: 'doStuff', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'd', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'e', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'g', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'str', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/constants.ts b/src/compiled/examples/constants.ts index 27c0d82..6081826 100644 --- a/src/compiled/examples/constants.ts +++ b/src/compiled/examples/constants.ts @@ -24,7 +24,7 @@ export function registerGetter(peer: FluencePeer, service: GetterDef): void; export function registerGetter(peer: FluencePeer, serviceId: string, service: GetterDef): void; export function registerGetter(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'test', functions: [ { @@ -32,18 +32,17 @@ export function registerGetter(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface OpODef { @@ -55,7 +54,7 @@ export function registerOpO(peer: FluencePeer, service: OpODef): void; export function registerOpO(peer: FluencePeer, serviceId: string, service: OpODef): void; export function registerOpO(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { @@ -63,18 +62,17 @@ export function registerOpO(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -105,8 +103,7 @@ export function callConstant(...args: any) { { functionName: 'callConstant', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/dataAlias.ts b/src/compiled/examples/dataAlias.ts index 3b1a7da..52ee0cd 100644 --- a/src/compiled/examples/dataAlias.ts +++ b/src/compiled/examples/dataAlias.ts @@ -24,20 +24,18 @@ export function registerNodeIdGetter(peer: FluencePeer, service: NodeIdGetterDef export function registerNodeIdGetter(peer: FluencePeer, serviceId: string, service: NodeIdGetterDef): void; export function registerNodeIdGetter(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'somesrv', functions: [ { functionName: 'get', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -65,8 +63,7 @@ export function getAliasedData(...args: any) { { functionName: 'getAliasedData', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/example.ts b/src/compiled/examples/example.ts index 1ffc021..b9a9f3a 100644 --- a/src/compiled/examples/example.ts +++ b/src/compiled/examples/example.ts @@ -24,7 +24,7 @@ export function registerPeer(peer: FluencePeer, service: PeerDef): void; export function registerPeer(peer: FluencePeer, serviceId: string, service: PeerDef): void; export function registerPeer(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'peer', functions: [ { @@ -32,18 +32,17 @@ export function registerPeer(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface OpDef { @@ -55,20 +54,18 @@ export function registerOp(peer: FluencePeer, service: OpDef): void; export function registerOp(peer: FluencePeer, serviceId: string, service: OpDef): void; export function registerOp(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { functionName: 'identity', argDefs: [], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface TestDef { @@ -81,28 +78,25 @@ export function registerTest(peer: FluencePeer, service: TestDef): void; export function registerTest(peer: FluencePeer, serviceId: string, service: TestDef): void; export function registerTest(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'test', functions: [ { functionName: 'doSomething', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { functionName: 'getUserList', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -150,14 +144,14 @@ export function betterMessage(...args: any) { { functionName: 'betterMessage', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'relay', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/fldist-sample.ts b/src/compiled/examples/fldist-sample.ts index 7134057..5925108 100644 --- a/src/compiled/examples/fldist-sample.ts +++ b/src/compiled/examples/fldist-sample.ts @@ -24,7 +24,7 @@ export function registerReturn(peer: FluencePeer, service: ReturnDef): void; export function registerReturn(peer: FluencePeer, serviceId: string, service: ReturnDef): void; export function registerReturn(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'returnService', functions: [ { @@ -32,18 +32,17 @@ export function registerReturn(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -83,14 +82,14 @@ export function test(...args: any) { { functionName: 'test', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'node', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/fold.ts b/src/compiled/examples/fold.ts index 0ac0db1..2dda394 100644 --- a/src/compiled/examples/fold.ts +++ b/src/compiled/examples/fold.ts @@ -42,14 +42,14 @@ export function iterateAndPrint(...args: any) { { functionName: 'iterateAndPrint', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'strings', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -115,29 +115,31 @@ export function iterateAndPrintParallel(...args: any) { { functionName: 'iterateAndPrintParallel', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'nodes', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, diff --git a/src/compiled/examples/foldJoin.ts b/src/compiled/examples/foldJoin.ts index 9b89d1d..5c1ba4c 100644 --- a/src/compiled/examples/foldJoin.ts +++ b/src/compiled/examples/foldJoin.ts @@ -24,7 +24,7 @@ export function registerOp2(peer: FluencePeer, service: Op2Def): void; export function registerOp2(peer: FluencePeer, serviceId: string, service: Op2Def): void; export function registerOp2(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { @@ -32,18 +32,17 @@ export function registerOp2(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -112,14 +111,14 @@ export function getTwoResults(...args: any) { { functionName: 'getTwoResults', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'relay', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/func.ts b/src/compiled/examples/func.ts index 3c88521..70a8c36 100644 --- a/src/compiled/examples/func.ts +++ b/src/compiled/examples/func.ts @@ -24,20 +24,18 @@ export function registerTestSrv(peer: FluencePeer, service: TestSrvDef): void; export function registerTestSrv(peer: FluencePeer, serviceId: string, service: TestSrvDef): void; export function registerTestSrv(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'test-service-id', functions: [ { functionName: 'str', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -65,8 +63,7 @@ export function testFunc(...args: any) { { functionName: 'testFunc', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/helloWorld.ts b/src/compiled/examples/helloWorld.ts index f533f0a..1c25532 100644 --- a/src/compiled/examples/helloWorld.ts +++ b/src/compiled/examples/helloWorld.ts @@ -24,7 +24,7 @@ export function registerStringExtra(peer: FluencePeer, service: StringExtraDef): export function registerStringExtra(peer: FluencePeer, serviceId: string, service: StringExtraDef): void; export function registerStringExtra(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'service-id', functions: [ { @@ -32,18 +32,17 @@ export function registerStringExtra(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -74,14 +73,14 @@ export function helloWorld(...args: any) { { functionName: 'helloWorld', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'name', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/if.ts b/src/compiled/examples/if.ts index 73dad30..cc6bedf 100644 --- a/src/compiled/examples/if.ts +++ b/src/compiled/examples/if.ts @@ -45,14 +45,14 @@ export function ifElseCall(...args: any) { { functionName: 'ifElseCall', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'condition', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -97,14 +97,14 @@ export function ifElseNumCall(...args: any) { { functionName: 'ifElseNumCall', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'condition', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/imports_exports/declare.ts b/src/compiled/examples/imports_exports/declare.ts index 4f0b663..dd0f607 100644 --- a/src/compiled/examples/imports_exports/declare.ts +++ b/src/compiled/examples/imports_exports/declare.ts @@ -24,20 +24,18 @@ export function registerSuperFoo(peer: FluencePeer, service: SuperFooDef): void; export function registerSuperFoo(peer: FluencePeer, serviceId: string, service: SuperFooDef): void; export function registerSuperFoo(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'super_foo', functions: [ { functionName: 'small_foo', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions diff --git a/src/compiled/examples/imports_exports/exports.ts b/src/compiled/examples/imports_exports/exports.ts index 33e5af5..939ca5d 100644 --- a/src/compiled/examples/imports_exports/exports.ts +++ b/src/compiled/examples/imports_exports/exports.ts @@ -24,20 +24,18 @@ export function registerMyExportSrv(peer: FluencePeer, service: MyExportSrvDef): export function registerMyExportSrv(peer: FluencePeer, serviceId: string, service: MyExportSrvDef): void; export function registerMyExportSrv(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'my_export_srv', functions: [ { functionName: 'another_str', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -62,8 +60,7 @@ export function string_from_lib(...args: any) { { functionName: 'string_from_lib', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/imports_exports/gen/OneMore.ts b/src/compiled/examples/imports_exports/gen/OneMore.ts index d1c5d7f..667c3e1 100644 --- a/src/compiled/examples/imports_exports/gen/OneMore.ts +++ b/src/compiled/examples/imports_exports/gen/OneMore.ts @@ -22,20 +22,18 @@ export function registerOneMore(serviceId: string, service: OneMoreDef): void; export function registerOneMore(peer: FluencePeer, serviceId: string, service: OneMoreDef): void; export function registerOneMore(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: null, functions: [ { functionName: 'more_call', argDefs: [], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions diff --git a/src/compiled/examples/imports_exports/import2.ts b/src/compiled/examples/imports_exports/import2.ts index a4a26ec..2133cde 100644 --- a/src/compiled/examples/imports_exports/import2.ts +++ b/src/compiled/examples/imports_exports/import2.ts @@ -43,8 +43,7 @@ export function wrap(...args: any) { { functionName: 'wrap', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -87,8 +86,7 @@ export function barfoo(...args: any) { { functionName: 'barfoo', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/imports_exports/import3.ts b/src/compiled/examples/imports_exports/import3.ts index 39abdb1..2025107 100644 --- a/src/compiled/examples/imports_exports/import3.ts +++ b/src/compiled/examples/imports_exports/import3.ts @@ -37,8 +37,7 @@ export function foo_wrapper(...args: any) { { functionName: 'foo_wrapper', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/imports_exports/imports-empty.ts b/src/compiled/examples/imports_exports/imports-empty.ts index 4de4c6c..fd4ff8b 100644 --- a/src/compiled/examples/imports_exports/imports-empty.ts +++ b/src/compiled/examples/imports_exports/imports-empty.ts @@ -46,7 +46,7 @@ export function registerNoop(peer: FluencePeer, service: NoopDef): void; export function registerNoop(peer: FluencePeer, serviceId: string, service: NoopDef): void; export function registerNoop(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { @@ -54,28 +54,31 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, { name: 'c', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, { name: 'd', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -83,13 +86,13 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'array', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -97,13 +100,13 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -111,13 +114,13 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'bs', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -125,28 +128,31 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, { name: 'c', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, { name: 'd', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -154,18 +160,19 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -173,21 +180,20 @@ export function registerNoop(...args: any) { argDefs: [ { name: 's', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, }, { functionName: 'noop', argDefs: [], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, { @@ -195,13 +201,13 @@ export function registerNoop(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -209,13 +215,13 @@ export function registerNoop(...args: any) { argDefs: [ { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -223,18 +229,17 @@ export function registerNoop(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface MyExportSrvDef { @@ -246,20 +251,18 @@ export function registerMyExportSrv(peer: FluencePeer, service: MyExportSrvDef): export function registerMyExportSrv(peer: FluencePeer, serviceId: string, service: MyExportSrvDef): void; export function registerMyExportSrv(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'my_export_srv', functions: [ { functionName: 'another_str', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -284,8 +287,7 @@ export function some_str(...args: any) { { functionName: 'some_str', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -322,8 +324,7 @@ export function some_string(...args: any) { { functionName: 'some_string', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -363,8 +364,7 @@ export function decl_foo(...args: any) { { functionName: 'decl_foo', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -401,8 +401,7 @@ export function decl_bar(...args: any) { { functionName: 'decl_bar', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -439,8 +438,7 @@ export function some_random_func(...args: any) { { functionName: 'some_random_func', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/imports_exports/imports.ts b/src/compiled/examples/imports_exports/imports.ts index 88eafd9..9c2edbf 100644 --- a/src/compiled/examples/imports_exports/imports.ts +++ b/src/compiled/examples/imports_exports/imports.ts @@ -24,7 +24,7 @@ export function registerStringService(peer: FluencePeer, service: StringServiceD export function registerStringService(peer: FluencePeer, serviceId: string, service: StringServiceDef): void; export function registerStringService(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'string_service', functions: [ { @@ -32,23 +32,23 @@ export function registerStringService(...args: any) { argDefs: [ { name: 'a', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -94,8 +94,7 @@ export function concat_foobars(...args: any) { { functionName: 'concat_foobars', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/imports_exports/subImport.ts b/src/compiled/examples/imports_exports/subImport.ts index 8bbb0f6..4c6df40 100644 --- a/src/compiled/examples/imports_exports/subImport.ts +++ b/src/compiled/examples/imports_exports/subImport.ts @@ -24,7 +24,7 @@ export function registerSubService(peer: FluencePeer, service: SubServiceDef): v export function registerSubService(peer: FluencePeer, serviceId: string, service: SubServiceDef): void; export function registerSubService(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'sub_service', functions: [ { @@ -32,18 +32,17 @@ export function registerSubService(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -72,8 +71,7 @@ export function subImport(...args: any) { { functionName: 'subImport', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/multiReturn.ts b/src/compiled/examples/multiReturn.ts index 83150c9..636ef9f 100644 --- a/src/compiled/examples/multiReturn.ts +++ b/src/compiled/examples/multiReturn.ts @@ -24,7 +24,7 @@ export function registerGetStr(peer: FluencePeer, service: GetStrDef): void; export function registerGetStr(peer: FluencePeer, serviceId: string, service: GetStrDef): void; export function registerGetStr(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'multiret-test', functions: [ { @@ -32,18 +32,17 @@ export function registerGetStr(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface GetNumDef { @@ -55,20 +54,18 @@ export function registerGetNum(peer: FluencePeer, service: GetNumDef): void; export function registerGetNum(peer: FluencePeer, serviceId: string, service: GetNumDef): void; export function registerGetNum(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'multiret-num', functions: [ { functionName: 'retNum', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -100,8 +97,15 @@ export function tupleFunc(...args: any) { { functionName: 'tupleFunc', returnType: { - isVoid: false, - isOptional: false, + tag: 'multiReturn', + returnItems: [ + { + tag: 'primitive', + }, + { + tag: 'primitive', + }, + ], }, argDefs: [], names: { @@ -168,40 +172,41 @@ export function multiReturnFunc(...args: any) { args, { functionName: 'multiReturnFunc', - multiReturn: [ - { - isOptional: false, - }, - { - isOptional: false, - }, - { - isOptional: false, - }, - { - isOptional: false, - }, - { - isOptional: true, - }, - { - isOptional: false, - }, - ], returnType: { - isVoid: false, - isOptional: false, + tag: 'multiReturn', + returnItems: [ + { + tag: 'primitive', + }, + { + tag: 'primitive', + }, + { + tag: 'primitive', + }, + { + tag: 'primitive', + }, + { + tag: 'optional', + }, + { + tag: 'primitive', + }, + ], }, argDefs: [ { name: 'somethingToReturn', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'smthOption', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], names: { diff --git a/src/compiled/examples/nestedFuncs.ts b/src/compiled/examples/nestedFuncs.ts index b0effee..26380c7 100644 --- a/src/compiled/examples/nestedFuncs.ts +++ b/src/compiled/examples/nestedFuncs.ts @@ -24,7 +24,7 @@ export function registerOpH(peer: FluencePeer, service: OpHDef): void; export function registerOpH(peer: FluencePeer, serviceId: string, service: OpHDef): void; export function registerOpH(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'opa', functions: [ { @@ -32,18 +32,17 @@ export function registerOpH(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -74,14 +73,14 @@ export function a(...args: any) { { functionName: 'a', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'b', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -124,14 +123,14 @@ export function d(...args: any) { { functionName: 'd', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'e', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/new-api-full.ts b/src/compiled/examples/new-api-full.ts index e1d4cab..f69281a 100644 --- a/src/compiled/examples/new-api-full.ts +++ b/src/compiled/examples/new-api-full.ts @@ -28,7 +28,7 @@ export function registerServiceWithDefaultId( ): void; export function registerServiceWithDefaultId(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'defaultId', functions: [ { @@ -36,18 +36,17 @@ export function registerServiceWithDefaultId(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface ServiceWithOUTDefaultIdDef { @@ -61,7 +60,7 @@ export function registerServiceWithOUTDefaultId( ): void; export function registerServiceWithOUTDefaultId(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: null, functions: [ { @@ -69,18 +68,17 @@ export function registerServiceWithOUTDefaultId(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface MoreMembersDef { @@ -94,15 +92,14 @@ export function registerMoreMembers(serviceId: string, service: MoreMembersDef): export function registerMoreMembers(peer: FluencePeer, serviceId: string, service: MoreMembersDef): void; export function registerMoreMembers(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: null, functions: [ { functionName: 'member1', argDefs: [], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, { @@ -110,13 +107,13 @@ export function registerMoreMembers(...args: any) { argDefs: [ { name: 's1', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, { @@ -124,18 +121,19 @@ export function registerMoreMembers(...args: any) { argDefs: [ { name: 's1', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 's2', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, { @@ -143,23 +141,25 @@ export function registerMoreMembers(...args: any) { argDefs: [ { name: 's1', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 's2', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'i', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -167,28 +167,29 @@ export function registerMoreMembers(...args: any) { argDefs: [ { name: 's1', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 's2', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'i', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -220,29 +221,31 @@ export function f1(...args: any) { { functionName: 'f1', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'callback', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + { + name: 'arg1', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - { - name: 'arg1', - isOptional: false, - callbackDef: null, - }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, @@ -293,34 +296,37 @@ export function f2(...args: any) { { functionName: 'f2', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'num', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'callback', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + { + name: 'arg1', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - { - name: 'arg1', - isOptional: false, - callbackDef: null, - }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, @@ -377,34 +383,37 @@ export function f3(...args: any) { { functionName: 'f3', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'num', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'callback', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + { + name: 'arg1', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - { - name: 'arg1', - isOptional: false, - callbackDef: null, - }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, @@ -450,18 +459,18 @@ export function callBackZeroArgs(...args: any) { { functionName: 'callBackZeroArgs', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'callback', - isOptional: false, - callbackDef: { - argDefs: [], - returnType: { - isVoid: true, - isOptional: false, + argType: { + tag: 'callback', + callback: { + argDefs: [], + returnType: { + tag: 'void', + }, }, }, }, diff --git a/src/compiled/examples/new-api.ts b/src/compiled/examples/new-api.ts index 171d208..5719b2f 100644 --- a/src/compiled/examples/new-api.ts +++ b/src/compiled/examples/new-api.ts @@ -25,15 +25,14 @@ export function registerHelloWorld(peer: FluencePeer, service: HelloWorldDef): v export function registerHelloWorld(peer: FluencePeer, serviceId: string, service: HelloWorldDef): void; export function registerHelloWorld(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'default', functions: [ { functionName: 'getNumber', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, { @@ -41,18 +40,17 @@ export function registerHelloWorld(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -84,29 +82,31 @@ export function callMeBack(...args: any) { { functionName: 'callMeBack', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'callback', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + { + name: 'arg1', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - { - name: 'arg1', - isOptional: false, - callbackDef: null, - }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, diff --git a/src/compiled/examples/on.ts b/src/compiled/examples/on.ts index 67414be..533c4f8 100644 --- a/src/compiled/examples/on.ts +++ b/src/compiled/examples/on.ts @@ -59,14 +59,14 @@ export function getPeerExternalAddresses(...args: any) { { functionName: 'getPeerExternalAddresses', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'otherNodePeerId', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -141,19 +141,20 @@ export function getDistantAddresses(...args: any) { { functionName: 'getDistantAddresses', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'target', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'viaNode', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/option.ts b/src/compiled/examples/option.ts index 4f44cd5..8b70152 100644 --- a/src/compiled/examples/option.ts +++ b/src/compiled/examples/option.ts @@ -26,7 +26,7 @@ export function registerSomeS(peer: FluencePeer, service: SomeSDef): void; export function registerSomeS(peer: FluencePeer, serviceId: string, service: SomeSDef): void; export function registerSomeS(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'test2', functions: [ { @@ -34,21 +34,20 @@ export function registerSomeS(...args: any) { argDefs: [ { name: 'arg0', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, }, { functionName: 'getStr1', argDefs: [], returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, }, { @@ -56,18 +55,17 @@ export function registerSomeS(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -106,14 +104,14 @@ export function useOptional(...args: any) { { functionName: 'useOptional', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'opt', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], names: { @@ -153,8 +151,7 @@ export function returnOptional(...args: any) { { functionName: 'returnOptional', returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, argDefs: [], names: { @@ -194,8 +191,7 @@ export function returnNone(...args: any) { { functionName: 'returnNone', returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, argDefs: [], names: { diff --git a/src/compiled/examples/options/option_gen.ts b/src/compiled/examples/options/option_gen.ts index abd5661..059db01 100644 --- a/src/compiled/examples/options/option_gen.ts +++ b/src/compiled/examples/options/option_gen.ts @@ -24,7 +24,7 @@ export function registerOptionString(peer: FluencePeer, service: OptionStringDef export function registerOptionString(peer: FluencePeer, serviceId: string, service: OptionStringDef): void; export function registerOptionString(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'opt_str', functions: [ { @@ -32,18 +32,17 @@ export function registerOptionString(...args: any) { argDefs: [ { name: 'str', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -68,8 +67,7 @@ export function emptyString(...args: any) { { functionName: 'emptyString', returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, argDefs: [], names: { @@ -109,8 +107,7 @@ export function checkEmpty(...args: any) { { functionName: 'checkEmpty', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -153,14 +150,14 @@ export function stringAsOption(...args: any) { { functionName: 'stringAsOption', returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, argDefs: [ { name: 'str', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -206,14 +203,14 @@ export function checkNoneEmpty(...args: any) { { functionName: 'checkNoneEmpty', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'str', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/par.ts b/src/compiled/examples/par.ts index 8bbf112..a8722bf 100644 --- a/src/compiled/examples/par.ts +++ b/src/compiled/examples/par.ts @@ -24,20 +24,18 @@ export function registerParService(peer: FluencePeer, service: ParServiceDef): v export function registerParService(peer: FluencePeer, serviceId: string, service: ParServiceDef): void; export function registerParService(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'parservice-id', functions: [ { functionName: 'call', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -92,29 +90,31 @@ export function parFunc(...args: any) { { functionName: 'parFunc', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'node', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'c', - isOptional: false, - callbackDef: { - argDefs: [ - { - name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'callback', + callback: { + argDefs: [ + { + name: 'arg0', + argType: { + tag: 'primitive', + }, + }, + ], + returnType: { + tag: 'void', }, - ], - returnType: { - isVoid: true, - isOptional: false, }, }, }, diff --git a/src/compiled/examples/passArgs.ts b/src/compiled/examples/passArgs.ts index ffa8310..6fd9629 100644 --- a/src/compiled/examples/passArgs.ts +++ b/src/compiled/examples/passArgs.ts @@ -29,7 +29,7 @@ export function registerAquaDHT(peer: FluencePeer, service: AquaDHTDef): void; export function registerAquaDHT(peer: FluencePeer, serviceId: string, service: AquaDHTDef): void; export function registerAquaDHT(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'test-dht', functions: [ { @@ -37,28 +37,29 @@ export function registerAquaDHT(...args: any) { argDefs: [ { name: 'key', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'value', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'service_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -106,24 +107,26 @@ export function putHostValue(...args: any) { { functionName: 'putHostValue', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'key', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'value', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'service_id', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], names: { @@ -166,14 +169,14 @@ export function create_client_util(...args: any) { { functionName: 'create_client_util', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'service_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/println.ts b/src/compiled/examples/println.ts index de2b2df..9a49727 100644 --- a/src/compiled/examples/println.ts +++ b/src/compiled/examples/println.ts @@ -24,7 +24,7 @@ export function registerPrintln(peer: FluencePeer, service: PrintlnDef): void; export function registerPrintln(peer: FluencePeer, serviceId: string, service: PrintlnDef): void; export function registerPrintln(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'println-service-id', functions: [ { @@ -32,18 +32,17 @@ export function registerPrintln(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -68,14 +67,14 @@ export function print(...args: any) { { functionName: 'print', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'str', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/pushToStream.ts b/src/compiled/examples/pushToStream.ts index b9ce46d..496b144 100644 --- a/src/compiled/examples/pushToStream.ts +++ b/src/compiled/examples/pushToStream.ts @@ -24,20 +24,18 @@ export function registerOpA(peer: FluencePeer, service: OpADef): void; export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADef): void; export function registerOpA(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'pop', functions: [ { functionName: 'get_str', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -71,8 +69,7 @@ export function get_results(...args: any) { { functionName: 'get_results', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/returnLiteral.ts b/src/compiled/examples/returnLiteral.ts index d6cdcf1..9abe3cf 100644 --- a/src/compiled/examples/returnLiteral.ts +++ b/src/compiled/examples/returnLiteral.ts @@ -37,8 +37,7 @@ export function returnLiteral(...args: any) { { functionName: 'returnLiteral', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { diff --git a/src/compiled/examples/stream.ts b/src/compiled/examples/stream.ts index f515da6..bcfb592 100644 --- a/src/compiled/examples/stream.ts +++ b/src/compiled/examples/stream.ts @@ -24,7 +24,7 @@ export function registerStringer(peer: FluencePeer, service: StringerDef): void; export function registerStringer(peer: FluencePeer, serviceId: string, service: StringerDef): void; export function registerStringer(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'stringer-id', functions: [ { @@ -32,18 +32,17 @@ export function registerStringer(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -68,8 +67,7 @@ export function returnNone(...args: any) { { functionName: 'returnNone', returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, argDefs: [], names: { @@ -106,8 +104,7 @@ export function stringNone(...args: any) { { functionName: 'stringNone', returnType: { - isVoid: false, - isOptional: true, + tag: 'optional', }, argDefs: [], names: { @@ -144,8 +141,7 @@ export function returnNil(...args: any) { { functionName: 'returnNil', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -182,8 +178,7 @@ export function stringNil(...args: any) { { functionName: 'stringNil', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [], names: { @@ -237,14 +232,14 @@ export function checkStreams(...args: any) { { functionName: 'checkStreams', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'ch', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/streamArgs.ts b/src/compiled/examples/streamArgs.ts index c58090f..78a2ffc 100644 --- a/src/compiled/examples/streamArgs.ts +++ b/src/compiled/examples/streamArgs.ts @@ -24,7 +24,7 @@ export function registerTestService(peer: FluencePeer, service: TestServiceDef): export function registerTestService(peer: FluencePeer, serviceId: string, service: TestServiceDef): void; export function registerTestService(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'test-service', functions: [ { @@ -32,18 +32,17 @@ export function registerTestService(...args: any) { argDefs: [ { name: 'key', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -84,19 +83,20 @@ export function append_records(...args: any) { { functionName: 'append_records', returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, argDefs: [ { name: 'peer', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'srum', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -139,14 +139,14 @@ export function retrieve_records(...args: any) { { functionName: 'retrieve_records', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'peer', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/streamResults.ts b/src/compiled/examples/streamResults.ts index a6d062c..5d487ba 100644 --- a/src/compiled/examples/streamResults.ts +++ b/src/compiled/examples/streamResults.ts @@ -24,7 +24,7 @@ export function registerDTGetter(peer: FluencePeer, service: DTGetterDef): void; export function registerDTGetter(peer: FluencePeer, serviceId: string, service: DTGetterDef): void; export function registerDTGetter(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'get-dt', functions: [ { @@ -32,18 +32,17 @@ export function registerDTGetter(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -74,14 +73,14 @@ export function use_name1(...args: any) { { functionName: 'use_name1', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'name', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -139,14 +138,14 @@ export function use_name2(...args: any) { { functionName: 'use_name2', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'name', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/subImportUsage.ts b/src/compiled/examples/subImportUsage.ts index e2cebfc..104e262 100644 --- a/src/compiled/examples/subImportUsage.ts +++ b/src/compiled/examples/subImportUsage.ts @@ -28,7 +28,7 @@ export function registerConcatSubs(peer: FluencePeer, service: ConcatSubsDef): v export function registerConcatSubs(peer: FluencePeer, serviceId: string, service: ConcatSubsDef): void; export function registerConcatSubs(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'concat_subs', functions: [ { @@ -36,23 +36,23 @@ export function registerConcatSubs(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'sr', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -90,14 +90,14 @@ export function subImportUsage(...args: any) { { functionName: 'subImportUsage', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/topology.ts b/src/compiled/examples/topology.ts index 118d2ab..9643161 100644 --- a/src/compiled/examples/topology.ts +++ b/src/compiled/examples/topology.ts @@ -24,7 +24,7 @@ export function registerTesto(peer: FluencePeer, service: TestoDef): void; export function registerTesto(peer: FluencePeer, serviceId: string, service: TestoDef): void; export function registerTesto(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'testo', functions: [ { @@ -32,18 +32,17 @@ export function registerTesto(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface LocalPrintDef { @@ -55,7 +54,7 @@ export function registerLocalPrint(peer: FluencePeer, service: LocalPrintDef): v export function registerLocalPrint(peer: FluencePeer, serviceId: string, service: LocalPrintDef): void; export function registerLocalPrint(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'lp', functions: [ { @@ -63,18 +62,17 @@ export function registerLocalPrint(...args: any) { argDefs: [ { name: 'arg0', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: true, - isOptional: false, + tag: 'void', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -157,29 +155,32 @@ export function topologyTest(...args: any) { { functionName: 'topologyTest', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'me', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'myRelay', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'friend', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'friendRelay', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/tryCatch.ts b/src/compiled/examples/tryCatch.ts index 58a76ac..b7858f7 100644 --- a/src/compiled/examples/tryCatch.ts +++ b/src/compiled/examples/tryCatch.ts @@ -24,20 +24,18 @@ export function registerUnexisted(peer: FluencePeer, service: UnexistedDef): voi export function registerUnexisted(peer: FluencePeer, serviceId: string, service: UnexistedDef): void; export function registerUnexisted(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'unex', functions: [ { functionName: 'getStr', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface OpADef { @@ -49,7 +47,7 @@ export function registerOpA(peer: FluencePeer, service: OpADef): void; export function registerOpA(peer: FluencePeer, serviceId: string, service: OpADef): void; export function registerOpA(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { @@ -57,18 +55,17 @@ export function registerOpA(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -120,14 +117,14 @@ export function tryCatchTest(...args: any) { { functionName: 'tryCatchTest', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/tryOtherwise.ts b/src/compiled/examples/tryOtherwise.ts index d9ad4d3..e0a7844 100644 --- a/src/compiled/examples/tryOtherwise.ts +++ b/src/compiled/examples/tryOtherwise.ts @@ -24,20 +24,18 @@ export function registerUnexisted(peer: FluencePeer, service: UnexistedDef): voi export function registerUnexisted(peer: FluencePeer, serviceId: string, service: UnexistedDef): void; export function registerUnexisted(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'unex', functions: [ { functionName: 'getStr', argDefs: [], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } export interface OpEDef { @@ -49,7 +47,7 @@ export function registerOpE(peer: FluencePeer, service: OpEDef): void; export function registerOpE(peer: FluencePeer, serviceId: string, service: OpEDef): void; export function registerOpE(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'op', functions: [ { @@ -57,18 +55,17 @@ export function registerOpE(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -114,14 +111,14 @@ export function tryOtherwiseTest(...args: any) { { functionName: 'tryOtherwiseTest', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { diff --git a/src/compiled/examples/via.ts b/src/compiled/examples/via.ts index 03464f8..b7120f3 100644 --- a/src/compiled/examples/via.ts +++ b/src/compiled/examples/via.ts @@ -24,7 +24,7 @@ export function registerCustomId(peer: FluencePeer, service: CustomIdDef): void; export function registerCustomId(peer: FluencePeer, serviceId: string, service: CustomIdDef): void; export function registerCustomId(...args: any) { - let serviceDefinition = { + registerService(args, { defaultServiceId: 'cid', functions: [ { @@ -32,18 +32,17 @@ export function registerCustomId(...args: any) { argDefs: [ { name: 's', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, }, ], - }; - registerService(args, serviceDefinition); + }); } // Functions @@ -122,19 +121,20 @@ export function viaArr(...args: any) { { functionName: 'viaArr', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'viaAr', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -233,19 +233,20 @@ export function viaStream(...args: any) { { functionName: 'viaStream', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'viaStr', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, ], names: { @@ -345,24 +346,26 @@ export function viaOpt(...args: any) { { functionName: 'viaOpt', returnType: { - isVoid: false, - isOptional: false, + tag: 'primitive', }, argDefs: [ { name: 'relay', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'node_id', - isOptional: false, - callbackDef: null, + argType: { + tag: 'primitive', + }, }, { name: 'viaOpt', - isOptional: true, - callbackDef: null, + argType: { + tag: 'optional', + }, }, ], names: {