fix: Can not defined same key in object. close #14

axetroy · Jun 13, 2018 · b06da7f · b06da7f
1 parent 95d05a8
commit b06da7f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/src/evaluate.ts b/src/evaluate.ts
@@ -849,7 +849,7 @@ const visitors: EvaluateMap = {
     const val = evaluate(path.createChild(node.value));
     if (isIdentifier(node.key)) {
       object[node.key.name] = val;
-      scope.const(node.key.name, val);
+      scope.var(node.key.name, val);
     } else {
       object[evaluate(path.createChild(node.key))] = val;
     }

diff --git a/src/scope.ts b/src/scope.ts
@@ -1,6 +1,6 @@
 import { Context } from "./context";
 import { ErrDuplicateDeclard } from "./error";
-import { Kind, KindType, ScopeType } from "./type";
+import { Kind, KindType, ScopeType, isolatedScopeMap } from "./type";
 import { Var } from "./var";
 
 export class Scope {
@@ -164,12 +164,10 @@ export class Scope {
     // tslint:disable-next-line
     let targetScope: Scope = this;
 
-    while (
-      targetScope.parent !== null &&
-      // function and constructor has own scope
-      (targetScope.type !== ScopeType.Function &&
-        targetScope.type !== ScopeType.Constructor)
-    ) {
+    // When to stop?
+    // 1. if the current scope is top-level scope
+    // 2. if the current scope type is one of types `function`, `constructor`
+    while (targetScope.parent !== null && !isolatedScopeMap[targetScope.type]) {
       targetScope = targetScope.parent;
     }
 

diff --git a/src/type.ts b/src/type.ts
@@ -24,6 +24,13 @@ export enum ScopeType {
   Block
 }
 
+export const isolatedScopeMap = {
+  [ScopeType.Function]: true,
+  [ScopeType.Constructor]: true,
+  [ScopeType.Method]: true,
+  [ScopeType.Object]: true
+};
+
 export enum Kind {
   Var = "var",
   Const = "const",

diff --git a/test/common/duplicate-object-key.test.ts b/test/common/duplicate-object-key.test.ts
@@ -3,18 +3,18 @@ import vm from "../../src/vm";
 
 test("allown duplicate object key", t => {
   // TODO
-  //   const sandbox: any = vm.createContext({});
-  //   const obj = vm.runInContext(
-  //     `
-  // var obj = {
-  //   a: 1,
-  //   a: 2,
-  // };
-  // module.exports = obj;
-  //     `,
-  //     sandbox
-  //   );
-  //   t.deepEqual(Object.keys(obj).length, 1);
-  //   t.deepEqual(obj.a, 2);
+  const sandbox: any = vm.createContext({});
+  const obj = vm.runInContext(
+    `
+  var obj = {
+    a: 1,
+    a: 2,
+  };
+  module.exports = obj;
+      `,
+    sandbox
+  );
+  t.deepEqual(Object.keys(obj).length, 1);
+  t.deepEqual(obj.a, 2);
   t.pass();
 });