@abedmurrar/objection 4.0.0-alpha.0 → 4.0.0-beta.1

package/lib/model/modelValues.js

@@ -1,126 +1,113 @@
 'use strict';
-
 const { isObject } = require('../utils/objectUtils');
-
 // Property keys needs to be prefixed with a non-numeric character so that
 // they are not considered indexes when used as object keys.
 const PROP_KEY_PREFIX = 'k_';
-
 function values(model, args) {
-  switch (args.length) {
-    case 1:
-      return values1(model, args);
-    case 2:
-      return values2(model, args);
-    case 3:
-      return values3(model, args);
-    default:
-      return valuesN(model, args);
-  }
+    switch (args.length) {
+        case 1:
+            return values1(model, args);
+        case 2:
+            return values2(model, args);
+        case 3:
+            return values3(model, args);
+        default:
+            return valuesN(model, args);
+    }
 }
-
 function propKey(model, props) {
-  switch (props.length) {
-    case 1:
-      return propKey1(model, props);
-    case 2:
-      return propKey2(model, props);
-    case 3:
-      return propKey3(model, props);
-    default:
-      return propKeyN(model, props);
-  }
+    switch (props.length) {
+        case 1:
+            return propKey1(model, props);
+        case 2:
+            return propKey2(model, props);
+        case 3:
+            return propKey3(model, props);
+        default:
+            return propKeyN(model, props);
+    }
 }
-
 function hasProps(model, props) {
-  for (let i = 0; i < props.length; ++i) {
-    const value = model[props[i]];
-
-    if (isNullOrUndefined(value)) {
-      return false;
+    for (let i = 0; i < props.length; ++i) {
+        const value = model[props[i]];
+        if (isNullOrUndefined(value)) {
+            return false;
+        }
     }
-  }
-
-  return true;
+    return true;
 }
-
 function values1(model, args) {
-  return [model[args[0]]];
+    return [model[args[0]]];
 }
-
 function values2(model, args) {
-  return [model[args[0]], model[args[1]]];
+    return [model[args[0]], model[args[1]]];
 }
-
 function values3(model, args) {
-  return [model[args[0]], model[args[1]], model[args[2]]];
+    return [model[args[0]], model[args[1]], model[args[2]]];
 }
-
 function valuesN(model, args) {
-  const ret = new Array(args.length);
-
-  for (let i = 0, l = args.length; i < l; ++i) {
-    ret[i] = model[args[i]];
-  }
-
-  return ret;
+    const ret = new Array(args.length);
+    for (let i = 0, l = args.length; i < l; ++i) {
+        ret[i] = model[args[i]];
+    }
+    return ret;
 }
-
 function propKey1(model, props) {
-  return PROP_KEY_PREFIX + propToStr(model[props[0]]);
+    return PROP_KEY_PREFIX + propToStr(model[props[0]]);
 }
-
 function propKey2(model, props) {
-  return PROP_KEY_PREFIX + propToStr(model[props[0]]) + ',' + propToStr(model[props[1]]);
+    return PROP_KEY_PREFIX + propToStr(model[props[0]]) + ',' + propToStr(model[props[1]]);
 }
-
 function propKey3(model, props) {
-  return (
-    PROP_KEY_PREFIX +
-    propToStr(model[props[0]]) +
-    ',' +
-    propToStr(model[props[1]]) +
-    ',' +
-    propToStr(model[props[2]])
-  );
+    return (PROP_KEY_PREFIX +
+        propToStr(model[props[0]]) +
+        ',' +
+        propToStr(model[props[1]]) +
+        ',' +
+        propToStr(model[props[2]]));
 }
-
 function propKeyN(model, props) {
-  let key = PROP_KEY_PREFIX;
-
-  for (let i = 0, l = props.length; i < l; ++i) {
-    key += propToStr(model[props[i]]);
-
-    if (i < l - 1) {
-      key += ',';
+    let key = PROP_KEY_PREFIX;
+    for (let i = 0, l = props.length; i < l; ++i) {
+        key += propToStr(model[props[i]]);
+        if (i < l - 1) {
+            key += ',';
+        }
     }
-  }
-
-  return key;
+    return key;
 }
-
 function propToStr(value) {
-  if (value === null) {
-    return 'null';
-  } else if (value === undefined) {
-    return 'undefined';
-  } else if (Buffer.isBuffer(value)) {
-    return value.toString('hex');
-  } else if (isObject(value)) {
-    return JSON.stringify(value);
-  } else {
-    return `${value}`;
-  }
+    // Ids are almost always numbers or strings.
+    const type = typeof value;
+    if (type === 'string') {
+        return value;
+    }
+    else if (type === 'number') {
+        return `${value}`;
+    }
+    else if (value === null) {
+        return 'null';
+    }
+    else if (value === undefined) {
+        return 'undefined';
+    }
+    else if (Buffer.isBuffer(value)) {
+        return value.toString('hex');
+    }
+    else if (isObject(value)) {
+        return JSON.stringify(value);
+    }
+    else {
+        return `${value}`;
+    }
 }
-
 function isNullOrUndefined(val) {
-  return val === null || val === undefined;
+    return val === null || val === undefined;
 }
-
 module.exports = {
-  PROP_KEY_PREFIX,
-  propToStr,
-  values,
-  hasProps,
-  propKey,
+    PROP_KEY_PREFIX,
+    propToStr,
+    values,
+    hasProps,
+    propKey,
 };

package/lib/model/modelVisitor.js

@@ -1,41 +1,34 @@
 'use strict';
-
 function visitModels(models, modelClass, visitor) {
-  doVisit(models, modelClass, null, null, visitor);
+    doVisit(models, modelClass, null, null, visitor);
 }
-
 function doVisit(models, modelClass, parent, rel, visitor) {
-  if (Array.isArray(models)) {
-    visitMany(models, modelClass, parent, rel, visitor);
-  } else if (models) {
-    visitOne(models, modelClass, parent, rel, visitor);
-  }
+    if (Array.isArray(models)) {
+        visitMany(models, modelClass, parent, rel, visitor);
+    }
+    else if (models) {
+        visitOne(models, modelClass, parent, rel, visitor);
+    }
 }
-
 function visitMany(models, modelClass, parent, rel, visitor) {
-  for (let i = 0, l = models.length; i < l; ++i) {
-    visitOne(models[i], modelClass, parent, rel, visitor);
-  }
+    for (let i = 0, l = models.length; i < l; ++i) {
+        visitOne(models[i], modelClass, parent, rel, visitor);
+    }
 }
-
 function visitOne(model, modelClass, parent, rel, visitor) {
-  if (model) {
-    visitor(model, modelClass, parent, rel);
-  }
-
-  const relationNames = modelClass.getRelationNames();
-
-  for (let i = 0, l = relationNames.length; i < l; ++i) {
-    const relationName = relationNames[i];
-    const relatedObj = model[relationName];
-
-    if (relatedObj) {
-      const relation = modelClass.getRelation(relationName);
-      doVisit(relatedObj, relation.relatedModelClass, model, relation, visitor);
+    if (model) {
+        visitor(model, modelClass, parent, rel);
+    }
+    const relationNames = modelClass.getRelationNames();
+    for (let i = 0, l = relationNames.length; i < l; ++i) {
+        const relationName = relationNames[i];
+        const relatedObj = model[relationName];
+        if (relatedObj) {
+            const relation = modelClass.getRelation(relationName);
+            doVisit(relatedObj, relation.relatedModelClass, model, relation, visitor);
+        }
     }
-  }
 }
-
 module.exports = {
-  visitModels,
+    visitModels,
 };

package/lib/objection.js

@@ -1,14 +1,5 @@
 'use strict';
-
-const {
-  DBError,
-  UniqueViolationError,
-  NotNullViolationError,
-  ForeignKeyViolationError,
-  ConstraintViolationError,
-  CheckViolationError,
-  DataError,
-} = require('db-errors');
+const { DBError, UniqueViolationError, NotNullViolationError, ForeignKeyViolationError, ConstraintViolationError, CheckViolationError, DataError, } = require('db-errors');
 const { Model: NativeModel } = require('./model/Model');
 const { QueryBuilder: NativeQueryBuilder } = require('./queryBuilder/QueryBuilder');
 const { QueryBuilderBase } = require('./queryBuilder/QueryBuilderBase');
@@ -26,89 +17,73 @@ const { HasOneThroughRelation } = require('./relations/hasOneThrough/HasOneThrou
 const { ManyToManyRelation } = require('./relations/manyToMany/ManyToManyRelation');
 const { transaction } = require('./transaction');
 const { initialize } = require('./initialize');
-
-const {
-  snakeCaseMappers,
-  knexSnakeCaseMappers,
-  knexIdentifierMapping,
-} = require('./utils/identifierMapping');
+const { snakeCaseMappers, knexSnakeCaseMappers, knexIdentifierMapping, } = require('./utils/identifierMapping');
 const { compose, mixin } = require('./utils/mixin');
 const { ref } = require('./queryBuilder/ReferenceBuilder');
 const { val } = require('./queryBuilder/ValueBuilder');
 const { raw } = require('./queryBuilder/RawBuilder');
 const { fn } = require('./queryBuilder/FunctionBuilder');
-const { inherit } = require('../lib/utils/classUtils');
-
+const { inherit } = require('./utils/classUtils');
 // We need to wrap the classes, that people can inherit, with ES5 classes
 // so that babel is able to use ES5 inheritance. sigh... Maybe people
 // should stop transpiling node apps to ES5 in the year 2019? Node 6
 // with full class support was released three years ago.
-
 function Model() {
-  // Nothing to do here.
+    // Nothing to do here.
 }
-
 function QueryBuilder(...args) {
-  NativeQueryBuilder.init(this, ...args);
+    NativeQueryBuilder.init(this, ...args);
 }
-
 function Validator(...args) {
-  NativeValidator.init(this, ...args);
+    NativeValidator.init(this, ...args);
 }
-
 function AjvValidator(...args) {
-  NativeAjvValidator.init(this, ...args);
+    NativeAjvValidator.init(this, ...args);
 }
-
 // Returns the relation mappings as is. This only exists for typescript: it
 // preserves the exact types of the mappings (like the names of `extra`
 // columns) so that the relation types can be inferred from them.
 function defineRelations(relationMappings) {
-  return relationMappings;
+    return relationMappings;
 }
-
 inherit(Model, NativeModel);
 inherit(QueryBuilder, NativeQueryBuilder);
 inherit(Validator, NativeValidator);
 inherit(AjvValidator, NativeAjvValidator);
-
 Model.QueryBuilder = QueryBuilder;
-
 module.exports = {
-  Model,
-  QueryBuilder,
-  QueryBuilderBase,
-  QueryBuilderOperation,
-  RelationExpression,
-  ValidationError,
-  NotFoundError,
-  AjvValidator,
-  Validator,
-  Relation,
-  HasOneRelation,
-  HasManyRelation,
-  BelongsToOneRelation,
-  HasOneThroughRelation,
-  ManyToManyRelation,
-
-  transaction,
-  initialize,
-  compose,
-  mixin,
-  defineRelations,
-  ref,
-  val,
-  raw,
-  fn,
-  snakeCaseMappers,
-  knexSnakeCaseMappers,
-  knexIdentifierMapping,
-
-  DBError,
-  UniqueViolationError,
-  NotNullViolationError,
-  ForeignKeyViolationError,
-  ConstraintViolationError,
-  CheckViolationError,
-  DataError,
+    Model,
+    QueryBuilder,
+    QueryBuilderBase,
+    QueryBuilderOperation,
+    RelationExpression,
+    ValidationError,
+    NotFoundError,
+    AjvValidator,
+    Validator,
+    Relation,
+    HasOneRelation,
+    HasManyRelation,
+    BelongsToOneRelation,
+    HasOneThroughRelation,
+    ManyToManyRelation,
+    transaction,
+    initialize,
+    compose,
+    mixin,
+    defineRelations,
+    ref,
+    val,
+    raw,
+    fn,
+    snakeCaseMappers,
+    knexSnakeCaseMappers,
+    knexIdentifierMapping,
+    DBError,
+    UniqueViolationError,
+    NotNullViolationError,
+    ForeignKeyViolationError,
+    ConstraintViolationError,
+    CheckViolationError,
+    DataError,
 };