leoric 2.6.2 → 2.7.1

package/index.js

@@ -5,7 +5,7 @@ const Logger = require('./src/drivers/abstract/logger');
 const Spell = require('./src/spell');
 const Bone = require('./src/bone');
 const Collection = require('./src/collection');
-const { invokable: DataTypes } = require('./src/data_types');
+const { invokable: DataTypes, LENGTH_VARIANTS } = require('./src/data_types');
 const migrations = require('./src/migrations');
 const sequelize = require('./src/adapters/sequelize');
 const { heresql } = require('./src/utils/string');
@@ -14,6 +14,7 @@ const Realm = require('./src/realm');
 const Decorators = require('./src/decorators');
 const Raw = require('./src/raw');
 const { MysqlDriver, PostgresDriver, SqliteDriver, AbstractDriver } = require('./src/drivers');
+const { isBone } = require('./src/utils');
 
 /**
  * @typedef {Object} RawSql
@@ -64,6 +65,8 @@ Object.assign(Realm, {
   SqliteDriver,
   AbstractDriver,
   Raw,
+  LENGTH_VARIANTS,
+  isBone,
 });
 
 module.exports = Realm;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.6.2",
+  "version": "2.7.1",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "types/index.d.ts",
@@ -67,6 +67,7 @@
     "@types/node": "^16.10.1",
     "dayjs": "^1.10.3",
     "eslint": "^7.20.0",
+    "eslint-plugin-no-only-tests": "^3.0.0",
     "expect.js": "^0.3.1",
     "jsdoc": "^3.6.3",
     "mocha": "^8.2.1",

package/src/adapters/sequelize.js

@@ -65,7 +65,7 @@ const setScopeToSpell = (scope) => (spell) => {
  * @returns {Object}
  */
 function mergeScope(scopes) {
-  let merged = {};
+  const merged = {};
   for (const scope of scopes) {
     if (scope.where) {
       merged.where = Object.assign({}, merged.where, scope.where);
@@ -227,7 +227,7 @@ module.exports = Bone => {
       }
 
       const { where } = options;
-      let spell = this._find(where, options)[`$${func}`](name);
+      const spell = this._find(where, options)[`$${func}`](name);
       if (options.paranoid === false) return spell.unparanoid;
       return spell;
     }
@@ -262,9 +262,9 @@ module.exports = Bone => {
 
     /**
      * see https://github.com/sequelize/sequelize/blob/a729c4df41fa3a58fbecaf879265d2fb73d80e5f/src/model.js#L2299
-     * @param {Array<Object>} valueSets 
-     * @param {Object} options 
-     * @returns 
+     * @param {Array<Object>} valueSets
+     * @param {Object} options
+     * @returns
      */
     static bulkBuild(valueSets, options = {}) {
       if (!valueSets.length) return [];
@@ -333,7 +333,7 @@ module.exports = Bone => {
     // static drop() {}
 
     static findAll(options = {}) {
-      let spell = this._find({}, filterOptions(options));
+      const spell = this._find({}, filterOptions(options));
       translateOptions(spell, options);
       if (options.paranoid === false) return spell.unparanoid;
       return spell;

package/src/bone.js

@@ -10,7 +10,7 @@ const pluralize = require('pluralize');
 const { executeValidator, LeoricValidateError } = require('./validator');
 require('reflect-metadata');
 
-const DataTypes = require('./data_types');
+const { default: DataTypes } = require('./data_types');
 const Collection = require('./collection');
 const Spell = require('./spell');
 const Raw = require('./raw');
@@ -21,6 +21,7 @@ const {
   LEGACY_TIMESTAMP_COLUMN_MAP,
   ASSOCIATE_METADATA_MAP,
   TIMESTAMP_ATTRIBUTE_NAMES,
+  IS_LEORIC_BONE,
 } = require('./constants');
 
 const columnAttributesKey = Symbol('leoric#columns');
@@ -101,7 +102,7 @@ function valuesValidate(values, attributes, ctx) {
     const value = values[valueKey];
     if (value == null && defaultValue == null) {
       if (allowNull === false) throw new LeoricValidateError('notNull', name);
-      if ((allowNull === true || allowNull === undefined) && validate.notNull === undefined ) continue;
+      if ((allowNull === true || allowNull === undefined) && validate.notNull === undefined) continue;
     }
     if (!validate) continue;
     for (const key in validate) {
@@ -699,7 +700,7 @@ class Bone {
   async _update(values, options = {}) {
     const Model = this.constructor;
     const { attributes, primaryKey, shardingKey } = Model;
-    let changes = {};
+    const changes = {};
     if (values == null) {
       for (const name in attributes) {
         if (this.changed(name)) changes[name] = this.attribute(name);
@@ -727,7 +728,7 @@ class Bone {
     if (attributes[updatedAt] && !changes[updatedAt] && !changes[deletedAt] && !options.silent) {
       changes[updatedAt] = new Date();
     }
-    if (options.validate !== false ) {
+    if (options.validate !== false) {
       this._validateAttributes(changes);
     }
     const spell = new Spell(Model, options).$where(where).$update(changes);
@@ -910,10 +911,9 @@ class Bone {
     const { attributes } = Model;
     for (const key in attributes) {
       const attribute = attributes[key];
-      if (attribute.primaryKey) continue;
       if (values[key] == null && attribute.defaultValue != null) {
         data[key] = attribute.defaultValue;
-      } else if (values[key] !== undefined){
+      } else if (values[key] !== undefined) {
         data[key] = values[key];
       }
     }
@@ -1667,7 +1667,7 @@ class Bone {
       if (force) {
         await driver.dropTable(table);
         await driver.createTable(table, attributes);
-      } else if (alter){
+      } else if (alter) {
         await driver.alterTable(table, compare(attributes, columnMap));
       } else {
         console.warn('[synchronize_fail] %s couldn\'t be synchronized, please use force or alter to specify execution', this.name);
@@ -1715,4 +1715,6 @@ for (const getter of Spell_getters) {
   });
 }
 
+Reflect.defineMetadata(IS_LEORIC_BONE, true, Bone);
+
 module.exports = Bone;

package/src/collection.js

@@ -1,8 +1,5 @@
 'use strict';
 
-const { AGGREGATOR_MAP } = require('./constants');
-
-const AGGREGATORS = Object.values(AGGREGATOR_MAP);
 /**
  * An extended Array to represent collections of models.
  */
@@ -92,11 +89,6 @@ function dispatch(spell, rows, fields) {
       const row = rows[0];
       const record = row && (row[''] || row[table]);
       const result = record && record[value];
-      // see https://www.w3schools.com/mysql/mysql_ref_functions.asp
-      if (AGGREGATORS.includes(args[0].name)) {
-        const num = Number(result);
-        return isNaN(num) ? result : num;
-      }
       return result;
     }
   }

package/src/constants.js

@@ -36,6 +36,8 @@ const ASSOCIATE_METADATA_MAP = {
   belongsTo: Symbol('belongsTo'),
 };
 
+const IS_LEORIC_BONE = Symbol('leoric#bone');
+
 module.exports = {
   AGGREGATOR_MAP,
   LEGACY_TIMESTAMP_MAP,
@@ -44,4 +46,5 @@ module.exports = {
   ASSOCIATE_METADATA_MAP,
   TIMESTAMP_ATTRIBUTE_NAMES,
   AGGREGATORS,
+  IS_LEORIC_BONE,
 };