@rsdk/graphql 5.16.0 → 5.17.0-next.0

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/dist/config.d.ts CHANGED
@@ -13,4 +13,5 @@ export declare class GraphqlConfig extends Config {
13
13
  noSchemaFile: boolean;
14
14
  schemaFilePath: string | undefined;
15
15
  requestBodyLogMaxSize: Size;
16
+ status400ForVariableCoercionErrors: boolean;
16
17
  }
package/dist/config.js CHANGED
@@ -26,6 +26,7 @@ let GraphqlConfig = class GraphqlConfig extends core_1.Config {
26
26
  noSchemaFile;
27
27
  schemaFilePath;
28
28
  requestBodyLogMaxSize;
29
+ status400ForVariableCoercionErrors;
29
30
  };
30
31
  exports.GraphqlConfig = GraphqlConfig;
31
32
  __decorate([
@@ -84,6 +85,13 @@ __decorate([
84
85
  }),
85
86
  __metadata("design:type", common_1.Size)
86
87
  ], GraphqlConfig.prototype, "requestBodyLogMaxSize", void 0);
88
+ __decorate([
89
+ (0, core_1.Property)('GRAPHQL_STATUS_400_FOR_VARIABLE_COERCION_ERRORS', new core_1.BoolParser(), {
90
+ defaultValue: false,
91
+ description: 'Return HTTP 400 on GraphQL variable coercion errors instead of 200',
92
+ }),
93
+ __metadata("design:type", Boolean)
94
+ ], GraphqlConfig.prototype, "status400ForVariableCoercionErrors", void 0);
87
95
  exports.GraphqlConfig = GraphqlConfig = __decorate([
88
96
  (0, core_1.ConfigSection)({
89
97
  tags: [core_1.ConfigTag.infrastructure, core_1.ConfigTag.transport, core_1.ConfigTag.graphql],
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAoC;AACpC,qCAUoB;AAEpB,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,8CAAgC,CAAA;AAClC,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAKM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,aAAM;IAKvC,iBAAiB,CAAW;IAM5B,cAAc,CAAc;IAM5B,cAAc,CAAW;IAOzB,+BAA+B,CAAW;IAO1C,iCAAiC,CAAqB;IAMtD,YAAY,CAAW;IAOvB,cAAc,CAAqB;IAMnC,qBAAqB,CAAQ;CAC9B,CAAA;AAnDY,sCAAa;AAKxB;IAJC,IAAA,eAAQ,EAAC,2BAA2B,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,8CAA8C;KAC5D,CAAC;;wDAC0B;AAM5B;IAJC,IAAA,eAAQ,EAAC,oBAAoB,EAAE,IAAI,iBAAU,CAAC,UAAU,CAAC,EAAE;QAC1D,YAAY,EAAE,UAAU,CAAC,OAAO;QAChC,WAAW,EAAE,iBAAiB;KAC/B,CAAC;;qDAC0B;AAM5B;IAJC,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;qDACuB;AAOzB;IALC,IAAA,eAAQ,EAAC,2CAA2C,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvE,YAAY,EAAE,KAAK;QACnB,WAAW,EACT,8GAA8G;KACjH,CAAC;;sEACwC;AAO1C;IALC,IAAA,eAAQ,EAAC,8CAA8C,EAAE,IAAI,gBAAS,EAAE,EAAE;QACzE,YAAY,EAAE,SAAS;QACvB,WAAW,EACT,oEAAoE;KACvE,CAAC;;wEACoD;AAMtD;IAJC,IAAA,eAAQ,EAAC,wBAAwB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACpD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,wCAAwC;KACtD,CAAC;;mDACqB;AAOvB;IALC,IAAA,eAAQ,EAAC,0BAA0B,EAAE,IAAI,mBAAY,EAAE,EAAE;QACxD,YAAY,EAAE,SAAS;QACvB,WAAW,EACT,mIAAmI;KACtI,CAAC;;qDACiC;AAMnC;IAJC,IAAA,eAAQ,EAAC,mCAAmC,EAAE,IAAI,iBAAU,EAAE,EAAE;QAC/D,YAAY,EAAE,IAAI,aAAI,CAAC,GAAG,EAAE,IAAI,CAAC;QACjC,WAAW,EAAE,sDAAsD;KACpE,CAAC;8BACsB,aAAI;4DAAC;wBAlDlB,aAAa;IAHzB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,OAAO,CAAC;KACzE,CAAC;GACW,aAAa,CAmDzB"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAoC;AACpC,qCAUoB;AAEpB,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,iCAAmB,CAAA;IACnB,8CAAgC,CAAA;AAClC,CAAC,EAHW,UAAU,0BAAV,UAAU,QAGrB;AAKM,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,aAAM;IAKvC,iBAAiB,CAAW;IAM5B,cAAc,CAAc;IAM5B,cAAc,CAAW;IAOzB,+BAA+B,CAAW;IAO1C,iCAAiC,CAAqB;IAMtD,YAAY,CAAW;IAOvB,cAAc,CAAqB;IAMnC,qBAAqB,CAAQ;IAW7B,kCAAkC,CAAW;CAC9C,CAAA;AA9DY,sCAAa;AAKxB;IAJC,IAAA,eAAQ,EAAC,2BAA2B,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,8CAA8C;KAC5D,CAAC;;wDAC0B;AAM5B;IAJC,IAAA,eAAQ,EAAC,oBAAoB,EAAE,IAAI,iBAAU,CAAC,UAAU,CAAC,EAAE;QAC1D,YAAY,EAAE,UAAU,CAAC,OAAO;QAChC,WAAW,EAAE,iBAAiB;KAC/B,CAAC;;qDAC0B;AAM5B;IAJC,IAAA,eAAQ,EAAC,yBAAyB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACrD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,mCAAmC;KACjD,CAAC;;qDACuB;AAOzB;IALC,IAAA,eAAQ,EAAC,2CAA2C,EAAE,IAAI,iBAAU,EAAE,EAAE;QACvE,YAAY,EAAE,KAAK;QACnB,WAAW,EACT,8GAA8G;KACjH,CAAC;;sEACwC;AAO1C;IALC,IAAA,eAAQ,EAAC,8CAA8C,EAAE,IAAI,gBAAS,EAAE,EAAE;QACzE,YAAY,EAAE,SAAS;QACvB,WAAW,EACT,oEAAoE;KACvE,CAAC;;wEACoD;AAMtD;IAJC,IAAA,eAAQ,EAAC,wBAAwB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACpD,YAAY,EAAE,KAAK;QACnB,WAAW,EAAE,wCAAwC;KACtD,CAAC;;mDACqB;AAOvB;IALC,IAAA,eAAQ,EAAC,0BAA0B,EAAE,IAAI,mBAAY,EAAE,EAAE;QACxD,YAAY,EAAE,SAAS;QACvB,WAAW,EACT,mIAAmI;KACtI,CAAC;;qDACiC;AAMnC;IAJC,IAAA,eAAQ,EAAC,mCAAmC,EAAE,IAAI,iBAAU,EAAE,EAAE;QAC/D,YAAY,EAAE,IAAI,aAAI,CAAC,GAAG,EAAE,IAAI,CAAC;QACjC,WAAW,EAAE,sDAAsD;KACpE,CAAC;8BACsB,aAAI;4DAAC;AAW7B;IATC,IAAA,eAAQ,EACP,iDAAiD,EACjD,IAAI,iBAAU,EAAE,EAChB;QACE,YAAY,EAAE,KAAK;QACnB,WAAW,EACT,oEAAoE;KACvE,CACF;;yEAC4C;wBA7DlC,aAAa;IAHzB,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,SAAS,EAAE,gBAAS,CAAC,OAAO,CAAC;KACzE,CAAC;GACW,aAAa,CA8DzB"}
@@ -31,6 +31,23 @@ const onConnect = (connectionParams, _webSocket, context) => {
31
31
  },
32
32
  };
33
33
  };
34
+ /**
35
+ * graphql-ws 6 передаёт в onConnect только ctx, connectionParams лежат в
36
+ * ctx.connectionParams. Возвращаемое значение уходит клиенту как ack, поэтому
37
+ * заголовки нормализуем прямо в connectionParams — их потом читает GqlHeaders.
38
+ */
39
+ const graphqlWsOnConnect = (ctx) => {
40
+ const connectionParams = ctx?.connectionParams;
41
+ if (!connectionParams) {
42
+ return;
43
+ }
44
+ const headers = connectionParams.headers ?? {};
45
+ if (connectionParams.Authorization || connectionParams.authorization) {
46
+ headers.authorization =
47
+ connectionParams.Authorization || connectionParams.authorization;
48
+ connectionParams.headers = headers;
49
+ }
50
+ };
34
51
  const isSchemaFirst = (options) => options.approach === 'schema-first';
35
52
  exports.isSchemaFirst = isSchemaFirst;
36
53
  const isCodeFirst = (options) => options.approach === 'code-first';
@@ -127,9 +144,10 @@ class GraphQLPlugin {
127
144
  installSubscriptionHandlers: true,
128
145
  introspection: config.playgroundEnabled,
129
146
  playground: playgroundEnabled,
147
+ status400ForVariableCoercionErrors: config.status400ForVariableCoercionErrors,
130
148
  subscriptions: {
131
149
  'graphql-ws': {
132
- onConnect,
150
+ onConnect: graphqlWsOnConnect,
133
151
  path: this.path,
134
152
  },
135
153
  // Этот вариант нужен (пока - на 23.02.2023) только для поддержки
@@ -1 +1 @@
1
- {"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"graphql.plugin.js","sourceRoot":"","sources":["../src/graphql.plugin.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rsdk/graphql",
3
- "version": "5.16.0",
3
+ "version": "5.17.0-next.0",
4
4
  "description": "Plugin for graphql",
5
5
  "license": "Apache License 2.0",
6
6
  "publishConfig": {
@@ -11,23 +11,29 @@
11
11
  },
12
12
  "main": "dist/index.js",
13
13
  "dependencies": {
14
- "@apollo/server": "^4.9.5",
15
- "@apollo/utils.logger": "^2.0.0"
14
+ "@apollo/server": "^5.5.2",
15
+ "@apollo/utils.logger": "^3.0.0"
16
16
  },
17
17
  "peerDependencies": {
18
- "@nestjs/apollo": "^12.0.0",
19
- "@nestjs/common": "^10.4.20",
20
- "@nestjs/core": "^10.4.20",
21
- "@nestjs/graphql": "^12.2.2",
18
+ "@as-integrations/express5": "^1.1.2",
19
+ "@nestjs/apollo": "^13.4.5",
20
+ "@nestjs/common": "^11.2.9",
21
+ "@nestjs/core": "^11.2.9",
22
+ "@nestjs/graphql": "^13.4.5",
22
23
  "@rsdk/common": "*",
23
24
  "@rsdk/core": "*",
24
25
  "@rsdk/http.server": "*",
25
26
  "@rsdk/http.server.express": "*",
26
27
  "@rsdk/logging": "*",
27
- "graphql": "^16.6.0",
28
+ "graphql": "^16.11.0",
28
29
  "graphql-subscriptions": "^2.0.0",
29
30
  "reflect-metadata": "^0.1.12 || ^0.2.0",
30
31
  "rxjs": "^7.1.0"
31
32
  },
32
- "gitHead": "6815c6f20a183c919cf4b01a3b61bc381b4321c6"
33
+ "peerDependenciesMeta": {
34
+ "@as-integrations/express5": {
35
+ "optional": true
36
+ }
37
+ },
38
+ "gitHead": "c65206299ce1f0f1e209bb936721a1537bc4a064"
33
39
  }
package/src/config.ts CHANGED
@@ -70,4 +70,15 @@ export class GraphqlConfig extends Config {
70
70
  description: 'Max request body size on logs, otherwise [TOO LARGE]',
71
71
  })
72
72
  requestBodyLogMaxSize!: Size;
73
+
74
+ @Property(
75
+ 'GRAPHQL_STATUS_400_FOR_VARIABLE_COERCION_ERRORS',
76
+ new BoolParser(),
77
+ {
78
+ defaultValue: false,
79
+ description:
80
+ 'Return HTTP 400 on GraphQL variable coercion errors instead of 200',
81
+ },
82
+ )
83
+ status400ForVariableCoercionErrors!: boolean;
73
84
  }
@@ -49,6 +49,25 @@ const onConnect = (
49
49
  };
50
50
  };
51
51
 
52
+ /**
53
+ * graphql-ws 6 передаёт в onConnect только ctx, connectionParams лежат в
54
+ * ctx.connectionParams. Возвращаемое значение уходит клиенту как ack, поэтому
55
+ * заголовки нормализуем прямо в connectionParams — их потом читает GqlHeaders.
56
+ */
57
+ const graphqlWsOnConnect = (ctx: any): void => {
58
+ const connectionParams = ctx?.connectionParams;
59
+ if (!connectionParams) {
60
+ return;
61
+ }
62
+
63
+ const headers = connectionParams.headers ?? {};
64
+ if (connectionParams.Authorization || connectionParams.authorization) {
65
+ headers.authorization =
66
+ connectionParams.Authorization || connectionParams.authorization;
67
+ connectionParams.headers = headers;
68
+ }
69
+ };
70
+
52
71
  export type Approach = 'schema-first' | 'code-first';
53
72
 
54
73
  export interface GraphQLPluginOptions<T extends Approach> {
@@ -198,9 +217,11 @@ export class GraphQLPlugin implements PlatformAppPlugin {
198
217
  installSubscriptionHandlers: true,
199
218
  introspection: config.playgroundEnabled,
200
219
  playground: playgroundEnabled,
220
+ status400ForVariableCoercionErrors:
221
+ config.status400ForVariableCoercionErrors,
201
222
  subscriptions: {
202
223
  'graphql-ws': {
203
- onConnect,
224
+ onConnect: graphqlWsOnConnect,
204
225
  path: this.path,
205
226
  },
206
227
 
@@ -1,5 +1,8 @@
1
1
  {
2
2
  "extends": "./tsconfig.json",
3
+ "compilerOptions": {
4
+ "rootDir": "src"
5
+ },
3
6
  "exclude": [
4
7
  "node_modules",
5
8
  "dist",