orchid-orm 1.5.29 → 1.5.31

package/dist/index.d.ts

@@ -192,7 +192,7 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
             xml: () => pqb.XMLColumn;
             json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
                 set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
-                tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+                tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
                 union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
                 any: () => pqb.JSONAny;
                 bigint: () => pqb.JSONBigInt;
@@ -230,12 +230,8 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
             timestamps: <T_14 extends pqb.ColumnType<unknown, pqb.BaseOperators, unknown>>(this: {
                 timestamp(): T_14;
             }) => {
-                createdAt: T_14 & {
-                    hasDefault: true;
-                };
-                updatedAt: T_14 & {
-                    hasDefault: true;
-                };
+                createdAt: pqb.ColumnWithDefault<T_14, pqb.RawExpression<pqb.ColumnTypeBase<unknown, pqb.BaseOperators, unknown, pqb.ColumnDataBase>>>;
+                updatedAt: pqb.ColumnWithDefault<T_14, pqb.RawExpression<pqb.ColumnTypeBase<unknown, pqb.BaseOperators, unknown, pqb.ColumnDataBase>>>;
             };
             primaryKey(columns: string[], options?: {
                 name?: string | undefined;
@@ -292,7 +288,7 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
             xml: () => pqb.XMLColumn;
             json: <Type extends pqb.JSONTypeAny>(schemaOrFn: Type | ((j: {
                 set: <Value extends pqb.JSONTypeAny>(valueType: Value) => pqb.JSONSet<Value>;
-                tuple: <T_1 extends pqb.JSONTupleItems | [], Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
+                tuple: <T_1 extends [] | pqb.JSONTupleItems, Rest extends pqb.JSONTypeAny | null = null>(items: T_1, rest?: Rest) => pqb.JSONTuple<T_1, Rest>;
                 union: <T_2 extends [pqb.JSONTypeAny, pqb.JSONTypeAny, ...pqb.JSONTypeAny[]]>(types: T_2) => pqb.JSONUnion<T_2>;
                 any: () => pqb.JSONAny;
                 bigint: () => pqb.JSONBigInt;
@@ -330,12 +326,8 @@ declare const createBaseTable: <CT extends ColumnTypesBase>(options?: {
             timestamps: <T_14 extends pqb.ColumnType<unknown, pqb.BaseOperators, unknown>>(this: {
                 timestamp(): T_14;
             }) => {
-                createdAt: T_14 & {
-                    hasDefault: true;
-                };
-                updatedAt: T_14 & {
-                    hasDefault: true;
-                };
+                createdAt: pqb.ColumnWithDefault<T_14, pqb.RawExpression<pqb.ColumnTypeBase<unknown, pqb.BaseOperators, unknown, pqb.ColumnDataBase>>>;
+                updatedAt: pqb.ColumnWithDefault<T_14, pqb.RawExpression<pqb.ColumnTypeBase<unknown, pqb.BaseOperators, unknown, pqb.ColumnDataBase>>>;
             };
             primaryKey(columns: string[], options?: {
                 name?: string | undefined;

package/dist/index.js

@@ -329,8 +329,8 @@ const hasRelationHandleUpdate = (q, ctx, set, key, primaryKey, nestedUpdate) =>
 };
 
 var __defProp$6 = Object.defineProperty;
-var __defProps$4 = Object.defineProperties;
-var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
+var __defProps$5 = Object.defineProperties;
+var __getOwnPropDescs$5 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$9 = Object.getOwnPropertySymbols;
 var __hasOwnProp$9 = Object.prototype.hasOwnProperty;
 var __propIsEnum$9 = Object.prototype.propertyIsEnumerable;
@@ -346,7 +346,7 @@ var __spreadValues$6 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
+var __spreadProps$5 = (a, b) => __defProps$5(a, __getOwnPropDescs$5(b));
 class HasOneVirtualColumn extends pqb.VirtualColumn {
   constructor(key, state) {
     super();
@@ -500,7 +500,7 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
     if (params.create || params.disconnect || params.set) {
       await currentRelationsQuery._update({ [foreignKey]: null });
       if (params.create) {
-        await t._count()._create(__spreadProps$4(__spreadValues$6({}, params.create), {
+        await t._count()._create(__spreadProps$5(__spreadValues$6({}, params.create), {
           [foreignKey]: data[0][primaryKey]
         }));
       }
@@ -516,7 +516,7 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
       const updatedIds = await currentRelationsQuery._pluck(foreignKey)._update(update);
       if (updatedIds.length < ids.length) {
         await t.createMany(
-          ids.filter((id) => !updatedIds.includes(id)).map((id) => __spreadProps$4(__spreadValues$6({}, create), {
+          ids.filter((id) => !updatedIds.includes(id)).map((id) => __spreadProps$5(__spreadValues$6({}, create), {
             [foreignKey]: id
           }))
         );
@@ -526,8 +526,8 @@ const nestedUpdate$2 = ({ query, primaryKey, foreignKey }) => {
 };
 
 var __defProp$5 = Object.defineProperty;
-var __defProps$3 = Object.defineProperties;
-var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
+var __defProps$4 = Object.defineProperties;
+var __getOwnPropDescs$4 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$8 = Object.getOwnPropertySymbols;
 var __hasOwnProp$8 = Object.prototype.hasOwnProperty;
 var __propIsEnum$8 = Object.prototype.propertyIsEnumerable;
@@ -543,7 +543,7 @@ var __spreadValues$5 = (a, b) => {
     }
   return a;
 };
-var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
+var __spreadProps$4 = (a, b) => __defProps$4(a, __getOwnPropDescs$4(b));
 class HasManyVirtualColumn extends pqb.VirtualColumn {
   constructor(key, state) {
     super();
@@ -731,7 +731,7 @@ const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
     const t = query.transacting(q);
     if (params.create) {
       await t._count()._createMany(
-        params.create.map((create) => __spreadProps$3(__spreadValues$5({}, create), {
+        params.create.map((create) => __spreadProps$4(__spreadValues$5({}, create), {
           [foreignKey]: data[0][primaryKey]
         }))
       );
@@ -775,6 +775,8 @@ const nestedUpdate$1 = ({ query, primaryKey, foreignKey }) => {
 };
 
 var __defProp$4 = Object.defineProperty;
+var __defProps$3 = Object.defineProperties;
+var __getOwnPropDescs$3 = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols$7 = Object.getOwnPropertySymbols;
 var __hasOwnProp$7 = Object.prototype.hasOwnProperty;
 var __propIsEnum$7 = Object.prototype.propertyIsEnumerable;
@@ -790,6 +792,7 @@ var __spreadValues$4 = (a, b) => {
     }
   return a;
 };
+var __spreadProps$3 = (a, b) => __defProps$3(a, __getOwnPropDescs$3(b));
 class HasAndBelongsToManyVirtualColumn extends pqb.VirtualColumn {
   constructor(key, state) {
     super();
@@ -831,15 +834,17 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   const foreignKeyFull = `${joinTable}.${fk}`;
   const associationForeignKeyFull = `${joinTable}.${afk}`;
   const associationPrimaryKeyFull = `${pqb.getQueryAs(query)}.${apk}`;
-  const __table = Object.create(qb.__table);
-  __table.__table = __table;
-  __table.table = joinTable;
-  __table.shape = {
+  const baseQuery = Object.create(qb.baseQuery);
+  baseQuery.baseQuery = baseQuery;
+  baseQuery.table = joinTable;
+  baseQuery.shape = {
     [fk]: table.shape[pk],
     [afk]: query.shape[apk]
   };
-  const subQuery = Object.create(__table);
-  subQuery.query = __spreadValues$4({}, subQuery.query);
+  baseQuery.query = __spreadProps$3(__spreadValues$4({}, baseQuery.query), {
+    shape: baseQuery.shape
+  });
+  const subQuery = Object.create(baseQuery);
   const state = {
     relatedTableQuery: query,
     joinTableQuery: subQuery,
@@ -1207,7 +1212,7 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
     query._take();
   }
   if (data.virtualColumn) {
-    dbTable.shape[relationName] = data.virtualColumn;
+    dbTable.shape[relationName] = dbTable.query.shape[relationName] = data.virtualColumn;
   }
   makeRelationQuery(dbTable, definedAs, relationName, data);
   dbTable.relations[relationName] = {
@@ -1262,7 +1267,7 @@ function transaction(fn) {
       const value = this[key];
       if (value instanceof pqb.Db) {
         const table = value.transacting(q);
-        table.__table = table;
+        table.baseQuery = table;
         table.db = orm;
         orm[key] = table;
       } else {
@@ -1386,16 +1391,16 @@ const createRepo = (table, methods) => {
   const queryMethods = __spreadValues$2(__spreadValues$2(__spreadValues$2(__spreadValues$2({}, methods.queryMethods), methods.queryOneMethods), methods.queryWithWhereMethods), methods.queryOneWithWhereMethods);
   const plainMethods = methods.methods;
   const repo = (q2) => {
-    const proto = Object.create(q2.__table);
-    proto.__table = proto;
+    const proto = Object.create(q2.baseQuery);
+    proto.baseQuery = proto;
     const result = Object.create(proto);
     result.query = pqb.getClonedQueryData(q2.query);
     if (plainMethods) {
-      Object.assign(proto.__table, plainMethods);
+      Object.assign(proto.baseQuery, plainMethods);
     }
     for (const key in queryMethods) {
       const method = queryMethods[key];
-      proto.__table[key] = function(...args) {
+      proto.baseQuery[key] = function(...args) {
         return method(this, ...args);
       };
     }