orchid-orm 1.9.10 → 1.9.12

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { columnTypes, getColumnTypes, addQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, getQueryAs, toSqlCacheKey, NotFoundError, relationQueryKey, Adapter, Db, anyShape, getClonedQueryData, columnsShapeToCode, ColumnType, primaryKeyToCode, indexToCode, constraintToCode, columnIndexesToCode, columnForeignKeysToCode, columnCheckToCode, identityToCode } from 'pqb';
 export { OrchidOrmError, OrchidOrmInternalError, columnTypes } from 'pqb';
-import { getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, pathToLog, toCamelCase, toPascalCase, getImportPath, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode, deepCompare } from 'orchid-core';
+import { getCallerFilePath, snakeCaseKey, toSnakeCase, pathToLog, toCamelCase, toPascalCase, getImportPath, singleQuote, codeToString, quoteObjectKey, addCode, columnDefaultArgumentToCode, deepCompare } from 'orchid-core';
 import { AsyncLocalStorage } from 'node:async_hooks';
 import * as path from 'path';
 import path__default from 'path';
@@ -99,8 +99,8 @@ const create = (columnTypes, filePath, snakeCase) => {
 };
 
 class BelongsToVirtualColumn extends VirtualColumn {
-  constructor(types, key, state) {
-    super(types);
+  constructor(key, state) {
+    super();
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert$3(this.state);
@@ -153,7 +153,7 @@ const makeBelongsToMethod = (relation, relationName, query) => {
     method: (params) => {
       return query.findBy({ [primaryKey]: params[foreignKey] });
     },
-    virtualColumn: new BelongsToVirtualColumn(emptyObject, relationName, state),
+    virtualColumn: new BelongsToVirtualColumn(relationName, state),
     joinQuery(fromQuery, toQuery) {
       return addQueryOn(toQuery, fromQuery, toQuery, primaryKey, foreignKey);
     },
@@ -354,8 +354,8 @@ var __spreadValues$7 = (a, b) => {
 };
 var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 class HasOneVirtualColumn extends VirtualColumn {
-  constructor(types, key, state) {
-    super(types);
+  constructor(key, state) {
+    super();
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert$2(state);
@@ -440,7 +440,7 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
       const values = { [foreignKey]: params[primaryKey] };
       return query.where(values)._defaults(values);
     },
-    virtualColumn: new HasOneVirtualColumn(emptyObject, relationName, state),
+    virtualColumn: new HasOneVirtualColumn(relationName, state),
     joinQuery(fromQuery, toQuery) {
       return addQueryOn(toQuery, fromQuery, toQuery, foreignKey, primaryKey);
     },
@@ -551,8 +551,8 @@ var __spreadValues$6 = (a, b) => {
 };
 var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 class HasManyVirtualColumn extends VirtualColumn {
-  constructor(types, key, state) {
-    super(types);
+  constructor(key, state) {
+    super();
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert$1(state);
@@ -636,7 +636,7 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
       const values = { [foreignKey]: params[primaryKey] };
       return query.where(values)._defaults(values);
     },
-    virtualColumn: new HasManyVirtualColumn(emptyObject, relationName, state),
+    virtualColumn: new HasManyVirtualColumn(relationName, state),
     joinQuery(fromQuery, toQuery) {
       return addQueryOn(toQuery, fromQuery, toQuery, foreignKey, primaryKey);
     },
@@ -800,8 +800,8 @@ var __spreadValues$5 = (a, b) => {
 };
 var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 class HasAndBelongsToManyVirtualColumn extends VirtualColumn {
-  constructor(types, key, state) {
-    super(types);
+  constructor(key, state) {
+    super();
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert(state);
@@ -879,11 +879,7 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
         })
       );
     },
-    virtualColumn: new HasAndBelongsToManyVirtualColumn(
-      emptyObject,
-      relationName,
-      state
-    ),
+    virtualColumn: new HasAndBelongsToManyVirtualColumn(relationName, state),
     // joinQuery can be a property of RelationQuery and be used by whereExists and other stuff which needs it
     // and the chained query itself may be a query around this joinQuery
     joinQuery(fromQuery, toQuery) {
@@ -1210,7 +1206,9 @@ const delayRelation = (delayedRelations, table, relationName, data) => {
 };
 const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, delayedRelations) => {
   var _a;
-  const query = (relation.options.scope ? relation.options.scope(otherDbTable) : otherDbTable).as(relationName);
+  const baseQuery = Object.create(otherDbTable);
+  baseQuery.baseQuery = baseQuery;
+  const query = (relation.options.scope ? relation.options.scope(baseQuery) : baseQuery).as(relationName);
   const definedAs = query.definedAs;
   if (!definedAs) {
     throw new Error(
@@ -1243,6 +1241,7 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
     dbTable.shape[relationName] = dbTable.query.shape[relationName] = data.virtualColumn;
   }
   makeRelationQuery(dbTable, definedAs, relationName, data);
+  baseQuery.joinQuery = data.joinQuery;
   dbTable.relations[relationName] = {
     type,
     key: relationName,
@@ -1252,6 +1251,7 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
     primaryKey: data.primaryKey,
     options: relation.options
   };
+  dbTable.relationsQueries[relationName] = query;
   const tableRelations = delayedRelations.get(dbTable);
   if (!tableRelations)
     return;