vona-module-a-orm 5.1.40 → 5.1.42

package/dist/index.js

@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import { BeanInfo, BeanBase, BeanAopMethodBase, deepExtend, appResource, assertIsolatedTestDatabaseClient, assertTestClaimDatabaseClient, beanFullNameFromOnionName, cast, useApp, $makeLocaleMagic, Virtual, registerTestClaimDatabaseCreation, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class, disposeInstance } from 'vona';
+import { BeanInfo, BeanBase, BeanAopMethodBase, deepExtend, appResource, assertIsolatedTestDatabaseClient, assertTestClaimDatabaseClient, beanFullNameFromOnionName, cast, useApp, $makeLocaleMagic, Virtual, registerTestClaimDatabaseCreation, BeanSimple, combineConfigDefault, BeanScopeBase, createBeanDecorator, PickClassInner, $Class, registerMappedClassMetadataKey, appMetadata, disposeInstance } from 'vona';
 import { __decorate, __metadata } from 'tslib';
 import { Schedule } from 'vona-module-a-schedule';
 import { AopMethod } from 'vona-module-a-aspect';
@@ -1153,6 +1153,8 @@ function _safeColumn(column) {
   return column.replace(/[\\.#%'"`;,() ]/g, '');
 }
 
+const SymbolDtoMutateRelations = Symbol('SymbolDtoMutateRelations');
+
 const app$1 = useApp();
 const ormConfig$1 = app$1.util.getModuleConfigRaw('a-orm');
 const ordersDefault = ormConfig$1?.rest?.query?.orders?.default ?? 'createdAt,desc';
@@ -3702,10 +3704,25 @@ function _DtoGet_raw(modelLike, params) {
   return entityClass;
 }
 function _DtoGet_relations(modelClass, entityClass, includeWrapper, mutateTypeTopLevel) {
-  // relations
   const relations = _DtoGet_relations_collection(modelClass, includeWrapper);
-  if (!relations) return;
+  // Mapped-class metadata follows the dtoClass field projection, including pick/omit.
+  registerMappedClassMetadataKey(entityClass.prototype, SymbolDtoMutateRelations, {});
+  const retained = appMetadata.getOwnMetadataMap(true, SymbolDtoMutateRelations, entityClass.prototype);
+  if (mutateTypeTopLevel) {
+    const overridden = new Set(relations.map(relation => relation[0]));
+    for (const name in retained) {
+      if (!overridden.has(name)) {
+        _DtoGet_relation_handle(entityClass, retained[name], mutateTypeTopLevel);
+      }
+    }
+  }
   for (const relation of relations) {
+    const [name, definition] = relation;
+    if (mutateTypeTopLevel && definition !== false && (definition.type === 'hasOne' || definition.type === 'hasMany')) {
+      retained[name] = relation;
+    } else {
+      delete retained[name];
+    }
     _DtoGet_relation_handle(entityClass, relation, mutateTypeTopLevel);
   }
 }
@@ -4067,7 +4084,7 @@ class BeanModelCache extends BeanModelCrud {
     }
     // insert/update
     const itemsInsertNew = await this.__insertBulk_raw(table, itemsInsert, options);
-    await this.__updateBulk_raw(table, itemsUpdate, options);
+    const idsUpdate = await this.__updateBulk_raw(table, itemsUpdate, options);
     const itemsMutate = itemsInsert.map((item, index) => {
       return Object.assign({}, item, {
         id: cast(itemsInsertNew[index]).id
@@ -4075,7 +4092,7 @@ class BeanModelCache extends BeanModelCrud {
     }).concat(itemsUpdate);
     let itemsMutateResult = itemsInsertNew.concat(itemsUpdate);
     const indexesMutate = indexesInsert.concat(indexesUpdate);
-    itemsMutateResult = await this.relations.handleRelationsMutate(itemsMutateResult, itemsMutate, options, options);
+    itemsMutateResult = await this.__handleRelationsMutateAdmitted(itemsMutateResult, itemsMutate, [...itemsInsertNew.map(item => [cast(item).id]), ...idsUpdate], options);
     let result = [];
     for (let index = 0; index < indexesMutate.length; index++) {
       result[indexesMutate[index]] = itemsMutateResult[index];
@@ -4416,19 +4433,80 @@ class BeanModelCache extends BeanModelCrud {
     return items[0];
   }
   async updateBulk(items, options) {
-    await this.__updateBulk_raw(undefined, items, options);
-    return await this.relations.handleRelationsMutate(items, items, options, options);
+    const ids = await this.__updateBulk_raw(undefined, items, options);
+    return await this.__handleRelationsMutateAdmitted(items, items, ids, options);
   }
   async __updateBulk_raw(table, items, options) {
-    if (items.length === 0) return;
+    const ids = [];
     for (const item of items) {
-      await this.__update_raw(table, item, options);
+      ids.push(await this.__update_raw(table, item, options));
+    }
+    return ids;
+  }
+  async __handleRelationsMutateAdmitted(results, items, ids, options) {
+    const indexes = [];
+    const itemsAdmitted = [];
+    const resultsAdmitted = [];
+    for (let index = 0; index < items.length; index++) {
+      const idsItem = ids[index];
+      if (!idsItem || idsItem.length !== 1) continue;
+      indexes.push(index);
+      itemsAdmitted.push(Object.assign({}, items[index], {
+        id: idsItem[0]
+      }));
+      resultsAdmitted.push(results[index]);
+    }
+    const resultsMutated = await this.relations.handleRelationsMutate(resultsAdmitted, itemsAdmitted, options, options);
+    const result = results.concat();
+    for (let index = 0; index < indexes.length; index++) {
+      result[indexes[index]] = resultsMutated[index];
     }
+    return result;
+  }
+  __hasWritableRelations(options) {
+    return this.relations.handleRelationsCollection(options).some(([, relation]) => {
+      return relation !== false && relation.type !== 'belongsTo';
+    });
+  }
+  async __selectMutationIds(table, where, options) {
+    // Admission must use current scoped rows, not cached entities or changed-row counts.
+    const items = await super._select(table, {
+      where,
+      columns: ['id']
+    }, options);
+    return items.map(item => cast(item).id);
   }
   async __update_raw(table, data, options) {
     // table
     table = table || this.getTable(data);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
+    if (this.__hasWritableRelations(options)) {
+      const where = Object.assign({}, options?.where);
+      const dataNew = Object.assign({}, data);
+      let hasId = false;
+      for (const key of ['id', `${table}.id`]) {
+        if (!isNil(dataNew[key])) {
+          cast(where).id = dataNew[key];
+          delete dataNew[key];
+          hasId = true;
+        }
+      }
+      if (!hasId && !options?.where) {
+        throw new Error('id should be specified for update method');
+      }
+      const ids = await this.__selectMutationIds(table, where, options);
+      if (ids.length === 0) return [];
+      await super._update(table, dataNew, {
+        ...options,
+        where: Object.assign({}, where, {
+          id: ids
+        })
+      });
+      if (!this._checkDisableCacheEntityByOptions(options)) {
+        await this.cacheEntityDel(ids, table);
+      }
+      return ids;
+    }
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
       await super._update(table, data, options);
@@ -4495,15 +4573,28 @@ class BeanModelCache extends BeanModelCrud {
   }
   async __deleteBulk_raw_with_relations(table, ids, options) {
     if (ids.length === 0) return;
-    await this.__delete_raw(table, {
+    const idsDeleted = await this.__delete_raw(table, {
       id: ids
     }, options);
-    await this.relations.handleRelationsDelete(ids, options, options);
+    if (idsDeleted) {
+      await this.relations.handleRelationsDelete(idsDeleted, options, options);
+    }
   }
   async __delete_raw(table, where, options) {
     // table
     table = table || this.getTable(where);
     if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
+    if (this.__hasWritableRelations(options)) {
+      const ids = await this.__selectMutationIds(table, where, options);
+      if (ids.length === 0) return [];
+      await super._delete(table, Object.assign({}, where, {
+        id: ids
+      }), options);
+      if (!this._checkDisableCacheEntityByOptions(options)) {
+        await this.cacheEntityDel(ids, table);
+      }
+      return ids;
+    }
     // check if cache
     if (this._checkDisableCacheEntityByOptions(options)) {
       return await super._delete(table, where, options);
@@ -4933,5 +5024,5 @@ const $relationMutate = {
   belongsToMany
 };
 
-export { $Dto, $defineAnalysis, $executeAnalysisAggregate, $executeAnalysisGroup, $locale, $relation, $relationDynamic, $relationMutate, AnalysisError, AopMethodTransaction, BeanDatabase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, HmrEntity, HmrModel, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDatabaseDialectBase, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolCacheModelCacheInstances, SymbolCacheModelsClear, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, analysisCapabilities, analysisControlSchemas, analysisFailure, analysisFunctions, analysisReservedFields, buildWhere, clearAllCacheModelsClear, clearCacheModelCacheInstance, config, configDefault, errors, getCacheModelCacheInstances, getCacheModelsClear, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isRaw, isRef, locales, prepareClassModel, prepareColumns, resolveAnalysis };
+export { $Dto, $defineAnalysis, $executeAnalysisAggregate, $executeAnalysisGroup, $locale, $relation, $relationDynamic, $relationMutate, AnalysisError, AopMethodTransaction, BeanDatabase, BeanModel, BeanModelBase, BeanModelMeta, BroadcastColumnsClear, DatabaseDialect, DtoQueryBase, DtoQueryPageBase, Entity, EntityBase, EntityBaseEmpty, EntityBaseInner, EntityBaseSimple, EventClientNameReal, EventColumnsClear, ExtendKnex, ExtendSchemaBuilder, ExtendTableBuilder, HmrEntity, HmrModel, Main, Model, Op, OpAggrs, OpJoint, OpJointValues, OpNormal, OpNormalValues, OpValues, QueueDoubleDelete, ScheduleSoftDeletionPrune, ScopeModuleAOrm, ServiceCacheEntity, ServiceCacheQuery, ServiceColumns, ServiceColumnsCache, ServiceDatabase, ServiceDatabaseAsyncLocalStorage, ServiceDatabaseClient, ServiceDatabaseDialectBase, ServiceDb, ServiceEntityResolver, ServiceModelResolver, ServiceRelations, ServiceTransaction, ServiceTransactionAsyncLocalStorage, ServiceTransactionConsistency‌, ServiceTransactionFiber, ServiceTransactionState, SymbolCacheModelCacheInstances, SymbolCacheModelsClear, SymbolDtoMutateRelations, SymbolKeyEntity, SymbolKeyEntityMeta, SymbolKeyFieldsMore, SymbolKeyModelOptions, TransactionIsolationLevelsMap, analysisCapabilities, analysisControlSchemas, analysisFailure, analysisFunctions, analysisReservedFields, buildWhere, clearAllCacheModelsClear, clearCacheModelCacheInstance, config, configDefault, errors, getCacheModelCacheInstances, getCacheModelsClear, getClassEntityFromClassModel, getTableOrTableAlias, getTargetColumnName, isRaw, isRef, locales, prepareClassModel, prepareColumns, resolveAnalysis };
 //# sourceMappingURL=index.js.map