vona-module-a-orm 5.1.7 → 5.1.12

package/src/{bean → lib}/bean.model/bean.model_cache.ts

@@ -5,6 +5,7 @@ import { parseFirstWord, toLowerCaseFirstChar } from '@cabloy/word-utils';
 import BigNumber from 'bignumber.js';
 import { cast, deepExtend, disposeInstance } from 'vona';
 
+import type { TypeQueueDoubleDeleteJobData } from '../../bean/queue.doubleDelete.ts';
 import type { ServiceDb } from '../../service/db_.ts';
 import type {
   IDatabaseClientRecord,
@@ -31,7 +32,6 @@ import type {
   TypeModelsClassLikeGeneral,
   TypeModelWhere,
 } from '../../types/index.ts';
-import type { TypeQueueDoubleDeleteJobData } from '../queue.doubleDelete.ts';
 
 import { getTargetColumnName } from '../../common/utils.ts';
 import { getCacheModelsClear } from '../../lib/const.ts';
@@ -860,7 +860,7 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
       if (!fieldName) throw new Error(`invalid magic method: ${prop}`);
       return (fieldValue: any, data: any, options?: any) => {
         const where = __combineMagicWhere(fieldName, op!, fieldValue);
-        if (fieldName === 'id') {
+        if (fieldName === 'id' && where.id !== null) {
           data = Object.assign({}, data, where);
         } else {
           options = deepExtend({}, options, { where });
@@ -879,15 +879,21 @@ export class BeanModelCache<TRecord extends {} = {}> extends BeanModelCrud<TReco
 }
 
 function __combineMagicWhere(fieldName: string, op: string, fieldValue?: any) {
+  if (fieldValue === undefined) {
+    if (op === 'eq') {
+      return {
+        [fieldName]: null,
+      };
+    }
+    throw new Error(`should specify the value for magic method: ${fieldName}/${op}`);
+  }
   return {
     [fieldName]:
-      fieldValue === undefined
-        ? undefined
-        : op === 'eq'
-          ? fieldValue
-          : {
-              [`_${op}_`]: fieldValue,
-            },
+      op === 'eq'
+        ? fieldValue
+        : {
+            [`_${op}_`]: fieldValue,
+          },
   };
 }
 

package/src/{bean → lib}/bean.model/bean.model_meta.ts

@@ -15,7 +15,7 @@ import type {
   TypeModelOptionsTable,
   TypeModelRelationOptionsMetaClient,
 } from '../../types/index.ts';
-import type { BeanModel } from '../bean.model.ts';
+import type { BeanModel } from '../../bean/bean.model.ts';
 
 import { getTableOrTableAlias, prepareClassModel } from '../../common/utils.ts';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from '../../types/index.ts';

package/src/{bean → lib}/bean.model/bean.model_utils.ts

@@ -319,7 +319,7 @@ export class BeanModelUtils<TRecord extends {}> extends BeanModelMeta<TRecord> {
   protected _ellipsis‌Logger(str: string) {
     const maxLength = this.scopeOrm.config.logger.maxLength;
     if (str.length > maxLength) {
-      str = str.substring(0, maxLength) + ' ...';
+      str = `${str.substring(0, maxLength)} ...`;
     }
     return str;
   }

package/src/{bean → lib}/bean.modelBase.ts

@@ -1,8 +1,3 @@
-import { Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
-
 import { BeanModelCache } from './bean.model/bean.model_cache.ts';
 
-@Bean()
-@Virtual()
 export class BeanModelBase<TRecord extends {} = any> extends BeanModelCache<TRecord> {}

package/src/lib/dto/dtoAggregate.ts

@@ -4,7 +4,7 @@ import { ensureArray } from '@cabloy/utils';
 import { Api, v } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { TypeDtoAggrResult } from '../../types/dto/dtoAggregate.ts';
 import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';

package/src/lib/dto/dtoCreate.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 

package/src/lib/dto/dtoGet.ts

@@ -12,7 +12,7 @@ import {
 } from 'vona-module-a-openapiutils';
 import z from 'zod';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoGetParams, TypeDtoGetResult } from '../../types/dto/dtoGet.ts';
 import type { TypeDtoMutateType } from '../../types/dto/dtoMutate.ts';
 import type { IModelRelationIncludeWrapper } from '../../types/model.ts';

package/src/lib/dto/dtoGroup.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { ensureArray } from '@cabloy/utils';
 import { PickClassInner } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { TypeDtoGroupResult } from '../../types/dto/dtoGroup.ts';
 import type { TypeModelSelectAggrParamsAggrs } from '../../types/modelAggr.ts';
 import type { TypeModelColumnsStrict } from '../../types/modelWhere.ts';

package/src/lib/dto/dtoMutate.ts

@@ -3,7 +3,7 @@ import type { Constructable } from 'vona';
 import { mutate } from 'mutate-on-copy';
 import { $Class } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type {
   IDtoMutateParams,
   TypeDtoMutateResult,

package/src/lib/dto/dtoSelectAndCount.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoGetParams } from '../../types/dto/dtoGet.ts';
 import type { TypeDtoSelectAndCountResult } from '../../types/dto/dtoSelectAndCount.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';

package/src/lib/dto/dtoUpdate.ts

@@ -1,6 +1,6 @@
 import type { Constructable } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../bean.model/bean.model_meta.ts';
 import type { IDtoMutateParams, TypeDtoMutateResult } from '../../types/dto/dtoMutate.ts';
 import type { IModelClassRecord } from '../../types/onion/model.ts';
 

package/src/lib/index.ts

@@ -3,6 +3,7 @@ export * from './databaseDialect.ts';
 export * from './dto/index.ts';
 export * from './entity.ts';
 export * from './model.ts';
+export * from './bean.modelBase.ts';
 export * from './relations.ts';
 export * from './relationsDynamic.ts';
 export * from './relationsMutate.ts';

package/src/lib/modelCacheBase.ts

@@ -1,8 +1,8 @@
-import type { BeanSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
+import type { ServiceSummerCacheBase, IDecoratorSummerCacheOptions } from 'vona-module-a-summer';
 
 import { BeanBase, deepExtend } from 'vona';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from './bean.model/bean.model_cache.ts';
 import type { TypeModelCacheType } from '../types/model.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
@@ -25,7 +25,7 @@ export class ModelCacheBase extends BeanBase {
     return this.$scope.orm;
   }
 
-  public getInstance(table: keyof ITableRecord): BeanSummerCacheBase {
+  public getInstance(table: keyof ITableRecord): ServiceSummerCacheBase {
     if (this.options === false) throw new Error('cache disabled');
     const beanFullName = this._model.$beanFullName;
     const cacheName = this.getName(table);

package/src/lib/relations.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

package/src/lib/relationsDynamic.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

package/src/lib/relationsMutate.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type {
   TypeModelClassLike,

package/src/lib/relationsStatic.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from './bean.model/bean.model_meta.ts';
 import type { TypeModelsClassLikeGeneral } from '../types/relations.ts';
 import type {
   IModelRelationOptionsManyDynamic,

package/src/service/cacheEntity_.ts

@@ -2,7 +2,7 @@ import type { TableIdentity } from 'table-identity';
 
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';

package/src/service/cacheQuery_.ts

@@ -1,6 +1,6 @@
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
 
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';

package/src/service/database.ts

@@ -2,7 +2,7 @@ import { isNil } from '@cabloy/utils';
 import { appResource, BeanBase, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanDatabaseDialectBase } from '../bean/bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type {
   IDatabaseClientDialectRecord,
@@ -61,7 +61,7 @@ export class ServiceDatabase extends BeanBase {
 
   prepareClientNameSelector(
     dbInfo: IDbInfo,
-    dialect: BeanDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
+    dialect: ServiceDatabaseDialectBase | keyof IDatabaseClientDialectRecord,
   ) {
     const dialect2 = typeof dialect === 'string' ? this.bean.database.getDialect(dialect) : dialect;
     if (!dialect2.capabilities.level) return dbInfo.clientName;

package/src/{bean/bean.databaseDialectBase.ts → service/databaseDialectBase_.ts}

@@ -3,7 +3,7 @@ import type { TableIdentity } from 'table-identity';
 
 import { isNil, safeBoolean } from '@cabloy/utils';
 import { BeanBase, Virtual } from 'vona';
-import { Bean } from 'vona-module-a-bean';
+import { Service } from 'vona-module-a-bean';
 
 import type { ITableColumn } from '../types/columns.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
@@ -14,9 +14,22 @@ import type {
   TypeDatabaseDialectTableColumnsFn,
 } from '../types/dialect.ts';
 
-@Bean()
+const BOOLEAN_COLUMN_TYPES = ['bit', 'bool', 'boolean'];
+const NUMBER_COLUMN_TYPES = ['int'];
+const TIMESTAMP_COLUMN_TYPE_PREFIXES = ['timestamp'];
+const FLOAT_COLUMN_TYPE_PREFIXES = ['float', 'double'];
+const INTEGER_COLUMN_TYPE_PREFIXES = [
+  'tinyint',
+  'smallint',
+  'mediumint',
+  'bigint',
+  'numeric',
+  'integer',
+];
+
+@Service()
 @Virtual()
-export class BeanDatabaseDialectBase extends BeanBase {
+export class ServiceDatabaseDialectBase extends BeanBase {
   protected _capabilities?: IDatabaseDialectCapabilities;
   protected _configBase?: Partial<ConfigDatabaseClient>;
 
@@ -75,11 +88,8 @@ export class BeanDatabaseDialectBase extends BeanBase {
   }
 
   coerceColumn(column: Knex.ColumnInfo): ITableColumn {
-    // result
     const result = { type: column.type } as ITableColumn;
-    // coerce
     result.default = this._coerceColumnValue(column.type, column.defaultValue);
-    // ok
     return result;
   }
 
@@ -111,22 +121,22 @@ export class BeanDatabaseDialectBase extends BeanBase {
     datas: any[],
   ): Promise<[TableIdentity[], Knex.QueryBuilder]> {
     if (datas.length === 0) return [[], builder];
-    if (isNil(datas[0].id)) {
-      let builderFirst: Knex.QueryBuilder | undefined = undefined;
-      const ids: TableIdentity[] = [];
-      for (const data of datas) {
-        const builder2 = builder.clone();
-        builder2.insert(data);
-        const items = await builder2;
-        ids.push(items[0]);
-        if (!builderFirst) builderFirst = builder2;
-      }
-      return [ids, builderFirst ?? builder];
-    } else {
+    if (!isNil(datas[0].id)) {
       builder.insert(datas);
       await builder;
       return [datas.map(item => item.id), builder];
     }
+
+    let builderFirst: Knex.QueryBuilder | undefined = undefined;
+    const ids: TableIdentity[] = [];
+    for (const data of datas) {
+      const builder2 = builder.clone();
+      builder2.insert(data);
+      const items = await builder2;
+      ids.push(items[0]);
+      if (!builderFirst) builderFirst = builder2;
+    }
+    return [ids, builderFirst ?? builder];
   }
 
   protected async insertAsPg(
@@ -134,41 +144,28 @@ export class BeanDatabaseDialectBase extends BeanBase {
     datas: any[],
   ): Promise<[TableIdentity[], Knex.QueryBuilder]> {
     if (datas.length === 0) return [[], builder];
-    if (isNil(datas[0].id)) {
-      builder.insert(datas).returning('id');
-      const items = await builder;
-      return [items.map(item => item.id), builder];
-    } else {
+    if (!isNil(datas[0].id)) {
       builder.insert(datas);
       await builder;
       return [datas.map(item => item.id), builder];
     }
+
+    builder.insert(datas).returning('id');
+    const items = await builder;
+    return [items.map(item => item.id), builder];
   }
 
   protected _coerceColumnValue(type: string, value) {
-    // null
     if (isNil(value)) return undefined;
-    // type
-    if (['bit', 'bool', 'boolean'].includes(type)) return safeBoolean(value);
-    if (['int'].includes(type)) return this._safeNumber(value);
-    if (this._columnTypePrefixes(type, ['timestamp']) && value === 'CURRENT_TIMESTAMP')
+    if (BOOLEAN_COLUMN_TYPES.includes(type)) return safeBoolean(value);
+    if (NUMBER_COLUMN_TYPES.includes(type)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, TIMESTAMP_COLUMN_TYPE_PREFIXES) && value === 'CURRENT_TIMESTAMP') {
       return undefined; // new Date();
-    if (this._columnTypePrefixes(type, ['float', 'double'])) return this._safeNumber(value);
-    if (
-      this._columnTypePrefixes(type, [
-        'tinyint',
-        'smallint',
-        'mediumint',
-        'bigint',
-        'numeric',
-        'integer',
-      ])
-    ) {
-      return this._safeNumber(value);
     }
+    if (this._columnTypePrefixes(type, FLOAT_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
+    if (this._columnTypePrefixes(type, INTEGER_COLUMN_TYPE_PREFIXES)) return this._safeNumber(value);
     // pg: NULL::character varying
     if (value.indexOf('NULL::') === 0) return undefined;
-    // others
     return value;
   }
 

package/src/service/db_.ts

@@ -3,7 +3,7 @@ import type { FunctionAny } from 'vona';
 import { BeanBase } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanDatabaseDialectBase } from '../bean/bean.databaseDialectBase.ts';
+import type { ServiceDatabaseDialectBase } from './databaseDialectBase_.ts';
 import type { IDatabaseClientDialectRecord, IDbInfo } from '../types/database.ts';
 import type { ITransactionConsistencyCommitOptions } from '../types/transaction.ts';
 import type { ServiceDatabaseClient } from './databaseClient_.ts';
@@ -63,7 +63,7 @@ export class ServiceDb extends BeanBase {
     return this.client.clientConfig.client;
   }
 
-  get dialect(): BeanDatabaseDialectBase {
+  get dialect(): ServiceDatabaseDialectBase {
     return this.bean.database.getDialect(this.dialectName);
   }
 

package/src/service/relations_.ts

@@ -4,9 +4,9 @@ import { isNil } from '@cabloy/utils';
 import { BeanBase, cast, deepExtend } from 'vona';
 import { Service } from 'vona-module-a-bean';
 
-import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
-import type { BeanModelCrud } from '../bean/bean.model/bean.model_crud.ts';
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelCache } from '../lib/bean.model/bean.model_cache.ts';
+import type { BeanModelCrud } from '../lib/bean.model/bean.model_crud.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelMethodOptions, IModelRelationIncludeWrapper } from '../types/model.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 import type { TypeModelClassLike } from '../types/relations.ts';

package/src/types/database.ts

@@ -1,6 +1,5 @@
 import type { FunctionAny } from 'vona';
 
-import type { BeanModel } from '../bean/bean.model.ts';
 import type { ServiceDb } from '../service/db_.ts';
 import type { ConfigDatabase } from './config.ts';
 
@@ -28,10 +27,6 @@ export interface IDatabaseSwitchOptions {
 }
 
 declare module 'vona' {
-  export interface IBeanRecordGlobal {
-    model: BeanModel;
-  }
-
   export interface VonaConfig {
     database: ConfigDatabase;
   }

package/src/types/dto/dtoGet.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumns } from '../modelWhere.ts';
 import type { IModelClassRecord } from '../onion/model.ts';

package/src/types/dto/dtoMutate.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { OmitNever, TypeOmitStringUnion } from 'vona';
 
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumnsStrict } from '../modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../onion/model.ts';

package/src/types/dto/dtoSelectAndCount.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../../lib/bean.model/bean.model_meta.ts';
 import type { IModelClassRecord } from '../onion/model.ts';
 import type { TypeDtoGetResult } from './dtoGet.ts';
 

package/src/types/model.ts

@@ -1,7 +1,7 @@
 import type { Knex } from 'knex';
 import type { TSummerCacheActionOptions } from 'vona-module-a-summer';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   TypeModelColumn,
   TypeModelColumns,

package/src/types/modelAggr.ts

@@ -1,6 +1,6 @@
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumns, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/src/types/modelCount.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelColumn, TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/src/types/modelGeneral.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   IModelRelationIncludeWrapper,
   IModelSelectParamsJoin,

package/src/types/modelGroup.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin, IModelSelectParamsOrder } from './model.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';
 import type { TypeModelColumnsStrict, TypeModelWhere } from './modelWhere.ts';

package/src/types/modelIncrement.ts

@@ -1,6 +1,6 @@
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelSelectParamsJoin } from './model.ts';
 import type { TypeModelWhere } from './modelWhere.ts';
 import type { TypeModelsClassLikeGeneral } from './relations.ts';

package/src/types/modelWhere.ts

@@ -33,7 +33,7 @@ export const OpNormal = {
   ref: '_ref_',
 } as const;
 export const Op = {
-  skip: '_skip_',
+  omit: undefined,
   ...OpJoint,
   ...OpNormal,
 } as const;
@@ -57,7 +57,7 @@ export type TypeModelColumnValue<TRecord, Column> =
   | Column
   | Column[]
   | null
-  | '_skip_';
+  | typeof Op.omit;
 
 export type TypeModelWhere<TRecord, Columns extends {} | undefined = undefined> = Columns extends {}
   ? TypeModelWhereInner<Columns>

package/src/types/relations.ts

@@ -1,6 +1,6 @@
 import type { Constructable, OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { TypeDepthPrev, TypeDepthPrevMax } from './depth.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from './onion/model.ts';
 import type {

package/src/types/relationsColumns.ts

@@ -1,6 +1,6 @@
 import type { TypeConfirmArray, TypeRecordValues } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type {
   TypeModelOfModelLike,

package/src/types/relationsDef.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { ServiceDb } from '../service/db_.ts';
 import type { IDatabaseClientRecord } from './database.ts';
 import type { TypeModelSelectAggrParamsAggrs } from './modelAggr.ts';

package/src/types/relationsDefDynamic.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type {
   IModelRelationIncludeWrapper,
   IModelSelectParamsJoin,

package/src/types/relationsDefMutate.ts

@@ -1,4 +1,4 @@
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IModelRelationIncludeWrapper } from './model.ts';
 import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
 

package/src/types/relationsMutate.ts

@@ -1,7 +1,7 @@
 import type { TableIdentity } from 'table-identity';
 import type { OmitNever } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type {
   TypeUtilGetModelOptions,

package/src/types/relationsTables.ts

@@ -1,6 +1,6 @@
 import type { TypeConfirmArray, TypeRecordValues } from 'vona';
 
-import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
+import type { BeanModelMeta } from '../lib/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type {
   TypeModelOfModelLike,

package/dist/bean/bean.databaseDialectBase.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bean.databaseDialectBase.d.ts","sourceRoot":"","sources":["../../src/bean/bean.databaseDialectBase.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAGpD,OAAO,EAAE,QAAQ,EAAW,MAAM,MAAM,CAAC;AAGzC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EACV,4BAA4B,EAC5B,yBAAyB,EACzB,uBAAuB,EACvB,iCAAiC,EAClC,MAAM,qBAAqB,CAAC;AAE7B,qBAEa,uBAAwB,SAAQ,QAAQ;IACnD,SAAS,CAAC,aAAa,CAAC,EAAE,4BAA4B,CAAC;IACvD,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC;IAEtD,IAAI,YAAY,iCAGf;IAED,IAAI,UAAU,8CAEb;IAEK,cAAc,CAClB,cAAc,EAAE,IAAI,CAAC,aAAa,EAClC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,yBAAyB,EAAE,CAAC;IAIjC,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAI1F,YAAY,CAAC,cAAc,EAAE,IAAI,CAAC,aAAa,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAItF,YAAY,CAChB,cAAc,EAAE,IAAI,CAAC,aAAa,EAClC,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAI/B,MAAM,CACV,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,MAAM,EAAE,GAAG,EAAE,GACZ,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAI1C,MAAM,CACV,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,GAAG,EAAE,iCAAiC,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC;IAIjB,KAAK,CAAC,OAAO,KAAA;IAIP,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIvF,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,GAAG,YAAY;cASnC,eAAe,CAC7B,QAAQ,EAAE,IAAI,CAAC,YAAY,EAC3B,KAAK,EAAE,GAAG,EAAE,EACZ,EAAE,EAAE,iCAAiC,GACpC,OAAO,CAAC,GAAG,EAAE,CAAC;cAmBD,aAAa,CAC3B,OAAO,EAAE,IAAI,CAAC,YAAY,EAC1B,KAAK,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;cAoBhC,UAAU,CACxB,OAAO,EAAE,IAAI,CAAC,YAAY,EAC1B,KAAK,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;IAahD,SAAS,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,KAAA;IA4BhD,SAAS,CAAC,WAAW,CAAC,KAAK,KAAA;IAK3B,SAAS,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE;CAG/D"}

package/dist/bean/bean.model/bean.model_cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bean.model_cache.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_cache.ts"],"names":[],"mappings":"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"}

package/dist/bean/bean.model/bean.model_crud.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bean.model_crud.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_crud.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,0BAA0B,EAC1B,kBAAkB,EAClB,0BAA0B,EAC1B,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,qBAAa,aAAa,CAAC,OAAO,SAAS,EAAE,GAAG,EAAE,CAAE,SAAQ,kBAAkB,CAAC,OAAO,CAAC;IAC/E,IAAI,CACR,GAAG,EAAE,aAAa,EAAE,EACpB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAIxB,MAAM,CACV,MAAM,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,EACpC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAIxB,GAAG,CACP,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;IAIlC,KAAK,CACT,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAIxB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,0BAA0B,GAAG,OAAO,CAAC,OAAO,CAAC;IAIvF,UAAU,CACd,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,EACxB,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,EAAE,CAAC;IAIf,MAAM,CACV,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAItB,MAAM,CACV,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;CAGjB"}

package/dist/bean/bean.model/bean.model_crud_inner.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"bean.model_crud_inner.d.ts","sourceRoot":"","sources":["../../../src/bean/bean.model/bean.model_crud_inner.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAKpD,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,EACrB,0BAA0B,EAC1B,yBAAyB,EACzB,kBAAkB,EAClB,0BAA0B,EAC1B,YAAY,EACZ,cAAc,EACf,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,qBAAa,kBAAkB,CAAC,OAAO,SAAS,EAAE,CAAE,SAAQ,aAAa,CAAC,OAAO,CAAC;cAChE,KAAK,CACnB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,EAAE,CAAC;cAML,cAAc,CAC5B,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,GAAG,CAAC,EAAE,aAAa,EAAE,EACrB,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC;cA8BnB,OAAO,CAAC,CAAC,SAAS,kBAAkB,CAAC,OAAO,CAAC,EAC3D,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B,EACpC,OAAO,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,GAC9C,OAAO,CAAC,OAAO,EAAE,CAAC;IAoBrB,SAAS,CAAC,mBAAmB,CAAC,CAAC,SAAS,yBAAyB,CAAC,OAAO,CAAC,EACxE,KAAK,EAAE,MAAM,YAAY,EACzB,MAAM,CAAC,EAAE,CAAC,EACV,OAAO,CAAC,EAAE,0BAA0B;cA4BtB,IAAI,CAClB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,EAC9B,OAAO,CAAC,EAAE,uBAAuB,CAAC,OAAO,CAAC,GACzC,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;cAgBf,MAAM,CACpB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,iBAAiB,CAAC,OAAO,CAAC,EACnC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;cAoBd,UAAU,CACxB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,EACvC,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,MAAM,CAAC;cAqBF,WAAW,CACzB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,IAAI,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,EAC5C,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,OAAO,GAAG,OAAO,EAAE,CAAC;cAmDf,OAAO,CACrB,KAAK,EAAE,MAAM,YAAY,GAAG,SAAS,EACrC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,EACtB,OAAO,CAAC,EAAE,0BAA0B,CAAC,OAAO,CAAC,GAC5C,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;cAqCZ,OAAO,CACrB,KAAK,CAAC,EAAE,MAAM,YAAY,EAC1B,KAAK,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,EAC/B,OAAO,CAAC,EAAE,0BAA0B,GACnC,OAAO,CAAC,IAAI,CAAC;CAsBjB"}