KT-3008: multiple minor fixes after code review

js/js.translator/testData/closure-wrapper.txt

@@ -8,12 +8,11 @@
     }
 }(this, function () {
     var Kotlin = {};
-    var kotlin = Kotlin;
     function require() {
         return Kotlin;
     }
     var module = {};
 %output%
-    Kotlin.modules.kotlin = mergedRoot;
-    return mergedRoot;
+    Kotlin.modules.kotlin = Kotlin;
+    return Kotlin;
 }));

js/js.translator/testData/export_Kotlin_if_possible.js

@@ -1,3 +0,0 @@
-if (typeof module !== 'undefined' && module.exports) {
-    module.exports = Kotlin;
-}

js/js.translator/testData/kotlin_lib.js

@@ -340,8 +340,6 @@
             }
     });
 
-    Kotlin.Annotation = Kotlin.createTraitNow(null);
-
     Kotlin.Enum = Kotlin.createClassNow(null,
         function () {
             this.name$ = void 0;
@@ -1240,8 +1238,7 @@
         }
         return obj1;
     };
-    
-    Kotlin.lazyInitClasses = Kotlin.lazyInitClasses || [];
-    Kotlin.lazyInitClasses.push(lazyInitClasses);
+
+    Kotlin.createDefinition(lazyInitClasses, Kotlin);
 })(Kotlin);
 

js/js.translator/testData/kotlin_lib_ecma5.js

@@ -186,8 +186,7 @@
             //noinspection JSUnfilteredForInLoop
             Object.defineProperty(constructor, innerTypeName, {
                 get: innerType,
-                configurable: true,
-                enumerable: true
+                configurable: true
             });
         }
     }
@@ -226,7 +225,7 @@
     Kotlin.createClass = function (basesFun, constructor, properties, staticProperties) {
         function $o() {
             var klass = Kotlin.createClassNow(getBases(basesFun), constructor, properties, staticProperties);
-            Object.defineProperty(this, $o.className, {value: klass, enumerable: true});
+            Object.defineProperty(this, $o.className, {value: klass});
             if (staticProperties && staticProperties.object_initializer$) {
                 staticProperties.object_initializer$(klass);
             }
@@ -302,7 +301,7 @@
     Kotlin.createTrait = function (basesFun, properties, staticProperties) {
         function $o() {
             var klass = Kotlin.createTraitNow(getBases(basesFun), properties, staticProperties);
-            Object.defineProperty(this, $o.className, {value: klass, enumerable: true});
+            Object.defineProperty(this, $o.className, {value: klass});
             return klass;
         }
 
@@ -325,7 +324,7 @@
             var obj = new klass();
             var metadata = klass.$metadata$;
             metadata.type = Kotlin.TYPE.OBJECT;
-            Object.defineProperty(this, $o.className, {value: obj, enumerable: true});
+            Object.defineProperty(this, $o.className, {value: obj});
             defineNestedTypes(obj, klass.$metadata$.types);
             copyProperties(obj, metadata.staticMembers);
             if (metadata.baseClass != null) {
@@ -512,8 +511,7 @@
                         members[p].className = p;
                         Object.defineProperty(definition, p, {
                             get: members[p],
-                            configurable: true,
-                            enumerable: true
+                            configurable: true
                         });
                     }
                     else {
@@ -538,11 +536,11 @@
     Kotlin.definePackage = function (initializer, members) {
         var definition = createDefinition(members);
         if (initializer === null) {
-            return {value: definition, enumerable: true};
+            return {value: definition};
         }
         else {
             var getter = createPackageGetter(definition, initializer);
-            return {get: getter, enumerable: true};
+            return {get: getter};
         }
     };
 

js/js.translator/testData/maps.js

@@ -1124,6 +1124,5 @@
 
     Object.defineProperty(Kotlin, "ComplexHashSet", { get : function () { return Kotlin.HashSet; }});
 
-    Kotlin.lazyInitClasses = Kotlin.lazyInitClasses || [];
-    Kotlin.lazyInitClasses.push(lazyInitClasses);
+    Kotlin.createDefinition(lazyInitClasses, Kotlin);
 }(Kotlin));

js/js.translator/testData/merge.js

@@ -1,11 +1,6 @@
-var stdlib = module.exports;
-var mergedRoot = Kotlin;
-
-for (var propertyName in stdlib) {
-    Kotlin[propertyName] = stdlib[propertyName];
-}
 (function () {
-    for (var i = 0; i < Kotlin.lazyInitClasses.length; ++i) {
-        Kotlin.createDefinition(Kotlin.lazyInitClasses[i], mergedRoot);
-    }
+    var stdlib = module.exports;
+    Object.getOwnPropertyNames(stdlib).forEach(function(propertyName) {
+        Kotlin[propertyName] = stdlib[propertyName];
+    });
 })();