vona-module-a-orm 5.0.44 → 5.0.46

package/dist/common/utils.d.ts

@@ -3,6 +3,7 @@ import type { BeanModelMeta } from '../bean/bean.model/bean.model_meta.ts';
 import type { TypeModelColumn, TypeModelColumns } from '../types/modelWhere.ts';
 import type { IModelClassRecord } from '../types/onion/model.ts';
 export declare function isRaw(raw: any): boolean;
+export declare function isRef(ref: any): boolean;
 export declare function getTableOrTableAlias(table: string): string;
 export declare function getTargetColumnName(column: string): string;
 export declare function prepareColumns<TRecord>(columns?: TypeModelColumns<TRecord>): Array<TypeModelColumn<TRecord>> | undefined;

package/dist/index.js

@@ -846,6 +846,9 @@ const OpValues = Object.values(Op);
 function isRaw(raw) {
   return typeof raw?.constructor === 'function' && raw?.constructor?.name === 'Raw';
 }
+function isRef(ref) {
+  return typeof ref?.constructor === 'function' && ref?.constructor?.name === 'Ref';
+}
 function getTableOrTableAlias(table) {
   const _table = table.toString();
   return _table.includes(' as ') ? _table.split(' as ')[1].trim() : _table;
@@ -985,7 +988,7 @@ function _buildWhereColumn(having, knex, builder, column, value, op) {
     return;
   }
   // raw
-  if (isRaw(value)) {
+  if (isRaw(value) || isRef(value)) {
     _buildWhereColumnOpNormal(having, knex, builder, column, value, op ?? Op.eq);
     return;
   }
@@ -1948,6 +1951,9 @@ class BeanModelCrudInner extends BeanModelView {
       const dataTemp2 = this._prepareInsertDataByOptions(table, dataTemp, options);
       // then
       const [dataNew, dataNewOriginal] = await this.prepareData(table, dataTemp2);
+      if (isNil(cast(dataNewOriginal).id) && Object.prototype.hasOwnProperty.call(dataNewOriginal, 'id')) {
+        delete cast(dataNewOriginal).id;
+      }
       datas.push(dataNew);
       datasOriginal.push(dataNewOriginal);
     }
@@ -2494,7 +2500,7 @@ let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
       for (let index = 0; index < entities.length; index++) {
         const entity = entities[index];
         if (entity[relationName]) {
-          // donot checkif has id of entity[relationName], for safety
+          // donot check if has id of entity[relationName], for safety
           const item = await modelTarget.get({
             [key]: cast(entity).id
           });
@@ -2527,13 +2533,18 @@ let ServiceRelations = (_dec$a = Service(), _dec2$a = BeanInfo({
         if (entity[relationName] && entity[relationName].length > 0) {
           const entityId = cast(entity).id;
           const idsTo = entity[relationName].map(item => item.id).filter(id => !isNil(id));
-          const itemsTarget = await cast(modelTarget).__select_raw(undefined, {
-            where: {
-              [key]: entityId,
-              id: idsTo
-            }
-          }, methodOptionsReal);
-          const idsTarget = itemsTarget.map(item => item.id);
+          let idsTarget;
+          if (idsTo.length === 0) {
+            idsTarget = [];
+          } else {
+            const itemsTarget = await cast(modelTarget).__select_raw(undefined, {
+              where: {
+                [key]: entityId,
+                id: idsTo
+              }
+            }, methodOptionsReal);
+            idsTarget = itemsTarget.map(item => item.id);
+          }
           for (const child of entity[relationName]) {
             if (!isNil(child.id) && !idsTarget.includes(child.id)) {
               throw new Error(`invalid id: ${child.id}`);
@@ -4117,4 +4128,4 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, locales, prepareClassModel, prepareColumns };
+export { $Dto, $column, $columns, $columnsAll, $locale, $relation, $relationDynamic, $relationMutate, $tableColumns, $tableComments, $tableDefaults, $tableName, AopMethodTransaction, BeanDatabase, BeanDatabaseDialectBase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, BroadcastDatabaseClientReload, Database, DatabaseDialect, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, Errors, EventClientNameReal, EventColumnsClear, EventDatabaseClientReload, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, buildWhere, config, configDefault, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isAggrColumn, isRaw, isRef, locales, prepareClassModel, prepareColumns };

package/package.json

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