@midwayjs/sequelize 3.5.1 → 3.6.0

package/dist/configuration.d.ts

@@ -1,5 +1,5 @@
-import { SequelizeDataSourceManager } from './dataSourceManager';
 import { IMidwayContainer, MidwayDecoratorService } from '@midwayjs/core';
+import { SequelizeDataSourceManager } from './dataSourceManager';
 export declare class SequelizeConfiguration {
     sequelizeConfig: any;
     decoratorService: MidwayDecoratorService;

package/dist/configuration.js

@@ -10,13 +10,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequelizeConfiguration = void 0;
-const decorator_1 = require("@midwayjs/decorator");
-const dataSourceManager_1 = require("./dataSourceManager");
 const core_1 = require("@midwayjs/core");
-const decorator_2 = require("./decorator");
+const dataSourceManager_1 = require("./dataSourceManager");
+const decorator_1 = require("./decorator");
 let SequelizeConfiguration = class SequelizeConfiguration {
     async init() {
-        this.decoratorService.registerPropertyHandler(decorator_2.ENTITY_MODEL_KEY, (propertyName, meta) => {
+        this.decoratorService.registerPropertyHandler(decorator_1.ENTITY_MODEL_KEY, (propertyName, meta) => {
             return this.dataSourceManager
                 .getDataSource(meta.connectionName ||
                 this.dataSourceManager.getDataSourceNameByModel(meta.modelKey))
@@ -33,21 +32,21 @@ let SequelizeConfiguration = class SequelizeConfiguration {
     }
 };
 __decorate([
-    (0, decorator_1.Config)('sequelize'),
+    (0, core_1.Config)('sequelize'),
     __metadata("design:type", Object)
 ], SequelizeConfiguration.prototype, "sequelizeConfig", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", core_1.MidwayDecoratorService)
 ], SequelizeConfiguration.prototype, "decoratorService", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], SequelizeConfiguration.prototype, "init", null);
 SequelizeConfiguration = __decorate([
-    (0, decorator_1.Configuration)({
+    (0, core_1.Configuration)({
         namespace: 'sequelize',
         importConfigs: [
             {

package/dist/dataSourceManager.js

@@ -10,7 +10,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequelizeDataSourceManager = void 0;
-const decorator_1 = require("@midwayjs/decorator");
 const core_1 = require("@midwayjs/core");
 const sequelize_typescript_1 = require("sequelize-typescript");
 let SequelizeDataSourceManager = class SequelizeDataSourceManager extends core_1.DataSourceManager {
@@ -27,7 +26,7 @@ let SequelizeDataSourceManager = class SequelizeDataSourceManager extends core_1
             client.addModels(entities);
         }
         // 兼容老写法，但是这里可能有问题，会添加到所有的数据源之中
-        const listEntities = (0, decorator_1.listModule)('sequelize:core');
+        const listEntities = (0, core_1.listModule)('sequelize:core');
         client.addModels(listEntities);
         await client.authenticate();
         if (config.sync) {
@@ -53,26 +52,26 @@ let SequelizeDataSourceManager = class SequelizeDataSourceManager extends core_1
     }
 };
 __decorate([
-    (0, decorator_1.Config)('sequelize'),
+    (0, core_1.Config)('sequelize'),
     __metadata("design:type", Object)
 ], SequelizeDataSourceManager.prototype, "sequelizeConfig", void 0);
 __decorate([
-    (0, decorator_1.Logger)('coreLogger'),
+    (0, core_1.Logger)('coreLogger'),
     __metadata("design:type", Object)
 ], SequelizeDataSourceManager.prototype, "coreLogger", void 0);
 __decorate([
-    (0, decorator_1.Inject)(),
+    (0, core_1.Inject)(),
     __metadata("design:type", String)
 ], SequelizeDataSourceManager.prototype, "baseDir", void 0);
 __decorate([
-    (0, decorator_1.Init)(),
+    (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], SequelizeDataSourceManager.prototype, "init", null);
 SequelizeDataSourceManager = __decorate([
-    (0, decorator_1.Provide)(),
-    (0, decorator_1.Scope)(decorator_1.ScopeEnum.Singleton)
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], SequelizeDataSourceManager);
 exports.SequelizeDataSourceManager = SequelizeDataSourceManager;
 //# sourceMappingURL=dataSourceManager.js.map

package/dist/decorator.js

@@ -1,18 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InjectRepository = exports.ENTITY_MODEL_KEY = exports.BaseTable = void 0;
-const decorator_1 = require("@midwayjs/decorator");
+const core_1 = require("@midwayjs/core");
 const sequelize_typescript_1 = require("sequelize-typescript");
-const decorator_2 = require("@midwayjs/decorator");
 function BaseTable(arg) {
     if (typeof arg === 'function') {
-        (0, decorator_2.saveModule)('sequelize:core', arg);
+        (0, core_1.saveModule)('sequelize:core', arg);
         annotate(arg);
     }
     else {
         const options = Object.assign({}, arg);
         return target => {
-            (0, decorator_2.saveModule)('sequelize:core', target);
+            (0, core_1.saveModule)('sequelize:core', target);
             annotate(target, options);
         };
     }
@@ -24,7 +23,7 @@ function annotate(target, options = {}) {
 }
 exports.ENTITY_MODEL_KEY = 'sequelize:entity_model_key';
 function InjectRepository(modelKey, connectionName) {
-    return (0, decorator_1.createCustomPropertyDecorator)(exports.ENTITY_MODEL_KEY, {
+    return (0, core_1.createCustomPropertyDecorator)(exports.ENTITY_MODEL_KEY, {
         modelKey,
         connectionName,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/sequelize",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "main": "dist/index",
   "typings": "index.d.ts",
   "files": [
@@ -9,14 +9,13 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.5.1",
-    "@midwayjs/decorator": "^3.4.11",
-    "@midwayjs/koa": "^3.5.1",
-    "@midwayjs/mock": "^3.5.1",
-    "sqlite3": "5.0.11"
+    "@midwayjs/core": "^3.6.0",
+    "@midwayjs/koa": "^3.6.0",
+    "@midwayjs/mock": "^3.6.0",
+    "sqlite3": "5.1.2"
   },
   "dependencies": {
-    "sequelize": "6.21.4",
+    "sequelize": "6.24.0",
     "sequelize-typescript": "^2.1.0"
   },
   "keywords": [
@@ -41,5 +40,5 @@
     "type": "git",
     "url": "http://github.com/midwayjs/midway.git"
   },
-  "gitHead": "3b63fc768617037644602dd5ad66d3734ce01b16"
+  "gitHead": "22643b0e8519766bb7c68b975930199fc136336e"
 }