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

package/lib/model/modelClone.js

@@ -1,121 +1,102 @@
 'use strict';
-
 const { isObject, cloneDeep } = require('../utils/objectUtils');
 const { hiddenProps } = require('./modelUtils');
 const { defineNonEnumerableProperty } = require('./modelUtils');
 const { isInternalProp } = require('../utils/internalPropUtils');
-
 function clone(model, shallow, stripInternal) {
-  let clone = null;
-
-  const omitFromJson = model.$omitFromJson();
-  const omitFromDatabaseJson = model.$omitFromDatabaseJson();
-
-  if (!shallow && !stripInternal) {
-    clone = cloneSimple(model);
-  } else {
-    clone = cloneWithOpt(model, shallow, stripInternal);
-  }
-
-  if (omitFromJson) {
-    clone.$omitFromJson(omitFromJson);
-  }
-
-  if (omitFromDatabaseJson) {
-    clone.$omitFromDatabaseJson(omitFromDatabaseJson);
-  }
-
-  clone = copyHiddenProps(model, clone);
-  return clone;
+    let clone = null;
+    const omitFromJson = model.$omitFromJson();
+    const omitFromDatabaseJson = model.$omitFromDatabaseJson();
+    if (!shallow && !stripInternal) {
+        clone = cloneSimple(model);
+    }
+    else {
+        clone = cloneWithOpt(model, shallow, stripInternal);
+    }
+    if (omitFromJson) {
+        clone.$omitFromJson(omitFromJson);
+    }
+    if (omitFromDatabaseJson) {
+        clone.$omitFromDatabaseJson(omitFromDatabaseJson);
+    }
+    clone = copyHiddenProps(model, clone);
+    return clone;
 }
-
 function cloneSimple(model) {
-  const clone = new model.constructor();
-  const keys = Object.keys(model);
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-    const value = model[key];
-
-    if (isObject(value)) {
-      clone[key] = cloneObject(value);
-    } else {
-      clone[key] = value;
+    const clone = new model.constructor();
+    const keys = Object.keys(model);
+    for (let i = 0, l = keys.length; i < l; ++i) {
+        const key = keys[i];
+        const value = model[key];
+        if (isObject(value)) {
+            clone[key] = cloneObject(value);
+        }
+        else {
+            clone[key] = value;
+        }
     }
-  }
-
-  return clone;
+    return clone;
 }
-
 function cloneWithOpt(model, shallow, stripInternal) {
-  const clone = new model.constructor();
-  const keys = Object.keys(model);
-  const relationNames = model.constructor.getRelationNames();
-
-  for (let i = 0, l = keys.length; i < l; ++i) {
-    const key = keys[i];
-    const value = model[key];
-
-    if (shallow && relationNames.includes(key)) {
-      // The constructor may have given default values for relations.
-      delete clone[key];
-      continue;
-    }
-
-    if (stripInternal && isInternalProp(key)) {
-      continue;
+    const clone = new model.constructor();
+    const keys = Object.keys(model);
+    const relationNames = model.constructor.getRelationNames();
+    for (let i = 0, l = keys.length; i < l; ++i) {
+        const key = keys[i];
+        const value = model[key];
+        if (shallow && relationNames.includes(key)) {
+            // The constructor may have given default values for relations.
+            delete clone[key];
+            continue;
+        }
+        if (stripInternal && isInternalProp(key)) {
+            continue;
+        }
+        if (isObject(value)) {
+            clone[key] = cloneObject(value);
+        }
+        else {
+            clone[key] = value;
+        }
     }
-
-    if (isObject(value)) {
-      clone[key] = cloneObject(value);
-    } else {
-      clone[key] = value;
-    }
-  }
-
-  return clone;
+    return clone;
 }
-
 function cloneObject(value) {
-  if (Array.isArray(value)) {
-    return cloneArray(value);
-  } else if (value.$isObjectionModel) {
-    return clone(value, false, false);
-  } else if (Buffer.isBuffer(value)) {
-    return new Buffer(value);
-  } else {
-    return cloneDeep(value);
-  }
+    if (Array.isArray(value)) {
+        return cloneArray(value);
+    }
+    else if (value.$isObjectionModel) {
+        return clone(value, false, false);
+    }
+    else if (Buffer.isBuffer(value)) {
+        return Buffer.from(value);
+    }
+    else {
+        return cloneDeep(value);
+    }
 }
-
 function cloneArray(value) {
-  const ret = new Array(value.length);
-
-  for (let i = 0, l = ret.length; i < l; ++i) {
-    const item = value[i];
-
-    if (isObject(item)) {
-      ret[i] = cloneObject(item);
-    } else {
-      ret[i] = item;
+    const ret = new Array(value.length);
+    for (let i = 0, l = ret.length; i < l; ++i) {
+        const item = value[i];
+        if (isObject(item)) {
+            ret[i] = cloneObject(item);
+        }
+        else {
+            ret[i] = item;
+        }
     }
-  }
-
-  return ret;
+    return ret;
 }
-
 function copyHiddenProps(model, clone) {
-  for (let i = 0, l = hiddenProps.length; i < l; ++i) {
-    const prop = hiddenProps[i];
-
-    if (model.hasOwnProperty(prop)) {
-      defineNonEnumerableProperty(clone, prop, model[prop]);
+    for (let i = 0, l = hiddenProps.length; i < l; ++i) {
+        const prop = hiddenProps[i];
+        if (Object.hasOwn(model, prop)) {
+            defineNonEnumerableProperty(clone, prop, model[prop]);
+        }
     }
-  }
-
-  return clone;
+    return clone;
 }
-
 module.exports = {
-  clone,
+    clone,
 };

package/lib/model/modelColPropMap.js

@@ -1,34 +1,24 @@
 'use strict';
-
 const { difference } = require('../utils/objectUtils');
-
 function columnNameToPropertyName(modelClass, columnName) {
-  const model = new modelClass();
-  const addedProps = Object.keys(model.$parseDatabaseJson({}));
-
-  const row = {};
-  row[columnName] = null;
-
-  const props = Object.keys(model.$parseDatabaseJson(row));
-  const propertyName = difference(props, addedProps)[0];
-
-  return propertyName || columnName;
+    const model = new modelClass();
+    const addedProps = Object.keys(model.$parseDatabaseJson({}));
+    const row = {};
+    row[columnName] = null;
+    const props = Object.keys(model.$parseDatabaseJson(row));
+    const propertyName = difference(props, addedProps)[0];
+    return propertyName || columnName;
 }
-
 function propertyNameToColumnName(modelClass, propertyName) {
-  const model = new modelClass();
-  const addedCols = Object.keys(model.$formatDatabaseJson({}));
-
-  const obj = {};
-  obj[propertyName] = null;
-
-  const cols = Object.keys(model.$formatDatabaseJson(obj));
-  const columnName = difference(cols, addedCols)[0];
-
-  return columnName || propertyName;
+    const model = new modelClass();
+    const addedCols = Object.keys(model.$formatDatabaseJson({}));
+    const obj = {};
+    obj[propertyName] = null;
+    const cols = Object.keys(model.$formatDatabaseJson(obj));
+    const columnName = difference(cols, addedCols)[0];
+    return columnName || propertyName;
 }
-
 module.exports = {
-  columnNameToPropertyName,
-  propertyNameToColumnName,
+    columnNameToPropertyName,
+    propertyNameToColumnName,
 };

package/lib/model/modelConcurrency.js

@@ -0,0 +1,24 @@
+'use strict';
+const { isMsSql } = require('../utils/knexUtils');
+const DEFAULT_CONCURRENCY = 4;
+let defaultGetConcurrency = null;
+// Called by Model.js with Model.getConcurrency.
+function setDefaultGetConcurrency(getConcurrency) {
+    defaultGetConcurrency = getConcurrency;
+}
+// The concurrency of the queries that only read, like the queries of
+// `withGraphFetched()`. By default `getConcurrency()` is 1 on MySQL, because
+// concurrent graph updates and deletes deadlock there, but reads don't. The
+// concurrency a model sets with `concurrency` or `getConcurrency()` is used as
+// is.
+function getReadConcurrency(modelClass, knex) {
+    if (modelClass.concurrency !== null || modelClass.getConcurrency !== defaultGetConcurrency) {
+        return modelClass.getConcurrency(knex);
+    }
+    // The mssql driver can't run concurrent queries.
+    return knex && isMsSql(knex) ? 1 : DEFAULT_CONCURRENCY;
+}
+module.exports = {
+    setDefaultGetConcurrency,
+    getReadConcurrency,
+};

package/lib/model/modelId.js

@@ -1,62 +1,57 @@
 'use strict';
-
 function getSetId(model, maybeId) {
-  if (maybeId !== undefined) {
-    return setId(model, maybeId);
-  } else {
-    return getId(model);
-  }
+    if (maybeId !== undefined) {
+        return setId(model, maybeId);
+    }
+    else {
+        return getId(model);
+    }
 }
-
 function hasId(model) {
-  return model.$hasProps(model.constructor.getIdPropertyArray());
+    return model.$hasProps(model.constructor.getIdPropertyArray());
 }
-
 function setId(model, id) {
-  const idProp = model.constructor.getIdProperty();
-  const isCompositeId = Array.isArray(idProp);
-
-  if (Array.isArray(id)) {
-    if (isCompositeId) {
-      if (id.length !== idProp.length) {
-        throw new Error('trying to set an invalid identifier for a model');
-      }
-
-      for (let i = 0; i < id.length; ++i) {
-        model[idProp[i]] = id[i];
-      }
-    } else {
-      if (id.length !== 1) {
-        throw new Error('trying to set an invalid identifier for a model');
-      }
-
-      model[idProp] = id[0];
+    const idProp = model.constructor.getIdProperty();
+    const isCompositeId = Array.isArray(idProp);
+    if (Array.isArray(id)) {
+        if (isCompositeId) {
+            if (id.length !== idProp.length) {
+                throw new Error('trying to set an invalid identifier for a model');
+            }
+            for (let i = 0; i < id.length; ++i) {
+                model[idProp[i]] = id[i];
+            }
+        }
+        else {
+            if (id.length !== 1) {
+                throw new Error('trying to set an invalid identifier for a model');
+            }
+            model[idProp] = id[0];
+        }
     }
-  } else {
-    if (isCompositeId) {
-      if (idProp.length > 1) {
-        throw new Error('trying to set an invalid identifier for a model');
-      }
-
-      model[idProp[0]] = id;
-    } else {
-      model[idProp] = id;
+    else {
+        if (isCompositeId) {
+            if (idProp.length > 1) {
+                throw new Error('trying to set an invalid identifier for a model');
+            }
+            model[idProp[0]] = id;
+        }
+        else {
+            model[idProp] = id;
+        }
     }
-  }
 }
-
 function getId(model) {
-  const idProp = model.constructor.getIdProperty();
-  const isCompositeId = Array.isArray(idProp);
-
-  if (isCompositeId) {
-    return model.$values(idProp);
-  } else {
-    return model[idProp];
-  }
+    const idProp = model.constructor.getIdProperty();
+    const isCompositeId = Array.isArray(idProp);
+    if (isCompositeId) {
+        return model.$values(idProp);
+    }
+    else {
+        return model[idProp];
+    }
 }
-
 module.exports = {
-  getSetId,
-  hasId,
+    getSetId,
+    hasId,
 };

package/lib/model/modelJsonAttributes.js

@@ -1,92 +1,72 @@
 'use strict';
-
 const { asArray, isObject, flatten, isString } = require('../utils/objectUtils');
-
 function parseJsonAttributes(json, modelClass) {
-  const jsonAttr = modelClass.getJsonAttributes();
-
-  if (jsonAttr.length) {
-    // JSON attributes may be returned as strings depending on the database and
-    // the database client. Convert them to objects here.
-    for (let i = 0, l = jsonAttr.length; i < l; ++i) {
-      const attr = jsonAttr[i];
-      const value = json[attr];
-
-      if (isString(value)) {
-        const parsed = tryParseJson(value);
-
-        // tryParseJson returns undefined if parsing failed.
-        if (parsed !== undefined) {
-          json[attr] = parsed;
+    const jsonAttr = modelClass.getJsonAttributes();
+    if (jsonAttr.length) {
+        // JSON attributes may be returned as strings depending on the database and
+        // the database client. Convert them to objects here.
+        for (let i = 0, l = jsonAttr.length; i < l; ++i) {
+            const attr = jsonAttr[i];
+            const value = json[attr];
+            if (isString(value)) {
+                const parsed = tryParseJson(value);
+                // tryParseJson returns undefined if parsing failed.
+                if (parsed !== undefined) {
+                    json[attr] = parsed;
+                }
+            }
         }
-      }
     }
-  }
-
-  return json;
+    return json;
 }
-
 function formatJsonAttributes(json, modelClass) {
-  const jsonAttr = modelClass.getJsonAttributes();
-
-  if (jsonAttr.length) {
-    // All database clients want JSON columns as strings. Do the conversion here.
-    for (let i = 0, l = jsonAttr.length; i < l; ++i) {
-      const attr = jsonAttr[i];
-      const value = json[attr];
-
-      if (value != null) {
-        json[attr] = JSON.stringify(value);
-      }
+    const jsonAttr = modelClass.getJsonAttributes();
+    if (jsonAttr.length) {
+        // All database clients want JSON columns as strings. Do the conversion here.
+        for (let i = 0, l = jsonAttr.length; i < l; ++i) {
+            const attr = jsonAttr[i];
+            const value = json[attr];
+            if (value != null) {
+                json[attr] = JSON.stringify(value);
+            }
+        }
     }
-  }
-
-  return json;
+    return json;
 }
-
 function getJsonAttributes(modelClass) {
-  let jsonAttributes = modelClass.jsonAttributes;
-
-  if (Array.isArray(jsonAttributes)) {
-    return jsonAttributes;
-  }
-
-  jsonAttributes = [];
-
-  if (modelClass.getJsonSchema()) {
-    const props = modelClass.getJsonSchema().properties || {};
-
-    for (const propName of Object.keys(props)) {
-      const prop = props[propName];
-      let types = asArray(prop.type).filter((it) => !!it);
-
-      if (types.length === 0 && Array.isArray(prop.anyOf)) {
-        types = flatten(prop.anyOf.map((it) => it.type));
-      }
-
-      if (types.length === 0 && Array.isArray(prop.oneOf)) {
-        types = flatten(prop.oneOf.map((it) => it.type));
-      }
-
-      if (types.indexOf('object') !== -1 || types.indexOf('array') !== -1) {
-        jsonAttributes.push(propName);
-      }
+    let jsonAttributes = modelClass.jsonAttributes;
+    if (Array.isArray(jsonAttributes)) {
+        return jsonAttributes;
+    }
+    jsonAttributes = [];
+    if (modelClass.getJsonSchema()) {
+        const props = modelClass.getJsonSchema().properties || {};
+        for (const propName of Object.keys(props)) {
+            const prop = props[propName];
+            let types = asArray(prop.type).filter((it) => !!it);
+            if (types.length === 0 && Array.isArray(prop.anyOf)) {
+                types = flatten(prop.anyOf.map((it) => it.type));
+            }
+            if (types.length === 0 && Array.isArray(prop.oneOf)) {
+                types = flatten(prop.oneOf.map((it) => it.type));
+            }
+            if (types.indexOf('object') !== -1 || types.indexOf('array') !== -1) {
+                jsonAttributes.push(propName);
+            }
+        }
     }
-  }
-
-  return jsonAttributes;
+    return jsonAttributes;
 }
-
 function tryParseJson(maybeJsonStr) {
-  try {
-    return JSON.parse(maybeJsonStr);
-  } catch (err) {
-    return undefined;
-  }
+    try {
+        return JSON.parse(maybeJsonStr);
+    }
+    catch (err) {
+        return undefined;
+    }
 }
-
 module.exports = {
-  parseJsonAttributes,
-  formatJsonAttributes,
-  getJsonAttributes,
+    parseJsonAttributes,
+    formatJsonAttributes,
+    getJsonAttributes,
 };