@commitspark/graphql-api 1.0.0 → 2.0.0-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.
- package/CHANGELOG.md +15 -0
- package/README.md +87 -4
- package/dist/cjs/client.d.ts +4 -2
- package/dist/cjs/client.js +4 -2
- package/dist/cjs/client.js.map +1 -1
- package/dist/cjs/graphql/errors.d.ts +3 -2
- package/dist/cjs/graphql/errors.js.map +1 -1
- package/dist/cjs/graphql/input-type-generator.js +2 -1
- package/dist/cjs/graphql/input-type-generator.js.map +1 -1
- package/dist/cjs/graphql/queries-mutations-generator.d.ts +8 -1
- package/dist/cjs/graphql/queries-mutations-generator.js +19 -0
- package/dist/cjs/graphql/queries-mutations-generator.js.map +1 -1
- package/dist/cjs/graphql/resolvers/field-resolvers/field-default-value-resolver.js +2 -1
- package/dist/cjs/graphql/resolvers/field-resolvers/field-default-value-resolver.js.map +1 -1
- package/dist/cjs/graphql/resolvers/query-mutation-resolvers/query-search-resolver.d.ts +2 -0
- package/dist/cjs/graphql/resolvers/query-mutation-resolvers/query-search-resolver.js +74 -0
- package/dist/cjs/graphql/resolvers/query-mutation-resolvers/query-search-resolver.js.map +1 -0
- package/dist/cjs/graphql/resolvers/types.d.ts +6 -0
- package/dist/cjs/graphql/schema-analyzer.js +2 -1
- package/dist/cjs/graphql/schema-analyzer.js.map +1 -1
- package/dist/cjs/graphql/schema-generator.js +7 -1
- package/dist/cjs/graphql/schema-generator.js.map +1 -1
- package/dist/cjs/graphql/schema-root-type-generator.d.ts +2 -2
- package/dist/cjs/graphql/schema-root-type-generator.js +2 -1
- package/dist/cjs/graphql/schema-root-type-generator.js.map +1 -1
- package/dist/cjs/graphql/schema-utils/directive-util.d.ts +4 -0
- package/dist/cjs/graphql/schema-utils/directive-util.js +10 -0
- package/dist/cjs/graphql/schema-utils/directive-util.js.map +1 -0
- package/dist/cjs/graphql/schema-utils/entry-reference-util.js +3 -1
- package/dist/cjs/graphql/schema-utils/entry-reference-util.js.map +1 -1
- package/dist/cjs/graphql/schema-utils/entry-type-util.d.ts +1 -2
- package/dist/cjs/graphql/schema-utils/entry-type-util.js +2 -6
- package/dist/cjs/graphql/schema-utils/entry-type-util.js.map +1 -1
- package/dist/cjs/graphql/schema-utils/searchable-field-util.d.ts +4 -0
- package/dist/cjs/graphql/schema-utils/searchable-field-util.js +79 -0
- package/dist/cjs/graphql/schema-utils/searchable-field-util.js.map +1 -0
- package/dist/cjs/graphql/schema-validator.js +21 -3
- package/dist/cjs/graphql/schema-validator.js.map +1 -1
- package/dist/cjs/index.d.ts +9 -2
- package/dist/cjs/index.js +4 -3
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/persistence/cache.js +76 -27
- package/dist/cjs/persistence/cache.js.map +1 -1
- package/dist/esm/client.js +4 -2
- package/dist/esm/client.js.map +1 -1
- package/dist/esm/graphql/errors.js.map +1 -1
- package/dist/esm/graphql/input-type-generator.js +3 -2
- package/dist/esm/graphql/input-type-generator.js.map +1 -1
- package/dist/esm/graphql/queries-mutations-generator.js +18 -0
- package/dist/esm/graphql/queries-mutations-generator.js.map +1 -1
- package/dist/esm/graphql/resolvers/field-resolvers/field-default-value-resolver.js +3 -2
- package/dist/esm/graphql/resolvers/field-resolvers/field-default-value-resolver.js.map +1 -1
- package/dist/esm/graphql/resolvers/query-mutation-resolvers/query-search-resolver.js +70 -0
- package/dist/esm/graphql/resolvers/query-mutation-resolvers/query-search-resolver.js.map +1 -0
- package/dist/esm/graphql/schema-analyzer.js +2 -1
- package/dist/esm/graphql/schema-analyzer.js.map +1 -1
- package/dist/esm/graphql/schema-generator.js +8 -2
- package/dist/esm/graphql/schema-generator.js.map +1 -1
- package/dist/esm/graphql/schema-root-type-generator.js +2 -1
- package/dist/esm/graphql/schema-root-type-generator.js.map +1 -1
- package/dist/esm/graphql/schema-utils/directive-util.js +6 -0
- package/dist/esm/graphql/schema-utils/directive-util.js.map +1 -0
- package/dist/esm/graphql/schema-utils/entry-reference-util.js +4 -2
- package/dist/esm/graphql/schema-utils/entry-reference-util.js.map +1 -1
- package/dist/esm/graphql/schema-utils/entry-type-util.js +2 -5
- package/dist/esm/graphql/schema-utils/entry-type-util.js.map +1 -1
- package/dist/esm/graphql/schema-utils/searchable-field-util.js +76 -0
- package/dist/esm/graphql/schema-utils/searchable-field-util.js.map +1 -0
- package/dist/esm/graphql/schema-validator.js +22 -4
- package/dist/esm/graphql/schema-validator.js.map +1 -1
- package/dist/esm/index.js +4 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/persistence/cache.js +76 -27
- package/dist/esm/persistence/cache.js.map +1 -1
- package/dist/types/client.d.ts +4 -2
- package/dist/types/client.d.ts.map +1 -1
- package/dist/types/graphql/errors.d.ts +3 -2
- package/dist/types/graphql/errors.d.ts.map +1 -1
- package/dist/types/graphql/input-type-generator.d.ts.map +1 -1
- package/dist/types/graphql/queries-mutations-generator.d.ts +8 -1
- package/dist/types/graphql/queries-mutations-generator.d.ts.map +1 -1
- package/dist/types/graphql/resolvers/field-resolvers/field-default-value-resolver.d.ts.map +1 -1
- package/dist/types/graphql/resolvers/query-mutation-resolvers/query-search-resolver.d.ts +3 -0
- package/dist/types/graphql/resolvers/query-mutation-resolvers/query-search-resolver.d.ts.map +1 -0
- package/dist/types/graphql/resolvers/types.d.ts +6 -0
- package/dist/types/graphql/resolvers/types.d.ts.map +1 -1
- package/dist/types/graphql/schema-analyzer.d.ts.map +1 -1
- package/dist/types/graphql/schema-generator.d.ts.map +1 -1
- package/dist/types/graphql/schema-root-type-generator.d.ts +2 -2
- package/dist/types/graphql/schema-root-type-generator.d.ts.map +1 -1
- package/dist/types/graphql/schema-utils/directive-util.d.ts +5 -0
- package/dist/types/graphql/schema-utils/directive-util.d.ts.map +1 -0
- package/dist/types/graphql/schema-utils/entry-reference-util.d.ts.map +1 -1
- package/dist/types/graphql/schema-utils/entry-type-util.d.ts +1 -2
- package/dist/types/graphql/schema-utils/entry-type-util.d.ts.map +1 -1
- package/dist/types/graphql/schema-utils/searchable-field-util.d.ts +5 -0
- package/dist/types/graphql/schema-utils/searchable-field-util.d.ts.map +1 -0
- package/dist/types/graphql/schema-validator.d.ts.map +1 -1
- package/dist/types/index.d.ts +9 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/persistence/cache.d.ts.map +1 -1
- package/package.json +3 -2
- package/src/client.ts +6 -0
- package/src/graphql/errors.ts +3 -2
- package/src/graphql/input-type-generator.ts +5 -4
- package/src/graphql/queries-mutations-generator.ts +31 -1
- package/src/graphql/resolvers/field-resolvers/field-default-value-resolver.ts +5 -4
- package/src/graphql/resolvers/query-mutation-resolvers/query-search-resolver.ts +110 -0
- package/src/graphql/resolvers/types.ts +8 -0
- package/src/graphql/schema-analyzer.ts +6 -1
- package/src/graphql/schema-generator.ts +13 -1
- package/src/graphql/schema-root-type-generator.ts +3 -0
- package/src/graphql/schema-utils/directive-util.ts +15 -0
- package/src/graphql/schema-utils/entry-reference-util.ts +6 -2
- package/src/graphql/schema-utils/entry-type-util.ts +2 -11
- package/src/graphql/schema-utils/searchable-field-util.ts +130 -0
- package/src/graphql/schema-validator.ts +37 -7
- package/src/index.ts +25 -4
- package/src/persistence/cache.ts +115 -28
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isListType, isNonNullType, isObjectType, isUnionType, } from 'graphql';
|
|
2
|
-
import { buildsOnTypeWithEntryDirective
|
|
2
|
+
import { buildsOnTypeWithEntryDirective } from "../../schema-utils/entry-type-util.js";
|
|
3
|
+
import { ENTRY_DIRECTIVE_NAME, hasDirective, } from "../../schema-utils/directive-util.js";
|
|
3
4
|
import { resolveEntryReference } from "./entry-reference-resolver.js";
|
|
4
5
|
import { resolveUnionValue } from "./union-value-resolver.js";
|
|
5
6
|
import { createError } from "../../errors.js";
|
|
@@ -68,7 +69,7 @@ export const resolveFieldDefaultValue = async (fieldValue, args, context, info)
|
|
|
68
69
|
return new Promise((resolve) => resolve(null));
|
|
69
70
|
}
|
|
70
71
|
}
|
|
71
|
-
if (
|
|
72
|
+
if (hasDirective(context.currentType, ENTRY_DIRECTIVE_NAME)) {
|
|
72
73
|
return resolveEntryReference(fieldValue, args, context, info);
|
|
73
74
|
}
|
|
74
75
|
return fieldValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"field-default-value-resolver.js","sourceRoot":"","sources":["../../../../../src/graphql/resolvers/field-resolvers/field-default-value-resolver.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,UAAU,EACV,aAAa,EACb,YAAY,EACZ,WAAW,GACZ,MAAM,SAAS,CAAA;AAChB,OAAO,
|
|
1
|
+
{"version":3,"file":"field-default-value-resolver.js","sourceRoot":"","sources":["../../../../../src/graphql/resolvers/field-resolvers/field-default-value-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { GraphQLError, isObjectType } from 'graphql';
|
|
2
|
+
import { SearchAdapterError } from '@commitspark/search-adapter';
|
|
3
|
+
import { createError } from "../../errors.js";
|
|
4
|
+
import { ENTRY_DIRECTIVE_NAME, hasDirective, } from "../../schema-utils/directive-util.js";
|
|
5
|
+
import { extractSearchableFieldValues } from "../../schema-utils/searchable-field-util.js";
|
|
6
|
+
const SEARCH_DEFAULT_LIMIT = 10;
|
|
7
|
+
const SEARCH_MAX_LIMIT = 100;
|
|
8
|
+
export const querySearchResolver = async (_source, args, context, info) => {
|
|
9
|
+
const searchAdapter = context.searchAdapter;
|
|
10
|
+
if (searchAdapter === undefined) {
|
|
11
|
+
throw createError('No search adapter configured.', "INTERNAL_ERROR" /* ErrorCode.INTERNAL_ERROR */, {});
|
|
12
|
+
}
|
|
13
|
+
if (args.query.trim() === '') {
|
|
14
|
+
throw createError('Search query must not be empty.', "BAD_USER_INPUT" /* ErrorCode.BAD_USER_INPUT */, {
|
|
15
|
+
argumentName: 'query',
|
|
16
|
+
argumentValue: args.query,
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
const limit = args.first ?? SEARCH_DEFAULT_LIMIT;
|
|
20
|
+
if (limit < 1 || limit > SEARCH_MAX_LIMIT) {
|
|
21
|
+
throw createError(`Argument "first" must be between 1 and ${SEARCH_MAX_LIMIT}.`, "BAD_USER_INPUT" /* ErrorCode.BAD_USER_INPUT */, {
|
|
22
|
+
argumentName: 'first',
|
|
23
|
+
argumentValue: limit,
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
const entryTypes = args.types ?? undefined;
|
|
27
|
+
if (entryTypes !== undefined) {
|
|
28
|
+
validateEntryTypeNames(info.schema, entryTypes);
|
|
29
|
+
if (entryTypes.length === 0) {
|
|
30
|
+
return [];
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
const commitHash = context.getCurrentHash();
|
|
34
|
+
let hits;
|
|
35
|
+
try {
|
|
36
|
+
hits = await searchAdapter.search({
|
|
37
|
+
commitHash: commitHash,
|
|
38
|
+
query: args.query,
|
|
39
|
+
entryTypes: entryTypes,
|
|
40
|
+
limit: limit,
|
|
41
|
+
getSearchableFieldValues: async () => {
|
|
42
|
+
const entriesRecord = await context.repositoryCache.getEntriesRecord(context, commitHash);
|
|
43
|
+
return extractSearchableFieldValues(info.schema, entriesRecord.byId.values());
|
|
44
|
+
},
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
catch (err) {
|
|
48
|
+
if (err instanceof GraphQLError) {
|
|
49
|
+
throw err;
|
|
50
|
+
}
|
|
51
|
+
if (err instanceof SearchAdapterError) {
|
|
52
|
+
throw createError(err.message, err.code, {});
|
|
53
|
+
}
|
|
54
|
+
const message = err instanceof Error ? err.message : String(err);
|
|
55
|
+
throw createError(message, "INTERNAL_ERROR" /* ErrorCode.INTERNAL_ERROR */, {});
|
|
56
|
+
}
|
|
57
|
+
return hits.slice(0, limit);
|
|
58
|
+
};
|
|
59
|
+
function validateEntryTypeNames(schema, typeNames) {
|
|
60
|
+
for (const typeName of typeNames) {
|
|
61
|
+
const type = schema.getType(typeName);
|
|
62
|
+
if (!isObjectType(type) || !hasDirective(type, ENTRY_DIRECTIVE_NAME)) {
|
|
63
|
+
throw createError(`Type "${typeName}" is not an entry type.`, "BAD_USER_INPUT" /* ErrorCode.BAD_USER_INPUT */, {
|
|
64
|
+
argumentName: 'types',
|
|
65
|
+
argumentValue: typeName,
|
|
66
|
+
});
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
//# sourceMappingURL=query-search-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"query-search-resolver.js","sourceRoot":"","sources":["../../../../../src/graphql/resolvers/query-mutation-resolvers/query-search-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { isInterfaceType, isObjectType, isUnionType, } from 'graphql';
|
|
2
2
|
import { getDirective } from '@graphql-tools/utils';
|
|
3
|
+
import { ENTRY_DIRECTIVE_NAME } from "./schema-utils/directive-util.js";
|
|
3
4
|
export function analyzeSchema(schema) {
|
|
4
5
|
const result = {
|
|
5
6
|
entryDirectiveTypes: [],
|
|
@@ -15,7 +16,7 @@ export function analyzeSchema(schema) {
|
|
|
15
16
|
if (isObjectType(type)) {
|
|
16
17
|
const objectType = type;
|
|
17
18
|
result.objectTypes.push(objectType);
|
|
18
|
-
const entityDirective = getDirective(schema, objectType,
|
|
19
|
+
const entityDirective = getDirective(schema, objectType, ENTRY_DIRECTIVE_NAME)?.[0];
|
|
19
20
|
if (entityDirective) {
|
|
20
21
|
result.entryDirectiveTypes.push(objectType);
|
|
21
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-analyzer.js","sourceRoot":"","sources":["../../../src/graphql/schema-analyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,eAAe,EACf,YAAY,EACZ,WAAW,GACZ,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"schema-analyzer.js","sourceRoot":"","sources":["../../../src/graphql/schema-analyzer.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,eAAe,EACf,YAAY,EACZ,WAAW,GACZ,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAA;AAEvE,MAAM,UAAU,aAAa,CAAC,MAAqB;IACjD,MAAM,MAAM,GAAyB;QACnC,mBAAmB,EAAE,EAAE;QACvB,WAAW,EAAE,EAAE;QACf,cAAc,EAAE,EAAE;QAClB,UAAU,EAAE,EAAE;KACf,CAAA;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAA;IAEnC,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAClD,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACzB,SAAQ;QACV,CAAC;QAED,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;YACvB,MAAM,UAAU,GAAG,IAAyB,CAAA;YAC5C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YACnC,MAAM,eAAe,GAAG,YAAY,CAClC,MAAM,EACN,UAAU,EACV,oBAAoB,CACrB,EAAE,CAAC,CAAC,CAAC,CAAA;YACN,IAAI,eAAe,EAAE,CAAC;gBACpB,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAC7C,CAAC;QACH,CAAC;QAED,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,aAAa,GAAG,IAA4B,CAAA;YAClD,MAAM,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;QAC3C,CAAC;QAED,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,MAAM,SAAS,GAAG,IAAwB,CAAA;YAC1C,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAA;QACnC,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { generateQueriesAndMutations, generateTypeNameQuery, } from "./queries-mutations-generator.js";
|
|
1
|
+
import { generateQueriesAndMutations, generateSearchQuery, generateTypeNameQuery, } from "./queries-mutations-generator.js";
|
|
2
2
|
import { makeExecutableSchema, } from '@graphql-tools/schema';
|
|
3
3
|
import { analyzeSchema } from "./schema-analyzer.js";
|
|
4
4
|
import { generateIdInputTypeStrings, generateObjectInputTypeStrings, generateUnionInputTypeStrings, } from "./input-type-generator.js";
|
|
@@ -25,9 +25,10 @@ export async function generateSchema(context) {
|
|
|
25
25
|
const generatedIdInputTypeStrings = generateIdInputTypeStrings(schemaAnalyzerResult);
|
|
26
26
|
const generatedQueriesMutations = generateQueriesAndMutations(schemaAnalyzerResult.entryDirectiveTypes);
|
|
27
27
|
const generatedTypeNameQuery = generateTypeNameQuery();
|
|
28
|
+
const generatedSearchQuery = context.searchAdapter !== undefined ? generateSearchQuery() : undefined;
|
|
28
29
|
const generatedObjectInputTypeStrings = generateObjectInputTypeStrings(schemaAnalyzerResult.objectTypes);
|
|
29
30
|
const generatedUnionInputTypeStrings = generateUnionInputTypeStrings(schemaAnalyzerResult.unionTypes);
|
|
30
|
-
const generatedSchemaRootTypeStrings = generateSchemaRootTypeStrings(generatedQueriesMutations, generatedTypeNameQuery);
|
|
31
|
+
const generatedSchemaRootTypeStrings = generateSchemaRootTypeStrings(generatedQueriesMutations, generatedTypeNameQuery, generatedSearchQuery);
|
|
31
32
|
const generatedSchemaString = `schema {
|
|
32
33
|
query: Query
|
|
33
34
|
mutation: Mutation
|
|
@@ -56,6 +57,10 @@ ${generatedSchemaRootTypeStrings}`;
|
|
|
56
57
|
}
|
|
57
58
|
generatedQueryResolvers[generatedTypeNameQuery.name] =
|
|
58
59
|
generatedTypeNameQuery.resolver;
|
|
60
|
+
if (generatedSearchQuery !== undefined) {
|
|
61
|
+
generatedQueryResolvers[generatedSearchQuery.name] =
|
|
62
|
+
generatedSearchQuery.resolver;
|
|
63
|
+
}
|
|
59
64
|
const allGeneratedResolvers = {
|
|
60
65
|
Query: generatedQueryResolvers,
|
|
61
66
|
Mutation: generatedMutationResolvers,
|
|
@@ -78,6 +83,7 @@ ${generatedSchemaRootTypeStrings}`;
|
|
|
78
83
|
generatedIdInputTypeStrings.join('\n'),
|
|
79
84
|
generatedObjectInputTypeStrings.join('\n'),
|
|
80
85
|
generatedUnionInputTypeStrings.join('\n'),
|
|
86
|
+
generatedSearchQuery?.typeDefinitionString ?? '',
|
|
81
87
|
].filter((typeDef) => typeDef.length > 0);
|
|
82
88
|
return {
|
|
83
89
|
typeDefs: typeDefs,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-generator.js","sourceRoot":"","sources":["../../../src/graphql/schema-generator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,2BAA2B,EAC3B,qBAAqB,GACtB,MAAM,kCAAkC,CAAA;AACzC,OAAO,EAEL,oBAAoB,GACrB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,EACL,0BAA0B,EAC1B,8BAA8B,EAC9B,6BAA6B,GAC9B,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,6BAA6B,EAAE,MAAM,iCAAiC,CAAA;AAC/E,OAAO,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAA;AAChE,OAAO,EAAE,iBAAiB,EAAE,MAAM,6DAA6D,CAAA;AAG/F,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,EAAE,8BAA8B,EAAE,MAAM,mEAAmE,CAAA;AAClH,OAAO,EAAE,WAAW,EAAa,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"schema-generator.js","sourceRoot":"","sources":["../../../src/graphql/schema-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export function generateSchemaRootTypeStrings(generatedSchemas, typeQuery) {
|
|
1
|
+
export function generateSchemaRootTypeStrings(generatedSchemas, typeQuery, searchQuery) {
|
|
2
2
|
return (`type Query {\n` +
|
|
3
3
|
generatedSchemas
|
|
4
4
|
.map((generated) => ' ' + generated.queryEvery.schemaString)
|
|
@@ -10,6 +10,7 @@ export function generateSchemaRootTypeStrings(generatedSchemas, typeQuery) {
|
|
|
10
10
|
'\n' +
|
|
11
11
|
` ${typeQuery.schemaString}` +
|
|
12
12
|
'\n' +
|
|
13
|
+
(searchQuery !== undefined ? ` ${searchQuery.schemaString}\n` : '') +
|
|
13
14
|
'}\n\n' +
|
|
14
15
|
'type Mutation {\n' +
|
|
15
16
|
generatedSchemas
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-root-type-generator.js","sourceRoot":"","sources":["../../../src/graphql/schema-root-type-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"schema-root-type-generator.js","sourceRoot":"","sources":["../../../src/graphql/schema-root-type-generator.ts"],"names":[],"mappings":"AAMA,MAAM,UAAU,6BAA6B,CAC3C,gBAAmC,EACnC,SAAyB,EACzB,WAA6C;IAE7C,OAAO,CACL,gBAAgB;QAChB,gBAAgB;aACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,UAAU,CAAC,YAAY,CAAC;aAC5D,IAAI,CAAC,IAAI,CAAC;QACb,IAAI;QACJ,gBAAgB;aACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,SAAS,CAAC,YAAY,CAAC;aAC3D,IAAI,CAAC,IAAI,CAAC;QACb,IAAI;QACJ,KAAK,SAAS,CAAC,YAAY,EAAE;QAC7B,IAAI;QACJ,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,WAAW,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,OAAO;QACP,mBAAmB;QACnB,gBAAgB;aACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC;aAChE,IAAI,CAAC,IAAI,CAAC;QACb,IAAI;QACJ,gBAAgB;aACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC;aAChE,IAAI,CAAC,IAAI,CAAC;QACb,IAAI;QACJ,gBAAgB;aACb,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,GAAG,SAAS,CAAC,cAAc,CAAC,YAAY,CAAC;aAChE,IAAI,CAAC,IAAI,CAAC;QACb,IAAI;QACJ,KAAK,CACN,CAAA;AACH,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
export const ENTRY_DIRECTIVE_NAME = 'Entry';
|
|
2
|
+
export const SEARCHABLE_DIRECTIVE_NAME = 'Searchable';
|
|
3
|
+
export function hasDirective(typeOrField, directiveName) {
|
|
4
|
+
return (typeOrField.astNode?.directives?.some((directive) => directive.name.value === directiveName) ?? false);
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=directive-util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"directive-util.js","sourceRoot":"","sources":["../../../../src/graphql/schema-utils/directive-util.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,oBAAoB,GAAG,OAAO,CAAA;AAC3C,MAAM,CAAC,MAAM,yBAAyB,GAAG,YAAY,CAAA;AAErD,MAAM,UAAU,YAAY,CAC1B,WAA8D,EAC9D,aAAqB;IAErB,OAAO,CACL,WAAW,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CACnC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,aAAa,CACtD,IAAI,KAAK,CACX,CAAA;AACH,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { isListType, isNonNullType, isObjectType, isScalarType, isUnionType, } from 'graphql';
|
|
2
2
|
import { getTypeById } from "../../persistence/persistence.js";
|
|
3
3
|
import { getUnionTypeNameFromFieldValue, getUnionValue, } from "./union-type-util.js";
|
|
4
|
-
import {
|
|
4
|
+
import { ENTRY_DIRECTIVE_NAME, hasDirective } from "./directive-util.js";
|
|
5
|
+
import { isUnionOfEntryTypes } from "./entry-type-util.js";
|
|
5
6
|
import { createError } from "../errors.js";
|
|
6
7
|
import { isEntryData } from "../util.js";
|
|
7
8
|
function isPermittedReferenceType(referencedTypeName, fieldType) {
|
|
@@ -120,7 +121,8 @@ export async function getReferencedEntryIds(rootType, context, fieldName, type,
|
|
|
120
121
|
return getReferencedEntryIds(rootType, context, fieldName, concreteFieldUnionType, unionValue);
|
|
121
122
|
}
|
|
122
123
|
if (isObjectType(type)) {
|
|
123
|
-
if (type.name !== rootType.name &&
|
|
124
|
+
if (type.name !== rootType.name &&
|
|
125
|
+
hasDirective(type, ENTRY_DIRECTIVE_NAME)) {
|
|
124
126
|
const referenceId = await getValidatedReferenceId(context, fieldName, type, data);
|
|
125
127
|
return [referenceId];
|
|
126
128
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-reference-util.js","sourceRoot":"","sources":["../../../../src/graphql/schema-utils/entry-reference-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,WAAW,GACZ,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAA;AAC9D,OAAO,EACL,8BAA8B,EAC9B,aAAa,GACd,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"entry-reference-util.js","sourceRoot":"","sources":["../../../../src/graphql/schema-utils/entry-reference-util.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { isListType, isNonNullType, isObjectType, isUnionType, } from 'graphql';
|
|
2
|
-
|
|
3
|
-
return (!!type.astNode &&
|
|
4
|
-
type.astNode.directives?.find((directive) => directive.name.value === 'Entry') !== undefined);
|
|
5
|
-
}
|
|
2
|
+
import { ENTRY_DIRECTIVE_NAME, hasDirective } from "./directive-util.js";
|
|
6
3
|
export function isUnionOfEntryTypes(type) {
|
|
7
4
|
return type
|
|
8
5
|
.getTypes()
|
|
@@ -19,7 +16,7 @@ export function buildsOnTypeWithEntryDirective(type) {
|
|
|
19
16
|
return isUnionOfEntryTypes(type);
|
|
20
17
|
}
|
|
21
18
|
else if (isObjectType(type)) {
|
|
22
|
-
return
|
|
19
|
+
return hasDirective(type, ENTRY_DIRECTIVE_NAME);
|
|
23
20
|
}
|
|
24
21
|
return false;
|
|
25
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entry-type-util.js","sourceRoot":"","sources":["../../../../src/graphql/schema-utils/entry-type-util.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"entry-type-util.js","sourceRoot":"","sources":["../../../../src/graphql/schema-utils/entry-type-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,aAAa,EACb,YAAY,EACZ,WAAW,GACZ,MAAM,SAAS,CAAA;AAChB,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAExE,MAAM,UAAU,mBAAmB,CAAC,IAAsB;IACxD,OAAO,IAAI;SACR,QAAQ,EAAE;SACV,KAAK,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,8BAA8B,CAAC,SAAS,CAAC,CAAC,CAAA;AACpE,CAAC;AAED,MAAM,UAAU,8BAA8B,CAC5C,IAAyB;IAEzB,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,OAAO,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,OAAO,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,OAAO,mBAAmB,CAAC,IAAI,CAAC,CAAA;IAClC,CAAC;SAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,YAAY,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAA;IACjD,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
import { isListType, isNonNullType, isObjectType, isScalarType, isUnionType, } from 'graphql';
|
|
2
|
+
import { ENTRY_DIRECTIVE_NAME, hasDirective, SEARCHABLE_DIRECTIVE_NAME, } from "./directive-util.js";
|
|
3
|
+
import { isUnionOfEntryTypes } from "./entry-type-util.js";
|
|
4
|
+
import { getUnionTypeNameFromFieldValue } from "./union-type-util.js";
|
|
5
|
+
// Returns every non-empty string value of searchable fields. Values that do not match the schema are skipped instead
|
|
6
|
+
// of failing the search.
|
|
7
|
+
export function extractSearchableFieldValues(schema, entries) {
|
|
8
|
+
const searchableFieldValues = [];
|
|
9
|
+
for (const entry of entries) {
|
|
10
|
+
const entryType = schema.getType(entry.metadata.type);
|
|
11
|
+
if (!isObjectType(entryType) || !isRecord(entry.data)) {
|
|
12
|
+
continue;
|
|
13
|
+
}
|
|
14
|
+
const addValue = (fieldPath, value) => {
|
|
15
|
+
searchableFieldValues.push({
|
|
16
|
+
entryId: entry.id,
|
|
17
|
+
entryType: entryType.name,
|
|
18
|
+
fieldPath: fieldPath,
|
|
19
|
+
value: value,
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
collectFromObject(schema, entryType, entry.data, '', addValue);
|
|
23
|
+
}
|
|
24
|
+
return searchableFieldValues;
|
|
25
|
+
}
|
|
26
|
+
function collectFromObject(schema, objectType, data, path, addValue) {
|
|
27
|
+
const isTypeSearchable = hasDirective(objectType, SEARCHABLE_DIRECTIVE_NAME);
|
|
28
|
+
for (const field of Object.values(objectType.getFields())) {
|
|
29
|
+
const value = data[field.name];
|
|
30
|
+
if (value === undefined || value === null) {
|
|
31
|
+
continue;
|
|
32
|
+
}
|
|
33
|
+
collectFromValue(schema, field.type, value, path === '' ? field.name : `${path}.${field.name}`, isTypeSearchable || hasDirective(field, SEARCHABLE_DIRECTIVE_NAME), addValue);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
function collectFromValue(schema, type, value, path, isSearchable, addValue) {
|
|
37
|
+
if (isNonNullType(type)) {
|
|
38
|
+
collectFromValue(schema, type.ofType, value, path, isSearchable, addValue);
|
|
39
|
+
}
|
|
40
|
+
else if (isListType(type)) {
|
|
41
|
+
if (!Array.isArray(value)) {
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
value.forEach((item, index) => collectFromValue(schema, type.ofType, item, `${path}[${index}]`, isSearchable, addValue));
|
|
45
|
+
}
|
|
46
|
+
else if (isScalarType(type)) {
|
|
47
|
+
if (isSearchable &&
|
|
48
|
+
type.name === 'String' &&
|
|
49
|
+
typeof value === 'string' &&
|
|
50
|
+
value.trim() !== '') {
|
|
51
|
+
addValue(path, value);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
else if (isObjectType(type)) {
|
|
55
|
+
// references to other entries are not followed, as each entry is indexed with its own content only
|
|
56
|
+
if (!hasDirective(type, ENTRY_DIRECTIVE_NAME) && isRecord(value)) {
|
|
57
|
+
collectFromObject(schema, type, value, path, addValue);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
else if (isUnionType(type)) {
|
|
61
|
+
if (isUnionOfEntryTypes(type) || !isRecord(value)) {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
// non-entry union values are stored wrapped in an object keyed by their concrete type name, which is kept in the
|
|
65
|
+
// path so that the path matches stored data and identifies the concrete type
|
|
66
|
+
const concreteType = schema.getType(getUnionTypeNameFromFieldValue(value));
|
|
67
|
+
const concreteValue = value[concreteType?.name ?? ''];
|
|
68
|
+
if (isObjectType(concreteType) && isRecord(concreteValue)) {
|
|
69
|
+
collectFromObject(schema, concreteType, concreteValue, `${path}.${concreteType.name}`, addValue);
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
function isRecord(value) {
|
|
74
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=searchable-field-util.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"searchable-field-util.js","sourceRoot":"","sources":["../../../../src/graphql/schema-utils/searchable-field-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EACV,aAAa,EACb,YAAY,EACZ,YAAY,EACZ,WAAW,GACZ,MAAM,SAAS,CAAA;AAGhB,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,yBAAyB,GAC1B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,EAAE,8BAA8B,EAAE,MAAM,sBAAsB,CAAA;AAErE,qHAAqH;AACrH,yBAAyB;AACzB,MAAM,UAAU,4BAA4B,CAC1C,MAAqB,EACrB,OAAwB;IAExB,MAAM,qBAAqB,GAA2B,EAAE,CAAA;IACxD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QACrD,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,SAAQ;QACV,CAAC;QACD,MAAM,QAAQ,GAAG,CAAC,SAAiB,EAAE,KAAa,EAAQ,EAAE;YAC1D,qBAAqB,CAAC,IAAI,CAAC;gBACzB,OAAO,EAAE,KAAK,CAAC,EAAE;gBACjB,SAAS,EAAE,SAAS,CAAC,IAAI;gBACzB,SAAS,EAAE,SAAS;gBACpB,KAAK,EAAE,KAAK;aACb,CAAC,CAAA;QACJ,CAAC,CAAA;QACD,iBAAiB,CAAC,MAAM,EAAE,SAAS,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAA;IAChE,CAAC;IACD,OAAO,qBAAqB,CAAA;AAC9B,CAAC;AAED,SAAS,iBAAiB,CACxB,MAAqB,EACrB,UAA6B,EAC7B,IAA6B,EAC7B,IAAY,EACZ,QAAoD;IAEpD,MAAM,gBAAgB,GAAG,YAAY,CAAC,UAAU,EAAE,yBAAyB,CAAC,CAAA;IAC5E,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;QAC1D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAC9B,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YAC1C,SAAQ;QACV,CAAC;QACD,gBAAgB,CACd,MAAM,EACN,KAAK,CAAC,IAAI,EACV,KAAK,EACL,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,EAClD,gBAAgB,IAAI,YAAY,CAAC,KAAK,EAAE,yBAAyB,CAAC,EAClE,QAAQ,CACT,CAAA;IACH,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,MAAqB,EACrB,IAAuB,EACvB,KAAc,EACd,IAAY,EACZ,YAAqB,EACrB,QAAoD;IAEpD,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;QACxB,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAA;IAC5E,CAAC;SAAM,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,OAAM;QACR,CAAC;QACD,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAC5B,gBAAgB,CACd,MAAM,EACN,IAAI,CAAC,MAAM,EACX,IAAI,EACJ,GAAG,IAAI,IAAI,KAAK,GAAG,EACnB,YAAY,EACZ,QAAQ,CACT,CACF,CAAA;IACH,CAAC;SAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,IACE,YAAY;YACZ,IAAI,CAAC,IAAI,KAAK,QAAQ;YACtB,OAAO,KAAK,KAAK,QAAQ;YACzB,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EACnB,CAAC;YACD,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;SAAM,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,mGAAmG;QACnG,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACjE,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;SAAM,IAAI,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,OAAM;QACR,CAAC;QACD,iHAAiH;QACjH,6EAA6E;QAC7E,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,8BAA8B,CAAC,KAAK,CAAC,CAAC,CAAA;QAC1E,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,CAAA;QACrD,IAAI,YAAY,CAAC,YAAY,CAAC,IAAI,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;YAC1D,iBAAiB,CACf,MAAM,EACN,YAAY,EACZ,aAAa,EACb,GAAG,IAAI,IAAI,YAAY,CAAC,IAAI,EAAE,EAC9B,QAAQ,CACT,CAAA;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;AAC7E,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Kind } from 'graphql';
|
|
1
|
+
import { getNamedType, isObjectType, isScalarType, Kind, } from 'graphql';
|
|
2
|
+
import { ENTRY_DIRECTIVE_NAME, hasDirective, SEARCHABLE_DIRECTIVE_NAME, } from "./schema-utils/directive-util.js";
|
|
2
3
|
function checkUnionMembersConsistentUseOfEntryDirective(schema) {
|
|
3
4
|
const typeMap = schema.getTypeMap();
|
|
4
5
|
for (const type of Object.values(typeMap)) {
|
|
@@ -6,11 +7,27 @@ function checkUnionMembersConsistentUseOfEntryDirective(schema) {
|
|
|
6
7
|
continue;
|
|
7
8
|
}
|
|
8
9
|
const innerTypes = type.getTypes();
|
|
9
|
-
const numberUnionMembersWithEntryDirective = innerTypes.filter((innerType) =>
|
|
10
|
-
innerType.astNode.directives?.find((directive) => directive.name.value === 'Entry') !== undefined).length;
|
|
10
|
+
const numberUnionMembersWithEntryDirective = innerTypes.filter((innerType) => hasDirective(innerType, ENTRY_DIRECTIVE_NAME)).length;
|
|
11
11
|
if (numberUnionMembersWithEntryDirective !== 0 &&
|
|
12
12
|
numberUnionMembersWithEntryDirective !== innerTypes.length) {
|
|
13
|
-
return `Either all union members of "${type.name}" must have "
|
|
13
|
+
return `Either all union members of "${type.name}" must have "@${ENTRY_DIRECTIVE_NAME}" directive or none.`;
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
return '';
|
|
17
|
+
}
|
|
18
|
+
function checkSearchableDirectiveOnlyOnStringFields(schema) {
|
|
19
|
+
for (const type of Object.values(schema.getTypeMap())) {
|
|
20
|
+
if (!isObjectType(type) || type.name.startsWith('__')) {
|
|
21
|
+
continue;
|
|
22
|
+
}
|
|
23
|
+
for (const field of Object.values(type.getFields())) {
|
|
24
|
+
if (!hasDirective(field, SEARCHABLE_DIRECTIVE_NAME)) {
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
27
|
+
const namedType = getNamedType(field.type);
|
|
28
|
+
if (!isScalarType(namedType) || namedType.name !== 'String') {
|
|
29
|
+
return `Field "${type.name}.${field.name}" must be of type "String" or a list of "String" to use "@${SEARCHABLE_DIRECTIVE_NAME}" directive.`;
|
|
30
|
+
}
|
|
14
31
|
}
|
|
15
32
|
}
|
|
16
33
|
return '';
|
|
@@ -18,6 +35,7 @@ function checkUnionMembersConsistentUseOfEntryDirective(schema) {
|
|
|
18
35
|
export function getValidationResult(schema) {
|
|
19
36
|
const results = [];
|
|
20
37
|
results.push(checkUnionMembersConsistentUseOfEntryDirective(schema));
|
|
38
|
+
results.push(checkSearchableDirectiveOnlyOnStringFields(schema));
|
|
21
39
|
return results.filter((result) => result !== '');
|
|
22
40
|
}
|
|
23
41
|
//# sourceMappingURL=schema-validator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../../src/graphql/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"schema-validator.js","sourceRoot":"","sources":["../../../src/graphql/schema-validator.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,MAAM,SAAS,CAAA;AAChB,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,yBAAyB,GAC1B,MAAM,kCAAkC,CAAA;AAEzC,SAAS,8CAA8C,CACrD,MAAqB;IAErB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,EAAE,CAAA;IAEnC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1C,IAAI,IAAI,CAAC,OAAO,EAAE,IAAI,KAAK,IAAI,CAAC,qBAAqB,EAAE,CAAC;YACtD,SAAQ;QACV,CAAC;QACD,MAAM,UAAU,GAAI,IAAyB,CAAC,QAAQ,EAAE,CAAA;QAExD,MAAM,oCAAoC,GAAG,UAAU,CAAC,MAAM,CAC5D,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAC7D,CAAC,MAAM,CAAA;QAER,IACE,oCAAoC,KAAK,CAAC;YAC1C,oCAAoC,KAAK,UAAU,CAAC,MAAM,EAC1D,CAAC;YACD,OAAO,gCAAgC,IAAI,CAAC,IAAI,iBAAiB,oBAAoB,sBAAsB,CAAA;QAC7G,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAA;AACX,CAAC;AAED,SAAS,0CAA0C,CACjD,MAAqB;IAErB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACtD,SAAQ;QACV,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,yBAAyB,CAAC,EAAE,CAAC;gBACpD,SAAQ;YACV,CAAC;YACD,MAAM,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAC1C,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBAC5D,OAAO,UAAU,IAAI,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,6DAA6D,yBAAyB,cAAc,CAAA;YAC9I,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,EAAE,CAAA;AACX,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAqB;IACvD,MAAM,OAAO,GAAG,EAAE,CAAA;IAClB,OAAO,CAAC,IAAI,CAAC,8CAA8C,CAAC,MAAM,CAAC,CAAC,CAAA;IACpE,OAAO,CAAC,IAAI,CAAC,0CAA0C,CAAC,MAAM,CAAC,CAAC,CAAA;IAChE,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;AAClD,CAAC"}
|
package/dist/esm/index.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { getSchema, postGraphQL, } from "./client.js";
|
|
2
2
|
import { createCacheHandler } from "./persistence/cache.js";
|
|
3
|
-
export async function createClient(gitAdapter) {
|
|
3
|
+
export async function createClient(gitAdapter, options = {}) {
|
|
4
4
|
const repositoryCache = createCacheHandler();
|
|
5
|
+
const searchAdapter = options.searchAdapter;
|
|
5
6
|
return {
|
|
6
|
-
postGraphQL: (...args) => postGraphQL(gitAdapter, repositoryCache, ...args),
|
|
7
|
-
getSchema: (...args) => getSchema(gitAdapter, repositoryCache, ...args),
|
|
7
|
+
postGraphQL: (...args) => postGraphQL(gitAdapter, searchAdapter, repositoryCache, ...args),
|
|
8
|
+
getSchema: (...args) => getSchema(gitAdapter, searchAdapter, repositoryCache, ...args),
|
|
8
9
|
};
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=index.js.map
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,WAAW,GAGZ,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAET,WAAW,GAGZ,MAAM,aAAa,CAAA;AAIpB,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAA;AA6B3D,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAAsB,EACtB,UAAyB,EAAE;IAE3B,MAAM,eAAe,GAAG,kBAAkB,EAAE,CAAA;IAC5C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAC3C,OAAO;QACL,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CACvB,WAAW,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAClE,SAAS,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CACrB,SAAS,CAAC,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;KACjE,CAAA;AACH,CAAC"}
|