@midwayjs/typegoose 2.13.4 → 2.14.6

package/CHANGELOG.md

@@ -3,6 +3,47 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.14.6](https://github.com/midwayjs/midway/compare/v2.14.5...v2.14.6) (2022-02-08)
+
+**Note:** Version bump only for package @midwayjs/typegoose
+
+
+
+
+
+## [2.14.2](https://github.com/midwayjs/midway/compare/v2.14.1...v2.14.2) (2021-12-28)
+
+
+### Bug Fixes
+
+* generate middleware typings ([#1442](https://github.com/midwayjs/midway/issues/1442)) ([1b2f99b](https://github.com/midwayjs/midway/commit/1b2f99b0fcfa6d87fa216ac9277d9f1240ef26a2))
+
+
+
+
+
+# [2.14.0](https://github.com/midwayjs/midway/compare/v2.13.5...v2.14.0) (2021-12-06)
+
+
+### Bug Fixes
+
+* mongoose init before config load ([#1401](https://github.com/midwayjs/midway/issues/1401)) ([34d2ab8](https://github.com/midwayjs/midway/commit/34d2ab8b5bcfc9bddf52b9a93d6f3b44960ef537))
+
+
+
+
+
+## [2.13.5](https://github.com/midwayjs/midway/compare/v2.13.4...v2.13.5) (2021-10-21)
+
+
+### Bug Fixes
+
+* remove connection key ([#1337](https://github.com/midwayjs/midway/issues/1337)) ([8e7e912](https://github.com/midwayjs/midway/commit/8e7e9124abbd66c27443851d67217ee76daac8fd))
+
+
+
+
+
 ## [2.13.4](https://github.com/midwayjs/midway/compare/v2.13.3...v2.13.4) (2021-10-21)
 
 

package/dist/configuration.d.ts

@@ -1,13 +1,11 @@
-import * as mongoose from '@midwayjs/mongoose';
-import { IMidwayApplication } from '@midwayjs/core';
+import { IMidwayApplication, IMidwayContainer } from '@midwayjs/core';
 export declare class TypegooseConfiguration {
-    connectionFactory: mongoose.MongooseConnectionServiceFactory;
     oldMongooseConfig: any;
     legacyMode: boolean;
     app: IMidwayApplication;
-    modelMap: Map<any, any>;
+    modelMap: WeakMap<object, any>;
     init(): Promise<void>;
-    onReady(): Promise<void>;
+    onReady(container: IMidwayContainer): Promise<void>;
     onStop(): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -18,29 +18,27 @@ const mongo = require("mongoose");
 let TypegooseConfiguration = class TypegooseConfiguration {
     constructor() {
         this.legacyMode = false;
-        this.modelMap = new Map();
+        this.modelMap = new WeakMap();
     }
     async init() {
         this.app
             .getApplicationContext()
             .registerDataHandler(interface_1.ENTITY_MODEL_KEY, (key) => {
             // return getConnection(key.connectionName).getRepository(key.modelKey);
-            return this.modelMap.get(key.connectionName).get(key.modelKey);
+            return this.modelMap.get(key.modelKey);
         });
     }
-    async onReady() {
+    async onReady(container) {
         var _a, _b;
+        const connectionFactory = await container.getAsync(mongoose.MongooseConnectionServiceFactory);
         const Models = (0, decorator_1.listModule)(interface_1.ENTITY_MODEL_KEY);
         for (const Model of Models) {
             const metadata = (_a = (0, decorator_1.getClassMetadata)(interface_1.ENTITY_MODEL_KEY, Model)) !== null && _a !== void 0 ? _a : {};
             const connectionName = (_b = metadata.connectionName) !== null && _b !== void 0 ? _b : 'default';
-            const conn = this.connectionFactory.get(connectionName);
+            const conn = connectionFactory.get(connectionName);
             if (conn) {
                 const model = (0, typegoose_1.getModelForClass)(Model, { existingConnection: conn });
-                if (!this.modelMap.has(connectionName)) {
-                    this.modelMap.set(connectionName, new WeakMap());
-                }
-                this.modelMap.get(connectionName).set(Model, model);
+                this.modelMap.set(Model, model);
             }
             else {
                 throw new Error(`connection name ${metadata.connectionName} not found`);
@@ -58,10 +56,6 @@ let TypegooseConfiguration = class TypegooseConfiguration {
         }
     }
 };
-__decorate([
-    (0, decorator_1.Inject)(),
-    __metadata("design:type", mongoose.MongooseConnectionServiceFactory)
-], TypegooseConfiguration.prototype, "connectionFactory", void 0);
 __decorate([
     (0, decorator_1.Config)('mongoose'),
     __metadata("design:type", Object)

package/dist/decorator/injectEntityModel.d.ts

@@ -1,2 +1,2 @@
-export declare function InjectEntityModel(modelKey: any, connectionName?: string): (target: any, propertyKey: string) => void;
+export declare function InjectEntityModel(modelKey: any, connectionName?: any): (target: any, propertyKey: string) => void;
 //# sourceMappingURL=injectEntityModel.d.ts.map

package/dist/decorator/injectEntityModel.js

@@ -3,12 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectEntityModel = void 0;
 const decorator_1 = require("@midwayjs/decorator");
 const interface_1 = require("../interface");
-function InjectEntityModel(modelKey, connectionName = 'default') {
+function InjectEntityModel(modelKey, connectionName) {
     return (target, propertyKey) => {
         (0, decorator_1.attachClassMetadata)(interface_1.ENTITY_MODEL_KEY, {
             key: {
                 modelKey,
-                connectionName,
             },
             propertyName: propertyKey,
         }, target);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/typegoose",
-  "version": "2.13.4",
+  "version": "2.14.6",
   "description": "Midway Component for typegoose",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -21,14 +21,14 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@midwayjs/mongoose": "^2.13.4"
+    "@midwayjs/mongoose": "^2.14.6"
   },
   "devDependencies": {
-    "@midwayjs/core": "^2.13.4",
-    "@midwayjs/decorator": "^2.13.2",
-    "@midwayjs/mock": "^2.13.4",
+    "@midwayjs/core": "^2.14.6",
+    "@midwayjs/decorator": "^2.14.0",
+    "@midwayjs/mock": "^2.14.6",
     "@typegoose/typegoose": "^9.0.0",
-    "mongoose": "~6.0.11"
+    "mongoose": "^6.1.3"
   },
-  "gitHead": "9e61ff6e854b5641201e7d3df8aa19a7d6287f3d"
+  "gitHead": "9041633a98444568643bb5a1e8f10bb58e1f1b19"
 }