@steedos/objectql 2.2.55-beta.6 → 2.2.55

package/lib/services/objectService.js

@@ -7,7 +7,6 @@ var datasource_1 = require("../types/datasource");
 var object_dynamic_load_1 = require("../types/object_dynamic_load");
 var _ = require("underscore");
 var graphql_1 = require("./helpers/graphql");
-// generateActionRestProp, 
 var _1 = require(".");
 var convert_1 = require("../util/convert");
 var util_1 = require("../util");
@@ -21,8 +20,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.aggregate(query, externalPipeline, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.aggregate(query, externalPipeline, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -34,11 +33,11 @@ function getObjectServiceMethodsSchema() {
                     return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                if (!(this.object.name == 'users')) return [3 /*break*/, 2];
-                                return [4 /*yield*/, this.object.find(query)];
-                            case 1: return [2 /*return*/, _a.sent()];
-                            case 2: return [4 /*yield*/, this.object.find(query, userSession)];
-                            case 3: return [2 /*return*/, _a.sent()];
+                                if (!(this.object.name == 'users')) return [3, 2];
+                                return [4, this.object.find(query)];
+                            case 1: return [2, _a.sent()];
+                            case 2: return [4, this.object.find(query, userSession)];
+                            case 3: return [2, _a.sent()];
                         }
                     });
                 });
@@ -50,11 +49,11 @@ function getObjectServiceMethodsSchema() {
                     return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                if (!(this.object.name == 'users')) return [3 /*break*/, 2];
-                                return [4 /*yield*/, this.object.findOne(id, query)];
-                            case 1: return [2 /*return*/, _a.sent()];
-                            case 2: return [4 /*yield*/, this.object.findOne(id, query, userSession)];
-                            case 3: return [2 /*return*/, _a.sent()];
+                                if (!(this.object.name == 'users')) return [3, 2];
+                                return [4, this.object.findOne(id, query)];
+                            case 1: return [2, _a.sent()];
+                            case 2: return [4, this.object.findOne(id, query, userSession)];
+                            case 3: return [2, _a.sent()];
                         }
                     });
                 });
@@ -65,8 +64,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.insert(doc, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.insert(doc, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -77,8 +76,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.update(id, doc, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.update(id, doc, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -89,8 +88,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.updateOne(id, doc, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.updateOne(id, doc, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -101,8 +100,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.updateMany(queryFilters, doc, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.updateMany(queryFilters, doc, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -113,8 +112,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.delete(id, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.delete(id, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -125,8 +124,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.directAggregate(query, externalPipeline, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.directAggregate(query, externalPipeline, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -137,8 +136,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.directAggregatePrefixalPipeline(query, externalPipeline, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.directAggregatePrefixalPipeline(query, externalPipeline, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -149,8 +148,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.directFind(query, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.directFind(query, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -161,8 +160,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.directInsert(doc, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.directInsert(doc, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -173,8 +172,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.directUpdate(id, doc, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.directUpdate(id, doc, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -185,8 +184,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.directDelete(id, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.directDelete(id, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -197,8 +196,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.count(query, userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.count(query, userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -239,8 +238,8 @@ function getObjectServiceMethodsSchema() {
                 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.object._makeNewID()];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object._makeNewID()];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -250,7 +249,7 @@ function getObjectServiceMethodsSchema() {
             handler: function () {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.object.getRecordAbsoluteUrl()];
+                        return [2, this.object.getRecordAbsoluteUrl()];
                     });
                 });
             }
@@ -259,7 +258,7 @@ function getObjectServiceMethodsSchema() {
             handler: function () {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.object.getGridAbsoluteUrl()];
+                        return [2, this.object.getGridAbsoluteUrl()];
                     });
                 });
             }
@@ -268,7 +267,7 @@ function getObjectServiceMethodsSchema() {
             handler: function (record, userSession) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.object.getRecordPermissions(record, userSession)];
+                        return [2, this.object.getRecordPermissions(record, userSession)];
                     });
                 });
             }
@@ -278,8 +277,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.getRecordView(userSession, context)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.getRecordView(userSession, context)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -290,8 +289,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.createDefaultRecordView(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.createDefaultRecordView(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -302,8 +301,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.getDefaultRecordView(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.getDefaultRecordView(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -314,8 +313,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.getRelateds()];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.getRelateds()];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -326,8 +325,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.refreshIndexes()];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.refreshIndexes()];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -338,8 +337,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.allowRead(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.allowRead(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -350,8 +349,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.allowInsert(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.allowInsert(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -362,8 +361,8 @@ function getObjectServiceMethodsSchema() {
                 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.object.allowUpdate(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.allowUpdate(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -374,16 +373,13 @@ function getObjectServiceMethodsSchema() {
                 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.object.allowDelete(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.object.allowDelete(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
             }
         }
-        // getPageView: {
-        //     //TODO
-        // }
     };
     return methods;
 }
@@ -402,14 +398,13 @@ function getObjectServiceActionsSchema() {
                             case 0:
                                 userSession = ctx.meta.user;
                                 _a = ctx.params, query = _a.query, externalPipeline = _a.externalPipeline;
-                                return [4 /*yield*/, this.aggregate(query, externalPipeline, userSession)];
-                            case 1: return [2 /*return*/, _b.sent()];
+                                return [4, this.aggregate(query, externalPipeline, userSession)];
+                            case 1: return [2, _b.sent()];
                         }
                     });
                 });
             }
         },
-        // meteor、default database 默认不返回is_deleted = true的数据
         graphqlFind: {
             params: {
                 fields: { type: 'array', items: "string", optional: true },
@@ -422,7 +417,6 @@ function getObjectServiceActionsSchema() {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var filters, filtersStr, resolveInfo, fieldNames, userSession;
                     return tslib_1.__generator(this, function (_a) {
-                        //TODO filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
                         if (this.object.datasource.driver === datasource_1.SteedosDatabaseDriverType.MeteorMongo || this.object.datasource.driver === datasource_1.SteedosDatabaseDriverType.Mongo) {
                             filters = ctx.params.filters;
                             if (filters) {
@@ -450,7 +444,7 @@ function getObjectServiceActionsSchema() {
                             }
                         }
                         userSession = ctx.meta.user;
-                        return [2 /*return*/, this.find(ctx.params, userSession)];
+                        return [2, this.find(ctx.params, userSession)];
                     });
                 });
             }
@@ -467,7 +461,6 @@ function getObjectServiceActionsSchema() {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var filters, filtersStr, userSession;
                     return tslib_1.__generator(this, function (_a) {
-                        //TODO filters: 如果filters中没有查询 is_deleted 则自动添加is_deleted != true 条件
                         if (this.object.datasource.driver === datasource_1.SteedosDatabaseDriverType.MeteorMongo || this.object.datasource.driver === datasource_1.SteedosDatabaseDriverType.Mongo) {
                             filters = ctx.params.filters;
                             if (filters) {
@@ -488,7 +481,7 @@ function getObjectServiceActionsSchema() {
                             }
                         }
                         userSession = ctx.meta.user;
-                        return [2 /*return*/, this.count(ctx.params, userSession)];
+                        return [2, this.count(ctx.params, userSession)];
                     });
                 });
             }
@@ -506,7 +499,7 @@ function getObjectServiceActionsSchema() {
                     var userSession;
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
-                        return [2 /*return*/, this.find(ctx.params, userSession)];
+                        return [2, this.find(ctx.params, userSession)];
                     });
                 });
             }
@@ -522,7 +515,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_b) {
                         userSession = ctx.meta.user;
                         _a = ctx.params, id = _a.id, query = _a.query;
-                        return [2 /*return*/, this.findOne(id, query, userSession)];
+                        return [2, this.findOne(id, query, userSession)];
                     });
                 });
             }
@@ -548,7 +541,7 @@ function getObjectServiceActionsSchema() {
                         if (userSession && object.getField('space')) {
                             data.space = userSession.spaceId;
                         }
-                        return [2 /*return*/, this.insert(data, userSession)];
+                        return [2, this.insert(data, userSession)];
                     });
                 });
             }
@@ -572,7 +565,7 @@ function getObjectServiceActionsSchema() {
                             data = JSON.parse(JSON.stringify(doc));
                         }
                         delete data.space;
-                        return [2 /*return*/, this.update(id, data, userSession)];
+                        return [2, this.update(id, data, userSession)];
                     });
                 });
             }
@@ -596,7 +589,7 @@ function getObjectServiceActionsSchema() {
                             data = JSON.parse(JSON.stringify(doc));
                         }
                         delete data.space;
-                        return [2 /*return*/, this.updateOne(id, data, userSession)];
+                        return [2, this.updateOne(id, data, userSession)];
                     });
                 });
             }
@@ -622,8 +615,8 @@ function getObjectServiceActionsSchema() {
                                     data = JSON.parse(JSON.stringify(doc));
                                 }
                                 delete data.space;
-                                return [4 /*yield*/, this.updateMany(queryFilters, data, userSession)];
-                            case 1: return [2 /*return*/, _b.sent()];
+                                return [4, this.updateMany(queryFilters, data, userSession)];
+                            case 1: return [2, _b.sent()];
                         }
                     });
                 });
@@ -639,7 +632,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
                         id = ctx.params.id;
-                        return [2 /*return*/, this.delete(id, userSession)];
+                        return [2, this.delete(id, userSession)];
                     });
                 });
             }
@@ -655,7 +648,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_b) {
                         userSession = ctx.meta.user;
                         _a = ctx.params, query = _a.query, externalPipeline = _a.externalPipeline;
-                        return [2 /*return*/, this.directAggregate(query, externalPipeline, userSession)];
+                        return [2, this.directAggregate(query, externalPipeline, userSession)];
                     });
                 });
             }
@@ -671,7 +664,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_b) {
                         userSession = ctx.meta.user;
                         _a = ctx.params, query = _a.query, prefixalPipeline = _a.prefixalPipeline;
-                        return [2 /*return*/, this.directAggregatePrefixalPipeline(query, prefixalPipeline, userSession)];
+                        return [2, this.directAggregatePrefixalPipeline(query, prefixalPipeline, userSession)];
                     });
                 });
             }
@@ -689,7 +682,7 @@ function getObjectServiceActionsSchema() {
                     var userSession;
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
-                        return [2 /*return*/, this.directFind(ctx.params, userSession)];
+                        return [2, this.directFind(ctx.params, userSession)];
                     });
                 });
             }
@@ -704,7 +697,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
                         doc = ctx.params.doc;
-                        return [2 /*return*/, this.directInsert(doc, userSession)];
+                        return [2, this.directInsert(doc, userSession)];
                     });
                 });
             }
@@ -720,7 +713,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_b) {
                         userSession = ctx.meta.user;
                         _a = ctx.params, id = _a.id, doc = _a.doc;
-                        return [2 /*return*/, this.directUpdate(id, doc, userSession)];
+                        return [2, this.directUpdate(id, doc, userSession)];
                     });
                 });
             }
@@ -735,7 +728,7 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
                         id = ctx.params.id;
-                        return [2 /*return*/, this.directDelete(id, userSession)];
+                        return [2, this.directDelete(id, userSession)];
                     });
                 });
             }
@@ -753,7 +746,7 @@ function getObjectServiceActionsSchema() {
                     var userSession;
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
-                        return [2 /*return*/, this.count(ctx.params, userSession)];
+                        return [2, this.count(ctx.params, userSession)];
                     });
                 });
             }
@@ -767,20 +760,16 @@ function getObjectServiceActionsSchema() {
                     var fieldApiName;
                     return tslib_1.__generator(this, function (_a) {
                         fieldApiName = ctx.params.fieldApiName;
-                        return [2 /*return*/, this.getField(fieldApiName)];
+                        return [2, this.getField(fieldApiName)];
                     });
                 });
             }
         },
         getFields: {
-            // rest: {
-            //     method: "GET",
-            //     path: "/fields"
-            // },
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.getFields()];
+                        return [2, this.getFields()];
                     });
                 });
             }
@@ -789,7 +778,7 @@ function getObjectServiceActionsSchema() {
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.getNameFieldKey()];
+                        return [2, this.getNameFieldKey()];
                     });
                 });
             }
@@ -798,22 +787,18 @@ function getObjectServiceActionsSchema() {
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.toConfig()];
+                        return [2, this.toConfig()];
                     });
                 });
             }
         },
         getUserObjectPermission: {
-            // rest: {
-            //     method: "GET",
-            //     path: "/getUserObjectPermission"
-            // },
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var userSession;
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
-                        return [2 /*return*/, this.getUserObjectPermission(userSession)];
+                        return [2, this.getUserObjectPermission(userSession)];
                     });
                 });
             }
@@ -822,7 +807,7 @@ function getObjectServiceActionsSchema() {
             handler: function () {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.isEnableAudit()];
+                        return [2, this.isEnableAudit()];
                     });
                 });
             }
@@ -832,8 +817,8 @@ function getObjectServiceActionsSchema() {
                 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._makeNewID()];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this._makeNewID()];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -843,7 +828,7 @@ function getObjectServiceActionsSchema() {
             handler: function () {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.getRecordAbsoluteUrl()];
+                        return [2, this.getRecordAbsoluteUrl()];
                     });
                 });
             }
@@ -852,16 +837,12 @@ function getObjectServiceActionsSchema() {
             handler: function () {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     return tslib_1.__generator(this, function (_a) {
-                        return [2 /*return*/, this.getGridAbsoluteUrl()];
+                        return [2, this.getGridAbsoluteUrl()];
                     });
                 });
             }
         },
         getRecordPermissionsById: {
-            // rest: {
-            //     method: "GET",
-            //     path: "/recordPermissions/:recordId"
-            // },
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var userSession, recordId, record;
@@ -870,10 +851,10 @@ function getObjectServiceActionsSchema() {
                             case 0:
                                 userSession = ctx.meta.user;
                                 recordId = ctx.params.recordId;
-                                return [4 /*yield*/, this.findOne(recordId)];
+                                return [4, this.findOne(recordId)];
                             case 1:
                                 record = _a.sent();
-                                return [2 /*return*/, this.getRecordPermissions(record, userSession)];
+                                return [2, this.getRecordPermissions(record, userSession)];
                         }
                     });
                 });
@@ -886,16 +867,12 @@ function getObjectServiceActionsSchema() {
                     return tslib_1.__generator(this, function (_a) {
                         userSession = ctx.meta.user;
                         record = ctx.params.record;
-                        return [2 /*return*/, this.getRecordPermissions(record, userSession)];
+                        return [2, this.getRecordPermissions(record, userSession)];
                     });
                 });
             }
         },
         getRecordView: {
-            // rest: {
-            //     method: "GET",
-            //     path: "/uiSchema"
-            // },
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var userSession, context;
@@ -904,18 +881,14 @@ function getObjectServiceActionsSchema() {
                             case 0:
                                 userSession = ctx.meta.user;
                                 context = ctx.params.context;
-                                return [4 /*yield*/, this.getRecordView(userSession, context)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.getRecordView(userSession, context)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
             }
         },
         createDefaultRecordView: {
-            // rest: {
-            //     method: "POST",
-            //     path: "/defUiSchema"
-            // },
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var userSession;
@@ -926,18 +899,14 @@ function getObjectServiceActionsSchema() {
                                 if (!userSession.is_space_admin) {
                                     throw new Error('no permission.');
                                 }
-                                return [4 /*yield*/, this.createDefaultRecordView(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.createDefaultRecordView(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
             }
         },
         getDefaultRecordView: {
-            // rest: {
-            //     method: "GET",
-            //     path: "/uiSchemaTemplate"
-            // },
             handler: function (ctx) {
                 return tslib_1.__awaiter(this, void 0, void 0, function () {
                     var userSession;
@@ -948,24 +917,20 @@ function getObjectServiceActionsSchema() {
                                 if (!userSession.is_space_admin) {
                                     throw new Error('no permission.');
                                 }
-                                return [4 /*yield*/, this.getDefaultRecordView(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.getDefaultRecordView(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
             }
         },
         getRelateds: {
-            // rest: {
-            //     method: "GET",
-            //     path: "/relateds"
-            // },
             handler: function (ctx) {
                 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.getRelateds()];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.getRelateds()];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -976,8 +941,8 @@ function getObjectServiceActionsSchema() {
                 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.refreshIndexes()];
-                            case 1: return [2 /*return*/, _a.sent()];
+                            case 0: return [4, this.refreshIndexes()];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -991,8 +956,8 @@ function getObjectServiceActionsSchema() {
                         switch (_a.label) {
                             case 0:
                                 userSession = ctx.meta.user;
-                                return [4 /*yield*/, this.allowRead(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.allowRead(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -1006,8 +971,8 @@ function getObjectServiceActionsSchema() {
                         switch (_a.label) {
                             case 0:
                                 userSession = ctx.meta.user;
-                                return [4 /*yield*/, this.allowInsert(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.allowInsert(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -1021,8 +986,8 @@ function getObjectServiceActionsSchema() {
                         switch (_a.label) {
                             case 0:
                                 userSession = ctx.meta.user;
-                                return [4 /*yield*/, this.allowUpdate(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.allowUpdate(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -1036,8 +1001,8 @@ function getObjectServiceActionsSchema() {
                         switch (_a.label) {
                             case 0:
                                 userSession = ctx.meta.user;
-                                return [4 /*yield*/, this.allowDelete(userSession)];
-                            case 1: return [2 /*return*/, _a.sent()];
+                                return [4, this.allowDelete(userSession)];
+                            case 1: return [2, _a.sent()];
                         }
                     });
                 });
@@ -1062,10 +1027,7 @@ function getObjectServiceSchema(serviceName, objectConfig) {
 exports.getObjectServiceSchema = getObjectServiceSchema;
 module.exports = {
     name: '#_objectBaseService',
-    settings: {
-    // objectApiName:  //TODO
-    // objectConfig
-    },
+    settings: {},
     actions: getObjectServiceActionsSchema(),
     methods: getObjectServiceMethodsSchema(),
     created: function (broker) {
@@ -1093,7 +1055,7 @@ module.exports = {
                         objectApiName = objectConfig.name;
                         steedosSchema = (0, __1.getSteedosSchema)();
                         obj = steedosSchema.getObject(objectApiName);
-                        return [4 /*yield*/, obj.getRelationsInfo()];
+                        return [4, obj.getRelationsInfo()];
                     case 1:
                         relationsInfo = _b.sent();
                         detailsInfo = relationsInfo.details || [];
@@ -1116,7 +1078,7 @@ module.exports = {
                             }
                             finally { if (e_1) throw e_1.error; }
                         }
-                        return [2 /*return*/];
+                        return [2];
                 }
             });
         });
@@ -1132,16 +1094,14 @@ module.exports = {
                             case 0:
                                 objectApiName = ctx.params.objectApiName;
                                 _a = this.settings, onDestroyObjectService = _a.onDestroyObjectService, objectConfig = _a.objectConfig;
-                                if (!(objectApiName === this.object.name)) return [3 /*break*/, 3];
+                                if (!(objectApiName === this.object.name)) return [3, 3];
                                 _.each(objectConfig.fields, function (field, name) {
                                     if ((field.type === 'lookup' || field.type === 'master_detail') && (field.reference_to && _.isString(field.reference_to))) {
                                         ctx.broker.emit("".concat((0, _1.getObjectServiceName)(field.reference_to), ".refresh"), {});
                                     }
                                 });
-                                // console.log(`ctx.broker.destroyService`, this.object.name);
-                                return [4 /*yield*/, ctx.broker.destroyService(this)];
+                                return [4, ctx.broker.destroyService(this)];
                             case 1:
-                                // console.log(`ctx.broker.destroyService`, this.object.name);
                                 _c.sent();
                                 if (onDestroyObjectService && _.isFunction(onDestroyObjectService)) {
                                     onDestroyObjectService(objectApiName);
@@ -1152,7 +1112,7 @@ module.exports = {
                                 }
                                 steedosSchema = (0, __1.getSteedosSchema)();
                                 obj = steedosSchema.getObject(objectApiName);
-                                return [4 /*yield*/, obj.getRelationsInfo()];
+                                return [4, obj.getRelationsInfo()];
                             case 2:
                                 relationsInfo = _c.sent();
                                 detailsInfo = relationsInfo.details || [];
@@ -1177,7 +1137,7 @@ module.exports = {
                                 }
                                 ctx.emit('$services.changed');
                                 _c.label = 3;
-                            case 3: return [2 /*return*/];
+                            case 3: return [2];
                         }
                     });
                 });
@@ -1187,16 +1147,7 @@ module.exports = {
     merged: function (schema) {
         var settings = schema.settings;
         var objectConfig = settings.objectConfig;
-        // 先关闭对象服务action rest api, 否则会导致 action rest api 过多, 请求速度变慢.
-        // if (objectConfig.enable_api) {
-        //     _.each(schema.actions, (action, actionName) => {
-        //         let rest = generateActionRestProp(actionName);
-        //         if (rest.method) {
-        //             action.rest = rest;
-        //         }
-        //     })
-        // }
-        if (objectConfig.enable_graphql || true) { // TODO object.yml添加enable_graphql属性
+        if (objectConfig.enable_graphql || true) {
             _.each(schema.actions, function (action, actionName) {
                 var gpObj = (0, graphql_1.generateActionGraphqlProp)(actionName, objectConfig);
                 if (!_.isEmpty(gpObj)) {
@@ -1221,12 +1172,12 @@ module.exports = {
                         type = this.settings.graphql.type;
                         relatedFieldName = (0, graphql_1.correctName)("".concat(graphql_1.RELATED_PREFIX, "_").concat(detailObjectApiName, "_").concat(detailFieldName));
                         relatedType = (0, graphql_1._getRelatedType)(relatedFieldName, detailObjectApiName);
-                        if (type.indexOf(relatedType) > -1) { // 防止重复定义field
-                            return [2 /*return*/];
+                        if (type.indexOf(relatedType) > -1) {
+                            return [2];
                         }
                         this.settings.graphql.type = type.substring(0, type.length - 1) + relatedType + '}';
                         resolvers[objectApiName][relatedFieldName] = (0, graphql_1.getRelatedResolver)(objectApiName, detailObjectApiName, detailFieldName, detailFieldReferenceToFieldName);
-                        return [2 /*return*/];
+                        return [2];
                     });
                 });
             }
@@ -1241,7 +1192,7 @@ module.exports = {
                             case 0:
                                 objectConfig = ctx.params.data;
                                 datasource = (0, datasource_1.getDataSource)(objectConfig.datasource);
-                                if (!datasource) return [3 /*break*/, 4];
+                                if (!datasource) return [3, 4];
                                 localObjectConfig = (0, object_dynamic_load_1.getObjectConfig)(objectConfig.name);
                                 if (localObjectConfig) {
                                     objectConfig.listeners = localObjectConfig.listeners;
@@ -1251,13 +1202,13 @@ module.exports = {
                                 datasource.setLocalObject(objectConfig.name, object);
                                 this.object = object;
                                 if (!(datasource.name != "meteor" &&
-                                    datasource.name != "default")) return [3 /*break*/, 2];
-                                return [4 /*yield*/, datasource.init()];
+                                    datasource.name != "default")) return [3, 2];
+                                return [4, datasource.init()];
                             case 1:
                                 _a.sent();
                                 _a.label = 2;
                             case 2:
-                                if (!(datasource.name === 'meteor' && Creator.Objects[objectConfig.name])) return [3 /*break*/, 4];
+                                if (!(datasource.name === 'meteor' && Creator.Objects[objectConfig.name])) return [3, 4];
                                 (0, convert_1.jsonToObject)(objectConfig);
                                 localTriggers = localObjectConfig.triggers;
                                 if (localTriggers) {
@@ -1265,7 +1216,7 @@ module.exports = {
                                 }
                                 (0, util_1.extend)(objectConfig, { triggers: Creator.Objects[objectConfig.name].triggers }, { triggers: localObjectConfig._baseTriggers });
                                 Creator.Objects[objectConfig.name] = objectConfig;
-                                return [4 /*yield*/, Future.task(function () {
+                                return [4, Future.task(function () {
                                         try {
                                             Creator.loadObjects(objectConfig, objectConfig.name);
                                         }
@@ -1280,11 +1231,8 @@ module.exports = {
                                 gobj = (0, graphql_1.generateSettingsGraphql)(objectConfig);
                                 this.settings.graphql = gobj;
                                 (0, graphql_1.dealWithRelatedFields)(objectConfig, this.settings.graphql);
-                                // TODO 重写 actions
-                                // let graphqlActions = getGraphqlActions(objectConfig);
-                                // schema.actions = _.extend({}, graphqlActions, schema.actions);
                                 ctx.emit('$services.changed');
-                                return [2 /*return*/];
+                                return [2];
                         }
                     });
                 });
@@ -1302,7 +1250,7 @@ module.exports = {
                             (0, graphql_1.dealWithRelatedFields)(_objectConfig, this.settings.graphql);
                             ctx.emit('$services.changed');
                         }
-                        return [2 /*return*/];
+                        return [2];
                     });
                 });
             }