@subsquid/openreader 5.2.0 → 5.4.0-beta.11e779
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/dialect/common.js +3 -3
- package/lib/dialect/common.js.map +1 -1
- package/lib/dialect/index.js +1 -2
- package/lib/dialect/index.js.map +1 -1
- package/lib/dialect/opencrud/orderBy.js +2 -3
- package/lib/dialect/opencrud/orderBy.js.map +1 -1
- package/lib/dialect/opencrud/tree.js +4 -5
- package/lib/dialect/opencrud/tree.js.map +1 -1
- package/lib/dialect/opencrud/where.js +2 -3
- package/lib/dialect/opencrud/where.js.map +1 -1
- package/lib/dialect/thegraph/locale.js +1 -2
- package/lib/dialect/thegraph/locale.js.map +1 -1
- package/lib/dialect/thegraph/orderBy.js +3 -3
- package/lib/dialect/thegraph/orderBy.js.map +1 -1
- package/lib/dialect/thegraph/tree.js +4 -5
- package/lib/dialect/thegraph/tree.js.map +1 -1
- package/lib/dialect/thegraph/where.js +2 -3
- package/lib/dialect/thegraph/where.js.map +1 -1
- package/lib/ir/connection.js +2 -3
- package/lib/ir/connection.js.map +1 -1
- package/lib/ir/fields.js +2 -3
- package/lib/ir/fields.js.map +1 -1
- package/lib/limit.size.js +3 -4
- package/lib/limit.size.js.map +1 -1
- package/lib/main.js +3 -1
- package/lib/main.js.map +1 -1
- package/lib/model.schema.js +3 -3
- package/lib/model.schema.js.map +1 -1
- package/lib/model.tools.js +16 -17
- package/lib/model.tools.js.map +1 -1
- package/lib/server.d.ts +2 -0
- package/lib/server.d.ts.map +1 -1
- package/lib/server.js +10 -8
- package/lib/server.js.map +1 -1
- package/lib/sql/mapping.js +4 -5
- package/lib/sql/mapping.js.map +1 -1
- package/lib/sql/util.js +3 -3
- package/lib/sql/util.js.map +1 -1
- package/lib/test/setup.js +7 -7
- package/lib/test/setup.js.map +1 -1
- package/lib/tools.js +2 -3
- package/lib/tools.js.map +1 -1
- package/lib/util/error-handling.js +2 -2
- package/lib/util/error-handling.js.map +1 -1
- package/lib/util/execute.js +2 -3
- package/lib/util/execute.js.map +1 -1
- package/lib/util/resolve-tree.js +4 -5
- package/lib/util/resolve-tree.js.map +1 -1
- package/lib/util/util.js +7 -8
- package/lib/util/util.js.map +1 -1
- package/package.json +4 -4
- package/src/main.ts +4 -1
- package/src/server.ts +10 -3
package/lib/util/execute.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.openreaderExecute = openreaderExecute;
|
|
4
|
+
exports.openreaderSubscribe = openreaderSubscribe;
|
|
4
5
|
const logger_1 = require("@subsquid/logger");
|
|
5
6
|
const util_internal_1 = require("@subsquid/util-internal");
|
|
6
7
|
const apollo_server_core_1 = require("apollo-server-core");
|
|
@@ -23,7 +24,6 @@ async function openreaderExecute(args, options) {
|
|
|
23
24
|
logResult('graphql result', log, args, result);
|
|
24
25
|
return result;
|
|
25
26
|
}
|
|
26
|
-
exports.openreaderExecute = openreaderExecute;
|
|
27
27
|
async function openreaderSubscribe(args) {
|
|
28
28
|
let log = args.contextValue.openreader.log?.child('gql');
|
|
29
29
|
if (log?.isDebug()) {
|
|
@@ -47,7 +47,6 @@ async function openreaderSubscribe(args) {
|
|
|
47
47
|
}
|
|
48
48
|
return result;
|
|
49
49
|
}
|
|
50
|
-
exports.openreaderSubscribe = openreaderSubscribe;
|
|
51
50
|
async function* logSubscriptionResults(log, args, results) {
|
|
52
51
|
for await (let result of results) {
|
|
53
52
|
logResult('graphql subscription result', log, args, result);
|
package/lib/util/execute.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/util/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../src/util/execute.ts"],"names":[],"mappings":"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"}
|
package/lib/util/resolve-tree.js
CHANGED
|
@@ -3,7 +3,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.simplifyResolveTree = simplifyResolveTree;
|
|
7
|
+
exports.getResolveTree = getResolveTree;
|
|
8
|
+
exports.getTreeRequest = getTreeRequest;
|
|
9
|
+
exports.hasTreeRequest = hasTreeRequest;
|
|
7
10
|
const apollo_server_core_1 = require("apollo-server-core");
|
|
8
11
|
const assert_1 = __importDefault(require("assert"));
|
|
9
12
|
const graphql_parse_resolve_info_1 = require("graphql-parse-resolve-info");
|
|
@@ -12,7 +15,6 @@ function simplifyResolveTree(schema, tree, typeName) {
|
|
|
12
15
|
(0, assert_1.default)(type != null);
|
|
13
16
|
return (0, graphql_parse_resolve_info_1.simplifyParsedResolveInfoFragmentWithType)(tree, type);
|
|
14
17
|
}
|
|
15
|
-
exports.simplifyResolveTree = simplifyResolveTree;
|
|
16
18
|
function getResolveTree(info, typeName) {
|
|
17
19
|
let tree = (0, graphql_parse_resolve_info_1.parseResolveInfo)(info);
|
|
18
20
|
(0, assert_1.default)(isResolveTree(tree));
|
|
@@ -23,7 +25,6 @@ function getResolveTree(info, typeName) {
|
|
|
23
25
|
return tree;
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
|
-
exports.getResolveTree = getResolveTree;
|
|
27
28
|
function isResolveTree(resolveInfo) {
|
|
28
29
|
return resolveInfo != null && resolveInfo.fieldsByTypeName != null;
|
|
29
30
|
}
|
|
@@ -39,7 +40,6 @@ function getTreeRequest(treeFields, fieldName) {
|
|
|
39
40
|
}
|
|
40
41
|
return req;
|
|
41
42
|
}
|
|
42
|
-
exports.getTreeRequest = getTreeRequest;
|
|
43
43
|
function hasTreeRequest(treeFields, fieldName) {
|
|
44
44
|
for (let alias in treeFields) {
|
|
45
45
|
let e = treeFields[alias];
|
|
@@ -48,5 +48,4 @@ function hasTreeRequest(treeFields, fieldName) {
|
|
|
48
48
|
}
|
|
49
49
|
return false;
|
|
50
50
|
}
|
|
51
|
-
exports.hasTreeRequest = hasTreeRequest;
|
|
52
51
|
//# sourceMappingURL=resolve-tree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-tree.js","sourceRoot":"","sources":["../../src/util/resolve-tree.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resolve-tree.js","sourceRoot":"","sources":["../../src/util/resolve-tree.ts"],"names":[],"mappings":";;;;;AAqBA,kDAIC;AAKD,wCAQC;AAQD,wCASC;AAGD,wCAMC;AAhED,2DAAiD;AACjD,oDAA2B;AAE3B,2EAKmC;AAanC,SAAgB,mBAAmB,CAAC,MAAqB,EAAE,IAAiB,EAAE,QAAgB;IAC1F,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IACnC,IAAA,gBAAM,EAAC,IAAI,IAAI,IAAI,CAAC,CAAA;IACpB,OAAO,IAAA,sEAAyC,EAAC,IAAI,EAAE,IAAI,CAAC,CAAA;AAChE,CAAC;AAKD,SAAgB,cAAc,CAAC,IAAwB,EAAE,QAAiB;IACtE,IAAI,IAAI,GAAG,IAAA,6CAAgB,EAAC,IAAI,CAAC,CAAA;IACjC,IAAA,gBAAM,EAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAA;IAC3B,IAAI,QAAQ,EAAE,CAAC;QACX,OAAO,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;IAC3D,CAAC;SAAM,CAAC;QACJ,OAAO,IAAI,CAAA;IACf,CAAC;AACL,CAAC;AAGD,SAAS,aAAa,CAAC,WAA8D;IACjF,OAAO,WAAW,IAAI,IAAI,IAAI,WAAW,CAAC,gBAAgB,IAAI,IAAI,CAAA;AACtE,CAAC;AAGD,SAAgB,cAAc,CAAC,UAA6B,EAAE,SAAiB;IAC3E,IAAI,GAA4B,CAAA;IAChC,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS;YAAE,SAAQ;QACjC,IAAI,GAAG,IAAI,IAAI;YAAE,MAAM,IAAI,mCAAc,CAAC,+BAA+B,SAAS,qBAAqB,CAAC,CAAA;QACxG,GAAG,GAAG,CAAC,CAAA;IACX,CAAC;IACD,OAAO,GAAG,CAAA;AACd,CAAC;AAGD,SAAgB,cAAc,CAAC,UAA6B,EAAE,SAAiB;IAC3E,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE,CAAC;QAC3B,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAA;QACzB,IAAI,CAAC,CAAC,IAAI,IAAI,SAAS;YAAE,OAAO,IAAI,CAAA;IACxC,CAAC;IACD,OAAO,KAAK,CAAA;AAChB,CAAC"}
|
package/lib/util/util.js
CHANGED
|
@@ -3,37 +3,36 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.
|
|
6
|
+
exports.toColumn = toColumn;
|
|
7
|
+
exports.toFkColumn = toFkColumn;
|
|
8
|
+
exports.toTable = toTable;
|
|
9
|
+
exports.ensureArray = ensureArray;
|
|
10
|
+
exports.toSafeInteger = toSafeInteger;
|
|
11
|
+
exports.invalidFormat = invalidFormat;
|
|
12
|
+
exports.identity = identity;
|
|
7
13
|
const util_naming_1 = require("@subsquid/util-naming");
|
|
8
14
|
const assert_1 = __importDefault(require("assert"));
|
|
9
15
|
function toColumn(gqlFieldName) {
|
|
10
16
|
return (0, util_naming_1.toSnakeCase)(gqlFieldName);
|
|
11
17
|
}
|
|
12
|
-
exports.toColumn = toColumn;
|
|
13
18
|
function toFkColumn(gqlFieldName) {
|
|
14
19
|
return (0, util_naming_1.toSnakeCase)(gqlFieldName) + '_id';
|
|
15
20
|
}
|
|
16
|
-
exports.toFkColumn = toFkColumn;
|
|
17
21
|
function toTable(entityName) {
|
|
18
22
|
return (0, util_naming_1.toSnakeCase)(entityName);
|
|
19
23
|
}
|
|
20
|
-
exports.toTable = toTable;
|
|
21
24
|
function ensureArray(item) {
|
|
22
25
|
return Array.isArray(item) ? item : [item];
|
|
23
26
|
}
|
|
24
|
-
exports.ensureArray = ensureArray;
|
|
25
27
|
function toSafeInteger(s) {
|
|
26
28
|
let i = parseInt(s, 10);
|
|
27
29
|
(0, assert_1.default)(Number.isSafeInteger(i));
|
|
28
30
|
return i;
|
|
29
31
|
}
|
|
30
|
-
exports.toSafeInteger = toSafeInteger;
|
|
31
32
|
function invalidFormat(type, value) {
|
|
32
33
|
return new TypeError(`Not a ${type}: ${value}`);
|
|
33
34
|
}
|
|
34
|
-
exports.invalidFormat = invalidFormat;
|
|
35
35
|
function identity(x) {
|
|
36
36
|
return x;
|
|
37
37
|
}
|
|
38
|
-
exports.identity = identity;
|
|
39
38
|
//# sourceMappingURL=util.js.map
|
package/lib/util/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util/util.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/util/util.ts"],"names":[],"mappings":";;;;;AAIA,4BAEC;AAGD,gCAEC;AAGD,0BAEC;AAGD,kCAEC;AAGD,sCAIC;AAGD,sCAEC;AAGD,4BAEC;AAtCD,uDAAiD;AACjD,oDAA2B;AAG3B,SAAgB,QAAQ,CAAC,YAAoB;IACzC,OAAO,IAAA,yBAAW,EAAC,YAAY,CAAC,CAAA;AACpC,CAAC;AAGD,SAAgB,UAAU,CAAC,YAAoB;IAC3C,OAAO,IAAA,yBAAW,EAAC,YAAY,CAAC,GAAG,KAAK,CAAA;AAC5C,CAAC;AAGD,SAAgB,OAAO,CAAC,UAAkB;IACtC,OAAO,IAAA,yBAAW,EAAC,UAAU,CAAC,CAAA;AAClC,CAAC;AAGD,SAAgB,WAAW,CAAI,IAAa;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;AAC9C,CAAC;AAGD,SAAgB,aAAa,CAAC,CAAkB;IAC5C,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAW,EAAE,EAAE,CAAC,CAAA;IACjC,IAAA,gBAAM,EAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/B,OAAO,CAAC,CAAA;AACZ,CAAC;AAGD,SAAgB,aAAa,CAAC,IAAY,EAAE,KAAa;IACrD,OAAO,IAAI,SAAS,CAAC,SAAS,IAAI,KAAK,KAAK,EAAE,CAAC,CAAA;AACnD,CAAC;AAGD,SAAgB,QAAQ,CAAI,CAAI;IAC5B,OAAO,CAAC,CAAA;AACZ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@subsquid/openreader",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.4.0-beta.11e779",
|
|
4
4
|
"description": "GraphQL server for postgres-compatible databases",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"graphql",
|
|
@@ -52,15 +52,15 @@
|
|
|
52
52
|
"devDependencies": {
|
|
53
53
|
"@types/deep-equal": "^1.0.4",
|
|
54
54
|
"@types/express": "^4.17.21",
|
|
55
|
-
"@types/mocha": "^10.0.
|
|
55
|
+
"@types/mocha": "^10.0.7",
|
|
56
56
|
"@types/node": "^18.18.14",
|
|
57
57
|
"@types/pg": "^8.10.9",
|
|
58
58
|
"@types/ws": "^8.5.10",
|
|
59
59
|
"dotenv": "^16.3.1",
|
|
60
60
|
"expect": "^29.7.0",
|
|
61
61
|
"gql-test-client": "^0.0.0",
|
|
62
|
-
"mocha": "^10.
|
|
63
|
-
"typescript": "~5.
|
|
62
|
+
"mocha": "^10.7.0",
|
|
63
|
+
"typescript": "~5.5.4",
|
|
64
64
|
"@types/inflected": "^2.1.3"
|
|
65
65
|
},
|
|
66
66
|
"scripts": {
|
package/src/main.ts
CHANGED
|
@@ -29,6 +29,7 @@ GraphQL server for postgres-compatible databases
|
|
|
29
29
|
program.option('--max-root-fields <count>', 'max number of root fields in a query', nat)
|
|
30
30
|
program.option('--max-response-size <nodes>', 'max response size measured in nodes', nat)
|
|
31
31
|
program.option('--sql-statement-timeout <ms>', 'sql statement timeout in ms', nat)
|
|
32
|
+
program.option('--validation-max-errors <count>', 'max validation errors', nat)
|
|
32
33
|
program.option('--subscriptions', 'enable gql subscriptions')
|
|
33
34
|
program.option('--subscription-poll-interval <ms>', 'subscription poll interval in ms', nat, 1000)
|
|
34
35
|
program.option('--subscription-max-response-size <nodes>', 'max response size measured in nodes', nat)
|
|
@@ -42,6 +43,7 @@ GraphQL server for postgres-compatible databases
|
|
|
42
43
|
maxRootFields?: number
|
|
43
44
|
maxResponseSize?: number
|
|
44
45
|
sqlStatementTimeout?: number
|
|
46
|
+
validationMaxErrors?: number
|
|
45
47
|
subscriptions?: boolean
|
|
46
48
|
subscriptionPollInterval: number
|
|
47
49
|
subscriptionMaxResponseSize?: number
|
|
@@ -65,7 +67,8 @@ GraphQL server for postgres-compatible databases
|
|
|
65
67
|
maxResponseNodes: opts.maxResponseSize,
|
|
66
68
|
subscriptions: opts.subscriptions,
|
|
67
69
|
subscriptionPollInterval: opts.subscriptionPollInterval,
|
|
68
|
-
subscriptionMaxResponseNodes: opts.subscriptionMaxResponseSize
|
|
70
|
+
subscriptionMaxResponseNodes: opts.subscriptionMaxResponseSize,
|
|
71
|
+
validationMaxErrors: opts.validationMaxErrors
|
|
69
72
|
})
|
|
70
73
|
|
|
71
74
|
LOG.info(`listening on port ${server.port}`)
|
package/src/server.ts
CHANGED
|
@@ -3,6 +3,7 @@ import {listen, ListeningServer} from '@subsquid/util-internal-http-server'
|
|
|
3
3
|
import {KeyValueCache, PluginDefinition} from 'apollo-server-core'
|
|
4
4
|
import {ApolloServer} from 'apollo-server-express'
|
|
5
5
|
import express from 'express'
|
|
6
|
+
import { validate } from 'graphql'
|
|
6
7
|
import fs from 'fs'
|
|
7
8
|
import {ExecutionArgs, GraphQLSchema} from 'graphql'
|
|
8
9
|
import {useServer as useWsServer} from 'graphql-ws/lib/use/ws'
|
|
@@ -34,6 +35,7 @@ export interface ServerOptions {
|
|
|
34
35
|
subscriptionPollInterval?: number
|
|
35
36
|
subscriptionConnection?: Pool
|
|
36
37
|
subscriptionMaxResponseNodes?: number
|
|
38
|
+
validationMaxErrors?: number
|
|
37
39
|
cache?: KeyValueCache
|
|
38
40
|
}
|
|
39
41
|
|
|
@@ -44,6 +46,7 @@ export async function serve(options: ServerOptions): Promise<ListeningServer> {
|
|
|
44
46
|
subscriptionPollInterval,
|
|
45
47
|
maxResponseNodes,
|
|
46
48
|
subscriptionMaxResponseNodes,
|
|
49
|
+
validationMaxErrors,
|
|
47
50
|
log,
|
|
48
51
|
} = options
|
|
49
52
|
|
|
@@ -85,6 +88,7 @@ export async function serve(options: ServerOptions): Promise<ListeningServer> {
|
|
|
85
88
|
subscriptions: options.subscriptions,
|
|
86
89
|
log: options.log,
|
|
87
90
|
graphiqlConsole: options.graphiqlConsole,
|
|
91
|
+
validationMaxErrors,
|
|
88
92
|
maxRequestSizeBytes: options.maxRequestSizeBytes,
|
|
89
93
|
maxRootFields: options.maxRootFields,
|
|
90
94
|
cache: options.cache,
|
|
@@ -105,13 +109,14 @@ export interface ApolloOptions {
|
|
|
105
109
|
graphiqlConsole?: boolean
|
|
106
110
|
log?: Logger
|
|
107
111
|
maxRequestSizeBytes?: number
|
|
112
|
+
validationMaxErrors?: number
|
|
108
113
|
maxRootFields?: number
|
|
109
114
|
cache?: KeyValueCache
|
|
110
115
|
}
|
|
111
116
|
|
|
112
117
|
|
|
113
118
|
export async function runApollo(options: ApolloOptions): Promise<ListeningServer> {
|
|
114
|
-
const {disposals, context, schema, log, maxRootFields} = options
|
|
119
|
+
const {disposals, context, schema, log, maxRootFields, validationMaxErrors} = options
|
|
115
120
|
|
|
116
121
|
let maxRequestSizeBytes = options.maxRequestSizeBytes ?? 256 * 1024
|
|
117
122
|
let app: express.Application = express()
|
|
@@ -119,7 +124,7 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
|
|
|
119
124
|
|
|
120
125
|
let execute = (args: ExecutionArgs) => openreaderExecute(args, {
|
|
121
126
|
maxRootFields: maxRootFields
|
|
122
|
-
|
|
127
|
+
})
|
|
123
128
|
|
|
124
129
|
if (options.subscriptions) {
|
|
125
130
|
let wsServer = new WebSocketServer({
|
|
@@ -150,6 +155,8 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
|
|
|
150
155
|
cache: options.cache,
|
|
151
156
|
stopOnTerminationSignals: false,
|
|
152
157
|
allowBatchedHttpRequests: false,
|
|
158
|
+
dangerouslyDisableValidation: false,
|
|
159
|
+
validationMaxErrors,
|
|
153
160
|
executor: async req => {
|
|
154
161
|
return execute({
|
|
155
162
|
schema,
|
|
@@ -157,7 +164,7 @@ export async function runApollo(options: ApolloOptions): Promise<ListeningServer
|
|
|
157
164
|
rootValue: {},
|
|
158
165
|
contextValue: req.context,
|
|
159
166
|
variableValues: req.request.variables,
|
|
160
|
-
operationName: req.operationName
|
|
167
|
+
operationName: req.operationName,
|
|
161
168
|
})
|
|
162
169
|
},
|
|
163
170
|
plugins: [
|