Fix tmp expr visit

lib/semantic.js

@@ -1685,6 +1685,7 @@ class TypeChecker {
     }
 
     if (isTmpVariable(id.type)) {
+      this.visitExpr(id, env);
       return;
     }
 
@@ -2345,7 +2346,6 @@ class TypeChecker {
     if (ast.left.type === 'static_or_instance_call') {
       const id = ast.left.id;
       this.checkId(id, env);
-
       if (env.local.hasDefined(id.lexeme) || isTmpVariable(id.type)) {
         ast.left.type = 'instance_call';
         this.visitInstanceCall(ast, env);
@@ -2510,7 +2510,7 @@ class TypeChecker {
     ast.isStatic = definedApi.type === 'api' ? false : definedApi.isStatic;
     ast.isAsync = definedApi.type === 'api' ? true : definedApi.isAsync;
     ast.inferred = this.getType(definedApi.returnType);
-    ast.hasThrow = ast.isAsync || definedApi.hasThrow;
+    ast.hasThrow = !builtin.has(name) && (ast.isAsync || definedApi.hasThrow);
   }
 
   visitConstruct(ast, env) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/parser",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "main": "index.js",
   "directories": {
     "lib": "lib",

test/fixtures/tmp_var_call/.libraries.json

@@ -0,0 +1,3 @@
+{
+    "alibabacloud:OSS:*": "libraries/alibabacloud-OSS-0.0.1"
+}

test/fixtures/tmp_var_call/Darafile

@@ -1,2 +1,5 @@
 {
-}
+    "libraries": {
+        "OSS": "alibabacloud:OSS:*"
+    }
+}

test/fixtures/tmp_var_call/libraries/alibabacloud-OSS-0.0.1/Darafile

@@ -0,0 +1,4 @@
+{
+    "name": "OSS",
+    "main": "./oss.dara"
+}

test/fixtures/tmp_var_call/libraries/alibabacloud-OSS-0.0.1/oss.dara

@@ -0,0 +1,9 @@
+model Config {
+    accessKeyId: string
+};
+
+init(config: Config);
+
+function getAccessKeyId(): string;
+
+static function accessKeyId(): string;

test/fixtures/tmp_var_call/main.dara

@@ -1,5 +1,10 @@
+import OSS;
+
 init(){
+  var config = new OSS.Config{};
+  var oss = new OSS(config);
   var arr = 'str.abc'.split('.');
+  var arr2 = `str.${OSS.accessKeyId()}.${oss.getAccessKeyId()}.abc`.split('.');
   var str = ['1','2','3'].join('.');
   var num = 1.parseLong();
   var en = {

test/import.test.js

@@ -254,7 +254,6 @@ function callOSS(): string {
     expect(function () {
       readAndParse('fixtures/import_module_model/undefined_model.dara');
     }).to.throwException(function (e) {
-      console.log(e);
       expect(e).to.be.a(SyntaxError);
       expect(e.message).to.be(`the model "ConfigX" is undefined in module "OSS"`);
     });

test/parser.test.js

@@ -6053,7 +6053,6 @@ describe('parser', function () {
       }
     `, '__filename');
     }).to.throwException(function(e) {
-      console.log(e);
       expect(e).to.be.a(SyntaxError);
       expect(e.message).to.be('Unexpected token: Word: `catch`. expect valid expression');
     });
@@ -9898,7 +9897,6 @@ describe('parser', function () {
         var str = 'tmpVar'.empty();
       }
       `, '__filename');
-    console.log('%j', ast);
     const expr = ast.moduleBody.nodes[0].initBody.stmts[0].expr;
     expect(expr).to.be.eql({
       'type': 'call',

test/semantic.test.js

@@ -592,11 +592,16 @@ describe('semantic', function () {
         async function callId(): object {
           return call();
         }
+
+        async function sp(): void {
+          $sleep(30);
+          return;
+        }
         init();`, '__filename');
-    var func = ast.moduleBody.nodes.find((item) => {
+    var func = ast.moduleBody.nodes.filter((item) => {
       return item.type === 'function';
     });
-    var returnExpr = func.functionBody.stmts.stmts[0];
+    var returnExpr = func[0].functionBody.stmts.stmts[0];
     expect(returnExpr).to.eql({
       type: 'return',
       'loc': loc(10, 11, 11, 9),
@@ -626,6 +631,9 @@ describe('semantic', function () {
         'loc': loc(10, 18, 10, 24)
       }
     });
+
+    var sleepStmt = func[1].functionBody.stmts.stmts[0];
+    expect(sleepStmt.hasThrow).to.eql(false);
   });
 
   it('submodel should ok', function () {
@@ -3071,7 +3079,6 @@ describe('semantic', function () {
 
         }`, '__filename');
     }).to.throwError(function(e) {
-      console.log(e);
       expect(e).to.be.an(SyntaxError);
       expect(e.message).to.be('the property "statusCode" is undefined in model "Error"');
     });
@@ -4683,7 +4690,6 @@ describe('semantic', function () {
 
   it('used exceptions should ok', function () {
     let ast = readAndParse('fixtures/module_exception_used/main.dara');
-    console.log(ast.usedExternException);
     expect(ast.usedExternException.get('OSS').has('Err1')).to.be(true);
     expect(ast.usedExternException.get('OSS').has('Config')).to.be(false);
 
@@ -7684,8 +7690,48 @@ init() {
   });
 
   it('use tmp variable method call shoule be ok', function(){
-    expect(function () {
-      readAndParse('fixtures/tmp_var_call/main.dara');
-    }).to.not.throwException();
+    const ast = readAndParse('fixtures/tmp_var_call/main.dara');
+    let tStrAst = ast.moduleBody.nodes[0].initBody.stmts[3];
+    expect(tStrAst.expr.left.id.elements[1].expr.left).to.be.eql({
+      'type': 'static_call',
+      'id': {
+        'tag': 2,
+        'loc': loc(7, 21, 7, 24),
+        'lexeme': 'OSS',
+        'index': 41,
+        'type': 'module'
+      },
+      'propertyPath': [
+        {
+          'tag': 2,
+          'loc': loc(7, 25, 7, 36),
+          'lexeme': 'accessKeyId',
+          'index': 43
+        }
+      ]
+    });
+
+    expect(tStrAst.expr.left.id.elements[3].expr.left).to.be.eql({
+      'type': 'instance_call',
+      'id': {
+        'tag': 2,
+        'loc': loc(7, 42, 7, 45),
+        'lexeme': 'oss',
+        'index': 47,
+        'type': 'variable',
+        'moduleType': {
+          'type': 'module',
+          'name': 'OSS'
+        }
+      },
+      'propertyPath': [
+        {
+          'tag': 2,
+          'loc': loc(7, 46, 7, 60),
+          'lexeme': 'getAccessKeyId',
+          'index': 49
+        }
+      ]
+    });
   });
-});
+});