vona-module-a-orm 5.0.95 → 5.1.1

package/dist/config/locale/zh-cn.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"zh-cn.d.ts","sourceRoot":"","sources":["../../../src/config/locale/zh-cn.ts"],"names":[],"mappings":";;;;;;;;AAAA,wBAOE"}

package/dist/extend/index.d.ts

@@ -2,3 +2,4 @@ import type { VonaApplication } from 'vona';
 export * from './schemaBuilder.ts';
 export * from './tableBuilder.ts';
 export declare function ExtendKnex(app: VonaApplication): void;
+//# sourceMappingURL=index.d.ts.map

package/dist/extend/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/extend/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAK5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAElC,wBAAgB,UAAU,CAAC,GAAG,EAAE,eAAe,QAG9C"}

package/dist/extend/schemaBuilder.d.ts

@@ -11,3 +11,4 @@ declare module 'knex' {
         }
     }
 }
+//# sourceMappingURL=schemaBuilder.d.ts.map

package/dist/extend/schemaBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schemaBuilder.d.ts","sourceRoot":"","sources":["../../src/extend/schemaBuilder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAM5C,OAAO,KAAK,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAE9F,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,eAAe,QAQvD;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAU,IAAI,CAAC;QACb,UAAU,aAAa;YACrB,cAAc,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,yBAAyB,EAAE,CAAC,CAAC;YAC7E,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;YACtD,YAAY,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;YAClD,YAAY,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAAC;SACrE;KACF;CACF"}

package/dist/extend/tableBuilder.d.ts

@@ -20,3 +20,4 @@ declare module 'knex' {
         }
     }
 }
+//# sourceMappingURL=tableBuilder.d.ts.map

package/dist/extend/tableBuilder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tableBuilder.d.ts","sourceRoot":"","sources":["../../src/extend/tableBuilder.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAM5C,MAAM,WAAW,mBAAmB;IAClC,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,eAAe,QAyDtD;AAED,OAAO,QAAQ,MAAM,CAAC;IACpB,UAAU,IAAI,CAAC;QACb,UAAU,YAAY;YACpB,WAAW,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC;YAC9D,iBAAiB,CAAC,OAAO,CAAC,EAAE,mBAAmB,GAAG,IAAI,CAAC,YAAY,CAAC;YACpE,aAAa,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YACvD,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAChD,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAC7C,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YAC7C,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;YACjD,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC;SAChD;KACF;CACF"}

package/dist/index.d.ts

@@ -6,3 +6,4 @@ export * from './common/index.ts';
 export * from './extend/index.ts';
 export * from './lib/index.ts';
 export * from './types/index.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAEtB,cAAc,sBAAsB,CAAC;AAErC,cAAc,wBAAwB,CAAC;AACvC,cAAc,sCAAsC,CAAC;AACrD,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC"}

package/dist/index.js

@@ -9,14 +9,14 @@ 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, OrderMaxBase, OrderCoreBase, getSchemaDynamic, SymbolSchemaDynamicRefId, addSchemaDynamic, mergeFieldsOpenapiMetadata } from 'vona-module-a-openapiutils';
+import { prepareClassType, Api, v, 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';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import { Queue, BeanQueueBase } from 'vona-module-a-queue';
 import { Schedule } from 'vona-module-a-schedule';
-import { Hmr } from 'vona-module-a-hmr';
+import { Hmr } from 'vona-module-a-hmrbase';
 import { configAll, configRedis } from 'vona-module-a-summer';
 import { ServiceDatabaseAsyncLocalStorage as ServiceDatabaseAsyncLocalStorage$1, ServiceTransactionConsistency‌ as ServiceTransactionConsistency_ } from 'vona-module-a-orm';
 import { mutate } from 'mutate-on-copy';
@@ -824,8 +824,10 @@ let BeanDatabaseDialectBase = class BeanDatabaseDialectBase extends BeanBase {
         const column = columns[columnName];
         if (Object.prototype.hasOwnProperty.call(data, columnName)) {
           const value = data[columnName];
-          if (column.type === 'json' && value !== undefined && typeof value === 'string') {
+          if (column.type === 'json' && !isNil(value) && typeof value === 'string') {
             data[columnName] = JSON.parse(value);
+          } else if (column.type === 'datetime' && !isNil(value)) {
+            data[columnName] = new Date(value);
           }
         }
       }
@@ -1246,30 +1248,10 @@ class EntityBaseInner extends EntityBaseEmpty {
     this.iid = void 0;
   }
 }
-__decorate([Api.field(v.openapi({
-  title: $locale('CreatedAt'),
-  rest: {
-    order: OrderMaxBase - 2
-  }
-})), __metadata("design:type", Date)], EntityBaseInner.prototype, "createdAt", void 0);
-__decorate([Api.field(v.openapi({
-  title: $locale('UpdatedAt'),
-  rest: {
-    order: OrderMaxBase - 1
-  }
-})), __metadata("design:type", Date)], EntityBaseInner.prototype, "updatedAt", void 0);
-__decorate([Api.field(v.openapi({
-  title: $locale('Deleted'),
-  rest: {
-    visible: false
-  }
-}), v.default(false)), __metadata("design:type", Boolean)], EntityBaseInner.prototype, "deleted", void 0);
-__decorate([Api.field(v.openapi({
-  title: $locale('InstanceId'),
-  rest: {
-    visible: false
-  }
-}), v.default(0)), __metadata("design:type", Number)], EntityBaseInner.prototype, "iid", void 0);
+__decorate([Api.field(v.title($locale('CreatedAt')), v.order(-2, 'max'), v.filterDateRange(), v.component('date')), __metadata("design:type", Date)], EntityBaseInner.prototype, "createdAt", void 0);
+__decorate([Api.field(v.title($locale('UpdatedAt')), v.order(-1, 'max'), v.filterDateRange(), v.component('date')), __metadata("design:type", Date)], EntityBaseInner.prototype, "updatedAt", void 0);
+__decorate([Api.field(v.title($locale('Deleted')), v.visible(false), v.default(false)), __metadata("design:type", Boolean)], EntityBaseInner.prototype, "deleted", void 0);
+__decorate([Api.field(v.title($locale('InstanceId')), v.visible(false), v.default(0)), __metadata("design:type", Number)], EntityBaseInner.prototype, "iid", void 0);
 
 class EntityBase extends EntityBaseInner {
   constructor(...args) {
@@ -1277,12 +1259,7 @@ class EntityBase extends EntityBaseInner {
     this.id = void 0;
   }
 }
-__decorate([Api.field(v.openapi({
-  title: $locale('TableIdentity'),
-  rest: {
-    order: OrderCoreBase + 1
-  }
-}), v.tableIdentity()), __metadata("design:type", Object)], EntityBase.prototype, "id", void 0);
+__decorate([Api.field(v.order(1, 'core'), v.title($locale('TableIdentity')), v.tableIdentity()), __metadata("design:type", Object)], EntityBase.prototype, "id", void 0);
 
 class EntityBaseSimple extends EntityBaseInner {
   constructor(...args) {
@@ -1290,12 +1267,7 @@ class EntityBaseSimple extends EntityBaseInner {
     this.id = void 0;
   }
 }
-__decorate([Api.field(v.openapi({
-  title: $locale('TableIdentity'),
-  rest: {
-    order: OrderCoreBase + 1
-  }
-})), __metadata("design:type", Number)], EntityBaseSimple.prototype, "id", void 0);
+__decorate([Api.field(v.order(1, 'core'), v.title($locale('TableIdentity'))), __metadata("design:type", Number)], EntityBaseSimple.prototype, "id", void 0);
 
 const SymbolKeyEntity = Symbol('$entity');
 const SymbolKeyEntityMeta = Symbol('$entityMeta');
@@ -1548,6 +1520,9 @@ class BeanModelUtils extends BeanModelMeta {
       builder.count();
     }
   }
+  buildIncrement(builder, columns) {
+    builder.increment(columns);
+  }
   buildOrders(builder, orders) {
     if (!orders) return;
     for (const [orderColumn, orderDirection, orderNulls] of orders) {
@@ -1947,6 +1922,25 @@ class BeanModelCrudInner extends BeanModelView {
     const res = await builder;
     return this.extractFirstNumber(res);
   }
+  async _increment(table, params, options) {
+    // table
+    table = table || this.getTable(params?.where);
+    if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
+    // params
+    params = params || {};
+    // builder
+    const builder = this.builder(table);
+    // count
+    this.buildIncrement(builder, params.columns);
+    // joins
+    this.buildJoins(builder, params.joins);
+    // where
+    this.prepareWhere(builder, table, params.where, options);
+    // ready
+    this.$loggerChild('model').debug(() => `model.increment: ${builder.toQuery()}`);
+    const res = await builder;
+    return res;
+  }
   async _insertBulk(table, data, options) {
     // data
     data = data || {};
@@ -2625,7 +2619,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
           const item = await modelTarget.get({
             [key]: cast(entity).id
           });
-          if (!isNil(item?.id) && !isNil(entity[relationName].id) && item?.id !== entity[relationName].id) {
+          if (!isNil(item?.id) && !isNil(entity[relationName].id) && String(item?.id) !== String(entity[relationName].id)) {
             throw new Error(`invalid id: ${entity[relationName].id}`);
           }
           const dataNew = {
@@ -2643,7 +2637,7 @@ let ServiceRelations = class ServiceRelations extends BeanBase {
         const entityResult = result[index];
         const entity = entities[index];
         if (entity[relationName]) {
-          entityResult[relationName] = children.find(item => item[key] === cast(entity).id);
+          entityResult[relationName] = children.find(item => String(item[key]) === String(cast(entity).id));
         }
       }
       return result;
@@ -3011,6 +3005,53 @@ class BeanModelCache extends BeanModelCrud {
     const item = await this.aggregate(params2, options);
     return this.extractFirstValue(item);
   }
+  async increment(params, options, _modelJoins) {
+    return await this.__increment_raw(undefined, params, options);
+  }
+  async decrement(params, options, _modelJoins) {
+    const columns = {};
+    for (const key in params.columns) {
+      columns[key] = -params.columns[key];
+    }
+    const params2 = Object.assign({}, params, {
+      columns
+    });
+    return await this.__increment_raw(undefined, params2, options);
+  }
+  async __increment_raw(table, params, options) {
+    // table
+    table = table || this.getTable(params?.where);
+    if (!table) return this.scopeOrm.error.ShouldSpecifyTable.throw();
+    // check if cache
+    if (this._checkDisableCacheEntityByOptions(options)) {
+      return await super._increment(table, params, options);
+    }
+    const where = params?.where;
+    const items = await this.__select_raw(table, {
+      where,
+      columns: ['id']
+    }, options);
+    if (items.length === 0) {
+      // donothing
+      return 0;
+    }
+    let id;
+    if (items.length === 1) {
+      id = cast(items[0]).id;
+    } else {
+      id = items.map(item => cast(item).id);
+    }
+    // update by id/ids
+    params = Object.assign({}, params, {
+      where: {
+        id
+      }
+    });
+    const res = await this._increment(table, params, options);
+    // delete cache
+    await this.cacheEntityDel(id, table);
+    return res;
+  }
   async aggregate(params, options, _modelJoins) {
     const items = await this.__aggregate_raw(undefined, params, options);
     return items[0];
@@ -3958,7 +3999,7 @@ function _DtoGet_relation_handle(entityClass, relation, mutateTypeTopLevel) {
       }));
     } else if (type === 'hasOne') {
       const schemaLazy = _DtoGet_relation_handle_schemaLazy(modelTarget, optionsReal, autoload, mutateTypeTopLevel, relation);
-      schema = v.lazy(schemaLazy);
+      schema = v.lazy(v.visible(false), schemaLazy);
       // optional = true;
     } else {
       // hasMany
@@ -3971,7 +4012,7 @@ function _DtoGet_relation_handle(entityClass, relation, mutateTypeTopLevel) {
     let schema;
     let optional = false;
     if (type === 'hasOne' || type === 'belongsTo') {
-      schema = v.lazy(schemaLazy);
+      schema = v.lazy(v.visible(false), schemaLazy);
       optional = true;
     } else {
       if (optionsReal.groups) {
@@ -4094,6 +4135,16 @@ function DtoCreate(modelLike, params) {
   return _DtoMutate_raw(modelLike, params, 'create', ['id', 'iid', 'deleted', 'createdAt', 'updatedAt'], true, undefined);
 }
 
+function DtoListAndCount(classRef) {
+  class TargetClass {}
+  Api.field(v.array(classRef))(TargetClass.prototype, 'list');
+  Api.field(z.string())(TargetClass.prototype, 'total');
+  Api.field(z.number())(TargetClass.prototype, 'pageCount');
+  Api.field(z.number())(TargetClass.prototype, 'pageSize');
+  Api.field(z.number())(TargetClass.prototype, 'pageNo');
+  return TargetClass;
+}
+
 function DtoQuery(classRef, keys) {
   return $Class.mixin(DtoQueryBase, $Class.partial($Class.pick(classRef, keys)));
 }
@@ -4103,14 +4154,8 @@ function DtoQueryPage(classRef, keys) {
 }
 
 function DtoSelectAndCount(modelLike, params) {
-  class TargetClass {}
   const DtoGetResult = DtoGet(modelLike, params);
-  Api.field(v.array(DtoGetResult))(TargetClass.prototype, 'list');
-  Api.field(z.string())(TargetClass.prototype, 'total');
-  Api.field(z.number())(TargetClass.prototype, 'pageCount');
-  Api.field(z.number())(TargetClass.prototype, 'pageSize');
-  Api.field(z.number())(TargetClass.prototype, 'pageNo');
-  return TargetClass;
+  return DtoListAndCount(DtoGetResult);
 }
 
 function DtoUpdate(modelLike, params) {
@@ -4126,7 +4171,8 @@ const $Dto = {
   group: DtoGroup,
   query: DtoQuery,
   queryPage: DtoQueryPage,
-  selectAndCount: DtoSelectAndCount
+  selectAndCount: DtoSelectAndCount,
+  listAndCount: DtoListAndCount
 };
 
 function Entity(table, options) {
@@ -4153,6 +4199,7 @@ function Model(options) {
 }
 
 function hasOne$2(classModel, key, options) {
+  // :  IModelRelationHasOne<MODEL, AUTOLOAD, COLUMNS> {
   return {
     type: 'hasOne',
     model: classModel,
@@ -4161,6 +4208,7 @@ function hasOne$2(classModel, key, options) {
   };
 }
 function belongsTo$1(_classModelSelf, classModel, key, options) {
+  // : IModelRelationBelongsTo<MODELSelf, MODEL, AUTOLOAD, COLUMNS> {
   return {
     type: 'belongsTo',
     model: classModel,
@@ -4169,6 +4217,7 @@ function belongsTo$1(_classModelSelf, classModel, key, options) {
   };
 }
 function hasMany$2(classModel, key, options, _modelJoins, _group) {
+  // : IModelRelationHasMany<MODEL, AUTOLOAD, COLUMNS, ModelJoins> {
   return {
     type: 'hasMany',
     model: classModel,
@@ -4177,6 +4226,7 @@ function hasMany$2(classModel, key, options, _modelJoins, _group) {
   };
 }
 function belongsToMany$2(classModelMiddle, classModel, keyFrom, keyTo, options, _modelJoins, _group) {
+  // : IModelRelationBelongsToMany<MODELMiddle, MODEL, AUTOLOAD, COLUMNS, ModelJoins> {
   return {
     type: 'belongsToMany',
     modelMiddle: classModelMiddle,
@@ -4327,3 +4377,4 @@ const $relationMutate = {
 };
 
 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, HmrEntity, 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 };
+//# sourceMappingURL=index.js.map