@eddeee888/gcg-typescript-resolver-files 0.9.2 → 0.9.4
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 +1 -1
- package/src/generateResolverFiles/addResolverMainFiles.js +3 -1
- package/src/generateResolverFiles/addResolverMainFiles.js.map +1 -1
- package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.d.ts +1 -0
- package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.js +9 -3
- package/src/generateResolverFiles/getVariableStatementWithExpectedIdentifier.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLInterfaceType.js +1 -1
- package/src/generateResolverFiles/handleGraphQLInterfaceType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLScalarType.js +1 -1
- package/src/generateResolverFiles/handleGraphQLScalarType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLUnionType.js +1 -1
- package/src/generateResolverFiles/handleGraphQLUnionType.js.map +1 -1
- package/src/generateResolverFiles/postProcessFiles.js +28 -3
- package/src/generateResolverFiles/postProcessFiles.js.map +1 -1
- package/src/generateResolverFiles/types.d.ts +31 -3
- package/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.js +9 -0
- package/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.js.map +1 -1
package/package.json
CHANGED
|
@@ -44,7 +44,9 @@ const addResolverMainFiles = ({ config: { baseOutputDir, resolverTypesPath, reso
|
|
|
44
44
|
};
|
|
45
45
|
// Non Root Object fields that was generated
|
|
46
46
|
if (file.__filetype === 'objectType' ||
|
|
47
|
-
file.__filetype === '
|
|
47
|
+
file.__filetype === 'interfaceResolver' ||
|
|
48
|
+
file.__filetype === 'unionResolver' ||
|
|
49
|
+
file.__filetype === 'scalarResolver') {
|
|
48
50
|
res[resolverMainFilename].importLines.push((0, utils_1.printImportLine)({
|
|
49
51
|
isTypeImport: false,
|
|
50
52
|
module: (0, utils_1.relativeModulePath)(outputDir, filepath),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addResolverMainFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFiles.ts"],"names":[],"mappings":";;;;AAAA,mDAA6B;AAC7B,oCAKkB;AAUlB,MAAM,wBAAwB,GAAG,GAAgB,EAAE,CAAC,CAAC;IACnD,WAAW,EAAE,EAAE;IACf,WAAW,EAAE,EAAE;IACf,cAAc,EAAE,EAAE;IAClB,kBAAkB,EAAE,EAAE;IACtB,WAAW,EAAE,EAAE;CAChB,CAAC,CAAC;AAEH;;;;;;;GAOG;AACI,MAAM,oBAAoB,GAAG,CAAC,EACnC,MAAM,EAAE,EACN,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,EACpB,yBAAyB,GAC1B,EACD,MAAM,GACuB,EAAQ,EAAE;IACvC,MAAM,mBAAmB,GAAG,yBAAyB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAE3D,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,EAAE;QAC1B,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC;QACb,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC;QAEtB,sHAAsH;QACtH,MAAM,oBAAoB,GACxB,oBAAoB,KAAK,SAAS;YAChC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CACb,aAAa,EACb,GAAG,IAAI,CAAC,4BAA4B,EACpC,gBAAgB,CACjB;YACH,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QAEvD,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE,CAAC;YAC/B,GAAG,CAAC,oBAAoB,CAAC,GAAG,wBAAwB,EAAE,CAAC;QACzD,CAAC;QAED,MAAM,kBAAkB,GAAG,4CAA4C,CACrE,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,IAAI,CACtC,CAAC;QACF,MAAM,cAAc,GAClB,mBAAmB,CAAC,kBAAkB,CAAC,GAAG,CAAC;YACzC,CAAC,CAAC,4CAA4C,CAC1C,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAC5C;YACH,CAAC,CAAC,kBAAkB,CAAC;QAEzB,MAAM,YAAY,GAAuB;YACvC,YAAY,EAAE,IAAI,CAAC,oBAAoB;YACvC,cAAc;SACf,CAAC;QAEF,4CAA4C;QAC5C,IACE,IAAI,CAAC,UAAU,KAAK,YAAY;YAChC,IAAI,CAAC,UAAU,KAAK,
|
|
1
|
+
{"version":3,"file":"addResolverMainFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,4 +3,5 @@ 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;
|
|
6
7
|
};
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getVariableStatementWithExpectedIdentifier = void 0;
|
|
4
4
|
const getVariableStatementWithExpectedIdentifier = (sourceFile, resolverFile) => {
|
|
5
|
-
var _a
|
|
5
|
+
var _a;
|
|
6
6
|
let isExported = false;
|
|
7
|
+
let ensureCorrectResolverType = undefined;
|
|
7
8
|
const variableStatementWithExpectedIdentifier = sourceFile.getVariableStatement((statement) => {
|
|
8
9
|
let hasExpectedIdentifier = false;
|
|
9
10
|
statement
|
|
@@ -28,13 +29,18 @@ const getVariableStatementWithExpectedIdentifier = (sourceFile, resolverFile) =>
|
|
|
28
29
|
*/
|
|
29
30
|
if (variableStatementWithExpectedIdentifier &&
|
|
30
31
|
((_a = resolverFile.meta.resolverType) === null || _a === void 0 ? void 0 : _a.final)) {
|
|
31
|
-
|
|
32
|
+
const variableDeclaration = variableStatementWithExpectedIdentifier
|
|
32
33
|
.getDeclarationList()
|
|
33
|
-
.getDeclarations()[0]
|
|
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);
|
|
34
39
|
}
|
|
35
40
|
return {
|
|
36
41
|
variableStatement: variableStatementWithExpectedIdentifier,
|
|
37
42
|
isExported,
|
|
43
|
+
ensureCorrectResolverType,
|
|
38
44
|
};
|
|
39
45
|
};
|
|
40
46
|
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,EAK1B,EAAE;;IACF,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,IAAI,yBAAyB,GAA6B,SAAS,CAAC;IAEpE,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;;;;;;OAMG;IACH,IACE,uCAAuC;SACvC,MAAA,YAAY,CAAC,IAAI,CAAC,YAAY,0CAAE,KAAK,CAAA,EACrC,CAAC;QACD,MAAM,mBAAmB,GAAG,uCAAuC;aAChE,kBAAkB,EAAE;aACpB,eAAe,EAAE,CAAC,CAAC,CAAC,CAAC;QACxB,MAAM,QAAQ,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,WAAW,EAAE,CAAC;QAEpD,yBAAyB,GAAG,QAAQ;YAClC,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;YACtE,CAAC,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAC9E,CAAC;IAED,OAAO;QACL,iBAAiB,EAAE,uCAAuC;QAC1D,UAAU;QACV,yBAAyB;KAC1B,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,0CAA0C,8CAsDrD"}
|
|
@@ -21,7 +21,7 @@ const handleGraphQLInterfaceType = ({ fieldFilePath, isFileAlreadyOnFilesystem,
|
|
|
21
21
|
});
|
|
22
22
|
const variableStatement = `export const ${resolverName}: ${resolverTypeString} = { /* Implement ${resolverName} interface logic here */ };`;
|
|
23
23
|
result.files[fieldFilePath] = {
|
|
24
|
-
__filetype: '
|
|
24
|
+
__filetype: 'interfaceResolver',
|
|
25
25
|
content: `
|
|
26
26
|
${resolverTypeImportDeclaration}
|
|
27
27
|
${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,
|
|
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;AAtDW,QAAA,0BAA0B,8BAsDrC"}
|
|
@@ -33,7 +33,7 @@ const handleGraphQLScalarType = ({ fieldFilePath, isFileAlreadyOnFilesystem, res
|
|
|
33
33
|
},
|
|
34
34
|
});`;
|
|
35
35
|
result.files[fieldFilePath] = {
|
|
36
|
-
__filetype: '
|
|
36
|
+
__filetype: 'scalarResolver',
|
|
37
37
|
content: `
|
|
38
38
|
${resolverTypeImportDeclaration}
|
|
39
39
|
${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,
|
|
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;AA/DW,QAAA,uBAAuB,2BA+DlC"}
|
|
@@ -20,7 +20,7 @@ const handleGraphQLUnionType = ({ fieldFilePath, isFileAlreadyOnFilesystem, reso
|
|
|
20
20
|
});
|
|
21
21
|
const variableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = { /* Implement ${resolverName} union logic here */ };`;
|
|
22
22
|
result.files[fieldFilePath] = {
|
|
23
|
-
__filetype: '
|
|
23
|
+
__filetype: 'unionResolver',
|
|
24
24
|
content: `
|
|
25
25
|
${resolverTypeImportDeclaration}
|
|
26
26
|
${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,
|
|
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;AApDW,QAAA,sBAAsB,0BAoDjC"}
|
|
@@ -38,8 +38,21 @@ const postProcessFiles = ({ config: { tsMorph: { project }, fixObjectTypeResolve
|
|
|
38
38
|
});
|
|
39
39
|
sourceFilesToProcess.forEach(({ sourceFile, resolverFile }) => {
|
|
40
40
|
const normalizedRelativePath = path.posix.relative((0, utils_1.cwd)(), sourceFile.getFilePath());
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const { addedVariableStatement, ensureCorrectResolverType } = ensureExportedResolver(sourceFile, resolverFile);
|
|
42
|
+
// For non-scalarResolver, ensure correct type is imported
|
|
43
|
+
// For scalarResolver, we don't need to add type to the variable statement for a few reasons:
|
|
44
|
+
// - For cases when we need to create a new GraphQLScalarType, it infer the type from `new GraphQLScalarType`
|
|
45
|
+
// - 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
|
|
46
|
+
if (resolverFile.__filetype !== 'scalarResolver' &&
|
|
47
|
+
ensureCorrectResolverType) {
|
|
48
|
+
ensureCorrectResolverType();
|
|
49
|
+
}
|
|
50
|
+
if (resolverFile.__filetype !== 'scalarResolver' ||
|
|
51
|
+
// For scalarResolver, only add `import { GraphQLScalarType } ...` if variable statement was added.
|
|
52
|
+
// This is because user could have used custom scalar. If so, we don't want to add unnecessary import
|
|
53
|
+
(resolverFile.__filetype === 'scalarResolver' && addedVariableStatement)) {
|
|
54
|
+
ensureImportedType(sourceFile, resolverFile);
|
|
55
|
+
}
|
|
43
56
|
if (fixObjectTypeResolvers === 'smart' &&
|
|
44
57
|
resolverFile.__filetype === 'objectType') {
|
|
45
58
|
(0, ensureObjectTypeResolversAreGenerated_1.ensureObjectTypeResolversAreGenerated)(sourceFile, resolverFile);
|
|
@@ -53,10 +66,14 @@ exports.postProcessFiles = postProcessFiles;
|
|
|
53
66
|
* Ensure correctly named resolvers are exported
|
|
54
67
|
*/
|
|
55
68
|
const ensureExportedResolver = (sourceFile, resolverFile) => {
|
|
56
|
-
const { variableStatement, isExported } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
|
|
69
|
+
const { variableStatement, isExported, ensureCorrectResolverType } = (0, getVariableStatementWithExpectedIdentifier_1.getVariableStatementWithExpectedIdentifier)(sourceFile, resolverFile);
|
|
57
70
|
if (!variableStatement) {
|
|
58
71
|
// Did not find variable statement with expected identifier, add it to the end with a warning
|
|
59
72
|
sourceFile.addStatements(resolverFile.meta.variableStatement);
|
|
73
|
+
return {
|
|
74
|
+
addedVariableStatement: true,
|
|
75
|
+
ensureCorrectResolverType,
|
|
76
|
+
};
|
|
60
77
|
}
|
|
61
78
|
else if (variableStatement && !isExported) {
|
|
62
79
|
// If has identifier but not exported
|
|
@@ -68,7 +85,15 @@ const ensureExportedResolver = (sourceFile, resolverFile) => {
|
|
|
68
85
|
variableStatement.setIsExported(true);
|
|
69
86
|
}
|
|
70
87
|
// else, if identifier's been exported do nothing
|
|
88
|
+
return {
|
|
89
|
+
addedVariableStatement: false,
|
|
90
|
+
ensureCorrectResolverType,
|
|
91
|
+
};
|
|
71
92
|
}
|
|
93
|
+
return {
|
|
94
|
+
addedVariableStatement: false,
|
|
95
|
+
ensureCorrectResolverType,
|
|
96
|
+
};
|
|
72
97
|
};
|
|
73
98
|
/**
|
|
74
99
|
* Ensure correctly imported resolves type generated by typescript-resolvers plugin
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"postProcessFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/postProcessFiles.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,8 +13,36 @@ interface BaseVirtualFile {
|
|
|
13
13
|
export interface StandardFile extends BaseVirtualFile {
|
|
14
14
|
__filetype: 'file';
|
|
15
15
|
}
|
|
16
|
-
export interface
|
|
17
|
-
__filetype: '
|
|
16
|
+
export interface InterfacelResolverFile extends BaseVirtualFile {
|
|
17
|
+
__filetype: 'interfaceResolver';
|
|
18
|
+
meta: {
|
|
19
|
+
moduleName: string;
|
|
20
|
+
relativePathFromBaseToModule: string[];
|
|
21
|
+
resolverTypeImportDeclaration: string;
|
|
22
|
+
variableStatement: string;
|
|
23
|
+
resolverType: {
|
|
24
|
+
baseImport: string;
|
|
25
|
+
final: string;
|
|
26
|
+
};
|
|
27
|
+
normalizedResolverName: NormalizedResolverName;
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
export interface UnionResolverFile extends BaseVirtualFile {
|
|
31
|
+
__filetype: 'unionResolver';
|
|
32
|
+
meta: {
|
|
33
|
+
moduleName: string;
|
|
34
|
+
relativePathFromBaseToModule: string[];
|
|
35
|
+
resolverTypeImportDeclaration: string;
|
|
36
|
+
variableStatement: string;
|
|
37
|
+
resolverType: {
|
|
38
|
+
baseImport: string;
|
|
39
|
+
final: string;
|
|
40
|
+
};
|
|
41
|
+
normalizedResolverName: NormalizedResolverName;
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
export interface ScalarResolverFile extends BaseVirtualFile {
|
|
45
|
+
__filetype: 'scalarResolver';
|
|
18
46
|
meta: {
|
|
19
47
|
moduleName: string;
|
|
20
48
|
relativePathFromBaseToModule: string[];
|
|
@@ -58,7 +86,7 @@ export interface ObjectTypeFile extends BaseVirtualFile {
|
|
|
58
86
|
resolversToGenerate?: GraphQLObjectTypeResolversToGenerate[number];
|
|
59
87
|
};
|
|
60
88
|
}
|
|
61
|
-
export type ResolverFile =
|
|
89
|
+
export type ResolverFile = RootObjectTypeFieldResolverFile | ObjectTypeFile | InterfacelResolverFile | UnionResolverFile | ScalarResolverFile;
|
|
62
90
|
export interface GenerateResolverFilesContext {
|
|
63
91
|
config: {
|
|
64
92
|
baseOutputDir: string;
|
|
@@ -8,6 +8,15 @@ const utils_1 = require("../utils");
|
|
|
8
8
|
* - scalarsOverrides must be used over externalResolvers to override scalars
|
|
9
9
|
*/
|
|
10
10
|
const validateAndMergeParsedConfigs = ({ externalResolvers, parsedGraphQLSchemaMeta: { userDefinedSchemaTypeMap, pluginsConfig: { defaultScalarExternalResolvers, defaultScalarTypesMap, defaultTypeMappers, }, }, }) => {
|
|
11
|
+
Object.keys(defaultScalarExternalResolvers).forEach((schemaType) => {
|
|
12
|
+
var _a;
|
|
13
|
+
if (
|
|
14
|
+
// If the scalar is defined on the filesystem, it means user wants to use their custom definition.
|
|
15
|
+
// This means we should use it, instead of importing it from scalar module
|
|
16
|
+
(_a = userDefinedSchemaTypeMap.scalar[schemaType]) === null || _a === void 0 ? void 0 : _a.resolverFile.isOnFilesystem) {
|
|
17
|
+
delete defaultScalarExternalResolvers[schemaType];
|
|
18
|
+
}
|
|
19
|
+
});
|
|
11
20
|
Object.keys(externalResolvers).forEach((schemaType) => {
|
|
12
21
|
if (userDefinedSchemaTypeMap.scalar[schemaType]) {
|
|
13
22
|
throw new Error(utils_1.fmt.error(`Scalar "${schemaType}" found in presetConfig.externalResolvers. Use presetConfig.scalarsOverrides to override scalar implementation and type. Remove "${schemaType}" from presetConfig.externalResolvers.`, 'Validation'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAndMergeParsedConfigs.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.ts"],"names":[],"mappings":";;;AAKA,oCAA+B;AAS/B;;;;GAIG;AACI,MAAM,6BAA6B,GAAG,CAAC,EAC5C,iBAAiB,EACjB,uBAAuB,EAAE,EACvB,wBAAwB,EACxB,aAAa,EAAE,EACb,8BAA8B,EAC9B,qBAAqB,EACrB,kBAAkB,GACnB,GACF,GAIF,EAAgB,EAAE;IACjB,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACpD,IAAI,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CACb,WAAG,CAAC,KAAK,CACP,WAAW,UAAU,oIAAoI,UAAU,wCAAwC,EAC3M,YAAY,CACb,CACF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,wBAAwB;QACxB,iBAAiB,kCACZ,8BAA8B,GAC9B,iBAAiB,CACrB;QACD,WAAW,oBACN,qBAAqB,CACzB;QACD,WAAW,EAAE,kBAAkB;KAChC,CAAC;AACJ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"validateAndMergeParsedConfigs.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.ts"],"names":[],"mappings":";;;AAKA,oCAA+B;AAS/B;;;;GAIG;AACI,MAAM,6BAA6B,GAAG,CAAC,EAC5C,iBAAiB,EACjB,uBAAuB,EAAE,EACvB,wBAAwB,EACxB,aAAa,EAAE,EACb,8BAA8B,EAC9B,qBAAqB,EACrB,kBAAkB,GACnB,GACF,GAIF,EAAgB,EAAE;IACjB,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;;QACjE;QACE,kGAAkG;QAClG,0EAA0E;QAC1E,MAAA,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,0CAAE,YAAY,CAAC,cAAc,EACxE,CAAC;YACD,OAAO,8BAA8B,CAAC,UAAU,CAAC,CAAC;QACpD,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QACpD,IAAI,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAChD,MAAM,IAAI,KAAK,CACb,WAAG,CAAC,KAAK,CACP,WAAW,UAAU,oIAAoI,UAAU,wCAAwC,EAC3M,YAAY,CACb,CACF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,wBAAwB;QACxB,iBAAiB,kCACZ,8BAA8B,GAC9B,iBAAiB,CACrB;QACD,WAAW,oBACN,qBAAqB,CACzB;QACD,WAAW,EAAE,kBAAkB;KAChC,CAAC;AACJ,CAAC,CAAC;AA9CW,QAAA,6BAA6B,iCA8CxC"}
|