Fix env builtin

lib/builtin.js

@@ -49,7 +49,7 @@ class Env extends Builtin {
     const key = args[0];
     this.generator.emit(`${this.module }[`);
     this.generator.visitExpr(key);
-    this.generator.emit('];');
+    this.generator.emit(']');
   }
 
   set(args){
@@ -59,7 +59,6 @@ class Env extends Builtin {
     this.generator.emit('] = ');
     const value = args[1];
     this.generator.visitExpr(value);
-    this.generator.emit(';');
   }
 }
 

lib/generator.js

@@ -514,9 +514,9 @@ Client.main(process.argv.slice(2));`);
           const models = [...usedModels.get(aliasId)];
           if (models.length > 0) {
             this.emit(`, $${inner}`, level);
-          }
-          if(inner !== aliasId) {
-            this.emit(` as $${aliasId}`);
+            if(inner !== aliasId) {
+              this.emit(` as $${aliasId}`);
+            }
           }
           this.emit(' }');
         } else {
@@ -1165,7 +1165,7 @@ Client.main(process.argv.slice(2));`);
         continue;
       }
       if(fieldName === 'name') {
-        this.emit(`this.name = "${exceptionName}Error";\n`, level);
+        continue;
       }
       this.emit(`this.${fieldName} = map.${fieldName};\n`, level);
     }
@@ -1179,6 +1179,8 @@ Client.main(process.argv.slice(2));`);
     this.emit(`\n`);
     this.emit(`constructor(map?: { [key: string]: any }) {\n`, level + 1);
     this.emit(`super(map);\n`, level + 2);
+    this.emit(`this.name = "${exceptionName}Error";\n`, level + 2);
+    this.emit(`Object.setPrototypeOf(this, ${exceptionName}Error.prototype);\n`, level + 2);
     this.visitEcxceptionConstrutor(exceptionBody, exceptionName, level + 2);
     this.emit(`}\n`, level + 1);
     this.emit('}\n\n', level);

package.json

@@ -20,7 +20,7 @@
   },
   "dependencies": {
     "@darabonba/annotation-parser": "^1.0.0",
-    "@darabonba/parser": "^2.0.5"
+    "@darabonba/parser": "^2.1.3"
   },
   "devDependencies": {
     "eslint": "^6.5.1",

test/fixtures/builtin/client.ts

@@ -64,8 +64,8 @@ export default class Client {
   }
 
   static async envTest(args: string[]): Promise<void> {
-    let es = process.env["TEST"];;
-    let ma = process.env["TEST"] = es + "test";;
+    let es = process.env["TEST"];
+    let ma = process.env["TEST"] = es + "test";
   }
 
   static async fileTest(args: string[]): Promise<void> {
@@ -116,8 +116,8 @@ export default class Client {
   }
 
   static async logerTest(args: string[]): Promise<void> {
+    console.info(`test:${args[0]}`);
     console.log("test");
-    console.info("test");
     console.warn("test");
     console.debug("test");
     console.error("test");
@@ -323,7 +323,7 @@ export default class Client {
 
     }
 
-    $dara.sleep(a);
+    await $dara.sleep(a);
     let defaultVal = args[0] || args[1];
     if (defaultVal === b) {
       return ;

test/fixtures/builtin/main.dara

@@ -109,8 +109,8 @@ static async function jsonTest(args: [string]): void {
 }
 
 static async function logerTest(args: [string]): void { 
+    $Logger.info(`test:${args[0]}`);
     $Logger.log("test");
-    $Logger.info("test");
     $Logger.warning("test");
     $Logger.debug("test");
     $Logger.error("test");

test/fixtures/complex/client.ts

@@ -215,6 +215,8 @@ export class Err1Error extends $dara.BaseError {
 
   constructor(map?: { [key: string]: any }) {
     super(map);
+    this.name = "Err1Error";
+    Object.setPrototypeOf(this, Err1Error.prototype);
     this.data = map.data;
   }
 }
@@ -224,6 +226,8 @@ export class Err2Error extends $dara.BaseError {
 
   constructor(map?: { [key: string]: any }) {
     super(map);
+    this.name = "Err2Error";
+    Object.setPrototypeOf(this, Err2Error.prototype);
     this.accessErrMessage = map.accessErrMessage;
   }
 }