@abedmurrar/objection 4.0.0-beta.3 → 4.0.0-beta.5

package/lib/queryBuilder/join/TableNode.js

@@ -1,6 +1,8 @@
-'use strict';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TableNode = void 0;
 class TableNode {
-    constructor({ tableTree, modelClass, expression, parentNode = null, relation = null }) {
+    constructor({ tableTree, modelClass, expression, parentNode = null, relation = null, }) {
         this.tableTree = tableTree;
         this.modelClass = modelClass;
         this.parentNode = parentNode;
@@ -20,6 +22,7 @@ class TableNode {
     get options() {
         return this.tableTree.options;
     }
+    // Null for the root node only.
     get relationProperty() {
         return this.expression.node.$name;
     }
@@ -57,6 +60,7 @@ class TableNode {
     }
     _calculateAlias() {
         if (this.parentNode) {
+            // A child node always has a name.
             const relationName = this.expression.node.$name;
             const alias = this.options.aliases[relationName] || relationName;
             if (this.options.minimize) {
@@ -84,6 +88,7 @@ class TableNode {
         }
     }
 }
+exports.TableNode = TableNode;
 function createIdGetter(columnAliases) {
     const columnAlias = columnAliases[0];
     return (flatRow) => {
@@ -131,6 +136,3 @@ function createMultiIdGetter(columnAliases) {
         return idStr;
     };
 }
-module.exports = {
-    TableNode,
-};

package/lib/queryBuilder/join/TableTree.js

@@ -1,6 +1,8 @@
-'use strict';
-const { forEachChildExpression } = require('./utils');
-const { TableNode } = require('./TableNode');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TableTree = void 0;
+const utils_1 = require("./utils");
+const TableNode_1 = require("./TableNode");
 class TableTree {
     constructor({ expression, rootModelClass, rootTableAlias, options }) {
         this.options = options;
@@ -38,7 +40,7 @@ class TableTree {
         }
     }
     _createRootNode({ expression, modelClass }) {
-        const node = TableNode.create({
+        const node = TableNode_1.TableNode.create({
             tableTree: this,
             modelClass,
             expression,
@@ -47,8 +49,12 @@ class TableTree {
         return node;
     }
     _createChildNodes({ expression, modelClass, parentNode }) {
-        forEachChildExpression(expression, modelClass, (childExpr, relation) => {
-            const node = TableNode.create({
+        (0, utils_1.forEachChildExpression)(expression, modelClass, (childExpr, relation) => {
+            // `relation` is only null for a recursive relation that doesn't exist.
+            // Reading its `relatedModelClass` then throws a TypeError.
+            // `Relation` types its model classes as `RelationModelClass`. They are
+            // full model classes.
+            const node = TableNode_1.TableNode.create({
                 tableTree: this,
                 modelClass: relation.relatedModelClass,
                 expression: childExpr,
@@ -64,6 +70,4 @@ class TableTree {
         });
     }
 }
-module.exports = {
-    TableTree,
-};
+exports.TableTree = TableTree;

package/lib/queryBuilder/join/utils.js

@@ -1,19 +1,19 @@
-'use strict';
-const { ValidationErrorType } = require('../../model/ValidationError');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RELATION_RECURSION_LIMIT = exports.ID_LENGTH_LIMIT = void 0;
+exports.forEachChildExpression = forEachChildExpression;
+const ValidationError_1 = require("../../model/ValidationError");
 const ID_LENGTH_LIMIT = 63;
+exports.ID_LENGTH_LIMIT = ID_LENGTH_LIMIT;
 const RELATION_RECURSION_LIMIT = 64;
+exports.RELATION_RECURSION_LIMIT = RELATION_RECURSION_LIMIT;
 // Given a relation expression, goes through all first level children.
 function forEachChildExpression(expr, modelClass, callback) {
     if (expr.node.$allRecursive || expr.maxRecursionDepth > RELATION_RECURSION_LIMIT) {
         throw modelClass.createValidationError({
-            type: ValidationErrorType.RelationExpression,
+            type: ValidationError_1.ValidationErrorType.RelationExpression,
             message: `recursion depth of eager expression ${expr.toString()} too big for JoinEagerAlgorithm`,
         });
     }
     expr.forEachChildExpression(modelClass, callback);
 }
-module.exports = {
-    ID_LENGTH_LIMIT,
-    RELATION_RECURSION_LIMIT,
-    forEachChildExpression,
-};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abedmurrar/objection",
-  "version": "4.0.0-beta.3",
+  "version": "4.0.0-beta.5",
   "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",