leoric 2.2.0 → 2.2.3

package/History.md

@@ -1,3 +1,30 @@
+2.2.3 / 2022-03-01
+==================
+
+## What's Changed
+* fix: normalize attribute defaultValue by @cyjake in https://github.com/cyjake/leoric/pull/285
+* fix: instance beforeUpdate hooks should not modify any Raw if there are no Raw assignment in them by @JimmyDaddy in https://github.com/cyjake/leoric/pull/283
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.2.2...v2.2.3
+
+2.2.2 / 2022-02-28
+==================
+
+## What's Changed
+* fix: tddl gives misleading information_schema.columns.table_name by @cyjake in https://github.com/cyjake/leoric/pull/284
+
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.2.1...v2.2.2
+
+2.2.1 / 2022-02-24
+==================
+
+## What's Changed
+* fix: realm.DataTypes should be invokable by @cyjake in https://github.com/cyjake/leoric/pull/282
+
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v2.2.0...v2.2.1
+
 2.2.0 / 2022-02-24
 ==================
 

package/index.js

@@ -36,7 +36,7 @@ const connect = async function connect(opts) {
   return realm;
 };
 
-Object.assign(Realm.prototype, migrations);
+Object.assign(Realm.prototype, migrations, { DataTypes });
 Object.assign(Realm, {
   connect,
   Bone,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.2.0",
+  "version": "2.2.3",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -72,6 +72,6 @@
     "pg": "^8.5.1",
     "sinon": "^10.0.0",
     "sqlite3": "^5.0.2",
-    "typescript": "^4.4.4"
+    "typescript": "^4.6.2"
   }
 }

package/src/bone.js

@@ -199,14 +199,14 @@ class Bone {
   }
 
   /**
-   *
-   * clone instance
+   * @protected clone instance
    * @param {Bone} target
    * @memberof Bone
    */
   _clone(target) {
-    Object.assign(this.#raw, target.getRaw());
-    Object.assign(this.#rawSaved, target.getRawSaved());
+    this.#raw = Object.assign({}, target.getRaw());
+    this.#rawSaved = Object.assign({}, target.getRawSaved());
+    this.#rawPrevious = Object.assign({}, target.getRawPrevious());
   }
 
   /**
@@ -717,6 +717,7 @@ class Bone {
     for (const name in attributes) {
       const value = this.attribute(name);
       const { defaultValue } = attributes[name];
+      // console.log(attributes[name], name, defaultValue);
       if (value != null) {
         data[name] = value;
       } else if (value === undefined && defaultValue != null) {

package/src/drivers/abstract/attribute.js

@@ -99,15 +99,23 @@ class Attribute {
     }
     const type = createType(DataTypes, params);
     const dataType = params.dataType || type.dataType;
+    let { defaultValue = null } = params;
+    try {
+      // normalize column defaults like `'0'` or `CURRENT_TIMESTAMP`
+      defaultValue = type.cast(type.uncast(defaultValue));
+    } catch {
+      defaultValue = null;
+    }
+
     Object.assign(this, {
       name,
       columnName,
       primaryKey: false,
-      defaultValue: null,
       allowNull: !params.primaryKey,
       columnType: type.toSqlString().toLowerCase(),
       ...params,
       type,
+      defaultValue,
       dataType,
       jsType: findJsType(DataTypes, type, dataType),
     });

package/src/realm.js

@@ -75,7 +75,7 @@ async function loadModels(Spine, models, opts) {
   const schemaInfo = await Spine.driver.querySchemaInfo(database, tables);
 
   for (const model of models) {
-    const columns = schemaInfo[model.physicTable];
+    const columns = schemaInfo[model.physicTable] || schemaInfo[model.table];
     if (!model.attributes) initAttributes(model, columns);
     model.load(columns);
     Spine.models[model.name] = model;
@@ -129,11 +129,6 @@ class Realm {
     this.options = Spine.options = options;
   }
 
-  get DataTypes() {
-    if (!this.driver) throw new Error('database not connected yet');
-    return this.driver.DataTypes;
-  }
-
   define(name, attributes, opts = {}, descriptors = {}) {
     const Model = class extends this.Bone {
       static name = name;

package/src/setup_hooks.js

@@ -129,9 +129,28 @@ function addHook(target, hookName, func) {
       if (useHooks && type === hookType.BEFORE) {
         // this.change(key) or this.attributeChanged(key) should work at before update
         if (method === 'update' && typeof arguments[0] === 'object' && !arguments[0] != null) {
-          for (const name in arguments[0]) this[name] = arguments[0][name];
+          const values = arguments[0];
+          const fields = arguments[1] && arguments[1].fields && arguments[1].fields.length? arguments[1].fields : [];
+          const originalRaw = {};
+          const changeRaw = {};
+          for (const name in values) {
+            if (!fields.length || fields.includes(name)) {
+              originalRaw[name] = this.attribute(name);
+              this[name] = values[name];
+              changeRaw[name] = this.attribute(name);
+            }
+          }
+          await func.apply(this, args);
+          // revert instance after before hooks
+          Object.keys(originalRaw).forEach((key) => {
+            const current = this.attribute(key);
+            // raw[key] may changed in beforeUpdate hooks
+            if (current !== originalRaw[key] && current !== changeRaw[key]) return;
+            this.attribute(key, originalRaw[key]);
+          });
+        } else {
+          await func.apply(this, args);
         }
-        await func.apply(this, args);
       }
       const res = await instanceOriginFunc.call(this, ...arguments);
       if (useHooks && type === hookType.AFTER) {