Merge pull request #66 from curbengh/no-multi-assign

style: no-multi-assign
hexojs · Nov 30, 2019 · c24cf93 · c24cf93
2 parents 2170bf4 + 007ae44
commit c24cf93
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/lib/database.js b/lib/database.js
@@ -97,7 +97,8 @@ class Database {
       return this._models[name];
     }
 
-    const model = this._models[name] = new this.Model(name, schema);
+    this._models[name] = new this.Model(name, schema);
+    const model = this._models[name];
     return model;
   }
 
@@ -178,8 +179,10 @@ class Database {
   }
 }
 
-Database.Schema = Database.prototype.Schema = Schema;
-Database.SchemaType = Database.prototype.SchemaType = SchemaType;
+Database.prototype.Schema = Schema;
+Database.Schema = Database.prototype.Schema;
+Database.prototype.SchemaType = SchemaType;
+Database.SchemaType = Database.prototype.SchemaType;
 Database.version = pkg.version;
 
 module.exports = Database;
diff --git a/lib/schema.js b/lib/schema.js
@@ -757,6 +757,7 @@ class Schema {
   }
 }
 
-Schema.Types = Schema.prototype.Types = Types;
+Schema.prototype.Types = Types;
+Schema.Types = Schema.prototype.Types;
 
 module.exports = Schema;
diff --git a/lib/util.js b/lib/util.js
@@ -57,7 +57,8 @@ exports.setProp = (obj, key, value) => {
 
   for (let i = 0; i < len; i++) {
     const name = token[i];
-    cursor = cursor[name] = cursor[name] || {};
+    cursor[name] = cursor[name] || {};
+    cursor = cursor[name];
   }
 
   cursor[lastKey] = value;
@@ -109,7 +110,8 @@ exports.setGetter = (obj, key, fn) => {
 
   for (let i = 0; i < len; i++) {
     const name = token[i];
-    cursor = cursor[name] = cursor[name] || {};
+    cursor[name] = cursor[name] || {};
+    cursor = cursor[name];
   }
 
   cursor.__defineGetter__(lastKey, fn);