vona-module-a-orm 5.0.50 → 5.0.51

package/cli/model/metadata/generate.ts

@@ -53,7 +53,7 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
   if (contentRelations.length === 0 && contentRecords.length === 0 && contentModels.length === 0) return '';
   // combine
   const content = `/** ${sceneName}: begin */
-import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TableIdentity, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
+import type { IModelGetOptions, IModelMethodOptions, IModelSelectParams, TypeModelSelectAndCount, TypeModelRelationResult, TypeModelWhere, IModelInsertOptions, TypeModelMutateRelationData, IModelDeleteOptions, IModelUpdateOptions, IModelMutateOptions, IModelSelectCountParams, IModelSelectAggrParams, TypeModelAggrRelationResult, IModelSelectGroupParams, TypeModelGroupRelationResult } from 'vona-module-a-orm';
 import { SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyModelOptions } from 'vona-module-a-orm';
 declare module 'vona-module-${moduleName}' {
   ${contentRelations.join('\n')}

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

@@ -1,8 +1,8 @@
 import type { Knex } from 'knex';
+import type { TableIdentity } from 'table-identity';
 import type { ITableColumn } from '../types/columns.ts';
 import type { ConfigDatabaseClient } from '../types/config.ts';
 import type { IFetchDatabasesResultItem, IFetchIndexesResultItem } from '../types/dialect.ts';
-import type { TableIdentity } from '../types/tableIdentity.ts';
 import { BeanBase } from 'vona';
 export declare class BeanDatabaseDialectBase extends BeanBase {
     getConfigBase(): ConfigDatabaseClient | undefined;

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

@@ -1,5 +1,6 @@
+import type { TableIdentity } from 'table-identity';
 import type { ServiceDb } from '../../service/db_.ts';
-import type { IDatabaseClientRecord, IModelDeleteOptions, IModelGetOptions, IModelInsertOptions, IModelMethodOptions, IModelMethodOptionsGeneral, IModelMutateOptions, IModelRecord, IModelSelectAggrParams, IModelSelectCountParams, IModelSelectGroupParams, IModelSelectParams, IModelUpdateOptions, ITableRecord, TableIdentity, TypeModelAggrRelationResult, TypeModelClassLikeGeneral, TypeModelGroupRelationResult, TypeModelsClassLikeGeneral, TypeModelWhere } from '../../types/index.ts';
+import type { IDatabaseClientRecord, IModelDeleteOptions, IModelGetOptions, IModelInsertOptions, IModelMethodOptions, IModelMethodOptionsGeneral, IModelMutateOptions, IModelRecord, IModelSelectAggrParams, IModelSelectCountParams, IModelSelectGroupParams, IModelSelectParams, IModelUpdateOptions, ITableRecord, TypeModelAggrRelationResult, TypeModelClassLikeGeneral, TypeModelGroupRelationResult, TypeModelsClassLikeGeneral, TypeModelWhere } from '../../types/index.ts';
 import BigNumber from 'bignumber.js';
 import { ServiceCacheEntity } from '../../service/cacheEntity_.ts';
 import { ServiceCacheQuery } from '../../service/cacheQuery_.ts';

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

@@ -1,5 +1,6 @@
 import type BigNumber from 'bignumber.js';
-import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectParams, IModelUpdateOptionsGeneral, TableIdentity, TypeModelWhere } from '../../types/index.ts';
+import type { TableIdentity } from 'table-identity';
+import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectParams, IModelUpdateOptionsGeneral, TypeModelWhere } from '../../types/index.ts';
 import { BeanModelCrudInner } from './bean.model_crud_inner.ts';
 export declare class BeanModelCrud<TRecord extends {} = {}> extends BeanModelCrudInner<TRecord> {
     mget(ids: TableIdentity[], options?: IModelGetOptionsGeneral<TRecord>): Promise<Partial<TRecord>[]>;

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

@@ -1,6 +1,7 @@
 import type BigNumber from 'bignumber.js';
 import type { Knex } from 'knex';
-import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectGeneralParams, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TableIdentity, TypeModelWhere } from '../../types/index.ts';
+import type { TableIdentity } from 'table-identity';
+import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectGeneralParams, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
 import { BeanModelView } from './bean.model_view.ts';
 export declare class BeanModelCrudInner<TRecord extends {}> extends BeanModelView<TRecord> {
     protected _mget(table?: keyof ITableRecord, ids?: TableIdentity[], options?: IModelGetOptionsGeneral<TRecord>): Promise<TRecord[]>;

package/dist/bean/bean.model/bean.model_crud_table.d.ts

@@ -1,5 +1,6 @@
 import type BigNumber from 'bignumber.js';
-import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TableIdentity, TypeModelWhere } from '../../types/index.ts';
+import type { TableIdentity } from 'table-identity';
+import type { IModelCountParams, IModelGetOptionsGeneral, IModelMethodOptionsGeneral, IModelSelectParams, IModelUpdateOptionsGeneral, ITableRecord, TypeModelWhere } from '../../types/index.ts';
 import { BeanModelCrudInner } from './bean.model_crud_inner.ts';
 export declare class BeanModelCrudTable<TRecord extends {}> extends BeanModelCrudInner<TRecord> {
     mget(table: keyof ITableRecord, ids: TableIdentity[], options?: Omit<IModelGetOptionsGeneral<TRecord>, 'include' | 'with'>): Promise<TRecord[]>;

package/dist/config/config.d.ts

@@ -1,8 +1,8 @@
+import type { TableIdentityType } from 'table-identity';
 import type { TypeBeanRecordGeneralSelectorKeys, VonaApplication } from 'vona';
 import type { IOnionOptionsMeta } from 'vona-module-a-onion';
 import type { TSummerCachePreset } from 'vona-module-a-summer';
 import type { IDatabaseClientDialectRecord } from '../types/database.ts';
-import type { TableIdentityType } from '../types/tableIdentity.ts';
 export type TypeDataBaseConfigDialects = Record<keyof IDatabaseClientDialectRecord, TypeBeanRecordGeneralSelectorKeys<'databaseDialect'>>;
 export declare function config(_app: VonaApplication): {
     rest: {

package/dist/index.js

@@ -10,7 +10,6 @@ import { prepareClassType, getTargetDecoratorRules, Api, v, OrderMaxBase, OrderC
 import { ZodMetadata } from '@cabloy/zod-query';
 import { SymbolDecoratorRuleColumn } from 'vona-module-a-openapiutils';
 import z from 'zod';
-export * from 'table-identity';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Schedule } from 'vona-module-a-schedule';

package/dist/service/cacheEntity_.d.ts

@@ -1,6 +1,6 @@
+import type { TableIdentity } from 'table-identity';
 import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
 import type { ITableRecord } from '../types/onion/table.ts';
-import type { TableIdentity } from '../types/tableIdentity.ts';
 import { ModelCacheBase } from '../lib/modelCacheBase.ts';
 export declare class ServiceCacheEntity extends ModelCacheBase {
     protected __init__(model: BeanModelCache): void;

package/dist/service/relations_.d.ts

@@ -1,6 +1,6 @@
+import type { TableIdentity } from 'table-identity';
 import type { BeanModelCache } from '../bean/bean.model/bean.model_cache.ts';
 import type { IModelMethodOptions, IModelRelationIncludeWrapper } from '../types/model.ts';
-import type { TableIdentity } from '../types/tableIdentity.ts';
 import { BeanBase } from 'vona';
 export declare class ServiceRelations extends BeanBase {
     protected _model: BeanModelCache;

package/dist/types/dto/dtoMutate.d.ts

@@ -1,10 +1,10 @@
+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 { IModelRelationIncludeWrapper } from '../model.ts';
 import type { TypeModelColumnsStrict } from '../modelWhere.ts';
 import type { IDecoratorModelOptions, IModelClassRecord } from '../onion/model.ts';
 import type { TypeModelOfModelLike, TypeSymbolKeyEntity, TypeUtilEntityOmit, TypeUtilEntityPartial, TypeUtilEntitySelector, TypeUtilGetColumnsFromRelationAndIncludeWrapper, TypeUtilGetModelOptions, TypeUtilGetParamsColumns, TypeUtilGetParamsInlcude, TypeUtilGetParamsWith, TypeUtilGetRelationEntity, TypeUtilGetRelationModel, TypeUtilGetRelationOptions, TypeUtilGetRelationOptionsAutoload, TypeUtilGetRelationType, TypeUtilPrepareColumns } from '../relations.ts';
-import type { TableIdentity } from '../tableIdentity.ts';
 export type TypeDtoMutateType = 'create' | 'update' | 'mutate';
 export type IDtoMutateParams<ModelLike extends BeanModelMeta | (keyof IModelClassRecord)> = IBuildDtoMutateParams<TypeModelOfModelLike<ModelLike>[TypeSymbolKeyEntity], TypeModelOfModelLike<ModelLike>>;
 export interface IBuildDtoMutateParams<TRecord, Model extends BeanModelMeta> extends IModelRelationIncludeWrapper<Model>, IBuildDtoMutateParamsBasic<TRecord> {

package/dist/types/entityBase.d.ts

@@ -1,4 +1,4 @@
-import type { TableIdentity } from './tableIdentity.ts';
+import type { TableIdentity } from 'table-identity';
 import { EntityBaseInner } from './entityBaseInner.ts';
 export declare class EntityBase extends EntityBaseInner {
     id: TableIdentity;

package/dist/types/index.d.ts

@@ -26,5 +26,4 @@ export * from './relationsDefMutate.ts';
 export * from './relationsGroup.ts';
 export * from './relationsMutate.ts';
 export * from './relationsTables.ts';
-export * from './tableIdentity.ts';
 export * from './transaction.ts';

package/dist/types/relationsMutate.d.ts

@@ -1,9 +1,9 @@
+import type { TableIdentity } from 'table-identity';
 import type { OmitNever } from 'vona';
 import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { IDecoratorModelOptions } from './onion/model.ts';
 import type { TypeUtilGetModelOptions, TypeUtilGetParamsInlcude, TypeUtilGetParamsWith, TypeUtilGetRelationEntity, TypeUtilGetRelationModel, TypeUtilGetRelationOptions, TypeUtilGetRelationOptionsAutoload, TypeUtilGetRelationType } from './relations.ts';
 import type { IModelRelationOptionsMetaWrapper } from './relationsDef.ts';
-import type { TableIdentity } from './tableIdentity.ts';
 export type TypeModelMutateParamsInclude<MODEL extends BeanModelMeta | undefined> = TypeModelMutateParamsIncludeByModelOptions<TypeUtilGetModelOptions<MODEL>>;
 export type TypeModelMutateParamsIncludeByModelOptions<ModelOptions extends IDecoratorModelOptions | undefined> = ModelOptions extends IDecoratorModelOptions ? {
     [relationName in keyof ModelOptions['relations']]?: TypeModelMutateParamsRelationOptions<ModelOptions['relations'][relationName]>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-orm",
   "type": "module",
-  "version": "5.0.50",
+  "version": "5.0.51",
   "title": "a-orm",
   "vonaModule": {
     "capabilities": {

package/dist/types/tableIdentity.d.ts

@@ -1 +0,0 @@
-export * from 'table-identity';