vona-module-test-vona 5.0.76 → 5.0.78

package/dist/dto/serializerSimple.d.ts

@@ -16,4 +16,5 @@ export declare class DtoSerializerSimple {
     fullName: string;
     fullName2: string;
     get fullName3(): string;
+    fullName4: string;
 }

package/dist/index.js

@@ -1963,45 +1963,47 @@ let DtoRoleLazy = (_dec$p = Dto(), _dec2$p = BeanInfo({
 }), _class2$m)) || _class$p) || _class$p);
 
 function SensitiveEmail() {
-  return Serializer.sensitive({
+  return Serializer.replace({
     // eslint-disable-next-line
     patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
     patternTo: '$1****$3$4'
   });
 }
 
-var _dec$o, _dec2$o, _dec3$l, _dec4$l, _dec5$l, _dec6$l, _dec7$j, _dec8$f, _dec9$b, _dec0$b, _dec1$b, _dec10$9, _dec11$9, _dec12$9, _dec13$9, _dec14$8, _dec15$8, _dec16$8, _dec17$7, _dec18$7, _dec19$7, _dec20$7, _dec21$5, _dec22$4, _dec23$4, _dec24$4, _dec25$4, _dec26$3, _dec27$3, _dec28$2, _dec29$2, _dec30$2, _dec31$2, _dec32$2, _dec33$1, _class$o, _class2$l, _descriptor$4, _descriptor2$4, _descriptor3$2, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor0, _descriptor1, _descriptor10, _descriptor11;
+var _dec$o, _dec2$o, _dec3$l, _dec4$l, _dec5$l, _dec6$l, _dec7$j, _dec8$f, _dec9$b, _dec0$b, _dec1$b, _dec10$9, _dec11$9, _dec12$9, _dec13$9, _dec14$8, _dec15$8, _dec16$8, _dec17$7, _dec18$7, _dec19$7, _dec20$7, _dec21$5, _dec22$4, _dec23$4, _dec24$4, _dec25$4, _dec26$3, _dec27$3, _dec28$2, _dec29$2, _dec30$2, _dec31$2, _dec32$2, _dec33$1, _dec34$1, _dec35$1, _class$o, _class2$l, _descriptor$4, _descriptor2$4, _descriptor3$2, _descriptor4, _descriptor5, _descriptor6, _descriptor7, _descriptor8, _descriptor9, _descriptor0, _descriptor1, _descriptor10, _descriptor11, _descriptor12;
 let DtoSerializerSimple = (_dec$o = Dto(), _dec2$o = BeanInfo({
   module: "test-vona"
-}), _dec3$l = Serializer.exclude(), _dec4$l = Api.field(v.min(6)), _dec5$l = Reflect.metadata("design:type", String), _dec6$l = Api.field(v.serializerExclude(), v.min(6)), _dec7$j = Reflect.metadata("design:type", String), _dec8$f = Serializer.transform('test-vona:email'), _dec9$b = Reflect.metadata("design:type", String), _dec0$b = Serializer.transform('a-serialization:sensitive', {
+}), _dec3$l = Serializer.exclude(), _dec4$l = Api.field(v.min(6)), _dec5$l = Reflect.metadata("design:type", String), _dec6$l = Api.field(v.serializerExclude(), v.min(6)), _dec7$j = Reflect.metadata("design:type", String), _dec8$f = Serializer.transform('test-vona:email'), _dec9$b = Reflect.metadata("design:type", String), _dec0$b = Serializer.transform('a-serialization:replace', {
   // eslint-disable-next-line
   patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
   patternTo: '$1****$3$4'
-}), _dec1$b = Api.field(v.email()), _dec10$9 = Reflect.metadata("design:type", String), _dec11$9 = Serializer.sensitive({
+}), _dec1$b = Api.field(v.email()), _dec10$9 = Reflect.metadata("design:type", String), _dec11$9 = Serializer.replace({
   // eslint-disable-next-line
   patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
   patternTo: '$1****$3$4'
 }), _dec12$9 = Api.field(v.email()), _dec13$9 = Reflect.metadata("design:type", String), _dec14$8 = SensitiveEmail(), _dec15$8 = Reflect.metadata("design:type", String), _dec16$8 = Api.field(v.openapi({
   serializerTransforms: {
-    'a-serialization:sensitive': {
+    'a-serialization:replace': {
       // eslint-disable-next-line
       patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
       patternTo: '$1****$3$4'
     }
   }
-}), v.email()), _dec17$7 = Reflect.metadata("design:type", String), _dec18$7 = Api.field(v.serializerTransform('a-serialization:sensitive', {
+}), v.email()), _dec17$7 = Reflect.metadata("design:type", String), _dec18$7 = Api.field(v.serializerTransform('a-serialization:replace', {
   // eslint-disable-next-line
   patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
   patternTo: '$1****$3$4'
-}), v.email()), _dec19$7 = Reflect.metadata("design:type", String), _dec20$7 = Api.field(v.serializerSensitive({
+}), v.email()), _dec19$7 = Reflect.metadata("design:type", String), _dec20$7 = Api.field(v.serializerReplace({
   // eslint-disable-next-line
   patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
   patternTo: '$1****$3$4'
-}), v.email()), _dec21$5 = Reflect.metadata("design:type", String), _dec22$4 = Api.field(), _dec23$4 = Reflect.metadata("design:type", String), _dec24$4 = Api.field(), _dec25$4 = Reflect.metadata("design:type", String), _dec26$3 = Serializer.getter(function () {
-  return `${this.firstName} ${this.lastName}`;
-}), _dec27$3 = Api.field(v.optional()), _dec28$2 = Reflect.metadata("design:type", String), _dec29$2 = Api.field(v.serializerGetter(function () {
-  return `${this.firstName} ${this.lastName}`;
-}), v.optional()), _dec30$2 = Reflect.metadata("design:type", String), _dec31$2 = Api.field(v.optional()), _dec32$2 = Reflect.metadata("design:type", Function), _dec33$1 = Reflect.metadata("design:paramtypes", []), _dec$o(_class$o = _dec2$o(_class$o = (_class2$l = class DtoSerializerSimple {
+}), v.email()), _dec21$5 = Reflect.metadata("design:type", String), _dec22$4 = Api.field(), _dec23$4 = Reflect.metadata("design:type", String), _dec24$4 = Api.field(), _dec25$4 = Reflect.metadata("design:type", String), _dec26$3 = Serializer.getter(data => {
+  return `${data.firstName} ${data.lastName}`;
+}), _dec27$3 = Api.field(v.optional()), _dec28$2 = Reflect.metadata("design:type", String), _dec29$2 = Api.field(v.serializerGetter(data => {
+  return `${data.firstName} ${data.lastName}`;
+}), v.optional()), _dec30$2 = Reflect.metadata("design:type", String), _dec31$2 = Api.field(v.optional()), _dec32$2 = Reflect.metadata("design:type", Function), _dec33$1 = Reflect.metadata("design:paramtypes", []), _dec34$1 = Api.field(v.serializerCustom((_value, data) => {
+  return `${data.firstName} ${data.lastName}`;
+}), v.optional()), _dec35$1 = Reflect.metadata("design:type", String), _dec$o(_class$o = _dec2$o(_class$o = (_class2$l = class DtoSerializerSimple {
   constructor() {
     _initializerDefineProperty(this, "password", _descriptor$4, this);
     _initializerDefineProperty(this, "password2", _descriptor2$4, this);
@@ -2016,6 +2018,7 @@ let DtoSerializerSimple = (_dec$o = Dto(), _dec2$o = BeanInfo({
     _initializerDefineProperty(this, "lastName", _descriptor1, this);
     _initializerDefineProperty(this, "fullName", _descriptor10, this);
     _initializerDefineProperty(this, "fullName2", _descriptor11, this);
+    _initializerDefineProperty(this, "fullName4", _descriptor12, this);
   }
   get fullName3() {
     return `${this.firstName} ${this.lastName}`;
@@ -2085,19 +2088,24 @@ let DtoSerializerSimple = (_dec$o = Dto(), _dec2$o = BeanInfo({
   enumerable: true,
   writable: true,
   initializer: null
-}), _applyDecoratedDescriptor(_class2$l.prototype, "fullName3", [_dec31$2, _dec32$2, _dec33$1], Object.getOwnPropertyDescriptor(_class2$l.prototype, "fullName3"), _class2$l.prototype), _class2$l)) || _class$o) || _class$o);
+}), _applyDecoratedDescriptor(_class2$l.prototype, "fullName3", [_dec31$2, _dec32$2, _dec33$1], Object.getOwnPropertyDescriptor(_class2$l.prototype, "fullName3"), _class2$l.prototype), _descriptor12 = _applyDecoratedDescriptor(_class2$l.prototype, "fullName4", [_dec34$1, _dec35$1], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class2$l)) || _class$o) || _class$o);
 
 var _dec$n, _dec2$n, _dec3$k, _dec4$k, _dec5$k, _dec6$k, _class$n, _class2$k, _descriptor$3, _descriptor2$3;
 let DtoSerializerArray = (_dec$n = Dto(), _dec2$n = BeanInfo({
   module: "test-vona"
-}), _dec3$k = Api.field(v.serializerGetter((value, _data) => {
+}), _dec3$k = Api.field(v.serializerGetter((_data, value) => {
   return value.map(item => {
     return {
       ...item,
       password: '111111'
     };
   });
-}), v.title('Simple'), v.array(DtoSerializerSimple)), _dec4$k = Reflect.metadata("design:type", Array), _dec5$k = Api.field(v.serializerGetter((value, _data) => {
+}), v.title('Simple'), v.array(DtoSerializerSimple)), _dec4$k = Reflect.metadata("design:type", Array), _dec5$k = Api.field(v.serializerGetter((_data, value) => {
   return value.map(item => {
     return {
       ...item,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-test-vona",
   "type": "module",
-  "version": "5.0.76",
+  "version": "5.0.78",
   "title": "test-vona",
   "vonaModule": {
     "fileVersion": 1,

package/src/dto/serializerArray.ts

@@ -7,7 +7,7 @@ export interface IDtoOptionsSerializerArray extends IDecoratorDtoOptions {}
 
 @Dto<IDtoOptionsSerializerArray>()
 export class DtoSerializerArray {
-  @Api.field(v.serializerGetter((value: DtoSerializerSimple[], _data: DtoSerializerArray) => {
+  @Api.field(v.serializerGetter((_data: DtoSerializerArray, value: DtoSerializerSimple[]) => {
     return value.map(item => {
       return {
         ...item,
@@ -17,7 +17,7 @@ export class DtoSerializerArray {
   }), v.title('Simple'), v.array(DtoSerializerSimple))
   simples: DtoSerializerSimple[];
 
-  @Api.field(v.serializerGetter((value: DtoSerializerSimple[], _data: DtoSerializerArray) => {
+  @Api.field(v.serializerGetter((_data: DtoSerializerArray, value: DtoSerializerSimple[]) => {
     return value.map(item => {
       return {
         ...item,

package/src/dto/serializerSimple.ts

@@ -19,7 +19,7 @@ export class DtoSerializerSimple {
   email: string;
 
   @Serializer.transform(
-    'a-serialization:sensitive',
+    'a-serialization:replace',
     {
       // eslint-disable-next-line
       patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
@@ -29,7 +29,7 @@ export class DtoSerializerSimple {
   @Api.field(v.email())
   email2: string;
 
-  @Serializer.sensitive({
+  @Serializer.replace({
     // eslint-disable-next-line
     patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
     patternTo: '$1****$3$4',
@@ -43,7 +43,7 @@ export class DtoSerializerSimple {
   @Api.field(
     v.openapi({
       serializerTransforms: {
-        'a-serialization:sensitive': {
+        'a-serialization:replace': {
           // eslint-disable-next-line
           patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
           patternTo: '$1****$3$4',
@@ -55,7 +55,7 @@ export class DtoSerializerSimple {
   email5: string;
 
   @Api.field(
-    v.serializerTransform('a-serialization:sensitive', {
+    v.serializerTransform('a-serialization:replace', {
       // eslint-disable-next-line
       patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
       patternTo: '$1****$3$4',
@@ -65,7 +65,7 @@ export class DtoSerializerSimple {
   email6: string;
 
   @Api.field(
-    v.serializerSensitive({
+    v.serializerReplace({
       // eslint-disable-next-line
       patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
       patternTo: '$1****$3$4',
@@ -80,14 +80,14 @@ export class DtoSerializerSimple {
   @Api.field()
   lastName: string;
 
-  @Serializer.getter(function (this: DtoSerializerSimple) {
-    return `${this.firstName} ${this.lastName}`;
+  @Serializer.getter((data: DtoSerializerSimple) => {
+    return `${data.firstName} ${data.lastName}`;
   })
   @Api.field(v.optional())
   fullName: string;
 
-  @Api.field(v.serializerGetter(function (this: DtoSerializerSimple) {
-    return `${this.firstName} ${this.lastName}`;
+  @Api.field(v.serializerGetter((data: DtoSerializerSimple) => {
+    return `${data.firstName} ${data.lastName}`;
   }), v.optional())
   fullName2: string;
 
@@ -95,4 +95,9 @@ export class DtoSerializerSimple {
   get fullName3(): string {
     return `${this.firstName} ${this.lastName}`;
   }
+
+  @Api.field(v.serializerCustom((_value, data: DtoSerializerSimple) => {
+    return `${data.firstName} ${data.lastName}`;
+  }), v.optional())
+  fullName4: string;
 }

package/src/lib/serializer.ts

@@ -1,7 +1,7 @@
 import { Serializer } from 'vona-module-a-serialization';
 
 export function SensitiveEmail(): PropertyDecorator {
-  return Serializer.sensitive({
+  return Serializer.replace({
     // eslint-disable-next-line
     patternFrom: /(\w?)(\w+)(\w)(@\w+\.[a-z]+)/,
     patternTo: '$1****$3$4',

package/test/passport.test.ts

@@ -8,6 +8,8 @@ describe('passport.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       await app.bean.passport.signinMock();
       assert.equal(app.bean.passport.isAuthenticated, true);
+      assert.equal(app.bean.passport.current, app.ctx.passport);
+      assert.equal(app.bean.passport.currentUser, app.ctx.user);
       await app.bean.executor.performAction('get', '/test/vona/passport/echo/:name', { params: { name: 'admin' } });
       await app.bean.passport.signout();
       assert.equal(app.bean.passport.isAuthenticated, false);

package/test/serializer.test.ts

@@ -34,6 +34,7 @@ describe('serializer.test.ts', () => {
       assert.equal(res.fullName, 'k v');
       assert.equal(res.fullName2, 'k v');
       assert.equal(res.fullName3, 'k v');
+      assert.equal(res.fullName4, 'k v');
     });
   });
   it('action:serializerArray', async () => {