upgrade the iterator check

aliyun · Mar 6, 2024 · ff0ddd3 · ff0ddd3
1 parent 789f08a
commit ff0ddd3
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 10 deletions.
diff --git a/builtin/crypto.dara b/builtin/crypto.dara
@@ -1,3 +1,5 @@
+// this package is staging package, don't publish
+
 /**
  * HmacSHA1 Signature
  * @param stringToSign string

diff --git a/lib/semantic.js b/lib/semantic.js
@@ -970,6 +970,9 @@ class TypeChecker {
     this.checkType(ast.returnType);
 
     const returnType = ast.returnType;
+    if(returnType.type  === 'iterator' && ast.isAsync) {
+      this.error(`async function return type must be asyncIterator`, ast.functionName);
+    }
     if (ast.functionBody) {
       const local = new Env();
       // merge the parameters into local env
@@ -1095,6 +1098,9 @@ class TypeChecker {
     });
     this.checkType(ast.returnType);
     const returnType = ast.returnType;
+    if(returnType.type  === 'iterator') {
+      this.error(`api return type must be asyncIterator`, ast.apiName);
+    }
     const local = new Env();
     // merge the parameters into local env
     for (const [key, value] of paramMap) {

diff --git a/test/fixtures/multi_module/lib/util.dara b/test/fixtures/multi_module/lib/util.dara
@@ -1,3 +1,3 @@
-static async function test1(): iterator[string];
+static function test1(): iterator[string];
 
 static function getQuery(): map[string]string;
diff --git a/test/fixtures/multi_module/model/user.dara b/test/fixtures/multi_module/model/user.dara
@@ -7,7 +7,7 @@ model Info {
 }
 
 
-static async function test(): iterator[string]{
+static function test(): iterator[string]{
  var it:iterator[string] = Util.test1();
  for(var test : it) {
     yield test;

diff --git a/test/fixtures/multi_module/sdk.dara b/test/fixtures/multi_module/sdk.dara
@@ -10,7 +10,7 @@ init(){
     };
 }
 
-async function test3(): iterator[string]{
+async function test3(): asyncIterator[string]{
  var it:iterator[string] = Util.test1();
  for(var test : it) {
     yield test;

diff --git a/test/semantic.test.js b/test/semantic.test.js
@@ -1367,29 +1367,88 @@ describe('semantic', function () {
   it('yield should ok', function () {
     expect(function () {
       parse(`
-  async function test1(): iterator[string];
-  async function test2(): iterator[string]{
+  async function test2(): iterator[number]{
+    yield 32;
+  }
+`, '__filename');
+    }).to.throwException(function (e) {
+      expect(e).to.be.a(SyntaxError);
+      expect(e.message).to.be(`async function return type must be asyncIterator`);
+    });
+
+    expect(function () {
+      parse(`
+      init();
+
+      api get(): asyncIterator[number] {
+        __request.method = 'GET';
+        __request.pathname = '/';
+        __request.headers.key = \`abc\`;
+        if (true) {
+          __request.headers.authorization = \`acs \`;
+        }
+      } returns {
+        yield __response.statusCode;
+      }
+`, '__filename');
+    }).to.ok();
+
+    expect(function () {
+      parse(`
+  async function test1(): asyncIterator[string];
+  async function test2(): asyncIterator[string]{
     var it:iterator[string] = test1();
     for(var test : it) {
         yield test;
     }
   }
-  async function test3(): iterator[string]{
+  async function test3(): asyncIterator[string]{
     yield 'test';
   }
 `, '__filename');
     }).to.ok();
 
     expect(function () {
       parse(`
-  async function test2(): iterator[string]{
+  async function test2(): asyncIterator[string]{
     yield 32;
   }
 `, '__filename');
     }).to.throwException(function (e) {
       expect(e).to.be.a(SyntaxError);
       expect(e.message).to.be(`the return type is not expected, expect: string, actual: integer`);
     });
+
+    expect(function () {
+      parse(`
+  async function test2(): iterator[number]{
+    yield 32;
+  }
+`, '__filename');
+    }).to.throwException(function (e) {
+      expect(e).to.be.a(SyntaxError);
+      expect(e.message).to.be(`async function return type must be asyncIterator`);
+    });
+
+    expect(function () {
+      parse(`
+      init();
+
+      api get(): iterator[number] {
+        __request.method = 'GET';
+        __request.pathname = '/';
+        __request.headers.key = \`abc\`;
+        if (true) {
+          __request.headers.authorization = \`acs \`;
+        }
+      } returns {
+        yield __response.statusCode;
+      }
+`, '__filename');
+    }).to.throwException(function (e) {
+      expect(e).to.be.a(SyntaxError);
+      expect(e.message).to.be(`api return type must be asyncIterator`);
+    });
   });
 
   it('parameter check for call should ok', function () {
@@ -6783,15 +6842,15 @@ describe('semantic', function () {
       'loc': {
         'start': {
           'line': 1,
-          'column': 23
+          'column': 17
         },
         'end': {
           'line': 1,
-          'column': 28
+          'column': 22
         }
       },
       'lexeme': 'test1',
-      'index': 4
+      'index': 3
     });
 
     const apiAst = ast.innerDep.get('API');