vona-module-test-vona 5.0.70 → 5.0.72

package/dist/index.js

@@ -2329,7 +2329,7 @@ let ControllerBean = (_dec$h = Controller({
     assert.equal(res, 'serviceTest');
 
     // general scope
-    res = this.bean.scope(__ThisModule__).service.test.name;
+    res = this.app.scope(__ThisModule__).service.test.name;
     assert.equal(res, 'serviceTest');
     res = this.$scope.testVona.service.test.name;
     assert.equal(res, 'serviceTest');

package/package.json

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

package/src/controller/bean.ts

@@ -86,7 +86,7 @@ export class ControllerBean extends BeanBase {
     assert.equal(res, 'serviceTest');
 
     // general scope
-    res = this.bean.scope(__ThisModule__).service.test.name;
+    res = this.app.scope(__ThisModule__).service.test.name;
     assert.equal(res, 'serviceTest');
 
     res = this.$scope.testVona.service.test.name;

package/test/aopMethod.test.ts

@@ -6,7 +6,7 @@ describe('aopMethod.test.ts', () => {
   it('action:aopMethod', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       let result = scopeTest.service.aopMethod.testSyncBase();
       assert.equal(result, '-+hello+-');
       result = scopeTest.service.aopMethod.testSync();

package/test/authSimple.test.ts

@@ -5,7 +5,7 @@ import { app } from 'vona-mock';
 
 describe('authSimple.test.ts', () => {
   it('action:passwordHash', async () => {
-    const scope = app.bean.scope('a-authsimple');
+    const scope = app.scope('a-authsimple');
     const password = '12344##1xxaasDFQ,.$';
     const hash = await scope.service.authSimple.calcPasswordHash(password);
     let verified = await scope.service.authSimple.verifyPasswordHash(password, hash);
@@ -16,10 +16,11 @@ describe('authSimple.test.ts', () => {
 
   it('action:authSimple', async () => {
     await app.bean.executor.mockCtx(async () => {
+      const password = app.scope('home-user').config.passwordDefault.admin;
       // login
       const jwt = await app.bean.auth.authenticate('a-authsimple:simple', {
         clientName: 'default',
-        clientOptions: { username: 'admin', password: '123456' },
+        clientOptions: { username: 'admin', password },
       });
       assert.equal(!!jwt?.accessToken, true);
       // isAuthenticated: isolate
@@ -36,7 +37,7 @@ describe('authSimple.test.ts', () => {
       assert.equal(isAuthenticated, true);
       // login again
       const jwt2 = await app.bean.authSimple.authenticate(
-        { username: 'admin', password: '123456' },
+        { username: 'admin', password },
         'login',
         'default',
       );

package/test/broadcast.test.ts

@@ -5,7 +5,7 @@ import { app } from 'vona-mock';
 describe('broadcast.test.ts', () => {
   it('action:broadcast', async () => {
     await app.bean.executor.mockCtx(async () => {
-      app.bean.scope('test-vona').broadcast.test.emit(
+      app.scope('test-vona').broadcast.test.emit(
         { message: 'hello' },
         {
           locale: 'zh-cn',

package/test/cache/caching.test.ts

@@ -5,7 +5,7 @@ import { app } from 'vona-mock';
 describe('caching.test.ts', () => {
   it('action:caching', async () => {
     await app.bean.executor.mockCtx(async () => {
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // get: cacheKeyFn(string)
       const res = await scopeTest.service.caching.get(2);
       assert.equal(res.id, 2);

package/test/database/database.test.ts

@@ -7,7 +7,7 @@ import { app } from 'vona-mock';
 describe('database.test.ts', () => {
   it('action:database:switchClient', async () => {
     await app.bean.executor.mockCtx(async () => {
-      const scopeDatabase = app.bean.scope('a-orm');
+      const scopeDatabase = app.scope('a-orm');
       const defaultClientName = scopeDatabase.service.database.getDefaultClientName();
       // current
       assert.equal(app.ctx.db.clientName, defaultClientName);
@@ -24,7 +24,7 @@ describe('database.test.ts', () => {
   it('action:model:clientName', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       const modelTest = scopeTest.model.test;
       assert.equal(modelTest.options.client, 'default');
       const modelTest2 = scopeTest.model.test;
@@ -34,7 +34,7 @@ describe('database.test.ts', () => {
   it('action:model:clientNameDynamic:transaction:fail', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       const entityTest = await scopeTest.model.test.insert({ title: 'clientNameDynamic:fail' });
       assert.equal(entityTest.title, 'clientNameDynamic:fail');
       await catchError(async () => {
@@ -55,7 +55,7 @@ describe('database.test.ts', () => {
   it('action:model:clientNameDynamic:transaction:success', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       const entityTest = await scopeTest.model.test.insert({ title: 'clientNameDynamic:success' });
       assert.equal(entityTest.title, 'clientNameDynamic:success');
       const db = app.bean.database.getDb({ clientName: 'default' });
@@ -73,7 +73,7 @@ describe('database.test.ts', () => {
   it('action:database:transaction:compensate', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       const entityTest = await scopeTest.model.test.insert({ title: 'transaction:compensate:fail' });
       assert.equal(entityTest.title, 'transaction:compensate:fail');
       await catchError(async () => {
@@ -96,7 +96,7 @@ describe('database.test.ts', () => {
   it('action:model:dynamicTableName', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       const entityTest = scopeTest.entity.test;
       const modelTest = scopeTest.model.testDynamicTable;
       // tableName

package/test/database/dtoLazy.test.ts

@@ -37,7 +37,7 @@ describe('dtoLazy.test.ts', () => {
       const schema = $schema(beanOptions.beanClass);
       registry.register(beanOptions.beanFullName, schema);
       const generator = new OpenApiGeneratorV31(registry.definitions);
-      const apiObj = generator.generateDocument(app.bean.scope('a-openapi').config.generateDocument.V31);
+      const apiObj = generator.generateDocument(app.scope('a-openapi').config.generateDocument.V31);
       assert.equal(cast(apiObj).components.schemas['test-vona.dto.userLazy'].properties.user.$ref, '#/components/schemas/test-vona.dto.userLazy');
       assert.equal(cast(apiObj).components.schemas['test-vona.dto.roleLazy'].properties.users.items.$ref, '#/components/schemas/test-vona.dto.userLazy');
     });

package/test/database/modelAggregate.test.ts

@@ -10,7 +10,7 @@ describe('modelAggregate.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelAggregate';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // insert: roles
       const roles = await scopeTest.model.role.insertBulk([
         { name: `${prefix}:family` },

package/test/database/modelCache.test.ts

@@ -7,7 +7,7 @@ describe('modelCache.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelCache:cacheQuery';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // create
       const user = await scopeTest.model.user.insert({ name: `${prefix}:1` });
       // select

package/test/database/modelGeneral.test.ts

@@ -7,7 +7,7 @@ describe('model.test.ts', () => {
   it('action:model:defaultValue', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // create
       const item = await scopeTest.model.test.insert();
       assert.equal(isNil(item.testDate), false);

package/test/database/modelGroup.test.ts

@@ -10,7 +10,7 @@ describe('modelGroup.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelGroup';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // insert: roles
       const roles = await scopeTest.model.role.insertBulk([
         { name: `${prefix}:family` },

package/test/database/modelMagic.test.ts

@@ -7,7 +7,7 @@ describe('modelMagic.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const name = 'modelMagic:001';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // create
       const item = await scopeTest.model.user.insert({ name });
       assert.equal(item.name, name);

package/test/database/modelRelations.test.ts

@@ -10,7 +10,7 @@ describe('modelRelations.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelRelations';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // test data: create
       const testData = await scopeTest.service.testData.create(prefix);
       const {

package/test/database/modelRelationsJoins.test.ts

@@ -7,7 +7,7 @@ describe('modelRelationsJoins.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelRelationsJoins';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // test data: create
       const testData = await scopeTest.service.testData.create(prefix);
       const {

package/test/database/modelRelationsMutate.test.ts

@@ -9,7 +9,7 @@ describe('modelRelationsMutate.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelRelationsMutate';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // insert: roles
       const roles = await scopeTest.model.role.insertBulk([
         { name: `${prefix}:family` },
@@ -154,7 +154,7 @@ describe('modelRelationsMutate.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelRelationsMutateWith';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // insert: roles
       const roles = await scopeTest.model.role.insertBulk([
         { name: `${prefix}:family` },
@@ -301,7 +301,7 @@ describe('modelRelationsMutate.test.ts', () => {
     await app.bean.executor.mockCtx(async () => {
       const prefix = 'action:modelRelationsMutateTree';
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // create: categoryTree
       const categoryTree = await scopeTest.model.category.insert({
         name: `${prefix}:1`,

package/test/database/modelWhere.test.ts

@@ -7,7 +7,7 @@ describe('modelWhere.test.ts', () => {
   it('action:modelWhere', async () => {
     await app.bean.executor.mockCtx(async () => {
       if (app.bean.database.current.dialectName !== 'pg') return;
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // ref
       let builder = scopeTest.model.post.builder();
       scopeTest.model.post.buildWhere(builder, { id: scopeTest.model.post.ref('id') as any });

package/test/database/orm.test.ts

@@ -5,7 +5,7 @@ describe('orm.test.ts', () => {
   it('action:orm:hasOne', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // create: post/postContent
       const post1 = await scopeTest.model.post.insert({
         title: 'action:orm:hasOne:post1',

package/test/database/transaction.test.ts

@@ -42,7 +42,7 @@ describe('transaction.test.ts', () => {
     });
 
     // aop method
-    const scopeTest = app.bean.scope('test-vona');
+    const scopeTest = app.scope('test-vona');
     await app.bean.executor.mockCtx(async () => {
       // create table
       await app.bean.model.createTable(tableNameFail, table => {
@@ -109,7 +109,7 @@ describe('transaction.test.ts', () => {
     });
 
     // aop method
-    const scopeTest = app.bean.scope('test-vona');
+    const scopeTest = app.scope('test-vona');
     await app.bean.executor.mockCtx(async () => {
       // create table
       await app.bean.model.createTable(tableNameSuccess, table => {

package/test/event.test.ts

@@ -6,7 +6,7 @@ describe('event.test.ts', () => {
   it('action:event', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       const result = await scopeTest.event.helloEcho.emit({ text: 'hello' }, 'world');
       assert.equal(result, 'hello world');
     });

package/test/instance.test.ts

@@ -5,7 +5,7 @@ import { app } from 'vona-mock';
 describe('instance.test.ts', () => {
   it('action:instance:shareTest', async () => {
     await app.bean.executor.mockCtx(async () => {
-      const scopeDatabase = app.bean.scope('a-orm');
+      const scopeDatabase = app.scope('a-orm');
       const defaultClientName = scopeDatabase.service.database.getDefaultClientName();
       assert.equal(app.ctx.instanceName, 'shareTest');
       assert.equal(app.ctx.instance.name, 'shareTest');
@@ -15,7 +15,7 @@ describe('instance.test.ts', () => {
   });
   it('action:instance:isolateTest', async () => {
     await app.bean.executor.mockCtx(async () => {
-      const scopeDatabase = app.bean.scope('a-orm');
+      const scopeDatabase = app.scope('a-orm');
       const defaultClientName = scopeDatabase.service.database.getDefaultClientName();
       assert.equal(app.ctx.instanceName, 'isolateTest');
       assert.equal(app.ctx.instance.name, 'isolateTest');

package/test/locale.test.ts

@@ -19,7 +19,7 @@ describe('locale.test.ts', () => {
         );
         assert.equal(app.meta.locale.getText(false, undefined, ctx.locale, 'test-vona::TestHelloWorld'), '您好，世界');
         // scope locale
-        const scopeTest = app.bean.scope('test-vona');
+        const scopeTest = app.scope('test-vona');
         assert.equal(scopeTest.locale.TestHelloWorld(), '您好，世界');
       },
       { locale: 'zh-cn' },
@@ -29,7 +29,7 @@ describe('locale.test.ts', () => {
   it('action:locale:plurals', async () => {
     await app.bean.executor.mockCtx(async () => {
       // scope
-      const scopeTest = app.bean.scope('test-vona');
+      const scopeTest = app.scope('test-vona');
       // english
       assert.equal(scopeTest.locale.TestApples.locale('en-us', 0), 'no apples');
       assert.equal(scopeTest.locale.TestApples.locale('en-us', 1), 'one apple');