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

package/lib/model/modelParseRelations.js

@@ -1,82 +1,83 @@
 'use strict';
-
 const { isObject } = require('../utils/objectUtils');
-
 function parseRelationsIntoModelInstances(model, json, options = {}) {
-  if (!options.cache) {
-    options = Object.assign({}, options, {
-      cache: new Map(),
-    });
-  }
-
-  options.cache.set(json, model);
-
-  for (const relationName of model.constructor.getRelationNames()) {
-    const relationJson = json[relationName];
-
-    if (relationJson !== undefined) {
-      const relation = model.constructor.getRelation(relationName);
-      const relationModel = parseRelation(relationJson, relation, options);
-
-      if (relationModel !== relationJson) {
-        model[relation.name] = relationModel;
-      }
+    const relationNames = model.constructor.getRelationNames();
+    if (!options.cache && !hasRelation(json, relationNames)) {
+        // Nothing to parse. The cache would only be used for the relations.
+        return model;
     }
-  }
-
-  return model;
+    if (!options.cache) {
+        options = Object.assign({}, options, {
+            cache: new Map(),
+        });
+    }
+    options.cache.set(json, model);
+    for (const relationName of relationNames) {
+        const relationJson = json[relationName];
+        if (relationJson !== undefined) {
+            const relation = model.constructor.getRelation(relationName);
+            const relationModel = parseRelation(relationJson, relation, options);
+            if (relationModel !== relationJson) {
+                model[relation.name] = relationModel;
+            }
+        }
+    }
+    return model;
+}
+function hasRelation(json, relationNames) {
+    for (let i = 0, l = relationNames.length; i < l; ++i) {
+        if (json[relationNames[i]] !== undefined) {
+            return true;
+        }
+    }
+    return false;
 }
-
 function parseRelation(json, relation, options) {
-  if (Array.isArray(json)) {
-    return parseRelationArray(json, relation, options);
-  } else if (json) {
-    return parseRelationObject(json, relation, options);
-  } else {
-    return null;
-  }
+    if (Array.isArray(json)) {
+        return parseRelationArray(json, relation, options);
+    }
+    else if (json) {
+        return parseRelationObject(json, relation, options);
+    }
+    else {
+        return null;
+    }
 }
-
 function parseRelationArray(json, relation, options) {
-  const models = new Array(json.length);
-  let didChange = false;
-
-  for (let i = 0, l = json.length; i < l; ++i) {
-    const model = parseRelationObject(json[i], relation, options);
-
-    if (model !== json[i]) {
-      didChange = true;
+    const models = new Array(json.length);
+    let didChange = false;
+    for (let i = 0, l = json.length; i < l; ++i) {
+        const model = parseRelationObject(json[i], relation, options);
+        if (model !== json[i]) {
+            didChange = true;
+        }
+        models[i] = model;
+    }
+    if (didChange) {
+        return models;
+    }
+    else {
+        return json;
     }
-
-    models[i] = model;
-  }
-
-  if (didChange) {
-    return models;
-  } else {
-    return json;
-  }
 }
-
 function parseRelationObject(json, relation, options) {
-  if (isObject(json)) {
-    const modelClass = relation.relatedModelClass;
-    let model = options.cache.get(json);
-
-    if (model === undefined) {
-      if (json instanceof modelClass) {
-        model = parseRelationsIntoModelInstances(json, json, options);
-      } else {
-        model = modelClass.fromJson(json, options);
-      }
+    if (isObject(json)) {
+        const modelClass = relation.relatedModelClass;
+        let model = options.cache.get(json);
+        if (model === undefined) {
+            if (json instanceof modelClass) {
+                model = parseRelationsIntoModelInstances(json, json, options);
+            }
+            else {
+                model = modelClass.fromJson(json, options);
+            }
+        }
+        return model;
+    }
+    else {
+        return json;
     }
-
-    return model;
-  } else {
-    return json;
-  }
 }
-
 module.exports = {
-  parseRelationsIntoModelInstances,
+    parseRelationsIntoModelInstances,
 };

package/lib/model/modelQueryProps.js

@@ -1,147 +1,116 @@
 'use strict';
-
 const { isObject, isFunction } = require('../utils/objectUtils');
 const { defineNonEnumerableProperty } = require('./modelUtils');
 const { isKnexRaw, isKnexQueryBuilder } = require('../utils/knexUtils');
-
 const QUERY_PROPS_PROPERTY = '$$queryProps';
-
 // Removes query properties from `json` and stores them into a hidden property
 // inside `model` so that they can be later merged back to `json`.
 function splitQueryProps(model, json) {
-  const keys = Object.keys(json);
-
-  if (hasQueryProps(json, keys)) {
-    const queryProps = {};
-    const modelProps = {};
-
-    for (let i = 0, l = keys.length; i < l; ++i) {
-      const key = keys[i];
-      const value = json[key];
-
-      if (isQueryProp(value)) {
-        queryProps[key] = value;
-      } else {
-        modelProps[key] = value;
-      }
+    const keys = Object.keys(json);
+    if (hasQueryProps(json, keys)) {
+        const queryProps = {};
+        const modelProps = {};
+        for (let i = 0, l = keys.length; i < l; ++i) {
+            const key = keys[i];
+            const value = json[key];
+            if (isQueryProp(value)) {
+                queryProps[key] = value;
+            }
+            else {
+                modelProps[key] = value;
+            }
+        }
+        defineNonEnumerableProperty(model, QUERY_PROPS_PROPERTY, queryProps);
+        return modelProps;
+    }
+    else {
+        return json;
     }
-
-    defineNonEnumerableProperty(model, QUERY_PROPS_PROPERTY, queryProps);
-
-    return modelProps;
-  } else {
-    return json;
-  }
 }
-
 function hasQueryProps(json, keys) {
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    if (isQueryProp(json[keys[i]])) {
-      return true;
+    for (let i = 0, l = keys.length; i < l; ++i) {
+        if (isQueryProp(json[keys[i]])) {
+            return true;
+        }
     }
-  }
-
-  return false;
+    return false;
 }
-
 function isQueryProp(value) {
-  if (!isObject(value)) {
-    return false;
-  }
-
-  return (
-    isKnexQueryBuilder(value) ||
-    isKnexRaw(value) ||
-    isKnexRawConvertable(value) ||
-    value.isObjectionQueryBuilderBase
-  );
+    if (!isObject(value)) {
+        return false;
+    }
+    return (isKnexQueryBuilder(value) ||
+        isKnexRaw(value) ||
+        isKnexRawConvertable(value) ||
+        value.isObjectionQueryBuilderBase);
 }
-
 // Merges and converts `model`'s query properties into `json`.
 function mergeQueryProps(model, json, omitProps, builder) {
-  json = convertExistingQueryProps(json, builder);
-  json = convertAndMergeHiddenQueryProps(model, json, omitProps, builder);
-
-  return json;
+    json = convertExistingQueryProps(json, builder);
+    json = convertAndMergeHiddenQueryProps(model, json, omitProps, builder);
+    return json;
 }
-
 // Converts the query properties in `json` to knex raw instances.
 // `json` may have query properties even though we removed them.
 // For example they may have been added in lifecycle hooks.
 function convertExistingQueryProps(json, builder) {
-  const keys = Object.keys(json);
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-    const value = json[key];
-
-    if (isQueryProp(value)) {
-      json[key] = queryPropToKnexRaw(value, builder);
+    const keys = Object.keys(json);
+    for (let i = 0, l = keys.length; i < l; ++i) {
+        const key = keys[i];
+        const value = json[key];
+        if (isQueryProp(value)) {
+            json[key] = queryPropToKnexRaw(value, builder);
+        }
     }
-  }
-
-  return json;
+    return json;
 }
-
 // Converts and merges the query props that were split from the model
 // and stored into QUERY_PROPS_PROPERTY.
 function convertAndMergeHiddenQueryProps(model, json, omitProps, builder) {
-  const queryProps = model[QUERY_PROPS_PROPERTY];
-
-  if (!queryProps) {
-    // The model has no query properties.
-    return json;
-  }
-
-  const modelClass = model.constructor;
-  const keys = Object.keys(queryProps);
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-
-    if (!omitProps || !omitProps.includes(key)) {
-      const queryProp = queryPropToKnexRaw(queryProps[key], builder);
-      json[modelClass.propertyNameToColumnName(key)] = queryProp;
+    const queryProps = model[QUERY_PROPS_PROPERTY];
+    if (!queryProps) {
+        // The model has no query properties.
+        return json;
+    }
+    const modelClass = model.constructor;
+    const keys = Object.keys(queryProps);
+    for (let i = 0, l = keys.length; i < l; ++i) {
+        const key = keys[i];
+        if (!omitProps || !omitProps.includes(key)) {
+            const queryProp = queryPropToKnexRaw(queryProps[key], builder);
+            json[modelClass.propertyNameToColumnName(key)] = queryProp;
+        }
     }
-  }
-
-  return json;
+    return json;
 }
-
 // Converts a query property into a knex `raw` instance.
 function queryPropToKnexRaw(queryProp, builder) {
-  if (!queryProp) {
-    return queryProp;
-  }
-
-  if (queryProp.isObjectionQueryBuilderBase) {
-    return buildObjectionQueryBuilder(queryProp, builder);
-  } else if (isKnexRawConvertable(queryProp)) {
-    return buildKnexRawConvertable(queryProp, builder);
-  } else {
-    return queryProp;
-  }
+    if (!queryProp) {
+        return queryProp;
+    }
+    if (queryProp.isObjectionQueryBuilderBase) {
+        return buildObjectionQueryBuilder(queryProp, builder);
+    }
+    else if (isKnexRawConvertable(queryProp)) {
+        return buildKnexRawConvertable(queryProp, builder);
+    }
+    else {
+        return queryProp;
+    }
 }
-
 function buildObjectionQueryBuilder(builder, parentBuilder) {
-  return builder.subqueryOf(parentBuilder).toKnexQuery();
+    return builder.subqueryOf(parentBuilder).toKnexQuery();
 }
-
 function buildKnexRawConvertable(convertable, builder) {
-  if (!builder) {
-    throw new Error(
-      'toDatabaseJson called without a query builder instance for a model with query properties',
-    );
-  }
-
-  return convertable.toKnexRaw(builder);
+    if (!builder) {
+        throw new Error('toDatabaseJson called without a query builder instance for a model with query properties');
+    }
+    return convertable.toKnexRaw(builder);
 }
-
 function isKnexRawConvertable(queryProp) {
-  return isFunction(queryProp.toKnexRaw);
+    return isFunction(queryProp.toKnexRaw);
 }
-
 module.exports = {
-  splitQueryProps,
-  mergeQueryProps,
+    splitQueryProps,
+    mergeQueryProps,
 };

package/lib/model/modelSet.js

@@ -1,136 +1,116 @@
 'use strict';
-
 const { isInternalProp } = require('../utils/internalPropUtils');
 const { splitQueryProps } = require('./modelQueryProps');
 const { isFunction, isString, isPlainObject } = require('../utils/objectUtils');
 const { parseRelationsIntoModelInstances } = require('./modelParseRelations');
-
 function setJson(model, json, options) {
-  json = json || {};
-  options = options || {};
-
-  if (Object.prototype.toString.call(json) !== '[object Object]') {
-    throw new Error(
-      'You should only pass objects to $setJson method. ' +
-        '$setJson method was given an invalid value ' +
-        json,
-    );
-  }
-
-  if (!json.$isObjectionModel) {
-    // json can contain "query properties" like `raw` instances, query builders etc.
-    // We take them out of `json` and store them to a hidden property $$queryProps
-    // in the model instance for later use.
-    json = splitQueryProps(model, json);
-  }
-
-  json = model.$parseJson(json, options);
-  json = model.$validate(json, options);
-
-  model.$set(json);
-
-  if (!options.skipParseRelations) {
-    parseRelationsIntoModelInstances(model, json, options);
-  }
-
-  return model;
+    json = json || {};
+    options = options || {};
+    if (Object.prototype.toString.call(json) !== '[object Object]') {
+        throw new Error('You should only pass objects to $setJson method. ' +
+            '$setJson method was given an invalid value ' +
+            json);
+    }
+    if (!json.$isObjectionModel) {
+        // json can contain "query properties" like `raw` instances, query builders etc.
+        // We take them out of `json` and store them to a hidden property $$queryProps
+        // in the model instance for later use.
+        json = splitQueryProps(model, json);
+    }
+    json = model.$parseJson(json, options);
+    json = model.$validate(json, options);
+    model.$set(json);
+    if (!options.skipParseRelations) {
+        parseRelationsIntoModelInstances(model, json, options);
+    }
+    return model;
 }
-
 function setDatabaseJson(model, json) {
-  json = model.$parseDatabaseJson(json);
-
-  if (json) {
-    const keys = Object.keys(json);
-
-    for (let i = 0, l = keys.length; i < l; ++i) {
-      const key = keys[i];
-      model[key] = json[key];
+    json = model.$parseDatabaseJson(json);
+    if (json) {
+        const keys = Object.keys(json);
+        for (let i = 0, l = keys.length; i < l; ++i) {
+            const key = keys[i];
+            model[key] = json[key];
+        }
     }
-  }
-
-  return model;
+    return model;
 }
-
 function setFast(model, obj) {
-  if (obj) {
-    // Don't try to set read-only properties. They can easily get here
-    // through `fromJson` when parsing an object that was previously
-    // serialized from a model instance.
-    const readOnlyAttr = model.constructor.getReadOnlyAttributes();
-    const keys = Object.keys(obj);
-
-    for (let i = 0, l = keys.length; i < l; ++i) {
-      const key = keys[i];
-      const value = obj[key];
-
-      if (
-        (value !== undefined || isPlainObject(obj)) &&
-        !isInternalProp(key) &&
-        !isFunction(value) &&
-        !readOnlyAttr.includes(key)
-      ) {
-        model[key] = value;
-      }
+    if (obj) {
+        // Don't try to set read-only properties. They can easily get here
+        // through `fromJson` when parsing an object that was previously
+        // serialized from a model instance.
+        const readOnlyAttr = model.constructor.getReadOnlyAttributes();
+        const keys = Object.keys(obj);
+        for (let i = 0, l = keys.length; i < l; ++i) {
+            const key = keys[i];
+            const value = obj[key];
+            if ((value !== undefined || isPlainObject(obj)) &&
+                !isInternalProp(key) &&
+                !isFunction(value) &&
+                !readOnlyAttr.includes(key)) {
+                model[key] = value;
+            }
+        }
     }
-  }
-
-  return model;
+    return model;
 }
-
 function setRelated(model, relation, models) {
-  relation = ensureRelation(model, relation);
-
-  if (relation.isOneToOne()) {
-    if (Array.isArray(models)) {
-      if (models.length === 0) {
-        model[relation.name] = null;
-      } else {
-        model[relation.name] = models[0] || null;
-      }
-    } else {
-      model[relation.name] = models || null;
+    relation = ensureRelation(model, relation);
+    if (relation.isOneToOne()) {
+        if (Array.isArray(models)) {
+            if (models.length === 0) {
+                model[relation.name] = null;
+            }
+            else {
+                model[relation.name] = models[0] || null;
+            }
+        }
+        else {
+            model[relation.name] = models || null;
+        }
     }
-  } else {
-    if (!models) {
-      model[relation.name] = [];
-    } else if (Array.isArray(models)) {
-      model[relation.name] = models;
-    } else {
-      model[relation.name] = [models];
+    else {
+        if (!models) {
+            model[relation.name] = [];
+        }
+        else if (Array.isArray(models)) {
+            model[relation.name] = models;
+        }
+        else {
+            model[relation.name] = [models];
+        }
     }
-  }
-
-  return model;
+    return model;
 }
-
 function appendRelated(model, relation, models) {
-  relation = ensureRelation(model, relation);
-
-  if (!model[relation.name] || relation.isOneToOne()) {
-    return model.$setRelated(relation, models);
-  } else {
-    if (Array.isArray(models)) {
-      models.forEach((it) => model[relation.name].push(it));
-    } else if (models) {
-      model[relation.name].push(models);
+    relation = ensureRelation(model, relation);
+    if (!model[relation.name] || relation.isOneToOne()) {
+        return model.$setRelated(relation, models);
     }
-  }
-
-  return model;
+    else {
+        if (Array.isArray(models)) {
+            models.forEach((it) => model[relation.name].push(it));
+        }
+        else if (models) {
+            model[relation.name].push(models);
+        }
+    }
+    return model;
 }
-
 function ensureRelation(model, relation) {
-  if (isString(relation)) {
-    return model.constructor.getRelation(relation);
-  } else {
-    return relation;
-  }
+    if (isString(relation)) {
+        return model.constructor.getRelation(relation);
+    }
+    else {
+        return relation;
+    }
 }
-
 module.exports = {
-  setFast,
-  setJson,
-  setDatabaseJson,
-  setRelated,
-  appendRelated,
+    setFast,
+    setJson,
+    setDatabaseJson,
+    setRelated,
+    appendRelated,
 };