@sentio/sdk 2.61.0-rc.17 → 2.61.0-rc.18
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-schema.d.ts","sourceRoot":"","sources":["../../src/core/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"database-schema.d.ts","sourceRoot":"","sources":["../../src/core/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAI/C,KAAK,MAAM,GAAG;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAA;CAC3C,CAAA;AAED,qBAAa,mBAAoB,SAAQ,gBAAgB,CAAC,MAAM,CAAC;IAC/D,MAAM,CAAC,QAAQ,sBAA4B;CAC5C;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM;IAI9B,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM;CAS/B;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,UA2B7C"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { ListStateStorage } from '@sentio/runtime';
|
|
2
2
|
import { isInterfaceType, isObjectType, isScalarType, parse } from 'graphql/index.js';
|
|
3
3
|
import { buildSchema } from '../store/schema.js';
|
|
4
|
-
import { printSchemaWithDirectives } from '@graphql-tools/utils';
|
|
5
|
-
import { GraphQLSchema } from 'graphql';
|
|
6
4
|
export class DatabaseSchemaState extends ListStateStorage {
|
|
7
5
|
static INSTANCE = new DatabaseSchemaState();
|
|
8
6
|
}
|
|
@@ -21,9 +19,10 @@ export class DatabaseSchema {
|
|
|
21
19
|
}
|
|
22
20
|
export function mergeSchemas(schemas) {
|
|
23
21
|
const allTypes = {};
|
|
24
|
-
let
|
|
22
|
+
let ret = '';
|
|
25
23
|
for (const schema of schemas) {
|
|
26
|
-
|
|
24
|
+
let source = schema.source;
|
|
25
|
+
const gqlSchema = buildSchema(parse(source));
|
|
27
26
|
for (const type of Object.values(gqlSchema.getTypeMap())) {
|
|
28
27
|
if (isScalarType(type) || type.name.startsWith('__')) {
|
|
29
28
|
// types.push(type)
|
|
@@ -31,21 +30,21 @@ export function mergeSchemas(schemas) {
|
|
|
31
30
|
}
|
|
32
31
|
if (allTypes[type.name]) {
|
|
33
32
|
console.warn(`Type ${type.name} is already registered, you have duplicate definitions in multiple schemas.`);
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
33
|
+
// remove the definition from source using regex
|
|
34
|
+
if (isObjectType(type)) {
|
|
35
|
+
const p = `type\\s+${type.name}\\s+[^}]+\\}`;
|
|
36
|
+
source = source.replace(new RegExp(p, 'g'), '');
|
|
37
|
+
}
|
|
38
|
+
else if (isInterfaceType(type)) {
|
|
39
|
+
source = source.replace(new RegExp(`interface\s+${type.name}\s+[^}]+\}`, 'g'), '');
|
|
40
|
+
}
|
|
37
41
|
}
|
|
38
42
|
else {
|
|
39
43
|
allTypes[type.name] = type;
|
|
40
44
|
}
|
|
41
45
|
}
|
|
42
|
-
|
|
43
|
-
types: [...Object.values(allTypes)]
|
|
44
|
-
});
|
|
46
|
+
ret += source + '\n';
|
|
45
47
|
}
|
|
46
|
-
return
|
|
47
|
-
commentDescriptions: false,
|
|
48
|
-
assumeValid: true
|
|
49
|
-
});
|
|
48
|
+
return ret;
|
|
50
49
|
}
|
|
51
50
|
//# sourceMappingURL=database-schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-schema.js","sourceRoot":"","sources":["../../src/core/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;
|
|
1
|
+
{"version":3,"file":"database-schema.js","sourceRoot":"","sources":["../../src/core/database-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAA;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAOhD,MAAM,OAAO,mBAAoB,SAAQ,gBAAwB;IAC/D,MAAM,CAAC,QAAQ,GAAG,IAAI,mBAAmB,EAAE,CAAA;;AAG7C,MAAM,OAAO,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,MAAc;QAC5B,mBAAmB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC/C,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAY;QAC5B,KAAK,MAAM,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC;YAC9D,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC1B,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAC9B,CAAC;QACH,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC;CACF;AAED,MAAM,UAAU,YAAY,CAAC,OAAiB;IAC5C,MAAM,QAAQ,GAAwB,EAAE,CAAA;IACxC,IAAI,GAAG,GAAG,EAAE,CAAA;IACZ,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;QAC1B,MAAM,SAAS,GAAG,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;QAC5C,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;YACzD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrD,mBAAmB;gBACnB,SAAQ;YACV,CAAC;YACD,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,6EAA6E,CAAC,CAAA;gBAC5G,gDAAgD;gBAChD,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;oBACvB,MAAM,CAAC,GAAG,WAAW,IAAI,CAAC,IAAI,cAAc,CAAA;oBAC5C,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;gBACjD,CAAC;qBAAM,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;oBACjC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,eAAe,IAAI,CAAC,IAAI,YAAY,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;gBACpF,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;YAC5B,CAAC;QACH,CAAC;QACD,GAAG,IAAI,MAAM,GAAG,IAAI,CAAA;IACtB,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database-schema.test.js","sourceRoot":"","sources":["../../src/core/database-schema.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,MAAM,MAAM,QAAQ,CAAA;AAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGnD,+CAA+C;AAC/C,MAAM,QAAQ;IACZ,YAAY,IAAuB;QACjC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IACD,EAAE,CAAS;IACX,IAAI,CAAS;CACd;AAED,MAAM,WAAW;IACf,YAAY,IAA0B;QACpC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IACD,EAAE,CAAS;IACX,KAAK,CAAS;IACd,KAAK,CAAS;CACf;AAED,MAAM,SAAS;IACb,YAAY,IAAwB;QAClC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;IAC3B,CAAC;IACD,EAAE,CAAS;IACX,MAAM,CAAS;IACf,KAAK,CAAS;CACf;AAED,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,EAAE,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAC9C,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,iDAAiD;YACzD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAiC;aACxC;SACF,CAAA;QAED,MAAM,MAAM,GAAG,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;QAErC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"database-schema.test.js","sourceRoot":"","sources":["../../src/core/database-schema.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sentio/sdk",
|
|
3
|
-
"version": "2.61.0-rc.
|
|
3
|
+
"version": "2.61.0-rc.18",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -60,7 +60,6 @@
|
|
|
60
60
|
"@aptos-labs/ts-sdk": "~4.0.0",
|
|
61
61
|
"@coral-xyz/anchor": "^0.30.1",
|
|
62
62
|
"@coral-xyz/borsh": "^0.30.1",
|
|
63
|
-
"@graphql-tools/utils": "^10.9.1",
|
|
64
63
|
"@iota/iota-sdk": "~1.5.0",
|
|
65
64
|
"@mysten/sui": "~1.37.1",
|
|
66
65
|
"@prettier/sync": "^0.5.2",
|
|
@@ -98,8 +97,8 @@
|
|
|
98
97
|
"typechain": "^8.3.2",
|
|
99
98
|
"utility-types": "^3.11.0",
|
|
100
99
|
"yaml": "^2.3.4",
|
|
101
|
-
"@sentio/
|
|
102
|
-
"@sentio/
|
|
100
|
+
"@sentio/protos": "2.61.0-rc.18",
|
|
101
|
+
"@sentio/runtime": "^2.61.0-rc.18"
|
|
103
102
|
},
|
|
104
103
|
"peerDependencies": {
|
|
105
104
|
"@sentio/tsup": "^8.3.5-rc.1"
|
|
@@ -2,8 +2,6 @@ import { ListStateStorage } from '@sentio/runtime'
|
|
|
2
2
|
import { EntityClass } from '../store/index.js'
|
|
3
3
|
import { isInterfaceType, isObjectType, isScalarType, parse } from 'graphql/index.js'
|
|
4
4
|
import { buildSchema } from '../store/schema.js'
|
|
5
|
-
import { printSchemaWithDirectives } from '@graphql-tools/utils'
|
|
6
|
-
import { GraphQLSchema } from 'graphql'
|
|
7
5
|
|
|
8
6
|
type Schema = {
|
|
9
7
|
source: string
|
|
@@ -32,9 +30,10 @@ export class DatabaseSchema {
|
|
|
32
30
|
|
|
33
31
|
export function mergeSchemas(schemas: Schema[]) {
|
|
34
32
|
const allTypes: Record<string, any> = {}
|
|
35
|
-
let
|
|
33
|
+
let ret = ''
|
|
36
34
|
for (const schema of schemas) {
|
|
37
|
-
|
|
35
|
+
let source = schema.source
|
|
36
|
+
const gqlSchema = buildSchema(parse(source))
|
|
38
37
|
for (const type of Object.values(gqlSchema.getTypeMap())) {
|
|
39
38
|
if (isScalarType(type) || type.name.startsWith('__')) {
|
|
40
39
|
// types.push(type)
|
|
@@ -42,18 +41,18 @@ export function mergeSchemas(schemas: Schema[]) {
|
|
|
42
41
|
}
|
|
43
42
|
if (allTypes[type.name]) {
|
|
44
43
|
console.warn(`Type ${type.name} is already registered, you have duplicate definitions in multiple schemas.`)
|
|
45
|
-
|
|
46
|
-
|
|
44
|
+
// remove the definition from source using regex
|
|
45
|
+
if (isObjectType(type)) {
|
|
46
|
+
const p = `type\\s+${type.name}\\s+[^}]+\\}`
|
|
47
|
+
source = source.replace(new RegExp(p, 'g'), '')
|
|
48
|
+
} else if (isInterfaceType(type)) {
|
|
49
|
+
source = source.replace(new RegExp(`interface\s+${type.name}\s+[^}]+\}`, 'g'), '')
|
|
50
|
+
}
|
|
47
51
|
} else {
|
|
48
52
|
allTypes[type.name] = type
|
|
49
53
|
}
|
|
50
54
|
}
|
|
51
|
-
|
|
52
|
-
types: [...Object.values(allTypes)]
|
|
53
|
-
})
|
|
55
|
+
ret += source + '\n'
|
|
54
56
|
}
|
|
55
|
-
return
|
|
56
|
-
commentDescriptions: false,
|
|
57
|
-
assumeValid: true
|
|
58
|
-
})
|
|
57
|
+
return ret
|
|
59
58
|
}
|