@steedos/objectql 2.2.55-beta.9 → 2.3.0-beta.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/actions/field_updates.js +36 -50
- package/lib/actions/field_updates.js.map +1 -1
- package/lib/actions/workflow_notifications.d.ts +0 -12
- package/lib/actions/workflow_notifications.js +14 -31
- package/lib/actions/workflow_notifications.js.map +1 -1
- package/lib/actions/workflow_rule.js +33 -54
- package/lib/actions/workflow_rule.js.map +1 -1
- package/lib/broker.js +5 -5
- package/lib/broker.js.map +1 -1
- package/lib/driver/driver.d.ts +0 -38
- package/lib/driver/field-encrytion/index.js +0 -7
- package/lib/driver/field-encrytion/index.js.map +1 -1
- package/lib/driver/field-encrytion/mongosharedconst.js +4 -20
- package/lib/driver/field-encrytion/mongosharedconst.js.map +1 -1
- package/lib/driver/fieldDBType.js +0 -4
- package/lib/driver/fieldDBType.js.map +1 -1
- package/lib/driver/format.d.ts +0 -12
- package/lib/driver/format.js +0 -12
- package/lib/driver/format.js.map +1 -1
- package/lib/driver/metadata.js +2 -10
- package/lib/driver/metadata.js.map +1 -1
- package/lib/driver/meteorMongo.js +32 -36
- package/lib/driver/meteorMongo.js.map +1 -1
- package/lib/driver/mongo.d.ts +0 -3
- package/lib/driver/mongo.js +59 -64
- package/lib/driver/mongo.js.map +1 -1
- package/lib/driver/mysql.js +1 -8
- package/lib/driver/mysql.js.map +1 -1
- package/lib/driver/oracle.js +3 -11
- package/lib/driver/oracle.js.map +1 -1
- package/lib/driver/postgres.js +1 -8
- package/lib/driver/postgres.js.map +1 -1
- package/lib/driver/sqlite3.js +1 -8
- package/lib/driver/sqlite3.js.map +1 -1
- package/lib/driver/sqlserver.js +3 -10
- package/lib/driver/sqlserver.js.map +1 -1
- package/lib/dynamic-load/actions.js +26 -27
- package/lib/dynamic-load/actions.js.map +1 -1
- package/lib/dynamic-load/approval_process.js +0 -1
- package/lib/dynamic-load/approval_process.js.map +1 -1
- package/lib/dynamic-load/button.js +13 -13
- package/lib/dynamic-load/button.js.map +1 -1
- package/lib/dynamic-load/chart.js +3 -3
- package/lib/dynamic-load/chart.js.map +1 -1
- package/lib/dynamic-load/client_script.js +0 -24
- package/lib/dynamic-load/client_script.js.map +1 -1
- package/lib/dynamic-load/field.js +13 -13
- package/lib/dynamic-load/field.js.map +1 -1
- package/lib/dynamic-load/layout.js +16 -16
- package/lib/dynamic-load/layout.js.map +1 -1
- package/lib/dynamic-load/listview.js +13 -13
- package/lib/dynamic-load/listview.js.map +1 -1
- package/lib/dynamic-load/object_translations.js +8 -20
- package/lib/dynamic-load/object_translations.js.map +1 -1
- package/lib/dynamic-load/package.d.ts +0 -8
- package/lib/dynamic-load/package.js +83 -95
- package/lib/dynamic-load/package.js.map +1 -1
- package/lib/dynamic-load/page.js +3 -3
- package/lib/dynamic-load/page.js.map +1 -1
- package/lib/dynamic-load/permission.js +24 -25
- package/lib/dynamic-load/permission.js.map +1 -1
- package/lib/dynamic-load/permissionset.js +22 -23
- package/lib/dynamic-load/permissionset.js.map +1 -1
- package/lib/dynamic-load/preload_data.js +73 -73
- package/lib/dynamic-load/preload_data.js.map +1 -1
- package/lib/dynamic-load/profile.js +22 -25
- package/lib/dynamic-load/profile.js.map +1 -1
- package/lib/dynamic-load/query.js +3 -3
- package/lib/dynamic-load/query.js.map +1 -1
- package/lib/dynamic-load/restrictionRules.js +3 -3
- package/lib/dynamic-load/restrictionRules.js.map +1 -1
- package/lib/dynamic-load/shareRules.js +3 -3
- package/lib/dynamic-load/shareRules.js.map +1 -1
- package/lib/dynamic-load/tab.js +4 -4
- package/lib/dynamic-load/tab.js.map +1 -1
- package/lib/dynamic-load/tabs.d.ts +0 -3
- package/lib/dynamic-load/tabs.js +4 -7
- package/lib/dynamic-load/tabs.js.map +1 -1
- package/lib/dynamic-load/translations.js +17 -28
- package/lib/dynamic-load/translations.js.map +1 -1
- package/lib/dynamic-load/trigger.d.ts +0 -5
- package/lib/dynamic-load/trigger.js +0 -29
- package/lib/dynamic-load/trigger.js.map +1 -1
- package/lib/errors/index.js +1 -25
- package/lib/errors/index.js.map +1 -1
- package/lib/formula/core.d.ts +0 -63
- package/lib/formula/core.js +94 -211
- package/lib/formula/core.js.map +1 -1
- package/lib/formula/field_formula.d.ts +0 -23
- package/lib/formula/field_formula.js +12 -36
- package/lib/formula/field_formula.js.map +1 -1
- package/lib/formula/index.js +15 -22
- package/lib/formula/index.js.map +1 -1
- package/lib/formula/params.js +23 -48
- package/lib/formula/params.js.map +1 -1
- package/lib/formula/recompute.d.ts +0 -8
- package/lib/formula/recompute.js +32 -45
- package/lib/formula/recompute.js.map +1 -1
- package/lib/formula/simple_params.js +10 -10
- package/lib/formula/simple_params.js.map +1 -1
- package/lib/formula/type.d.ts +0 -52
- package/lib/formula/type.js +0 -4
- package/lib/formula/type.js.map +1 -1
- package/lib/formula/util.d.ts +0 -69
- package/lib/formula/util.js +0 -70
- package/lib/formula/util.js.map +1 -1
- package/lib/index.js +0 -7
- package/lib/index.js.map +1 -1
- package/lib/metadata-register/_base.js +13 -13
- package/lib/metadata-register/_base.js.map +1 -1
- package/lib/metadata-register/app.js +8 -8
- package/lib/metadata-register/app.js.map +1 -1
- package/lib/metadata-register/chart.js +1 -1
- package/lib/metadata-register/index.js +49 -49
- package/lib/metadata-register/index.js.map +1 -1
- package/lib/metadata-register/layout.js +10 -10
- package/lib/metadata-register/layout.js.map +1 -1
- package/lib/metadata-register/object.js +10 -15
- package/lib/metadata-register/object.js.map +1 -1
- package/lib/metadata-register/page.js +1 -1
- package/lib/metadata-register/permissionFields.js +1 -1
- package/lib/metadata-register/permissionset.js +6 -6
- package/lib/metadata-register/permissionset.js.map +1 -1
- package/lib/metadata-register/process.js +1 -8
- package/lib/metadata-register/process.js.map +1 -1
- package/lib/metadata-register/processTrigger.d.ts +0 -11
- package/lib/metadata-register/processTrigger.js +1 -12
- package/lib/metadata-register/processTrigger.js.map +1 -1
- package/lib/metadata-register/profile.js +6 -6
- package/lib/metadata-register/profile.js.map +1 -1
- package/lib/metadata-register/query.js +1 -1
- package/lib/metadata-register/restrictionRules.js +1 -1
- package/lib/metadata-register/shareRules.js +1 -1
- package/lib/metadata-register/tab.js +1 -1
- package/lib/metadata-register/tabs.d.ts +0 -3
- package/lib/metadata-register/tabs.js +10 -13
- package/lib/metadata-register/tabs.js.map +1 -1
- package/lib/services/datasourceServiceFactory.js +5 -8
- package/lib/services/datasourceServiceFactory.js.map +1 -1
- package/lib/services/helpers/graphql/consts.js +0 -7
- package/lib/services/helpers/graphql/consts.js.map +1 -1
- package/lib/services/helpers/graphql/getPrimaryFieldType.d.ts +0 -4
- package/lib/services/helpers/graphql/getPrimaryFieldType.js +0 -12
- package/lib/services/helpers/graphql/getPrimaryFieldType.js.map +1 -1
- package/lib/services/helpers/graphql/getQueryFields.js +0 -4
- package/lib/services/helpers/graphql/getQueryFields.js.map +1 -1
- package/lib/services/helpers/graphql/index.js +84 -108
- package/lib/services/helpers/graphql/index.js.map +1 -1
- package/lib/services/objectService.js +127 -179
- package/lib/services/objectService.js.map +1 -1
- package/lib/services/objectServiceDispatcher.js +87 -87
- package/lib/services/objectServiceDispatcher.js.map +1 -1
- package/lib/services/objectServiceFactory.js +4 -4
- package/lib/services/objectServiceFactory.js.map +1 -1
- package/lib/summary/core.d.ts +0 -68
- package/lib/summary/core.js +46 -130
- package/lib/summary/core.js.map +1 -1
- package/lib/summary/field_summary.d.ts +0 -16
- package/lib/summary/field_summary.js +10 -27
- package/lib/summary/field_summary.js.map +1 -1
- package/lib/summary/index.d.ts +0 -5
- package/lib/summary/index.js +10 -28
- package/lib/summary/index.js.map +1 -1
- package/lib/summary/recompute.d.ts +0 -8
- package/lib/summary/recompute.js +8 -23
- package/lib/summary/recompute.js.map +1 -1
- package/lib/summary/type.d.ts +0 -17
- package/lib/summary/type.js +0 -13
- package/lib/summary/type.js.map +1 -1
- package/lib/typeorm/driver.js +69 -77
- package/lib/typeorm/driver.js.map +1 -1
- package/lib/typeorm/util.js +5 -4
- package/lib/typeorm/util.js.map +1 -1
- package/lib/types/action.js +1 -1
- package/lib/types/app.js +38 -43
- package/lib/types/app.js.map +1 -1
- package/lib/types/config.js +11 -15
- package/lib/types/config.js.map +1 -1
- package/lib/types/connection.d.ts +0 -10
- package/lib/types/connection.js +9 -16
- package/lib/types/connection.js.map +1 -1
- package/lib/types/dashboard.js +1 -1
- package/lib/types/datasource.d.ts +0 -3
- package/lib/types/datasource.js +97 -110
- package/lib/types/datasource.js.map +1 -1
- package/lib/types/field.js +4 -34
- package/lib/types/field.js.map +1 -1
- package/lib/types/field_permission.js +7 -7
- package/lib/types/field_permission.js.map +1 -1
- package/lib/types/list_view.js +2 -2
- package/lib/types/object.d.ts +0 -38
- package/lib/types/object.js +284 -391
- package/lib/types/object.js.map +1 -1
- package/lib/types/object_dynamic_load.js +40 -45
- package/lib/types/object_dynamic_load.js.map +1 -1
- package/lib/types/object_events.js +4 -14
- package/lib/types/object_events.js.map +1 -1
- package/lib/types/object_layouts.js +4 -4
- package/lib/types/object_layouts.js.map +1 -1
- package/lib/types/object_permission.js +2 -2
- package/lib/types/query.d.ts +0 -12
- package/lib/types/report.js +1 -1
- package/lib/types/restrictionRule.js +6 -6
- package/lib/types/restrictionRule.js.map +1 -1
- package/lib/types/schema.d.ts +0 -14
- package/lib/types/schema.js +14 -39
- package/lib/types/schema.js.map +1 -1
- package/lib/types/shareRule.js +6 -6
- package/lib/types/shareRule.js.map +1 -1
- package/lib/types/trigger.js +1 -1
- package/lib/types/validation_rules.js +10 -15
- package/lib/types/validation_rules.js.map +1 -1
- package/lib/util/index.d.ts +0 -12
- package/lib/util/index.js +10 -50
- package/lib/util/index.js.map +1 -1
- package/lib/util/locale.d.ts +0 -6
- package/lib/util/locale.js +0 -6
- package/lib/util/locale.js.map +1 -1
- package/lib/util/suffix.js +4 -12
- package/lib/util/suffix.js.map +1 -1
- package/package.json +13 -13
package/lib/driver/driver.d.ts
CHANGED
|
@@ -3,55 +3,17 @@ import { SteedosQueryOptions, SteedosQueryFilters } from "../types/query";
|
|
|
3
3
|
import { SteedosIDType, SteedosObjectType } from "../types";
|
|
4
4
|
import { SteedosFieldDBType } from './fieldDBType';
|
|
5
5
|
export declare type SteedosDriverConfig = {
|
|
6
|
-
/**
|
|
7
|
-
* Connection url where perform connection to.
|
|
8
|
-
*/
|
|
9
6
|
readonly url?: string;
|
|
10
|
-
/**
|
|
11
|
-
* Database host.
|
|
12
|
-
*/
|
|
13
7
|
readonly host?: string;
|
|
14
|
-
/**
|
|
15
|
-
* Database host port.
|
|
16
|
-
*/
|
|
17
8
|
readonly port?: number;
|
|
18
|
-
/**
|
|
19
|
-
* Database username.
|
|
20
|
-
*/
|
|
21
9
|
readonly username?: string;
|
|
22
|
-
/**
|
|
23
|
-
* Database password.
|
|
24
|
-
*/
|
|
25
10
|
readonly password?: string;
|
|
26
|
-
/**
|
|
27
|
-
* Database name to connect to.
|
|
28
|
-
*/
|
|
29
11
|
readonly database?: string;
|
|
30
|
-
/**
|
|
31
|
-
* Once you set domain, driver will connect to SQL Server using domain login.
|
|
32
|
-
*/
|
|
33
12
|
readonly domain?: string;
|
|
34
|
-
/**
|
|
35
|
-
* The timezone configured on the MySQL server.
|
|
36
|
-
* This is used to type cast server date/time values to JavaScript Date object and vice versa.
|
|
37
|
-
* This can be 'local', 'Z', or an offset in the form +HH:MM or -HH:MM. (Default: 'local')
|
|
38
|
-
*/
|
|
39
13
|
readonly timezone?: string;
|
|
40
|
-
/**
|
|
41
|
-
* Database options.
|
|
42
|
-
*/
|
|
43
14
|
readonly connectString?: string;
|
|
44
|
-
/**
|
|
45
|
-
* Database options.
|
|
46
|
-
*/
|
|
47
15
|
readonly options?: any;
|
|
48
|
-
/**
|
|
49
|
-
* Print sql log for driver.
|
|
50
|
-
*/
|
|
51
16
|
readonly logging?: boolean | Array<any>;
|
|
52
|
-
/**
|
|
53
|
-
* collection locale.
|
|
54
|
-
*/
|
|
55
17
|
readonly locale?: string;
|
|
56
18
|
};
|
|
57
19
|
export interface SteedosDriver {
|
|
@@ -1,12 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
var tslib_1 = require("tslib");
|
|
4
|
-
/*
|
|
5
|
-
* @Author: sunhaolin@hotoa.com
|
|
6
|
-
* @Date: 2022-05-13 14:01:40
|
|
7
|
-
* @LastEditors: sunhaolin@hotoa.com
|
|
8
|
-
* @LastEditTime: 2022-06-21 15:33:22
|
|
9
|
-
* @Description:
|
|
10
|
-
*/
|
|
11
4
|
tslib_1.__exportStar(require("./mongosharedconst"), exports);
|
|
12
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/driver/field-encrytion/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/driver/field-encrytion/index.ts"],"names":[],"mappings":";;;AAOA,6DAAmC"}
|
|
@@ -1,21 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/*
|
|
3
|
-
* @Author: sunhaolin@hotoa.com
|
|
4
|
-
* @Date: 2022-05-03 11:37:54
|
|
5
|
-
* @LastEditors: sunhaolin@hotoa.com
|
|
6
|
-
* @LastEditTime: 2022-06-21 15:32:30
|
|
7
|
-
* @Description:
|
|
8
|
-
*/
|
|
9
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
10
3
|
exports.getMongoFieldEncryptionConsts = void 0;
|
|
11
4
|
var mongodb_1 = require("mongodb");
|
|
12
5
|
var mongodb_uri_1 = require("mongodb-uri");
|
|
13
|
-
// var MY_LOCAL_KEY = crypto.randomBytes(96).toString('base64')
|
|
14
|
-
// 主密钥
|
|
15
6
|
function getMongoFieldEncryptionConsts() {
|
|
16
7
|
var MY_LOCAL_KEY = process.env.STEEDOS_CSFLE_MASTER_KEY;
|
|
17
8
|
var MONGO_URL = process.env.MONGO_URL;
|
|
18
|
-
// 密钥管理服务
|
|
19
9
|
var getKMSProviders = function getKMSProviders() {
|
|
20
10
|
return {
|
|
21
11
|
"local": {
|
|
@@ -24,17 +14,11 @@ function getMongoFieldEncryptionConsts() {
|
|
|
24
14
|
};
|
|
25
15
|
};
|
|
26
16
|
var defaultuUriObj = (0, mongodb_uri_1.parse)(MONGO_URL);
|
|
27
|
-
|
|
28
|
-
var
|
|
29
|
-
// 密钥保管库表名
|
|
30
|
-
var keyVaultCollection = process.env.STEEDOS_CSFLE_KEY_VAULT_COLLECTION || '__keystore'; // 默认 __keystore
|
|
31
|
-
// 密钥保管库命名空间
|
|
17
|
+
var keyVaultDb = process.env.STEEDOS_CSFLE_KEY_VAULT_DB || defaultuUriObj.database;
|
|
18
|
+
var keyVaultCollection = process.env.STEEDOS_CSFLE_KEY_VAULT_COLLECTION || '__keystore';
|
|
32
19
|
var keyVaultNamespace = "".concat(keyVaultDb, ".").concat(keyVaultCollection);
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
var connectionString = process.env.STEEDOS_CSFLE_MONGO_URL || process.env.MONGO_URL; // 默认 MONGO_URL
|
|
36
|
-
// 主密钥别名
|
|
37
|
-
var altKeyName = process.env.STEEDOS_CSFLE_ALT_KEY_NAME || 'steedos'; // 默认 steedos
|
|
20
|
+
var connectionString = process.env.STEEDOS_CSFLE_MONGO_URL || process.env.MONGO_URL;
|
|
21
|
+
var altKeyName = process.env.STEEDOS_CSFLE_ALT_KEY_NAME || 'steedos';
|
|
38
22
|
return {
|
|
39
23
|
getKMSProviders: getKMSProviders,
|
|
40
24
|
keyVaultDb: keyVaultDb,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mongosharedconst.js","sourceRoot":"","sources":["../../../src/driver/field-encrytion/mongosharedconst.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mongosharedconst.js","sourceRoot":"","sources":["../../../src/driver/field-encrytion/mongosharedconst.ts"],"names":[],"mappings":";;;AAQA,mCAAiC;AACjC,2CAAoC;AAIpC,SAAgB,6BAA6B;IACzC,IAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;IAC1D,IAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;IAExC,IAAM,eAAe,GAAG,SAAS,eAAe;QAC5C,OAAO;YACH,OAAO,EAAE;gBACL,KAAK,EAAE,IAAI,gBAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC;aAC5D;SACJ,CAAA;IACL,CAAC,CAAA;IAED,IAAM,cAAc,GAAG,IAAA,mBAAK,EAAC,SAAS,CAAC,CAAC;IAExC,IAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,cAAc,CAAC,QAAQ,CAAC;IAErF,IAAM,kBAAkB,GAAG,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,YAAY,CAAC;IAE1F,IAAM,iBAAiB,GAAG,UAAG,UAAU,cAAI,kBAAkB,CAAE,CAAC;IAGhE,IAAM,gBAAgB,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC;IAEtF,IAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,0BAA0B,IAAI,SAAS,CAAC;IAEvE,OAAO;QACH,eAAe,iBAAA;QACf,UAAU,YAAA;QACV,kBAAkB,oBAAA;QAClB,iBAAiB,mBAAA;QACjB,gBAAgB,kBAAA;QAChB,UAAU,YAAA;KACb,CAAA;AACL,CAAC;AAjCD,sEAiCC"}
|
|
@@ -11,9 +11,5 @@ var SteedosFieldDBType;
|
|
|
11
11
|
SteedosFieldDBType["dateTime"] = "dateTime";
|
|
12
12
|
SteedosFieldDBType["json"] = "json";
|
|
13
13
|
SteedosFieldDBType["array"] = "array";
|
|
14
|
-
// oneToOne,
|
|
15
|
-
// oneToMany,
|
|
16
|
-
// manyToOne,
|
|
17
|
-
// manyToMany
|
|
18
14
|
})(SteedosFieldDBType = exports.SteedosFieldDBType || (exports.SteedosFieldDBType = {}));
|
|
19
15
|
//# sourceMappingURL=fieldDBType.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fieldDBType.js","sourceRoot":"","sources":["../../src/driver/fieldDBType.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAaX;AAbD,WAAY,kBAAkB;IAC1B,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,uCAAiB,CAAA;IACjB,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;IACb,qCAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"fieldDBType.js","sourceRoot":"","sources":["../../src/driver/fieldDBType.ts"],"names":[],"mappings":";;;AAAA,IAAY,kBAaX;AAbD,WAAY,kBAAkB;IAC1B,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,uCAAiB,CAAA;IACjB,yCAAmB,CAAA;IACnB,mCAAa,CAAA;IACb,2CAAqB,CAAA;IACrB,mCAAa,CAAA;IACb,qCAAe,CAAA;AAKnB,CAAC,EAbW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAa7B"}
|
package/lib/driver/format.d.ts
CHANGED
|
@@ -1,15 +1,3 @@
|
|
|
1
1
|
import { Dictionary } from "@salesforce/ts-types";
|
|
2
2
|
import { SteedosObjectType } from "../types";
|
|
3
|
-
/**
|
|
4
|
-
* https://github.com/steedos/steedos-frontend/issues/69
|
|
5
|
-
* mongo数据源不会自动把日期/日期时间字段从字符串转换为Date类型
|
|
6
|
-
* https://github.com/steedos/steedos-platform/issues/3314
|
|
7
|
-
* 公式中可能引用日期/日期时间字段做比较,所以需要在object层就调用该函数,而不是在driver层调用
|
|
8
|
-
* Meteor数据源只是在driver层保存数据的时候会自动处理各种字段类型转换,所以也调用了该函数提前转换,以避免公式运算中拿到的参数值也是转换前的
|
|
9
|
-
* TypeORM相关的数据源因为一直没暴露过相关问题,所以暂时不调用该函数
|
|
10
|
-
* direct相关db操作函数因为可能从接口中接收记录doc参数值,所以也调用了该函数
|
|
11
|
-
* @param doc 记录数据
|
|
12
|
-
* @param objectConfig 对象schema
|
|
13
|
-
* @returns
|
|
14
|
-
*/
|
|
15
3
|
export declare function formatRecord(doc: Dictionary<any>, objectConfig: SteedosObjectType): Dictionary<any>;
|
package/lib/driver/format.js
CHANGED
|
@@ -2,18 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.formatRecord = void 0;
|
|
4
4
|
var _ = require("lodash");
|
|
5
|
-
/**
|
|
6
|
-
* https://github.com/steedos/steedos-frontend/issues/69
|
|
7
|
-
* mongo数据源不会自动把日期/日期时间字段从字符串转换为Date类型
|
|
8
|
-
* https://github.com/steedos/steedos-platform/issues/3314
|
|
9
|
-
* 公式中可能引用日期/日期时间字段做比较,所以需要在object层就调用该函数,而不是在driver层调用
|
|
10
|
-
* Meteor数据源只是在driver层保存数据的时候会自动处理各种字段类型转换,所以也调用了该函数提前转换,以避免公式运算中拿到的参数值也是转换前的
|
|
11
|
-
* TypeORM相关的数据源因为一直没暴露过相关问题,所以暂时不调用该函数
|
|
12
|
-
* direct相关db操作函数因为可能从接口中接收记录doc参数值,所以也调用了该函数
|
|
13
|
-
* @param doc 记录数据
|
|
14
|
-
* @param objectConfig 对象schema
|
|
15
|
-
* @returns
|
|
16
|
-
*/
|
|
17
5
|
function formatRecord(doc, objectConfig) {
|
|
18
6
|
if (!objectConfig) {
|
|
19
7
|
return doc;
|
package/lib/driver/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/driver/format.ts"],"names":[],"mappings":";;;AASA,0BAA6B;
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/driver/format.ts"],"names":[],"mappings":";;;AASA,0BAA6B;AAc7B,SAAgB,YAAY,CAAC,GAAoB,EAAE,YAA+B;IAC9E,IAAG,CAAC,YAAY,EAAC;QACb,OAAO,GAAG,CAAC;KACd;IACD,IAAM,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IACnC,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,EAAE,UAAS,KAAK,EAAE,GAAG;QACvC,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACxB,IAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAC;YACnF,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;SAC1B;QACD,OAAO,KAAK,CAAC;IACjB,CAAC,CAAC,CAAC;AACP,CAAC;AAZD,oCAYC"}
|
package/lib/driver/metadata.js
CHANGED
|
@@ -6,7 +6,7 @@ var steedosFilters = require("@steedos/filters");
|
|
|
6
6
|
var odataV4Mongodb = require("@steedos/odata-v4-mongodb");
|
|
7
7
|
var clone = require("clone");
|
|
8
8
|
var _ = require("underscore");
|
|
9
|
-
var MetadataDriver =
|
|
9
|
+
var MetadataDriver = (function () {
|
|
10
10
|
function MetadataDriver() {
|
|
11
11
|
}
|
|
12
12
|
MetadataDriver.prototype.connect = function () {
|
|
@@ -121,23 +121,15 @@ var MetadataDriver = /** @class */ (function () {
|
|
|
121
121
|
});
|
|
122
122
|
var mongoFilters = this.getMongoFilters(queryOptions.filters);
|
|
123
123
|
var mongoOptions = this.getMongoOptions(queryOptions);
|
|
124
|
-
// console.log(`mongoFilters`, JSON.stringify(mongoFilters));
|
|
125
|
-
// console.log(`mongoOptions`, mongoOptions);
|
|
126
124
|
var query = new mingo.Query(mongoFilters);
|
|
127
125
|
var projection = queryOptions.projection ? Object.assign({}, queryOptions.projection, {
|
|
128
126
|
record_permissions: 1,
|
|
129
127
|
is_system: 1,
|
|
130
128
|
}) : null;
|
|
131
|
-
var cursor = query.find(_collection, projection);
|
|
129
|
+
var cursor = query.find(_collection, projection);
|
|
132
130
|
if (mongoOptions.sort) {
|
|
133
131
|
cursor.sort(mongoOptions.sort);
|
|
134
132
|
}
|
|
135
|
-
// if(mongoOptions.skip){
|
|
136
|
-
// cursor.skip(mongoOptions.skip)
|
|
137
|
-
// }
|
|
138
|
-
// if(mongoOptions.limit){
|
|
139
|
-
// cursor.limit(mongoOptions.limit)
|
|
140
|
-
// }
|
|
141
133
|
return cursor;
|
|
142
134
|
};
|
|
143
135
|
MetadataDriver.prototype.getSupportedColumnTypes = function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/driver/metadata.ts"],"names":[],"mappings":";;;AAKA,6BAAgC;AAChC,iDAAoD;AACpD,0DAA6D;AAC7D,6BAAgC;AAChC,8BAAiC;AAEjC;IAAA;IAsNA,CAAC;IAnNG,gCAAO,GAAP;IAEA,CAAC;IACD,8BAAK,GAAL;IAEA,CAAC;IAED,kDAAyB,GAAzB,UAA0B,OAAO;QAC7B,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,UAAU,GAAG,EAAE,CAAC;QACpB,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YACrB,UAAU,GAAG,OAAO,CAAC;SACxB;aACI;YACD,UAAU,GAAG,cAAc,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAA;SACjE;QACD,IAAG,CAAC,UAAU,EAAC;YACX,OAAO,YAAY,CAAC;SACvB;QACD,IAAI,KAAK,GAAG,cAAc,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,wCAAe,GAAf,UAAgB,OAAO;QACnB,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,OAAO,YAAY,CAAC;SACvB;QACD,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,OAAO,YAAY,CAAA;SACtB;QACD,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACvC,OAAO,YAAY,CAAA;SACtB;QACD,IAAI,YAAY,GAAG,IAAI,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAC3D,OAAO,YAAY,CAAA;IACvB,CAAC;IAED,8CAAqB,GAArB,UAAsB,MAAM;QACxB,IAAI,OAAO,MAAM,IAAI,QAAQ,EAAE;YAC3B,MAAM,GAAG,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAO,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;SACjE;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE;YAC5B,OAAO,EAAE,CAAA;SACZ;QACD,IAAI,UAAU,GAAG;YACb,kBAAkB,EAAE,CAAC;YACrB,SAAS,EAAE,CAAC;SACf,CAAC;QACF,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAC,KAAK;YACnB,IAAI,KAAK,EAAE;gBACP,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACzB;QACL,CAAC,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,wCAAe,GAAf,UAAgB,OAAO;QACnB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QACD,IAAI,MAAM,GAAQ,EAAE,CAAC;QACrB,IAAI,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,MAAM,CAAC,UAAU,GAAG,UAAU,CAAC;QAC/B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACnB,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC;QAC3B,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;QAC3B,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,4CAAmB,GAAnB,UAAoB,IAAI;QACpB,IAAI,MAAM,GAAG,SAAS,CAAC;QACvB,IAAI,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;YAClC,IAAI,SAAS,GAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,UAAC,CAAC,IAAO,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAChE,IAAI,YAAU,GAAG,EAAE,CAAC;YACpB,SAAS,CAAC,OAAO,CAAC,UAAC,CAAC;gBAChB,IAAI,CAAC,EAAE;oBACH,YAAU,IAAI,UAAG,CAAC,MAAG,CAAA;iBACxB;YACL,CAAC,CAAC,CAAC;YACH,YAAU,GAAG,YAAU,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,GAAG,cAAc,CAAC,WAAW,CAAC,mBAAY,YAAU,CAAE,CAAC,CAAC,IAAI,CAAC;SACtE;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,4CAAmB,GAAnB,UAAoB,OAAO;QACvB,IAAI,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACb;QACD,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC5D,IAAI,IAAI,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACxB,MAAM,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,CAAC;SACzC;QACD,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SAChC;QACD,IAAI,OAAO,CAAC,IAAI,EAAE;YACd,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;SACxC;QACD,IAAI,OAAO,CAAC,GAAG,EAAE;YACb,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;SACxC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,sCAAa,GAAb,UAAc,UAAU,EAAE,YAAY,EAAE,OAAO;QAC3C,IAAM,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;QACtC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,UAAS,IAAI;YAC7B,IAAI;gBACA,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;aACxB;YAAC,OAAO,KAAK,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,yCAAkC,IAAI,sBAAmB,CAAC,CAAC;aAC5E;QACL,CAAC,CAAC,CAAC;QACH,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;QAC9D,IAAI,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"metadata.js","sourceRoot":"","sources":["../../src/driver/metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ var fieldDBType_1 = require("./fieldDBType");
|
|
|
9
9
|
var mongodb_1 = require("mongodb");
|
|
10
10
|
var format_1 = require("./format");
|
|
11
11
|
var Fiber = require('fibers');
|
|
12
|
-
var SteedosMeteorMongoDriver =
|
|
12
|
+
var SteedosMeteorMongoDriver = (function () {
|
|
13
13
|
function SteedosMeteorMongoDriver(config) {
|
|
14
14
|
}
|
|
15
15
|
SteedosMeteorMongoDriver.prototype.getSupportedColumnTypes = function () {
|
|
@@ -31,7 +31,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
31
31
|
SteedosMeteorMongoDriver.prototype.init = function () {
|
|
32
32
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
33
33
|
return tslib_1.__generator(this, function (_a) {
|
|
34
|
-
return [2
|
|
34
|
+
return [2];
|
|
35
35
|
});
|
|
36
36
|
});
|
|
37
37
|
};
|
|
@@ -50,7 +50,6 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
50
50
|
var query = (0, odata_v4_mongodb_1.createFilter)(odataQuery);
|
|
51
51
|
return query;
|
|
52
52
|
};
|
|
53
|
-
/* TODO: */
|
|
54
53
|
SteedosMeteorMongoDriver.prototype.getMongoFilters = function (filters) {
|
|
55
54
|
var emptyFilters = {};
|
|
56
55
|
if (_.isUndefined(filters)) {
|
|
@@ -70,7 +69,6 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
70
69
|
fields = fields.split(",").map(function (n) { return n.trim(); });
|
|
71
70
|
}
|
|
72
71
|
if (!(fields && fields.length)) {
|
|
73
|
-
// throw new Error("fields must not be undefined or empty");
|
|
74
72
|
return {};
|
|
75
73
|
}
|
|
76
74
|
var projection = {};
|
|
@@ -96,7 +94,6 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
96
94
|
}
|
|
97
95
|
return result;
|
|
98
96
|
};
|
|
99
|
-
/* TODO: */
|
|
100
97
|
SteedosMeteorMongoDriver.prototype.getMongoOptions = function (options) {
|
|
101
98
|
if (_.isUndefined(options)) {
|
|
102
99
|
return {};
|
|
@@ -177,7 +174,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
177
174
|
collection = this.collection(tableName);
|
|
178
175
|
mongoFilters = this.getMongoFilters(query.filters);
|
|
179
176
|
mongoOptions = this.getMongoOptions(query);
|
|
180
|
-
return [4
|
|
177
|
+
return [4, new Promise(function (resolve, reject) {
|
|
181
178
|
Fiber(function () {
|
|
182
179
|
try {
|
|
183
180
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -196,7 +193,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
196
193
|
}
|
|
197
194
|
}).run();
|
|
198
195
|
})];
|
|
199
|
-
case 1: return [2
|
|
196
|
+
case 1: return [2, _a.sent()];
|
|
200
197
|
}
|
|
201
198
|
});
|
|
202
199
|
});
|
|
@@ -227,7 +224,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
227
224
|
if (!_.isEmpty(externalPipeline)) {
|
|
228
225
|
pipeline = pipeline.concat(externalPipeline);
|
|
229
226
|
}
|
|
230
|
-
return [4
|
|
227
|
+
return [4, new Promise(function (resolve, reject) {
|
|
231
228
|
Fiber(function () {
|
|
232
229
|
try {
|
|
233
230
|
rawCollection.aggregate(pipeline).toArray(function (err, data) {
|
|
@@ -242,7 +239,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
242
239
|
}
|
|
243
240
|
}).run();
|
|
244
241
|
})];
|
|
245
|
-
case 1: return [2
|
|
242
|
+
case 1: return [2, _a.sent()];
|
|
246
243
|
}
|
|
247
244
|
});
|
|
248
245
|
});
|
|
@@ -260,7 +257,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
260
257
|
aggregateOptions = this.getAggregateOptions(query);
|
|
261
258
|
pipeline.push({ $match: mongoFilters });
|
|
262
259
|
pipeline = pipeline.concat(aggregateOptions).concat(externalPipeline);
|
|
263
|
-
return [4
|
|
260
|
+
return [4, new Promise(function (resolve, reject) {
|
|
264
261
|
Fiber(function () {
|
|
265
262
|
try {
|
|
266
263
|
rawCollection.aggregate(pipeline).toArray(function (err, data) {
|
|
@@ -275,7 +272,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
275
272
|
}
|
|
276
273
|
}).run();
|
|
277
274
|
})];
|
|
278
|
-
case 1: return [2
|
|
275
|
+
case 1: return [2, _a.sent()];
|
|
279
276
|
}
|
|
280
277
|
});
|
|
281
278
|
});
|
|
@@ -292,9 +289,8 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
292
289
|
mongoFilters = this.getMongoFilters(query.filters);
|
|
293
290
|
aggregateOptions = this.getAggregateOptions(query);
|
|
294
291
|
pipeline.push({ $match: mongoFilters });
|
|
295
|
-
// pipeline中的次序不能错,一定要先$lookup,再$match,再$project、$sort、$skip、$limit等,否则查询结果可能为空,比如公式字段中就用到了$lookup
|
|
296
292
|
pipeline = prefixalPipeline.concat(pipeline).concat(aggregateOptions);
|
|
297
|
-
return [4
|
|
293
|
+
return [4, new Promise(function (resolve, reject) {
|
|
298
294
|
Fiber(function () {
|
|
299
295
|
try {
|
|
300
296
|
rawCollection.aggregate(pipeline).toArray(function (err, data) {
|
|
@@ -309,7 +305,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
309
305
|
}
|
|
310
306
|
}).run();
|
|
311
307
|
})];
|
|
312
|
-
case 1: return [2
|
|
308
|
+
case 1: return [2, _a.sent()];
|
|
313
309
|
}
|
|
314
310
|
});
|
|
315
311
|
});
|
|
@@ -323,7 +319,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
323
319
|
collection = this.collection(tableName);
|
|
324
320
|
mongoFilters = this.getMongoFilters(query.filters);
|
|
325
321
|
mongoOptions = this.getMongoOptions(query);
|
|
326
|
-
return [4
|
|
322
|
+
return [4, new Promise(function (resolve, reject) {
|
|
327
323
|
Fiber(function () {
|
|
328
324
|
try {
|
|
329
325
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -342,7 +338,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
342
338
|
}
|
|
343
339
|
}).run();
|
|
344
340
|
})];
|
|
345
|
-
case 1: return [2
|
|
341
|
+
case 1: return [2, _a.sent()];
|
|
346
342
|
}
|
|
347
343
|
});
|
|
348
344
|
});
|
|
@@ -357,7 +353,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
357
353
|
mongoFilters = this.getMongoFilters(query.filters);
|
|
358
354
|
mongoOptions = this.getMongoOptions(query);
|
|
359
355
|
self = this;
|
|
360
|
-
return [4
|
|
356
|
+
return [4, new Promise(function (resolve, reject) {
|
|
361
357
|
Fiber(function () {
|
|
362
358
|
try {
|
|
363
359
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -383,7 +379,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
383
379
|
}
|
|
384
380
|
}).run();
|
|
385
381
|
})];
|
|
386
|
-
case 1: return [2
|
|
382
|
+
case 1: return [2, _a.sent()];
|
|
387
383
|
}
|
|
388
384
|
});
|
|
389
385
|
});
|
|
@@ -395,7 +391,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
395
391
|
switch (_a.label) {
|
|
396
392
|
case 0:
|
|
397
393
|
collection = this.collection(tableName);
|
|
398
|
-
return [4
|
|
394
|
+
return [4, new Promise(function (resolve, reject) {
|
|
399
395
|
Fiber(function () {
|
|
400
396
|
try {
|
|
401
397
|
data._id = data._id || collection._makeNewID();
|
|
@@ -416,7 +412,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
416
412
|
}
|
|
417
413
|
}).run();
|
|
418
414
|
})];
|
|
419
|
-
case 1: return [2
|
|
415
|
+
case 1: return [2, _a.sent()];
|
|
420
416
|
}
|
|
421
417
|
});
|
|
422
418
|
});
|
|
@@ -434,7 +430,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
434
430
|
else {
|
|
435
431
|
selector = { _id: id };
|
|
436
432
|
}
|
|
437
|
-
return [4
|
|
433
|
+
return [4, new Promise(function (resolve, reject) {
|
|
438
434
|
Fiber(function () {
|
|
439
435
|
try {
|
|
440
436
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -464,7 +460,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
464
460
|
}
|
|
465
461
|
}).run();
|
|
466
462
|
})];
|
|
467
|
-
case 1: return [2
|
|
463
|
+
case 1: return [2, _a.sent()];
|
|
468
464
|
}
|
|
469
465
|
});
|
|
470
466
|
});
|
|
@@ -482,7 +478,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
482
478
|
else {
|
|
483
479
|
selector = { _id: id };
|
|
484
480
|
}
|
|
485
|
-
return [4
|
|
481
|
+
return [4, new Promise(function (resolve, reject) {
|
|
486
482
|
Fiber(function () {
|
|
487
483
|
try {
|
|
488
484
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -502,7 +498,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
502
498
|
}
|
|
503
499
|
}).run();
|
|
504
500
|
})];
|
|
505
|
-
case 1: return [2
|
|
501
|
+
case 1: return [2, _a.sent()];
|
|
506
502
|
}
|
|
507
503
|
});
|
|
508
504
|
});
|
|
@@ -515,7 +511,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
515
511
|
case 0:
|
|
516
512
|
collection = this.collection(tableName);
|
|
517
513
|
mongoFilters = this.getMongoFilters(queryFilters);
|
|
518
|
-
return [4
|
|
514
|
+
return [4, new Promise(function (resolve, reject) {
|
|
519
515
|
Fiber(function () {
|
|
520
516
|
try {
|
|
521
517
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -534,7 +530,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
534
530
|
}
|
|
535
531
|
}).run();
|
|
536
532
|
})];
|
|
537
|
-
case 1: return [2
|
|
533
|
+
case 1: return [2, _a.sent()];
|
|
538
534
|
}
|
|
539
535
|
});
|
|
540
536
|
});
|
|
@@ -552,7 +548,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
552
548
|
else {
|
|
553
549
|
selector = { _id: id };
|
|
554
550
|
}
|
|
555
|
-
return [4
|
|
551
|
+
return [4, new Promise(function (resolve, reject) {
|
|
556
552
|
Fiber(function () {
|
|
557
553
|
try {
|
|
558
554
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -571,7 +567,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
571
567
|
}
|
|
572
568
|
}).run();
|
|
573
569
|
})];
|
|
574
|
-
case 1: return [2
|
|
570
|
+
case 1: return [2, _a.sent()];
|
|
575
571
|
}
|
|
576
572
|
});
|
|
577
573
|
});
|
|
@@ -585,7 +581,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
585
581
|
collection = this.collection(tableName);
|
|
586
582
|
mongoFilters = this.getMongoFilters(query.filters);
|
|
587
583
|
mongoOptions = this.getMongoOptions(query);
|
|
588
|
-
return [4
|
|
584
|
+
return [4, new Promise(function (resolve, reject) {
|
|
589
585
|
Fiber(function () {
|
|
590
586
|
try {
|
|
591
587
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -604,7 +600,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
604
600
|
}
|
|
605
601
|
}).run();
|
|
606
602
|
})];
|
|
607
|
-
case 1: return [2
|
|
603
|
+
case 1: return [2, _a.sent()];
|
|
608
604
|
}
|
|
609
605
|
});
|
|
610
606
|
});
|
|
@@ -622,7 +618,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
622
618
|
else {
|
|
623
619
|
selector = { _id: id };
|
|
624
620
|
}
|
|
625
|
-
return [4
|
|
621
|
+
return [4, new Promise(function (resolve, reject) {
|
|
626
622
|
Fiber(function () {
|
|
627
623
|
try {
|
|
628
624
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -652,7 +648,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
652
648
|
}
|
|
653
649
|
}).run();
|
|
654
650
|
})];
|
|
655
|
-
case 1: return [2
|
|
651
|
+
case 1: return [2, _a.sent()];
|
|
656
652
|
}
|
|
657
653
|
});
|
|
658
654
|
});
|
|
@@ -664,7 +660,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
664
660
|
switch (_a.label) {
|
|
665
661
|
case 0:
|
|
666
662
|
collection = this.collection(tableName);
|
|
667
|
-
return [4
|
|
663
|
+
return [4, new Promise(function (resolve, reject) {
|
|
668
664
|
Fiber(function () {
|
|
669
665
|
try {
|
|
670
666
|
data._id = data._id || collection._makeNewID();
|
|
@@ -685,7 +681,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
685
681
|
}
|
|
686
682
|
}).run();
|
|
687
683
|
})];
|
|
688
|
-
case 1: return [2
|
|
684
|
+
case 1: return [2, _a.sent()];
|
|
689
685
|
}
|
|
690
686
|
});
|
|
691
687
|
});
|
|
@@ -703,7 +699,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
703
699
|
else {
|
|
704
700
|
selector = { _id: id };
|
|
705
701
|
}
|
|
706
|
-
return [4
|
|
702
|
+
return [4, new Promise(function (resolve, reject) {
|
|
707
703
|
Fiber(function () {
|
|
708
704
|
try {
|
|
709
705
|
var invocation = new DDPCommon.MethodInvocation({
|
|
@@ -722,7 +718,7 @@ var SteedosMeteorMongoDriver = /** @class */ (function () {
|
|
|
722
718
|
}
|
|
723
719
|
}).run();
|
|
724
720
|
})];
|
|
725
|
-
case 1: return [2
|
|
721
|
+
case 1: return [2, _a.sent()];
|
|
726
722
|
}
|
|
727
723
|
});
|
|
728
724
|
});
|