orchid-orm 1.25.3 → 1.26.1

package/dist/index.mjs

@@ -1,6 +1,6 @@
-import { makeColumnTypes, defaultSchemaConfig, QueryHooks, getColumnTypes, getTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryDefaults, _queryUpdateOrThrow, _queryWhere, toSQLCacheKey, _queryJoinOn, OrchidOrmInternalError, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, _queryAll, Adapter, _initQueryBuilder, Db, addComputedColumns, getClonedQueryData } from 'pqb';
+import { makeColumnTypes, QueryHooks, defaultSchemaConfig, getColumnTypes, parseTableData, _queryHookAfterCreate, _queryHookAfterUpdate, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, _queryCreateMany, isQueryReturnsAll, _queryHookBeforeUpdate, _queryFindBy, _queryCreate, _queryRows, _queryUpdate, _queryDelete, _queryDefaults, _queryUpdateOrThrow, _queryWhere, toSQLCacheKey, _queryJoinOn, OrchidOrmInternalError, _queryCreateFrom, NotFoundError, _queryFindByOptional, _querySelect, _queryWhereExists, _queryTake, _queryTakeOptional, _queryAll, Adapter, _initQueryBuilder, Db, addComputedColumns, getClonedQueryData } from 'pqb';
 export * from 'pqb';
-import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyArray, objectHasValues, toArray } from 'orchid-core';
+import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyObject, emptyArray, objectHasValues, toArray } from 'orchid-core';
 export * from 'orchid-core';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
@@ -14,29 +14,39 @@ function createBaseTable({
   language
 } = {}) {
   var _a;
-  const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(makeColumnTypes(schemaConfig)) : columnTypesArg || makeColumnTypes(defaultSchemaConfig);
+  const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(makeColumnTypes(schemaConfig)) : columnTypesArg || makeColumnTypes(schemaConfig);
   const filePathOrStack = filePathArg || getStackTrace();
   let filePath;
+  const defaultColumns = {
+    shape: emptyObject,
+    data: emptyArray
+  };
   const base = (_a = class {
     constructor() {
+      this.columns = defaultColumns;
       this.snakeCase = snakeCase;
       this.types = columnTypes;
       this.q = {};
       this.language = language;
     }
     static inputSchema() {
+      this.instance();
       return this._inputSchema === void 0 ? this._inputSchema = schemaConfig.inputSchema.call(this) : this._inputSchema;
     }
     static outputSchema() {
+      this.instance();
       return this._outputSchema === void 0 ? this._outputSchema = schemaConfig.outputSchema.call(this) : this._outputSchema;
     }
     static querySchema() {
+      this.instance();
       return this._querySchema === void 0 ? this._querySchema = schemaConfig.querySchema.call(this) : this._querySchema;
     }
     static updateSchema() {
+      this.instance();
       return this._updateSchema === void 0 ? this._updateSchema = schemaConfig.updateSchema.call(this) : this._updateSchema;
     }
     static pkeySchema() {
+      this.instance();
       return this._pkeySchema === void 0 ? this._pkeySchema = schemaConfig.pkeySchema.call(this) : this._pkeySchema;
     }
     static getFilePath() {
@@ -71,10 +81,10 @@ function createBaseTable({
         `Failed to determine file path for table ${this.constructor.name}. Please set \`filePath\` property manually`
       );
     }
-    setColumns(fn) {
+    setColumns(fn, dataFn) {
       columnTypes[snakeCaseKey] = this.snakeCase;
       const shape = getColumnTypes(columnTypes, fn, nowSQL, this.language);
-      this.constructor.prototype.tableData = getTableData();
+      const tableData = this.constructor.prototype.tableData = parseTableData(dataFn);
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
@@ -86,7 +96,10 @@ function createBaseTable({
           }
         }
       }
-      return this.constructor.prototype.columns = shape;
+      return this.constructor.prototype.columns = {
+        shape,
+        data: tableData
+      };
     }
     setComputed(computed) {
       return computed;
@@ -169,7 +182,7 @@ const hasRelationHandleUpdate = (q, set, key, primaryKeys, nestedUpdate) => {
     return;
   selectIfNotSelected(q, primaryKeys);
   q.q.wrapInTransaction = true;
-  _queryHookAfterUpdate(q, q.primaryKeys, (rows, q2) => {
+  _queryHookAfterUpdate(q, primaryKeys, (rows, q2) => {
     return nestedUpdate(
       q2,
       rows,
@@ -443,7 +456,6 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
     }
     if (upsert) {
       ((_a = state.queries) != null ? _a : state.queries = []).push(async (queryResult) => {
-        var _a2;
         const row = queryResult.rows[0];
         let obj = {};
         for (let i = 0; i < len; i++) {
@@ -462,8 +474,13 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
         } else {
           const data = typeof upsert.create === "function" ? upsert.create() : upsert.create;
           const result = await _queryCreate(query.select(...primaryKeys), data);
+          const collectData = {};
+          state.collect = {
+            keys: primaryKeys,
+            data: collectData
+          };
           for (let i = 0; i < len; i++) {
-            ((_a2 = state.updateData) != null ? _a2 : state.updateData = {})[foreignKeys[i]] = result[primaryKeys[i]];
+            collectData[foreignKeys[i]] = result[primaryKeys[i]];
           }
         }
       });
@@ -1871,11 +1888,11 @@ const orchidORM = (_a, tables) => {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       qb,
       table.table,
-      table.columns,
+      table.columns.shape,
       table.types,
       transactionStorage,
       options2,
-      (_a2 = table.constructor.prototype.tableData) != null ? _a2 : {}
+      (_a2 = table.constructor.prototype.tableData) != null ? _a2 : emptyObject
     );
     dbTable.definedAs = key;
     dbTable.db = result;