Merge pull request #31 from FredKSchott/duplicate-properties

New: Add support for duplicate object literal properties

Author: nzakas

espree.js

@@ -2445,12 +2445,13 @@ function parseObjectProperty() {
 
 function parseObjectInitialiser() {
     var marker = markerCreate(),
+        allowDuplicates = extra.ecmaFeatures.objectLiteralDuplicateProperties,
         properties = [],
         property,
         name,
         key,
         kind,
-        map = {},
+        kindMap = {},
         toString = String;
 
     expect("{");
@@ -2459,34 +2460,43 @@ function parseObjectInitialiser() {
         property = parseObjectProperty();
 
         if (!property.computed) {
+
             if (property.key.type === astNodeTypes.Identifier) {
                 name = property.key.name;
             } else {
                 name = toString(property.key.value);
             }
 
-            /*eslint-disable no-nested-ternary*/
-            kind = (property.kind === "init") ? PropertyKind.Data : (property.kind === "get") ? PropertyKind.Get : PropertyKind.Set;
-            /*eslint-enable no-nested-ternary*/
+            if (property.kind === "init") {
+                kind = PropertyKind.Data;
+            } else if (property.kind === "get") {
+                kind = PropertyKind.Get;
+            } else {
+                kind = PropertyKind.Set;
+            }
 
             key = "$" + name;
-            if (Object.prototype.hasOwnProperty.call(map, key)) {
-                if (map[key] === PropertyKind.Data) {
-                    if (strict && kind === PropertyKind.Data) {
+            if (Object.prototype.hasOwnProperty.call(kindMap, key)) {
+                if (kindMap[key] === PropertyKind.Data) {
+                    if (kind === PropertyKind.Data && name === "__proto__" && allowDuplicates) {
+                        // Duplicate '__proto__' literal properties are forbidden in ES 6
+                        throwErrorTolerant({}, Messages.DuplicatePrototypeProperty);
+                    } else if (kind === PropertyKind.Data && strict && !allowDuplicates) {
+                        // Duplicate literal properties are only forbidden in ES 5 strict mode
                         throwErrorTolerant({}, Messages.StrictDuplicateProperty);
                     } else if (kind !== PropertyKind.Data) {
                         throwErrorTolerant({}, Messages.AccessorDataProperty);
                     }
                 } else {
                     if (kind === PropertyKind.Data) {
                         throwErrorTolerant({}, Messages.AccessorDataProperty);
-                    } else if (map[key] & kind) {
+                    } else if (kindMap[key] & kind) {
                         throwErrorTolerant({}, Messages.AccessorGetSet);
                     }
                 }
-                map[key] |= kind;
+                kindMap[key] |= kind;
             } else {
-                map[key] = kind;
+                kindMap[key] = kind;
             }
         }
 

lib/features.js

@@ -66,6 +66,9 @@ module.exports = {
     // enable parsing of shorthand object literal properties
     objectLiteralShorthandProperties: false,
 
+    // Allow duplicate object literal properties (except '__proto__')
+    objectLiteralDuplicateProperties: false,
+
     // enable parsing of generators/yield
     generators: false,
 

lib/messages.js

@@ -68,6 +68,7 @@ module.exports = {
     StrictOctalLiteral: "Octal literals are not allowed in strict mode.",
     StrictDelete: "Delete of an unqualified identifier in strict mode.",
     StrictDuplicateProperty: "Duplicate data property in object literal not allowed in strict mode",
+    DuplicatePrototypeProperty: "Duplicate '__proto__' property in object literal are not allowed",
     AccessorDataProperty: "Object literal may not have data and accessor property with the same name",
     AccessorGetSet: "Object literal may not have multiple get/set accessors with the same name",
     StrictLHSAssignment: "Assignment to eval or arguments is not allowed in strict mode",

tests/fixtures/ecma-features-mix/objectLiteralDuplicateProperties-and-objectLiteralComputedProperties/proto-computed-property.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+    objectLiteralDuplicateProperties: true,
+    objectLiteralComputedProperties: true
+};