@eddeee888/gcg-typescript-resolver-files 0.4.0 → 0.4.1
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/README.md +9 -2
- package/package.json +1 -1
- package/src/generateResolverFiles/addExternalResolverImport.d.ts +1 -1
- package/src/generateResolverFiles/addExternalResolverImport.js +2 -1
- package/src/generateResolverFiles/addExternalResolverImport.js.map +1 -1
- package/src/generateResolverFiles/addResolverMainFile.d.ts +2 -2
- package/src/generateResolverFiles/addResolverMainFile.js +6 -2
- package/src/generateResolverFiles/addResolverMainFile.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLObjectType.js +2 -1
- package/src/generateResolverFiles/handleGraphQLObjectType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js +2 -1
- package/src/generateResolverFiles/handleGraphQLRootObjectTypeField.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLScalarType.js +2 -1
- package/src/generateResolverFiles/handleGraphQLScalarType.js.map +1 -1
- package/src/generateResolverFiles/handleGraphQLUninionType.js +2 -1
- package/src/generateResolverFiles/handleGraphQLUninionType.js.map +1 -1
- package/src/generateResolverFiles/types.d.ts +1 -0
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.js +5 -1
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.js.map +1 -1
- package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.d.ts +2 -2
- package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.js +2 -2
- package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.js.map +1 -1
- package/src/parseGraphQLSchema/parseGraphQLSchema.d.ts +11 -7
- package/src/parseGraphQLSchema/parseGraphQLSchema.js +6 -2
- package/src/parseGraphQLSchema/parseGraphQLSchema.js.map +1 -1
- package/src/parseTypeMappers/collectTypeMappersFromSourceFile.d.ts +2 -1
- package/src/parseTypeMappers/collectTypeMappersFromSourceFile.js +7 -3
- package/src/parseTypeMappers/collectTypeMappersFromSourceFile.js.map +1 -1
- package/src/parseTypeMappers/parseTypeMappers.d.ts +2 -1
- package/src/parseTypeMappers/parseTypeMappers.js +2 -1
- package/src/parseTypeMappers/parseTypeMappers.js.map +1 -1
- package/src/preset.js +6 -4
- package/src/preset.js.map +1 -1
- package/src/utils/fmt.d.ts +7 -0
- package/src/utils/fmt.js +16 -0
- package/src/utils/fmt.js.map +1 -0
- package/src/utils/index.d.ts +1 -0
- package/src/utils/index.js +1 -0
- package/src/utils/index.js.map +1 -1
- package/src/utils/printImportLine.d.ts +2 -1
- package/src/utils/printImportLine.js +4 -2
- package/src/utils/printImportLine.js.map +1 -1
- package/src/validatePresetConfig/validatePresetConfig.d.ts +3 -1
- package/src/validatePresetConfig/validatePresetConfig.js +19 -21
- package/src/validatePresetConfig/validatePresetConfig.js.map +1 -1
package/README.md
CHANGED
|
@@ -26,9 +26,7 @@ yarn add graphql-scalars
|
|
|
26
26
|
```graphql
|
|
27
27
|
# src/schema/base/schema.graphql
|
|
28
28
|
type Query
|
|
29
|
-
```
|
|
30
29
|
|
|
31
|
-
```graphql
|
|
32
30
|
# src/schema/user/schema.graphql
|
|
33
31
|
extend type Query {
|
|
34
32
|
user(id: ID!): User
|
|
@@ -68,13 +66,16 @@ export interface UserMapper {
|
|
|
68
66
|
|
|
69
67
|
```ts
|
|
70
68
|
// codegen.ts
|
|
69
|
+
import type { CodegenConfig } from '@graphql-codegen/cli';
|
|
71
70
|
import { defineConfig } from '@eddeee888/gcg-typescript-resolver-files';
|
|
71
|
+
|
|
72
72
|
const config: CodegenConfig = {
|
|
73
73
|
schema: '**/schema.graphql',
|
|
74
74
|
generates: {
|
|
75
75
|
'src/schema': defineConfig(),
|
|
76
76
|
},
|
|
77
77
|
};
|
|
78
|
+
|
|
78
79
|
export default config;
|
|
79
80
|
```
|
|
80
81
|
|
|
@@ -211,6 +212,12 @@ Project's TypeScript config, relative from project root. This helps type analysi
|
|
|
211
212
|
|
|
212
213
|
Statically compares object type's mapper types' field against schema types' fields, creating resolvers if required
|
|
213
214
|
|
|
215
|
+
### emitLegacyCommonJSImports
|
|
216
|
+
|
|
217
|
+
`bool` (Default: `true`)
|
|
218
|
+
|
|
219
|
+
Determines whether imports emitted should use CommonJS syntax or ESM syntax (with `.js` file endings)
|
|
220
|
+
|
|
214
221
|
## Config Examples
|
|
215
222
|
|
|
216
223
|
#### 1. Custom Config
|
package/package.json
CHANGED
|
@@ -4,5 +4,5 @@ interface AddExternalResolverImportParams {
|
|
|
4
4
|
normalizedResolverName: string;
|
|
5
5
|
configImportSyntax: string;
|
|
6
6
|
}
|
|
7
|
-
export declare const addExternalResolverImport: (params: AddExternalResolverImportParams, { result }: GenerateResolverFilesContext) => void;
|
|
7
|
+
export declare const addExternalResolverImport: (params: AddExternalResolverImportParams, { result, config: { emitLegacyCommonJSImports }, }: GenerateResolverFilesContext) => void;
|
|
8
8
|
export {};
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addExternalResolverImport = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
const addExternalResolverImport = (params, { result }) => {
|
|
5
|
+
const addExternalResolverImport = (params, { result, config: { emitLegacyCommonJSImports }, }) => {
|
|
6
6
|
const { importIdentifier, identifierUsage, moduleImport } = parseImportSyntax(params);
|
|
7
7
|
result.externalImports[moduleImport] =
|
|
8
8
|
result.externalImports[moduleImport] ||
|
|
@@ -13,6 +13,7 @@ const addExternalResolverImport = (params, { result }) => {
|
|
|
13
13
|
module: moduleImport,
|
|
14
14
|
namedImports: [],
|
|
15
15
|
defaultImport: undefined,
|
|
16
|
+
emitLegacyCommonJSImports: emitLegacyCommonJSImports,
|
|
16
17
|
},
|
|
17
18
|
identifierUsages: [],
|
|
18
19
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addExternalResolverImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addExternalResolverImport.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AAc1C,MAAM,yBAAyB,GAAG,CACvC,MAAuC,EACvC,
|
|
1
|
+
{"version":3,"file":"addExternalResolverImport.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addExternalResolverImport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { GenerateResolverFilesContext } from './types';
|
|
2
2
|
/**
|
|
3
|
-
* TODO: rename addResolverMainFiles
|
|
3
|
+
* TODO: rename addResolverMainFile -> addResolverMainFiles
|
|
4
4
|
*/
|
|
5
|
-
export declare const addResolverMainFile: ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, }, result, }: GenerateResolverFilesContext) => void;
|
|
5
|
+
export declare const addResolverMainFile: ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, emitLegacyCommonJSImports, }, result, }: GenerateResolverFilesContext) => void;
|
|
@@ -11,9 +11,9 @@ const createDefaultFileDetails = () => ({
|
|
|
11
11
|
objectTypes: [],
|
|
12
12
|
});
|
|
13
13
|
/**
|
|
14
|
-
* TODO: rename addResolverMainFiles
|
|
14
|
+
* TODO: rename addResolverMainFile -> addResolverMainFiles
|
|
15
15
|
*/
|
|
16
|
-
const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, }, result, }) => {
|
|
16
|
+
const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resolverMainFile, resolverMainFileMode, emitLegacyCommonJSImports, }, result, }) => {
|
|
17
17
|
const resolverMainFiles = Object.entries(result.files).reduce((res, [filepath, file]) => {
|
|
18
18
|
if (file.__filetype === 'file') {
|
|
19
19
|
return res;
|
|
@@ -34,6 +34,7 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
|
|
|
34
34
|
isTypeImport: false,
|
|
35
35
|
module: (0, utils_1.relativeModulePath)(outputDir, filepath),
|
|
36
36
|
namedImports: [file.mainImportIdentifier],
|
|
37
|
+
emitLegacyCommonJSImports,
|
|
37
38
|
}));
|
|
38
39
|
res[resolverMainFilename].objectTypes.push({
|
|
39
40
|
propertyName: file.mainImportIdentifier,
|
|
@@ -53,6 +54,7 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
|
|
|
53
54
|
isTypeImport: false,
|
|
54
55
|
module: (0, utils_1.relativeModulePath)(outputDir, filepath),
|
|
55
56
|
namedImports: [fieldMapping],
|
|
57
|
+
emitLegacyCommonJSImports,
|
|
56
58
|
}));
|
|
57
59
|
const rootObjectMap = {
|
|
58
60
|
Query: () => res[resolverMainFilename].queryFields.push(fieldMapping),
|
|
@@ -75,6 +77,7 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
|
|
|
75
77
|
module,
|
|
76
78
|
namedImports: meta.importLineMeta.namedImports,
|
|
77
79
|
defaultImport: meta.importLineMeta.defaultImport,
|
|
80
|
+
emitLegacyCommonJSImports,
|
|
78
81
|
}));
|
|
79
82
|
meta.identifierUsages.forEach((usage) => {
|
|
80
83
|
const resolverNameParts = usage.normalizedResolverName.split('.');
|
|
@@ -131,6 +134,7 @@ const addResolverMainFile = ({ config: { baseOutputDir, resolverTypesPath, resol
|
|
|
131
134
|
isTypeImport: true,
|
|
132
135
|
module: relativePathToResolverTypes,
|
|
133
136
|
namedImports: [resolversTypeName],
|
|
137
|
+
emitLegacyCommonJSImports,
|
|
134
138
|
})}
|
|
135
139
|
${resolverMainFile.importLines.map((line) => line).join('\n')}
|
|
136
140
|
export const ${resolversIdentifier}: ${resolversTypeName} = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addResolverMainFile.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFile.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;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;;GAEG;AACI,MAAM,mBAAmB,GAAG,CAAC,EAClC,MAAM,EAAE,EACN,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"addResolverMainFile.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/addResolverMainFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleGraphQLObjectType = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, }, { result, config: { graphQLObjectTypeResolversToGenerate } }) => {
|
|
5
|
+
const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, }, { result, config: { graphQLObjectTypeResolversToGenerate, emitLegacyCommonJSImports }, }) => {
|
|
6
6
|
const variableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = {
|
|
7
7
|
/* Implement ${resolverName} resolver logic here */
|
|
8
8
|
};`;
|
|
@@ -13,6 +13,7 @@ const handleGraphQLObjectType = ({ fieldFilePath, resolverName, normalizedResolv
|
|
|
13
13
|
isTypeImport: true,
|
|
14
14
|
module: resolversTypeMeta.module,
|
|
15
15
|
namedImports: [resolversTypeMeta.typeNamedImport],
|
|
16
|
+
emitLegacyCommonJSImports,
|
|
16
17
|
})}
|
|
17
18
|
${variableStatement}`,
|
|
18
19
|
mainImportIdentifier: resolverName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAEpC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,
|
|
1
|
+
{"version":3,"file":"handleGraphQLObjectType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLObjectType.ts"],"names":[],"mappings":";;;AACA,oCAA2C;AAEpC,MAAM,uBAAuB,GAAuB,CACzD,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,EACE,MAAM,EACN,MAAM,EAAE,EAAE,oCAAoC,EAAE,yBAAyB,EAAE,GAC5E,EACD,EAAE;IACF,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU;mBACtE,YAAY;KAC1B,CAAC;IAEJ,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,YAAY;QACxB,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,sBAAsB;YACtB,iBAAiB;YACjB,mBAAmB,EAAE,oCAAoC,CAAC,YAAY,CAAC,EAAE,qDAAqD;SAC/H;KACF,CAAC;AACJ,CAAC,CAAC;AAnCW,QAAA,uBAAuB,2BAmClC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleGraphQLRootObjectTypeField = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, moduleName, }, { result }) => {
|
|
5
|
+
const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongsToRootObject, normalizedResolverName, resolversTypeMeta, moduleName, }, { result, config: { emitLegacyCommonJSImports } }) => {
|
|
6
6
|
const suggestion = `/* Implement ${normalizedResolverName} resolver logic here */`;
|
|
7
7
|
let variableStatement = `export const ${resolverName}: NonNullable<${resolversTypeMeta.typeString}> = async (_parent, _arg, _ctx) => { ${suggestion} };`;
|
|
8
8
|
if (belongsToRootObject === 'Subscription') {
|
|
@@ -17,6 +17,7 @@ const handleGraphQLRootObjectTypeField = ({ fieldFilePath, resolverName, belongs
|
|
|
17
17
|
isTypeImport: true,
|
|
18
18
|
module: resolversTypeMeta.module,
|
|
19
19
|
namedImports: [resolversTypeMeta.typeNamedImport],
|
|
20
|
+
emitLegacyCommonJSImports,
|
|
20
21
|
})}
|
|
21
22
|
${variableStatement}`,
|
|
22
23
|
mainImportIdentifier: resolverName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AAAA,oCAAgE;AAGzD,MAAM,gCAAgC,GAEzC,CACF,EACE,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"handleGraphQLRootObjectTypeField.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLRootObjectTypeField.ts"],"names":[],"mappings":";;;AAAA,oCAAgE;AAGzD,MAAM,gCAAgC,GAEzC,CACF,EACE,aAAa,EACb,YAAY,EACZ,mBAAmB,EACnB,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,yBAAyB,EAAE,EAAE,EACjD,EAAE;IACF,MAAM,UAAU,GAAG,gBAAgB,sBAAsB,yBAAyB,CAAC;IAEnF,IAAI,iBAAiB,GAAG,gBAAgB,YAAY,iBAAiB,iBAAiB,CAAC,UAAU,wCAAwC,UAAU,KAAK,CAAC;IACzJ,IAAI,mBAAmB,KAAK,cAAc,EAAE;QAC1C,iBAAiB,GAAG,gBAAgB,YAAY,iBAAiB,iBAAiB,CAAC,UAAU;oDAC7C,UAAU;MACxD,CAAC;KACJ;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,6BAA6B;QACzC,OAAO,EAAE;UACH,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;UACA,iBAAiB,EAAE;QACzB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,mBAAmB;YACnB,iBAAiB;YACjB,sBAAsB;SACvB;KACF,CAAC;AACJ,CAAC,CAAC;AAxCW,QAAA,gCAAgC,oCAwC3C"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.handleGraphQLScalarType = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
5
|
const graphQLScalarType = 'GraphQLScalarType';
|
|
6
|
-
const handleGraphQLScalarType = ({ fieldFilePath, resolverName, normalizedResolverName, moduleName }, { result }) => {
|
|
6
|
+
const handleGraphQLScalarType = ({ fieldFilePath, resolverName, normalizedResolverName, moduleName }, { result, config: { emitLegacyCommonJSImports } }) => {
|
|
7
7
|
const variableStatement = `export const ${resolverName}: ${graphQLScalarType} = { /* Implement ${resolverName} scalar logic here */ };`;
|
|
8
8
|
result.files[fieldFilePath] = {
|
|
9
9
|
__filetype: 'generalResolver',
|
|
@@ -12,6 +12,7 @@ const handleGraphQLScalarType = ({ fieldFilePath, resolverName, normalizedResolv
|
|
|
12
12
|
isTypeImport: true,
|
|
13
13
|
module: 'graphql',
|
|
14
14
|
namedImports: [graphQLScalarType],
|
|
15
|
+
emitLegacyCommonJSImports,
|
|
15
16
|
})}
|
|
16
17
|
${variableStatement}`,
|
|
17
18
|
mainImportIdentifier: resolverName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLScalarType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLScalarType.ts"],"names":[],"mappings":";;;AAAA,oCAA2C;AAG3C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,MAAM,uBAAuB,GAAuB,CACzD,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,EACnE,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"handleGraphQLScalarType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLScalarType.ts"],"names":[],"mappings":";;;AAAA,oCAA2C;AAG3C,MAAM,iBAAiB,GAAG,mBAAmB,CAAC;AAEvC,MAAM,uBAAuB,GAAuB,CACzD,EAAE,aAAa,EAAE,YAAY,EAAE,sBAAsB,EAAE,UAAU,EAAE,EACnE,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,yBAAyB,EAAE,EAAE,EACjD,EAAE;IACF,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,qBAAqB,YAAY,0BAA0B,CAAC;IAExI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,SAAS;YACjB,YAAY,EAAE,CAAC,iBAAiB,CAAC;YACjC,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,sBAAsB;YACtB,iBAAiB;SAClB;KACF,CAAC;AACJ,CAAC,CAAC;AAvBW,QAAA,uBAAuB,2BAuBlC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleGraphQLUninionType = void 0;
|
|
4
4
|
const utils_1 = require("../utils");
|
|
5
|
-
const handleGraphQLUninionType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, }, { result }) => {
|
|
5
|
+
const handleGraphQLUninionType = ({ fieldFilePath, resolverName, normalizedResolverName, resolversTypeMeta, moduleName, }, { result, config: { emitLegacyCommonJSImports } }) => {
|
|
6
6
|
const variableStatement = `export const ${resolverName}: ${resolversTypeMeta.typeString} = { __resolveType: (parent) => parent.__typename };`;
|
|
7
7
|
result.files[fieldFilePath] = {
|
|
8
8
|
__filetype: 'generalResolver',
|
|
@@ -11,6 +11,7 @@ const handleGraphQLUninionType = ({ fieldFilePath, resolverName, normalizedResol
|
|
|
11
11
|
isTypeImport: true,
|
|
12
12
|
module: resolversTypeMeta.module,
|
|
13
13
|
namedImports: [resolversTypeMeta.typeNamedImport],
|
|
14
|
+
emitLegacyCommonJSImports,
|
|
14
15
|
})}
|
|
15
16
|
${variableStatement}`,
|
|
16
17
|
mainImportIdentifier: resolverName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handleGraphQLUninionType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLUninionType.ts"],"names":[],"mappings":";;;AAAA,oCAA2C;AAGpC,MAAM,wBAAwB,GAAuB,CAC1D,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"handleGraphQLUninionType.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateResolverFiles/handleGraphQLUninionType.ts"],"names":[],"mappings":";;;AAAA,oCAA2C;AAGpC,MAAM,wBAAwB,GAAuB,CAC1D,EACE,aAAa,EACb,YAAY,EACZ,sBAAsB,EACtB,iBAAiB,EACjB,UAAU,GACX,EACD,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,yBAAyB,EAAE,EAAE,EACjD,EAAE;IACF,MAAM,iBAAiB,GAAG,gBAAgB,YAAY,KAAK,iBAAiB,CAAC,UAAU,sDAAsD,CAAC;IAE9I,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG;QAC5B,UAAU,EAAE,iBAAiB;QAC7B,OAAO,EAAE;MACP,IAAA,uBAAe,EAAC;YAChB,YAAY,EAAE,IAAI;YAClB,MAAM,EAAE,iBAAiB,CAAC,MAAM;YAChC,YAAY,EAAE,CAAC,iBAAiB,CAAC,eAAe,CAAC;YACjD,yBAAyB;SAC1B,CAAC;MACA,iBAAiB,EAAE;QACrB,oBAAoB,EAAE,YAAY;QAClC,IAAI,EAAE;YACJ,UAAU;YACV,sBAAsB;YACtB,iBAAiB;SAClB;KACF,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}
|
|
@@ -58,6 +58,7 @@ export interface GenerateResolverFilesContext {
|
|
|
58
58
|
};
|
|
59
59
|
graphQLObjectTypeResolversToGenerate: GraphQLObjectTypeResolversToGenerate;
|
|
60
60
|
fixObjectTypeResolvers: ParsedPresetConfig['fixObjectTypeResolvers'];
|
|
61
|
+
emitLegacyCommonJSImports: boolean;
|
|
61
62
|
};
|
|
62
63
|
result: {
|
|
63
64
|
files: Record<string, StandardFile | ResolverFile>;
|
|
@@ -29,9 +29,13 @@ const generateTypeDefsFiles = ({ baseOutputDir, typeDefsFilePath, typeDefsFileMo
|
|
|
29
29
|
return;
|
|
30
30
|
}
|
|
31
31
|
if (isWhitelisted && typeDefsFileMode === 'modules') {
|
|
32
|
+
// sourcePath.dir is absolute which does not work well to use as filenames for Windows
|
|
33
|
+
// example of cases where it does not work:
|
|
34
|
+
// - when `prettier` is run in afterAllFileWrite hooks with absolute Windows path
|
|
35
|
+
const relativeSourcePathDir = path.posix.relative((0, utils_1.cwd)(), sourcePath.dir);
|
|
32
36
|
appendSDLToFile({
|
|
33
37
|
filesContent,
|
|
34
|
-
filePath: path.posix.join(
|
|
38
|
+
filePath: path.posix.join(relativeSourcePathDir, typeDefsFilePath),
|
|
35
39
|
rawSDL: source.rawSDL,
|
|
36
40
|
});
|
|
37
41
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateTypeDefsFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsFiles/generateTypeDefsFiles.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAG7B,
|
|
1
|
+
{"version":3,"file":"generateTypeDefsFiles.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsFiles/generateTypeDefsFiles.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;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;YACjC,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;SACR;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,mBAAmB,EAAE;YAC7D,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;SACR;QAED,IAAI,aAAa,IAAI,gBAAgB,KAAK,SAAS,EAAE;YACnD,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;SACR;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;AA1DW,QAAA,qBAAqB,yBA0DhC;AAEF,MAAM,eAAe,GAAG,CAAC,EACvB,MAAM,EACN,QAAQ,EACR,YAAY,GAKb,EAAQ,EAAE;IACT,IAAI,CAAC,MAAM,EAAE;QACX,OAAO;KACR;IAED,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QAC3B,YAAY,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;KAC7B;IACD,YAAY,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,IAAI,CAAC;AAC1C,CAAC,CAAC"}
|
package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ export type GraphQLObjectTypeResolversToGenerate = Record<string, Record<string,
|
|
|
4
4
|
resolverName: string;
|
|
5
5
|
resolverDeclaration: string;
|
|
6
6
|
}>>;
|
|
7
|
-
export declare const getGraphQLObjectTypeResolversToGenerate: ({ typesSourceFile,
|
|
7
|
+
export declare const getGraphQLObjectTypeResolversToGenerate: ({ typesSourceFile, userDefinedSchemaObjectTypeMap, typeMappersMap, }: {
|
|
8
8
|
typesSourceFile: SourceFile;
|
|
9
9
|
typeMappersMap: TypeMappersMap;
|
|
10
|
-
|
|
10
|
+
userDefinedSchemaObjectTypeMap: Record<string, true>;
|
|
11
11
|
}) => GraphQLObjectTypeResolversToGenerate;
|
package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getGraphQLObjectTypeResolversToGenerate = void 0;
|
|
4
4
|
const ts_morph_1 = require("ts-morph");
|
|
5
5
|
const utils_1 = require("../utils");
|
|
6
|
-
const getGraphQLObjectTypeResolversToGenerate = ({ typesSourceFile,
|
|
6
|
+
const getGraphQLObjectTypeResolversToGenerate = ({ typesSourceFile, userDefinedSchemaObjectTypeMap, typeMappersMap, }) => {
|
|
7
7
|
const typeMappersEntries = Object.entries(typeMappersMap);
|
|
8
8
|
if (typeMappersEntries.length === 0) {
|
|
9
9
|
return {};
|
|
@@ -13,7 +13,7 @@ const getGraphQLObjectTypeResolversToGenerate = ({ typesSourceFile, userDefinedS
|
|
|
13
13
|
const populateSchemaTypePropertyMap = (node) => {
|
|
14
14
|
const identifier = node.getNameNode();
|
|
15
15
|
const identifierName = identifier.getText();
|
|
16
|
-
if (
|
|
16
|
+
if (userDefinedSchemaObjectTypeMap[identifierName]) {
|
|
17
17
|
schemaTypePropertyMap[identifierName] = (0, utils_1.getNodePropertyMap)(node);
|
|
18
18
|
}
|
|
19
19
|
};
|
package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getGraphQLObjectTypeResolversToGenerate.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.ts"],"names":[],"mappings":";;;AAAA,uCAKkB;AAElB,oCAAoE;AAO7D,MAAM,uCAAuC,GAAG,CAAC,EACtD,eAAe,EACf,
|
|
1
|
+
{"version":3,"file":"getGraphQLObjectTypeResolversToGenerate.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.ts"],"names":[],"mappings":";;;AAAA,uCAKkB;AAElB,oCAAoE;AAO7D,MAAM,uCAAuC,GAAG,CAAC,EACtD,eAAe,EACf,8BAA8B,EAC9B,cAAc,GAKf,EAAwC,EAAE;IACzC,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC1D,IAAI,kBAAkB,CAAC,MAAM,KAAK,CAAC,EAAE;QACnC,OAAO,EAAE,CAAC;KACX;IAED,0CAA0C;IAC1C,MAAM,qBAAqB,GAAoC,EAAE,CAAC;IAElE,MAAM,6BAA6B,GAAG,CACpC,IAAiD,EAC3C,EAAE;QACR,MAAM,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC;QAC5C,IAAI,8BAA8B,CAAC,cAAc,CAAC,EAAE;YAClD,qBAAqB,CAAC,cAAc,CAAC,GAAG,IAAA,0BAAkB,EAAC,IAAI,CAAC,CAAC;SAClE;IACH,CAAC,CAAC;IACF,eAAe;SACZ,oBAAoB,CAAC,qBAAU,CAAC,oBAAoB,CAAC;SACrD,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAE1C,eAAe;SACZ,oBAAoB,CAAC,qBAAU,CAAC,oBAAoB,CAAC;SACrD,OAAO,CAAC,6BAA6B,CAAC,CAAC;IAE1C,+CAA+C;IAC/C,MAAM,MAAM,GAAyC,EAAE,CAAC;IACxD,kBAAkB,CAAC,OAAO,CACxB,CAAC,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,cAAc,EAAE,qBAAqB,EAAE,CAAC,EAAE,EAAE;QAC7D,MAAM,4BAA4B,GAAG,qBAAqB,CAAC,UAAU,CAAC,CAAC;QACvE,IAAI,4BAA4B,EAAE;YAChC,MAAM,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,OAAO,CACjD,CAAC,kBAAkB,EAAE,EAAE;gBACrB,MAAM,kBAAkB,GACtB,qBAAqB,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBACjD,MAAM,4BAA4B,GAAG,GAAG,cAAc,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;gBACpF,MAAM,4BAA4B,GAAG,GAAG,UAAU,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;gBAEhF,IAAI,kBAAkB,CAAC,IAAI,KAAK,YAAY,EAAE;oBAC5C,OAAO;iBACR;gBAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;gBAE9C,yDAAyD;gBACzD,IAAI,CAAC,kBAAkB,EAAE;oBACvB,MAAM,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG;wBAC5C,YAAY,EAAE,kBAAkB,CAAC,IAAI;wBACrC,mBAAmB,EAAE,cAAc,4BAA4B,iCAAiC,4BAA4B,eAAe,4BAA4B,gBAAgB;qBACxL,CAAC;oBACF,OAAO;iBACR;gBAED;;;;;;;;mBAQG;gBACH,MAAM,CAAC,UAAU,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG;oBAC5C,YAAY,EAAE,kBAAkB,CAAC,IAAI;oBACrC,mBAAmB,EAAE,MAAM,kBAAkB,CAAC,IAAI;qBAC3C,4BAA4B,iCAAiC,4BAA4B,QAAQ,4BAA4B;yBACzH,kBAAkB,CAAC,IAAI;gBAChC;iBACH,CAAC;gBAEF,OAAO;YACT,CAAC,CACF,CAAC;SACH;IACH,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAvFW,QAAA,uCAAuC,2CAuFlD"}
|
|
@@ -1,16 +1,20 @@
|
|
|
1
1
|
import { GraphQLSchema } from 'graphql';
|
|
2
2
|
import type { ParseSourcesResult } from '../parseSources';
|
|
3
3
|
import type { TypeMappersMap } from '../parseTypeMappers';
|
|
4
|
-
|
|
4
|
+
import type { ParsedPresetConfig } from '../validatePresetConfig';
|
|
5
|
+
interface ParseGraphQLSchemaParams {
|
|
5
6
|
schemaAst: GraphQLSchema;
|
|
6
7
|
sourceMap: ParseSourcesResult['sourceMap'];
|
|
7
8
|
typeMappersMap: TypeMappersMap;
|
|
8
|
-
whitelistedModules:
|
|
9
|
-
blacklistedModules:
|
|
9
|
+
whitelistedModules: ParsedPresetConfig['whitelistedModules'];
|
|
10
|
+
blacklistedModules: ParsedPresetConfig['blacklistedModules'];
|
|
10
11
|
}
|
|
11
|
-
|
|
12
|
-
userDefinedSchemaTypeMap:
|
|
12
|
+
export interface ParsedGraphQLSchemaMeta {
|
|
13
|
+
userDefinedSchemaTypeMap: {
|
|
14
|
+
object: Record<string, true>;
|
|
15
|
+
scalar: Record<string, true>;
|
|
16
|
+
};
|
|
13
17
|
pluginsConfig: Record<'defaultScalarTypesMap' | 'defaultScalarExternalResolvers' | 'defaultTypeMappers', Record<string, string>>;
|
|
14
|
-
}
|
|
15
|
-
export declare const parseGraphQLSchema: ({ schemaAst, sourceMap, typeMappersMap, whitelistedModules, blacklistedModules, }:
|
|
18
|
+
}
|
|
19
|
+
export declare const parseGraphQLSchema: ({ schemaAst, sourceMap, typeMappersMap, whitelistedModules, blacklistedModules, }: ParseGraphQLSchemaParams) => ParsedGraphQLSchemaMeta;
|
|
16
20
|
export {};
|
|
@@ -20,10 +20,11 @@ const parseGraphQLSchema = ({ schemaAst, sourceMap, typeMappersMap, whitelistedM
|
|
|
20
20
|
return res;
|
|
21
21
|
}
|
|
22
22
|
if ((0, graphql_1.isScalarType)(namedType)) {
|
|
23
|
+
res.userDefinedSchemaTypeMap.scalar[schemaType] = true;
|
|
23
24
|
handleScalarType(schemaType, res);
|
|
24
25
|
}
|
|
25
26
|
if (!(0, utils_1.isRootObjectType)(schemaType) && (0, graphql_1.isObjectType)(namedType)) {
|
|
26
|
-
res.userDefinedSchemaTypeMap[schemaType] = true;
|
|
27
|
+
res.userDefinedSchemaTypeMap.object[schemaType] = true;
|
|
27
28
|
// Wire up `mappers` config
|
|
28
29
|
const typeMapperDetails = typeMappersMap[schemaType];
|
|
29
30
|
if (typeMapperDetails) {
|
|
@@ -33,7 +34,10 @@ const parseGraphQLSchema = ({ schemaAst, sourceMap, typeMappersMap, whitelistedM
|
|
|
33
34
|
}
|
|
34
35
|
return res;
|
|
35
36
|
}, {
|
|
36
|
-
userDefinedSchemaTypeMap: {
|
|
37
|
+
userDefinedSchemaTypeMap: {
|
|
38
|
+
object: {},
|
|
39
|
+
scalar: {},
|
|
40
|
+
},
|
|
37
41
|
pluginsConfig: {
|
|
38
42
|
defaultScalarTypesMap: {},
|
|
39
43
|
defaultScalarExternalResolvers: {},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseGraphQLSchema.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseGraphQLSchema/parseGraphQLSchema.ts"],"names":[],"mappings":";;;AAAA,qCAAoE;AACpE,qDAA+D;
|
|
1
|
+
{"version":3,"file":"parseGraphQLSchema.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseGraphQLSchema/parseGraphQLSchema.ts"],"names":[],"mappings":";;;AAAA,qCAAoE;AACpE,qDAA+D;AAI/D,oCAIkB;AAuBX,MAAM,kBAAkB,GAAG,CAAC,EACjC,SAAS,EACT,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,kBAAkB,GACO,EAA2B,EAAE;IACtD,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC,CAAC,MAAM,CAClD,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,SAAS,CAAC,EAAE,EAAE;;QAC/B,IAAI,IAAA,yBAAiB,EAAC,SAAS,CAAC,EAAE;YAChC,OAAO,GAAG,CAAC;SACZ;QAED,MAAM,YAAY,GAAG,IAAA,yCAAiC,EAAC;YACrD,QAAQ,EAAE,MAAA,SAAS,CAAC,OAAO,0CAAE,GAAG;YAChC,SAAS;YACT,kBAAkB;YAClB,kBAAkB;SACnB,CAAC,CAAC;QACH,IAAI,CAAC,YAAY,EAAE;YACjB,OAAO,GAAG,CAAC;SACZ;QAED,IAAI,IAAA,sBAAY,EAAC,SAAS,CAAC,EAAE;YAC3B,GAAG,CAAC,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YACvD,gBAAgB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;SACnC;QAED,IAAI,CAAC,IAAA,wBAAgB,EAAC,UAAU,CAAC,IAAI,IAAA,sBAAY,EAAC,SAAS,CAAC,EAAE;YAC5D,GAAG,CAAC,wBAAwB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;YAEvD,2BAA2B;YAC3B,MAAM,iBAAiB,GAAG,cAAc,CAAC,UAAU,CAAC,CAAC;YACrD,IAAI,iBAAiB,EAAE;gBACrB,GAAG,CAAC,aAAa,CAAC,kBAAkB,CAAC,iBAAiB,CAAC,UAAU,CAAC;oBAChE,iBAAiB,CAAC,gBAAgB,CAAC;aACtC;SACF;QAED,OAAO,GAAG,CAAC;IACb,CAAC,EACD;QACE,wBAAwB,EAAE;YACxB,MAAM,EAAE,EAAE;YACV,MAAM,EAAE,EAAE;SACX;QACD,aAAa,EAAE;YACb,qBAAqB,EAAE,EAAE;YACzB,8BAA8B,EAAE,EAAE;YAClC,kBAAkB,EAAE,EAAE;SACvB;KACF,CACF,CAAC;AACJ,CAAC,CAAC;AArDW,QAAA,kBAAkB,sBAqD7B;AAEF,MAAM,gBAAgB,GAAG,CACvB,UAAkB,EAClB,MAA+B,EACzB,EAAE;IACR,MAAM,cAAc,GAAG,2BAAe,CAAC,UAAU,CAAC,CAAC;IACnD,IAAI,CAAC,cAAc,EAAE;QACnB,OAAO;KACR;IAED,IACE,cAAc,CAAC,UAAU,CAAC,iBAAiB;QAC3C,OAAO,cAAc,CAAC,UAAU,CAAC,iBAAiB,KAAK,QAAQ,EAC/D;QACA,MAAM,CAAC,aAAa,CAAC,qBAAqB,CAAC,UAAU,CAAC;YACpD,cAAc,CAAC,UAAU,CAAC,iBAAiB,CAAC;KAC/C;IAED,MAAM,CAAC,aAAa,CAAC,8BAA8B,CACjD,UAAU,CACX,GAAG,oBAAoB,cAAc,CAAC,IAAI,UAAU,CAAC;AACxD,CAAC,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { type SourceFile } from 'ts-morph';
|
|
2
2
|
import type { TypeMappersMap } from './parseTypeMappers';
|
|
3
|
-
export declare const collectTypeMappersFromSourceFile: ({ typeMappersSourceFile, typeMappersSuffix, resolverTypesPath, shouldCollectPropertyMap, }: {
|
|
3
|
+
export declare const collectTypeMappersFromSourceFile: ({ typeMappersSourceFile, typeMappersSuffix, resolverTypesPath, shouldCollectPropertyMap, emitLegacyCommonJSImports, }: {
|
|
4
4
|
typeMappersSourceFile: SourceFile;
|
|
5
5
|
typeMappersSuffix: string;
|
|
6
6
|
resolverTypesPath: string;
|
|
7
7
|
shouldCollectPropertyMap: boolean;
|
|
8
|
+
emitLegacyCommonJSImports: boolean;
|
|
8
9
|
}, result: TypeMappersMap) => void;
|
|
@@ -4,7 +4,7 @@ exports.collectTypeMappersFromSourceFile = void 0;
|
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const ts_morph_1 = require("ts-morph");
|
|
6
6
|
const utils_1 = require("../utils");
|
|
7
|
-
const collectTypeMappersFromSourceFile = ({ typeMappersSourceFile, typeMappersSuffix, resolverTypesPath, shouldCollectPropertyMap, }, result) => {
|
|
7
|
+
const collectTypeMappersFromSourceFile = ({ typeMappersSourceFile, typeMappersSuffix, resolverTypesPath, shouldCollectPropertyMap, emitLegacyCommonJSImports, }, result) => {
|
|
8
8
|
// Look for interfaces with exported keywords
|
|
9
9
|
typeMappersSourceFile.getInterfaces().forEach((interfaceDeclaration) => {
|
|
10
10
|
if (!interfaceDeclaration.hasExportKeyword()) {
|
|
@@ -17,6 +17,7 @@ const collectTypeMappersFromSourceFile = ({ typeMappersSourceFile, typeMappersSu
|
|
|
17
17
|
typeMappersFilePath: typeMappersSourceFile.getFilePath(),
|
|
18
18
|
resolverTypesPath,
|
|
19
19
|
shouldCollectPropertyMap,
|
|
20
|
+
emitLegacyCommonJSImports,
|
|
20
21
|
}, result);
|
|
21
22
|
});
|
|
22
23
|
// Look for exported types with exported keywords
|
|
@@ -32,6 +33,7 @@ const collectTypeMappersFromSourceFile = ({ typeMappersSourceFile, typeMappersSu
|
|
|
32
33
|
typeMappersFilePath: typeMappersSourceFile.getFilePath(),
|
|
33
34
|
resolverTypesPath,
|
|
34
35
|
shouldCollectPropertyMap,
|
|
36
|
+
emitLegacyCommonJSImports,
|
|
35
37
|
}, result);
|
|
36
38
|
});
|
|
37
39
|
// Look for named exports e.g.
|
|
@@ -52,12 +54,13 @@ const collectTypeMappersFromSourceFile = ({ typeMappersSourceFile, typeMappersSu
|
|
|
52
54
|
typeMappersFilePath: typeMappersSourceFile.getFilePath(),
|
|
53
55
|
resolverTypesPath,
|
|
54
56
|
shouldCollectPropertyMap,
|
|
57
|
+
emitLegacyCommonJSImports,
|
|
55
58
|
}, result);
|
|
56
59
|
});
|
|
57
60
|
});
|
|
58
61
|
};
|
|
59
62
|
exports.collectTypeMappersFromSourceFile = collectTypeMappersFromSourceFile;
|
|
60
|
-
const addTypeMapperDetailsIfValid = ({ declarationNode, identifierNode, typeMappersSuffix, typeMappersFilePath, resolverTypesPath, shouldCollectPropertyMap, }, result) => {
|
|
63
|
+
const addTypeMapperDetailsIfValid = ({ declarationNode, identifierNode, typeMappersSuffix, typeMappersFilePath, resolverTypesPath, shouldCollectPropertyMap, emitLegacyCommonJSImports, }, result) => {
|
|
61
64
|
const identifierName = identifierNode.getText();
|
|
62
65
|
if (!identifierName.endsWith(typeMappersSuffix)) {
|
|
63
66
|
return;
|
|
@@ -79,7 +82,8 @@ const addTypeMapperDetailsIfValid = ({ declarationNode, identifierNode, typeMapp
|
|
|
79
82
|
.join(path.posix.sep);
|
|
80
83
|
const parsedRelativePathFromResolverTypesToSourceFile = path.parse(relativePath);
|
|
81
84
|
const relativeImportPathFromResolverTypesToSourceFile = (0, utils_1.normalizeRelativePath)(path.posix.join(parsedRelativePathFromResolverTypesToSourceFile.dir, parsedRelativePathFromResolverTypesToSourceFile.name));
|
|
82
|
-
const
|
|
85
|
+
const fileExtension = emitLegacyCommonJSImports ? '' : '.js';
|
|
86
|
+
const configImportPath = `${relativeImportPathFromResolverTypesToSourceFile}${fileExtension}#${identifierName}`;
|
|
83
87
|
if (result[schemaType]) {
|
|
84
88
|
throw new Error(`GraphQL type "${schemaType}" has duplicated "${identifierName}" mappers:\n - ${configImportPath}\n - ${result[schemaType].configImportPath}`);
|
|
85
89
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"collectTypeMappersFromSourceFile.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseTypeMappers/collectTypeMappersFromSourceFile.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,uCAOkB;AAClB,oCAAqE;AAG9D,MAAM,gCAAgC,GAAG,CAC9C,EACE,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,wBAAwB,
|
|
1
|
+
{"version":3,"file":"collectTypeMappersFromSourceFile.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseTypeMappers/collectTypeMappersFromSourceFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export interface ParseTypeMappersParams {
|
|
|
8
8
|
typeMappersSuffix: string;
|
|
9
9
|
tsMorphProject: Project;
|
|
10
10
|
shouldCollectPropertyMap: boolean;
|
|
11
|
+
emitLegacyCommonJSImports: boolean;
|
|
11
12
|
}
|
|
12
13
|
export interface TypeMapperDetails {
|
|
13
14
|
schemaType: string;
|
|
@@ -16,4 +17,4 @@ export interface TypeMapperDetails {
|
|
|
16
17
|
configImportPath: string;
|
|
17
18
|
}
|
|
18
19
|
export type TypeMappersMap = Record<string, TypeMapperDetails>;
|
|
19
|
-
export declare const parseTypeMappers: ({ sourceMap, resolverTypesPath, typeMappersFileExtension, typeMappersSuffix, tsMorphProject, shouldCollectPropertyMap, }: ParseTypeMappersParams) => TypeMappersMap;
|
|
20
|
+
export declare const parseTypeMappers: ({ sourceMap, resolverTypesPath, typeMappersFileExtension, typeMappersSuffix, tsMorphProject, shouldCollectPropertyMap, emitLegacyCommonJSImports, }: ParseTypeMappersParams) => TypeMappersMap;
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.parseTypeMappers = void 0;
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const collectTypeMappersFromSourceFile_1 = require("./collectTypeMappersFromSourceFile");
|
|
6
|
-
const parseTypeMappers = ({ sourceMap, resolverTypesPath, typeMappersFileExtension, typeMappersSuffix, tsMorphProject, shouldCollectPropertyMap, }) => {
|
|
6
|
+
const parseTypeMappers = ({ sourceMap, resolverTypesPath, typeMappersFileExtension, typeMappersSuffix, tsMorphProject, shouldCollectPropertyMap, emitLegacyCommonJSImports, }) => {
|
|
7
7
|
const result = Object.entries(sourceMap).reduce((res, [_, { sourcePath }]) => {
|
|
8
8
|
const typeMapperFilePath = path.posix.join(sourcePath.dir, `${sourcePath.name}${typeMappersFileExtension}`);
|
|
9
9
|
const typeMappersSourceFile = tsMorphProject.addSourceFileAtPathIfExists(typeMapperFilePath);
|
|
@@ -15,6 +15,7 @@ const parseTypeMappers = ({ sourceMap, resolverTypesPath, typeMappersFileExtensi
|
|
|
15
15
|
typeMappersSuffix,
|
|
16
16
|
resolverTypesPath,
|
|
17
17
|
shouldCollectPropertyMap,
|
|
18
|
+
emitLegacyCommonJSImports,
|
|
18
19
|
}, res);
|
|
19
20
|
return res;
|
|
20
21
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseTypeMappers.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseTypeMappers/parseTypeMappers.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAI7B,yFAAsF;
|
|
1
|
+
{"version":3,"file":"parseTypeMappers.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/parseTypeMappers/parseTypeMappers.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAI7B,yFAAsF;AAqB/E,MAAM,gBAAgB,GAAG,CAAC,EAC/B,SAAS,EACT,iBAAiB,EACjB,wBAAwB,EACxB,iBAAiB,EACjB,cAAc,EACd,wBAAwB,EACxB,yBAAyB,GACF,EAAkB,EAAE;IAC3C,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,EAAE;QAC3B,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CACxC,UAAU,CAAC,GAAG,EACd,GAAG,UAAU,CAAC,IAAI,GAAG,wBAAwB,EAAE,CAChD,CAAC;QAEF,MAAM,qBAAqB,GACzB,cAAc,CAAC,2BAA2B,CAAC,kBAAkB,CAAC,CAAC;QAEjE,IAAI,CAAC,qBAAqB,EAAE;YAC1B,OAAO,GAAG,CAAC;SACZ;QAED,IAAA,mEAAgC,EAC9B;YACE,qBAAqB;YACrB,iBAAiB;YACjB,iBAAiB;YACjB,wBAAwB;YACxB,yBAAyB;SAC1B,EACD,GAAG,CACJ,CAAC;QAEF,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IACF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAvCW,QAAA,gBAAgB,oBAuC3B"}
|
package/src/preset.js
CHANGED
|
@@ -26,7 +26,7 @@ exports.preset = {
|
|
|
26
26
|
if (!Array.isArray(sources) || sources.length === 0) {
|
|
27
27
|
throw new Error('Empty Sources. Make sure schema files are parsed correctly.');
|
|
28
28
|
}
|
|
29
|
-
const { resolverTypesPath: relativeResolverTypesPathFromBaseOutputDir, resolverRelativeTargetDir, mappersFileExtension: typeMappersFileExtension, mappersSuffix: typeMappersSuffix, resolverMainFile, resolverMainFileMode, typeDefsFilePath, typeDefsFileMode, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsMorphProjectOptions, fixObjectTypeResolvers, } = (0, validatePresetConfig_1.validatePresetConfig)(rawPresetConfig);
|
|
29
|
+
const { resolverTypesPath: relativeResolverTypesPathFromBaseOutputDir, resolverRelativeTargetDir, mappersFileExtension: typeMappersFileExtension, mappersSuffix: typeMappersSuffix, resolverMainFile, resolverMainFileMode, typeDefsFilePath, typeDefsFileMode, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsMorphProjectOptions, fixObjectTypeResolvers, emitLegacyCommonJSImports, } = (0, validatePresetConfig_1.validatePresetConfig)(rawPresetConfig);
|
|
30
30
|
const resolverTypesPath = path.posix.join(baseOutputDir, relativeResolverTypesPathFromBaseOutputDir);
|
|
31
31
|
const { sourceMap } = (0, parseSources_1.parseSources)(sources);
|
|
32
32
|
const tsMorphProject = yield profiler.run(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () { return new ts_morph_1.Project(tsMorphProjectOptions); }), createProfilerRunName('Initialising ts-morph project'));
|
|
@@ -38,10 +38,10 @@ exports.preset = {
|
|
|
38
38
|
typeMappersSuffix,
|
|
39
39
|
tsMorphProject,
|
|
40
40
|
shouldCollectPropertyMap: fixObjectTypeResolvers !== 'disabled',
|
|
41
|
+
emitLegacyCommonJSImports,
|
|
41
42
|
});
|
|
42
43
|
}), createProfilerRunName('parseTypeMappers'));
|
|
43
44
|
const generatesSection = [];
|
|
44
|
-
// typescript and typescript-resolvers plugins config
|
|
45
45
|
const { userDefinedSchemaTypeMap, pluginsConfig: { defaultScalarTypesMap, defaultScalarExternalResolvers, defaultTypeMappers, }, } = (0, parseGraphQLSchema_1.parseGraphQLSchema)({
|
|
46
46
|
schemaAst,
|
|
47
47
|
sourceMap,
|
|
@@ -49,7 +49,8 @@ exports.preset = {
|
|
|
49
49
|
whitelistedModules,
|
|
50
50
|
blacklistedModules,
|
|
51
51
|
});
|
|
52
|
-
|
|
52
|
+
// typescript and typescript-resolvers plugins config
|
|
53
|
+
const resolverTypesConfig = Object.assign(Object.assign({ enumsAsTypes: true, nonOptionalTypename: true, emitLegacyCommonJSImports }, typesPluginsConfig), { scalars: Object.assign(Object.assign({}, defaultScalarTypesMap), typesPluginsConfig.scalars), mappers: Object.assign(Object.assign({}, defaultTypeMappers), typesPluginsConfig.mappers) });
|
|
53
54
|
// typesSourceFile is the virtual `types.generated.ts`
|
|
54
55
|
// This is useful when we need to do static analysis as most types come from this file
|
|
55
56
|
// e.g. comparing mappers field type vs schema object field type
|
|
@@ -62,7 +63,7 @@ exports.preset = {
|
|
|
62
63
|
const graphQLObjectTypeResolversToGenerate = yield profiler.run(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
63
64
|
return (0, getGraphQLObjectTypeResolversToGenerate_1.getGraphQLObjectTypeResolversToGenerate)({
|
|
64
65
|
typesSourceFile,
|
|
65
|
-
userDefinedSchemaTypeMap,
|
|
66
|
+
userDefinedSchemaObjectTypeMap: userDefinedSchemaTypeMap.object,
|
|
66
67
|
typeMappersMap,
|
|
67
68
|
});
|
|
68
69
|
}), createProfilerRunName('graphQLObjectTypeResolversToGenerate'));
|
|
@@ -127,6 +128,7 @@ exports.preset = {
|
|
|
127
128
|
whitelistedModules,
|
|
128
129
|
blacklistedModules,
|
|
129
130
|
externalResolvers: Object.assign(Object.assign({}, defaultScalarExternalResolvers), externalResolvers),
|
|
131
|
+
emitLegacyCommonJSImports,
|
|
130
132
|
},
|
|
131
133
|
result,
|
|
132
134
|
});
|
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,6BAA6B;AAC7B,kDAAkD;AAClD,gEAAgE;AAChE,mFAAmF;AACnF,oEAGyC;AACzC,uCAAmC;AACnC,iDAA8C;AAC9C,6DAA0D;AAC1D,mEAGiC;AACjC,mEAAgE;AAChE,uGAAoG;AACpG,+FAA4F;AAC5F,yDAAsD;AACtD,iEAA+E;AAElE,QAAA,UAAU,GAAG,0CAA0C,CAAC;AAExD,QAAA,MAAM,GAAwC;IACzD,qBAAqB,EAAE,CAAO,EAC5B,MAAM,EACN,SAAS,EACT,YAAY,EAAE,eAAe,EAC7B,aAAa,EACb,QAAQ,GAAG,IAAA,mCAAkB,GAAE,GAChC,EAAE,EAAE;QACH,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;SACtC;QACD,MAAM,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,eAAe,CAAC;QACrD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACnD,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;SACH;QAED,MAAM,EACJ,iBAAiB,EAAE,0CAA0C,EAC7D,yBAAyB,EACzB,oBAAoB,EAAE,wBAAwB,EAC9C,aAAa,EAAE,iBAAiB,EAChC,gBAAgB,EAChB,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,EAChB,IAAI,EACJ,kBAAkB,EAClB,kBAAkB,EAClB,iBAAiB,EACjB,kBAAkB,EAClB,qBAAqB,EACrB,sBAAsB,
|
|
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.js
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.fmt = void 0;
|
|
4
|
+
const preset_1 = require("../preset");
|
|
5
|
+
/**
|
|
6
|
+
* Shared message formatter
|
|
7
|
+
*/
|
|
8
|
+
exports.fmt = {
|
|
9
|
+
error: (input, type) => {
|
|
10
|
+
return `[${preset_1.presetName}] ERROR: ${type} - ${input}`;
|
|
11
|
+
},
|
|
12
|
+
warn: (input) => {
|
|
13
|
+
return `[${preset_1.presetName}] WARN: ${input}`;
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
//# sourceMappingURL=fmt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"fmt.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/fmt.ts"],"names":[],"mappings":";;;AAAA,sCAAuC;AAEvC;;GAEG;AACU,QAAA,GAAG,GAAG;IACjB,KAAK,EAAE,CAAC,KAAa,EAAE,IAAkB,EAAU,EAAE;QACnD,OAAO,IAAI,mBAAU,YAAY,IAAI,MAAM,KAAK,EAAE,CAAC;IACrD,CAAC;IACD,IAAI,EAAE,CAAC,KAAa,EAAU,EAAE;QAC9B,OAAO,IAAI,mBAAU,WAAW,KAAK,EAAE,CAAC;IAC1C,CAAC;CACF,CAAC"}
|
package/src/utils/index.d.ts
CHANGED
package/src/utils/index.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
tslib_1.__exportStar(require("./cwd"), exports);
|
|
5
|
+
tslib_1.__exportStar(require("./fmt"), exports);
|
|
5
6
|
tslib_1.__exportStar(require("./parseLocationForWhitelistedModule"), exports);
|
|
6
7
|
tslib_1.__exportStar(require("./isNativeNamedType"), exports);
|
|
7
8
|
tslib_1.__exportStar(require("./isRootObjectType"), exports);
|
package/src/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,8EAAoD;AACpD,8DAAoC;AACpC,6DAAmC;AACnC,gEAAsC;AACtC,4DAAkC;AAClC,+DAAqC;AACrC,kEAAwC;AACxC,+DAAqC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/index.ts"],"names":[],"mappings":";;;AAAA,gDAAsB;AACtB,gDAAsB;AACtB,8EAAoD;AACpD,8DAAoC;AACpC,6DAAmC;AACnC,gEAAsC;AACtC,4DAAkC;AAClC,+DAAqC;AACrC,kEAAwC;AACxC,+DAAqC"}
|
|
@@ -6,5 +6,6 @@ export interface ImportLineMeta {
|
|
|
6
6
|
identifierName: string;
|
|
7
7
|
})[];
|
|
8
8
|
defaultImport?: string;
|
|
9
|
+
emitLegacyCommonJSImports: boolean;
|
|
9
10
|
}
|
|
10
|
-
export declare function printImportLine({ isTypeImport, module, namedImports, defaultImport, }: ImportLineMeta): string;
|
|
11
|
+
export declare function printImportLine({ isTypeImport, module, namedImports, defaultImport, emitLegacyCommonJSImports, }: ImportLineMeta): string;
|
|
@@ -1,14 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.printImportLine = void 0;
|
|
4
|
-
function printImportLine({ isTypeImport, module, namedImports, defaultImport, }) {
|
|
4
|
+
function printImportLine({ isTypeImport, module, namedImports, defaultImport, emitLegacyCommonJSImports, }) {
|
|
5
5
|
const typeImportKeyword = isTypeImport ? 'type' : '';
|
|
6
6
|
const hasDefaultImport = Boolean(defaultImport);
|
|
7
7
|
const hasNamedImports = namedImports.length > 0;
|
|
8
8
|
const namedImportsString = hasNamedImports
|
|
9
9
|
? `{ ${namedImports.map(printNamedImportSpecifier).join(',')} }`
|
|
10
10
|
: '';
|
|
11
|
-
|
|
11
|
+
const isFile = module.startsWith('.');
|
|
12
|
+
const fileExt = emitLegacyCommonJSImports || !isFile ? '' : '.js';
|
|
13
|
+
return `import ${typeImportKeyword} ${defaultImport || ''} ${hasDefaultImport && hasNamedImports ? ',' : ''} ${namedImportsString} from '${normalizeModuleExtensionForImport(module)}${fileExt}';`;
|
|
12
14
|
}
|
|
13
15
|
exports.printImportLine = printImportLine;
|
|
14
16
|
const normalizeModuleExtensionForImport = (module) => {
|
|
@@ -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":";;;AAQA,SAAgB,eAAe,CAAC,EAC9B,YAAY,EACZ,MAAM,EACN,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;IACP,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,yBAAyB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAElE,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;AArBD,0CAqBC;AAED,MAAM,iCAAiC,GAAG,CAAC,MAAc,EAAU,EAAE;IACnE,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;QAC1B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;KACjD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,WAAmD,EAC3C,EAAE;IACV,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;QACnC,OAAO,WAAW,CAAC;KACpB;IAED,IAAI,WAAW,CAAC,YAAY,KAAK,WAAW,CAAC,cAAc,EAAE;QAC3D,OAAO,WAAW,CAAC,cAAc,CAAC;KACnC;IAED,OAAO,GAAG,WAAW,CAAC,YAAY,OAAO,WAAW,CAAC,cAAc,EAAE,CAAC;AACxE,CAAC,CAAC"}
|
|
@@ -24,6 +24,7 @@ export interface ParsedPresetConfig {
|
|
|
24
24
|
typesPluginsConfig: ParsedTypesPluginsConfig;
|
|
25
25
|
tsMorphProjectOptions: ProjectOptions;
|
|
26
26
|
fixObjectTypeResolvers: FixObjectTypeResolvers;
|
|
27
|
+
emitLegacyCommonJSImports: boolean;
|
|
27
28
|
}
|
|
28
29
|
export interface RawPresetConfig {
|
|
29
30
|
resolverTypesPath?: string;
|
|
@@ -41,6 +42,7 @@ export interface RawPresetConfig {
|
|
|
41
42
|
typesPluginsConfig?: typeScriptPlugin.TypeScriptPluginConfig & typeScriptResolversPlugin.TypeScriptResolversPluginConfig;
|
|
42
43
|
tsConfigFilePath?: string;
|
|
43
44
|
fixObjectTypeResolvers?: string;
|
|
45
|
+
emitLegacyCommonJSImports?: boolean;
|
|
44
46
|
}
|
|
45
47
|
export interface TypedPresetConfig extends RawPresetConfig {
|
|
46
48
|
mode?: ConfigMode;
|
|
@@ -48,5 +50,5 @@ export interface TypedPresetConfig extends RawPresetConfig {
|
|
|
48
50
|
typeDefsFileMode?: TypeDefsFileMode;
|
|
49
51
|
fixObjectTypeResolvers?: FixObjectTypeResolvers;
|
|
50
52
|
}
|
|
51
|
-
export declare const validatePresetConfig: ({ resolverTypesPath, resolverRelativeTargetDir, resolverMainFile, resolverMainFileMode, typeDefsFilePath, typeDefsFileMode: inputTypeDefsFileMode, mappersFileExtension, mappersSuffix, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsConfigFilePath, fixObjectTypeResolvers, }: RawPresetConfig) => ParsedPresetConfig;
|
|
53
|
+
export declare const validatePresetConfig: ({ resolverTypesPath, resolverRelativeTargetDir, resolverMainFile, resolverMainFileMode, typeDefsFilePath, typeDefsFileMode: inputTypeDefsFileMode, mappersFileExtension, mappersSuffix, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsConfigFilePath, fixObjectTypeResolvers, emitLegacyCommonJSImports, }: RawPresetConfig) => ParsedPresetConfig;
|
|
52
54
|
export {};
|
|
@@ -3,60 +3,63 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.validatePresetConfig = void 0;
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const fs = require("fs");
|
|
6
|
-
const preset_1 = require("../preset");
|
|
7
6
|
const utils_1 = require("../utils");
|
|
8
7
|
const defaultResolverRelativeTargetDirMap = {
|
|
9
8
|
modules: 'resolvers',
|
|
10
9
|
merged: '',
|
|
11
10
|
};
|
|
12
11
|
const defaultTypeDefsFilePath = './typeDefs.generated.ts';
|
|
13
|
-
const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', resolverRelativeTargetDir, resolverMainFile = 'resolvers.generated.ts', resolverMainFileMode = 'merged', typeDefsFilePath = defaultTypeDefsFilePath, typeDefsFileMode: inputTypeDefsFileMode = 'merged', mappersFileExtension = '.mappers.ts', mappersSuffix = 'Mapper', mode = 'modules', whitelistedModules, blacklistedModules, externalResolvers = {}, typesPluginsConfig = {}, tsConfigFilePath = './tsconfig.json', fixObjectTypeResolvers = 'smart', }) => {
|
|
12
|
+
const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', resolverRelativeTargetDir, resolverMainFile = 'resolvers.generated.ts', resolverMainFileMode = 'merged', typeDefsFilePath = defaultTypeDefsFilePath, typeDefsFileMode: inputTypeDefsFileMode = 'merged', mappersFileExtension = '.mappers.ts', mappersSuffix = 'Mapper', mode = 'modules', whitelistedModules, blacklistedModules, externalResolvers = {}, typesPluginsConfig = {}, tsConfigFilePath = './tsconfig.json', fixObjectTypeResolvers = 'smart', emitLegacyCommonJSImports = true, }) => {
|
|
14
13
|
if (mode !== 'merged' && mode !== 'modules') {
|
|
15
|
-
throw new Error(
|
|
14
|
+
throw new Error(utils_1.fmt.error('presetConfig.mode must be "merged" or "modules" (default is "modules")', 'Validation'));
|
|
16
15
|
}
|
|
17
16
|
if (fixObjectTypeResolvers !== 'smart' &&
|
|
18
17
|
fixObjectTypeResolvers !== 'disabled') {
|
|
19
|
-
throw new Error(
|
|
18
|
+
throw new Error(utils_1.fmt.error('presetConfig.fixObjectTypeResolvers must be "smart" or "disabled" (default is "smart")', 'Validation'));
|
|
20
19
|
}
|
|
21
20
|
if (resolverMainFileMode !== 'merged' && resolverMainFileMode !== 'modules') {
|
|
22
|
-
throw new Error(
|
|
21
|
+
throw new Error(utils_1.fmt.error('presetConfig.resolverMainFileMode must be "merged" or "modules" (default is "merged")', 'Validation'));
|
|
23
22
|
}
|
|
24
23
|
let typeDefsFileMode = inputTypeDefsFileMode;
|
|
25
24
|
if (mode === 'merged') {
|
|
26
25
|
// If mode is `merged`, `typeDefsFileMode` is also `merged` because there's no whitelisted or modules concepts
|
|
27
26
|
typeDefsFileMode = 'merged';
|
|
28
|
-
console.warn(
|
|
27
|
+
console.warn(utils_1.fmt.warn(`presetConfig.typeDefsFileMode has automatically been set to "merged" because presetConfig.mode is "merged"`));
|
|
29
28
|
}
|
|
30
29
|
if (typeDefsFileMode !== 'merged' &&
|
|
31
30
|
typeDefsFileMode !== 'modules' &&
|
|
32
31
|
typeDefsFileMode !== 'mergedWhitelisted') {
|
|
33
|
-
throw new Error(
|
|
32
|
+
throw new Error(utils_1.fmt.error('presetConfig.typeDefsFileMode must be "merged", "mergedWhitelisted" or "modules" (default is "merged")', 'Validation'));
|
|
34
33
|
}
|
|
35
34
|
if (!resolverTypesPath) {
|
|
36
|
-
throw new Error(
|
|
35
|
+
throw new Error(utils_1.fmt.error('presetConfig.resolverTypesPath is required', 'Validation'));
|
|
37
36
|
}
|
|
38
37
|
const finalResolverRelativeTargetDir = resolverRelativeTargetDir === undefined
|
|
39
38
|
? defaultResolverRelativeTargetDirMap[mode]
|
|
40
39
|
: resolverRelativeTargetDir;
|
|
41
40
|
if (path.extname(resolverMainFile) === '') {
|
|
42
|
-
throw new Error(
|
|
41
|
+
throw new Error(utils_1.fmt.error('presetConfig.mainFile must be a valid file name', 'Validation'));
|
|
43
42
|
}
|
|
44
43
|
if (whitelistedModules) {
|
|
45
44
|
if (!Array.isArray(whitelistedModules)) {
|
|
46
|
-
throw new Error(
|
|
45
|
+
throw new Error(utils_1.fmt.error('presetConfig.whitelistedModules must be an array if provided', 'Validation'));
|
|
47
46
|
}
|
|
48
47
|
if (mode !== 'modules') {
|
|
49
|
-
throw new Error(
|
|
48
|
+
throw new Error(utils_1.fmt.error('presetConfig.whitelistedModules can only be used with presetConfig.mode == "modules"', 'Validation'));
|
|
50
49
|
}
|
|
51
50
|
}
|
|
52
51
|
if (blacklistedModules) {
|
|
53
52
|
if (!Array.isArray(blacklistedModules)) {
|
|
54
|
-
throw new Error(
|
|
53
|
+
throw new Error(utils_1.fmt.error('presetConfig.blacklistedModules must be an array if provided', 'Validation'));
|
|
55
54
|
}
|
|
56
55
|
if (mode !== 'modules') {
|
|
57
|
-
throw new Error(
|
|
56
|
+
throw new Error(utils_1.fmt.error('presetConfig.blacklistedModules can only be used with presetConfig.mode == "modules"', 'Validation'));
|
|
58
57
|
}
|
|
59
58
|
}
|
|
59
|
+
if (emitLegacyCommonJSImports === false &&
|
|
60
|
+
typesPluginsConfig.emitLegacyCommonJSImports !== null) {
|
|
61
|
+
console.warn(utils_1.fmt.warn(`emitLegacyCommonJSImports is set to false and typesPluginsConfig's emitLegacyCommonJSImports is set as well - usually this is unwanted behaviour. The root config's emitLegacyCommonJSImports sets typesPluinsConfig's emitLegacyCommonJSImports as well.`));
|
|
62
|
+
}
|
|
60
63
|
const validatedTypesPluginsConfig = validateTypesPluginsConfig(typesPluginsConfig);
|
|
61
64
|
let finalTypeDefsFilePath = typeDefsFilePath;
|
|
62
65
|
if (finalTypeDefsFilePath === true) {
|
|
@@ -71,7 +74,7 @@ const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', reso
|
|
|
71
74
|
tsMorphProjectOptions.tsConfigFilePath = absoluteTsConfigFilePath;
|
|
72
75
|
}
|
|
73
76
|
else {
|
|
74
|
-
console.warn(
|
|
77
|
+
console.warn(utils_1.fmt.warn(`Unable to find TypeScript config at ${absoluteTsConfigFilePath}. Use presetConfig.tsConfigFilePath to set a custom value. Otherwise, type analysis may not work correctly.`));
|
|
75
78
|
}
|
|
76
79
|
}
|
|
77
80
|
return {
|
|
@@ -90,20 +93,15 @@ const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', reso
|
|
|
90
93
|
typesPluginsConfig: validatedTypesPluginsConfig,
|
|
91
94
|
tsMorphProjectOptions,
|
|
92
95
|
fixObjectTypeResolvers,
|
|
96
|
+
emitLegacyCommonJSImports,
|
|
93
97
|
};
|
|
94
98
|
};
|
|
95
99
|
exports.validatePresetConfig = validatePresetConfig;
|
|
96
100
|
const validateTypesPluginsConfig = (config) => {
|
|
97
101
|
const scalarsOption = config.scalars || {};
|
|
98
102
|
if (typeof scalarsOption === 'string') {
|
|
99
|
-
throw new Error(
|
|
103
|
+
throw new Error(utils_1.fmt.error('presetConfig.typesPluginsConfig.scalars of type "string" is not supported', 'Validation'));
|
|
100
104
|
}
|
|
101
105
|
return Object.assign(Object.assign({}, config), { scalars: scalarsOption });
|
|
102
106
|
};
|
|
103
|
-
const printError = (input, type) => {
|
|
104
|
-
return `[${preset_1.presetName}] ERROR: ${type} - ${input}`;
|
|
105
|
-
};
|
|
106
|
-
const printWarning = (input) => {
|
|
107
|
-
return `[${preset_1.presetName}] WARN: ${input}`;
|
|
108
|
-
};
|
|
109
107
|
//# sourceMappingURL=validatePresetConfig.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yBAAyB;AAIzB,
|
|
1
|
+
{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":"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"}
|