@abedmurrar/objection 4.0.0-beta.6 → 4.0.0-beta.8

package/lib/model/modelTableMetadata.js

@@ -1,8 +1,11 @@
-'use strict';
-const { defineNonEnumerableProperty } = require('./modelUtils');
-const { isPromise } = require('../utils/promiseUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchTableMetadata = fetchTableMetadata;
+exports.tableMetadata = tableMetadata;
+const modelUtils_1 = require("./modelUtils");
+const promiseUtils_1 = require("../utils/promiseUtils");
 const TABLE_METADATA = '$$tableMetadata';
-function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, force = false, table = null } = {}) {
+function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, force = false, table = null, } = {}) {
     // The table isn't necessarily same as `modelClass.getTableName()` for example if
     // a view is queried instead.
     if (!table) {
@@ -22,7 +25,7 @@ function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, for
     // Memoize metadata but only for modelClass. The hasOwnProperty check
     // will fail for subclasses and the value gets recreated.
     if (!Object.hasOwn(modelClass, TABLE_METADATA)) {
-        defineNonEnumerableProperty(modelClass, TABLE_METADATA, new Map());
+        (0, modelUtils_1.defineNonEnumerableProperty)(modelClass, TABLE_METADATA, new Map());
     }
     // The cache needs to be checked in addition to calling tableMetadata
     // because the cache may contain a temporary promise in which case
@@ -54,7 +57,7 @@ function fetchTableMetadata(modelClass, { parentBuilder = null, knex = null, for
 function tableMetadata(modelClass, { table } = {}) {
     if (Object.hasOwn(modelClass, TABLE_METADATA)) {
         const metadata = modelClass[TABLE_METADATA].get(table || modelClass.getTableName());
-        if (isPromise(metadata)) {
+        if ((0, promiseUtils_1.isPromise)(metadata)) {
             return null;
         }
         else {
@@ -65,7 +68,3 @@ function tableMetadata(modelClass, { table } = {}) {
         return null;
     }
 }
-module.exports = {
-    fetchTableMetadata,
-    tableMetadata,
-};

package/lib/model/modelToJson.js

@@ -1,7 +1,10 @@
-'use strict';
-const { isInternalProp } = require('../utils/internalPropUtils');
-const { mergeQueryProps } = require('./modelQueryProps');
-const { isObject, cloneDeep, isFunction } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toJson = toJson;
+exports.toDatabaseJson = toDatabaseJson;
+const internalPropUtils_1 = require("../utils/internalPropUtils");
+const modelQueryProps_1 = require("./modelQueryProps");
+const objectUtils_1 = require("../utils/objectUtils");
 const EMPTY_ARRAY = [];
 function toJson(model, optIn) {
     const modelClass = model.constructor;
@@ -29,7 +32,7 @@ function toDatabaseJson(model, builder) {
     };
     let json = toDatabaseJsonImpl(model, opt);
     json = model.$formatDatabaseJson(json);
-    return mergeQueryProps(model, json, opt.omitFromJson, builder);
+    return (0, modelQueryProps_1.mergeQueryProps)(model, json, opt.omitFromJson, builder);
 }
 function getVirtuals(opt) {
     if (!opt) {
@@ -91,10 +94,10 @@ function assignJsonValue(json, key, value, opt) {
     const type = typeof value;
     if (type !== 'function' &&
         type !== 'undefined' &&
-        !isInternalProp(key) &&
+        !(0, internalPropUtils_1.isInternalProp)(key) &&
         !shouldOmit(opt, key) &&
         shouldPick(opt, key)) {
-        if (isObject(value)) {
+        if ((0, objectUtils_1.isObject)(value)) {
             json[key] = toJsonObject(value, opt);
         }
         else {
@@ -113,7 +116,7 @@ function assignVirtualAttributes(json, model, vAttr, opt) {
     for (let i = 0, l = vAttr.length; i < l; ++i) {
         const key = vAttr[i];
         let value = model[key];
-        if (isFunction(value)) {
+        if ((0, objectUtils_1.isFunction)(value)) {
             value = value.call(model);
         }
         assignJsonValue(json, key, value, opt);
@@ -132,7 +135,7 @@ function toJsonObject(value, opt) {
         return value;
     }
     else if (opt.cloneObjects) {
-        return cloneDeep(value);
+        return (0, objectUtils_1.cloneDeep)(value);
     }
     else {
         return value;
@@ -142,7 +145,7 @@ function toJsonArray(value, opt) {
     const ret = new Array(value.length);
     for (let i = 0, l = ret.length; i < l; ++i) {
         const item = value[i];
-        if (isObject(item)) {
+        if ((0, objectUtils_1.isObject)(item)) {
             ret[i] = toJsonObject(item, opt);
         }
         else {
@@ -151,7 +154,3 @@ function toJsonArray(value, opt) {
     }
     return ret;
 }
-module.exports = {
-    toJson,
-    toDatabaseJson,
-};

package/lib/model/modelUtils.js

@@ -1,5 +1,10 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.staticHiddenProps = exports.hiddenProps = void 0;
+exports.defineNonEnumerableProperty = defineNonEnumerableProperty;
+exports.keyByProps = keyByProps;
 const hiddenProps = ['$$queryProps'];
+exports.hiddenProps = hiddenProps;
 const staticHiddenProps = [
     '$$knex',
     '$$validator',
@@ -16,6 +21,7 @@ const staticHiddenProps = [
     '$$idRelationProperty',
     '$$virtualAttributes',
 ];
+exports.staticHiddenProps = staticHiddenProps;
 function defineNonEnumerableProperty(obj, prop, value) {
     Object.defineProperty(obj, prop, {
         enumerable: false,
@@ -32,9 +38,3 @@ function keyByProps(models, props) {
     }
     return map;
 }
-module.exports = {
-    hiddenProps,
-    staticHiddenProps,
-    defineNonEnumerableProperty,
-    keyByProps,
-};

package/lib/model/modelValidate.js

@@ -1,5 +1,7 @@
-'use strict';
-const { clone } = require('./modelClone');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validate = validate;
+const modelClone_1 = require("./modelClone");
 function validate(model, json, options = {}) {
     json = json || model;
     const inputJson = json;
@@ -12,7 +14,7 @@ function validate(model, json, options = {}) {
         // TODO 1: This should use `json.$toJson()` since we always validate the input representation!
         // TODO 2: This should also keep the relations in the object because some validators may
         //         depend on the relations.
-        json = clone(json, true, true);
+        json = (0, modelClone_1.clone)(json, true, true);
         // We can mutate `json` now that we took a copy of it.
         options = Object.assign({}, options, { mutable: true });
     }
@@ -35,6 +37,3 @@ function validate(model, json, options = {}) {
         return json;
     }
 }
-module.exports = {
-    validate,
-};

package/lib/model/modelValues.js

@@ -1,8 +1,15 @@
-'use strict';
-const { isObject } = require('../utils/objectUtils');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PROP_KEY_PREFIX = void 0;
+exports.propToStr = propToStr;
+exports.values = values;
+exports.hasProps = hasProps;
+exports.propKey = propKey;
+const objectUtils_1 = 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_';
+exports.PROP_KEY_PREFIX = PROP_KEY_PREFIX;
 function values(model, args) {
     switch (args.length) {
         case 1:
@@ -94,7 +101,7 @@ function propToStr(value) {
     else if (Buffer.isBuffer(value)) {
         return value.toString('hex');
     }
-    else if (isObject(value)) {
+    else if ((0, objectUtils_1.isObject)(value)) {
         return JSON.stringify(value);
     }
     else {
@@ -104,10 +111,3 @@ function propToStr(value) {
 function isNullOrUndefined(val) {
     return val === null || val === undefined;
 }
-module.exports = {
-    PROP_KEY_PREFIX,
-    propToStr,
-    values,
-    hasProps,
-    propKey,
-};

package/lib/model/modelVisitor.js

@@ -1,4 +1,6 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.visitModels = visitModels;
 function visitModels(models, modelClass, visitor) {
     doVisit(models, modelClass, null, null, visitor);
 }
@@ -29,6 +31,3 @@ function visitOne(model, modelClass, parent, rel, visitor) {
         }
     }
 }
-module.exports = {
-    visitModels,
-};

package/lib/transaction.js

@@ -1,13 +1,48 @@
-'use strict';
-const promiseUtils = require('./utils/promiseUtils');
-const { isFunction } = require('./utils/objectUtils');
-function transaction() {
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transaction = transaction;
+const promiseUtils = __importStar(require("./utils/promiseUtils"));
+const objectUtils_1 = require("./utils/objectUtils");
+function transaction(...transactionArgs) {
     // There must be at least one model class and the callback.
-    if (arguments.length < 2) {
+    if (transactionArgs.length < 2) {
         return Promise.reject(new Error('objection.transaction: provide at least one Model class to bind to the transaction or a knex instance'));
     }
-    let args = Array.from(arguments);
-    if (!isModelClass(args[0]) && isFunction(args[0].transaction)) {
+    let args = Array.from(transactionArgs);
+    if (!isModelClass(args[0]) && (0, objectUtils_1.isFunction)(args[0].transaction)) {
         const knex = args[0];
         args = args.slice(1);
         return knex.transaction.apply(knex, args);
@@ -45,7 +80,7 @@ transaction.start = function (modelClassOrKnex) {
     if (isModelClass(modelClassOrKnex)) {
         knex = modelClassOrKnex.knex();
     }
-    if (!knex || !isFunction(knex.transaction)) {
+    if (!knex || !(0, objectUtils_1.isFunction)(knex.transaction)) {
         return Promise.reject(new Error('objection.transaction.start: first argument must be a model class or a knex instance'));
     }
     return new Promise((resolve, reject) => {
@@ -59,8 +94,5 @@ transaction.start = function (modelClassOrKnex) {
     });
 };
 function isModelClass(maybeModel) {
-    return isFunction(maybeModel) && maybeModel.isObjectionModelClass;
+    return (0, objectUtils_1.isFunction)(maybeModel) && maybeModel.isObjectionModelClass;
 }
-module.exports = {
-    transaction,
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abedmurrar/objection",
-  "version": "4.0.0-beta.6",
+  "version": "4.0.0-beta.8",
   "description": "An SQL-friendly ORM for Node.js. A fork of objection.js with strict TypeScript types and MySQL support.",
   "main": "lib/objection.js",
   "type": "commonjs",