vona-module-test-vona 5.0.55 → 5.0.57

package/dist/.metadata/index.d.ts

@@ -404,6 +404,7 @@ declare module 'vona-module-test-vona' {
         relations: {
             posts: IModelRelationHasMany<ModelPost, 'userId', false, 'id' | 'title', ['test-vona:user', ModelPostContent], undefined, undefined>;
             roles: IModelRelationBelongsToMany<'test-vona:roleUser', 'test-vona:role', false, 'id' | 'name', undefined, undefined, undefined>;
+            orders: IModelRelationHasMany<ModelOrder, 'userId', false, undefined, undefined, undefined, undefined>;
         };
     }
     interface IModelOptionsUserStats {

package/dist/controller/order.d.ts

@@ -61,14 +61,14 @@ export declare class ControllerOrder extends BeanBase {
         joins?: import("vona-module-a-orm").IModelSelectParamsJoin<import("vona-module-test-vona").EntityOrder, import("vona").TypeRecordValues<{
             user: "testVonaUser";
             products: "testVonaProduct";
-        }>, import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelOrder> | import("vona").TypeRecordValues<{
+        }>, import("vona").TypeRecordValues<{
             user: "testVonaUser.name" | "testVonaUser.id" | "testVonaUser.iid" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.deleted" | "testVonaUser.age" | "testVonaUser.scores";
             products: "testVonaProduct.name" | "testVonaProduct.id" | "testVonaProduct.iid" | "testVonaProduct.createdAt" | "testVonaProduct.updatedAt" | "testVonaProduct.deleted" | "testVonaProduct.price" | "testVonaProduct.quantity" | "testVonaProduct.amount" | "testVonaProduct.orderId";
-        }>>[] | undefined;
-        orders?: import("vona-module-a-orm").IModelSelectParamsOrder<import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelOrder> | import("vona").TypeRecordValues<{
+        }> | import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelOrder>>[] | undefined;
+        orders?: import("vona-module-a-orm").IModelSelectParamsOrder<import("vona").TypeRecordValues<{
             user: "testVonaUser.name" | "testVonaUser.id" | "testVonaUser.iid" | "testVonaUser.createdAt" | "testVonaUser.updatedAt" | "testVonaUser.deleted" | "testVonaUser.age" | "testVonaUser.scores";
             products: "testVonaProduct.name" | "testVonaProduct.id" | "testVonaProduct.iid" | "testVonaProduct.createdAt" | "testVonaProduct.updatedAt" | "testVonaProduct.deleted" | "testVonaProduct.price" | "testVonaProduct.quantity" | "testVonaProduct.amount" | "testVonaProduct.orderId";
-        }>>[] | undefined;
+        }> | import("vona-module-a-orm").TypeEntityTableColumnNamesOfModelSelf<ModelOrder>>[] | undefined;
         limit?: number;
         offset?: number;
     }, undefined, undefined, undefined, 50>>;

package/dist/index.d.ts

@@ -1,2 +1,3 @@
 export * from './.metadata/index.ts';
 export * from './lib/index.ts';
+export * from './types/index.ts';

package/dist/index.js

@@ -550,7 +550,8 @@ let ModelUser = (_dec$16 = Model({
     }, ['test-vona:user', ModelPostContent]),
     roles: $relation.belongsToMany('test-vona:roleUser', 'test-vona:role', 'userId', 'roleId', {
       columns: ['id', 'name']
-    })
+    }),
+    orders: $relation.hasMany(() => ModelOrder, 'userId')
   },
   cache: {
     modelsClear: [() => ModelUserStats, () => ModelUserStatsGroup]

package/dist/types/index.d.ts

@@ -0,0 +1,5 @@
+declare module 'vona-module-a-orm' {
+    interface IDatabaseClientRecord {
+    }
+}
+export {};

package/package.json

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

package/src/.metadata/index.ts

@@ -491,6 +491,7 @@ export interface IModelOptionsUser {
         relations: {
           posts: IModelRelationHasMany<ModelPost, 'userId', false, 'id'|'title', ['test-vona:user',ModelPostContent], undefined, undefined>;
 roles: IModelRelationBelongsToMany<'test-vona:roleUser', 'test-vona:role', false, 'id'|'name',undefined,undefined,undefined>;
+orders: IModelRelationHasMany<ModelOrder, 'userId', false, undefined, undefined, undefined, undefined>;
         };
       }
 export interface IModelOptionsUserStats {

package/src/index.ts

@@ -1,2 +1,3 @@
 export * from './.metadata/index.ts';
 export * from './lib/index.ts';
+export * from './types/index.ts';

package/src/model/user.ts

@@ -1,6 +1,7 @@
 import type { IDecoratorModelOptions } from 'vona-module-a-orm';
 import { $relation, BeanModelBase, Model } from 'vona-module-a-orm';
 import { EntityUser } from '../entity/user.ts';
+import { ModelOrder } from './order.ts';
 import { ModelPost } from './post.ts';
 import { ModelPostContent } from './postContent.ts';
 import { ModelUserStats } from './userStats.ts';
@@ -13,6 +14,7 @@ export interface IModelOptionsUser extends IDecoratorModelOptions<EntityUser> {}
   relations: {
     posts: $relation.hasMany(() => ModelPost, 'userId', { columns: ['id', 'title'] }, ['test-vona:user', ModelPostContent]),
     roles: $relation.belongsToMany('test-vona:roleUser', 'test-vona:role', 'userId', 'roleId', { columns: ['id', 'name'] }),
+    orders: $relation.hasMany(() => ModelOrder, 'userId'),
   },
   cache: {
     modelsClear: [() => ModelUserStats, () => ModelUserStatsGroup],

package/src/types/index.ts

@@ -0,0 +1,6 @@
+declare module 'vona-module-a-orm' {
+  export interface IDatabaseClientRecord {
+    // 'user-pg': never;
+    // 'order-mysql': never;
+  }
+}

package/test/instance.test.ts

@@ -0,0 +1,26 @@
+import assert from 'node:assert';
+import { describe, it } from 'node:test';
+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 defaultClientName = scopeDatabase.service.database.getDefaultClientName();
+      assert.equal(app.ctx.instanceName, 'shareTest');
+      assert.equal(app.ctx.instance.name, 'shareTest');
+      assert.equal(app.bean.database.current.clientName, defaultClientName);
+      assert.equal(['pg', 'mysql'].includes(app.bean.database.current.clientName), true);
+    }, { instanceName: 'shareTest' as any });
+  });
+  it('action:instance:isolateTest', async () => {
+    await app.bean.executor.mockCtx(async () => {
+      const scopeDatabase = app.bean.scope('a-orm');
+      const defaultClientName = scopeDatabase.service.database.getDefaultClientName();
+      assert.equal(app.ctx.instanceName, 'isolateTest');
+      assert.equal(app.ctx.instance.name, 'isolateTest');
+      assert.equal(app.bean.database.current.clientName, defaultClientName);
+      assert.equal(app.bean.database.current.clientName, 'isolateTest');
+    }, { instanceName: 'isolateTest' as any });
+  });
+});