@eddeee888/gcg-typescript-resolver-files 0.3.0 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +191 -32
- package/package.json +5 -5
- package/src/defineConfig.d.ts +5 -0
- package/src/defineConfig.js +19 -0
- package/src/defineConfig.js.map +1 -0
- package/src/generateResolverFiles/addExternalResolverImport.d.ts +1 -0
- package/src/generateResolverFiles/addExternalResolverImport.js +1 -0
- package/src/generateResolverFiles/addExternalResolverImport.js.map +1 -1
- package/src/generateResolverFiles/addResolverMainFile.d.ts +4 -1
- package/src/generateResolverFiles/addResolverMainFile.js +71 -50
- 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 +9 -2
- 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/postProcessFiles.js +2 -1
- package/src/generateResolverFiles/postProcessFiles.js.map +1 -1
- package/src/generateResolverFiles/types.d.ts +11 -4
- package/src/generateResolverFiles/visitNamedType.js +28 -11
- package/src/generateResolverFiles/visitNamedType.js.map +1 -1
- package/src/generateTypeDefsFiles/generateTypeDefsContent.js.map +1 -0
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.d.ts +13 -0
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.js +60 -0
- package/src/generateTypeDefsFiles/generateTypeDefsFiles.js.map +1 -0
- package/src/generateTypeDefsFiles/index.d.ts +1 -0
- package/src/{generateTypeDefsContent → generateTypeDefsFiles}/index.js +1 -1
- package/src/{generateTypeDefsContent → generateTypeDefsFiles}/index.js.map +1 -1
- package/src/getGraphQLObjectTypeResolversToGenerate/getGraphQLObjectTypeResolversToGenerate.d.ts +1 -1
- package/src/index.d.ts +1 -0
- package/src/index.js +3 -1
- package/src/index.js.map +1 -1
- package/src/parseGraphQLSchema/index.d.ts +1 -0
- package/src/{getPluginsConfig → parseGraphQLSchema}/index.js +1 -1
- package/src/parseGraphQLSchema/index.js.map +1 -0
- package/src/{getPluginsConfig/getPluginsConfig.d.ts → parseGraphQLSchema/parseGraphQLSchema.d.ts} +2 -5
- package/src/{getPluginsConfig/getPluginsConfig.js → parseGraphQLSchema/parseGraphQLSchema.js} +4 -7
- package/src/parseGraphQLSchema/parseGraphQLSchema.js.map +1 -0
- package/src/parseSources/parseSources.d.ts +0 -1
- package/src/parseSources/parseSources.js +2 -3
- package/src/parseSources/parseSources.js.map +1 -1
- package/src/parseTypeMappers/collectTypeMappersFromSourceFile.js +13 -2
- package/src/parseTypeMappers/collectTypeMappersFromSourceFile.js.map +1 -1
- package/src/parseTypeMappers/parseTypeMappers.d.ts +1 -1
- package/src/parseTypeMappers/parseTypeMappers.js +1 -1
- package/src/parseTypeMappers/parseTypeMappers.js.map +1 -1
- package/src/preset.js +28 -20
- package/src/preset.js.map +1 -1
- package/src/utils/cwd.d.ts +4 -0
- package/src/utils/cwd.js +12 -0
- package/src/utils/cwd.js.map +1 -0
- package/src/utils/getNodePropertyMap.d.ts +1 -1
- package/src/utils/getNodePropertyMap.js +23 -15
- package/src/utils/getNodePropertyMap.js.map +1 -1
- package/src/utils/index.d.ts +4 -2
- package/src/utils/index.js +4 -16
- package/src/utils/index.js.map +1 -1
- package/src/utils/isRootObjectType.d.ts +1 -1
- package/src/utils/isWhitelistedModule.d.ts +5 -0
- package/src/utils/isWhitelistedModule.js +16 -0
- package/src/utils/isWhitelistedModule.js.map +1 -0
- package/src/utils/normalizeRelativePath.d.ts +1 -0
- package/src/utils/normalizeRelativePath.js +11 -0
- package/src/utils/normalizeRelativePath.js.map +1 -0
- package/src/utils/parseLocationForWhitelistedModule.js +7 -9
- package/src/utils/parseLocationForWhitelistedModule.js.map +1 -1
- package/src/utils/relativeModulePath.d.ts +1 -0
- package/src/utils/relativeModulePath.js +11 -0
- package/src/utils/relativeModulePath.js.map +1 -0
- package/src/validatePresetConfig/validatePresetConfig.d.ts +19 -5
- package/src/validatePresetConfig/validatePresetConfig.js +40 -19
- package/src/validatePresetConfig/validatePresetConfig.js.map +1 -1
- package/src/generateTypeDefsContent/generateTypeDefsContent.js.map +0 -1
- package/src/generateTypeDefsContent/index.d.ts +0 -1
- package/src/getPluginsConfig/getPluginsConfig.js.map +0 -1
- package/src/getPluginsConfig/index.d.ts +0 -1
- package/src/getPluginsConfig/index.js.map +0 -1
- /package/src/{generateTypeDefsContent → generateTypeDefsFiles}/generateTypeDefsContent.d.ts +0 -0
- /package/src/{generateTypeDefsContent → generateTypeDefsFiles}/generateTypeDefsContent.js +0 -0
package/src/preset.js
CHANGED
|
@@ -9,9 +9,9 @@ const typeScriptResolversPlugin = require("@graphql-codegen/typescript-resolvers
|
|
|
9
9
|
const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
|
|
10
10
|
const ts_morph_1 = require("ts-morph");
|
|
11
11
|
const parseSources_1 = require("./parseSources");
|
|
12
|
-
const
|
|
12
|
+
const parseGraphQLSchema_1 = require("./parseGraphQLSchema");
|
|
13
13
|
const generateResolverFiles_1 = require("./generateResolverFiles");
|
|
14
|
-
const
|
|
14
|
+
const generateTypeDefsFiles_1 = require("./generateTypeDefsFiles");
|
|
15
15
|
const getGraphQLObjectTypeResolversToGenerate_1 = require("./getGraphQLObjectTypeResolversToGenerate");
|
|
16
16
|
const addVirtualTypesFileToTsMorphProject_1 = require("./addVirtualTypesFileToTsMorphProject");
|
|
17
17
|
const parseTypeMappers_1 = require("./parseTypeMappers");
|
|
@@ -26,9 +26,9 @@ 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, typeDefsFilePath, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsMorphProjectOptions, fixObjectTypeResolvers, } = (0, validatePresetConfig_1.validatePresetConfig)(rawPresetConfig);
|
|
30
|
-
const resolverTypesPath = path.join(baseOutputDir, relativeResolverTypesPathFromBaseOutputDir);
|
|
31
|
-
const { sourceMap
|
|
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);
|
|
30
|
+
const resolverTypesPath = path.posix.join(baseOutputDir, relativeResolverTypesPathFromBaseOutputDir);
|
|
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'));
|
|
33
33
|
const typeMappersMap = yield profiler.run(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
34
34
|
return (0, parseTypeMappers_1.parseTypeMappers)({
|
|
@@ -42,7 +42,7 @@ exports.preset = {
|
|
|
42
42
|
}), createProfilerRunName('parseTypeMappers'));
|
|
43
43
|
const generatesSection = [];
|
|
44
44
|
// typescript and typescript-resolvers plugins config
|
|
45
|
-
const { userDefinedSchemaTypeMap, pluginsConfig: { defaultScalarTypesMap, defaultScalarExternalResolvers, defaultTypeMappers, }, } = (0,
|
|
45
|
+
const { userDefinedSchemaTypeMap, pluginsConfig: { defaultScalarTypesMap, defaultScalarExternalResolvers, defaultTypeMappers, }, } = (0, parseGraphQLSchema_1.parseGraphQLSchema)({
|
|
46
46
|
schemaAst,
|
|
47
47
|
sourceMap,
|
|
48
48
|
typeMappersMap,
|
|
@@ -80,20 +80,27 @@ exports.preset = {
|
|
|
80
80
|
generatesSection.push(resolverTypesFile);
|
|
81
81
|
// typeDefs
|
|
82
82
|
if (typeDefsFilePath) {
|
|
83
|
-
const
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
83
|
+
const typeDefsFiles = yield profiler.run(() => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
84
|
+
return (0, generateTypeDefsFiles_1.generateTypeDefsFiles)({
|
|
85
|
+
baseOutputDir,
|
|
86
|
+
typeDefsFilePath,
|
|
87
|
+
typeDefsFileMode,
|
|
88
|
+
sourceMap,
|
|
89
|
+
whitelistedModules,
|
|
90
|
+
blacklistedModules,
|
|
91
|
+
});
|
|
92
|
+
}), createProfilerRunName('generateTypeDefsFiles'));
|
|
93
|
+
Object.entries(typeDefsFiles).forEach(([filename, meta]) => {
|
|
94
|
+
const typeDefsFile = {
|
|
95
|
+
filename: filename,
|
|
96
|
+
pluginMap: { add: addPlugin },
|
|
97
|
+
plugins: [{ add: { content: meta.content } }],
|
|
98
|
+
config: {},
|
|
99
|
+
schema,
|
|
100
|
+
documents: [],
|
|
101
|
+
};
|
|
102
|
+
generatesSection.push(typeDefsFile);
|
|
103
|
+
});
|
|
97
104
|
}
|
|
98
105
|
// resolver files
|
|
99
106
|
const result = {
|
|
@@ -109,6 +116,7 @@ exports.preset = {
|
|
|
109
116
|
resolverTypesPath,
|
|
110
117
|
resolverRelativeTargetDir,
|
|
111
118
|
resolverMainFile,
|
|
119
|
+
resolverMainFileMode,
|
|
112
120
|
graphQLObjectTypeResolversToGenerate,
|
|
113
121
|
tsMorph: {
|
|
114
122
|
project: tsMorphProject,
|
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,
|
|
1
|
+
{"version":3,"file":"preset.js","sourceRoot":"","sources":["../../../../packages/typescript-resolver-files/src/preset.ts"],"names":[],"mappings":"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"}
|
package/src/utils/cwd.js
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.cwd = void 0;
|
|
4
|
+
const path = require("path");
|
|
5
|
+
/**
|
|
6
|
+
* It is process.cwd() but normalised for all OS
|
|
7
|
+
*/
|
|
8
|
+
const cwd = () => {
|
|
9
|
+
return process.cwd().split(path.sep).join(path.posix.sep);
|
|
10
|
+
};
|
|
11
|
+
exports.cwd = cwd;
|
|
12
|
+
//# sourceMappingURL=cwd.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cwd.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/cwd.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAE7B;;GAEG;AACI,MAAM,GAAG,GAAG,GAAW,EAAE;IAC9B,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAC5D,CAAC,CAAC;AAFW,QAAA,GAAG,OAEd"}
|
|
@@ -28,22 +28,30 @@ const getNodeProperties = (node) => {
|
|
|
28
28
|
}
|
|
29
29
|
else if (node.isKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)) {
|
|
30
30
|
const typeNode = node.getTypeNodeOrThrow();
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
propertyName: prop.getName(),
|
|
35
|
-
};
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
else if (ts_morph_1.Node.isTypeReference(typeNode)) {
|
|
39
|
-
return typeNode
|
|
40
|
-
.getType()
|
|
41
|
-
.getProperties()
|
|
42
|
-
.map((prop) => ({
|
|
43
|
-
propertyName: prop.getName(),
|
|
44
|
-
}));
|
|
45
|
-
}
|
|
31
|
+
const properties = [];
|
|
32
|
+
collectTypeNodeProperties(typeNode, properties);
|
|
33
|
+
return properties;
|
|
46
34
|
}
|
|
47
35
|
return [];
|
|
48
36
|
};
|
|
37
|
+
const collectTypeNodeProperties = (typeNode, result) => {
|
|
38
|
+
if (ts_morph_1.Node.isTypeLiteral(typeNode)) {
|
|
39
|
+
typeNode.getProperties().forEach((prop) => {
|
|
40
|
+
result.push({ propertyName: prop.getName() });
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
else if (ts_morph_1.Node.isTypeReference(typeNode)) {
|
|
44
|
+
typeNode
|
|
45
|
+
.getType()
|
|
46
|
+
.getProperties()
|
|
47
|
+
.forEach((prop) => {
|
|
48
|
+
result.push({ propertyName: prop.getName() });
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
else if (ts_morph_1.Node.isIntersectionTypeNode(typeNode)) {
|
|
52
|
+
typeNode.getTypeNodes().forEach((typeNode) => {
|
|
53
|
+
collectTypeNodeProperties(typeNode, result); // May contain duplicated properties from different typeNodes. Will be deduped in getNodePropertyMap.
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
};
|
|
49
57
|
//# sourceMappingURL=getNodePropertyMap.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNodePropertyMap.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/getNodePropertyMap.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"getNodePropertyMap.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/getNodePropertyMap.ts"],"names":[],"mappings":";;;AAAA,uCAA2D;AAI3D;;;GAGG;AACI,MAAM,kBAAkB,GAAG,CAAC,IAAsB,EAAmB,EAAE;IAC5E,IAAI,CAAC,IAAI,EAAE;QACT,OAAO,EAAE,CAAC;KACX;IAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAE3C,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CACvC,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE;QACxB,GAAG,CAAC,YAAY,CAAC,GAAG;YAClB,IAAI,EAAE,YAAY;SACnB,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IAEF,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAlBW,QAAA,kBAAkB,sBAkB7B;AAIF,MAAM,iBAAiB,GAAG,CAAC,IAAU,EAAc,EAAE;IACnD,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,oBAAoB,CAAC,EAAE;QAChD,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACzC,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE;SAC7B,CAAC,CAAC,CAAC;KACL;SAAM,IAAI,IAAI,CAAC,MAAM,CAAC,qBAAU,CAAC,oBAAoB,CAAC,EAAE;QACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAC3C,MAAM,UAAU,GAAe,EAAE,CAAC;QAClC,yBAAyB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAChD,OAAO,UAAU,CAAC;KACnB;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAChC,QAAkB,EAClB,MAAkB,EACZ,EAAE;IACR,IAAI,eAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE;QAChC,QAAQ,CAAC,aAAa,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YACxC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;KACJ;SAAM,IAAI,eAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE;QACzC,QAAQ;aACL,OAAO,EAAE;aACT,aAAa,EAAE;aACf,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;KACN;SAAM,IAAI,eAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE;QAChD,QAAQ,CAAC,YAAY,EAAE,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC3C,yBAAyB,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,qGAAqG;QACpJ,CAAC,CAAC,CAAC;KACJ;AACH,CAAC,CAAC"}
|
package/src/utils/index.d.ts
CHANGED
|
@@ -1,7 +1,9 @@
|
|
|
1
|
+
export * from './cwd';
|
|
1
2
|
export * from './parseLocationForWhitelistedModule';
|
|
2
3
|
export * from './isNativeNamedType';
|
|
3
4
|
export * from './isRootObjectType';
|
|
5
|
+
export * from './isWhitelistedModule';
|
|
4
6
|
export * from './printImportLine';
|
|
5
7
|
export * from './getNodePropertyMap';
|
|
6
|
-
export
|
|
7
|
-
export
|
|
8
|
+
export * from './normalizeRelativePath';
|
|
9
|
+
export * from './relativeModulePath';
|
package/src/utils/index.js
CHANGED
|
@@ -1,25 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.normalizeRelativePath = exports.relativeModulePath = void 0;
|
|
4
3
|
const tslib_1 = require("tslib");
|
|
5
|
-
|
|
4
|
+
tslib_1.__exportStar(require("./cwd"), exports);
|
|
6
5
|
tslib_1.__exportStar(require("./parseLocationForWhitelistedModule"), exports);
|
|
7
6
|
tslib_1.__exportStar(require("./isNativeNamedType"), exports);
|
|
8
7
|
tslib_1.__exportStar(require("./isRootObjectType"), exports);
|
|
8
|
+
tslib_1.__exportStar(require("./isWhitelistedModule"), exports);
|
|
9
9
|
tslib_1.__exportStar(require("./printImportLine"), exports);
|
|
10
10
|
tslib_1.__exportStar(require("./getNodePropertyMap"), exports);
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
const relativeModulePath = (from, to) => {
|
|
14
|
-
const rawPath = path.relative(from, to);
|
|
15
|
-
return (0, exports.normalizeRelativePath)(rawPath);
|
|
16
|
-
};
|
|
17
|
-
exports.relativeModulePath = relativeModulePath;
|
|
18
|
-
const normalizeRelativePath = (path) => {
|
|
19
|
-
if (!path.startsWith('../') || !path.startsWith('./')) {
|
|
20
|
-
return `./${path}`;
|
|
21
|
-
}
|
|
22
|
-
return path;
|
|
23
|
-
};
|
|
24
|
-
exports.normalizeRelativePath = normalizeRelativePath;
|
|
11
|
+
tslib_1.__exportStar(require("./normalizeRelativePath"), exports);
|
|
12
|
+
tslib_1.__exportStar(require("./relativeModulePath"), exports);
|
|
25
13
|
//# sourceMappingURL=index.js.map
|
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":"
|
|
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,2 +1,2 @@
|
|
|
1
|
-
export
|
|
1
|
+
export type RootObjectType = 'Query' | 'Mutation' | 'Subscription';
|
|
2
2
|
export declare const isRootObjectType: (typeName: string) => typeName is RootObjectType;
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isWhitelistedModule = void 0;
|
|
4
|
+
const isWhitelistedModule = ({ moduleName, whitelistedModules, blacklistedModules, }) => {
|
|
5
|
+
if (blacklistedModules.includes(moduleName)) {
|
|
6
|
+
return false;
|
|
7
|
+
}
|
|
8
|
+
const isInWhitelistedModule =
|
|
9
|
+
// whitelistedModules is empty a.k.a. all are whitelisted
|
|
10
|
+
whitelistedModules.length === 0
|
|
11
|
+
? true
|
|
12
|
+
: whitelistedModules.includes(moduleName);
|
|
13
|
+
return isInWhitelistedModule;
|
|
14
|
+
};
|
|
15
|
+
exports.isWhitelistedModule = isWhitelistedModule;
|
|
16
|
+
//# sourceMappingURL=isWhitelistedModule.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isWhitelistedModule.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/isWhitelistedModule.ts"],"names":[],"mappings":";;;AAAO,MAAM,mBAAmB,GAAG,CAAC,EAClC,UAAU,EACV,kBAAkB,EAClB,kBAAkB,GAKnB,EAAW,EAAE;IACZ,IAAI,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAC3C,OAAO,KAAK,CAAC;KACd;IAED,MAAM,qBAAqB;IACzB,yDAAyD;IACzD,kBAAkB,CAAC,MAAM,KAAK,CAAC;QAC7B,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAE9C,OAAO,qBAAqB,CAAC;AAC/B,CAAC,CAAC;AApBW,QAAA,mBAAmB,uBAoB9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const normalizeRelativePath: (path: string) => string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.normalizeRelativePath = void 0;
|
|
4
|
+
const normalizeRelativePath = (path) => {
|
|
5
|
+
if (!path.startsWith('../') || !path.startsWith('./')) {
|
|
6
|
+
return `./${path}`;
|
|
7
|
+
}
|
|
8
|
+
return path;
|
|
9
|
+
};
|
|
10
|
+
exports.normalizeRelativePath = normalizeRelativePath;
|
|
11
|
+
//# sourceMappingURL=normalizeRelativePath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizeRelativePath.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/normalizeRelativePath.ts"],"names":[],"mappings":";;;AAAO,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAU,EAAE;IAC5D,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACrD,OAAO,KAAK,IAAI,EAAE,CAAC;KACpB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AALW,QAAA,qBAAqB,yBAKhC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.parseLocationForWhitelistedModule = void 0;
|
|
4
|
+
const isWhitelistedModule_1 = require("./isWhitelistedModule");
|
|
4
5
|
const parseLocationForWhitelistedModule = ({ location, sourceMap, whitelistedModules, blacklistedModules, }) => {
|
|
5
6
|
if (!location) {
|
|
6
7
|
throw new Error('Location is invalid');
|
|
@@ -10,15 +11,12 @@ const parseLocationForWhitelistedModule = ({ location, sourceMap, whitelistedMod
|
|
|
10
11
|
if (!sourceFile) {
|
|
11
12
|
throw new Error(`Unable to find ${sourceFilename} in sourceMap`);
|
|
12
13
|
}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
? true
|
|
20
|
-
: whitelistedModules.includes(sourceFile.moduleName);
|
|
21
|
-
return isInWhitelistedModule ? sourceFile : undefined;
|
|
14
|
+
const isWhitelisted = (0, isWhitelistedModule_1.isWhitelistedModule)({
|
|
15
|
+
moduleName: sourceFile.moduleName,
|
|
16
|
+
whitelistedModules,
|
|
17
|
+
blacklistedModules,
|
|
18
|
+
});
|
|
19
|
+
return isWhitelisted ? sourceFile : undefined;
|
|
22
20
|
};
|
|
23
21
|
exports.parseLocationForWhitelistedModule = parseLocationForWhitelistedModule;
|
|
24
22
|
//# sourceMappingURL=parseLocationForWhitelistedModule.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseLocationForWhitelistedModule.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/parseLocationForWhitelistedModule.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"parseLocationForWhitelistedModule.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/parseLocationForWhitelistedModule.ts"],"names":[],"mappings":";;;AAEA,+DAA4D;AASrD,MAAM,iCAAiC,GAAG,CAAC,EAChD,QAAQ,EACR,SAAS,EACT,kBAAkB,EAClB,kBAAkB,GACgB,EAA4B,EAAE;IAChE,IAAI,CAAC,QAAQ,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;KACxC;IAED,MAAM,cAAc,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;IAC5C,MAAM,UAAU,GAAG,SAAS,CAAC,cAAc,CAAC,CAAC;IAC7C,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,kBAAkB,cAAc,eAAe,CAAC,CAAC;KAClE;IAED,MAAM,aAAa,GAAG,IAAA,yCAAmB,EAAC;QACxC,UAAU,EAAE,UAAU,CAAC,UAAU;QACjC,kBAAkB;QAClB,kBAAkB;KACnB,CAAC,CAAC;IAEH,OAAO,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AAChD,CAAC,CAAC;AAvBW,QAAA,iCAAiC,qCAuB5C"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const relativeModulePath: (from: string, to: string) => string;
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.relativeModulePath = void 0;
|
|
4
|
+
const path = require("path");
|
|
5
|
+
const normalizeRelativePath_1 = require("./normalizeRelativePath");
|
|
6
|
+
const relativeModulePath = (from, to) => {
|
|
7
|
+
const rawPath = path.posix.relative(from, to);
|
|
8
|
+
return (0, normalizeRelativePath_1.normalizeRelativePath)(rawPath);
|
|
9
|
+
};
|
|
10
|
+
exports.relativeModulePath = relativeModulePath;
|
|
11
|
+
//# sourceMappingURL=relativeModulePath.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"relativeModulePath.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/utils/relativeModulePath.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,mEAAgE;AAEzD,MAAM,kBAAkB,GAAG,CAAC,IAAY,EAAE,EAAU,EAAU,EAAE;IACrE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC9C,OAAO,IAAA,6CAAqB,EAAC,OAAO,CAAC,CAAC;AACxC,CAAC,CAAC;AAHW,QAAA,kBAAkB,sBAG7B"}
|
|
@@ -1,29 +1,37 @@
|
|
|
1
1
|
import * as typeScriptPlugin from '@graphql-codegen/typescript';
|
|
2
2
|
import * as typeScriptResolversPlugin from '@graphql-codegen/typescript-resolvers';
|
|
3
3
|
import type { ProjectOptions } from 'ts-morph';
|
|
4
|
-
|
|
4
|
+
type ParsedTypesPluginsConfig = Omit<typeScriptPlugin.TypeScriptPluginConfig, 'scalars'> & Omit<typeScriptResolversPlugin.TypeScriptResolversPluginConfig, 'scalars'> & {
|
|
5
5
|
scalars: Record<string, string>;
|
|
6
6
|
};
|
|
7
|
-
|
|
7
|
+
type ConfigMode = 'merged' | 'modules';
|
|
8
|
+
type ResolverMainFileMode = 'merged' | 'modules';
|
|
9
|
+
export type TypeDefsFileMode = 'merged' | 'mergedWhitelisted' | 'modules';
|
|
10
|
+
type FixObjectTypeResolvers = 'smart' | 'disabled';
|
|
11
|
+
export interface ParsedPresetConfig {
|
|
8
12
|
resolverTypesPath: string;
|
|
9
13
|
resolverRelativeTargetDir: string;
|
|
10
14
|
resolverMainFile: string;
|
|
15
|
+
resolverMainFileMode: ResolverMainFileMode;
|
|
11
16
|
typeDefsFilePath: string | false;
|
|
17
|
+
typeDefsFileMode: TypeDefsFileMode;
|
|
12
18
|
mappersFileExtension: string;
|
|
13
19
|
mappersSuffix: string;
|
|
14
|
-
mode:
|
|
20
|
+
mode: ConfigMode;
|
|
15
21
|
whitelistedModules: string[];
|
|
16
22
|
blacklistedModules: string[];
|
|
17
23
|
externalResolvers: Record<string, string>;
|
|
18
24
|
typesPluginsConfig: ParsedTypesPluginsConfig;
|
|
19
25
|
tsMorphProjectOptions: ProjectOptions;
|
|
20
|
-
fixObjectTypeResolvers:
|
|
26
|
+
fixObjectTypeResolvers: FixObjectTypeResolvers;
|
|
21
27
|
}
|
|
22
28
|
export interface RawPresetConfig {
|
|
23
29
|
resolverTypesPath?: string;
|
|
24
30
|
resolverRelativeTargetDir?: string;
|
|
25
31
|
resolverMainFile?: string;
|
|
32
|
+
resolverMainFileMode?: string;
|
|
26
33
|
typeDefsFilePath?: string | boolean;
|
|
34
|
+
typeDefsFileMode?: string;
|
|
27
35
|
mappersFileExtension?: string;
|
|
28
36
|
mappersSuffix?: string;
|
|
29
37
|
mode?: string;
|
|
@@ -34,5 +42,11 @@ export interface RawPresetConfig {
|
|
|
34
42
|
tsConfigFilePath?: string;
|
|
35
43
|
fixObjectTypeResolvers?: string;
|
|
36
44
|
}
|
|
37
|
-
export
|
|
45
|
+
export interface TypedPresetConfig extends RawPresetConfig {
|
|
46
|
+
mode?: ConfigMode;
|
|
47
|
+
resolverMainFileMode?: ResolverMainFileMode;
|
|
48
|
+
typeDefsFileMode?: TypeDefsFileMode;
|
|
49
|
+
fixObjectTypeResolvers?: FixObjectTypeResolvers;
|
|
50
|
+
}
|
|
51
|
+
export declare const validatePresetConfig: ({ resolverTypesPath, resolverRelativeTargetDir, resolverMainFile, resolverMainFileMode, typeDefsFilePath, typeDefsFileMode: inputTypeDefsFileMode, mappersFileExtension, mappersSuffix, mode, whitelistedModules, blacklistedModules, externalResolvers, typesPluginsConfig, tsConfigFilePath, fixObjectTypeResolvers, }: RawPresetConfig) => ParsedPresetConfig;
|
|
38
52
|
export {};
|
|
@@ -4,47 +4,60 @@ exports.validatePresetConfig = void 0;
|
|
|
4
4
|
const path = require("path");
|
|
5
5
|
const fs = require("fs");
|
|
6
6
|
const preset_1 = require("../preset");
|
|
7
|
+
const utils_1 = require("../utils");
|
|
7
8
|
const defaultResolverRelativeTargetDirMap = {
|
|
8
9
|
modules: 'resolvers',
|
|
9
10
|
merged: '',
|
|
10
11
|
};
|
|
11
12
|
const defaultTypeDefsFilePath = './typeDefs.generated.ts';
|
|
12
|
-
const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', resolverRelativeTargetDir, resolverMainFile = 'resolvers.generated.ts', typeDefsFilePath = defaultTypeDefsFilePath, mappersFileExtension = '.mappers.ts', mappersSuffix = 'Mapper', mode = 'modules', whitelistedModules, blacklistedModules, externalResolvers = {}, typesPluginsConfig = {}, tsConfigFilePath = './tsconfig.json', fixObjectTypeResolvers = 'smart', }) => {
|
|
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', }) => {
|
|
13
14
|
if (mode !== 'merged' && mode !== 'modules') {
|
|
14
|
-
throw new Error(
|
|
15
|
+
throw new Error(printError('presetConfig.mode must be "merged" or "modules" (default is "modules")', 'Validation'));
|
|
15
16
|
}
|
|
16
17
|
if (fixObjectTypeResolvers !== 'smart' &&
|
|
17
18
|
fixObjectTypeResolvers !== 'disabled') {
|
|
18
|
-
throw new Error(
|
|
19
|
+
throw new Error(printError('presetConfig.fixObjectTypeResolvers must be "smart" or "disabled" (default is "smart")', 'Validation'));
|
|
20
|
+
}
|
|
21
|
+
if (resolverMainFileMode !== 'merged' && resolverMainFileMode !== 'modules') {
|
|
22
|
+
throw new Error(printError('presetConfig.resolverMainFileMode must be "merged" or "modules" (default is "merged")', 'Validation'));
|
|
23
|
+
}
|
|
24
|
+
let typeDefsFileMode = inputTypeDefsFileMode;
|
|
25
|
+
if (mode === 'merged') {
|
|
26
|
+
// If mode is `merged`, `typeDefsFileMode` is also `merged` because there's no whitelisted or modules concepts
|
|
27
|
+
typeDefsFileMode = 'merged';
|
|
28
|
+
console.warn(printWarning(`presetConfig.typeDefsFileMode has automatically been set to "merged" because presetConfig.mode is "merged"`));
|
|
29
|
+
}
|
|
30
|
+
if (typeDefsFileMode !== 'merged' &&
|
|
31
|
+
typeDefsFileMode !== 'modules' &&
|
|
32
|
+
typeDefsFileMode !== 'mergedWhitelisted') {
|
|
33
|
+
throw new Error(printError('presetConfig.typeDefsFileMode must be "merged", "mergedWhitelisted" or "modules" (default is "merged")', 'Validation'));
|
|
19
34
|
}
|
|
20
35
|
if (!resolverTypesPath) {
|
|
21
|
-
throw new Error(
|
|
36
|
+
throw new Error(printError('presetConfig.resolverTypesPath is required', 'Validation'));
|
|
22
37
|
}
|
|
23
38
|
const finalResolverRelativeTargetDir = resolverRelativeTargetDir === undefined
|
|
24
39
|
? defaultResolverRelativeTargetDirMap[mode]
|
|
25
40
|
: resolverRelativeTargetDir;
|
|
26
41
|
if (path.extname(resolverMainFile) === '') {
|
|
27
|
-
throw new Error(
|
|
42
|
+
throw new Error(printError('presetConfig.mainFile must be a valid file name', 'Validation'));
|
|
28
43
|
}
|
|
29
44
|
if (whitelistedModules) {
|
|
30
45
|
if (!Array.isArray(whitelistedModules)) {
|
|
31
|
-
throw new Error(
|
|
46
|
+
throw new Error(printError('presetConfig.whitelistedModules must be an array if provided', 'Validation'));
|
|
32
47
|
}
|
|
33
48
|
if (mode !== 'modules') {
|
|
34
|
-
throw new Error(
|
|
49
|
+
throw new Error(printError('presetConfig.whitelistedModules can only be used with presetConfig.mode == "modules"', 'Validation'));
|
|
35
50
|
}
|
|
36
51
|
}
|
|
37
52
|
if (blacklistedModules) {
|
|
38
53
|
if (!Array.isArray(blacklistedModules)) {
|
|
39
|
-
throw new Error(
|
|
54
|
+
throw new Error(printError('presetConfig.blacklistedModules must be an array if provided', 'Validation'));
|
|
40
55
|
}
|
|
41
56
|
if (mode !== 'modules') {
|
|
42
|
-
throw new Error(
|
|
57
|
+
throw new Error(printError('presetConfig.blacklistedModules can only be used with presetConfig.mode == "modules"', 'Validation'));
|
|
43
58
|
}
|
|
44
59
|
}
|
|
45
|
-
|
|
46
|
-
throw new Error('Invalid typescriptPluginConfig. Should not see this.');
|
|
47
|
-
}
|
|
60
|
+
const validatedTypesPluginsConfig = validateTypesPluginsConfig(typesPluginsConfig);
|
|
48
61
|
let finalTypeDefsFilePath = typeDefsFilePath;
|
|
49
62
|
if (finalTypeDefsFilePath === true) {
|
|
50
63
|
finalTypeDefsFilePath = defaultTypeDefsFilePath;
|
|
@@ -53,36 +66,44 @@ const validatePresetConfig = ({ resolverTypesPath = './types.generated.ts', reso
|
|
|
53
66
|
skipAddingFilesFromTsConfig: true, // avoid long startup time by NOT loading files included by tsconfig.json. We only use this virtually anyways so we don't need all the files
|
|
54
67
|
};
|
|
55
68
|
if (tsConfigFilePath) {
|
|
56
|
-
const absoluteTsConfigFilePath = path.join(
|
|
69
|
+
const absoluteTsConfigFilePath = path.join((0, utils_1.cwd)(), tsConfigFilePath);
|
|
57
70
|
if (fs.existsSync(absoluteTsConfigFilePath)) {
|
|
58
71
|
tsMorphProjectOptions.tsConfigFilePath = absoluteTsConfigFilePath;
|
|
59
72
|
}
|
|
60
73
|
else {
|
|
61
|
-
console.warn(`
|
|
74
|
+
console.warn(printWarning(`Unable to find TypeScript config at ${absoluteTsConfigFilePath}. Use presetConfig.tsConfigFilePath to set a custom value. Otherwise, type analysis may not work correctly.`));
|
|
62
75
|
}
|
|
63
76
|
}
|
|
64
77
|
return {
|
|
65
78
|
resolverTypesPath,
|
|
66
79
|
resolverRelativeTargetDir: finalResolverRelativeTargetDir,
|
|
67
80
|
resolverMainFile,
|
|
81
|
+
resolverMainFileMode,
|
|
68
82
|
typeDefsFilePath: finalTypeDefsFilePath,
|
|
83
|
+
typeDefsFileMode,
|
|
69
84
|
mode,
|
|
70
85
|
mappersFileExtension,
|
|
71
86
|
mappersSuffix,
|
|
72
87
|
whitelistedModules: whitelistedModules || [],
|
|
73
88
|
blacklistedModules: blacklistedModules || [],
|
|
74
89
|
externalResolvers,
|
|
75
|
-
typesPluginsConfig,
|
|
90
|
+
typesPluginsConfig: validatedTypesPluginsConfig,
|
|
76
91
|
tsMorphProjectOptions,
|
|
77
92
|
fixObjectTypeResolvers,
|
|
78
93
|
};
|
|
79
94
|
};
|
|
80
95
|
exports.validatePresetConfig = validatePresetConfig;
|
|
81
96
|
const validateTypesPluginsConfig = (config) => {
|
|
82
|
-
|
|
83
|
-
if (typeof
|
|
84
|
-
throw new Error(
|
|
97
|
+
const scalarsOption = config.scalars || {};
|
|
98
|
+
if (typeof scalarsOption === 'string') {
|
|
99
|
+
throw new Error(printError('presetConfig.typesPluginsConfig.scalars of type "string" is not supported', 'Validation'));
|
|
85
100
|
}
|
|
86
|
-
return
|
|
101
|
+
return Object.assign(Object.assign({}, config), { scalars: scalarsOption });
|
|
102
|
+
};
|
|
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}`;
|
|
87
108
|
};
|
|
88
109
|
//# 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,sCAAuC;
|
|
1
|
+
{"version":3,"file":"validatePresetConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/validatePresetConfig/validatePresetConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generateTypeDefsContent.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/generateTypeDefsContent/generateTypeDefsContent.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAMzB,MAAM,uBAAuB,GAAG,CAAC,EACtC,SAAS,GACqB,EAAU,EAAE;IAC1C,MAAM,YAAY,GAAG,IAAA,eAAK,EAAC,SAAS,CAAC,CAAC;IACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAExD,OAAO;4BACmB,kBAAkB,6BAA6B,CAAC;AAC5E,CAAC,CAAC;AARW,QAAA,uBAAuB,2BAQlC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export * from './generateTypeDefsContent';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"getPluginsConfig.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getPluginsConfig/getPluginsConfig.ts"],"names":[],"mappings":";;;AAAA,qCAAoE;AACpE,qDAA+D;AAG/D,oCAIkB;AAoBlB;;GAEG;AACI,MAAM,gBAAgB,GAAG,CAAC,EAC/B,SAAS,EACT,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,kBAAkB,GACK,EAA0B,EAAE;IACnD,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,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,UAAU,CAAC,GAAG,IAAI,CAAC;YAEhD,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,EAAE;QAC5B,aAAa,EAAE;YACb,qBAAqB,EAAE,EAAE;YACzB,8BAA8B,EAAE,EAAE;YAClC,kBAAkB,EAAE,EAAE;SACvB;KACF,CACF,CAAC;AACJ,CAAC,CAAC;AAjDW,QAAA,gBAAgB,oBAiD3B;AAEF,MAAM,gBAAgB,GAAG,CACvB,UAAkB,EAClB,MAA8B,EACxB,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 +0,0 @@
|
|
|
1
|
-
export * from './getPluginsConfig';
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/typescript-resolver-files/src/getPluginsConfig/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC"}
|
|
File without changes
|
|
File without changes
|