orchid-orm 1.18.3 → 1.20.0

package/dist/index.mjs

@@ -1,35 +1,43 @@
-import { columnTypes, QueryHooks, getColumnTypes, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, toSQLCacheKey, OrchidOrmInternalError, NotFoundError, Adapter, Db, anyShape, addComputedColumns, getClonedQueryData } from 'pqb';
+import { makeColumnTypes, defaultSchemaConfig, QueryHooks, getColumnTypes, getQueryAs, setQueryObjectValue, pushQueryOn, VirtualColumn, pushQueryValue, isQueryReturnsAll, toSQLCacheKey, OrchidOrmInternalError, NotFoundError, Adapter, Db, anyShape, addComputedColumns, getClonedQueryData } from 'pqb';
 export * from 'pqb';
 import { getStackTrace, applyMixins, getCallerFilePath, snakeCaseKey, toSnakeCase, emptyArray, toArray } from 'orchid-core';
 import { AsyncLocalStorage } from 'node:async_hooks';
 
 function createBaseTable({
+  schemaConfig = defaultSchemaConfig,
   columnTypes: columnTypesArg,
   snakeCase,
   filePath: filePathArg,
   nowSQL,
   exportAs = "BaseTable",
-  language,
-  schemaProvider: schemaProviderArg
+  language
 } = {}) {
   var _a;
-  const columnTypes$1 = typeof columnTypesArg === "function" ? columnTypesArg(
-    columnTypes
-  ) : columnTypesArg || columnTypes;
+  const columnTypes = typeof columnTypesArg === "function" ? columnTypesArg(makeColumnTypes(schemaConfig)) : columnTypesArg || makeColumnTypes(defaultSchemaConfig);
   const filePathOrStack = filePathArg || getStackTrace();
   let filePath;
-  function schemaProvider() {
-    const schema = schemaProviderArg.call(this);
-    this.schema = () => schema;
-    return schema;
-  }
   const base = (_a = class {
     constructor() {
       this.snakeCase = snakeCase;
-      this.types = columnTypes$1;
+      this.types = columnTypes;
       this.q = {};
       this.language = language;
     }
+    static inputSchema() {
+      return this._inputSchema === void 0 ? this._inputSchema = schemaConfig.inputSchema.call(this) : this._inputSchema;
+    }
+    static outputSchema() {
+      return this._outputSchema === void 0 ? this._outputSchema = schemaConfig.outputSchema.call(this) : this._outputSchema;
+    }
+    static querySchema() {
+      return this._querySchema === void 0 ? this._querySchema = schemaConfig.querySchema.call(this) : this._querySchema;
+    }
+    static updateSchema() {
+      return this._updateSchema === void 0 ? this._updateSchema = schemaConfig.updateSchema.call(this) : this._updateSchema;
+    }
+    static pkeySchema() {
+      return this._pkeySchema === void 0 ? this._pkeySchema = schemaConfig.pkeySchema.call(this) : this._pkeySchema;
+    }
     static getFilePath() {
       if (filePath)
         return filePath;
@@ -63,8 +71,8 @@ function createBaseTable({
       );
     }
     setColumns(fn) {
-      columnTypes$1[snakeCaseKey] = this.snakeCase;
-      const shape = getColumnTypes(columnTypes$1, fn, nowSQL, this.language);
+      columnTypes[snakeCaseKey] = this.snakeCase;
+      const shape = getColumnTypes(columnTypes, fn, nowSQL, this.language);
       if (this.snakeCase) {
         for (const key in shape) {
           const column = shape[key];
@@ -76,7 +84,7 @@ function createBaseTable({
           }
         }
       }
-      return shape;
+      return this.constructor.prototype.columns = shape;
     }
     setComputed(computed) {
       return computed;
@@ -112,9 +120,9 @@ function createBaseTable({
         options
       };
     }
-  }, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a.schema = schemaProvider, _a);
+  }, _a.nowSQL = nowSQL, _a.exportAs = exportAs, _a);
   applyMixins(base, [QueryHooks]);
-  base.prototype.types = columnTypes$1;
+  base.prototype.types = columnTypes;
   return base;
 }
 
@@ -225,8 +233,8 @@ const joinQueryChainingHOF = (reverseJoin, joinQuery) => (joiningQuery, baseQuer
 };
 
 class BelongsToVirtualColumn extends VirtualColumn {
-  constructor(key, state) {
-    super();
+  constructor(schema, key, state) {
+    super(schema);
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert$3(this.state);
@@ -303,7 +311,11 @@ const makeBelongsToMethod = (relation, relationName, query) => {
     method(params) {
       return query.where(makeWhere(params));
     },
-    virtualColumn: new BelongsToVirtualColumn(relationName, state),
+    virtualColumn: new BelongsToVirtualColumn(
+      defaultSchemaConfig,
+      relationName,
+      state
+    ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
       (joiningQuery, baseQuery) => join(baseQuery, joiningQuery, primaryKeys, foreignKeys)
@@ -504,8 +516,8 @@ var __spreadValues$5 = (a, b) => {
   return a;
 };
 class HasOneVirtualColumn extends VirtualColumn {
-  constructor(key, state) {
-    super();
+  constructor(schema, key, state) {
+    super(schema);
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert$2(state);
@@ -602,7 +614,11 @@ const makeHasOneMethod = (table, relation, relationName, query) => {
       }
       return query.where(values)._defaults(values);
     },
-    virtualColumn: new HasOneVirtualColumn(relationName, state),
+    virtualColumn: new HasOneVirtualColumn(
+      defaultSchemaConfig,
+      relationName,
+      state
+    ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
       (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
@@ -748,8 +764,8 @@ var __spreadValues$4 = (a, b) => {
   return a;
 };
 class HasManyVirtualColumn extends VirtualColumn {
-  constructor(key, state) {
-    super();
+  constructor(schema, key, state) {
+    super(schema);
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert$1(state);
@@ -850,7 +866,11 @@ const makeHasManyMethod = (table, relation, relationName, query) => {
       }
       return query.where(values)._defaults(values);
     },
-    virtualColumn: new HasManyVirtualColumn(relationName, state),
+    virtualColumn: new HasManyVirtualColumn(
+      defaultSchemaConfig,
+      relationName,
+      state
+    ),
     joinQuery: joinQueryChainingHOF(
       reverseJoin,
       (joiningQuery, baseQuery) => joinHasRelation(baseQuery, joiningQuery, primaryKeys, foreignKeys, len)
@@ -1041,8 +1061,8 @@ var __spreadValues$3 = (a, b) => {
 };
 var __spreadProps$1 = (a, b) => __defProps$1(a, __getOwnPropDescs$1(b));
 class HasAndBelongsToManyVirtualColumn extends VirtualColumn {
-  constructor(key, state) {
-    super();
+  constructor(schema, key, state) {
+    super(schema);
     this.key = key;
     this.state = state;
     this.nestedInsert = nestedInsert(state);
@@ -1111,7 +1131,9 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
   baseQuery.table = joinTable;
   const shape = {};
   for (let i = 0; i < len; i++) {
-    shape[foreignKeys[i]] = removeColumnName(table.shape[primaryKeys[i]]);
+    shape[foreignKeys[i]] = removeColumnName(
+      table.shape[primaryKeys[i]]
+    );
   }
   for (let i = 0; i < throughLen; i++) {
     shape[throughForeignKeys[i]] = removeColumnName(
@@ -1175,7 +1197,11 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
         return q._where(where);
       });
     },
-    virtualColumn: new HasAndBelongsToManyVirtualColumn(relationName, state),
+    virtualColumn: new HasAndBelongsToManyVirtualColumn(
+      defaultSchemaConfig,
+      relationName,
+      state
+    ),
     joinQuery: joinQueryChainingHOF(reverseJoin, (joiningQuery, baseQuery2) => {
       const joined = joinQuery(
         joiningQuery,
@@ -1734,7 +1760,7 @@ const orchidORM = (_a, tables) => {
       void 0,
       void 0,
       anyShape,
-      columnTypes,
+      makeColumnTypes(defaultSchemaConfig),
       transactionStorage,
       commonOptions
     );
@@ -1759,7 +1785,8 @@ const orchidORM = (_a, tables) => {
     const options2 = __spreadProps(__spreadValues$1({}, commonOptions), {
       schema: table.schema,
       language: table.language,
-      scopes: table.scopes
+      scopes: table.scopes,
+      softDelete: table.softDelete
     });
     if (table.noPrimaryKey)
       options2.noPrimaryKey = "ignore";