@midwayjs/sequelize 3.20.5 → 4.0.0-beta.1

package/dist/configuration.js

@@ -36,6 +36,7 @@ let SequelizeConfiguration = class SequelizeConfiguration {
         }
     }
 };
+exports.SequelizeConfiguration = SequelizeConfiguration;
 __decorate([
     (0, core_1.Config)('sequelize'),
     __metadata("design:type", Object)
@@ -50,30 +51,16 @@ __decorate([
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], SequelizeConfiguration.prototype, "init", null);
-SequelizeConfiguration = __decorate([
+exports.SequelizeConfiguration = SequelizeConfiguration = __decorate([
     (0, core_1.Configuration)({
         namespace: 'sequelize',
         importConfigs: [
             {
                 default: {
-                    sequelize: {
-                        validateConnection: true,
-                    },
+                    sequelize: {},
                 },
             },
         ],
-        importConfigFilter: config => {
-            if (config['sequelize'] && config['sequelize']['options']) {
-                config['sequelize'].options.sync = config['sequelize'].sync || false;
-                const legacyDataSourceConfig = config['sequelize'].options;
-                delete config['sequelize']['options'];
-                config['sequelize'].dataSource = {
-                    default: legacyDataSourceConfig,
-                };
-            }
-            return config;
-        },
     })
 ], SequelizeConfiguration);
-exports.SequelizeConfiguration = SequelizeConfiguration;
 //# sourceMappingURL=configuration.js.map

package/dist/dataSourceManager.d.ts

@@ -3,7 +3,6 @@ import { Sequelize } from 'sequelize-typescript';
 export declare class SequelizeDataSourceManager extends DataSourceManager<Sequelize> {
     sequelizeConfig: any;
     coreLogger: ILogger;
-    baseDir: string;
     init(): Promise<void>;
     getName(): string;
     protected createDataSource(config: any, dataSourceName: string): Promise<Sequelize>;

package/dist/dataSourceManager.js

@@ -14,7 +14,9 @@ const core_1 = require("@midwayjs/core");
 const sequelize_typescript_1 = require("sequelize-typescript");
 let SequelizeDataSourceManager = class SequelizeDataSourceManager extends core_1.DataSourceManager {
     async init() {
-        await this.initDataSource(this.sequelizeConfig, this.baseDir);
+        await this.initDataSource(this.sequelizeConfig, {
+            concurrent: true,
+        });
     }
     getName() {
         return 'sequelize';
@@ -25,9 +27,6 @@ let SequelizeDataSourceManager = class SequelizeDataSourceManager extends core_1
         if (entities && entities.length > 0) {
             client.addModels(entities);
         }
-        // 兼容老写法，但是这里可能有问题，会添加到所有的数据源之中
-        const listEntities = (0, core_1.listModule)('sequelize:core');
-        client.addModels(listEntities);
         const isConnected = await this.checkConnected(client);
         if (isConnected && config.sync) {
             await client.sync(config.syncOptions);
@@ -51,6 +50,7 @@ let SequelizeDataSourceManager = class SequelizeDataSourceManager extends core_1
         }
     }
 };
+exports.SequelizeDataSourceManager = SequelizeDataSourceManager;
 __decorate([
     (0, core_1.Config)('sequelize'),
     __metadata("design:type", Object)
@@ -59,19 +59,14 @@ __decorate([
     (0, core_1.Logger)('coreLogger'),
     __metadata("design:type", Object)
 ], SequelizeDataSourceManager.prototype, "coreLogger", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", String)
-], SequelizeDataSourceManager.prototype, "baseDir", void 0);
 __decorate([
     (0, core_1.Init)(),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
 ], SequelizeDataSourceManager.prototype, "init", null);
-SequelizeDataSourceManager = __decorate([
+exports.SequelizeDataSourceManager = SequelizeDataSourceManager = __decorate([
     (0, core_1.Provide)(),
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], SequelizeDataSourceManager);
-exports.SequelizeDataSourceManager = SequelizeDataSourceManager;
 //# sourceMappingURL=dataSourceManager.js.map

package/dist/decorator.d.ts

@@ -1,11 +1,4 @@
-import { Model, TableOptions } from 'sequelize-typescript';
-/**
- * @deprecated
- * @param options
- * @constructor
- */
-export declare function BaseTable<M extends Model = Model>(options: TableOptions<M>): any;
-export declare function BaseTable(target: any): void;
+import { Model } from 'sequelize-typescript';
 export declare const ENTITY_MODEL_KEY = "sequelize:entity_model_key";
 export declare const DATA_SOURCE_KEY = "sequelize:data_source_key";
 export declare function InjectRepository(modelKey: {

package/dist/decorator.js

@@ -1,37 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectDataSource = exports.InjectRepository = exports.DATA_SOURCE_KEY = exports.ENTITY_MODEL_KEY = exports.BaseTable = void 0;
+exports.InjectDataSource = exports.InjectRepository = exports.DATA_SOURCE_KEY = exports.ENTITY_MODEL_KEY = void 0;
 const core_1 = require("@midwayjs/core");
-const sequelize_typescript_1 = require("sequelize-typescript");
-function BaseTable(arg) {
-    if (typeof arg === 'function') {
-        (0, core_1.saveModule)('sequelize:core', arg);
-        annotate(arg);
-    }
-    else {
-        const options = Object.assign({}, arg);
-        return target => {
-            (0, core_1.saveModule)('sequelize:core', target);
-            annotate(target, options);
-        };
-    }
-}
-exports.BaseTable = BaseTable;
-function annotate(target, options = {}) {
-    (0, sequelize_typescript_1.setModelName)(target.prototype, options.modelName || target.name);
-    (0, sequelize_typescript_1.addOptions)(target.prototype, options);
-}
 exports.ENTITY_MODEL_KEY = 'sequelize:entity_model_key';
 exports.DATA_SOURCE_KEY = 'sequelize:data_source_key';
 function InjectRepository(modelKey, connectionName) {
-    return (0, core_1.createCustomPropertyDecorator)(exports.ENTITY_MODEL_KEY, {
+    return core_1.DecoratorManager.createCustomPropertyDecorator(exports.ENTITY_MODEL_KEY, {
         modelKey,
         connectionName,
     });
 }
 exports.InjectRepository = InjectRepository;
 function InjectDataSource(dataSourceName) {
-    return (0, core_1.createCustomPropertyDecorator)(exports.DATA_SOURCE_KEY, {
+    return core_1.DecoratorManager.createCustomPropertyDecorator(exports.DATA_SOURCE_KEY, {
         dataSourceName,
     });
 }

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { SequelizeConfiguration as Configuration } from './configuration';
-export { BaseTable, InjectRepository, InjectDataSource } from './decorator';
+export { InjectRepository, InjectDataSource } from './decorator';
 export * from './interface';
 export * from './dataSourceManager';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -14,11 +14,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InjectDataSource = exports.InjectRepository = exports.BaseTable = exports.Configuration = void 0;
+exports.InjectDataSource = exports.InjectRepository = exports.Configuration = void 0;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.SequelizeConfiguration; } });
 var decorator_1 = require("./decorator");
-Object.defineProperty(exports, "BaseTable", { enumerable: true, get: function () { return decorator_1.BaseTable; } });
 Object.defineProperty(exports, "InjectRepository", { enumerable: true, get: function () { return decorator_1.InjectRepository; } });
 Object.defineProperty(exports, "InjectDataSource", { enumerable: true, get: function () { return decorator_1.InjectDataSource; } });
 __exportStar(require("./interface"), exports);

package/dist/interface.d.ts

@@ -1,8 +1,4 @@
 import { DataSourceManagerConfigOption } from '@midwayjs/core';
 import { SequelizeOptions } from 'sequelize-typescript';
-import { SyncOptions } from 'sequelize';
-export type SequelizeConfigOptions = DataSourceManagerConfigOption<SequelizeOptions & {
-    sync?: boolean;
-    syncOptions?: SyncOptions;
-}>;
+export type SequelizeConfigOptions = DataSourceManagerConfigOption<SequelizeOptions>;
 //# sourceMappingURL=interface.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/sequelize",
-  "version": "3.20.5",
+  "version": "4.0.0-beta.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -9,9 +9,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.20.4",
-    "@midwayjs/koa": "^3.20.5",
-    "@midwayjs/mock": "^3.20.4",
+    "@midwayjs/core": "^4.0.0-beta.1",
+    "@midwayjs/mock": "^4.0.0-beta.1",
     "sequelize": "6.37.5",
     "sequelize-typescript": "2.1.6",
     "sqlite3": "5.1.7"
@@ -22,14 +21,14 @@
     "sequelize"
   ],
   "author": {
-    "name": "stone-jin",
-    "email": "1520006273@qq.com"
+    "name": "czy88840616",
+    "email": "czy88840616@gmail.com"
   },
   "license": "MIT",
   "scripts": {
     "build": "tsc",
-    "test": "NODE_ENV=development node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit"
+    "test": "NODE_ENV=development node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand",
+    "cov": "node -r ts-node/register ../../node_modules/jest/bin/jest.js --runInBand --coverage --forceExit"
   },
   "engines": {
     "node": ">=12"
@@ -38,5 +37,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "7ce57281bd3ef5d18dc50b47ff9bffb8a27c071e"
+  "gitHead": "832961ec3aff123c033197d8c00cb2bc9bad7ff8"
 }