feat(mongoose): @tsed/mongoose need mongoose v6 as minimal version

tsedio · Apr 2, 2022 · 85605e6 · 85605e6
1 parent 0668c3d
commit 85605e6
Show file tree

Hide file tree

Showing 24 changed files with 215 additions and 298 deletions.
diff --git a/package.json b/package.json
@@ -106,21 +106,21 @@
   "devDependencies": {
     "@commitlint/cli": "^16.1.0",
     "@commitlint/config-conventional": "^16.0.0",
-    "@tsed/monorepo-utils": "1.20.1",
+    "@tsed/monorepo-utils": "1.20.2",
     "@tsed/ts-doc": "4.0.14",
     "@types/axios": "0.14.0",
-    "@types/chai": "4.2.12",
-    "@types/chai-as-promised": "7.1.3",
-    "@types/faker": "5.5.9",
+    "@types/chai": "4.3.0",
+    "@types/chai-as-promised": "7.1.5",
+    "@types/faker": "6.6.9",
     "@types/globby": "9.1.0",
     "@types/jest": "27.4.1",
-    "@types/mocha": "8.2.2",
-    "@types/node": "14.14.34",
+    "@types/mocha": "9.1.0",
+    "@types/node": "17.0.23",
     "@types/proxyquire": "1.3.28",
     "@types/sinon": "10.0.11",
-    "@types/sinon-chai": "3.2.4",
-    "@types/superagent": "4.1.10",
-    "@types/supertest": "2.0.10",
+    "@types/sinon-chai": "3.2.8",
+    "@types/superagent": "4.1.15",
+    "@types/supertest": "2.0.12",
     "@typescript-eslint/eslint-plugin": "^5.11.0",
     "@typescript-eslint/parser": "^5.11.0",
     "chai": "4.2.0",
@@ -174,7 +174,7 @@
     ]
   },
   "resolutions": {
-    "mongoose": "6.1.7"
+    "mongoose": "6.2.9"
   },
   "collective": {
     "type": "opencollective",

diff --git a/packages/orm/adapters-redis/package.json b/packages/orm/adapters-redis/package.json
@@ -26,7 +26,7 @@
   },
   "devDependencies": {
     "@tsed/core": "6.107.5",
-    "@types/ioredis": "4.17.11",
+    "@types/ioredis": "4.28.10",
     "@types/ioredis-mock": "^5.6.0",
     "ioredis": "4.19.4",
     "ioredis-mock": "5.2.0"

diff --git a/packages/orm/adapters/package.json b/packages/orm/adapters/package.json
@@ -35,7 +35,7 @@
     "@tsed/di": "6.107.5",
     "@tsed/json-mapper": "6.107.5",
     "@tsed/schema": "6.107.5",
-    "@types/fs-extra": "9.0.6"
+    "@types/fs-extra": "9.0.13"
   },
   "peerDependencies": {
     "@tsed/ajv": "6.107.5",

diff --git a/packages/orm/mongoose/src/decorators/model.ts b/packages/orm/mongoose/src/decorators/model.ts
@@ -66,7 +66,7 @@ export function Model(options: MongooseModelOptions = {}) {
           schema,
           collectionName,
           options.collection,
-          options.skipInit,
+          options.overwriteModels,
           connections.get(options.connection),
           options.discriminatorValue
         );

diff --git a/packages/orm/mongoose/src/interfaces/MongooseModelOptions.ts b/packages/orm/mongoose/src/interfaces/MongooseModelOptions.ts
@@ -1,9 +1,10 @@
 import {MongooseSchemaOptions} from "./MongooseSchemaOptions";
+import {CompileModelOptions} from "mongoose";
 
 export interface MongooseModelOptions extends MongooseSchemaOptions {
   name?: string;
   connection?: string;
   collection?: string;
-  skipInit?: boolean;
+  overwriteModels?: boolean;
   discriminatorValue?: string;
 }
diff --git a/packages/orm/mongoose/src/services/MongooseConnections.ts b/packages/orm/mongoose/src/services/MongooseConnections.ts
@@ -47,16 +47,7 @@ registerProvider({
     let isDefault = true;
 
     for (const current of settings) {
-      await mongooseService.connect(
-        current.id,
-        current.url,
-        current.connectionOptions || {
-          useCreateIndex: true,
-          useNewUrlParser: true,
-          useUnifiedTopology: true
-        },
-        isDefault
-      );
+      await mongooseService.connect(current.id, current.url, current.connectionOptions || {}, isDefault);
 
       isDefault = false;
     }

diff --git a/packages/orm/mongoose/src/utils/createModel.spec.ts b/packages/orm/mongoose/src/utils/createModel.spec.ts
@@ -16,7 +16,7 @@ describe("createModel()", () => {
     });
 
     it("should call mongoose.model", () => {
-      expect(mongoose.model).toHaveBeenCalledWith("name", schema, "collection", true);
+      expect(mongoose.model).toHaveBeenCalledWith("name", schema, "collection", {overwriteModels: true});
     });
   });
 

diff --git a/packages/orm/mongoose/src/utils/createModel.ts b/packages/orm/mongoose/src/utils/createModel.ts
@@ -1,5 +1,5 @@
 import {ancestorsOf, nameOf, Store, Type} from "@tsed/core";
-import mongoose, {Connection, Model as MongooseModel} from "mongoose";
+import mongoose, {CompileModelOptions, Connection, Model as MongooseModel} from "mongoose";
 import {MONGOOSE_MODEL, MONGOOSE_MODEL_NAME, MONGOOSE_SCHEMA_OPTIONS} from "../constants/constants";
 import {MongooseModels} from "../registries/MongooseModels";
 import {getSchemaToken} from "./createSchema";
@@ -20,7 +20,7 @@ export function getModelToken(target: Type<any>, options: any) {
  * @param {"mongoose".Schema} schema Schema that will be attached to the model.
  * @param name model name
  * @param collection (optional, induced from model name)
- * @param skipInit whether to skip initialization (defaults to false)
+ * @param overwriteModels
  * @param connection
  * @param discriminatorValue
  * @returns {Model<T extends Document>}
@@ -30,7 +30,7 @@ export function createModel<T>(
   schema: mongoose.Schema,
   name: string = nameOf(target),
   collection?: string,
-  skipInit?: boolean,
+  overwriteModels?: boolean,
   connection?: Connection,
   discriminatorValue?: string
 ) {
@@ -52,14 +52,11 @@ export function createModel<T>(
     }
   }
 
-  /* istanbul ignore else */
-  if (connection) {
-    const model = connection.model(name, schema, collection);
-    Store.from(target).set(MONGOOSE_MODEL, model);
-    return model;
-  }
+  const opts = overwriteModels ? {overwriteModels} : undefined;
+  const c = connection || mongoose;
 
-  const model = mongoose.model(name, schema, collection, skipInit);
+  const model = c.model(name, schema, collection, opts);
   Store.from(target).set(MONGOOSE_MODEL, model);
+
   return model;
 }
diff --git a/packages/orm/mongoose/src/utils/createSchema.spec.ts b/packages/orm/mongoose/src/utils/createSchema.spec.ts
@@ -102,7 +102,7 @@ describe("createSchema", () => {
     }
 
     // WHEN
-    const result = getSchema(Test2);
+    const result: any = getSchema(Test2);
 
     // THEN
     expect(result.obj.test.required).toBeInstanceOf(Function);

diff --git a/packages/orm/mongoose/test/ref.integration.spec.ts b/packages/orm/mongoose/test/ref.integration.spec.ts
@@ -39,7 +39,7 @@ const baseUser = {
 
 const baseProfile = {
   image: faker.image.avatar(),
-  age: faker.random.number(2)
+  age: faker.datatype.number(2)
 };
 
 describe("Mongoose", () => {

diff --git a/packages/orm/mongoose/test/subdocument.integration.spec.ts b/packages/orm/mongoose/test/subdocument.integration.spec.ts
@@ -23,8 +23,8 @@ describe("Mongoose", () => {
     afterEach(TestMongooseContext.reset);
 
     it("should create model with sub document", () => {
-      const documentSchema = getSchema(TestModelDocument);
-      const subDocumentSchema = getSchema(TestSubDocument);
+      const documentSchema: any = getSchema(TestModelDocument);
+      const subDocumentSchema: any = getSchema(TestSubDocument);
 
       expect(documentSchema.obj.sub.type.obj.prop.type).toBe(String);
       expect(documentSchema.obj.sub.type).toBe(subDocumentSchema);

diff --git a/packages/orm/testing-mongoose/src/TestMongooseContext.ts b/packages/orm/testing-mongoose/src/TestMongooseContext.ts
@@ -73,7 +73,7 @@ export class TestMongooseContext extends PlatformTest {
     await Promise.all(promises);
   }
 
-  static async getMongooseOptions() {
+  static async getMongooseOptions(): Promise<any> {
     const mongo = TestMongooseContext.getMongo();
     try {
       !["running", "starting"].includes(mongo.state) && (await mongo.start());

diff --git a/packages/platform/common/package.json b/packages/platform/common/package.json
@@ -99,5 +99,6 @@
     "@tsed/logger-file": {
       "optional": false
     }
-  }
+  },
+  "devDependencies": {}
 }
diff --git a/packages/platform/platform-express/package.json b/packages/platform/platform-express/package.json
@@ -64,14 +64,14 @@
     "@tsed/common": "6.107.5",
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
-    "@tsed/platform-views": "6.107.5",
     "@tsed/platform-test-utils": "6.107.5",
-    "@types/body-parser": "1.19.0",
-    "@types/compression": "1.7.0",
+    "@tsed/platform-views": "6.107.5",
+    "@types/body-parser": "1.19.2",
+    "@types/compression": "1.7.2",
     "@types/cookie-parser": "1.4.2",
     "@types/express": "^4.17.7",
-    "@types/express-session": "1.17.0",
-    "@types/method-override": "0.0.31",
+    "@types/express-session": "1.17.4",
+    "@types/method-override": "0.0.32",
     "@types/multer": "^1.4.3",
     "body-parser": "1.19.0",
     "compression": "1.7.4",
@@ -85,10 +85,10 @@
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
     "@tsed/json-mapper": "6.107.5",
+    "@tsed/logger": ">=6.1.1",
     "@tsed/openspec": "6.107.5",
     "@tsed/platform-views": "6.107.5",
     "@tsed/schema": "6.107.5",
-    "@tsed/logger": ">=6.1.1",
     "@types/multer": "^1.4.5",
     "body-parser": "1.19.0"
   },

diff --git a/packages/platform/platform-koa/package.json b/packages/platform/platform-koa/package.json
@@ -55,20 +55,20 @@
     "url": "git+https://github.com/tsedio/tsed.git"
   },
   "devDependencies": {
-    "@koa/cors": "3.1.0",
+    "@koa/cors": "3.3.0",
     "@tsed/common": "6.107.5",
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
     "@tsed/platform-test-utils": "6.107.5",
-    "@types/koa": "2.11.3",
-    "@types/koa-bodyparser": "4.3.0",
+    "@types/koa": "2.13.4",
+    "@types/koa-bodyparser": "4.3.7",
     "@types/koa-compose": "3.2.5",
-    "@types/koa-compress": "4.0.0",
-    "@types/koa-json": "2.0.18",
+    "@types/koa-compress": "4.0.3",
+    "@types/koa-json": "2.0.20",
     "@types/koa-mount": "4.0.1",
-    "@types/koa-send": "4.1.2",
-    "@types/koa-session": "5.10.2",
-    "@types/koa__router": "8.0.2",
+    "@types/koa-send": "4.1.3",
+    "@types/koa-session": "5.10.6",
+    "@types/koa__router": "8.0.11",
     "koa": "2.13.0",
     "koa-bodyparser": "4.3.0",
     "koa-compress": "5.0.1",
@@ -88,9 +88,9 @@
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
     "@tsed/json-mapper": "6.107.5",
+    "@tsed/logger": ">=6.1.1",
     "@tsed/openspec": "6.107.5",
     "@tsed/schema": "6.107.5",
-    "@tsed/logger": ">=6.1.1",
     "koa": ">=2.13.0",
     "koa-bodyparser": ">=4.3.0",
     "koa-compress": ">=5.0.1",

diff --git a/packages/platform/platform-views/package.json b/packages/platform/platform-views/package.json
@@ -30,7 +30,7 @@
     "@tsed/engines": "^1.1.5",
     "@tsed/exceptions": "6.107.5",
     "@tsed/schema": "6.107.5",
-    "@types/consolidate": "0.14.0",
+    "@types/consolidate": "0.14.1",
     "@types/ejs": "3.1.0"
   },
   "peerDependencies": {

diff --git a/packages/security/oidc-provider/package.json b/packages/security/oidc-provider/package.json
@@ -44,9 +44,9 @@
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
     "@tsed/exceptions": "6.107.5",
-    "@types/lowdb": "1.0.9",
+    "@types/lowdb": "1.0.11",
     "@types/oidc-provider": "^7.1.1",
-    "@types/uuid": "8.3.0",
+    "@types/uuid": "8.3.4",
     "oidc-provider": "7.10.1"
   },
   "peerDependencies": {

diff --git a/packages/security/oidc-provider/src/domain/OidcAccountsMethods.ts b/packages/security/oidc-provider/src/domain/OidcAccountsMethods.ts
@@ -4,11 +4,12 @@ import {Provider, Account} from "oidc-provider";
 export type AuthorizationCode = InstanceType<Provider["AuthorizationCode"]>;
 export type AccessToken = InstanceType<Provider["AccessToken"]>;
 export type DeviceCode = InstanceType<Provider["DeviceCode"]>;
+export type BackchannelAuthenticationRequest = InstanceType<Provider["BackchannelAuthenticationRequest"]>;
 
 export interface OidcAccountsMethods {
   findAccount(
     id: string,
-    token: AuthorizationCode | AccessToken | DeviceCode | undefined,
+    token: AuthorizationCode | AccessToken | DeviceCode | BackchannelAuthenticationRequest | undefined,
     ctx: PlatformContext
   ): Promise<Account | undefined>;
 }
diff --git a/packages/security/passport/package.json b/packages/security/passport/package.json
@@ -28,8 +28,8 @@
     "@tsed/common": "6.107.5",
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
-    "@types/passport": "1.0.4",
-    "@types/passport-http": "0.3.8",
+    "@types/passport": "1.0.7",
+    "@types/passport-http": "0.3.9",
     "@types/passport-local": "1.0.34",
     "@types/passport-strategy": "0.2.35",
     "passport": "0.4.1",

diff --git a/packages/specs/schema/package.json b/packages/specs/schema/package.json
@@ -43,12 +43,12 @@
     "tslib": "2.3.1"
   },
   "devDependencies": {
-    "@apidevtools/swagger-parser": "10.0.2",
+    "@apidevtools/swagger-parser": "10.0.3",
     "@tsed/core": "6.107.5",
     "@tsed/openspec": "6.107.5",
-    "@types/fs-extra": "9.0.6",
-    "@types/json-schema": "7.0.7",
-    "@types/micromatch": "4.0.1",
+    "@types/fs-extra": "9.0.13",
+    "@types/json-schema": "7.0.11",
+    "@types/micromatch": "4.0.2",
     "@types/statuses": "2.0.0"
   },
   "peerDependencies": {

diff --git a/packages/third-parties/async-hook-context/package.json b/packages/third-parties/async-hook-context/package.json
@@ -41,5 +41,6 @@
   "devDependencies": {
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5"
-  }
+  },
+  "peerDependencies": {}
 }
diff --git a/packages/third-parties/stripe/package.json b/packages/third-parties/stripe/package.json
@@ -35,17 +35,17 @@
   "devDependencies": {
     "@tsed/core": "6.107.5",
     "@tsed/di": "6.107.5",
-    "@tsed/schema": "6.107.5",
     "@tsed/exceptions": "6.107.5",
     "@tsed/platform-middlewares": "6.107.5",
     "@tsed/platform-params": "6.107.5",
+    "@tsed/schema": "6.107.5",
     "stripe": "^8.129.0"
   },
   "peerDependencies": {
+    "@tsed/exceptions": "6.107.5",
     "@tsed/platform-middlewares": "6.107.5",
     "@tsed/platform-params": "6.107.5",
     "@tsed/schema": "6.107.5",
-    "@tsed/exceptions": "6.107.5",
     "@types/body-parser": "^1.19.0",
     "body-parser": "^1.19.0",
     "stripe": "^8.129.0"

diff --git a/tools/benchmarks/package.json b/tools/benchmarks/package.json
@@ -12,7 +12,7 @@
     "wrk": "1.2.1"
   },
   "devDependencies": {
-    "@types/bytes": "3.1.0",
+    "@types/bytes": "3.1.1",
     "@types/fancy-log": "1.3.1"
   },
   "scripts": {
@@ -21,4 +21,4 @@
     "benchmarks": "yarn build && node ./lib/checkBenchmarks.js"
   },
   "peerDependencies": {}
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ describe("createModel()", () => { @@
         });
         it("should call mongoose.model", () => {
-          expect(mongoose.model).toHaveBeenCalledWith("name", schema, "collection", true);
+          expect(mongoose.model).toHaveBeenCalledWith("name", schema, "collection", {overwriteModels: true});
         });
       });
@@ Expand Down @@