Merge pull request #1457 from aeternity/feature/ts-compiler-api-options

Update compiler to 7.0.1

.env

@@ -1,2 +1,2 @@
 NODE_TAG=v6.5.2
-COMPILER_TAG=v6.1.0
+COMPILER_TAG=v7.0.1

.gitignore

@@ -28,3 +28,4 @@ coverage.*
 .site
 site
 /src/apis/
+/tooling/autorest/compiler-swagger.yaml

package.json

@@ -16,7 +16,7 @@
   "sideEffects": false,
   "scripts": {
     "build:es": "tsc && babel src --config-file ./babel.esm.config.js --out-dir es --extensions .js,.ts --out-file-extension .mjs --source-maps true",
-    "build:api": "npx autorest tooling/autorest/compiler.yaml --output-artifact:code-model-v4 && npx autorest tooling/autorest/node.yaml --output-artifact:code-model-v4",
+    "build:api": "node tooling/autorest/compiler-prepare.mjs && npx autorest tooling/autorest/compiler.yaml --output-artifact:code-model-v4 && npx autorest tooling/autorest/node.yaml --output-artifact:code-model-v4",
     "build": "npm run build:api && webpack && npm run build:es",
     "docs:examples": "node tooling/docs/examples-to-md.js examples/node/*.mjs",
     "docs:api": "typedoc",

src/contract/Compiler.ts

@@ -58,9 +58,9 @@ export default class Compiler extends CompilerApi {
       ],
     });
     if (ignoreVersion !== true) {
-      const versionPromise = this.aPIVersion().then(({ apiVersion }) => apiVersion);
+      const versionPromise = this.apiVersion().then(({ apiVersion }) => apiVersion);
       this.pipeline.addPolicy(
-        genVersionCheckPolicy('compiler', '/api-version', versionPromise, '6.1.0', '7.0.0'),
+        genVersionCheckPolicy('compiler', '/api-version', versionPromise, '7.0.1', '8.0.0'),
       );
     }
   }

test/integration/contract-aci.ts

@@ -61,7 +61,6 @@ namespace Test =
 
 contract interface RemoteI =
   type test_type = int
-  record state = { value: string, key: test_type, testOption: option(string) }
   record test_record = { value: string, key: list(test_type) }
   entrypoint test : () => int
   datatype event = RemoteEvent1(int) | RemoteEvent2(string, int) | Duplicate(int)
@@ -272,9 +271,8 @@ describe('Contract instance', () => {
   }));
 
   it('rejects not matching bytecode with enabled validation', async () => expect(aeSdk.getContractInstance({
-    bytecode: (await aeSdk.compilerApi.compileContract({
-      code: identityContractSourceCode, options: {},
-    })).bytecode,
+    bytecode: (await aeSdk.compilerApi.compileContract({ code: identityContractSourceCode }))
+      .bytecode,
     aci: await aeSdk.compilerApi
       .generateACI({ code: identityContractSourceCode, options: { fileSystem } }),
     address: testContractAddress,

test/integration/contract.ts

@@ -126,9 +126,8 @@ describe('Contract', () => {
   });
 
   it('compiles Sophia code', async () => {
-    bytecode = (await aeSdk.compilerApi.compileContract({
-      code: identityContract, options: {},
-    })).bytecode as Encoded.ContractBytearray;
+    bytecode = (await aeSdk.compilerApi.compileContract({ code: identityContract }))
+      .bytecode as Encoded.ContractBytearray;
     expect(bytecode).to.satisfy((b: string) => b.startsWith('cb_'));
   });
 
@@ -267,9 +266,8 @@ describe('Contract', () => {
 
   describe('Sophia Compiler', () => {
     it('compile', async () => {
-      bytecode = (await aeSdk.compilerApi.compileContract({
-        code: identityContract, options: {},
-      })).bytecode as Encoded.ContractBytearray;
+      bytecode = (await aeSdk.compilerApi.compileContract({ code: identityContract }))
+        .bytecode as Encoded.ContractBytearray;
       expect(bytecode.split('_')[0]).to.be.equal('cb');
     });
 
@@ -280,39 +278,37 @@ describe('Contract', () => {
           + '  entrypoint getArg(x : bar) = x\n'
           + '  entrypoint getArg(x : int) = baz\n'
           + '  entrypoint getArg1(x : int) = baz\n',
-        options: {},
       })).to.be.rejectedWith(
         'compile error:\n'
-        + 'type_error:3:3: Duplicate definitions of getArg at\n'
+        + 'type_error:3:3: Duplicate definitions of `getArg` at\n'
         + '  - line 2, column 3\n'
         + '  - line 3, column 3\n'
-        + 'type_error:3:32: Unbound variable baz at line 3, column 32\n'
-        + 'type_error:4:33: Unbound variable baz at line 4, column 33',
+        + 'type_error:3:32: Unbound variable `baz`\n'
+        + 'type_error:4:33: Unbound variable `baz`',
       );
     });
 
     it('generate contract ACI', async () => {
-      const aci = await aeSdk.compilerApi.generateACI({ code: identityContract, options: {} });
+      const aci = await aeSdk.compilerApi.generateACI({ code: identityContract });
       expect(aci).to.have.property('encodedAci');
       expect(aci).to.have.property('externalEncodedAci');
       expect(aci).to.have.property('interface');
     });
 
     it('throws clear exception if generating ACI with no arguments', async () => {
-      await expect(aeSdk.compilerApi.generateACI({ options: {} } as any))
+      await expect(aeSdk.compilerApi.generateACI({} as any))
         .to.be.rejectedWith('Error "body.code cannot be null or undefined." occurred in serializing the payload - undefined');
     });
 
     it('validate bytecode', async () => {
-      expect(await aeSdk.compilerApi.validateByteCode({
-        bytecode, source: identityContract, options: {},
-      })).to.be.eql({ body: {} });
+      expect(await aeSdk.compilerApi.validateByteCode({ bytecode, source: identityContract }))
+        .to.be.eql({ body: {} });
     });
 
     it('Use invalid compiler url', async () => {
       const url = aeSdk.compilerApi.$host;
       aeSdk.setCompilerUrl('https://compiler.aepps.comas');
-      await expect(aeSdk.compilerApi.generateACI({ code: 'test', options: {} }))
+      await expect(aeSdk.compilerApi.generateACI({ code: 'test' }))
         .to.be.rejectedWith('getaddrinfo ENOTFOUND compiler.aepps.comas');
       aeSdk.setCompilerUrl(url);
     });

test/integration/transaction.ts

@@ -117,7 +117,7 @@ describe('Transaction', () => {
     }),
   ], [
     'contract create',
-    'tx_+LAqAaEB1c8IQA6YgiLybrSwLI+JB3RXRnIRpubZVe23B0nGozsBuGr4aEYDoKEijZbj/w2AeiWwAbldusME5pm3ZgPuomnZ3TbUbYgrwLg7nv5E1kQfADcANwAaDoI/AQM//oB4IJIANwEHBwEBAJgvAhFE1kQfEWluaXQRgHggkhlnZXRBcmeCLwCFNi4xLjAAgwcAA4ZHcyzkwAAAAACDTEtAhDuaygCHKxFE1kQfPxOlnVo=',
+    'tx_+LAqAaEB1c8IQA6YgiLybrSwLI+JB3RXRnIRpubZVe23B0nGozsBuGr4aEYDoKEijZbj/w2AeiWwAbldusME5pm3ZgPuomnZ3TbUbYgrwLg7nv5E1kQfADcANwAaDoI/AQM//oB4IJIANwEHBwEBAJgvAhFE1kQfEWluaXQRgHggkhlnZXRBcmeCLwCFNy4wLjEAgwcAA4ZHcyzkwAAAAACDTEtAhDuaygCHKxFE1kQfP6vKAEo=',
     async () => aeSdk.buildTx(Tag.ContractCreateTx, {
       nonce,
       ownerId: address,

tooling/autorest/compiler-prepare.mjs

@@ -0,0 +1,17 @@
+import https from 'https';
+import fs from 'fs';
+
+const swaggerUrl = 'https://raw.githubusercontent.com/aeternity/aesophia_http/v7.0.1/config/swagger.yaml';
+
+let swagger = await new Promise((resolve) => {
+  https.get(swaggerUrl, (res) => {
+    let data = '';
+    res.on('data', (chunk) => { data += chunk; });
+    res.on('close', () => resolve(data));
+  }).end();
+});
+
+swagger = swagger.replace(/basePath: \//, '');
+// TODO: Remove after fixing https://github.com/aeternity/aesophia_http/issues/87
+swagger = swagger.replace(/'400':.{80,120}?Error'\s+'400':/gms, '\'400\':');
+await fs.promises.writeFile('./tooling/autorest/compiler-swagger.yaml', swagger);

tooling/autorest/compiler.yaml

@@ -21,7 +21,7 @@ use-extension:
   '@autorest/modelerfour': ^4.23.1
 # replace with a link to https://github.com/aeternity/aesophia_http/blob/master/config/swagger.yaml
 # at specific version after fixing https://github.com/aeternity/aesophia_http/issues/87
-input-file: https://compiler.aeternity.io/api
+input-file: compiler-swagger.yaml
 output-folder: ../../src/apis/compiler
 source-code-folder-path: .
 client-side-validation: true