@midwayjs/typegoose 2.13.2 → 2.14.0

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.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)
+
+
+### Features
+
+* add mongoose component and support multi-instance for typegoose ([#1334](https://github.com/midwayjs/midway/issues/1334)) ([ec54224](https://github.com/midwayjs/midway/commit/ec54224d775a3cfde3ff280538c8db79bcff4610))
+
+
+
+
+
+## [2.13.3](https://github.com/midwayjs/midway/compare/v2.13.2...v2.13.3) (2021-09-28)
+
+**Note:** Version bump only for package @midwayjs/typegoose
+
+
+
+
+
 ## [2.13.2](https://github.com/midwayjs/midway/compare/v2.13.1...v2.13.2) (2021-09-09)
 
 **Note:** Version bump only for package @midwayjs/typegoose

package/dist/configuration.d.ts

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

package/dist/configuration.js

@@ -5,24 +5,76 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AutoConfiguration = void 0;
+exports.TypegooseConfiguration = void 0;
 const decorator_1 = require("@midwayjs/decorator");
-const path_1 = require("path");
-const mongoose = require("mongoose");
-let AutoConfiguration = class AutoConfiguration {
-    async onReady(app) {
-        await app.getAsync('mongoose:mongooseService');
+const mongoose = require("@midwayjs/mongoose");
+const interface_1 = require("./interface");
+const typegoose_1 = require("@typegoose/typegoose");
+const mongo = require("mongoose");
+let TypegooseConfiguration = class TypegooseConfiguration {
+    constructor() {
+        this.legacyMode = false;
+        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.modelKey);
+        });
+    }
+    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 = connectionFactory.get(connectionName);
+            if (conn) {
+                const model = (0, typegoose_1.getModelForClass)(Model, { existingConnection: conn });
+                this.modelMap.set(Model, model);
+            }
+            else {
+                throw new Error(`connection name ${metadata.connectionName} not found`);
+            }
+        }
+        // 兼容老代码
+        if (Models.length === 0 && this.oldMongooseConfig['uri']) {
+            this.legacyMode = true;
+            await mongo.connect(this.oldMongooseConfig.uri, this.oldMongooseConfig.options);
+        }
     }
     async onStop() {
-        await mongoose.disconnect();
+        if (this.legacyMode) {
+            await mongo.disconnect();
+        }
     }
 };
-AutoConfiguration = __decorate([
+__decorate([
+    (0, decorator_1.Config)('mongoose'),
+    __metadata("design:type", Object)
+], TypegooseConfiguration.prototype, "oldMongooseConfig", void 0);
+__decorate([
+    (0, decorator_1.App)(),
+    __metadata("design:type", Object)
+], TypegooseConfiguration.prototype, "app", void 0);
+__decorate([
+    (0, decorator_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], TypegooseConfiguration.prototype, "init", null);
+TypegooseConfiguration = __decorate([
     (0, decorator_1.Configuration)({
-        namespace: 'mongoose',
-        importConfigs: [(0, path_1.join)(__dirname, 'config')],
+        namespace: 'typegoose',
+        imports: [mongoose],
     })
-], AutoConfiguration);
-exports.AutoConfiguration = AutoConfiguration;
+], TypegooseConfiguration);
+exports.TypegooseConfiguration = TypegooseConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/decorator/entityModel.d.ts

@@ -0,0 +1,3 @@
+import { EntityOptions } from '../interface';
+export declare function EntityModel(options?: EntityOptions): ClassDecorator;
+//# sourceMappingURL=entityModel.d.ts.map

package/dist/decorator/entityModel.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntityModel = void 0;
+const decorator_1 = require("@midwayjs/decorator");
+const interface_1 = require("../interface");
+function EntityModel(options) {
+    return (target) => {
+        (0, decorator_1.saveModule)(interface_1.ENTITY_MODEL_KEY, target);
+        (0, decorator_1.saveClassMetadata)(interface_1.ENTITY_MODEL_KEY, options, target);
+    };
+}
+exports.EntityModel = EntityModel;
+//# sourceMappingURL=entityModel.js.map

package/dist/decorator/injectEntityModel.d.ts

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

package/dist/decorator/injectEntityModel.js

@@ -0,0 +1,17 @@
+"use strict";
+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) {
+    return (target, propertyKey) => {
+        (0, decorator_1.attachClassMetadata)(interface_1.ENTITY_MODEL_KEY, {
+            key: {
+                modelKey,
+            },
+            propertyName: propertyKey,
+        }, target);
+    };
+}
+exports.InjectEntityModel = InjectEntityModel;
+//# sourceMappingURL=injectEntityModel.js.map

package/dist/index.d.ts

@@ -1,5 +1,4 @@
-export { AutoConfiguration as Configuration } from './configuration';
-export * from './service/mongoose';
-export * from '@typegoose/typegoose';
-export * from './interface/config.type';
+export { TypegooseConfiguration as Configuration } from './configuration';
+export * from './decorator/entityModel';
+export * from './decorator/injectEntityModel';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -12,8 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
-Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.AutoConfiguration; } });
-__exportStar(require("./service/mongoose"), exports);
-__exportStar(require("@typegoose/typegoose"), exports);
-__exportStar(require("./interface/config.type"), exports);
+Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.TypegooseConfiguration; } });
+__exportStar(require("./decorator/entityModel"), exports);
+__exportStar(require("./decorator/injectEntityModel"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -0,0 +1,19 @@
+import * as mongoose from 'mongoose';
+export interface EntityOptions {
+    connectionName: string;
+}
+export declare const ENTITY_MODEL_KEY = "TYPEGOOSE:MODEL";
+interface M5 {
+    ConnectionOptions: unknown;
+}
+interface M6 {
+    ConnectOptions: unknown;
+}
+declare type ExtractConnectionOptions<T> = T extends M5 ? T['ConnectionOptions'] : T extends M6 ? T['ConnectOptions'] : never;
+declare type ConnectionOptions = ExtractConnectionOptions<typeof mongoose>;
+export declare type DefaultConfig = {
+    uri: string;
+    options: ConnectionOptions;
+};
+export {};
+//# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ENTITY_MODEL_KEY = void 0;
+exports.ENTITY_MODEL_KEY = 'TYPEGOOSE:MODEL';
+//# sourceMappingURL=interface.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/typegoose",
-  "version": "2.13.2",
+  "version": "2.14.0",
   "description": "Midway Component for typegoose",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -20,14 +20,15 @@
     "node": ">= 12.13.0"
   },
   "license": "MIT",
+  "dependencies": {
+    "@midwayjs/mongoose": "^2.14.0"
+  },
   "devDependencies": {
-    "@midwayjs/core": "^2.13.2",
-    "@midwayjs/decorator": "^2.13.2",
-    "@midwayjs/koa": "^2.13.2",
-    "@midwayjs/mock": "^2.13.2",
-    "@typegoose/typegoose": "^8.1.0",
-    "mongodb-memory-server": "^6.9.6",
-    "mongoose": "~5.13.3"
+    "@midwayjs/core": "^2.14.0",
+    "@midwayjs/decorator": "^2.14.0",
+    "@midwayjs/mock": "^2.14.0",
+    "@typegoose/typegoose": "^9.0.0",
+    "mongoose": "~6.0.11"
   },
-  "gitHead": "30cec549e5e393fb6ace1cecfb9c122d8ca647d0"
+  "gitHead": "5fd716b0e731162d8e9f0931790fde7402fb83de"
 }

package/dist/config/config.default.d.ts

@@ -1,9 +0,0 @@
-export declare const mongoose: {
-    uri: string;
-    options: {
-        useNewUrlParser: boolean;
-        useUnifiedTopology: boolean;
-        dbName: string;
-    };
-};
-//# sourceMappingURL=config.default.d.ts.map

package/dist/config/config.default.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mongoose = void 0;
-exports.mongoose = {
-    uri: 'mongodb://localhost:27017/',
-    options: { useNewUrlParser: true, useUnifiedTopology: true, dbName: 'test' },
-};
-//# sourceMappingURL=config.default.js.map

package/dist/interface/config.type.d.ts

@@ -1,6 +0,0 @@
-import * as mongoose from 'mongoose';
-export declare type DefaultConfig = {
-    uri: string;
-    options: mongoose.ConnectionOptions;
-};
-//# sourceMappingURL=config.type.d.ts.map

package/dist/interface/config.type.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=config.type.js.map

package/dist/service/mongoose.d.ts

@@ -1,5 +0,0 @@
-export declare class MongooseService {
-    config: any;
-    init(): Promise<void>;
-}
-//# sourceMappingURL=mongoose.d.ts.map

package/dist/service/mongoose.js

@@ -1,35 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongooseService = void 0;
-const decorator_1 = require("@midwayjs/decorator");
-const mongoose = require("mongoose");
-let MongooseService = class MongooseService {
-    async init() {
-        await mongoose.connect(this.config.uri, this.config.options);
-    }
-};
-__decorate([
-    (0, decorator_1.Config)('mongoose'),
-    __metadata("design:type", Object)
-], MongooseService.prototype, "config", void 0);
-__decorate([
-    (0, decorator_1.Init)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], MongooseService.prototype, "init", null);
-MongooseService = __decorate([
-    (0, decorator_1.Provide)('mongooseService'),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
-], MongooseService);
-exports.MongooseService = MongooseService;
-//# sourceMappingURL=mongoose.js.map