@eddeee888/gcg-typescript-resolver-files 0.10.2 → 0.10.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 +4 -3
- package/src/addVirtualTypesFileToTsMorphProject/addVirtualTypesFileToTsMorphProject.js +7 -7
- package/src/defineConfig.d.ts +3 -3
- package/src/generateResolverFiles/addExternalResolverImport.d.ts +5 -1
- package/src/generateResolverFiles/addExternalResolverImport.js +7 -3
- package/src/generateResolverFiles/addExternalResolverImport.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLObjectType.js +10 -4
- package/src/generateResolverFiles/handleGraphQLObjectType.js.map +1 -1
- package/src/generateResolverFiles/types.d.ts +1 -1
- package/src/generateResolverFiles/visitNamedType.js +3 -5
- package/src/generateResolverFiles/visitNamedType.js.map +1 -1
- package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.d.ts +1 -1
- package/src/parseGraphQLSchema/parseGraphQLSchema.d.ts +2 -1
- package/src/parseGraphQLSchema/parseGraphQLSchema.js +12 -11
- package/src/parseGraphQLSchema/parseGraphQLSchema.js.map +1 -1
- package/src/parseSources/parseSources.d.ts +0 -1
- package/src/parseSources/parseSources.js +1 -2
- package/src/parseSources/parseSources.js.map +1 -1
- package/src/preset.js +2 -2
- package/src/preset.js.map +1 -1
- package/src/utils/fmt.d.ts +1 -1
- package/src/utils/printImportLine.js +1 -2
- package/src/utils/printImportLine.js.map +1 -1
- package/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.d.ts +10 -3
- package/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.js +5 -5
- package/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.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.10.
|
|
3
|
+
"version": "0.10.4",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "https://github.com/eddeee888/graphql-code-generator-plugins.git",
|
|
@@ -43,5 +43,6 @@
|
|
|
43
43
|
"directory": "../../dist/packages/typescript-resolver-files"
|
|
44
44
|
},
|
|
45
45
|
"main": "./src/index.js",
|
|
46
|
-
"type": "commonjs"
|
|
47
|
-
|
|
46
|
+
"type": "commonjs",
|
|
47
|
+
"types": "./src/index.d.ts"
|
|
48
|
+
}
|
|
@@ -20,8 +20,8 @@ exports.addVirtualTypesFileToTsMorphProject = addVirtualTypesFileToTsMorphProjec
|
|
|
20
20
|
* getVirtualTypesFile generates a virtual types.generated.ts file
|
|
21
21
|
* This is used to statically detect and compare types in the parse and post-process steps
|
|
22
22
|
*/
|
|
23
|
-
const generateVirtualTypesFile = (
|
|
24
|
-
var _c, _d, _e, _f
|
|
23
|
+
const generateVirtualTypesFile = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ schemaAst, resolverTypesPath, resolverTypesConfig, addConfig, }) {
|
|
24
|
+
var _b, _c, _d, _e, _f;
|
|
25
25
|
const [typescriptResult, typescriptResolversResult, addResult] = yield Promise.all([
|
|
26
26
|
typeScriptPlugin.plugin(schemaAst, [], resolverTypesConfig),
|
|
27
27
|
typeScriptResolversPlugin.plugin(schemaAst, [], resolverTypesConfig),
|
|
@@ -31,16 +31,16 @@ const generateVirtualTypesFile = (_b) => tslib_1.__awaiter(void 0, [_b], void 0,
|
|
|
31
31
|
return {
|
|
32
32
|
filePath: resolverTypesPath,
|
|
33
33
|
content: `
|
|
34
|
-
${(
|
|
35
|
-
${(
|
|
36
|
-
${(
|
|
34
|
+
${(_b = addResultAsComplextOutput.prepend) === null || _b === void 0 ? void 0 : _b.join('\n')}
|
|
35
|
+
${(_c = typescriptResult.prepend) === null || _c === void 0 ? void 0 : _c.join('\n')}
|
|
36
|
+
${(_d = typescriptResolversResult.prepend) === null || _d === void 0 ? void 0 : _d.join('\n')}
|
|
37
37
|
${typescriptResult.content}
|
|
38
38
|
${typescriptResolversResult.content}
|
|
39
39
|
${addResultAsComplextOutput.content}
|
|
40
|
-
${(
|
|
40
|
+
${(_e = addResultAsComplextOutput.append) === null || _e === void 0 ? void 0 : _e.join('\n')}
|
|
41
41
|
`,
|
|
42
42
|
meta: {
|
|
43
|
-
generatedResolverTypes: ((
|
|
43
|
+
generatedResolverTypes: ((_f = typescriptResolversResult.meta) === null || _f === void 0 ? void 0 : _f.generatedResolverTypes) || {
|
|
44
44
|
resolversMap: { name: 'Resolvers' },
|
|
45
45
|
userDefined: {},
|
|
46
46
|
},
|
package/src/defineConfig.d.ts
CHANGED
|
@@ -2,6 +2,6 @@ import type { Types } from '@graphql-codegen/plugin-helpers';
|
|
|
2
2
|
import type { TypedPresetConfig } from './validatePresetConfig';
|
|
3
3
|
export declare const defineConfig: (presetConfig?: TypedPresetConfig, context?: {
|
|
4
4
|
baseOutputDir?: string;
|
|
5
|
-
schema?: Types.ConfiguredOutput[
|
|
6
|
-
hooks?: Types.ConfiguredOutput[
|
|
7
|
-
}) => Pick<Types.ConfiguredOutput,
|
|
5
|
+
schema?: Types.ConfiguredOutput["schema"];
|
|
6
|
+
hooks?: Types.ConfiguredOutput["hooks"];
|
|
7
|
+
}) => Pick<Types.ConfiguredOutput, "preset" | "presetConfig" | "watchPattern" | "schema" | "hooks">;
|
|
@@ -8,7 +8,11 @@ interface AddExternalResolverImportParams {
|
|
|
8
8
|
/**
|
|
9
9
|
* addExternalResolverImport
|
|
10
10
|
*
|
|
11
|
-
*
|
|
11
|
+
* External resolvers are resolvers that are not managed by server preset:
|
|
12
|
+
* - unmanaged resolvers e.g. using config.externalResolvers or config.scalarsOverrides
|
|
13
|
+
* - resolvers that come from an external module e.g. `graphql-scalars`
|
|
14
|
+
*
|
|
15
|
+
* 1. parse external resolvers (originally from ) import syntax
|
|
12
16
|
* 2. dedupes any duplicated imports
|
|
13
17
|
* 3. declares the which identifier name to use for GraphQL object or resolver in identifierUsages
|
|
14
18
|
*/
|
|
@@ -5,7 +5,11 @@ const utils_1 = require("../utils");
|
|
|
5
5
|
/**
|
|
6
6
|
* addExternalResolverImport
|
|
7
7
|
*
|
|
8
|
-
*
|
|
8
|
+
* External resolvers are resolvers that are not managed by server preset:
|
|
9
|
+
* - unmanaged resolvers e.g. using config.externalResolvers or config.scalarsOverrides
|
|
10
|
+
* - resolvers that come from an external module e.g. `graphql-scalars`
|
|
11
|
+
*
|
|
12
|
+
* 1. parse external resolvers (originally from ) import syntax
|
|
9
13
|
* 2. dedupes any duplicated imports
|
|
10
14
|
* 3. declares the which identifier name to use for GraphQL object or resolver in identifierUsages
|
|
11
15
|
*/
|
|
@@ -14,7 +18,7 @@ const addExternalResolverImport = (params, { result, config: { emitLegacyCommonJ
|
|
|
14
18
|
let shouldPushIndentifierUsages = false;
|
|
15
19
|
result.externalImports[moduleImport] =
|
|
16
20
|
result.externalImports[moduleImport] ||
|
|
17
|
-
|
|
21
|
+
{
|
|
18
22
|
moduleName: params.moduleName,
|
|
19
23
|
relativePathFromBaseToModule: params.relativePathFromBaseToModule,
|
|
20
24
|
importLineMeta: {
|
|
@@ -26,7 +30,7 @@ const addExternalResolverImport = (params, { result, config: { emitLegacyCommonJ
|
|
|
26
30
|
emitLegacyCommonJSImports,
|
|
27
31
|
},
|
|
28
32
|
identifierUsages: [],
|
|
29
|
-
}
|
|
33
|
+
};
|
|
30
34
|
const { importLineMeta, identifierUsages } = result.externalImports[moduleImport];
|
|
31
35
|
switch (importIdentifier.__type) {
|
|
32
36
|
case 'default':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExternalResolverImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addExternalResolverImport.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AAejD
|
|
1
|
+
{"version":3,"file":"addExternalResolverImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addExternalResolverImport.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,18 @@ pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap
|
|
|
30
30
|
}
|
|
31
31
|
return '';
|
|
32
32
|
})();
|
|
33
|
-
|
|
33
|
+
const hasFieldsToPick = fieldsToPick.length > 0;
|
|
34
|
+
// __isTypeOf is required to resolve abstract types, should user chooses this approach.
|
|
35
|
+
// TODO: Run static analysis to enforce only one __isTypeOf per Object type, so users cannot accidentally implement/override it across modules
|
|
36
|
+
if (hasFieldsToPick) {
|
|
37
|
+
fieldsToPick.push('__isTypeOf');
|
|
38
|
+
}
|
|
39
|
+
if (hasFieldsToPick && pickReferenceResolver) {
|
|
34
40
|
fieldsToPick.push('__resolveReference');
|
|
35
41
|
}
|
|
36
42
|
// `typeString` contains the resolver type
|
|
37
43
|
// If there's fieldsToPick, we must only pick said fields from the original resolver type
|
|
38
|
-
const typeString =
|
|
44
|
+
const typeString = hasFieldsToPick
|
|
39
45
|
? `Pick<${resolversTypeMeta.typeString}, ${fieldsToPick
|
|
40
46
|
.map((fieldName) => `'${fieldName}'`)
|
|
41
47
|
.join('|')}>`
|
|
@@ -43,9 +49,9 @@ pickReferenceResolver, }, { result, config: { resolverGeneration, typeMappersMap
|
|
|
43
49
|
// Array of all resolvers that may need type checking
|
|
44
50
|
// If there's fieldsToPick, we must only generate said fields
|
|
45
51
|
const allResolversToGenerate = graphQLObjectTypeResolversToGenerate[resolverName];
|
|
46
|
-
const resolversToGenerate =
|
|
52
|
+
const resolversToGenerate = hasFieldsToPick
|
|
47
53
|
? fieldsToPick.reduce((res, fieldToPick) => {
|
|
48
|
-
if (allResolversToGenerate) {
|
|
54
|
+
if (allResolversToGenerate && allResolversToGenerate[fieldToPick]) {
|
|
49
55
|
res[fieldToPick] = allResolversToGenerate[fieldToPick];
|
|
50
56
|
}
|
|
51
57
|
return res;
|
|
@@ -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,GAMhC,CACF,EACE,aAAa,EACb,YAAY,EACZ,yBAAyB,EACzB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,EACV,4BAA4B,EAC5B,YAAY,GAAG,EAAE,EAAE,kFAAkF;AACrG,qBAAqB,GACtB,EACD,EACE,MAAM,EACN,MAAM,EAAE,EACN,kBAAkB,EAClB,cAAc,EACd,oCAAoC,EACpC,yBAAyB,GAC1B,GACF,EACD,EAAE;IACF,MAAM,wBAAwB,GAAG,IAAA,kCAA0B,EAAC;QAC1D,OAAO,EAAE,kBAAkB,CAAC,MAAM;QAClC,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,wCAAwC,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,IAAI,CACvH,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,qFAAqF,sBAAsB,CAAC,UAAU,gBAAgB,kBAAkB,CAAC,MAAM,cAAc,aAAa,CAAC,cAAc,EAAE,CAC5M,CAAC;YACF,OAAO;qDACwC,aAAa,CAAC,cAAc;;;;;;;SAOxE,CAAC;QACN,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC,EAAE,CAAC;IAEL,
|
|
1
|
+
{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":"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"}
|
|
@@ -114,7 +114,7 @@ export interface GenerateResolverFilesContext {
|
|
|
114
114
|
resolverMainFile: string;
|
|
115
115
|
resolverMainFileMode: ParsedPresetConfig['resolverMainFileMode'];
|
|
116
116
|
resolverGeneration: ParsedPresetConfig['resolverGeneration'];
|
|
117
|
-
|
|
117
|
+
unmanagedResolvers: Record<string, string>;
|
|
118
118
|
tsMorph: {
|
|
119
119
|
project: Project;
|
|
120
120
|
typesSourceFile: SourceFile;
|
|
@@ -3,15 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.visitNamedType = void 0;
|
|
4
4
|
const addExternalResolverImport_1 = require("./addExternalResolverImport");
|
|
5
5
|
const visitNamedType = ({ moduleName, relativePathFromBaseToModule, normalizedResolverName, resolverFile, relativePathToResolverTypesFile, typeNamedImport, typeString, belongsToRootObject, visitor, }, ctx) => {
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
if (externalResolverImportSyntax) {
|
|
9
|
-
// If has external resolver, use it
|
|
6
|
+
const unmanagedResolversImportSyntax = ctx.config.unmanagedResolvers[normalizedResolverName.base];
|
|
7
|
+
if (unmanagedResolversImportSyntax) {
|
|
10
8
|
(0, addExternalResolverImport_1.addExternalResolverImport)({
|
|
11
9
|
moduleName,
|
|
12
10
|
relativePathFromBaseToModule,
|
|
13
11
|
normalizedResolverName: normalizedResolverName.base,
|
|
14
|
-
configImportSyntax:
|
|
12
|
+
configImportSyntax: unmanagedResolversImportSyntax,
|
|
15
13
|
}, ctx);
|
|
16
14
|
return;
|
|
17
15
|
}
|
|
@@ -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,
|
|
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;KACF,EACD,GAAG,CACJ,CAAC;AACJ,CAAC,CAAC;AAzDW,QAAA,cAAc,kBAyDzB"}
|
package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.d.ts
CHANGED
|
@@ -9,5 +9,5 @@ export declare const getGraphQLObjectTypeResolversToGenerate: ({ tsMorphProject,
|
|
|
9
9
|
tsMorphProject: Project;
|
|
10
10
|
typesSourceFile: SourceFile;
|
|
11
11
|
typeMappersMap: TypeMappersMap;
|
|
12
|
-
userDefinedSchemaObjectTypeMap: ParsedGraphQLSchemaMeta[
|
|
12
|
+
userDefinedSchemaObjectTypeMap: ParsedGraphQLSchemaMeta["userDefinedSchemaTypeMap"]["object"];
|
|
13
13
|
}) => GraphQLObjectTypeResolversToGenerate;
|
|
@@ -57,7 +57,8 @@ export interface ParsedGraphQLSchemaMeta {
|
|
|
57
57
|
};
|
|
58
58
|
pluginsConfig: {
|
|
59
59
|
defaultScalarTypesMap: Record<string, ScalarsOverridesType>;
|
|
60
|
-
|
|
60
|
+
scalarsModuleResolvers: Record<string, string>;
|
|
61
|
+
unmanagedScalarResolvers: Record<string, string>;
|
|
61
62
|
defaultTypeMappers: Record<string, string>;
|
|
62
63
|
};
|
|
63
64
|
}
|
|
@@ -9,7 +9,7 @@ const utils_1 = require("../utils");
|
|
|
9
9
|
const parseLocationForOutputDir_1 = require("./parseLocationForOutputDir");
|
|
10
10
|
const normalizeResolverName_1 = require("./normalizeResolverName");
|
|
11
11
|
const parseGraphQLSchema = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, function* ({ schemaAst, sourceMap, resolverTypesPath, typeMappersMap, scalarsModule, scalarsOverrides, mode, baseOutputDir, resolverRelativeTargetDir, whitelistedModules, blacklistedModules, federationEnabled, }) {
|
|
12
|
-
const
|
|
12
|
+
const scalarsModuleResolverMap = scalarsModule
|
|
13
13
|
? yield getScalarResolverMapFromModule(scalarsModule)
|
|
14
14
|
: {};
|
|
15
15
|
return Object.entries(schemaAst.getTypeMap()).reduce((res, [schemaType, namedType]) => {
|
|
@@ -79,7 +79,7 @@ const parseGraphQLSchema = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, funct
|
|
|
79
79
|
// Handle scalar type wireups
|
|
80
80
|
if ((0, graphql_1.isScalarType)(namedType)) {
|
|
81
81
|
handleScalarType({
|
|
82
|
-
|
|
82
|
+
scalarsModuleResolverMap,
|
|
83
83
|
schemaType,
|
|
84
84
|
scalarsModule,
|
|
85
85
|
scalarsOverrides,
|
|
@@ -133,22 +133,23 @@ const parseGraphQLSchema = (_a) => tslib_1.__awaiter(void 0, [_a], void 0, funct
|
|
|
133
133
|
},
|
|
134
134
|
pluginsConfig: {
|
|
135
135
|
defaultScalarTypesMap: {},
|
|
136
|
-
|
|
136
|
+
scalarsModuleResolvers: {},
|
|
137
|
+
unmanagedScalarResolvers: {},
|
|
137
138
|
defaultTypeMappers: {},
|
|
138
139
|
},
|
|
139
140
|
});
|
|
140
141
|
});
|
|
141
142
|
exports.parseGraphQLSchema = parseGraphQLSchema;
|
|
142
|
-
const handleScalarType = ({
|
|
143
|
-
const
|
|
143
|
+
const handleScalarType = ({ scalarsModuleResolverMap, schemaType, scalarsModule, scalarsOverrides, result, }) => {
|
|
144
|
+
const scalarsModuleResolver = scalarsModuleResolverMap[schemaType];
|
|
144
145
|
// Use found the scalar from scalar module
|
|
145
|
-
if (
|
|
146
|
-
if (
|
|
147
|
-
typeof
|
|
146
|
+
if (scalarsModuleResolver) {
|
|
147
|
+
if (scalarsModuleResolver.extensions.codegenScalarType &&
|
|
148
|
+
typeof scalarsModuleResolver.extensions.codegenScalarType === 'string') {
|
|
148
149
|
result.pluginsConfig.defaultScalarTypesMap[schemaType] =
|
|
149
|
-
|
|
150
|
+
scalarsModuleResolver.extensions.codegenScalarType;
|
|
150
151
|
}
|
|
151
|
-
result.pluginsConfig.
|
|
152
|
+
result.pluginsConfig.scalarsModuleResolvers[schemaType] = `~${scalarsModule}#${scalarsModuleResolver.name}Resolver`;
|
|
152
153
|
}
|
|
153
154
|
// If found scalar overrides, use them
|
|
154
155
|
const override = scalarsOverrides[schemaType];
|
|
@@ -157,7 +158,7 @@ const handleScalarType = ({ scalarResolverMap, schemaType, result, scalarsModule
|
|
|
157
158
|
result.pluginsConfig.defaultScalarTypesMap[schemaType] = override.type;
|
|
158
159
|
}
|
|
159
160
|
if (override.resolver) {
|
|
160
|
-
result.pluginsConfig.
|
|
161
|
+
result.pluginsConfig.unmanagedScalarResolvers[schemaType] =
|
|
161
162
|
override.resolver;
|
|
162
163
|
}
|
|
163
164
|
}
|
|
@@ -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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseSources =
|
|
3
|
+
exports.parseSources = parseSources;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const path = tslib_1.__importStar(require("path"));
|
|
6
6
|
function parseSources(sources, baseOutputDir) {
|
|
@@ -23,5 +23,4 @@ function parseSources(sources, baseOutputDir) {
|
|
|
23
23
|
return result;
|
|
24
24
|
}, { sourceMap: {} });
|
|
25
25
|
}
|
|
26
|
-
exports.parseSources = parseSources;
|
|
27
26
|
//# sourceMappingURL=parseSources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseSources.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseSources/parseSources.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"parseSources.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseSources/parseSources.ts"],"names":[],"mappings":";;AAcA,oCA8BC;;AA5CD,mDAA6B;AAc7B,SAAgB,YAAY,CAC1B,OAAiB,EACjB,aAAqB;IAErB,OAAO,OAAO,CAAC,MAAM,CACnB,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE;QACjB,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;QAC7C,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC;QAEjC,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAE5C,MAAM,4BAA4B,GAAG,IAAI;aACtC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;aACnE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEnB,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG;YAClC,MAAM;YACN,UAAU;YACV,UAAU;YACV,4BAA4B;SAC7B,CAAC;QAEF,OAAO,MAAM,CAAC;IAChB,CAAC,EACD,EAAE,SAAS,EAAE,EAAE,EAAE,CAClB,CAAC;AACJ,CAAC"}
|
package/src/preset.js
CHANGED
|
@@ -65,7 +65,7 @@ exports.preset = {
|
|
|
65
65
|
});
|
|
66
66
|
}), createProfilerRunName('parseGraphQLSchema'));
|
|
67
67
|
const mergedConfig = (0, validateAndMergeParsedConfigs_1.validateAndMergeParsedConfigs)({
|
|
68
|
-
externalResolvers,
|
|
68
|
+
unmanagedNonScalarResolvers: externalResolvers,
|
|
69
69
|
parsedGraphQLSchemaMeta,
|
|
70
70
|
});
|
|
71
71
|
// typescript and typescript-resolvers plugins config
|
|
@@ -170,7 +170,7 @@ exports.preset = {
|
|
|
170
170
|
typesSourceFile,
|
|
171
171
|
},
|
|
172
172
|
fixObjectTypeResolvers,
|
|
173
|
-
|
|
173
|
+
unmanagedResolvers: Object.assign({}, mergedConfig.unmanagedResolvers),
|
|
174
174
|
emitLegacyCommonJSImports,
|
|
175
175
|
generatedTypesFileMeta,
|
|
176
176
|
},
|
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":"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
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/preset.ts"],"names":[],"mappings":"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"}
|
package/src/utils/fmt.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.printImportLine =
|
|
3
|
+
exports.printImportLine = printImportLine;
|
|
4
4
|
function printImportLine({ isTypeImport, module, moduleType, namedImports, defaultImport, emitLegacyCommonJSImports, }) {
|
|
5
5
|
const typeImportKeyword = isTypeImport ? 'type' : '';
|
|
6
6
|
const hasDefaultImport = Boolean(defaultImport);
|
|
@@ -15,7 +15,6 @@ function printImportLine({ isTypeImport, module, moduleType, namedImports, defau
|
|
|
15
15
|
}
|
|
16
16
|
return `import ${typeImportKeyword} ${defaultImport || ''} ${hasDefaultImport && hasNamedImports ? ',' : ''} ${namedImportsString} from '${normalizeModuleExtensionForImport(module)}${fileExt}';`;
|
|
17
17
|
}
|
|
18
|
-
exports.printImportLine = printImportLine;
|
|
19
18
|
const normalizeModuleExtensionForImport = (module) => {
|
|
20
19
|
if (module.endsWith('.ts')) {
|
|
21
20
|
return module.split('.').slice(0, -1).join('.');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"printImportLine.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/printImportLine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"printImportLine.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/printImportLine.ts"],"names":[],"mappings":";;AAiBA,0CA0BC;AA1BD,SAAgB,eAAe,CAAC,EAC9B,YAAY,EACZ,MAAM,EACN,UAAU,EACV,YAAY,EACZ,aAAa,EACb,yBAAyB,GACV;IACf,MAAM,iBAAiB,GAAG,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;IACrD,MAAM,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAChD,MAAM,eAAe,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC;IAChD,MAAM,kBAAkB,GAAG,eAAe;QACxC,CAAC,CAAC,KAAK,YAAY,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI;QAChE,CAAC,CAAC,EAAE,CAAC;IAEP,IAAI,OAAO,GAAG,EAAE,CAAC;IACjB,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,UAAU,KAAK,MAAM,CAAC;QACrC,OAAO,GAAG,yBAAyB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAC9D,CAAC;IAED,OAAO,UAAU,iBAAiB,IAAI,aAAa,IAAI,EAAE,IACvD,gBAAgB,IAAI,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAC9C,IAAI,kBAAkB,UAAU,iCAAiC,CAC/D,MAAM,CACP,GAAG,OAAO,IAAI,CAAC;AAClB,CAAC;AAED,MAAM,iCAAiC,GAAG,CAAC,MAAc,EAAU,EAAE;IACnE,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,WAAmD,EAC3C,EAAE;IACV,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,WAAW,CAAC,YAAY,KAAK,WAAW,CAAC,cAAc,EAAE,CAAC;QAC5D,OAAO,WAAW,CAAC,cAAc,CAAC;IACpC,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,YAAY,OAAO,WAAW,CAAC,cAAc,EAAE,CAAC;AACxE,CAAC,CAAC"}
|
|
@@ -2,17 +2,24 @@ import type { ParsedGraphQLSchemaMeta } from '../parseGraphQLSchema';
|
|
|
2
2
|
import type { ParsedPresetConfig, ScalarsOverridesType } from '../validatePresetConfig';
|
|
3
3
|
interface MergedConfig {
|
|
4
4
|
userDefinedSchemaTypeMap: ParsedGraphQLSchemaMeta['userDefinedSchemaTypeMap'];
|
|
5
|
-
externalResolvers: ParsedPresetConfig['externalResolvers'];
|
|
6
5
|
scalarTypes: Record<string, ScalarsOverridesType>;
|
|
7
6
|
typeMappers: Record<string, string>;
|
|
7
|
+
/**
|
|
8
|
+
* Resolvers users explicitly wants to control i.e. unmanaged by server preset so no static analysis is run on these resolvers
|
|
9
|
+
* This is set by a few options:
|
|
10
|
+
* - config.externalResolvers: for non-scalar types
|
|
11
|
+
* - config.scalarsOverrides: for scalar types
|
|
12
|
+
* - external resolvers e.g. from `graphql-scalars` module
|
|
13
|
+
**/
|
|
14
|
+
unmanagedResolvers: Record<string, string>;
|
|
8
15
|
}
|
|
9
16
|
/**
|
|
10
17
|
* validateAndMergeParsedConfigs is used to make sure all parsed configs do not incorrectly override each other.
|
|
11
18
|
* Use this to ensure there's only one way of doing something. e.g.
|
|
12
19
|
* - scalarsOverrides must be used over externalResolvers to override scalars
|
|
13
20
|
*/
|
|
14
|
-
export declare const validateAndMergeParsedConfigs: ({
|
|
15
|
-
|
|
21
|
+
export declare const validateAndMergeParsedConfigs: ({ unmanagedNonScalarResolvers, parsedGraphQLSchemaMeta: { userDefinedSchemaTypeMap, pluginsConfig: { scalarsModuleResolvers, unmanagedScalarResolvers, defaultScalarTypesMap, defaultTypeMappers, }, }, }: {
|
|
22
|
+
unmanagedNonScalarResolvers: ParsedPresetConfig["externalResolvers"];
|
|
16
23
|
parsedGraphQLSchemaMeta: ParsedGraphQLSchemaMeta;
|
|
17
24
|
}) => MergedConfig;
|
|
18
25
|
export {};
|
|
@@ -7,14 +7,14 @@ const utils_1 = require("../utils");
|
|
|
7
7
|
* Use this to ensure there's only one way of doing something. e.g.
|
|
8
8
|
* - scalarsOverrides must be used over externalResolvers to override scalars
|
|
9
9
|
*/
|
|
10
|
-
const validateAndMergeParsedConfigs = ({
|
|
11
|
-
Object.keys(
|
|
10
|
+
const validateAndMergeParsedConfigs = ({ unmanagedNonScalarResolvers, parsedGraphQLSchemaMeta: { userDefinedSchemaTypeMap, pluginsConfig: { scalarsModuleResolvers, unmanagedScalarResolvers, defaultScalarTypesMap, defaultTypeMappers, }, }, }) => {
|
|
11
|
+
Object.keys(scalarsModuleResolvers).forEach((schemaType) => {
|
|
12
12
|
var _a;
|
|
13
13
|
if (
|
|
14
14
|
// If the scalar is defined on the filesystem, it means user wants to use their custom definition.
|
|
15
15
|
// This means we should use it, instead of importing it from scalar module
|
|
16
16
|
(_a = userDefinedSchemaTypeMap.scalar[schemaType]) === null || _a === void 0 ? void 0 : _a.resolverFile.isOnFilesystem) {
|
|
17
|
-
delete
|
|
17
|
+
delete scalarsModuleResolvers[schemaType];
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
20
|
// By default, codegen doesn't generate types for enums
|
|
@@ -25,16 +25,16 @@ const validateAndMergeParsedConfigs = ({ externalResolvers, parsedGraphQLSchemaM
|
|
|
25
25
|
result[enumTypename] = allowedValues.map((v) => `'${v}'`).join(' | ');
|
|
26
26
|
return result;
|
|
27
27
|
}, {});
|
|
28
|
-
Object.keys(
|
|
28
|
+
Object.keys(unmanagedNonScalarResolvers).forEach((schemaType) => {
|
|
29
29
|
if (userDefinedSchemaTypeMap.scalar[schemaType]) {
|
|
30
30
|
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'));
|
|
31
31
|
}
|
|
32
32
|
});
|
|
33
33
|
return {
|
|
34
34
|
userDefinedSchemaTypeMap,
|
|
35
|
-
externalResolvers: Object.assign(Object.assign({}, defaultScalarExternalResolvers), externalResolvers),
|
|
36
35
|
scalarTypes: Object.assign({}, defaultScalarTypesMap),
|
|
37
36
|
typeMappers: Object.assign(Object.assign({}, schemaEnumTypeMappers), defaultTypeMappers),
|
|
37
|
+
unmanagedResolvers: Object.assign(Object.assign(Object.assign({}, unmanagedNonScalarResolvers), scalarsModuleResolvers), unmanagedScalarResolvers),
|
|
38
38
|
};
|
|
39
39
|
};
|
|
40
40
|
exports.validateAndMergeParsedConfigs = validateAndMergeParsedConfigs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validateAndMergeParsedConfigs.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.ts"],"names":[],"mappings":";;;AAKA,oCAA+B;
|
|
1
|
+
{"version":3,"file":"validateAndMergeParsedConfigs.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validateAndMergeParsedConfigs/validateAndMergeParsedConfigs.ts"],"names":[],"mappings":";;;AAKA,oCAA+B;AAgB/B;;;;GAIG;AACI,MAAM,6BAA6B,GAAG,CAAC,EAC5C,2BAA2B,EAC3B,uBAAuB,EAAE,EACvB,wBAAwB,EACxB,aAAa,EAAE,EACb,sBAAsB,EACtB,wBAAwB,EACxB,qBAAqB,EACrB,kBAAkB,GACnB,GACF,GAIF,EAAgB,EAAE;IACjB,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;;QACzD;QACE,kGAAkG;QAClG,0EAA0E;QAC1E,MAAA,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,0CAAE,YAAY,CAAC,cAAc,EACxE,CAAC;YACD,OAAO,sBAAsB,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,uDAAuD;IACvD,wHAAwH;IACxH,uHAAuH;IACvH,kHAAkH;IAClH,MAAM,qBAAqB,GAAG,MAAM,CAAC,OAAO,CAC1C,wBAAwB,CAAC,IAAI,CAC9B,CAAC,MAAM,CACN,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE;QAC5C,MAAM,CAAC,YAAY,CAAC,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtE,OAAO,MAAM,CAAC;IAChB,CAAC,EACD,EAAE,CACH,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;QAC9D,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,WAAW,oBACN,qBAAqB,CACzB;QACD,WAAW,kCACN,qBAAqB,GACrB,kBAAkB,CACtB;QACD,kBAAkB,gDACb,2BAA2B,GAC3B,sBAAsB,GACtB,wBAAwB,CAC5B;KACF,CAAC;AACJ,CAAC,CAAC;AAjEW,QAAA,6BAA6B,iCAiExC"}
|