orchid-orm 1.50.4 → 1.51.0

package/dist/index.d.ts

@@ -188,19 +188,19 @@ interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, Rel e
 }
 
 declare function transaction<Result>(this: {
-    $queryBuilder: Db;
+    $qb: Db;
 }, fn: () => Promise<Result>): Promise<Result>;
 declare function transaction<Result>(this: {
-    $queryBuilder: Db;
+    $qb: Db;
 }, options: IsolationLevel | TransactionOptions, fn: () => Promise<Result>): Promise<Result>;
 declare function ensureTransaction<Result>(this: {
-    $queryBuilder: Db;
+    $qb: Db;
 }, cb: () => Promise<Result>): Promise<Result>;
 declare function isInTransaction(this: {
-    $queryBuilder: Db;
+    $qb: Db;
 }): boolean;
 declare function afterCommit(this: {
-    $queryBuilder: Db;
+    $qb: Db;
 }, hook: AfterCommitStandaloneHook): void;
 
 interface FromQuery extends Query {
@@ -226,7 +226,7 @@ type OrchidORM<T extends TableClasses = TableClasses> = {
      */
     $afterCommit: typeof afterCommit;
     $adapter: Adapter;
-    $queryBuilder: Db;
+    $qb: Db;
     /**
      * Use `$query` to perform raw SQL queries.
      *
@@ -417,18 +417,6 @@ interface RelationConfigSelf {
     relations: RelationThunks;
 }
 type RelationConfigParams<T extends RelationConfigSelf, Relation extends RelationThunk> = Relation extends BelongsTo ? BelongsToParams<T, Relation> : Relation extends HasOne | HasMany ? HasOneParams<T, Relation> : Relation extends HasAndBelongsToMany ? HasAndBelongsToManyParams<T, Relation> : never;
-type MapRelation<T extends RelationConfigSelf, K extends keyof T['relations'] & string> = T['relations'][K] extends BelongsTo ? {
-    relationConfig: BelongsToInfo<T, K, T['relations'][K], T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<RelationTableToQuery<T['relations'][K]>, K>>;
-} : T['relations'][K] extends HasOne ? {
-    relationConfig: HasOneInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>>;
-} : T['relations'][K] extends HasMany ? {
-    relationConfig: HasManyInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>>;
-} : T['relations'][K] extends HasAndBelongsToMany ? {
-    relationConfig: HasAndBelongsToManyInfo<T, K, T['relations'][K], HasAndBelongsToManyQuery<K, RelationTableToQuery<T['relations'][K]>>>;
-} : never;
-type MapRelations<T> = T extends RelationConfigSelf ? {
-    [K in keyof T['relations'] & string]: MapRelation<T, K>;
-} : EmptyObject;
 
 interface TableClass<T extends ORMTableInput = ORMTableInput> {
     new (): T;
@@ -446,11 +434,11 @@ interface TableInfo {
 interface Table extends Query, TableInfo {
 }
 interface TableToDb<T extends ORMTableInput, Relations extends RelationsBase> extends TableInfo, Db<T['table'], T['columns']['shape'], keyof ShapeColumnPrimaryKeys<T['columns']['shape']> extends never ? never : ShapeColumnPrimaryKeys<T['columns']['shape']>, ShapeUniqueColumns<T['columns']['shape']> | TableDataItemsUniqueColumns<T['columns']['shape'], T['columns']['data']>, TableDataItemsUniqueColumnTuples<T['columns']['shape'], T['columns']['data']>, UniqueConstraints<T['columns']['shape']> | TableDataItemsUniqueConstraints<T['columns']['data']>, T['types'], T['columns']['shape'] & ComputedColumnsFromOptions<T['computed']>, MapTableScopesOption<T>> {
-    relations: {
-        [K in keyof Relations]: Relations[K]['relationConfig']['query'] & Relations[K];
-    };
+    relations: Relations;
 }
-type ORMTableInputToQueryBuilder<T extends ORMTableInput> = T extends RelationConfigSelf ? TableToDb<T, MapRelations<T>> : TableToDb<T, EmptyObject>;
+type ORMTableInputToQueryBuilder<T extends ORMTableInput> = T extends RelationConfigSelf ? TableToDb<T, T extends RelationConfigSelf ? {
+    [K in keyof T['relations'] & string]: T['relations'][K] extends BelongsTo ? BelongsToInfo<T, K, T['relations'][K], T['relations'][K]['options']['columns'][number] & string, T['relations'][K]['options']['required'], BelongsToQuery<RelationTableToQuery<T['relations'][K]>, K>> : T['relations'][K] extends HasOne ? HasOneInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasMany ? HasManyInfo<T, K, T['relations'][K], HasOneQuery<T, K, RelationTableToQuery<T['relations'][K]>>> : T['relations'][K] extends HasAndBelongsToMany ? HasAndBelongsToManyInfo<T, K, T['relations'][K], HasAndBelongsToManyQuery<K, RelationTableToQuery<T['relations'][K]>>> : never;
+} : EmptyObject> : TableToDb<T, EmptyObject>;
 interface ORMTableInput {
     table: string;
     columns: {

package/dist/index.js

@@ -89,7 +89,7 @@ function createBaseTable({
     setColumns(fn, dataFn) {
       columnTypes[orchidCore.snakeCaseKey] = this.snakeCase;
       const shape = pqb.getColumnTypes(columnTypes, fn, nowSQL, this.language);
-      const tableData = this.constructor.prototype.tableData = pqb.parseTableData(dataFn);
+      const tableData = pqb.parseTableData(dataFn);
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
@@ -148,10 +148,10 @@ function createBaseTable({
 }
 
 const getThroughRelation = (table, through) => {
-  return table.relations[through]?.relationConfig;
+  return table.relations[through];
 };
 const getSourceRelation = (throughRelation, source) => {
-  return throughRelation.query.relations[source]?.relationConfig;
+  return throughRelation.query.relations[source];
 };
 const hasRelationHandleCreate = (q, ctx, item, rowIndex, key, primaryKeys, nestedInsert) => {
   const value = item[key];
@@ -297,7 +297,8 @@ const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, b
     return joinQuery(jq, baseQuery);
   }
   const last = chain[chain.length - 1];
-  const query = "relationConfig" in last ? last.relationConfig.joinQuery(last, baseQuery) : last;
+  const prev = chain[chain.length - 2];
+  const query = prev.rel.joinQuery(last.query, baseQuery);
   let useWhereExist = true;
   if (jq.q.returnType !== "value" && jq.q.returnType !== "valueOrThrow") {
     let tablePrefix;
@@ -1958,7 +1959,7 @@ const applyRelations = (qb, tables, result) => {
         let message = `Cannot define a \`${item.relationName}\` relation on \`${as}\``;
         const table = result[as];
         const { through, source } = relation.options;
-        const throughRel = table.relations[through]?.relationConfig;
+        const throughRel = table.relations[through];
         if (through && !throughRel) {
           message += `: cannot find \`${through}\` relation required by the \`through\` option`;
         } else if (source && throughRel && !throughRel.table.relations[source]) {
@@ -2033,7 +2034,7 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
       return q;
     }
   };
-  baseQuery.relationConfig = {
+  dbTable.relations[relationName] = {
     table: otherDbTable,
     query,
     queryRelated: data.queryRelated,
@@ -2041,7 +2042,7 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
     reverseJoin: data.reverseJoin,
     modifyRelatedQuery: data.modifyRelatedQuery
   };
-  dbTable.relations[relationName] = query;
+  (dbTable.relationQueries ?? (dbTable.relationQueries = {}))[relationName] = query;
   const tableRelations = delayedRelations.get(dbTable);
   if (!tableRelations) return;
   tableRelations[relationName]?.forEach((data2) => {
@@ -2050,19 +2051,19 @@ const applyRelation = (table, qb, { relationName, relation, dbTable, otherDbTabl
 };
 
 function transaction(fnOrOptions, fn) {
-  return this.$queryBuilder.transaction(
+  return this.$qb.transaction(
     fnOrOptions,
     fn
   );
 }
 function ensureTransaction(cb) {
-  return this.$queryBuilder.ensureTransaction(cb);
+  return this.$qb.ensureTransaction(cb);
 }
 function isInTransaction() {
-  return this.$queryBuilder.isInTransaction();
+  return this.$qb.isInTransaction();
 }
 function afterCommit(hook) {
-  this.$queryBuilder.afterCommit(hook);
+  this.$qb.afterCommit(hook);
 }
 
 const orchidORM = ({
@@ -2084,7 +2085,7 @@ const orchidORM = ({
   if ("db" in options) {
     adapter = options.db.q.adapter;
     transactionStorage = options.db.internal.transactionStorage;
-    qb = options.db.queryBuilder;
+    qb = options.db.qb;
   } else {
     adapter = "adapter" in options ? options.adapter : new pqb.Adapter(options);
     transactionStorage = new node_async_hooks.AsyncLocalStorage();
@@ -2102,8 +2103,10 @@ const orchidORM = ({
     $isInTransaction: isInTransaction,
     $afterCommit: afterCommit,
     $adapter: adapter,
-    $queryBuilder: qb,
-    $query: (...args) => qb.query(...args),
+    $qb: qb,
+    get $query() {
+      return qb.query;
+    },
     $queryArrays: (...args) => qb.queryArrays(...args),
     $with: qb.with.bind(qb),
     $withRecursive: qb.withRecursive.bind(qb),
@@ -2140,7 +2143,7 @@ const orchidORM = ({
       table.types,
       transactionStorage,
       options2,
-      table.constructor.prototype.tableData ?? {}
+      table.constructor.prototype.columns?.data ?? {}
     );
     dbTable.definedAs = key;
     dbTable.db = result;