@steedos/objectql 2.2.50-beta.4 → 2.2.50-beta.5
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/services/helpers/graphql/getQueryFields.d.ts +1 -1
- package/lib/services/helpers/graphql/getQueryFields.js +9 -3
- package/lib/services/helpers/graphql/getQueryFields.js.map +1 -1
- package/lib/typeorm/util.js +1 -1
- package/lib/typeorm/util.js.map +1 -1
- package/package.json +10 -10
- package/src/services/helpers/graphql/getQueryFields.ts +10 -5
- package/src/typeorm/util.ts +3 -0
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { GraphQLResolveInfo } from 'graphql';
|
|
2
|
-
export declare function getQueryFields(resolveInfo: GraphQLResolveInfo):
|
|
2
|
+
export declare function getQueryFields(resolveInfo: GraphQLResolveInfo): any[];
|
|
@@ -4,12 +4,18 @@ exports.getQueryFields = void 0;
|
|
|
4
4
|
var graphql_parse_resolve_info_1 = require("graphql-parse-resolve-info");
|
|
5
5
|
var _ = require("lodash");
|
|
6
6
|
function getQueryFields(resolveInfo) {
|
|
7
|
+
var fieldsName = [];
|
|
7
8
|
var parsedResolveInfoFragment = (0, graphql_parse_resolve_info_1.parseResolveInfo)(resolveInfo);
|
|
8
9
|
var simplifiedFragment = (0, graphql_parse_resolve_info_1.simplifyParsedResolveInfoFragmentWithType)(parsedResolveInfoFragment, resolveInfo.returnType);
|
|
9
|
-
|
|
10
|
-
|
|
10
|
+
var fields = simplifiedFragment.fields;
|
|
11
|
+
if (!_.isEmpty(fields)) {
|
|
12
|
+
for (var key in fields) {
|
|
13
|
+
if (Object.prototype.hasOwnProperty.call(fields, key)) {
|
|
14
|
+
fieldsName.push(fields[key].name);
|
|
15
|
+
}
|
|
16
|
+
}
|
|
11
17
|
}
|
|
12
|
-
return
|
|
18
|
+
return fieldsName;
|
|
13
19
|
}
|
|
14
20
|
exports.getQueryFields = getQueryFields;
|
|
15
21
|
//# sourceMappingURL=getQueryFields.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getQueryFields.js","sourceRoot":"","sources":["../../../../src/services/helpers/graphql/getQueryFields.ts"],"names":[],"mappings":";;;AAQA,yEAIoC;AAEpC,0BAA6B;AAE7B,SAAgB,cAAc,CAAC,WAA+B;
|
|
1
|
+
{"version":3,"file":"getQueryFields.js","sourceRoot":"","sources":["../../../../src/services/helpers/graphql/getQueryFields.ts"],"names":[],"mappings":";;;AAQA,yEAIoC;AAEpC,0BAA6B;AAE7B,SAAgB,cAAc,CAAC,WAA+B;IAC1D,IAAM,UAAU,GAAG,EAAE,CAAA;IACrB,IAAM,yBAAyB,GAA6B,IAAA,6CAAgB,EAAC,WAAW,CAAC,CAAC;IAC1F,IAAM,kBAAkB,GAAG,IAAA,sEAAyC,EAChE,yBAAyB,EACzB,WAAW,CAAC,UAAU,CACzB,CAAC;IAEF,IAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC;IACzC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACpB,KAAK,IAAM,GAAG,IAAI,MAAM,EAAE;YACtB,IAAI,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE;gBACnD,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAA;aACpC;SACJ;KACJ;IAED,OAAO,UAAU,CAAC;AAEtB,CAAC;AAnBD,wCAmBC"}
|
package/lib/typeorm/util.js
CHANGED
|
@@ -62,7 +62,7 @@ function getTableColumns(fields, object, databaseType) {
|
|
|
62
62
|
}
|
|
63
63
|
// 服务端增加_id字段统一代理主键字段处理查询
|
|
64
64
|
if (field.primary) {
|
|
65
|
-
columns['_id'] = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, columns[fieldName]), { name: field.column_name || fieldName, generated: false, primary: false });
|
|
65
|
+
columns['_id'] = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, columns[fieldName]), { name: field.column_name || fieldName, generated: false, primary: false, nullable: true, insert: false, update: false });
|
|
66
66
|
}
|
|
67
67
|
}
|
|
68
68
|
if (!primaryColumnCount) {
|
package/lib/typeorm/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/typeorm/util.ts"],"names":[],"mappings":";;;;AAAA,mCAAqI;AAGrI,oCAA+C;AAW/C,SAAgB,kBAAkB,CAAC,KAAuB,EAAE,YAA0B;IAClF,IAAI,UAAU,GAAuB,KAAK,CAAC,WAAW,CAAC;IACvD,QAAQ,UAAU,EAAE;QAChB,KAAK,2BAAkB,CAAC,OAAO;YAC3B,OAAO,MAAM,CAAC;QAClB,KAAK,2BAAkB,CAAC,IAAI;YACxB,IAAI,YAAY,KAAK,QAAQ,EAAC;gBAC1B,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,MAAM,CAAC;QAClB,KAAK,2BAAkB,CAAC,MAAM;YAC1B,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC;YACxD,IAAI,KAAK,KAAK,CAAC,EAAC;gBACZ,OAAO,KAAK,CAAC;aAChB;YACD,OAAO,SAAS,CAAC;QACrB,KAAK,2BAAkB,CAAC,QAAQ;YAC5B,OAAO,IAAI,CAAC;QAChB,KAAK,2BAAkB,CAAC,IAAI;YACxB,IAAI,YAAY,KAAK,UAAU,EAAE;gBAC7B,0CAA0C;gBAC1C,OAAO,MAAM,CAAC;aACjB;YACD,OAAO,IAAI,CAAC;QAChB,KAAK,2BAAkB,CAAC,OAAO;YAC3B,OAAO,OAAO,CAAC;KACtB;IACD,OAAO,UAAU,IAAI,MAAM,CAAC;AAChC,CAAC;AA5BD,gDA4BC;AAAA,CAAC;AAEF,SAAgB,eAAe,CAAC,MAAoC,EAAE,MAAyB,EAAE,YAA0B;IACvH,IAAI,OAAO,GAAiC,EAAE,CAAC;IAC/C,IAAI,kBAAkB,GAAG,CAAC,CAAC;IAC3B,KAAK,IAAI,SAAS,IAAI,MAAM,EAAE;QAC1B,IAAI,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,SAAS,GAAe,kBAAkB,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;QACpE,IAAI,CAAC,SAAS,EAAC;YACX,SAAS;SACZ;QACD,IAAI,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;QAC7C,IAAI,KAAK,CAAC,OAAO,EAAC;YACd,QAAQ,GAAG,KAAK,CAAC;YACjB,kBAAkB,EAAE,CAAC;SACxB;QACD,OAAO,CAAC,SAAS,CAAC,GAAG;YACjB,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,QAAQ;YAClB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7E,KAAK,EAAE,KAAK,CAAC,KAAK;SACrB,CAAC;QACF,IAAG,KAAK,CAAC,WAAW,EAAC;YAChB,OAAe,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,WAAW,CAAA;SAC1D;QACD,yBAAyB;QACzB,IAAI,KAAK,CAAC,OAAO,EAAE;YACd,OAAe,CAAC,KAAK,CAAC,mDAChB,OAAO,CAAC,SAAS,CAAC,KACrB,IAAI,EAAE,KAAK,CAAC,WAAW,IAAI,SAAS,EACpC,SAAS,EAAE,KAAK,EAChB,OAAO,EAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/typeorm/util.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/objectql",
|
|
3
3
|
"private": false,
|
|
4
|
-
"version": "2.2.50-beta.
|
|
4
|
+
"version": "2.2.50-beta.5",
|
|
5
5
|
"description": "",
|
|
6
6
|
"main": "lib/index.js",
|
|
7
7
|
"scripts": {
|
|
@@ -18,13 +18,13 @@
|
|
|
18
18
|
"@babel/preset-env": "^7.8.4",
|
|
19
19
|
"@salesforce/kit": "^1.0.4",
|
|
20
20
|
"@salesforce/ts-types": "^1.1.1",
|
|
21
|
-
"@steedos/cachers": "2.2.50-beta.
|
|
22
|
-
"@steedos/filters": "2.2.50-beta.
|
|
23
|
-
"@steedos/formula": "2.2.50-beta.
|
|
24
|
-
"@steedos/metadata-core": "2.2.50-beta.
|
|
25
|
-
"@steedos/odata-v4-typeorm": "2.2.50-beta.
|
|
26
|
-
"@steedos/schemas": "2.2.50-beta.
|
|
27
|
-
"@steedos/standard-objects": "2.2.50-beta.
|
|
21
|
+
"@steedos/cachers": "2.2.50-beta.5",
|
|
22
|
+
"@steedos/filters": "2.2.50-beta.5",
|
|
23
|
+
"@steedos/formula": "2.2.50-beta.5",
|
|
24
|
+
"@steedos/metadata-core": "2.2.50-beta.5",
|
|
25
|
+
"@steedos/odata-v4-typeorm": "2.2.50-beta.5",
|
|
26
|
+
"@steedos/schemas": "2.2.50-beta.5",
|
|
27
|
+
"@steedos/standard-objects": "2.2.50-beta.5",
|
|
28
28
|
"app-root-path": "^2.2.1",
|
|
29
29
|
"body-parser": "^1.18.1",
|
|
30
30
|
"bunyan-sfdx-no-dtrace": "^1.8.2",
|
|
@@ -53,7 +53,7 @@
|
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@salesforce/dev-config": "^1.4.4",
|
|
55
55
|
"@salesforce/dev-scripts": "0.3.12",
|
|
56
|
-
"@steedos/meteor-bundle-runner": "2.2.50-beta.
|
|
56
|
+
"@steedos/meteor-bundle-runner": "2.2.50-beta.5",
|
|
57
57
|
"@types/chai": "^4.1.7",
|
|
58
58
|
"@types/chai-as-promised": "7.1.0",
|
|
59
59
|
"@types/express": "^4.16.1",
|
|
@@ -76,5 +76,5 @@
|
|
|
76
76
|
"publishConfig": {
|
|
77
77
|
"access": "public"
|
|
78
78
|
},
|
|
79
|
-
"gitHead": "
|
|
79
|
+
"gitHead": "c156d628578f361dd908e7958bee958caeda3654"
|
|
80
80
|
}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @Author: sunhaolin@hotoa.com
|
|
3
3
|
* @Date: 2022-06-15 15:50:29
|
|
4
4
|
* @LastEditors: sunhaolin@hotoa.com
|
|
5
|
-
* @LastEditTime: 2022-06-
|
|
5
|
+
* @LastEditTime: 2022-06-17 15:19:47
|
|
6
6
|
* @Description: 根据query的请求体解析出查询的字段
|
|
7
7
|
*/
|
|
8
8
|
import { GraphQLResolveInfo } from 'graphql';
|
|
@@ -15,17 +15,22 @@ import {
|
|
|
15
15
|
import _ = require('lodash');
|
|
16
16
|
|
|
17
17
|
export function getQueryFields(resolveInfo: GraphQLResolveInfo) {
|
|
18
|
-
|
|
18
|
+
const fieldsName = []
|
|
19
19
|
const parsedResolveInfoFragment: ResolveTree = <ResolveTree>parseResolveInfo(resolveInfo);
|
|
20
20
|
const simplifiedFragment = simplifyParsedResolveInfoFragmentWithType(
|
|
21
21
|
parsedResolveInfoFragment,
|
|
22
22
|
resolveInfo.returnType
|
|
23
23
|
);
|
|
24
24
|
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
const fields = simplifiedFragment.fields;
|
|
26
|
+
if (!_.isEmpty(fields)) {
|
|
27
|
+
for (const key in fields) {
|
|
28
|
+
if (Object.prototype.hasOwnProperty.call(fields, key)) {
|
|
29
|
+
fieldsName.push(fields[key].name)
|
|
30
|
+
}
|
|
31
|
+
}
|
|
27
32
|
}
|
|
28
33
|
|
|
29
|
-
return
|
|
34
|
+
return fieldsName;
|
|
30
35
|
|
|
31
36
|
}
|
package/src/typeorm/util.ts
CHANGED