orchid-orm 1.58.1 → 1.58.3

package/dist/index.d.ts

@@ -1,7 +1,5 @@
-import { TableData, Query, SelectableFromShape, CreateManyMethodsNames, CreateData, CreateBelongsToData, AddQueryDefaults, QueryTake, QueryTakeOptional, UpdateData, WhereArg, CreateMethodsNames, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, FromArg, FromResult, DbSharedOptions, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, ComputedOptionsConfig, QueryData, TableDataFn, DbTableOptionScopes, RawSQL, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
+import { ColumnsShapeBase, TableData, ColumnShapeInputPartial, Query, SelectableFromShape, CreateManyMethodsNames, CreateData, AddQueryDefaults, RelationConfigBase, QueryTake, QueryTakeOptional, EmptyObject, UpdateData, WhereArg, CreateMethodsNames, MaybeArray, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, AfterCommitStandaloneHook, AdapterBase, FromArg, FromResult, DbSharedOptions, RelationsBase, ShapeColumnPrimaryKeys, ShapeUniqueColumns, TableDataItemsUniqueColumns, TableDataItemsUniqueColumnTuples, UniqueConstraints, TableDataItemsUniqueConstraints, ComputedColumnsFromOptions, MapTableScopesOption, TableDataItem, ComputedOptionsFactory, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, ComputedOptionsConfig, QueryOrExpression, QueryColumn, ColumnShapeInput, QueryData, IsQuery, TableDataFn, DbTableOptionScopes, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, RawSQL, DynamicSQLArg, DynamicRawSQL, DefaultSchemaConfig, DefaultColumnTypes, QueryBeforeHookInternal, QueryAfterHook, QueryColumns, AfterHook, WhereResult, MergeQuery, QueryReturnType } from 'pqb';
 export * from 'pqb';
-import { ColumnsShapeBase, ColumnShapeInputPartial, RelationConfigBase, EmptyObject, MaybeArray, AfterCommitStandaloneHook, AdapterBase, RelationsBase, RecordUnknown, ShallowSimplify, ColumnShapeOutput, DefaultSelectColumns, QueryOrExpression, QueryColumn, ColumnShapeInput, IsQuery, CoreQueryScopes, ColumnSchemaConfig, StaticSQLArgs, DynamicSQLArg, QueryColumns, QueryReturnType } from 'orchid-core';
-export * from 'orchid-core';
 
 interface RelationRefsOptions<Column extends PropertyKey = string, Shape extends ColumnsShapeBase = ColumnsShapeBase> {
     required?: boolean;
@@ -43,7 +41,7 @@ type HasOneQuery<T extends RelationConfigSelf, Name extends string, TableQuery e
         selectable: SelectableFromShape<TableQuery['shape'], Name>;
     } : K extends 'join' ? RelJoin : K extends CreateManyMethodsNames ? never : TableQuery[K];
 };
-interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query, CD = T['relations'][Name]['options'] extends RelationThroughOptions ? CreateData<Q, CreateBelongsToData<Q>> : CreateData<AddQueryDefaults<Q, HasOnePopulate<T, Name>>, CreateBelongsToData<Q>>> extends RelationConfigBase {
+interface HasOneInfo<T extends RelationConfigSelf, Name extends string, Rel extends HasOne, Q extends Query, CD = T['relations'][Name]['options'] extends RelationThroughOptions ? CreateData<Q> : CreateData<AddQueryDefaults<Q, HasOnePopulate<T, Name>>>> extends RelationConfigBase {
     returnsOne: true;
     query: Q;
     params: HasOneParams<T, Rel>;
@@ -182,7 +180,7 @@ interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, Rel e
     } | {
         update: UpdateData<Q>;
     } | {
-        create: CreateData<Q, CreateBelongsToData<Q>>;
+        create: CreateData<Q>;
     };
     dataForUpdateOne: {
         disconnect: boolean;
@@ -193,11 +191,11 @@ interface BelongsToInfo<T extends RelationConfigSelf, Name extends string, Rel e
     } | {
         update: UpdateData<Q>;
     } | {
-        create: CreateData<Q, CreateBelongsToData<Q>>;
+        create: CreateData<Q>;
     } | {
         upsert: {
             update: UpdateData<Q>;
-            create: CreateData<Q, CreateBelongsToData<Q>> | (() => CreateData<Q, CreateBelongsToData<Q>>);
+            create: CreateData<Q> | (() => CreateData<Q>);
         };
     };
 }

package/dist/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var pqb = require('pqb');
-var orchidCore = require('orchid-core');
 var node_async_hooks = require('node:async_hooks');
 
 function createBaseTable({
@@ -16,11 +15,11 @@ function createBaseTable({
 } = {}) {
   var _a;
   const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(pqb.makeColumnTypes(schemaConfig)) : columnTypesArg || pqb.makeColumnTypes(schemaConfig);
-  const filePathOrStack = filePathArg || orchidCore.getStackTrace();
+  const filePathOrStack = filePathArg || pqb.getStackTrace();
   let filePath;
   const defaultColumns = {
-    shape: orchidCore.emptyObject,
-    data: orchidCore.emptyArray
+    shape: pqb.emptyObject,
+    data: pqb.emptyArray
   };
   const base = (_a = class {
     constructor() {
@@ -64,7 +63,7 @@ function createBaseTable({
       if (typeof filePathOrStack === "string") {
         return filePath = filePathOrStack;
       }
-      filePath = orchidCore.getCallerFilePath(filePathOrStack);
+      filePath = pqb.getCallerFilePath(filePathOrStack);
       if (filePath) return filePath;
       throw new Error(
         `Failed to determine file path of a base table. Please set the \`filePath\` option of \`createBaseTable\` manually.`
@@ -80,21 +79,21 @@ function createBaseTable({
       if (this.filePath) return this.filePath;
       if (typeof filePathOrStack === "string")
         return this.filePath = filePathOrStack;
-      const filePath2 = orchidCore.getCallerFilePath(filePathOrStack);
+      const filePath2 = pqb.getCallerFilePath(filePathOrStack);
       if (filePath2) return this.filePath = filePath2;
       throw new Error(
         `Failed to determine file path for table ${this.constructor.name}. Please set \`filePath\` property manually`
       );
     }
     setColumns(fn, dataFn) {
-      columnTypes[orchidCore.snakeCaseKey] = this.snakeCase;
+      columnTypes[pqb.snakeCaseKey] = this.snakeCase;
       const shape = pqb.getColumnTypes(columnTypes, fn, nowSQL, this.language);
       const tableData = pqb.parseTableData(dataFn);
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
           if (column.data.name) continue;
-          const snakeName = orchidCore.toSnakeCase(key);
+          const snakeName = pqb.toSnakeCase(key);
           if (snakeName !== key) {
             column.data.name = snakeName;
           }
@@ -140,7 +139,7 @@ function createBaseTable({
       };
     }
   }, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a.columnTypes = columnTypes, _a);
-  orchidCore.applyMixins(base, [pqb.QueryHooks]);
+  pqb.applyMixins(base, [pqb.QueryHooks]);
   base.prototype.types = columnTypes;
   base.prototype.snakeCase = snakeCase;
   base.prototype.autoForeignKeys = autoForeignKeys === true ? {} : autoForeignKeys || void 0;
@@ -239,7 +238,7 @@ const addAutoForeignKey = (tableConfig, from, to, primaryKeys, foreignKeys, opti
   let fkeyOptions = options.foreignKey !== void 0 ? options.foreignKey : tableConfig.autoForeignKeys;
   if (!fkeyOptions) return;
   if (fkeyOptions === true) {
-    fkeyOptions = tableConfig.autoForeignKeys || orchidCore.emptyObject;
+    fkeyOptions = tableConfig.autoForeignKeys || pqb.emptyObject;
   }
   if (foreignKeys.length === 1) {
     const column = from.shape[foreignKeys[0]];
@@ -306,7 +305,7 @@ const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, b
       useWhereExist = jq.q.order.every((o) => {
         if (typeof o === "string") {
           return isOwnColumn(prefix, o);
-        } else if (orchidCore.isExpression(o)) {
+        } else if (pqb.isExpression(o)) {
           return false;
         } else {
           for (const key in o) {
@@ -323,7 +322,7 @@ const joinQueryChainHOF = (relPKeys, reverseJoin, joinQuery) => (joiningQuery, b
       useWhereExist = jq.q.select.every((s) => {
         if (typeof s === "string") {
           return isOwnColumn(prefix, s);
-        } else if (orchidCore.isExpression(s)) {
+        } else if (pqb.isExpression(s)) {
           return false;
         } else if (!s) {
           return false;
@@ -378,7 +377,7 @@ const combineOrdering = (result, joined) => {
   if (order) {
     const as = pqb.getQueryAs(joined);
     const add = order.map(
-      (o) => typeof o === "string" ? `${as}.${o}` : orchidCore.isExpression(o) ? o : Object.fromEntries(
+      (o) => typeof o === "string" ? `${as}.${o}` : pqb.isExpression(o) ? o : Object.fromEntries(
         Object.entries(o).map(([key, value]) => [`${as}.${key}`, value])
       )
     );
@@ -428,7 +427,7 @@ class BelongsToVirtualColumn extends pqb.VirtualColumn {
     const relationData = [values];
     store.belongsTo[key] = relationData;
     q.q.wrapInTransaction = true;
-    orchidCore.pushQueryValueImmutable(q, "beforeCreate", async (q2) => {
+    pqb.pushQueryValueImmutable(q, "beforeCreate", async (q2) => {
       const inserted = await this.nestedInsert(
         q2,
         relationData.map(([, , data]) => data)
@@ -505,7 +504,7 @@ const makeBelongsToMethod = (tableConfig, table, relation, relationName, query)
       state
     ),
     joinQuery: joinQueryChainHOF(
-      orchidCore.getPrimaryKeys(query),
+      pqb.getPrimaryKeys(query),
       reverseJoin,
       (joiningQuery, baseQuery) => join(
         baseQuery,
@@ -543,7 +542,7 @@ const nestedInsert$3 = ({ query, primaryKeys, on }) => {
       }
       connectOrCreated = await Promise.all(items);
     } else {
-      connectOrCreated = orchidCore.emptyArray;
+      connectOrCreated = pqb.emptyArray;
     }
     let connectOrCreatedI = 0;
     items.length = 0;
@@ -564,7 +563,7 @@ const nestedInsert$3 = ({ query, primaryKeys, on }) => {
         items
       );
     } else {
-      created = orchidCore.emptyArray;
+      created = pqb.emptyArray;
     }
     items.length = 0;
     for (const item of data) {
@@ -581,7 +580,7 @@ const nestedInsert$3 = ({ query, primaryKeys, on }) => {
       }
       connected = await Promise.all(items);
     } else {
-      connected = orchidCore.emptyArray;
+      connected = pqb.emptyArray;
     }
     let createdI = 0;
     let connectedI = 0;
@@ -636,7 +635,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
       } else if (params.delete) {
         const selectQuery = q2.clone();
         selectQuery.q.type = void 0;
-        selectQuery.q.distinct = orchidCore.emptyArray;
+        selectQuery.q.distinct = pqb.emptyArray;
         selectIfNotSelected(selectQuery, foreignKeys);
         idsForDelete = await pqb._queryRows(selectQuery);
         for (const foreignKey of foreignKeys) {
@@ -682,7 +681,7 @@ const nestedUpdate$3 = ({ query, primaryKeys, foreignKeys, len }) => {
     } else if (params.delete || params.update) {
       pqb._queryHookAfterUpdate(
         q,
-        params.update ? foreignKeys : orchidCore.emptyArray,
+        params.update ? foreignKeys : pqb.emptyArray,
         async (data) => {
           let ids;
           if (params.delete) {
@@ -754,7 +753,7 @@ class HasOneVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasOneMethod = (tableConfig, table, relation, relationName, query) => {
-  const relPKeys = orchidCore.getPrimaryKeys(query);
+  const relPKeys = pqb.getPrimaryKeys(query);
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -1029,7 +1028,7 @@ class HasManyVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasManyMethod = (tableConfig, table, relation, relationName, query) => {
-  const relPKeys = orchidCore.getPrimaryKeys(query);
+  const relPKeys = pqb.getPrimaryKeys(query);
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -1148,7 +1147,7 @@ const getWhereForNestedUpdate = (t, data, params, primaryKeys, foreignKeys) => {
       columns: foreignKeys,
       values: data.map((item) => primaryKeys.map((key) => item[key]))
     },
-    OR: params ? orchidCore.toArray(params) : void 0
+    OR: params ? pqb.toArray(params) : void 0
   });
 };
 const nestedInsert$1 = ({ query, primaryKeys, foreignKeys }) => {
@@ -1268,7 +1267,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
     }
     if (params.add) {
       if (data.length > 1) {
-        throw new orchidCore.OrchidOrmInternalError(
+        throw new pqb.OrchidOrmInternalError(
           query,
           "`connect` is not available when updating multiple records, it is only applicable for a single record update"
         );
@@ -1277,13 +1276,13 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
       for (let i = 0; i < len; i++) {
         obj[foreignKeys[i]] = data[0][primaryKeys[i]];
       }
-      const relatedWheres = orchidCore.toArray(params.add);
+      const relatedWheres = pqb.toArray(params.add);
       const count = await pqb._queryUpdate(
         t.where({ OR: relatedWheres }),
         obj
       );
       if (count < relatedWheres.length) {
-        throw new orchidCore.OrchidOrmInternalError(
+        throw new pqb.OrchidOrmInternalError(
           query,
           `Expected to find at least ${relatedWheres.length} record(s) based on \`add\` conditions, but found ${count}`
         );
@@ -1294,7 +1293,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
       for (const foreignKey of foreignKeys) {
         obj[foreignKey] = null;
       }
-      const setConditions = params.set && (Array.isArray(params.set) ? params.set.length : orchidCore.objectHasValues(params.set)) && (Array.isArray(params.set) ? {
+      const setConditions = params.set && (Array.isArray(params.set) ? params.set.length : pqb.objectHasValues(params.set)) && (Array.isArray(params.set) ? {
         OR: params.set
       } : params.set);
       let queryToDisconnect = getWhereForNestedUpdate(
@@ -1388,11 +1387,11 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
     pqb._queryDefaults(query, on);
   }
   const foreignKeysFull = foreignKeys.map((key, i) => {
-    if (snakeCase) key = foreignKeys[i] = orchidCore.toSnakeCase(key);
+    if (snakeCase) key = foreignKeys[i] = pqb.toSnakeCase(key);
     return `${joinTable}.${key}`;
   });
   const throughForeignKeysFull = throughForeignKeys.map((key, i) => {
-    if (snakeCase) key = throughForeignKeys[i] = orchidCore.toSnakeCase(key);
+    if (snakeCase) key = throughForeignKeys[i] = pqb.toSnakeCase(key);
     return `${joinTable}.${key}`;
   });
   const foreignTable = pqb.getQueryAs(query);
@@ -1514,7 +1513,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
       state
     ),
     joinQuery: joinQueryChainHOF(
-      orchidCore.getPrimaryKeys(query),
+      pqb.getPrimaryKeys(query),
       reverseJoin,
       (joiningQuery, baseQuery2) => joinQuery(
         joiningQuery,
@@ -1548,7 +1547,7 @@ const makeHasAndBelongsToManyMethod = (tableConfig, table, qb, relation, relatio
             data
           );
           if (createdCount === 0) {
-            throw new orchidCore.NotFoundError(baseQuery2);
+            throw new pqb.NotFoundError(baseQuery2);
           }
         }
       );
@@ -1812,7 +1811,7 @@ const nestedUpdate = (state) => {
     }
     if (params.add) {
       const as = query.table;
-      const relatedWheres = orchidCore.toArray(params.add);
+      const relatedWheres = pqb.toArray(params.add);
       const joinTableColumns = [
         ...state.foreignKeys,
         ...state.throughForeignKeys
@@ -1841,18 +1840,18 @@ const nestedUpdate = (state) => {
                 state.primaryKeysShape[key]
               ])
             ),
-            data.map((x) => orchidCore.pick(x, state.primaryKeys))
+            data.map((x) => pqb.pick(x, state.primaryKeys))
           )
         ).onConflict(joinTableColumns).merge([state.foreignKeys[0]]);
         if (count < data.length * relatedWheres.length) {
-          throw new orchidCore.OrchidOrmInternalError(
+          throw new pqb.OrchidOrmInternalError(
             query,
             `Expected to find at least ${relatedWheres.length} record(s) based on \`add\` conditions, but found ${count / data.length}`
           );
         }
       } catch (err) {
         if (err.code === "42P10") {
-          throw new orchidCore.OrchidOrmInternalError(
+          throw new pqb.OrchidOrmInternalError(
             query,
             `"${state.joinTableQuery.table}" must have a primary key or a unique index on columns (${joinTableColumns.join(
               ", "
@@ -1884,7 +1883,7 @@ const nestedUpdate = (state) => {
     if (params.set) {
       const j = queryJoinTable(state, data);
       await pqb._queryDelete(j);
-      if (Array.isArray(params.set) ? params.set.length : orchidCore.objectHasValues(params.set)) {
+      if (Array.isArray(params.set) ? params.set.length : pqb.objectHasValues(params.set)) {
         const idsRows = await pqb._queryRows(
           pqb._querySelect(
             state.relatedTableQuery.where(
@@ -2208,10 +2207,4 @@ Object.keys(pqb).forEach(function (k) {
     get: function () { return pqb[k]; }
   });
 });
-Object.keys(orchidCore).forEach(function (k) {
-  if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
-    enumerable: true,
-    get: function () { return orchidCore[k]; }
-  });
-});
 //# sourceMappingURL=index.js.map