@steedos/service-object-graphql 2.4.8-beta.1 → 2.4.8-beta.2

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.
Files changed (4) hide show
  1. package/lib/getPrimaryFieldType.js +1 -1
  2. package/lib/getPrimaryFieldType.js.map +1 -1
  3. package/package.json +10 -4
  4. package/src/getPrimaryFieldType.ts +2 -2
package/lib/getPrimaryFieldType.js CHANGED
@@ -8,7 +8,7 @@ function getPrimaryFieldType(objectConfig) {
8
8
  var fields = objectConfig.fields;
9
9
  var datasource = (0, objectql_1.getDataSource)(objectConfig.datasource);
10
10
  if (!datasource) {
11
- console.log('getPrimaryFieldType objectConfig:', objectConfig);
11
+ console.log('getPrimaryFieldType can not found datasoruce:', objectConfig.name, objectConfig.datasource);
12
12
  }
13
13
  if (datasource.driver === objectql_1.SteedosDatabaseDriverType.MeteorMongo || datasource.driver === objectql_1.SteedosDatabaseDriverType.Mongo) {
14
14
  if (!_.has(fields, "_id")) {
package/lib/getPrimaryFieldType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"getPrimaryFieldType.js","sourceRoot":"","sources":["../src/getPrimaryFieldType.ts"],"names":[],"mappings":";;;AAQA,8CAAsG;AACtG,0BAA6B;AAM7B,SAAgB,mBAAmB,CAAC,YAAqC;IACrE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IACjC,IAAM,UAAU,GAAG,IAAA,wBAAa,EAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC1D,IAAI,CAAC,UAAU,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,YAAY,CAAC,CAAA;KACjE;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,oCAAyB,CAAC,WAAW,IAAI,UAAU,CAAC,MAAM,KAAK,oCAAyB,CAAC,KAAK,EAAE;QACtH,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;YACvB,MAAM,GAAG,aAAa,CAAA;SACzB;KACJ;SAAM;QAEH,KAAK,IAAI,SAAS,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,KAAK,CAAC,OAAO,EAAE;gBACf,IAAI,SAAS,GAAG,EAAE,CAAA;gBAClB,QAAQ,KAAK,CAAC,IAAI,EAAE;oBAChB,KAAK,MAAM,IAAI,UAAU;wBACrB,SAAS,GAAG,QAAQ,CAAC;wBACrB,MAAM;oBACV,KAAK,QAAQ;wBACT,SAAS,GAAG,OAAO,CAAC;wBACpB,MAAM;oBACV;wBACI,SAAS,GAAG,MAAM,CAAA;wBAClB,MAAM;iBACb;gBACD,MAAM,GAAG,eAAQ,SAAS,CAAE,CAAC;gBAC7B,MAAM;aACT;SACJ;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAnCD,kDAmCC"}
1
+ {"version":3,"file":"getPrimaryFieldType.js","sourceRoot":"","sources":["../src/getPrimaryFieldType.ts"],"names":[],"mappings":";;;AAQA,8CAAsG;AACtG,0BAA6B;AAM7B,SAAgB,mBAAmB,CAAC,YAAqC;IACrE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC;IACjC,IAAM,UAAU,GAAG,IAAA,wBAAa,EAAC,YAAY,CAAC,UAAU,CAAC,CAAC;IAC1D,IAAI,CAAC,UAAU,EAAE;QACb,OAAO,CAAC,GAAG,CAAC,+CAA+C,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAA;KAC3G;IACD,IAAI,UAAU,CAAC,MAAM,KAAK,oCAAyB,CAAC,WAAW,IAAI,UAAU,CAAC,MAAM,KAAK,oCAAyB,CAAC,KAAK,EAAE;QACtH,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE;YACvB,MAAM,GAAG,aAAa,CAAA;SACzB;KACJ;SAAM;QAEH,KAAK,IAAI,SAAS,IAAI,MAAM,EAAE;YAC1B,IAAI,KAAK,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,KAAK,CAAC,OAAO,EAAE;gBACf,IAAI,SAAS,GAAG,EAAE,CAAA;gBAClB,QAAQ,KAAK,CAAC,IAAI,EAAE;oBAChB,KAAK,MAAM,IAAI,UAAU;wBACrB,SAAS,GAAG,QAAQ,CAAC;wBACrB,MAAM;oBACV,KAAK,QAAQ;wBACT,SAAS,GAAG,OAAO,CAAC;wBACpB,MAAM;oBACV;wBACI,SAAS,GAAG,MAAM,CAAA;wBAClB,MAAM;iBACb;gBACD,MAAM,GAAG,eAAQ,SAAS,CAAE,CAAC;gBAC7B,MAAM;aACT;SACJ;KACJ;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAnCD,kDAmCC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@steedos/service-object-graphql",
3
- "version": "2.4.8-beta.1",
3
+ "version": "2.4.8-beta.2",
4
4
  "main": "package.service.js",
5
5
  "private": false,
6
6
  "publishConfig": {
@@ -15,9 +15,15 @@
15
15
  "description": "steedos package",
16
16
  "repository": {},
17
17
  "license": "MIT",
18
- "gitHead": "f35130770cfb86468309f8f9a8ce21a3bbb5b2f6",
18
+ "gitHead": "75409cde3a71561adfff93fbb36a7dc1ce5252d5",
19
19
  "dependencies": {
20
- "@steedos/objectql": "2.4.6",
21
- "@steedos/service-package-loader": "2.4.6"
20
+ "@steedos/i18n": "2.4.8-beta.2",
21
+ "@steedos/objectql": "2.4.8-beta.2",
22
+ "graphql": "^15.8.0",
23
+ "graphql-parse-resolve-info": "^4.12.3",
24
+ "moleculer": "^0.14.25",
25
+ "moleculer-apollo-server": "^0.3.6",
26
+ "moment": "^2.29.1",
27
+ "underscore": "1.5.2"
22
28
  }
23
29
  }
package/src/getPrimaryFieldType.ts CHANGED
@@ -2,7 +2,7 @@
2
2
  * @Author: sunhaolin@hotoa.com
3
3
  * @Date: 2022-06-16 14:37:39
4
4
  * @LastEditors: sunhaolin@hotoa.com
5
- * @LastEditTime: 2023-03-27 18:29:26
5
+ * @LastEditTime: 2023-03-28 19:30:35
6
6
  * @Description: 获取对象主键字段类型，用于生成对象的graphql schema，如 id: ID!
7
7
  */
8
8
 
@@ -18,7 +18,7 @@ export function getPrimaryFieldType(objectConfig: SteedosObjectTypeConfig) {
18
18
  let fields = objectConfig.fields;
19
19
  const datasource = getDataSource(objectConfig.datasource);
20
20
  if (!datasource) {
21
- console.log('getPrimaryFieldType objectConfig:', objectConfig)
21
+ console.log('getPrimaryFieldType can not found datasoruce:', objectConfig.name, objectConfig.datasource)
22
22
  }
23
23
  if (datasource.driver === SteedosDatabaseDriverType.MeteorMongo || datasource.driver === SteedosDatabaseDriverType.Mongo) {
24
24
  if (!_.has(fields, "_id")) {