vona-module-a-orm 5.0.89 → 5.0.91

package/cli/entity/metadata/generate.ts

@@ -13,7 +13,7 @@ export default async function (options: IMetadataCustomGenerateOptions): Promise
     const tableName = __parseTableName(fileContent);
     contentColumns.push(`export type ${className}TableName = '${tableName}';`);
     contentEntityMetas.push(`export type ${className}Meta=TypeEntityMeta<${className},${className}TableName>;`);
-    const contentRecordItem = `'${tableName}': never;`;
+    const contentRecordItem = `'${tableName}': ${className}Meta;`;
     if (!contentRecords.includes(contentRecordItem)) {
       contentRecords.push(contentRecordItem);
     }

package/dist/index.js

@@ -3,12 +3,12 @@ import { BeanInfo, BeanAopMethodBase, BeanBase, deepExtend, appResource, beanFul
 import { AopMethod } from 'vona-module-a-aspect';
 import { Service, Bean, Scope } from 'vona-module-a-bean';
 import { AsyncLocalStorage, AsyncResource } from 'node:async_hooks';
-import { isNil, catchError, safeBoolean, isClass, ensureArray, hashkey } from '@cabloy/utils';
+import { isNil, catchError, safeBoolean, ensureArray, hashkey } from '@cabloy/utils';
 import knex from 'knex';
 import { BeanMutateBase } from 'vona-module-a-beanmutate';
 import { swapDeps } from '@cabloy/deps';
-import { prepareClassType, getTargetDecoratorRules, getTargetDecoratorRuleColumnsMap, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
-import { ZodMetadata } from '@cabloy/zod-openapi';
+import { $tableNameFromEntity, $tableDefaults, $columnsAll } from 'vona-module-a-ormutils';
+import { prepareClassType, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
 import z from 'zod';
 import { parseFirstWord, toLowerCaseFirstChar } from '@cabloy/word-utils';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
@@ -679,7 +679,7 @@ let ServiceDatabaseClient = (_dec$l = Service(), _dec2$l = BeanInfo({
     // config: inited by bean.database.getClient
     this.clientConfig = clientConfig;
     // knex
-    this._knex = knex(this.clientConfig);
+    this._knex = knex(deepExtend({}, this.clientConfig));
   }
   async __close() {
     if (this._knex) {
@@ -1148,11 +1148,11 @@ function _buildWhereColumnOpNormal(having, db, builder, column, value, op) {
   } else if (op === Op.notBetween) {
     builder[having ? 'havingNotBetween' : 'whereNotBetween'](column, value);
   } else if (op === Op.startsWith) {
-    builder[having ? 'havingLike' : 'whereLike'](column, `${value}%`);
+    builder[_getOpLikeReal(having, db)](column, `${value}%`);
   } else if (op === Op.endsWith) {
-    builder[having ? 'havingLike' : 'whereLike'](column, `%${value}`);
+    builder[_getOpLikeReal(having, db)](column, `%${value}`);
   } else if (op === Op.includes) {
-    builder[having ? 'havingLike' : 'whereLike'](column, `%${value}%`);
+    builder[_getOpLikeReal(having, db)](column, `%${value}%`);
   } else if (op === Op.startsWithI) {
     builder[_getOpILikeReal(having, db)](column, `${value}%`);
   } else if (op === Op.endsWithI) {
@@ -1163,6 +1163,9 @@ function _buildWhereColumnOpNormal(having, db, builder, column, value, op) {
     builder[having ? 'having' : 'where'](column, '=', db.connection.ref(value));
   }
 }
+function _getOpLikeReal(having, db) {
+  return db.dialect.capabilities.like ? having ? 'havingLike' : 'whereLike' : having ? 'havingILike' : 'whereILike';
+}
 function _getOpILikeReal(having, db) {
   return db.dialect.capabilities.ilike ? having ? 'havingILike' : 'whereILike' : having ? 'havingLike' : 'whereLike';
 }
@@ -1187,83 +1190,6 @@ function _safeColumn(column) {
   return column.replace(/[\\.#%'"`;,() ]/g, '');
 }
 
-function $column(key) {
-  return key;
-}
-function $columns(key) {
-  return key;
-}
-function $columnsAll(classEntity, withTableName, withMeta) {
-  const classEntity2 = _prepareClassEntity(classEntity);
-  let columns = getTargetDecoratorRuleColumnsMap(classEntity2.prototype);
-  if (withTableName) {
-    const tableName = $tableName(classEntity2);
-    columns = {
-      ...columns,
-      $table: tableName
-    };
-  }
-  if (withMeta) {
-    const comments = $tableComments(classEntity2);
-    const defaults = $tableDefaults(classEntity2);
-    columns = {
-      ...columns,
-      $comment: comments,
-      $default: defaults
-    };
-  }
-  return columns;
-}
-function $tableColumns(classEntity, key) {
-  // tableName
-  const tableName = $tableName(classEntity);
-  return {
-    [tableName]: key
-  };
-}
-function $tableName(classEntity) {
-  const beanOptionsEntity = appResource.getBean(_prepareClassEntity(classEntity));
-  const entityOptions = beanOptionsEntity?.options;
-  return entityOptions.table;
-}
-function $tableComments(classEntity) {
-  const app = useApp();
-  const classEntity2 = _prepareClassEntity(classEntity);
-  // rules
-  const rules = getTargetDecoratorRules(classEntity2.prototype);
-  const comments = {};
-  for (const key in rules) {
-    const rule = rules[key];
-    const metadata = ZodMetadata.getOpenapiMetadata(rule);
-    const comment = metadata?.description || metadata?.title;
-    comments[key] = comment ? app.meta.text(comment) : '';
-  }
-  // table comment
-  const beanOptions = appResource.getBean(classEntity2);
-  if (beanOptions) {
-    const openapi = cast(beanOptions.options)?.openapi;
-    const comment = openapi?.description || openapi?.title;
-    cast(comments).$table = comment ? app.meta.text(comment) : '';
-  }
-  // ok
-  return comments;
-}
-function $tableDefaults(classEntity) {
-  const classEntity2 = _prepareClassEntity(classEntity);
-  // rules
-  const rules = getTargetDecoratorRules(classEntity2.prototype);
-  const defaults = {};
-  for (const key in rules) {
-    const rule = rules[key];
-    defaults[key] = ZodMetadata.getDefaultValue(rule);
-  }
-  // ok
-  return defaults;
-}
-function _prepareClassEntity(classEntity) {
-  return isClass(classEntity) ? classEntity : cast(classEntity)();
-}
-
 function _applyDecoratedDescriptor(i, e, r, n, l) {
   var a = {};
   return Object.keys(n).forEach(function (i) {
@@ -1514,7 +1440,7 @@ class BeanModelMeta extends BeanBase {
   _getTable(where) {
     const table = this[SymbolModelTable] ?? this.options.table;
     if (table && typeof table === 'string') return table;
-    const defaultTable = this.options.entity && $tableName(this.options.entity);
+    const defaultTable = this.options.entity && $tableNameFromEntity(this.options.entity);
     if (table && typeof table === 'function') {
       return table(this.ctx, where, defaultTable, this);
     }
@@ -2789,10 +2715,13 @@ let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
           if (!isNil(item?.id) && !isNil(entity[relationName].id) && item?.id !== entity[relationName].id) {
             throw new Error(`invalid id: ${entity[relationName].id}`);
           }
-          children.push(Object.assign({}, entity[relationName], {
-            [key]: cast(entity).id,
-            id: item?.id
-          }));
+          const dataNew = {
+            [key]: cast(entity).id
+          };
+          if (!isNil(item?.id)) {
+            dataNew.id = item.id;
+          }
+          children.push(Object.assign({}, entity[relationName], dataNew));
         }
       }
       children = await modelTarget.mutateBulk(children, methodOptionsReal);
@@ -4485,4 +4414,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, HmrModel, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolCacheModelCacheInstances, SymbolCacheModelsClear, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, clearAllCacheModelsClear, clearCacheModelCacheInstance, config, configDefault, errors, getCacheModelCacheInstances, getCacheModelsClear, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isRaw, isRef, locales, prepareClassModel, prepareColumns };
+export { $Dto, $locale, $relation, $relationDynamic, $relationMutate, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, HmrModel, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolCacheModelCacheInstances, SymbolCacheModelsClear, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, clearAllCacheModelsClear, clearCacheModelCacheInstance, config, configDefault, errors, getCacheModelCacheInstances, getCacheModelsClear, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/dist/lib/index.d.ts

@@ -1,4 +1,3 @@
-export * from './columns.ts';
 export * from './const.ts';
 export * from './databaseDialect.ts';
 export * from './dto/index.ts';

package/dist/types/dialect.d.ts

@@ -7,6 +7,7 @@ export interface IFetchIndexesResultItem {
 }
 export type TypeDatabaseDialectTableColumnsFn = () => Promise<ITableColumns>;
 export interface IDatabaseDialectCapabilities {
+    like: boolean;
     ilike: boolean;
     level: boolean;
 }

package/dist/types/entity.d.ts

@@ -1,3 +1,4 @@
+import type { PickString } from 'vona';
 export type TypeEntityMeta<T, N = string> = Required<{
     [key in keyof T]: key;
 }> & {
@@ -13,3 +14,5 @@ export type TypeEntityMeta<T, N = string> = Required<{
 };
 export declare const SymbolKeyFieldsMore: unique symbol;
 export type TypeSymbolKeyFieldsMore = typeof SymbolKeyFieldsMore;
+export type TypeEntityStudentMetaSimple<T> = Omit<T, '$table' | '$comment' | '$default'>;
+export type TypeEntityStudentMetaSimpleColumns<T> = PickString<keyof TypeEntityStudentMetaSimple<T>>;

package/dist-cli/entity/metadata/generate.js

@@ -11,7 +11,7 @@ export default async function (options) {
         const tableName = __parseTableName(fileContent);
         contentColumns.push(`export type ${className}TableName = '${tableName}';`);
         contentEntityMetas.push(`export type ${className}Meta=TypeEntityMeta<${className},${className}TableName>;`);
-        const contentRecordItem = `'${tableName}': never;`;
+        const contentRecordItem = `'${tableName}': ${className}Meta;`;
         if (!contentRecords.includes(contentRecordItem)) {
             contentRecords.push(contentRecordItem);
         }

package/package.json

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

package/dist/lib/columns.d.ts

@@ -1,9 +0,0 @@
-import type { Constructable } from 'vona';
-import type { ITableRecord, TypeEntityMeta } from '../types/index.ts';
-export declare function $column<T>(key: keyof T): keyof T;
-export declare function $columns<T>(key?: (keyof T) | Array<keyof T> | undefined): (keyof T) | Array<keyof T> | undefined;
-export declare function $columnsAll<T, TableName extends boolean, Meta extends boolean>(classEntity: (() => Constructable<T>) | Constructable<T>, withTableName?: TableName, withMeta?: Meta): TableName extends true ? (Meta extends true ? TypeEntityMeta<T> : Omit<TypeEntityMeta<T>, '$comment' | '$default'>) : (Meta extends true ? Omit<TypeEntityMeta<T>, '$table'> : Omit<TypeEntityMeta<T>, '$table' | '$comment' | '$default'>);
-export declare function $tableColumns<T>(classEntity: (() => Constructable<T>) | Constructable<T>, key?: (keyof T) | Array<keyof T> | undefined): Record<keyof ITableRecord, (keyof T) | Array<keyof T> | undefined>;
-export declare function $tableName<T>(classEntity: (() => Constructable<T>) | Constructable<T>): keyof ITableRecord;
-export declare function $tableComments<T>(classEntity: (() => Constructable<T>) | Constructable<T>): Record<string, string>;
-export declare function $tableDefaults<T>(classEntity: (() => Constructable<T>) | Constructable<T>): Record<string, any>;

package/dist-cli/entity/metadata/generate.d.ts

@@ -1,2 +0,0 @@
-import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
-export default function (options: IMetadataCustomGenerateOptions): Promise<string>;

package/dist-cli/model/metadata/generate.d.ts

@@ -1,2 +0,0 @@
-import type { IMetadataCustomGenerateOptions } from '@cabloy/cli';
-export default function (options: IMetadataCustomGenerateOptions): Promise<string>;

package/dist-cli/model/metadata/magic.d.ts

@@ -1,4 +0,0 @@
-import type { BeanCliBase } from '@cabloy/cli';
-import type { IGlobBeanFile } from '@cabloy/module-info';
-import type GoGoCode from 'gogocode';
-export declare function __parseMagics(cli: BeanCliBase, ast: GoGoCode.GoGoAST, globFile: IGlobBeanFile, entityName: string): string[];