vona-module-a-orm 5.0.82 → 5.0.84

package/dist/index.js

@@ -7,7 +7,7 @@ import { isNil, catchError, safeBoolean, isClass, ensureArray, hashkey } from '@
 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-openapi';
+import { prepareClassType, getTargetDecoratorRules, getTargetDecoratorRuleColumnsMap, Api, v, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
 import { ZodMetadata } from '@cabloy/zod-openapi';
 import z from 'zod';
 import { parseFirstWord, toLowerCaseFirstChar } from '@cabloy/word-utils';
@@ -1227,13 +1227,13 @@ function _initializerDefineProperty(e, i, r, l) {
   });
 }
 
-var _dec$h, _dec2$h, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _dec7$1, _class$h, _descriptor$4, _descriptor2$2, _descriptor3$1;
+var _dec$h, _dec2$h, _dec3$6, _dec4$4, _dec5$1, _dec6$1, _class$h, _descriptor$4, _descriptor2$2, _descriptor3$1;
 const app$1 = useApp();
 const ormConfig$1 = app$1.util.getModuleConfigRaw('a-orm');
 const ordersDefault = ormConfig$1?.rest?.query?.orders?.default ?? 'createdAt,desc';
 let DtoQueryBase = (_dec$h = Api.field(v.optional(), v.array(String, {
   separator: ','
-})), _dec2$h = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.looseObject({})), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Api.field(v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec7$1 = Reflect.metadata("design:type", Object), _class$h = class DtoQueryBase {
+})), _dec2$h = Reflect.metadata("design:type", Array), _dec3$6 = Api.field(v.optional(), z.looseObject({})), _dec4$4 = Reflect.metadata("design:type", Object), _dec5$1 = Api.field(v.default(ordersDefault), v.optional(), z.union([z.string(), z.array(z.array(z.string()))])), _dec6$1 = Reflect.metadata("design:type", Object), _class$h = class DtoQueryBase {
   constructor() {
     _initializerDefineProperty(this, "columns", _descriptor$4, this);
     _initializerDefineProperty(this, "where", _descriptor2$2, this);
@@ -1249,7 +1249,7 @@ let DtoQueryBase = (_dec$h = Api.field(v.optional(), v.array(String, {
   enumerable: true,
   writable: true,
   initializer: null
-}), _descriptor3$1 = _applyDecoratedDescriptor(_class$h.prototype, "orders", [_dec5$1, _dec6$1, _dec7$1], {
+}), _descriptor3$1 = _applyDecoratedDescriptor(_class$h.prototype, "orders", [_dec5$1, _dec6$1], {
   configurable: true,
   enumerable: true,
   writable: true,
@@ -1778,6 +1778,7 @@ class BeanModelKnex extends BeanModelUtils {
   }
   async queryOne(sql, bindings) {
     const res = await this.query(sql, bindings);
+    if (!res[0]) return undefined;
     return res[0];
   }
 }
@@ -3000,10 +3001,9 @@ class BeanModelCache extends BeanModelCrud {
     const cache = this.cacheEntity.getInstance(table);
     let items = await cache.mget(ids, {
       mget: async ids => {
-        const items = await super._mget_original(table, ids, {
+        return await super._mget_original(table, ids, {
           disableDeleted: true
         });
-        return items.map(item => item === undefined ? null : item);
       },
       db: this.db
     });
@@ -3049,9 +3049,8 @@ class BeanModelCache extends BeanModelCrud {
   }
   async selectAndCount(params, options, modelJoins) {
     // pageNo/pageSize
-    const pageSize = params?.limit;
-    if (!pageSize) throw new Error('should specify the page size');
-    const pageNo = Math.floor(params.offset / pageSize) + 1;
+    const pageSize = params?.limit ?? this.scopeOrm.config.rest.query.pageSize.default;
+    const pageNo = Math.floor((params?.offset ?? 0) / pageSize) + 1;
     // count
     const paramsCount = Object.assign({}, params, {
       columns: undefined,
@@ -3331,15 +3330,13 @@ class BeanModelCache extends BeanModelCrud {
     const item = await cache.get(id, {
       get: async () => {
         // where: maybe contain aux key
-        const item = await super._get(table, where, {
+        return await super._get(table, where, {
           disableDeleted: true
         });
-        return item === undefined ? null : item;
       },
       db: this.db
     });
-    if (!item) return item;
-    if (!this._checkIfEntityValidByDeleted(item, options)) return undefined;
+    if (!item || !this._checkIfEntityValidByDeleted(item, options)) return undefined;
     return item;
   }
   __filterMGetColumns(items, columns) {

package/package.json

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