vona-module-a-orm 5.1.13 → 5.1.18

package/dist/index.js

@@ -9,7 +9,7 @@ import knex from 'knex';
 import { BeanMutateBase } from 'vona-module-a-beanmutate';
 import { swapDeps } from '@cabloy/deps';
 import { $tableNameFromEntity, $tableDefaults, $columnsAll } from 'vona-module-a-ormutils';
-import { prepareClassType, Api, v, schemaRenderVisible, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeDtoFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
+import { prepareClassType, Api, v, schemaRenderVisible, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, getTargetDecoratorRuleColumns, mergeDtoFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
 import z from 'zod';
 import { Broadcast, BeanBroadcastBase } from 'vona-module-a-broadcast';
 import { Event, BeanEventBase } from 'vona-module-a-event';
@@ -2320,7 +2320,7 @@ function handleRelationsCollection(relationsStatic, includeWrapper) {
       let withReal;
       let autoload;
       if (relationCur === false) {
-        continue;
+        relationReal = false;
       } else if (relationCur === true) {
         relationReal = relationDef;
         autoload = relationDef.options?.autoload;
@@ -2403,6 +2403,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
   }
   async __handleRelationOne(entity, relation, methodOptions) {
     const [relationName, relationReal, includeReal, withReal] = relation;
+    if (relationReal === false) return;
     const {
       type,
       modelMiddle,
@@ -2505,6 +2506,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
   }
   async __handleRelationMany(entities, relation, methodOptions) {
     const [relationName, relationReal, includeReal, withReal] = relation;
+    if (relationReal === false) return;
     const {
       type,
       modelMiddle,
@@ -2539,7 +2541,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
       }
       for (const entity of entities) {
         entity[relationName] = items.find(item => {
-          if (item[key] === cast(entity).id) {
+          if (this.__sameTableIdentity(item[key], cast(entity).id)) {
             if (!withKey) delete item[key];
             return true;
           }
@@ -2551,7 +2553,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
       const options2 = deepExtend({}, methodOptionsReal, optionsReal);
       const items = await modelTarget.mget(idsTo, options2);
       for (const entity of entities) {
-        entity[relationName] = items.find(item => cast(item).id === cast(entity)[key]);
+        entity[relationName] = items.find(item => this.__sameTableIdentity(cast(item).id, cast(entity)[key]));
       }
     } else if (type === 'hasMany') {
       const idsFrom = entities.map(item => cast(item).id).filter(id => !isNil(id));
@@ -2567,7 +2569,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         for (const entity of entities) {
           entity[relationName] = [];
           for (const item of items) {
-            if (item[key] === cast(entity).id) {
+            if (this.__sameTableIdentity(item[key], cast(entity).id)) {
               delete item[key];
               entity[relationName].push(item);
             }
@@ -2582,7 +2584,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         });
         const items = await modelTarget.group(options2, methodOptionsReal);
         for (const entity of entities) {
-          const item = items.find(item => item[key] === cast(entity).id);
+          const item = items.find(item => this.__sameTableIdentity(item[key], cast(entity).id));
           if (item) {
             delete item[key];
           }
@@ -2600,7 +2602,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         for (const entity of entities) {
           entity[relationName] = [];
           for (const item of items) {
-            if (item[key] === cast(entity).id) {
+            if (this.__sameTableIdentity(item[key], cast(entity).id)) {
               if (!withKey) delete item[key];
               entity[relationName].push(item);
             }
@@ -2622,7 +2624,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
       }
       if (optionsReal.groups) {
         for (const entity of entities) {
-          const idsTo = itemsMiddle.filter(item => item[keyFrom] === cast(entity).id).map(item => item[keyTo]);
+          const idsTo = itemsMiddle.filter(item => this.__sameTableIdentity(item[keyFrom], cast(entity).id)).map(item => item[keyTo]);
           const options2 = deepExtend({}, optionsReal, {
             groups: optionsReal.groups,
             where: {
@@ -2633,7 +2635,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         }
       } else if (optionsReal.aggrs) {
         for (const entity of entities) {
-          const idsTo = itemsMiddle.filter(item => item[keyFrom] === cast(entity).id).map(item => item[keyTo]);
+          const idsTo = itemsMiddle.filter(item => this.__sameTableIdentity(item[keyFrom], cast(entity).id)).map(item => item[keyTo]);
           const options2 = deepExtend({}, optionsReal, {
             where: {
               id: idsTo
@@ -2648,8 +2650,8 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         for (const entity of entities) {
           entity[relationName] = [];
           for (const itemMiddle of itemsMiddle) {
-            if (itemMiddle[keyFrom] === cast(entity).id) {
-              entity[relationName].push(items.find(item => cast(item).id === cast(itemMiddle)[keyTo]));
+            if (this.__sameTableIdentity(itemMiddle[keyFrom], cast(entity).id)) {
+              entity[relationName].push(items.find(item => this.__sameTableIdentity(cast(item).id, cast(itemMiddle)[keyTo])));
             }
           }
         }
@@ -2658,6 +2660,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
   }
   async __handleRelationMutate(entitiesResult, entities, relation, methodOptions) {
     const [relationName, relationReal, includeReal, withReal] = relation;
+    if (relationReal === false) return entitiesResult;
     const {
       type,
       modelMiddle,
@@ -2713,9 +2716,9 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         if (entity[relationName] && entity[relationName].length > 0) {
           const entityId = cast(entity).id;
           const idsTo = entity[relationName].map(item => item.id).filter(id => !isNil(id));
-          let idsTarget;
+          let idsTargetSet;
           if (idsTo.length === 0) {
-            idsTarget = [];
+            idsTargetSet = new Set();
           } else {
             const itemsTarget = await cast(modelTarget).__select_raw(undefined, {
               where: {
@@ -2723,10 +2726,10 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
                 id: idsTo
               }
             }, methodOptionsReal);
-            idsTarget = itemsTarget.map(item => item.id);
+            idsTargetSet = new Set(itemsTarget.map(item => String(item.id)));
           }
           for (const child of entity[relationName]) {
-            if (!isNil(child.id) && !idsTarget.includes(child.id)) {
+            if (!isNil(child.id) && !idsTargetSet.has(String(child.id))) {
               throw new Error(`invalid id: ${child.id}`);
             }
             children.push(Object.assign({}, child, {
@@ -2743,7 +2746,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         if (entity[relationName]) {
           entityResult[relationName] = [];
           for (const child of children) {
-            if (child[key] === cast(entity).id) {
+            if (this.__sameTableIdentity(child[key], cast(entity).id)) {
               entityResult[relationName].push(child);
             }
           }
@@ -2769,7 +2772,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
             }, methodOptionsReal);
           }
           for (const child of entity[relationName]) {
-            const itemMiddle = itemsMiddle.find(item => item[keyTo] === child.id);
+            const itemMiddle = itemsMiddle.find(item => this.__sameTableIdentity(item[keyTo], child.id));
             if (!itemMiddle) {
               if (!child.deleted) {
                 // add
@@ -2798,7 +2801,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         if (entity[relationName]) {
           entityResult[relationName] = [];
           for (const child of children) {
-            if (child[keyFrom] === cast(entity).id) {
+            if (this.__sameTableIdentity(child[keyFrom], cast(entity).id)) {
               entityResult[relationName].push({
                 id: child[keyTo]
               });
@@ -2813,6 +2816,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
   }
   async __handleRelationDelete(ids, relation, methodOptions) {
     const [_relationName, relationReal, includeReal, withReal] = relation;
+    if (relationReal === false) return;
     const {
       type,
       modelMiddle,
@@ -2847,6 +2851,10 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
       await modelTargetMiddle.deleteBulk(idsMiddle, methodOptionsReal);
     }
   }
+  __sameTableIdentity(id1, id2) {
+    if (isNil(id1) || isNil(id2)) return false;
+    return String(id1) === String(id2);
+  }
   __prepareColumnsAndKey(columns, key) {
     if (!columns) return [columns, true];
     columns = Array.isArray(columns) ? columns : [columns];
@@ -2862,6 +2870,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
     const refKeys = [];
     for (const relation of relations) {
       const [_relationName, relationReal] = relation;
+      if (relationReal === false) continue;
       const {
         type,
         key
@@ -3251,8 +3260,8 @@ function _DtoGet_raw(modelLike, params) {
   // entity
   let entityClass = params?.dtoClass ?? getClassEntityFromClassModel(modelClass);
   // columns
-  const columns = prepareColumns(params?.columns);
-  // always create a new class, no matter if columns empty
+  const columns = params?.dtoClass ? undefined : prepareColumns(params?.columns);
+  // always create a new class, no matter if columns empty: dtoClass keeps own fields
   entityClass = $Class.pick(entityClass, columns);
   // relations
   _DtoGet_relations(modelClass, entityClass, params);
@@ -3268,6 +3277,10 @@ function _DtoGet_relations(modelClass, entityClass, includeWrapper, mutateTypeTo
 }
 function _DtoGet_relation_handle(entityClass, relation, mutateTypeTopLevel) {
   const [relationName, relationReal, includeReal, withReal, autoload] = relation;
+  if (relationReal === false) {
+    Api.field(schemaRenderVisible(false), v.optional())(entityClass.prototype, relationName);
+    return;
+  }
   const {
     type,
     model,
@@ -3381,7 +3394,13 @@ function _DtoMutate_raw(modelLike, params, mutateTypeTopLevel, columnsOmitDefaul
   // entity
   let entityClass = params?.dtoClass ?? getClassEntityFromClassModel(modelClass);
   // columns
-  let columns = prepareColumns(params?.columns);
+  let columns;
+  // if dtoClass, use dtoClass fields
+  if (params?.dtoClass) {
+    columns = getTargetDecoratorRuleColumns(params.dtoClass.prototype);
+  } else {
+    columns = prepareColumns(params?.columns);
+  }
   if (columns) {
     if (!topLevel) {
       if (mutateTypeTopLevel === 'create') {
@@ -3413,12 +3432,14 @@ function _DtoMutate_raw(modelLike, params, mutateTypeTopLevel, columnsOmitDefaul
   }
   if (!topLevel && relation) {
     const [_relationName, relationReal] = relation;
-    const {
-      type,
-      key
-    } = relationReal;
-    if (type === 'hasOne' || type === 'hasMany') {
-      entityClass = $Class.omit(entityClass, key);
+    if (relationReal !== false) {
+      const {
+        type,
+        key
+      } = relationReal;
+      if (type === 'hasOne' || type === 'hasMany') {
+        entityClass = $Class.omit(entityClass, key);
+      }
     }
   }
   // relations