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

package/lib/utils/mysqlJsonPath.js

@@ -1,55 +1,70 @@
-'use strict';
-
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.JSON_CAST = void 0;
+exports.toMySqlJsonPath = toMySqlJsonPath;
+exports.toMySqlCastType = toMySqlCastType;
+exports.isBooleanType = isBooleanType;
+exports.toJsonSql = toJsonSql;
+exports.jsonCastsForDialect = jsonCastsForDialect;
+const knexUtils_1 = require("./knexUtils");
 // SQL types of `ReferenceBuilder` casts that MySQL's `CAST()` calls differently.
 // `CAST(x AS integer)` for example is a syntax error on MySQL.
 const MYSQL_CAST_TYPES = {
-  text: 'CHAR',
-  varchar: 'CHAR',
-  integer: 'SIGNED',
-  int: 'SIGNED',
-  smallint: 'SIGNED',
-  bigint: 'SIGNED',
-  float: 'FLOAT',
-  real: 'DOUBLE',
-  double: 'DOUBLE',
-  'double precision': 'DOUBLE',
-  decimal: 'DECIMAL(65,30)',
-  numeric: 'DECIMAL(65,30)',
-  json: 'JSON',
-  jsonb: 'JSON',
+    text: 'CHAR',
+    varchar: 'CHAR',
+    integer: 'SIGNED',
+    int: 'SIGNED',
+    smallint: 'SIGNED',
+    bigint: 'SIGNED',
+    float: 'FLOAT',
+    real: 'DOUBLE',
+    double: 'DOUBLE',
+    'double precision': 'DOUBLE',
+    decimal: 'DECIMAL(65,30)',
+    numeric: 'DECIMAL(65,30)',
+    json: 'JSON',
+    jsonb: 'JSON',
 };
-
 /**
  * Converts the `access` part of a parsed field expression into a MySQL JSON
  * path like `$."a"[1]."b.c"`. Keys are always quoted, so they can contain any
  * characters. The path must be passed to MySQL as a binding.
  */
 function toMySqlJsonPath(access) {
-  return (
-    '$' +
-    access
-      .map((it) => {
-        if (it.type === 'array' && Number.isInteger(it.ref)) {
-          return `[${it.ref}]`;
-        } else {
-          return `.${JSON.stringify(String(it.ref))}`;
-        }
-      })
-      .join('')
-  );
+    return ('$' +
+        access
+            .map((it) => {
+            if (it.type === 'array' && Number.isInteger(it.ref)) {
+                return `[${it.ref}]`;
+            }
+            else {
+                return `.${JSON.stringify(String(it.ref))}`;
+            }
+        })
+            .join(''));
 }
-
 function toMySqlCastType(sqlType) {
-  return MYSQL_CAST_TYPES[sqlType.toLowerCase()] || sqlType;
+    return MYSQL_CAST_TYPES[sqlType.toLowerCase()] || sqlType;
 }
-
 function isBooleanType(sqlType) {
-  const type = sqlType.toLowerCase();
-  return type === 'boolean' || type === 'bool';
+    const type = sqlType.toLowerCase();
+    return type === 'boolean' || type === 'bool';
+}
+// The SQL that makes `sql` a JSON value. MariaDB has no JSON type to cast to:
+// its JSON columns are text. `JSON_COMPACT()` returns the value as JSON, which
+// `JSON_SET()` nests instead of storing a string, and in the compact form
+// objection stores JSON in, so comparisons with columns work.
+function toJsonSql(sql, knex) {
+    return (0, knexUtils_1.isMariaDb)(knex) ? `JSON_COMPACT(${sql})` : `CAST(${sql} AS JSON)`;
+}
+const JSON_CAST = 'CAST(? AS JSON)';
+exports.JSON_CAST = JSON_CAST;
+// For SQL that objection generates before the knex instance is known, like the
+// conditions of the `whereJson*` methods: replaces `CAST(? AS JSON)` with
+// `JSON_COMPACT(?)` on MariaDB. The values are always bindings, so the text
+// only contains what objection generated.
+function jsonCastsForDialect(sql, knex) {
+    return (0, knexUtils_1.isMariaDb)(knex) && sql.includes(JSON_CAST)
+        ? sql.split(JSON_CAST).join('JSON_COMPACT(?)')
+        : sql;
 }
-
-module.exports = {
-  toMySqlJsonPath,
-  toMySqlCastType,
-  isBooleanType,
-};

package/lib/utils/normalizeIds.js

@@ -1,144 +1,127 @@
-'use strict';
-
-const { isObject } = require('../utils/objectUtils');
-
-// ids is of type RelationProperty.
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeIds = normalizeIds;
+const objectUtils_1 = require("../utils/objectUtils");
 function normalizeIds(ids, prop, opt) {
-  opt = opt || {};
-
-  let isComposite = prop.size > 1;
-  let ret;
-
-  if (isComposite) {
-    // For composite ids these are okay:
-    //
-    // 1. [1, 'foo', 4]
-    // 2. {a: 1, b: 'foo', c: 4}
-    // 3. [[1, 'foo', 4], [4, 'bar', 1]]
-    // 4. [{a: 1, b: 'foo', c: 4}, {a: 4, b: 'bar', c: 1}]
-    //
-    if (Array.isArray(ids)) {
-      if (Array.isArray(ids[0])) {
-        ret = new Array(ids.length);
-
-        // 3.
-        for (let i = 0, l = ids.length; i < l; ++i) {
-          ret[i] = convertIdArrayToObject(ids[i], prop);
+    opt = opt || {};
+    const isComposite = prop.size > 1;
+    let ret;
+    if (isComposite) {
+        // For composite ids these are okay:
+        //
+        // 1. [1, 'foo', 4]
+        // 2. {a: 1, b: 'foo', c: 4}
+        // 3. [[1, 'foo', 4], [4, 'bar', 1]]
+        // 4. [{a: 1, b: 'foo', c: 4}, {a: 4, b: 'bar', c: 1}]
+        //
+        if (Array.isArray(ids)) {
+            if (Array.isArray(ids[0])) {
+                ret = new Array(ids.length);
+                // 3.
+                for (let i = 0, l = ids.length; i < l; ++i) {
+                    ret[i] = convertIdArrayToObject(ids[i], prop);
+                }
+            }
+            else if ((0, objectUtils_1.isObject)(ids[0])) {
+                ret = new Array(ids.length);
+                // 4.
+                for (let i = 0, l = ids.length; i < l; ++i) {
+                    ret[i] = ensureObject(ids[i]);
+                }
+            }
+            else {
+                // 1.
+                ret = [convertIdArrayToObject(ids, prop)];
+            }
         }
-      } else if (isObject(ids[0])) {
-        ret = new Array(ids.length);
-
-        // 4.
-        for (let i = 0, l = ids.length; i < l; ++i) {
-          ret[i] = ensureObject(ids[i], prop);
+        else if ((0, objectUtils_1.isObject)(ids)) {
+            // 2.
+            ret = [ids];
+        }
+        else {
+            throw new Error(`invalid composite key ${JSON.stringify(ids)}`);
         }
-      } else {
-        // 1.
-        ret = [convertIdArrayToObject(ids, prop)];
-      }
-    } else if (isObject(ids)) {
-      // 2.
-      ret = [ids];
-    } else {
-      throw new Error(`invalid composite key ${JSON.stringify(ids)}`);
     }
-  } else {
-    // For non-composite ids, these are okay:
-    //
-    // 1. 1
-    // 2. {id: 1}
-    // 3. [1, 'foo', 4]
-    // 4. [{id: 1}, {id: 'foo'}, {id: 4}]
-    //
-    if (Array.isArray(ids)) {
-      if (isObject(ids[0])) {
-        ret = new Array(ids.length);
-
-        // 4.
-        for (let i = 0, l = ids.length; i < l; ++i) {
-          ret[i] = ensureObject(ids[i]);
+    else {
+        // For non-composite ids, these are okay:
+        //
+        // 1. 1
+        // 2. {id: 1}
+        // 3. [1, 'foo', 4]
+        // 4. [{id: 1}, {id: 'foo'}, {id: 4}]
+        //
+        if (Array.isArray(ids)) {
+            if ((0, objectUtils_1.isObject)(ids[0])) {
+                ret = new Array(ids.length);
+                // 4.
+                for (let i = 0, l = ids.length; i < l; ++i) {
+                    ret[i] = ensureObject(ids[i]);
+                }
+            }
+            else {
+                ret = new Array(ids.length);
+                // 3.
+                for (let i = 0, l = ids.length; i < l; ++i) {
+                    ret[i] = {};
+                    prop.setProp(ret[i], 0, ids[i]);
+                }
+            }
+        }
+        else if ((0, objectUtils_1.isObject)(ids)) {
+            // 2.
+            ret = [ids];
         }
-      } else {
-        ret = new Array(ids.length);
-
-        // 3.
-        for (let i = 0, l = ids.length; i < l; ++i) {
-          ret[i] = {};
-          prop.setProp(ret[i], 0, ids[i]);
+        else {
+            // 1.
+            const obj = {};
+            prop.setProp(obj, 0, ids);
+            ret = [obj];
         }
-      }
-    } else if (isObject(ids)) {
-      // 2.
-      ret = [ids];
-    } else {
-      // 1.
-      const obj = {};
-      prop.setProp(obj, 0, ids);
-      ret = [obj];
     }
-  }
-
-  checkProperties(ret, prop);
-
-  if (opt.arrayOutput) {
-    return normalizedToArray(ret, prop);
-  } else {
-    return ret;
-  }
+    checkProperties(ret, prop);
+    if (opt.arrayOutput) {
+        return normalizedToArray(ret, prop);
+    }
+    else {
+        return ret;
+    }
 }
-
 function convertIdArrayToObject(ids, prop) {
-  if (!Array.isArray(ids)) {
-    throw new Error(`invalid composite key ${JSON.stringify(ids)}`);
-  }
-
-  if (ids.length != prop.size) {
-    throw new Error(`composite identifier ${JSON.stringify(ids)} should have ${prop.size} values`);
-  }
-
-  const obj = {};
-
-  for (let i = 0; i < ids.length; ++i) {
-    prop.setProp(obj, i, ids[i]);
-  }
-
-  return obj;
+    if (!Array.isArray(ids)) {
+        throw new Error(`invalid composite key ${JSON.stringify(ids)}`);
+    }
+    if (ids.length != prop.size) {
+        throw new Error(`composite identifier ${JSON.stringify(ids)} should have ${prop.size} values`);
+    }
+    const obj = {};
+    for (let i = 0; i < ids.length; ++i) {
+        prop.setProp(obj, i, ids[i]);
+    }
+    return obj;
 }
-
 function ensureObject(ids) {
-  if (isObject(ids)) {
-    return ids;
-  } else {
-    throw new Error(`invalid composite key ${JSON.stringify(ids)}`);
-  }
+    if ((0, objectUtils_1.isObject)(ids)) {
+        return ids;
+    }
+    else {
+        throw new Error(`invalid composite key ${JSON.stringify(ids)}`);
+    }
 }
-
 function checkProperties(ret, prop) {
-  for (let i = 0, l = ret.length; i < l; ++i) {
-    const obj = ret[i];
-
-    for (let j = 0, lp = prop.size; j < lp; ++j) {
-      const val = prop.getProp(obj, j);
-
-      if (typeof val === 'undefined') {
-        throw new Error(
-          `expected id ${JSON.stringify(obj)} to have property ${prop.propDescription(j)}`,
-        );
-      }
+    for (let i = 0, l = ret.length; i < l; ++i) {
+        const obj = ret[i];
+        for (let j = 0, lp = prop.size; j < lp; ++j) {
+            const val = prop.getProp(obj, j);
+            if (typeof val === 'undefined') {
+                throw new Error(`expected id ${JSON.stringify(obj)} to have property ${prop.propDescription(j)}`);
+            }
+        }
     }
-  }
 }
-
 function normalizedToArray(ret, prop) {
-  const arr = new Array(ret.length);
-
-  for (let i = 0, l = ret.length; i < l; ++i) {
-    arr[i] = prop.getProps(ret[i]);
-  }
-
-  return arr;
+    const arr = new Array(ret.length);
+    for (let i = 0, l = ret.length; i < l; ++i) {
+        arr[i] = prop.getProps(ret[i]);
+    }
+    return arr;
 }
-
-module.exports = {
-  normalizeIds,
-};