Add fixes for es6 generator (#180)

Various fixes for JS (ES6) generator

samples/client/petstore/javascript-es6/src/model/Order.js

@@ -11,51 +11,42 @@
  *
  */
 
-
 import ApiClient from '../ApiClient';
 
-
-
-
-
 /**
-* The Order model module.
-* @module model/Order
-* @version 1.0.0
-*/
-export default class Order {
+ * The Order model module.
+ * @module model/Order
+ * @version 1.0.0
+ */
+class Order {
     /**
-    * Constructs a new <code>Order</code>.
-    * @alias module:model/Order
-    * @class
-    */
-
-    constructor() {
-        
-
-        
-        
-
-        
-
+     * Constructs a new <code>Order</code>.
+     * @alias module:model/Order
+     */
+    constructor() { 
         
+        Order.initialize(this);
     }
 
     /**
-    * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
-    * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
-    * @param {Object} data The plain JavaScript object bearing properties of interest.
-    * @param {module:model/Order} obj Optional instance to populate.
-    * @return {module:model/Order} The populated <code>Order</code> instance.
-    */
+     * Initializes the fields of this object.
+     * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins).
+     * Only for internal use.
+     */
+    static initialize(obj) { 
+    }
+
+    /**
+     * Constructs a <code>Order</code> from a plain JavaScript object, optionally creating a new instance.
+     * Copies all relevant properties from <code>data</code> to <code>obj</code> if supplied or a new instance if not.
+     * @param {Object} data The plain JavaScript object bearing properties of interest.
+     * @param {module:model/Order} obj Optional instance to populate.
+     * @return {module:model/Order} The populated <code>Order</code> instance.
+     */
     static constructFromObject(data, obj) {
         if (data) {
             obj = obj || new Order();
 
-            
-            
-            
-
             if (data.hasOwnProperty('id')) {
                 obj['id'] = ApiClient.convertToType(data['id'], 'Number');
             }
@@ -78,66 +69,72 @@ export default class Order {
         return obj;
     }
 
-    /**
-    * @member {Number} id
-    */
-    id = undefined;
-    /**
-    * @member {Number} petId
-    */
-    petId = undefined;
-    /**
-    * @member {Number} quantity
-    */
-    quantity = undefined;
-    /**
-    * @member {Date} shipDate
-    */
-    shipDate = undefined;
-    /**
-    * Order Status
-    * @member {module:model/Order.StatusEnum} status
-    */
-    status = undefined;
-    /**
-    * @member {Boolean} complete
-    * @default false
-    */
-    complete = false;
-
-
-
-
-
-
-    /**
-    * Allowed values for the <code>status</code> property.
-    * @enum {String}
-    * @readonly
-    */
-    static StatusEnum = {
-    
-        /**
-         * value: "placed"
-         * @const
-         */
-        "placed": "placed",
-    
-        /**
-         * value: "approved"
-         * @const
-         */
-        "approved": "approved",
-    
-        /**
-         * value: "delivered"
-         * @const
-         */
-        "delivered": "delivered"    
-    };
-
-
 
 }
 
+/**
+ * @member {Number} id
+ */
+Order.prototype['id'] = undefined;
+
+/**
+ * @member {Number} petId
+ */
+Order.prototype['petId'] = undefined;
+
+/**
+ * @member {Number} quantity
+ */
+Order.prototype['quantity'] = undefined;
+
+/**
+ * @member {Date} shipDate
+ */
+Order.prototype['shipDate'] = undefined;
+
+/**
+ * Order Status
+ * @member {module:model/Order.StatusEnum} status
+ */
+Order.prototype['status'] = undefined;
+
+/**
+ * @member {Boolean} complete
+ * @default false
+ */
+Order.prototype['complete'] = false;
+
+
+
+
+
+/**
+ * Allowed values for the <code>status</code> property.
+ * @enum {String}
+ * @readonly
+ */
+Order['StatusEnum'] = {
+
+    /**
+     * value: "placed"
+     * @const
+     */
+    "placed": "placed",
+
+    /**
+     * value: "approved"
+     * @const
+     */
+    "approved": "approved",
+
+    /**
+     * value: "delivered"
+     * @const
+     */
+    "delivered": "delivered"
+};
+
+
+
+export default Order;