@eddeee888/gcg-typescript-resolver-files 0.10.4 → 0.11.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/package.json +2 -2
- package/src/generateResolverFiles/addResolverMainFiles.js +6 -0
- package/src/generateResolverFiles/addResolverMainFiles.js.map +1 -1
- package/src/generateResolverFiles/ensureEnumTypeResolversAreGenerated.js +1 -0
- package/src/generateResolverFiles/ensureEnumTypeResolversAreGenerated.js.map +1 -1
- package/src/generateResolverFiles/ensureObjectTypeResolversAreGenerated.js +17 -11
- package/src/generateResolverFiles/ensureObjectTypeResolversAreGenerated.js.map +1 -1
- package/src/generateResolverFiles/generateResolverFiles.js +1 -1
- package/src/generateResolverFiles/generateResolverFiles.js.map +1 -1
- package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.d.ts +0 -1
- package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.js +0 -20
- package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLEnumType.js +4 -0
- package/src/generateResolverFiles/handleGraphQLEnumType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLInterfaceType.js +4 -0
- package/src/generateResolverFiles/handleGraphQLInterfaceType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLObjectType.d.ts +0 -1
- package/src/generateResolverFiles/handleGraphQLObjectType.js +32 -9
- package/src/generateResolverFiles/handleGraphQLObjectType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js +4 -0
- package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLScalarType.js +4 -0
- package/src/generateResolverFiles/handleGraphQLScalarType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLUnionType.js +4 -0
- package/src/generateResolverFiles/handleGraphQLUnionType.js.map +1 -1
- package/src/generateResolverFiles/postProcessFiles.js +66 -22
- package/src/generateResolverFiles/postProcessFiles.js.map +1 -1
- package/src/generateResolverFiles/types.d.ts +6 -0
- package/src/generateResolverFiles/visitNamedType.js +1 -0
- package/src/generateResolverFiles/visitNamedType.js.map +1 -1
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.js +6 -0
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.js.map +1 -1
- package/src/parseGraphQLSchema/parseGraphQLSchema.d.ts +1 -3
- package/src/parseGraphQLSchema/parseGraphQLSchema.js +3 -10
- package/src/parseGraphQLSchema/parseGraphQLSchema.js.map +1 -1
- package/src/preset.js +25 -11
- package/src/preset.js.map +1 -1
- package/src/validatePresetConfig/validatePresetConfig.js +0 -3
- package/src/validatePresetConfig/validatePresetConfig.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eddeee888/gcg-typescript-resolver-files",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/eddeee888/graphql-code-generator-plugins.git",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@graphql-codegen/plugin-helpers": "^5.0.4",
|
|
33
33
|
"@graphql-codegen/schema-ast": "^4.1.0",
|
|
34
34
|
"@graphql-codegen/typescript": "^4.0.7",
|
|
35
|
-
"@graphql-codegen/typescript-resolvers": "^4.
|
|
35
|
+
"@graphql-codegen/typescript-resolvers": "^4.4.0",
|
|
36
36
|
"@graphql-tools/merge": "^9.0.4",
|
|
37
37
|
"@graphql-tools/utils": "^10.0.0",
|
|
38
38
|
"micromatch": "^4.0.0",
|
|
@@ -143,6 +143,12 @@ const addResolverMainFiles = ({ config: { baseOutputDir, resolverTypesPath, reso
|
|
|
143
143
|
: '';
|
|
144
144
|
result.files[resolverMainFilename] = {
|
|
145
145
|
__filetype: 'file',
|
|
146
|
+
// TODO: type='virtual' means we will generate these main files every run.
|
|
147
|
+
// Consider checking if these files are already on the filesystem, and whether the content has changed before generating?
|
|
148
|
+
filesystem: {
|
|
149
|
+
type: 'virtual',
|
|
150
|
+
contentUpdated: false,
|
|
151
|
+
},
|
|
146
152
|
mainImportIdentifier: resolversIdentifier,
|
|
147
153
|
content: `/* This file was automatically generated. DO NOT UPDATE MANUALLY. */
|
|
148
154
|
${(0, utils_1.printImportLine)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addResolverMainFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFiles.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"addResolverMainFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureEnumTypeResolversAreGenerated.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/ensureEnumTypeResolversAreGenerated.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AAEvD,6GAA0G;AAEnG,MAAM,mCAAmC,GAAG,CACjD,UAAsB,EACtB,YAA8B,EACxB,EAAE;IACR,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,uFAA0C,EACtE,UAAU,EACV,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAE7D,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;QACtB,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,6CAA6C;IAC7C,iBAAiB;SACd,oBAAoB,CAAC,qBAAU,CAAC,kBAAkB,CAAC;SACnD,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;QAC9B,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClD,IAAI,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,gBAAgB,CAAC,YAAY,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,mCAAmC;IACnC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CACtC,CAAC,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE;QAClC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,iBAAiB;iBACd,oBAAoB,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;iBAC3D,qBAAqB,CAAC;gBACrB,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,IAAI,YAAY,GAAG;aACjC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"ensureEnumTypeResolversAreGenerated.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/ensureEnumTypeResolversAreGenerated.ts"],"names":[],"mappings":";;;AAAA,uCAAuD;AAEvD,6GAA0G;AAEnG,MAAM,mCAAmC,GAAG,CACjD,UAAsB,EACtB,YAA8B,EACxB,EAAE;IACR,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,uFAA0C,EACtE,UAAU,EACV,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,mEAAmE,CACpE,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAE7D,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE;QACtB,GAAG,CAAC,YAAY,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC;QAC3C,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,6CAA6C;IAC7C,iBAAiB;SACd,oBAAoB,CAAC,qBAAU,CAAC,kBAAkB,CAAC;SACnD,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;QAC9B,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClD,IAAI,gBAAgB,CAAC,YAAY,CAAC,EAAE,CAAC;YACnC,gBAAgB,CAAC,YAAY,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,mCAAmC;IACnC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CACtC,CAAC,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE;QAClC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,iBAAiB;iBACd,oBAAoB,CAAC,qBAAU,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;iBAC3D,qBAAqB,CAAC;gBACrB,IAAI,EAAE,YAAY;gBAClB,WAAW,EAAE,IAAI,YAAY,GAAG;aACjC,CAAC,CAAC;YACL,YAAY,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC;QAChD,CAAC;IACH,CAAC,CACF,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,mCAAmC,uCA8C9C"}
|
|
@@ -46,18 +46,19 @@ const ensureObjectTypeResolversAreGenerated = (sourceFile, resolverFile) => {
|
|
|
46
46
|
// 2. Add missing resolver properties if they haven't been implemented
|
|
47
47
|
const addedPropertyAssignmentNodes = [];
|
|
48
48
|
Object.values(resolversData).forEach(({ resolverName, resolverDeclaration, implemented }) => {
|
|
49
|
-
if (
|
|
50
|
-
|
|
51
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0]
|
|
52
|
-
.addPropertyAssignment({
|
|
53
|
-
name: resolverName,
|
|
54
|
-
initializer: resolverDeclaration,
|
|
55
|
-
});
|
|
56
|
-
addedPropertyAssignmentNodes[addedNode.getStartLineNumber()] = {
|
|
57
|
-
node: addedNode,
|
|
58
|
-
__toBeRemoved: true,
|
|
59
|
-
};
|
|
49
|
+
if (implemented) {
|
|
50
|
+
return;
|
|
60
51
|
}
|
|
52
|
+
const addedNode = variableStatement
|
|
53
|
+
.getDescendantsOfKind(ts_morph_1.SyntaxKind.ObjectLiteralExpression)[0]
|
|
54
|
+
.addPropertyAssignment({
|
|
55
|
+
name: resolverName,
|
|
56
|
+
initializer: resolverDeclaration,
|
|
57
|
+
});
|
|
58
|
+
addedPropertyAssignmentNodes[addedNode.getStartLineNumber()] = {
|
|
59
|
+
node: addedNode,
|
|
60
|
+
__toBeRemoved: true,
|
|
61
|
+
};
|
|
61
62
|
});
|
|
62
63
|
// 3. Check to see if there's error at the newly added properties:
|
|
63
64
|
// a. If there's error, leave it as user needs to manually map mapper type to schema type
|
|
@@ -74,6 +75,11 @@ const ensureObjectTypeResolversAreGenerated = (sourceFile, resolverFile) => {
|
|
|
74
75
|
if (__toBeRemoved) {
|
|
75
76
|
node.remove();
|
|
76
77
|
}
|
|
78
|
+
else {
|
|
79
|
+
// If found a property assignment that cannot be removed i.e. incompatible types between mapper vs schema types
|
|
80
|
+
// Then we must mark the content as updated to be added to generate list
|
|
81
|
+
resolverFile.filesystem.contentUpdated = true;
|
|
82
|
+
}
|
|
77
83
|
});
|
|
78
84
|
};
|
|
79
85
|
exports.ensureObjectTypeResolversAreGenerated = ensureObjectTypeResolversAreGenerated;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ensureObjectTypeResolversAreGenerated.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/ensureObjectTypeResolversAreGenerated.ts"],"names":[],"mappings":";;;AAAA,uCAAgF;AAEhF,6GAA0G;AAE1G;;GAEG;AACI,MAAM,qCAAqC,GAAG,CACnD,UAAsB,EACtB,YAA4B,EACtB,EAAE;IACR,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAAC,mBAAmB,IAAI,EAAE,CAAC;IACxE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,IAAA,uFAA0C,EACtE,UAAU,EACV,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CACb,qEAAqE,CACtE,CAAC;IACJ,CAAC;IAED;;;;;;;;;OASG;IAEH,4EAA4E;IAC5E,MAAM,aAAa,qBAOV,mBAAmB,CAAE,CAAC;IAE/B,iBAAiB;SACd,oBAAoB,CAAC,qBAAU,CAAC,kBAAkB,CAAC;SACnD,OAAO,CAAC,CAAC,kBAAkB,EAAE,EAAE;QAC9B,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,EAAE,CAAC;QAClD,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,aAAa,CAAC,YAAY,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,iBAAiB;SACd,oBAAoB,CAAC,qBAAU,CAAC,iBAAiB,CAAC;SAClD,OAAO,CAAC,CAAC,iBAAiB,EAAE,EAAE;QAC7B,MAAM,YAAY,GAAG,iBAAiB,CAAC,OAAO,EAAE,CAAC;QACjD,IAAI,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;YAChC,aAAa,CAAC,YAAY,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC;QACjD,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,sEAAsE;IACtE,MAAM,4BAA4B,GAG9B,EAAE,CAAC;IACP,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAClC,CAAC,EAAE,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,EAAE,EAAE;QACrD,IAAI,
|
|
1
|
+
{"version":3,"file":"ensureObjectTypeResolversAreGenerated.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/ensureObjectTypeResolversAreGenerated.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,7 +26,7 @@ const generateResolverFiles = (ctx) => {
|
|
|
26
26
|
// Object
|
|
27
27
|
Object.values(ctx.config.parsedGraphQLSchemaMeta.userDefinedSchemaTypeMap.object).forEach((objectsByModules) => {
|
|
28
28
|
Object.values(objectsByModules).forEach((details) => {
|
|
29
|
-
(0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: null, visitor: (baseParams, prev_ctx) => (0, handleGraphQLObjectType_1.handleGraphQLObjectType)(Object.assign(Object.assign({}, baseParams), { fieldsToPick: details.fieldsToPick
|
|
29
|
+
(0, visitNamedType_1.visitNamedType)(Object.assign(Object.assign({}, details), { belongsToRootObject: null, visitor: (baseParams, prev_ctx) => (0, handleGraphQLObjectType_1.handleGraphQLObjectType)(Object.assign(Object.assign({}, baseParams), { fieldsToPick: details.fieldsToPick }), prev_ctx) }), ctx);
|
|
30
30
|
});
|
|
31
31
|
});
|
|
32
32
|
// Scalar
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateResolverFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/generateResolverFiles.ts"],"names":[],"mappings":";;;AAAA,iEAA8D;AAC9D,yDAAsD;AACtD,yFAAsF;AACtF,uEAAoE;AACpE,qEAAkE;AAClE,uEAAoE;AACpE,6EAA0E;AAC1E,mEAAgE;AAChE,qDAAkD;AAG3C,MAAM,qBAAqB,GAAG,CACnC,GAAiC,EAC3B,EAAE;IACR,QAAQ;IACR,MAAM,CAAC,MAAM,CACX,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,KAAK,CAClE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACpB,IAAA,+BAAc,kCAEP,OAAO,KACV,mBAAmB,EAAE,OAAO,EAC5B,OAAO,EAAE,mEAAgC,KAE3C,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,WAAW;IACX,MAAM,CAAC,MAAM,CACX,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,QAAQ,CACrE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACpB,IAAA,+BAAc,kCAEP,OAAO,KACV,mBAAmB,EAAE,UAAU,EAC/B,OAAO,EAAE,mEAAgC,KAE3C,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,eAAe;IACf,MAAM,CAAC,MAAM,CACX,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,YAAY,CACzE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACpB,IAAA,+BAAc,kCAEP,OAAO,KACV,mBAAmB,EAAE,cAAc,EACnC,OAAO,EAAE,mEAAgC,KAE3C,GAAG,CACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,SAAS;IACT,MAAM,CAAC,MAAM,CACX,GAAG,CAAC,MAAM,CAAC,uBAAuB,CAAC,wBAAwB,CAAC,MAAM,CACnE,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,EAAE;QAC7B,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAClD,IAAA,+BAAc,kCAEP,OAAO,KACV,mBAAmB,EAAE,IAAI,EACzB,OAAO,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,CAChC,IAAA,iDAAuB,kCAEhB,UAAU,KACb,YAAY,EAAE,OAAO,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"generateResolverFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/generateResolverFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,5 +3,4 @@ import type { ResolverFile } from './types';
|
|
|
3
3
|
export declare const getVariableStatementWithExpectedIdentifier: (sourceFile: SourceFile, resolverFile: ResolverFile) => {
|
|
4
4
|
variableStatement: VariableStatement | undefined;
|
|
5
5
|
isExported: boolean;
|
|
6
|
-
ensureCorrectResolverType: (() => void) | undefined;
|
|
7
6
|
};
|
|
@@ -2,9 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getVariableStatementWithExpectedIdentifier = void 0;
|
|
4
4
|
const getVariableStatementWithExpectedIdentifier = (sourceFile, resolverFile) => {
|
|
5
|
-
var _a;
|
|
6
5
|
let isExported = false;
|
|
7
|
-
let ensureCorrectResolverType = undefined;
|
|
8
6
|
const variableStatementWithExpectedIdentifier = sourceFile.getVariableStatement((statement) => {
|
|
9
7
|
let hasExpectedIdentifier = false;
|
|
10
8
|
statement
|
|
@@ -20,27 +18,9 @@ const getVariableStatementWithExpectedIdentifier = (sourceFile, resolverFile) =>
|
|
|
20
18
|
});
|
|
21
19
|
return hasExpectedIdentifier;
|
|
22
20
|
});
|
|
23
|
-
/**
|
|
24
|
-
* If we found the variable statement replace its type with the expected resolver type string
|
|
25
|
-
*
|
|
26
|
-
* This is because we change the type of the resolver in some cases:
|
|
27
|
-
* 1. When `extend type <Object>` is used, we might change its original type to the picked version
|
|
28
|
-
* e.g. `Book` might become `Pick<Book, 'title' | 'author'>`
|
|
29
|
-
*/
|
|
30
|
-
if (variableStatementWithExpectedIdentifier &&
|
|
31
|
-
((_a = resolverFile.meta.resolverType) === null || _a === void 0 ? void 0 : _a.final)) {
|
|
32
|
-
const variableDeclaration = variableStatementWithExpectedIdentifier
|
|
33
|
-
.getDeclarationList()
|
|
34
|
-
.getDeclarations()[0];
|
|
35
|
-
const typeNode = variableDeclaration === null || variableDeclaration === void 0 ? void 0 : variableDeclaration.getTypeNode();
|
|
36
|
-
ensureCorrectResolverType = typeNode
|
|
37
|
-
? () => typeNode.replaceWithText(resolverFile.meta.resolverType.final)
|
|
38
|
-
: () => variableDeclaration.setType(resolverFile.meta.resolverType.final);
|
|
39
|
-
}
|
|
40
21
|
return {
|
|
41
22
|
variableStatement: variableStatementWithExpectedIdentifier,
|
|
42
23
|
isExported,
|
|
43
|
-
ensureCorrectResolverType,
|
|
44
24
|
};
|
|
45
25
|
};
|
|
46
26
|
exports.getVariableStatementWithExpectedIdentifier = getVariableStatementWithExpectedIdentifier;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getVariableStatementWithExpectedIdentifier.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.ts"],"names":[],"mappings":";;;AAGO,MAAM,0CAA0C,GAAG,CACxD,UAAsB,EACtB,YAA0B,
|
|
1
|
+
{"version":3,"file":"getVariableStatementWithExpectedIdentifier.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.ts"],"names":[],"mappings":";;;AAGO,MAAM,0CAA0C,GAAG,CACxD,UAAsB,EACtB,YAA0B,EAI1B,EAAE;IACF,IAAI,UAAU,GAAG,KAAK,CAAC;IAEvB,MAAM,uCAAuC,GAC3C,UAAU,CAAC,oBAAoB,CAAC,CAAC,SAAS,EAAE,EAAE;QAC5C,IAAI,qBAAqB,GAAG,KAAK,CAAC;QAClC,SAAS;aACN,kBAAkB,EAAE;aACpB,eAAe,EAAE;aACjB,OAAO,CAAC,CAAC,eAAe,EAAE,EAAE;YAC3B,IAAI,eAAe,CAAC,OAAO,EAAE,KAAK,YAAY,CAAC,oBAAoB,EAAE,CAAC;gBACpE,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,IAAI,SAAS,CAAC,UAAU,EAAE,EAAE,CAAC;oBAC3B,UAAU,GAAG,IAAI,CAAC;gBACpB,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACL,OAAO,qBAAqB,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEL,OAAO;QACL,iBAAiB,EAAE,uCAAuC;QAC1D,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AA9BW,QAAA,0CAA0C,8CA8BrD"}
|
|
@@ -36,6 +36,10 @@ const handleGraphQLEnumType = ({ fieldFilePath, relativePathFromBaseToModule, re
|
|
|
36
36
|
}`;
|
|
37
37
|
result.files[fieldFilePath] = {
|
|
38
38
|
__filetype: 'enumResolver',
|
|
39
|
+
filesystem: {
|
|
40
|
+
type: 'virtual',
|
|
41
|
+
contentUpdated: false,
|
|
42
|
+
},
|
|
39
43
|
content: `
|
|
40
44
|
${resolverTypeImportDeclaration}
|
|
41
45
|
${variableStatement}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLEnumType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLEnumType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,qBAAqB,GAG9B,CACF,EACE,aAAa,EACb,4BAA4B,EAC5B,YAAY,EACZ,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,aAAa,GACd,EACD,EACE,MAAM,EACN,MAAM,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,GAC1E,EACD,EAAE;IACF,MAAM,wBAAwB,GAAG,IAAA,kCAA0B,EAAC;QAC1D,OAAO,EAAE,kBAAkB,CAAC,IAAI;QAChC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAElE,IACE,CAAC,wBAAwB;QACzB,CAAC,aAAa;QACd,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,sCAAsC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,IAAI,CACnH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE;QACpC,IAAI,CAAC,wBAAwB,IAAI,aAAa,EAAE,CAAC;YAC/C,cAAM,CAAC,KAAK,CACV,mFAAmF,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,cAAc,aAAa,CAAC,cAAc,EAAE,CACxM,CAAC;YACF,OAAO;mDACsC,aAAa,CAAC,cAAc;;SAEtE,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,GAAG,uBAAuB,gBAAgB,YAAY,KAC9E,iBAAiB,CAAC,UACpB;MACI,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IAClE,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,cAAc;QAC1B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,sBAAsB;YACtB,aAAa;SACd;KACF,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGraphQLEnumType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLEnumType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,qBAAqB,GAG9B,CACF,EACE,aAAa,EACb,4BAA4B,EAC5B,YAAY,EACZ,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,aAAa,GACd,EACD,EACE,MAAM,EACN,MAAM,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,GAC1E,EACD,EAAE;IACF,MAAM,wBAAwB,GAAG,IAAA,kCAA0B,EAAC;QAC1D,OAAO,EAAE,kBAAkB,CAAC,IAAI;QAChC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,cAAc,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAElE,IACE,CAAC,wBAAwB;QACzB,CAAC,aAAa;QACd,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,sCAAsC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,IAAI,CACnH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,uBAAuB,GAAG,CAAC,GAAG,EAAE;QACpC,IAAI,CAAC,wBAAwB,IAAI,aAAa,EAAE,CAAC;YAC/C,cAAM,CAAC,KAAK,CACV,mFAAmF,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,IAAI,cAAc,aAAa,CAAC,cAAc,EAAE,CACxM,CAAC;YACF,OAAO;mDACsC,aAAa,CAAC,cAAc;;SAEtE,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EAAE,CAAC;IAEL,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,GAAG,uBAAuB,gBAAgB,YAAY,KAC9E,iBAAiB,CAAC,UACpB;MACI,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IAClE,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,cAAc;QAC1B,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,sBAAsB;YACtB,aAAa;SACd;KACF,CAAC;AACJ,CAAC,CAAC;AAtFW,QAAA,qBAAqB,yBAsFhC"}
|
|
@@ -22,6 +22,10 @@ const handleGraphQLInterfaceType = ({ fieldFilePath, isFileAlreadyOnFilesystem,
|
|
|
22
22
|
const variableStatement = `export const ${resolverName}: ${resolverTypeString} = { /* Implement ${resolverName} interface logic here */ };`;
|
|
23
23
|
result.files[fieldFilePath] = {
|
|
24
24
|
__filetype: 'interfaceResolver',
|
|
25
|
+
filesystem: {
|
|
26
|
+
type: 'virtual',
|
|
27
|
+
contentUpdated: false,
|
|
28
|
+
},
|
|
25
29
|
content: `
|
|
26
30
|
${resolverTypeImportDeclaration}
|
|
27
31
|
${variableStatement}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLInterfaceType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLInterfaceType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,0BAA0B,GAAuB,CAC5D,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,SAAS;QACrC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,2CAA2C,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,SAAS,IAAI,CAC7H,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,UAAU,CAAC;IAExD,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,qBAAqB,YAAY,6BAA6B,CAAC;IAE5I,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,mBAAmB;QAC/B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,kBAAkB;aAC1B;SACF;KACF,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGraphQLInterfaceType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLInterfaceType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,0BAA0B,GAAuB,CAC5D,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,SAAS;QACrC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,2CAA2C,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,SAAS,IAAI,CAC7H,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,UAAU,CAAC;IAExD,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,qBAAqB,YAAY,6BAA6B,CAAC;IAE5I,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,mBAAmB;QAC/B,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,kBAAkB;aAC1B;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,0BAA0B,8BA0DrC"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleGraphQLObjectType = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
const handleGraphQLObjectType = ({ fieldFilePath, resolverName, isFileAlreadyOnFilesystem, normalizedResolverName, resolversTypeMeta, moduleName, relativePathFromBaseToModule, fieldsToPick = [], // If fieldsToPick.length === 0, it means the current object handles all resolvers
|
|
6
|
-
|
|
6
|
+
generatedTypesFileMeta, }, { result, config: { resolverGeneration, typeMappersMap, graphQLObjectTypeResolversToGenerate, emitLegacyCommonJSImports, }, }) => {
|
|
7
|
+
var _a;
|
|
7
8
|
const matchedPatternToGenerate = (0, utils_1.isMatchResolverNamePattern)({
|
|
8
9
|
pattern: resolverGeneration.object,
|
|
9
10
|
value: normalizedResolverName.withModule,
|
|
@@ -36,16 +37,33 @@ pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap
|
|
|
36
37
|
if (hasFieldsToPick) {
|
|
37
38
|
fieldsToPick.push('__isTypeOf');
|
|
38
39
|
}
|
|
39
|
-
if (hasFieldsToPick &&
|
|
40
|
+
if (hasFieldsToPick &&
|
|
41
|
+
((_a = generatedTypesFileMeta.generatedResolverTypes.userDefined[normalizedResolverName.base].federation) === null || _a === void 0 ? void 0 : _a.hasResolveReference)) {
|
|
40
42
|
fieldsToPick.push('__resolveReference');
|
|
41
43
|
}
|
|
42
|
-
// `typeString` contains the resolver type
|
|
43
|
-
//
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
44
|
+
// - `typeString` contains the resolver type
|
|
45
|
+
// If there's fieldsToPick, we must only pick said fields from the original resolver type
|
|
46
|
+
// - `otherTypeStringVariants` contains other types that are the same as `typeString` but formatted differently
|
|
47
|
+
// This is used to check if the resolver type is the same when running static analysis
|
|
48
|
+
// We want to use string comparison instead of true AST check because it's a lot faster and simpler
|
|
49
|
+
const { typeString, otherTypeStringVariants } = (() => {
|
|
50
|
+
if (hasFieldsToPick) {
|
|
51
|
+
return {
|
|
52
|
+
typeString: `Pick<${resolversTypeMeta.typeString}, ${fieldsToPick
|
|
53
|
+
.map((fieldName) => `'${fieldName}'`)
|
|
54
|
+
.join('|')}>`,
|
|
55
|
+
otherTypeStringVariants: [
|
|
56
|
+
`Pick<${resolversTypeMeta.typeString}, |${fieldsToPick
|
|
57
|
+
.map((fieldName) => `'${fieldName}'`)
|
|
58
|
+
.join('|')}>`,
|
|
59
|
+
],
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
return {
|
|
63
|
+
typeString: resolversTypeMeta.typeString,
|
|
64
|
+
otherTypeStringVariants: [],
|
|
65
|
+
};
|
|
66
|
+
})();
|
|
49
67
|
// Array of all resolvers that may need type checking
|
|
50
68
|
// If there's fieldsToPick, we must only generate said fields
|
|
51
69
|
const allResolversToGenerate = graphQLObjectTypeResolversToGenerate[resolverName];
|
|
@@ -69,6 +87,10 @@ pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap
|
|
|
69
87
|
});
|
|
70
88
|
result.files[fieldFilePath] = {
|
|
71
89
|
__filetype: 'objectType',
|
|
90
|
+
filesystem: {
|
|
91
|
+
type: 'virtual',
|
|
92
|
+
contentUpdated: false,
|
|
93
|
+
},
|
|
72
94
|
content: `
|
|
73
95
|
${resolverTypeImportDeclaration}
|
|
74
96
|
${variableStatement}`,
|
|
@@ -82,6 +104,7 @@ pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap
|
|
|
82
104
|
resolverType: {
|
|
83
105
|
baseImport: resolversTypeMeta.typeNamedImport,
|
|
84
106
|
final: typeString,
|
|
107
|
+
otherVariants: otherTypeStringVariants,
|
|
85
108
|
},
|
|
86
109
|
resolversToGenerate,
|
|
87
110
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA+E;AAExE,MAAM,uBAAuB,
|
|
1
|
+
{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,10 @@ const handleGraphQLRootObjectTypeField = ({ fieldFilePath, isFileAlreadyOnFilesy
|
|
|
48
48
|
});
|
|
49
49
|
result.files[fieldFilePath] = {
|
|
50
50
|
__filetype: 'rootObjectTypeFieldResolver',
|
|
51
|
+
filesystem: {
|
|
52
|
+
type: 'virtual',
|
|
53
|
+
contentUpdated: false,
|
|
54
|
+
},
|
|
51
55
|
content: `
|
|
52
56
|
${resolverTypeImportDeclaration}
|
|
53
57
|
${variableStatement}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AAAA,oCAKkB;AAGX,MAAM,gCAAgC,GAEzC,CACF,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,mBAAmB,KAAK,OAAO;QAC9B,CAAC,IAAA,kCAA0B,EAAC;YAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;YACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;SACzC,CAAC;QACF,CAAC,yBAAyB,CAAC;QAC7B,CAAC,mBAAmB,KAAK,UAAU;YACjC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,QAAQ;gBACpC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC;YACF,CAAC,yBAAyB,CAAC;QAC7B,CAAC,mBAAmB,KAAK,cAAc;YACrC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,YAAY;gBACxC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC;YACF,CAAC,yBAAyB,CAAC,EAC7B,CAAC;QACD,MAAM,yBAAyB,GAC7B,mBAAmB,KAAK,OAAO;YAC7B,CAAC,CAAC,kBAAkB,CAAC,KAAK;YAC1B,CAAC,CAAC,mBAAmB,KAAK,UAAU;gBACpC,CAAC,CAAC,kBAAkB,CAAC,QAAQ;gBAC7B,CAAC,CAAC,mBAAmB,KAAK,cAAc;oBACxC,CAAC,CAAC,kBAAkB,CAAC,YAAY;oBACjC,CAAC,CAAC,SAAS,CAAC;QAChB,cAAM,CAAC,KAAK,CACV,WAAW,mBAAmB,0BAA0B,sBAAsB,CAAC,UAAU,gBAAgB,yBAAyB,IAAI,CACvI,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,sBAAsB,CAAC,IAAI,yBAAyB,CAAC;IAExF,MAAM,kBAAkB,GAAG,eAAe,iBAAiB,CAAC,UAAU,GAAG,CAAC;IAE1E,IAAI,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,uCAAuC,UAAU,KAAK,CAAC;IAClI,IAAI,mBAAmB,KAAK,cAAc,EAAE,CAAC;QAC3C,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB;oDACvB,UAAU;MACxD,CAAC;IACL,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,6BAA6B;QACzC,OAAO,EAAE;UACH,6BAA6B;UAC7B,iBAAiB,EAAE;QACzB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,mBAAmB;YACnB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,QAAQ,EAAE,iBAAiB,CAAC,UAAU;gBACtC,KAAK,EAAE,kBAAkB;aAC1B;YACD,sBAAsB;SACvB;KACF,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AAAA,oCAKkB;AAGX,MAAM,gCAAgC,GAEzC,CACF,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,mBAAmB,KAAK,OAAO;QAC9B,CAAC,IAAA,kCAA0B,EAAC;YAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;YACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;SACzC,CAAC;QACF,CAAC,yBAAyB,CAAC;QAC7B,CAAC,mBAAmB,KAAK,UAAU;YACjC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,QAAQ;gBACpC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC;YACF,CAAC,yBAAyB,CAAC;QAC7B,CAAC,mBAAmB,KAAK,cAAc;YACrC,CAAC,IAAA,kCAA0B,EAAC;gBAC1B,OAAO,EAAE,kBAAkB,CAAC,YAAY;gBACxC,KAAK,EAAE,sBAAsB,CAAC,UAAU;aACzC,CAAC;YACF,CAAC,yBAAyB,CAAC,EAC7B,CAAC;QACD,MAAM,yBAAyB,GAC7B,mBAAmB,KAAK,OAAO;YAC7B,CAAC,CAAC,kBAAkB,CAAC,KAAK;YAC1B,CAAC,CAAC,mBAAmB,KAAK,UAAU;gBACpC,CAAC,CAAC,kBAAkB,CAAC,QAAQ;gBAC7B,CAAC,CAAC,mBAAmB,KAAK,cAAc;oBACxC,CAAC,CAAC,kBAAkB,CAAC,YAAY;oBACjC,CAAC,CAAC,SAAS,CAAC;QAChB,cAAM,CAAC,KAAK,CACV,WAAW,mBAAmB,0BAA0B,sBAAsB,CAAC,UAAU,gBAAgB,yBAAyB,IAAI,CACvI,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,UAAU,GAAG,gBAAgB,sBAAsB,CAAC,IAAI,yBAAyB,CAAC;IAExF,MAAM,kBAAkB,GAAG,eAAe,iBAAiB,CAAC,UAAU,GAAG,CAAC;IAE1E,IAAI,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB,uCAAuC,UAAU,KAAK,CAAC;IAClI,IAAI,mBAAmB,KAAK,cAAc,EAAE,CAAC;QAC3C,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,kBAAkB;oDACvB,UAAU;MACxD,CAAC;IACL,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,6BAA6B;QACzC,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;UACH,6BAA6B;UAC7B,iBAAiB,EAAE;QACzB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,mBAAmB;YACnB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,QAAQ,EAAE,iBAAiB,CAAC,UAAU;gBACtC,KAAK,EAAE,kBAAkB;aAC1B;YACD,sBAAsB;SACvB;KACF,CAAC;AACJ,CAAC,CAAC;AA5FW,QAAA,gCAAgC,oCA4F3C"}
|
|
@@ -34,6 +34,10 @@ const handleGraphQLScalarType = ({ fieldFilePath, isFileAlreadyOnFilesystem, res
|
|
|
34
34
|
});`;
|
|
35
35
|
result.files[fieldFilePath] = {
|
|
36
36
|
__filetype: 'scalarResolver',
|
|
37
|
+
filesystem: {
|
|
38
|
+
type: 'virtual',
|
|
39
|
+
contentUpdated: false,
|
|
40
|
+
},
|
|
37
41
|
content: `
|
|
38
42
|
${resolverTypeImportDeclaration}
|
|
39
43
|
${variableStatement}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLScalarType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLScalarType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAG/E,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,MAAM;QAClC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,wCAAwC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,IAAI,CACvH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,KAAK;QACnB,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,CAAC,iBAAiB,CAAC;QACjC,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,UAAU,iBAAiB;aACtE,YAAY;oBACL,YAAY;;;;;;;;;;MAU1B,CAAC;IAEL,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,gBAAgB;QAC5B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB;gBAC7B,KAAK,EAAE,iBAAiB;aACzB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGraphQLScalarType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLScalarType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAG/E,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,MAAM;QAClC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,wCAAwC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,IAAI,CACvH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,KAAK;QACnB,MAAM,EAAE,SAAS;QACjB,UAAU,EAAE,QAAQ;QACpB,YAAY,EAAE,CAAC,iBAAiB,CAAC;QACjC,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,UAAU,iBAAiB;aACtE,YAAY;oBACL,YAAY;;;;;;;;;;MAU1B,CAAC;IAEL,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,gBAAgB;QAC5B,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,6BAA6B;YAC7B,iBAAiB;YACjB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB;gBAC7B,KAAK,EAAE,iBAAiB;aACzB;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,uBAAuB,2BAmElC"}
|
|
@@ -21,6 +21,10 @@ const handleGraphQLUnionType = ({ fieldFilePath, isFileAlreadyOnFilesystem, reso
|
|
|
21
21
|
const variableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = { /* Implement ${resolverName} union logic here */ };`;
|
|
22
22
|
result.files[fieldFilePath] = {
|
|
23
23
|
__filetype: 'unionResolver',
|
|
24
|
+
filesystem: {
|
|
25
|
+
type: 'virtual',
|
|
26
|
+
contentUpdated: false,
|
|
27
|
+
},
|
|
24
28
|
content: `
|
|
25
29
|
${resolverTypeImportDeclaration}
|
|
26
30
|
${variableStatement}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLUnionType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLUnionType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,sBAAsB,GAAuB,CACxD,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;QACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,uCAAuC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,KAAK,IAAI,CACrH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,qBAAqB,YAAY,yBAAyB,CAAC;IAElJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,eAAe;QAC3B,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,6BAA6B;YAC7B,iBAAiB;SAClB;KACF,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"handleGraphQLUnionType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLUnionType.ts"],"names":[],"mappings":";;;AAAA,oCAA+E;AAGxE,MAAM,sBAAsB,GAAuB,CACxD,EACE,aAAa,EACb,yBAAyB,EACzB,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,GAC7B,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,EAAE,EACrE,EAAE;IACF,IACE,CAAC,IAAA,kCAA0B,EAAC;QAC1B,OAAO,EAAE,kBAAkB,CAAC,KAAK;QACjC,KAAK,EAAE,sBAAsB,CAAC,UAAU;KACzC,CAAC;QACF,CAAC,yBAAyB,EAC1B,CAAC;QACD,cAAM,CAAC,KAAK,CACV,uCAAuC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,KAAK,IAAI,CACrH,CAAC;QACF,OAAO;IACT,CAAC;IAED,MAAM,6BAA6B,GAAG,IAAA,uBAAe,EAAC;QACpD,YAAY,EAAE,IAAI;QAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;QAChC,UAAU,EAAE,iBAAiB,CAAC,UAAU;QACxC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;QACjD,yBAAyB;KAC1B,CAAC,CAAC;IACH,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,qBAAqB,YAAY,yBAAyB,CAAC;IAElJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,eAAe;QAC3B,UAAU,EAAE;YACV,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,KAAK;SACtB;QACD,OAAO,EAAE;MACP,6BAA6B;MAC7B,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,4BAA4B;YAC5B,sBAAsB;YACtB,YAAY,EAAE;gBACZ,UAAU,EAAE,iBAAiB,CAAC,eAAe;gBAC7C,KAAK,EAAE,iBAAiB,CAAC,UAAU;aACpC;YACD,6BAA6B;YAC7B,iBAAiB;SAClB;KACF,CAAC;AACJ,CAAC,CAAC;AAxDW,QAAA,sBAAsB,0BAwDjC"}
|
|
@@ -22,6 +22,10 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
|
|
|
22
22
|
}
|
|
23
23
|
const existingSourceFile = project.addSourceFileAtPathIfExists(filePath);
|
|
24
24
|
if (existingSourceFile) {
|
|
25
|
+
file.filesystem = {
|
|
26
|
+
type: 'filesystem',
|
|
27
|
+
contentUpdated: false,
|
|
28
|
+
};
|
|
25
29
|
sourceFilesToProcess.push({
|
|
26
30
|
sourceFile: existingSourceFile,
|
|
27
31
|
resolverFile: file,
|
|
@@ -39,15 +43,7 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
|
|
|
39
43
|
});
|
|
40
44
|
sourceFilesToProcess.forEach(({ sourceFile, resolverFile }) => {
|
|
41
45
|
const normalizedRelativePath = path.posix.relative((0, utils_1.cwd)(), sourceFile.getFilePath());
|
|
42
|
-
const { addedVariableStatement
|
|
43
|
-
// For non-scalarResolver, ensure correct type is imported
|
|
44
|
-
// For scalarResolver, we don't need to add type to the variable statement for a few reasons:
|
|
45
|
-
// - For cases when we need to create a new GraphQLScalarType, it infer the type from `new GraphQLScalarType`
|
|
46
|
-
// - For cases when there's custom user logic, it's up to the user to import the correct type or call `new GraphQLScalarType` by themselves
|
|
47
|
-
if (resolverFile.__filetype !== 'scalarResolver' &&
|
|
48
|
-
ensureCorrectResolverType) {
|
|
49
|
-
ensureCorrectResolverType();
|
|
50
|
-
}
|
|
46
|
+
const { addedVariableStatement } = ensureExportedResolver(sourceFile, resolverFile);
|
|
51
47
|
if (resolverFile.__filetype !== 'scalarResolver' ||
|
|
52
48
|
// For scalarResolver, only add `import { GraphQLScalarType } ...` if variable statement was added.
|
|
53
49
|
// This is because user could have used custom scalar. If so, we don't want to add unnecessary import
|
|
@@ -71,14 +67,66 @@ exports.postProcessFiles = postProcessFiles;
|
|
|
71
67
|
* Ensure correctly named resolvers are exported
|
|
72
68
|
*/
|
|
73
69
|
const ensureExportedResolver = (sourceFile, resolverFile) => {
|
|
74
|
-
|
|
70
|
+
var _a;
|
|
71
|
+
const { variableStatement, isExported } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
|
|
72
|
+
/**
|
|
73
|
+
* If we found the variable statement replace its type with the expected resolver type string
|
|
74
|
+
*
|
|
75
|
+
* This is because we change the type of the resolver in some cases:
|
|
76
|
+
* 1. When `extend type <Object>` is used, we might change its original type to the picked version
|
|
77
|
+
* e.g. `Book` might become `Pick<Book, 'title' | 'author'>`
|
|
78
|
+
*/
|
|
79
|
+
let ensureCorrectResolverType = undefined;
|
|
80
|
+
if (variableStatement && ((_a = resolverFile.meta.resolverType) === null || _a === void 0 ? void 0 : _a.final)) {
|
|
81
|
+
const variableDeclaration = variableStatement
|
|
82
|
+
.getDeclarationList()
|
|
83
|
+
.getDeclarations()[0];
|
|
84
|
+
const typeNode = variableDeclaration === null || variableDeclaration === void 0 ? void 0 : variableDeclaration.getTypeNode();
|
|
85
|
+
ensureCorrectResolverType = typeNode
|
|
86
|
+
? () => {
|
|
87
|
+
const trimTypeString = (value) => value.replace(/[\n\r\s]/g, '');
|
|
88
|
+
const trimmedOriginalTypeString = trimTypeString(typeNode.getText());
|
|
89
|
+
typeNode.replaceWithText(resolverFile.meta.resolverType.final);
|
|
90
|
+
// If the formatted type is the semantically the same but formatted differently from `resolverType.final`
|
|
91
|
+
// e.g.
|
|
92
|
+
// ```
|
|
93
|
+
// Pick<
|
|
94
|
+
// BookResolvers,
|
|
95
|
+
// | 'title'
|
|
96
|
+
// | 'author'
|
|
97
|
+
// >`
|
|
98
|
+
// vs
|
|
99
|
+
// `Pick<Book, 'author' | 'title'>`
|
|
100
|
+
// ```
|
|
101
|
+
const newTypeStringVariants = 'otherVariants' in resolverFile.meta.resolverType
|
|
102
|
+
? [
|
|
103
|
+
resolverFile.meta.resolverType.final,
|
|
104
|
+
...resolverFile.meta.resolverType.otherVariants,
|
|
105
|
+
]
|
|
106
|
+
: [resolverFile.meta.resolverType.final];
|
|
107
|
+
const trimmedNewTypeStringVariants = newTypeStringVariants.map(trimTypeString);
|
|
108
|
+
if (!trimmedNewTypeStringVariants.find((newText) => newText === trimmedOriginalTypeString)) {
|
|
109
|
+
resolverFile.filesystem.contentUpdated = true;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
: () => {
|
|
113
|
+
variableDeclaration.setType(resolverFile.meta.resolverType.final);
|
|
114
|
+
resolverFile.filesystem.contentUpdated = true;
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
// For non-scalarResolver, ensure correct type is imported
|
|
118
|
+
// For scalarResolver, we don't need to add type to the variable statement for a few reasons:
|
|
119
|
+
// - For cases when we need to create a new GraphQLScalarType, it infer the type from `new GraphQLScalarType`
|
|
120
|
+
// - For cases when there's custom user logic, it's up to the user to import the correct type or call `new GraphQLScalarType` by themselves
|
|
121
|
+
if (resolverFile.__filetype !== 'scalarResolver' &&
|
|
122
|
+
ensureCorrectResolverType) {
|
|
123
|
+
ensureCorrectResolverType();
|
|
124
|
+
}
|
|
75
125
|
if (!variableStatement) {
|
|
76
126
|
// Did not find variable statement with expected identifier, add it to the end with a warning
|
|
77
127
|
sourceFile.addStatements(resolverFile.meta.variableStatement);
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
ensureCorrectResolverType,
|
|
81
|
-
};
|
|
128
|
+
resolverFile.filesystem.contentUpdated = true;
|
|
129
|
+
return { addedVariableStatement: true };
|
|
82
130
|
}
|
|
83
131
|
else if (variableStatement && !isExported) {
|
|
84
132
|
// If has identifier but not exported
|
|
@@ -88,17 +136,12 @@ const ensureExportedResolver = (sourceFile, resolverFile) => {
|
|
|
88
136
|
.get(resolverFile.mainImportIdentifier));
|
|
89
137
|
if (!isExpectedIdentifierExported) {
|
|
90
138
|
variableStatement.setIsExported(true);
|
|
139
|
+
resolverFile.filesystem.contentUpdated = true;
|
|
91
140
|
}
|
|
92
141
|
// else, if identifier's been exported do nothing
|
|
93
|
-
return {
|
|
94
|
-
addedVariableStatement: false,
|
|
95
|
-
ensureCorrectResolverType,
|
|
96
|
-
};
|
|
142
|
+
return { addedVariableStatement: false };
|
|
97
143
|
}
|
|
98
|
-
return {
|
|
99
|
-
addedVariableStatement: false,
|
|
100
|
-
ensureCorrectResolverType,
|
|
101
|
-
};
|
|
144
|
+
return { addedVariableStatement: false };
|
|
102
145
|
};
|
|
103
146
|
/**
|
|
104
147
|
* Ensure correctly imported resolves type generated by typescript-resolvers plugin
|
|
@@ -107,6 +150,7 @@ const ensureImportedType = (sourceFile, resolverFile) => {
|
|
|
107
150
|
const { importDeclaration } = (0, getImportStatementWithExpectedNamedImport_1.getImportStatementWithExpectedNamedImport)(sourceFile, resolverFile);
|
|
108
151
|
if (!importDeclaration) {
|
|
109
152
|
sourceFile.insertStatements(0, resolverFile.meta.resolverTypeImportDeclaration);
|
|
153
|
+
resolverFile.filesystem.contentUpdated = true;
|
|
110
154
|
}
|
|
111
155
|
};
|
|
112
156
|
//# sourceMappingURL=postProcessFiles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postProcessFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/postProcessFiles.ts"],"names":[],"mappings":";;;;AACA,mDAA6B;AAC7B,oCAA+B;AAE/B,6GAA0G;AAC1G,mGAAgG;AAChG,+FAA4F;AAC5F,2GAAwG;AAExG;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAAC,EAC/B,MAAM,EAAE,EACN,OAAO,EAAE,EAAE,OAAO,EAAE,EACpB,sBAAsB,GACvB,EACD,MAAM,GACuB,EAAQ,EAAE;IACvC,MAAM,oBAAoB,GAGpB,EAAE,CAAC;IACT,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QACxD,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;QACzE,IAAI,kBAAkB,EAAE,CAAC;YACvB,oBAAoB,CAAC,IAAI,CAAC;gBACxB,UAAU,EAAE,kBAAkB;gBAC9B,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,uGAAuG;QACvG,IAAI,IAAI,CAAC,UAAU,KAAK,YAAY,EAAE,CAAC;YACrC,MAAM,iBAAiB,GAAG,OAAO,CAAC,gBAAgB,CAChD,QAAQ,EACR,IAAI,CAAC,OAAO,CACb,CAAC;YACF,oBAAoB,CAAC,IAAI,CAAC;gBACxB,UAAU,EAAE,iBAAiB;gBAC7B,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;QACL,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,oBAAoB,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE,EAAE;QAC5D,MAAM,sBAAsB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAChD,IAAA,WAAG,GAAE,EACL,UAAU,CAAC,WAAW,EAAE,CACzB,CAAC;QAEF,MAAM,EAAE,sBAAsB,EAAE,
|
|
1
|
+
{"version":3,"file":"postProcessFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/postProcessFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,10 @@ export type GeneratedTypesFileMeta = {
|
|
|
11
11
|
};
|
|
12
12
|
interface BaseVirtualFile {
|
|
13
13
|
__filetype: string;
|
|
14
|
+
filesystem: {
|
|
15
|
+
type: 'virtual' | 'filesystem';
|
|
16
|
+
contentUpdated: boolean;
|
|
17
|
+
};
|
|
14
18
|
content: string;
|
|
15
19
|
mainImportIdentifier: string;
|
|
16
20
|
}
|
|
@@ -100,6 +104,7 @@ export interface ObjectTypeFile extends BaseVirtualFile {
|
|
|
100
104
|
resolverType: {
|
|
101
105
|
baseImport: string;
|
|
102
106
|
final: string;
|
|
107
|
+
otherVariants: string[];
|
|
103
108
|
};
|
|
104
109
|
normalizedResolverName: NormalizedResolverName;
|
|
105
110
|
resolversToGenerate?: GraphQLObjectTypeResolversToGenerate[number];
|
|
@@ -153,6 +158,7 @@ export interface GraphQLTypeHandlerParams<BelongsToRootObject = null> {
|
|
|
153
158
|
moduleType: ImportLineMeta['moduleType'];
|
|
154
159
|
typeString: string;
|
|
155
160
|
};
|
|
161
|
+
generatedTypesFileMeta: GeneratedTypesFileMeta;
|
|
156
162
|
}
|
|
157
163
|
export type GraphQLTypeHandler<BelongsToRootObject = null, ExtraParams = Record<string, unknown>> = (params: GraphQLTypeHandlerParams<BelongsToRootObject> & ExtraParams, ctx: GenerateResolverFilesContext) => void;
|
|
158
164
|
export {};
|
|
@@ -30,6 +30,7 @@ const visitNamedType = ({ moduleName, relativePathFromBaseToModule, normalizedRe
|
|
|
30
30
|
typeNamedImport: typeNamedImport(ctx.config.generatedTypesFileMeta),
|
|
31
31
|
typeString: typeString(ctx.config.generatedTypesFileMeta),
|
|
32
32
|
},
|
|
33
|
+
generatedTypesFileMeta: ctx.config.generatedTypesFileMeta,
|
|
33
34
|
}, ctx);
|
|
34
35
|
};
|
|
35
36
|
exports.visitNamedType = visitNamedType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"visitNamedType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/visitNamedType.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AAGjE,MAAM,cAAc,GAAG,CAC5B,EACE,UAAU,EACV,4BAA4B,EAC5B,sBAAsB,EACtB,YAAY,EACZ,+BAA+B,EAC/B,eAAe,EACf,UAAU,EACV,mBAAmB,EACnB,OAAO,GAIR,EACD,GAAiC,EAC3B,EAAE;IACR,MAAM,8BAA8B,GAClC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,8BAA8B,EAAE,CAAC;QACnC,IAAA,qDAAyB,EACvB;YACE,UAAU;YACV,4BAA4B;YAC5B,sBAAsB,EAAE,sBAAsB,CAAC,IAAI;YACnD,kBAAkB,EAAE,8BAA8B;SACnD,EACD,GAAG,CACJ,CAAC;QAEF,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,mDAAmD,YAAY,CAAC,IAAI,WAAW,YAAY,CAAC,IAAI,EAAE,CACnG,CAAC;IACJ,CAAC;IAED,OAAO,CACL;QACE,mBAAmB;QACnB,aAAa,EAAE,YAAY,CAAC,IAAI;QAChC,yBAAyB,EAAE,YAAY,CAAC,cAAc;QACtD,UAAU;QACV,sBAAsB;QACtB,4BAA4B;QAC5B,YAAY,EAAE,YAAY,CAAC,IAAI;QAC/B,iBAAiB,EAAE;YACjB,MAAM,EAAE,+BAA+B;YACvC,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;YACnE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;SAC1D;
|
|
1
|
+
{"version":3,"file":"visitNamedType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/visitNamedType.ts"],"names":[],"mappings":";;;AACA,2EAAwE;AAGjE,MAAM,cAAc,GAAG,CAC5B,EACE,UAAU,EACV,4BAA4B,EAC5B,sBAAsB,EACtB,YAAY,EACZ,+BAA+B,EAC/B,eAAe,EACf,UAAU,EACV,mBAAmB,EACnB,OAAO,GAIR,EACD,GAAiC,EAC3B,EAAE;IACR,MAAM,8BAA8B,GAClC,GAAG,CAAC,MAAM,CAAC,kBAAkB,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,8BAA8B,EAAE,CAAC;QACnC,IAAA,qDAAyB,EACvB;YACE,UAAU;YACV,4BAA4B;YAC5B,sBAAsB,EAAE,sBAAsB,CAAC,IAAI;YACnD,kBAAkB,EAAE,8BAA8B;SACnD,EACD,GAAG,CACJ,CAAC;QAEF,OAAO;IACT,CAAC;IAED,IAAI,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACxC,MAAM,IAAI,KAAK,CACb,mDAAmD,YAAY,CAAC,IAAI,WAAW,YAAY,CAAC,IAAI,EAAE,CACnG,CAAC;IACJ,CAAC;IAED,OAAO,CACL;QACE,mBAAmB;QACnB,aAAa,EAAE,YAAY,CAAC,IAAI;QAChC,yBAAyB,EAAE,YAAY,CAAC,cAAc;QACtD,UAAU;QACV,sBAAsB;QACtB,4BAA4B;QAC5B,YAAY,EAAE,YAAY,CAAC,IAAI;QAC/B,iBAAiB,EAAE;YACjB,MAAM,EAAE,+BAA+B;YACvC,UAAU,EAAE,MAAM;YAClB,eAAe,EAAE,eAAe,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;YACnE,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,sBAAsB,CAAC;SAC1D;QACD,sBAAsB,EAAE,GAAG,CAAC,MAAM,CAAC,sBAAsB;KAC1D,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AA1DW,QAAA,cAAc,kBA0DzB"}
|
|
@@ -46,6 +46,12 @@ const generateTypeDefsFiles = ({ baseOutputDir, typeDefsFilePath, typeDefsFileMo
|
|
|
46
46
|
Object.entries(filesContent).forEach(([filePath, content]) => {
|
|
47
47
|
result[filePath] = {
|
|
48
48
|
__filetype: 'file',
|
|
49
|
+
// TODO: this is virtual so it will always re-generate
|
|
50
|
+
// In the future, if no schema file changes, then we don't need to re-generate this file
|
|
51
|
+
filesystem: {
|
|
52
|
+
type: 'virtual',
|
|
53
|
+
contentUpdated: false,
|
|
54
|
+
},
|
|
49
55
|
content: (0, generateTypeDefsContent_1.generateTypeDefsContent)({ mergedSDL: content }),
|
|
50
56
|
mainImportIdentifier: 'typeDefs',
|
|
51
57
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateTypeDefsFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsFiles/generateTypeDefsFiles.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAG7B,oCAAoD;AAEpD,uEAAoE;AAW7D,MAAM,qBAAqB,GAAG,CAAC,EACpC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GACU,EAAgC,EAAE;IAC9D,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACtE,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC;YACxC,UAAU;YACV,kBAAkB;YAClB,kBAAkB;SACnB,CAAC,CAAC;QAEH,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAClC,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,mBAAmB,EAAE,CAAC;YAC9D,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACpD,sFAAsF;YACtF,2CAA2C;YAC3C,mFAAmF;YACnF,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAA,WAAG,GAAE,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;YACzE,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;gBAClE,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAiC,EAAE,CAAC;IAChD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE;QAC3D,MAAM,CAAC,QAAQ,CAAC,GAAG;YACjB,UAAU,EAAE,MAAM;YAClB,OAAO,EAAE,IAAA,iDAAuB,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;YACxD,oBAAoB,EAAE,UAAU;SACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generateTypeDefsFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsFiles/generateTypeDefsFiles.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAG7B,oCAAoD;AAEpD,uEAAoE;AAW7D,MAAM,qBAAqB,GAAG,CAAC,EACpC,aAAa,EACb,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GACU,EAAgC,EAAE;IAC9D,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QACtE,MAAM,aAAa,GAAG,IAAA,2BAAmB,EAAC;YACxC,UAAU;YACV,kBAAkB;YAClB,kBAAkB;SACnB,CAAC,CAAC;QAEH,IAAI,gBAAgB,KAAK,QAAQ,EAAE,CAAC;YAClC,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,mBAAmB,EAAE,CAAC;YAC9D,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC;gBAC1D,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACpD,sFAAsF;YACtF,2CAA2C;YAC3C,mFAAmF;YACnF,MAAM,qBAAqB,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAA,WAAG,GAAE,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;YACzE,eAAe,CAAC;gBACd,YAAY;gBACZ,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;gBAClE,MAAM,EAAE,MAAM,CAAC,MAAM;aACtB,CAAC,CAAC;YACH,OAAO;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAiC,EAAE,CAAC;IAChD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE;QAC3D,MAAM,CAAC,QAAQ,CAAC,GAAG;YACjB,UAAU,EAAE,MAAM;YAClB,sDAAsD;YACtD,wFAAwF;YACxF,UAAU,EAAE;gBACV,IAAI,EAAE,SAAS;gBACf,cAAc,EAAE,KAAK;aACtB;YACD,OAAO,EAAE,IAAA,iDAAuB,EAAC,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC;YACxD,oBAAoB,EAAE,UAAU;SACjC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAhEW,QAAA,qBAAqB,yBAgEhC;AAEF,MAAM,eAAe,GAAG,CAAC,EACvB,MAAM,EACN,QAAQ,EACR,YAAY,GAKb,EAAQ,EAAE;IACT,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;IAC9B,CAAC;IACD,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC;AAC1C,CAAC,CAAC"}
|
|
@@ -16,7 +16,6 @@ interface ParseGraphQLSchemaParams {
|
|
|
16
16
|
resolverRelativeTargetDir: string;
|
|
17
17
|
whitelistedModules: ParsedPresetConfig['whitelistedModules'];
|
|
18
18
|
blacklistedModules: ParsedPresetConfig['blacklistedModules'];
|
|
19
|
-
federationEnabled: boolean;
|
|
20
19
|
}
|
|
21
20
|
export interface ResolverDetails {
|
|
22
21
|
schemaType: string;
|
|
@@ -34,7 +33,6 @@ export interface ResolverDetails {
|
|
|
34
33
|
}
|
|
35
34
|
type ObjectResolverDetails = ResolverDetails & {
|
|
36
35
|
fieldsToPick: string[];
|
|
37
|
-
pickReferenceResolver: boolean;
|
|
38
36
|
};
|
|
39
37
|
type EnumResolverDetails = ResolverDetails & {
|
|
40
38
|
allowedValues: string[];
|
|
@@ -62,5 +60,5 @@ export interface ParsedGraphQLSchemaMeta {
|
|
|
62
60
|
defaultTypeMappers: Record<string, string>;
|
|
63
61
|
};
|
|
64
62
|
}
|
|
65
|
-
export declare const parseGraphQLSchema: ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules,
|
|
63
|
+
export declare const parseGraphQLSchema: ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules, }: ParseGraphQLSchemaParams) => Promise<ParsedGraphQLSchemaMeta>;
|
|
66
64
|
export {};
|
|
@@ -8,7 +8,7 @@ const graphql_1 = require("graphql");
|
|
|
8
8
|
const utils_1 = require("../utils");
|
|
9
9
|
const parseLocationForOutputDir_1 = require("./parseLocationForOutputDir");
|
|
10
10
|
const normalizeResolverName_1 = require("./normalizeResolverName");
|
|
11
|
-
const parseGraphQLSchema = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules,
|
|
11
|
+
const parseGraphQLSchema = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules, }) {
|
|
12
12
|
const scalarsModuleResolverMap = scalarsModule
|
|
13
13
|
? yield getScalarResolverMapFromModule(scalarsModule)
|
|
14
14
|
: {};
|
|
@@ -69,7 +69,6 @@ const parseGraphQLSchema = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, funct
|
|
|
69
69
|
baseOutputDir,
|
|
70
70
|
blacklistedModules,
|
|
71
71
|
whitelistedModules,
|
|
72
|
-
federationEnabled,
|
|
73
72
|
namedType,
|
|
74
73
|
schemaType,
|
|
75
74
|
result: res,
|
|
@@ -188,8 +187,7 @@ const handleNativeScalarType = ({ schemaType, result, scalarsOverrides, }) => {
|
|
|
188
187
|
result.pluginsConfig.defaultScalarTypesMap[schemaType] = override.type;
|
|
189
188
|
}
|
|
190
189
|
};
|
|
191
|
-
const handleObjectType = ({ mode, sourceMap, resolverTypesPath, resolverRelativeTargetDir, baseOutputDir, blacklistedModules, whitelistedModules,
|
|
192
|
-
var _a;
|
|
190
|
+
const handleObjectType = ({ mode, sourceMap, resolverTypesPath, resolverRelativeTargetDir, baseOutputDir, blacklistedModules, whitelistedModules, namedType, schemaType, result, }) => {
|
|
193
191
|
// parse for details
|
|
194
192
|
const fieldsByGraphQLModule = Object.entries(namedType.getFields()).reduce((res, [_, fieldNode]) => {
|
|
195
193
|
var _a;
|
|
@@ -207,10 +205,6 @@ const handleObjectType = ({ mode, sourceMap, resolverTypesPath, resolverRelative
|
|
|
207
205
|
res[modulePath].fieldNodes.push(fieldNode);
|
|
208
206
|
return res;
|
|
209
207
|
}, {});
|
|
210
|
-
let pickReferenceResolver = false;
|
|
211
|
-
if (federationEnabled && ((_a = namedType.astNode) === null || _a === void 0 ? void 0 : _a.directives)) {
|
|
212
|
-
pickReferenceResolver = namedType.astNode.directives.some((d) => d.name.value === 'key');
|
|
213
|
-
}
|
|
214
208
|
result.userDefinedSchemaTypeMap.object[schemaType] =
|
|
215
209
|
result.userDefinedSchemaTypeMap.object[schemaType] || {};
|
|
216
210
|
Object.entries(fieldsByGraphQLModule).forEach(([_modulePath, { firstFieldLocation, fieldNodes }], _index, graphQLModules) => {
|
|
@@ -237,8 +231,7 @@ const handleObjectType = ({ mode, sourceMap, resolverTypesPath, resolverRelative
|
|
|
237
231
|
//
|
|
238
232
|
// If there's only one module, we return an empty array i.e. pick all fields
|
|
239
233
|
const fieldsToPick = graphQLModules.length > 1 ? fieldNodes.map((field) => field.name) : [];
|
|
240
|
-
result.userDefinedSchemaTypeMap.object[schemaType][resolverDetails.normalizedResolverName.withModule] = Object.assign(Object.assign({}, resolverDetails), { fieldsToPick
|
|
241
|
-
pickReferenceResolver });
|
|
234
|
+
result.userDefinedSchemaTypeMap.object[schemaType][resolverDetails.normalizedResolverName.withModule] = Object.assign(Object.assign({}, resolverDetails), { fieldsToPick });
|
|
242
235
|
});
|
|
243
236
|
};
|
|
244
237
|
const createResolverDetails = ({ belongsToRootObject, mode, sourceMap, resolverRelativeTargetDir, resolverTypesPath, baseOutputDir, blacklistedModules, whitelistedModules, schemaType, nestedDirs, location, resolverName, }) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseGraphQLSchema.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseGraphQLSchema/parseGraphQLSchema.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,+CAAyB;AACzB,qCAYiB;AAOjB,oCAMkB;AAClB,2EAAwE;AACxE,mEAAgE;
|
|
1
|
+
{"version":3,"file":"parseGraphQLSchema.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseGraphQLSchema/parseGraphQLSchema.ts"],"names":[],"mappings":"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"}
|
package/src/preset.js
CHANGED
|
@@ -20,6 +20,7 @@ const parseTypeMappers_1 = require("./parseTypeMappers");
|
|
|
20
20
|
const validatePresetConfig_1 = require("./validatePresetConfig");
|
|
21
21
|
const validateAndMergeParsedConfigs_1 = require("./validateAndMergeParsedConfigs");
|
|
22
22
|
const normalizeAddConfigPath_1 = require("./normalizeAddConfigPath");
|
|
23
|
+
const utils_1 = require("./utils");
|
|
23
24
|
exports.presetName = '@eddeee888/gcg-typescript-resolver-files';
|
|
24
25
|
exports.preset = {
|
|
25
26
|
buildGeneratesSection: (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ schema, schemaAst, presetConfig: rawPresetConfig, baseOutputDir, profiler = (0, plugin_helpers_1.createNoopProfiler)(), }) {
|
|
@@ -47,7 +48,6 @@ exports.preset = {
|
|
|
47
48
|
});
|
|
48
49
|
}), createProfilerRunName('parseTypeMappers'));
|
|
49
50
|
const generatesSection = [];
|
|
50
|
-
const federationEnabled = Boolean(typesPluginsConfig.federation);
|
|
51
51
|
const parsedGraphQLSchemaMeta = yield profiler.run(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
52
52
|
return (0, parseGraphQLSchema_1.parseGraphQLSchema)({
|
|
53
53
|
schemaAst,
|
|
@@ -61,7 +61,6 @@ exports.preset = {
|
|
|
61
61
|
resolverRelativeTargetDir,
|
|
62
62
|
whitelistedModules,
|
|
63
63
|
blacklistedModules,
|
|
64
|
-
federationEnabled,
|
|
65
64
|
});
|
|
66
65
|
}), createProfilerRunName('parseGraphQLSchema'));
|
|
67
66
|
const mergedConfig = (0, validateAndMergeParsedConfigs_1.validateAndMergeParsedConfigs)({
|
|
@@ -72,7 +71,9 @@ exports.preset = {
|
|
|
72
71
|
const resolverTypesConfig = (0, gcg_server_config_1.defineConfig)(Object.assign(Object.assign({ optionalResolveType: true, resolversNonOptionalTypename: {
|
|
73
72
|
unionMember: true,
|
|
74
73
|
interfaceImplementingType: true,
|
|
75
|
-
}, namingConvention: 'keep', emitLegacyCommonJSImports
|
|
74
|
+
}, namingConvention: 'keep', emitLegacyCommonJSImports, generateInternalResolversIfNeeded: {
|
|
75
|
+
__resolveReference: true,
|
|
76
|
+
} }, typesPluginsConfig), { scalars: mergedConfig.scalarTypes, mappers: Object.assign(Object.assign({}, mergedConfig.typeMappers), typesPluginsConfig.mappers) }));
|
|
76
77
|
// typesSourceFile is the virtual `types.generated.ts`
|
|
77
78
|
// This is useful when we need to do static analysis as most types come from this file
|
|
78
79
|
// e.g. comparing mappers field type vs schema object field type
|
|
@@ -177,14 +178,27 @@ exports.preset = {
|
|
|
177
178
|
result,
|
|
178
179
|
});
|
|
179
180
|
}), createProfilerRunName('generateResolverFiles'));
|
|
180
|
-
const
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
181
|
+
const resultFilesArray = Object.entries(result.files);
|
|
182
|
+
const resolverFilesGenerateOptions = resultFilesArray
|
|
183
|
+
.filter(([_, file]) => {
|
|
184
|
+
// Only generate files that are:
|
|
185
|
+
// 1. `virtual` - because file doesn't exist yet
|
|
186
|
+
// 2. on `filesystem` and with `contentUpdated` - because file content has been updated, so we want to apply the changes
|
|
187
|
+
return (file.filesystem.type === 'virtual' ||
|
|
188
|
+
(file.filesystem.type === 'filesystem' &&
|
|
189
|
+
file.filesystem.contentUpdated === true));
|
|
190
|
+
})
|
|
191
|
+
.map(([filename, { content }]) => {
|
|
192
|
+
return {
|
|
193
|
+
filename,
|
|
194
|
+
pluginMap: { add: addPlugin },
|
|
195
|
+
plugins: [{ add: { content } }],
|
|
196
|
+
config: {},
|
|
197
|
+
schema,
|
|
198
|
+
documents: [],
|
|
199
|
+
};
|
|
200
|
+
});
|
|
201
|
+
utils_1.logger.debug(`Applying changes to ${resolverFilesGenerateOptions.length}/${resultFilesArray.length} files. (${resultFilesArray.length - resolverFilesGenerateOptions.length} skipped files because they are already on filesystem and are not updated)`);
|
|
188
202
|
return [...resolverFilesGenerateOptions, ...generatesSection];
|
|
189
203
|
}),
|
|
190
204
|
};
|
package/src/preset.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/preset.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,wEAAkD;AAClD,qFAA+D;AAC/D,sFAAgE;AAChE,yGAAmF;AACnF,oEAGyC;AACzC,uCAAmC;AACnC,oEAAkF;AAClF,iDAA8C;AAC9C,6DAA0D;AAC1D,mEAGiC;AACjC,mEAAgE;AAChE,uGAAoG;AACpG,+FAA4F;AAC5F,yDAAsD;AACtD,iEAGgC;AAChC,mFAAgF;AAChF,qEAAkE;
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/preset.ts"],"names":[],"mappings":"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"}
|
|
@@ -120,9 +120,6 @@ const validateTypesPluginsConfig = (config) => {
|
|
|
120
120
|
if ('emitLegacyCommonJSImports' in config) {
|
|
121
121
|
throw new Error(utils_1.fmt.error('presetConfig.typesPluginsConfig.emitLegacyCommonJSImports is not supported. Use presetConfig.emitLegacyCommonJSImports instead.', 'Validation'));
|
|
122
122
|
}
|
|
123
|
-
if ('namingConvention' in config) {
|
|
124
|
-
console.warn(utils_1.fmt.warn("presetConfig.typesPluginsConfig.namingConvention is not fully supported. The default is `namingConvention: 'keep'`. Change at your own risk."));
|
|
125
|
-
}
|
|
126
123
|
const { scalars: _, emitLegacyCommonJSImports: __ } = config, rest = tslib_1.__rest(config, ["scalars", "emitLegacyCommonJSImports"]);
|
|
127
124
|
return rest;
|
|
128
125
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":"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"}
|