@steedos/objectql 2.1.82 → 2.1.86

package/lib/types/datasource.js

@@ -7,7 +7,6 @@ var index_1 = require("../services/index");
 var driver_1 = require("../driver");
 var _ = require("lodash");
 var _1 = require(".");
-var objectServiceManager_1 = require("../metadata-register/objectServiceManager");
 var index_2 = require("../services/index");
 var path = require("path");
 var Fiber = require('fibers');
@@ -24,6 +23,7 @@ var SteedosDatabaseDriverType;
 var SteedosDataSourceType = /** @class */ (function () {
     function SteedosDataSourceType(datasource_name, config, schema) {
         this._objects = {};
+        this._cacheObjects = [];
         this._objectsConfig = {};
         this._objectsRolesPermission = {};
         this._objectsSpaceRolesPermission = {};
@@ -73,6 +73,26 @@ var SteedosDataSourceType = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
+    Object.defineProperty(SteedosDataSourceType.prototype, "cacheObjects", {
+        get: function () {
+            return this._cacheObjects;
+        },
+        set: function (value) {
+            this._cacheObjects = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(SteedosDataSourceType.prototype, "service", {
+        get: function () {
+            return this._service;
+        },
+        set: function (value) {
+            this._service = value;
+        },
+        enumerable: false,
+        configurable: true
+    });
     Object.defineProperty(SteedosDataSourceType.prototype, "enable_space", {
         get: function () {
             return this._enable_space;
@@ -98,15 +118,30 @@ var SteedosDataSourceType = /** @class */ (function () {
         configurable: true
     });
     SteedosDataSourceType.prototype.getObjects = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
+                // if(!this.schema.metadataRegister){
+                //     return this._objects
+                // }
+                // return await this.schema.metadataRegister.getObjectsConfig(this.name);
+                return [2 /*return*/, this.getCacheObjects()];
+            });
+        });
+    };
+    SteedosDataSourceType.prototype.getCacheObjects = function () {
+        return this.cacheObjects;
+    };
+    SteedosDataSourceType.prototype.flushCacheObjects = function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        if (!this.schema.metadataRegister) {
-                            return [2 /*return*/, this._objects];
-                        }
+                        _a = this;
                         return [4 /*yield*/, this.schema.metadataRegister.getObjectsConfig(this.name)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 1:
+                        _a.cacheObjects = _b.sent();
+                        return [2 /*return*/];
                 }
             });
         });
@@ -122,7 +157,7 @@ var SteedosDataSourceType = /** @class */ (function () {
         if (localObject) {
             return localObject;
         }
-        return index_2.getObjectDispatcher(objectApiName);
+        return (0, index_2.getObjectDispatcher)(objectApiName);
     };
     SteedosDataSourceType.prototype.getLocalObject = function (objectApiName) {
         return this._objects[objectApiName];
@@ -134,16 +169,23 @@ var SteedosDataSourceType = /** @class */ (function () {
         return this._objectsConfig[objectName];
     };
     SteedosDataSourceType.prototype.setObject = function (objectApiName, objectConfig) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var serviceName, object;
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var serviceName, object, findIndex;
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        serviceName = index_1.getObjectServiceName(objectApiName);
+                        serviceName = (0, index_1.getObjectServiceName)(objectApiName);
                         object = new _1.SteedosObjectType(objectApiName, this, objectConfig);
                         this._objectsConfig[objectApiName] = objectConfig;
+                        findIndex = _.findIndex(this.cacheObjects, function (item) { var _a; return ((_a = item === null || item === void 0 ? void 0 : item.metadata) === null || _a === void 0 ? void 0 : _a.name) === objectApiName; });
+                        if (findIndex != -1) {
+                            this.cacheObjects[findIndex] = Object.assign({ service: { name: serviceName } }, { metadata: objectConfig });
+                        }
+                        else {
+                            this.cacheObjects.push(Object.assign({ service: { name: serviceName } }, { metadata: objectConfig }));
+                        }
                         this._objects[objectApiName] = object;
-                        return [4 /*yield*/, objectServiceManager_1.createObjectService(this._schema.metadataBroker, serviceName, objectConfig)];
+                        return [4 /*yield*/, (0, index_2.createObjectService)(this._schema.metadataBroker, serviceName, objectConfig)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/, object];
@@ -195,59 +237,25 @@ var SteedosDataSourceType = /** @class */ (function () {
                     this._adapter = new driver_1.SteedosMySqlDriver(driverConfig);
                     break;
                 default:
-                    throw new Error("the driver " + this.config.driver + " is not supported");
+                    throw new Error("the driver ".concat(this.config.driver, " is not supported"));
             }
         }
         else {
             this._adapter = this.config.driver;
         }
     };
-    SteedosDataSourceType.prototype.initObjects = function () {
-        var e_1, _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var objects, self, _b, _c, object, objectConfig, localObjectConfig, _db, e_1_1;
-            var _this = this;
-            return tslib_1.__generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.getObjects()];
-                    case 1:
-                        objects = _d.sent();
-                        self = this;
-                        _d.label = 2;
-                    case 2:
-                        _d.trys.push([2, 8, 9, 14]);
-                        _b = tslib_1.__asyncValues(_.values(objects));
-                        _d.label = 3;
-                    case 3: return [4 /*yield*/, _b.next()];
-                    case 4:
-                        if (!(_c = _d.sent(), !_c.done)) return [3 /*break*/, 7];
-                        object = _c.value;
-                        objectConfig = object.metadata;
-                        localObjectConfig = _1.getObjectConfig(objectConfig.name);
+    SteedosDataSourceType.prototype.initObject = function (objectConfig) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var localObjectConfig, _db;
+            return (0, tslib_1.__generator)(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        localObjectConfig = (0, _1.getObjectConfig)(objectConfig.name);
                         if (localObjectConfig) {
                             objectConfig.listeners = localObjectConfig.listeners;
                             objectConfig.methods = localObjectConfig.methods;
                         }
-                        // if(self._schema.metadataBroker){
-                        //     const res = await self._schema.metadataRegister.object(object)
-                        //     if(res){
-                        //         self.setObject(object.name, object);
-                        //     }
-                        // }else{
-                        //     self.setObject(object.name, object);
-                        // }
-                        return [4 /*yield*/, self.setObject(objectConfig.name, objectConfig)];
-                    case 5:
-                        // if(self._schema.metadataBroker){
-                        //     const res = await self._schema.metadataRegister.object(object)
-                        //     if(res){
-                        //         self.setObject(object.name, object);
-                        //     }
-                        // }else{
-                        //     self.setObject(object.name, object);
-                        // }
-                        _d.sent();
-                        if (this.name === "default") {
+                        if (this.name === "meteor") {
                             try {
                                 _db = Creator.createCollection(objectConfig);
                                 Creator.Collections[_db._name] = _db;
@@ -256,70 +264,69 @@ var SteedosDataSourceType = /** @class */ (function () {
                                 // console.log(`error`, error) //此处无需打印日志，@steedos/core 在init Creator 时，会兼容此部分的异常逻辑。
                             }
                         }
-                        _d.label = 6;
-                    case 6: return [3 /*break*/, 3];
-                    case 7: return [3 /*break*/, 14];
-                    case 8:
+                        return [4 /*yield*/, this.setObject(objectConfig.name, objectConfig)];
+                    case 1:
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    SteedosDataSourceType.prototype.initObjects = function () {
+        var e_1, _a;
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var objects, self, _b, _c, object, objectConfig, e_1_1;
+            return (0, tslib_1.__generator)(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        objects = this.cacheObjects;
+                        self = this;
+                        _d.label = 1;
+                    case 1:
+                        _d.trys.push([1, 7, 8, 13]);
+                        _b = (0, tslib_1.__asyncValues)(_.values(objects));
+                        _d.label = 2;
+                    case 2: return [4 /*yield*/, _b.next()];
+                    case 3:
+                        if (!(_c = _d.sent(), !_c.done)) return [3 /*break*/, 6];
+                        object = _c.value;
+                        objectConfig = object.metadata;
+                        return [4 /*yield*/, self.initObject(objectConfig)];
+                    case 4:
+                        _d.sent();
+                        _d.label = 5;
+                    case 5: return [3 /*break*/, 2];
+                    case 6: return [3 /*break*/, 13];
+                    case 7:
                         e_1_1 = _d.sent();
                         e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 14];
-                    case 9:
-                        _d.trys.push([9, , 12, 13]);
-                        if (!(_c && !_c.done && (_a = _b.return))) return [3 /*break*/, 11];
+                        return [3 /*break*/, 13];
+                    case 8:
+                        _d.trys.push([8, , 11, 12]);
+                        if (!(_c && !_c.done && (_a = _b.return))) return [3 /*break*/, 10];
                         return [4 /*yield*/, _a.call(_b)];
-                    case 10:
+                    case 9:
                         _d.sent();
-                        _d.label = 11;
-                    case 11: return [3 /*break*/, 13];
-                    case 12:
+                        _d.label = 10;
+                    case 10: return [3 /*break*/, 12];
+                    case 11:
                         if (e_1) throw e_1.error;
                         return [7 /*endfinally*/];
-                    case 13: return [7 /*endfinally*/];
-                    case 14:
-                        // _.each(objects, (object) => {
-                        //     const obj = this.getObject(object.name);
-                        //     if(obj){
-                        //         // 加try catch是因为有错误时不应该影响下一个对象加载
-                        //         try{
-                        //             obj.initMasterDetails();
-                        //         }
-                        //         catch(ex){
-                        //             console.error(ex);
-                        //         }
-                        //     }
-                        // });
-                        // _.each(objects, (object) => {
-                        //     const obj = this.getObject(object.name);
-                        //     if(obj){
-                        //         // 加try catch是因为有错误时不应该影响下一个对象加载
-                        //         try{
-                        //             obj.checkMasterDetails();
-                        //         }
-                        //         catch(ex){
-                        //             console.error(ex);
-                        //         }
-                        //     }
-                        // });
-                        _.each(this.config.objectsRolesPermission, function (objectRolesPermission, object_name) {
-                            _.each(objectRolesPermission, function (objectRolePermission, role_name) {
-                                objectRolePermission.name = role_name;
-                                _this.setObjectPermission(object_name, objectRolePermission);
-                            });
-                        });
-                        return [2 /*return*/, true];
+                    case 12: return [7 /*endfinally*/];
+                    case 13: return [2 /*return*/, true];
                 }
             });
         });
     };
     SteedosDataSourceType.prototype.loadFiles = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var _a, _b, objectPath, filePath, e_2_1;
             var e_2, _c;
-            return tslib_1.__generator(this, function (_d) {
+            return (0, tslib_1.__generator)(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         _d.trys.push([0, 5, 6, 7]);
-                        _a = tslib_1.__values(this.config.objectFiles), _b = _a.next();
+                        _a = (0, tslib_1.__values)(this.config.objectFiles), _b = _a.next();
                         _d.label = 1;
                     case 1:
                         if (!!_b.done) return [3 /*break*/, 4];
@@ -328,7 +335,7 @@ var SteedosDataSourceType = /** @class */ (function () {
                         if (!path.isAbsolute(objectPath)) {
                             filePath = path.join(process.cwd(), objectPath);
                         }
-                        return [4 /*yield*/, _1.addAllConfigFiles(filePath, this._name, null)];
+                        return [4 /*yield*/, (0, _1.addAllConfigFiles)(filePath, this._name, null)];
                     case 2:
                         _d.sent();
                         _d.label = 3;
@@ -383,8 +390,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         }
     };
     SteedosDataSourceType.prototype.getRoles = function (userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._getRoles) return [3 /*break*/, 2];
@@ -396,8 +403,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.find = function (tableName, query, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.find(tableName, query, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -406,8 +413,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.aggregate = function (tableName, query, externalPipeline, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.aggregate(tableName, query, externalPipeline, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -416,8 +423,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.findOne = function (tableName, id, query, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.findOne(tableName, id, query, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -426,8 +433,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.insert = function (tableName, doc, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.insert(tableName, doc, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -436,8 +443,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.update = function (tableName, id, doc, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.update(tableName, id, doc, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -446,8 +453,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.updateOne = function (tableName, id, doc, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.updateOne(tableName, id, doc, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -456,8 +463,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.updateMany = function (tableName, queryFilters, doc, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.updateMany(tableName, queryFilters, doc, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -466,8 +473,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.delete = function (tableName, id, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.delete(tableName, id, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -476,8 +483,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.count = function (tableName, query, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.count(tableName, query, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -486,8 +493,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.directFind = function (tableName, query, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.find(tableName, query, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -496,8 +503,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.directInsert = function (tableName, doc, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.directInsert(tableName, doc, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -506,8 +513,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.directUpdate = function (tableName, id, doc, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.directUpdate(tableName, id, doc, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -516,8 +523,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.directDelete = function (tableName, id, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.directDelete(tableName, id, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -526,8 +533,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.directAggregate = function (tableName, query, externalPipeline, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.directAggregate(tableName, query, externalPipeline, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -536,8 +543,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.directAggregatePrefixalPipeline = function (tableName, query, prefixalPipeline, userId) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter.directAggregatePrefixalPipeline(tableName, query, prefixalPipeline, userId)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -546,8 +553,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype._makeNewID = function (tableName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._adapter._makeNewID(tableName)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -563,8 +570,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         configurable: true
     });
     SteedosDataSourceType.prototype.dropEntities = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._adapter.dropEntities) return [3 /*break*/, 2];
@@ -581,8 +588,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         }
     };
     SteedosDataSourceType.prototype.dropTables = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._adapter.dropEntities) return [3 /*break*/, 2];
@@ -594,8 +601,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.createTables = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._adapter.createTables) return [3 /*break*/, 2];
@@ -607,63 +614,69 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.init = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.initObjects()];
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            var broker, _a;
+            return (0, tslib_1.__generator)(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        // await this.flushCacheObjects();
+                        // await this.initObjects();
+                        this.initObjectPermissions();
+                        if (!!this.service) return [3 /*break*/, 2];
+                        broker = this._schema.metadataBroker;
+                        _a = this;
+                        return [4 /*yield*/, (0, index_2.createDataSourceService)(broker, this)];
                     case 1:
-                        _a.sent();
-                        return [4 /*yield*/, this.initTypeORM()];
-                    case 2:
-                        _a.sent();
-                        return [2 /*return*/];
+                        _a.service = _b.sent();
+                        _b.label = 2;
+                    case 2: return [2 /*return*/];
                 }
             });
         });
     };
-    SteedosDataSourceType.prototype.initTypeORM = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _objects, _a, _b, self_1;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        _objects = {};
-                        _b = (_a = _).map;
-                        return [4 /*yield*/, this.getObjects()];
-                    case 1:
-                        _b.apply(_a, [_c.sent(), function (item) {
-                                if (item && item.metadata) {
-                                    _objects[item.metadata.name] = item.metadata;
-                                }
-                            }]);
-                        if (this._adapter.init) {
-                            self_1 = this;
-                            Fiber(function () {
-                                var fiber = Fiber.current;
-                                self_1._adapter.init(_objects).then(function (result) {
-                                    fiber.run();
-                                }).catch(function (result) {
-                                    console.error(result);
-                                    fiber.run();
-                                });
-                                Fiber.yield();
-                            }).run();
-                        }
-                        return [2 /*return*/];
-                }
+    /**
+     * 初始化数据源上配置的对象权限。
+     */
+    SteedosDataSourceType.prototype.initObjectPermissions = function () {
+        var _this = this;
+        _.each(this.config.objectsRolesPermission, function (objectRolesPermission, object_name) {
+            _.each(objectRolesPermission, function (objectRolePermission, role_name) {
+                objectRolePermission.name = role_name;
+                _this.setObjectPermission(object_name, objectRolePermission);
             });
         });
     };
+    SteedosDataSourceType.prototype.initTypeORM = function () {
+        var _objects = {};
+        _.map(this.cacheObjects, function (item) {
+            if (item && item.metadata) {
+                _objects[item.metadata.name] = item.metadata;
+            }
+        });
+        if (this._adapter.init) {
+            var self_1 = this;
+            Fiber(function () {
+                var fiber = Fiber.current;
+                self_1._adapter.init(_objects).then(function (result) {
+                    fiber.run();
+                }).catch(function (result) {
+                    console.error(result);
+                    fiber.run();
+                });
+                Fiber.yield();
+            }).run();
+        }
+    };
     // 暂时保留，兼容creator bootstrap接口
     SteedosDataSourceType.prototype.getAppsConfig = function () {
-        return _1.getAppConfigs();
+        return (0, _1.getAppConfigs)();
     };
     SteedosDataSourceType.prototype.getDashboardsConfig = function () {
-        return _1.getDashboardConfigs();
+        return (0, _1.getDashboardConfigs)();
     };
     SteedosDataSourceType.prototype.connect = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this._adapter.connect) return [3 /*break*/, 2];
@@ -685,8 +698,8 @@ var SteedosDataSourceType = /** @class */ (function () {
         });
     };
     SteedosDataSourceType.prototype.close = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+            return (0, tslib_1.__generator)(this, function (_a) {
                 if (this._adapter.close)
                     this._adapter.close();
                 return [2 /*return*/];
@@ -697,7 +710,7 @@ var SteedosDataSourceType = /** @class */ (function () {
 }());
 exports.SteedosDataSourceType = SteedosDataSourceType;
 function getDataSource(datasourceName, schema) {
-    return (schema ? schema : _1.getSteedosSchema()).getDataSource(datasourceName);
+    return (schema ? schema : (0, _1.getSteedosSchema)()).getDataSource(datasourceName);
 }
 exports.getDataSource = getDataSource;
 //# sourceMappingURL=datasource.js.map