@gqlkit-ts/cli 0.6.0 → 0.7.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/dist/auto-type-generator/auto-type-generator.d.ts +7 -0
- package/dist/auto-type-generator/auto-type-generator.d.ts.map +1 -1
- package/dist/auto-type-generator/auto-type-generator.js +375 -55
- package/dist/auto-type-generator/auto-type-generator.js.map +1 -1
- package/dist/auto-type-generator/discriminator-field-validator.d.ts +26 -0
- package/dist/auto-type-generator/discriminator-field-validator.d.ts.map +1 -0
- package/dist/auto-type-generator/discriminator-field-validator.js +242 -0
- package/dist/auto-type-generator/discriminator-field-validator.js.map +1 -0
- package/dist/auto-type-generator/discriminator-naming.d.ts +11 -0
- package/dist/auto-type-generator/discriminator-naming.d.ts.map +1 -0
- package/dist/auto-type-generator/discriminator-naming.js +15 -0
- package/dist/auto-type-generator/discriminator-naming.js.map +1 -0
- package/dist/auto-type-generator/discriminator-resolve-type-generator.d.ts +44 -0
- package/dist/auto-type-generator/discriminator-resolve-type-generator.d.ts.map +1 -0
- package/dist/auto-type-generator/discriminator-resolve-type-generator.js +77 -0
- package/dist/auto-type-generator/discriminator-resolve-type-generator.js.map +1 -0
- package/dist/auto-type-generator/index.d.ts +3 -0
- package/dist/auto-type-generator/index.d.ts.map +1 -1
- package/dist/auto-type-generator/index.js +3 -0
- package/dist/auto-type-generator/index.js.map +1 -1
- package/dist/auto-type-generator/inline-enum-collector.d.ts.map +1 -1
- package/dist/auto-type-generator/inline-enum-collector.js +14 -7
- package/dist/auto-type-generator/inline-enum-collector.js.map +1 -1
- package/dist/auto-type-generator/inline-object-converter.d.ts +12 -0
- package/dist/auto-type-generator/inline-object-converter.d.ts.map +1 -0
- package/dist/auto-type-generator/inline-object-converter.js +72 -0
- package/dist/auto-type-generator/inline-object-converter.js.map +1 -0
- package/dist/auto-type-generator/inline-object-traverser.d.ts +2 -1
- package/dist/auto-type-generator/inline-object-traverser.d.ts.map +1 -1
- package/dist/auto-type-generator/inline-object-traverser.js +22 -4
- package/dist/auto-type-generator/inline-object-traverser.js.map +1 -1
- package/dist/auto-type-generator/inline-union-collector.d.ts.map +1 -1
- package/dist/auto-type-generator/inline-union-collector.js +20 -6
- package/dist/auto-type-generator/inline-union-collector.js.map +1 -1
- package/dist/auto-type-generator/inline-union-types.d.ts +2 -0
- package/dist/auto-type-generator/inline-union-types.d.ts.map +1 -1
- package/dist/auto-type-generator/inline-union-validator.js +3 -3
- package/dist/auto-type-generator/inline-union-validator.js.map +1 -1
- package/dist/auto-type-generator/intersection-flattener.d.ts +44 -0
- package/dist/auto-type-generator/intersection-flattener.d.ts.map +1 -0
- package/dist/auto-type-generator/intersection-flattener.js +398 -0
- package/dist/auto-type-generator/intersection-flattener.js.map +1 -0
- package/dist/auto-type-generator/naming-convention.d.ts +21 -0
- package/dist/auto-type-generator/naming-convention.d.ts.map +1 -1
- package/dist/auto-type-generator/naming-convention.js +145 -1
- package/dist/auto-type-generator/naming-convention.js.map +1 -1
- package/dist/auto-type-generator/typename-extractor.d.ts +2 -0
- package/dist/auto-type-generator/typename-extractor.d.ts.map +1 -1
- package/dist/auto-type-generator/typename-extractor.js +11 -3
- package/dist/auto-type-generator/typename-extractor.js.map +1 -1
- package/dist/auto-type-generator/typename-resolve-type-generator.d.ts +2 -0
- package/dist/auto-type-generator/typename-resolve-type-generator.d.ts.map +1 -1
- package/dist/auto-type-generator/typename-resolve-type-generator.js +12 -84
- package/dist/auto-type-generator/typename-resolve-type-generator.js.map +1 -1
- package/dist/auto-type-generator/typename-types.d.ts +4 -0
- package/dist/auto-type-generator/typename-types.d.ts.map +1 -1
- package/dist/auto-type-generator/typename-types.js +6 -0
- package/dist/auto-type-generator/typename-types.js.map +1 -1
- package/dist/auto-type-generator/typename-validator.d.ts.map +1 -1
- package/dist/auto-type-generator/typename-validator.js +4 -3
- package/dist/auto-type-generator/typename-validator.js.map +1 -1
- package/dist/commands/gen.d.ts.map +1 -1
- package/dist/commands/gen.js +2 -1
- package/dist/commands/gen.js.map +1 -1
- package/dist/config/types.d.ts +7 -0
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config-loader/index.d.ts +1 -1
- package/dist/config-loader/index.d.ts.map +1 -1
- package/dist/config-loader/index.js.map +1 -1
- package/dist/config-loader/loader.d.ts +6 -0
- package/dist/config-loader/loader.d.ts.map +1 -1
- package/dist/config-loader/loader.js +1 -0
- package/dist/config-loader/loader.js.map +1 -1
- package/dist/config-loader/validator.d.ts.map +1 -1
- package/dist/config-loader/validator.js +84 -1
- package/dist/config-loader/validator.js.map +1 -1
- package/dist/gen-orchestrator/orchestrator.d.ts +2 -1
- package/dist/gen-orchestrator/orchestrator.d.ts.map +1 -1
- package/dist/gen-orchestrator/orchestrator.js +15 -2
- package/dist/gen-orchestrator/orchestrator.js.map +1 -1
- package/dist/resolver-extractor/extractor/define-api-extractor.d.ts.map +1 -1
- package/dist/resolver-extractor/extractor/define-api-extractor.js +4 -0
- package/dist/resolver-extractor/extractor/define-api-extractor.js.map +1 -1
- package/dist/resolver-extractor/validator/abstract-resolver-validator.d.ts +2 -0
- package/dist/resolver-extractor/validator/abstract-resolver-validator.d.ts.map +1 -1
- package/dist/resolver-extractor/validator/abstract-resolver-validator.js +16 -3
- package/dist/resolver-extractor/validator/abstract-resolver-validator.js.map +1 -1
- package/dist/schema-generator/emitter/code-emitter.d.ts.map +1 -1
- package/dist/schema-generator/emitter/code-emitter.js +13 -1
- package/dist/schema-generator/emitter/code-emitter.js.map +1 -1
- package/dist/schema-generator/emitter/discriminator-resolve-type-emitter.d.ts +18 -0
- package/dist/schema-generator/emitter/discriminator-resolve-type-emitter.d.ts.map +1 -0
- package/dist/schema-generator/emitter/discriminator-resolve-type-emitter.js +89 -0
- package/dist/schema-generator/emitter/discriminator-resolve-type-emitter.js.map +1 -0
- package/dist/schema-generator/generate-schema.d.ts +2 -0
- package/dist/schema-generator/generate-schema.d.ts.map +1 -1
- package/dist/schema-generator/generate-schema.js +69 -10
- package/dist/schema-generator/generate-schema.js.map +1 -1
- package/dist/schema-generator/integrator/result-integrator.d.ts +4 -0
- package/dist/schema-generator/integrator/result-integrator.d.ts.map +1 -1
- package/dist/schema-generator/integrator/result-integrator.js +18 -2
- package/dist/schema-generator/integrator/result-integrator.js.map +1 -1
- package/dist/schema-generator/resolver-collector/resolver-collector.d.ts +2 -0
- package/dist/schema-generator/resolver-collector/resolver-collector.d.ts.map +1 -1
- package/dist/schema-generator/resolver-collector/resolver-collector.js +4 -0
- package/dist/schema-generator/resolver-collector/resolver-collector.js.map +1 -1
- package/dist/shared/constants.d.ts.map +1 -1
- package/dist/shared/constants.js +14 -1
- package/dist/shared/constants.js.map +1 -1
- package/dist/shared/enum-prefix-detector.d.ts.map +1 -1
- package/dist/shared/enum-prefix-detector.js +78 -8
- package/dist/shared/enum-prefix-detector.js.map +1 -1
- package/dist/shared/inline-object-utils.js +1 -1
- package/dist/shared/inline-object-utils.js.map +1 -1
- package/dist/shared/type-converter.d.ts.map +1 -1
- package/dist/shared/type-converter.js +55 -0
- package/dist/shared/type-converter.js.map +1 -1
- package/dist/type-extractor/converter/graphql-converter.d.ts.map +1 -1
- package/dist/type-extractor/converter/graphql-converter.js +11 -1
- package/dist/type-extractor/converter/graphql-converter.js.map +1 -1
- package/dist/type-extractor/extractor/field-type-resolver.d.ts +18 -0
- package/dist/type-extractor/extractor/field-type-resolver.d.ts.map +1 -1
- package/dist/type-extractor/extractor/field-type-resolver.js +198 -15
- package/dist/type-extractor/extractor/field-type-resolver.js.map +1 -1
- package/dist/type-extractor/extractor/type-extractor.d.ts +1 -0
- package/dist/type-extractor/extractor/type-extractor.d.ts.map +1 -1
- package/dist/type-extractor/extractor/type-extractor.js +100 -9
- package/dist/type-extractor/extractor/type-extractor.js.map +1 -1
- package/dist/type-extractor/types/diagnostics.d.ts +1 -1
- package/dist/type-extractor/types/diagnostics.d.ts.map +1 -1
- package/dist/type-extractor/types/index.d.ts +1 -1
- package/dist/type-extractor/types/index.d.ts.map +1 -1
- package/dist/type-extractor/types/index.js +1 -1
- package/dist/type-extractor/types/index.js.map +1 -1
- package/dist/type-extractor/types/ts-type-reference-factory.d.ts +7 -1
- package/dist/type-extractor/types/ts-type-reference-factory.d.ts.map +1 -1
- package/dist/type-extractor/types/ts-type-reference-factory.js +18 -3
- package/dist/type-extractor/types/ts-type-reference-factory.js.map +1 -1
- package/dist/type-extractor/types/typescript.d.ts +3 -1
- package/dist/type-extractor/types/typescript.d.ts.map +1 -1
- package/dist/type-extractor/validator/type-validator.d.ts.map +1 -1
- package/dist/type-extractor/validator/type-validator.js +6 -1
- package/dist/type-extractor/validator/type-validator.js.map +1 -1
- package/docs/configuration.md +19 -0
- package/docs/index.md +1 -0
- package/docs/integration/ai-sdk.md +189 -0
- package/docs/schema/unions.md +117 -0
- package/package.json +2 -2
- package/src/auto-type-generator/auto-type-generator.ts +576 -58
- package/src/auto-type-generator/discriminator-field-validator.ts +368 -0
- package/src/auto-type-generator/discriminator-naming.ts +24 -0
- package/src/auto-type-generator/discriminator-resolve-type-generator.ts +136 -0
- package/src/auto-type-generator/index.ts +17 -0
- package/src/auto-type-generator/inline-enum-collector.ts +19 -4
- package/src/auto-type-generator/inline-object-converter.ts +100 -0
- package/src/auto-type-generator/inline-object-traverser.ts +33 -7
- package/src/auto-type-generator/inline-union-collector.ts +26 -4
- package/src/auto-type-generator/inline-union-types.ts +2 -0
- package/src/auto-type-generator/inline-union-validator.ts +3 -3
- package/src/auto-type-generator/intersection-flattener.ts +554 -0
- package/src/auto-type-generator/naming-convention.ts +205 -1
- package/src/auto-type-generator/typename-extractor.ts +17 -3
- package/src/auto-type-generator/typename-resolve-type-generator.ts +19 -108
- package/src/auto-type-generator/typename-types.ts +7 -0
- package/src/auto-type-generator/typename-validator.ts +4 -3
- package/src/commands/gen.ts +9 -2
- package/src/config/types.ts +10 -0
- package/src/config-loader/index.ts +1 -0
- package/src/config-loader/loader.ts +11 -0
- package/src/config-loader/validator.ts +100 -1
- package/src/gen-orchestrator/orchestrator.ts +19 -2
- package/src/resolver-extractor/extractor/define-api-extractor.ts +4 -0
- package/src/resolver-extractor/validator/abstract-resolver-validator.ts +20 -6
- package/src/schema-generator/emitter/code-emitter.ts +26 -1
- package/src/schema-generator/emitter/discriminator-resolve-type-emitter.ts +125 -0
- package/src/schema-generator/generate-schema.ts +100 -13
- package/src/schema-generator/integrator/result-integrator.ts +25 -1
- package/src/schema-generator/resolver-collector/resolver-collector.ts +7 -0
- package/src/shared/constants.ts +15 -1
- package/src/shared/enum-prefix-detector.ts +96 -8
- package/src/shared/inline-object-utils.ts +1 -1
- package/src/shared/type-converter.ts +63 -0
- package/src/type-extractor/converter/graphql-converter.ts +17 -1
- package/src/type-extractor/extractor/field-type-resolver.ts +241 -16
- package/src/type-extractor/extractor/type-extractor.ts +119 -5
- package/src/type-extractor/types/diagnostics.ts +10 -1
- package/src/type-extractor/types/index.ts +2 -1
- package/src/type-extractor/types/ts-type-reference-factory.ts +24 -3
- package/src/type-extractor/types/typescript.ts +6 -2
- package/src/type-extractor/validator/type-validator.ts +6 -1
|
@@ -9,7 +9,9 @@ function extractTypenameFromFields(fields) {
|
|
|
9
9
|
return null;
|
|
10
10
|
}
|
|
11
11
|
const { tsType } = field;
|
|
12
|
-
if (tsType.nullable ||
|
|
12
|
+
if (tsType.nullable ||
|
|
13
|
+
tsType.kind !== "stringLiteral" ||
|
|
14
|
+
tsType.name === null) {
|
|
13
15
|
return null;
|
|
14
16
|
}
|
|
15
17
|
return { typeName: tsType.name, fieldName };
|
|
@@ -21,7 +23,9 @@ function extractTypenameFromInlineObjectProperties(properties) {
|
|
|
21
23
|
}
|
|
22
24
|
const { property, fieldName } = found;
|
|
23
25
|
const { propertyType: tsType } = property;
|
|
24
|
-
if (tsType.nullable ||
|
|
26
|
+
if (tsType.nullable ||
|
|
27
|
+
tsType.kind !== "stringLiteral" ||
|
|
28
|
+
tsType.name === null) {
|
|
25
29
|
return null;
|
|
26
30
|
}
|
|
27
31
|
return { typeName: tsType.name, fieldName };
|
|
@@ -126,11 +130,15 @@ function extractTypenames(params) {
|
|
|
126
130
|
return null;
|
|
127
131
|
}
|
|
128
132
|
export function collectTypenameExtractions(params) {
|
|
129
|
-
const { extractedTypes, typeMap } = params;
|
|
133
|
+
const { extractedTypes, typeMap, discriminatorFieldUnionNames } = params;
|
|
130
134
|
const results = [];
|
|
131
135
|
for (const typeInfo of extractedTypes) {
|
|
132
136
|
if (typeInfo.metadata.kind === "union" ||
|
|
133
137
|
typeInfo.metadata.kind === "graphqlInterface") {
|
|
138
|
+
// Skip unions that have discriminatorFields configured; they use the discriminator pipeline instead
|
|
139
|
+
if (discriminatorFieldUnionNames.has(typeInfo.metadata.name)) {
|
|
140
|
+
continue;
|
|
141
|
+
}
|
|
134
142
|
const result = extractTypenames({ abstractType: typeInfo, typeMap });
|
|
135
143
|
if (result !== null) {
|
|
136
144
|
results.push(result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-extractor.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-extractor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,oBAAoB,GAErB,MAAM,qBAAqB,CAAC;AAwB7B,SAAS,yBAAyB,CAChC,MAAsC;IAEtC,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAE7C,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,
|
|
1
|
+
{"version":3,"file":"typename-extractor.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-extractor.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,oBAAoB,GAErB,MAAM,qBAAqB,CAAC;AAwB7B,SAAS,yBAAyB,CAChC,MAAsC;IAEtC,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAE7C,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,IACE,MAAM,CAAC,QAAQ;QACf,MAAM,CAAC,IAAI,KAAK,eAAe;QAC/B,MAAM,CAAC,IAAI,KAAK,IAAI,EACpB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,yCAAyC,CAChD,UAA+C;IAE/C,MAAM,KAAK,GAAG,oBAAoB,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;IACtE,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAE1C,IACE,MAAM,CAAC,QAAQ;QACf,MAAM,CAAC,IAAI,KAAK,eAAe;QAC/B,MAAM,CAAC,IAAI,KAAK,IAAI,EACpB,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;AAC9C,CAAC;AAED,SAAS,2BAA2B,CAClC,MAA8B;IAE9B,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IACzC,MAAM,OAAO,GAAyB,EAAE,CAAC;IACzC,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAElC,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,IAAI,EAAE,CAAC;IACrD,MAAM,mBAAmB,GAAG,YAAY,CAAC,mBAAmB,IAAI,EAAE,CAAC;IACnE,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM,GAAG,CAAC,CAAC;IAExD,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,KAAK,MAAM,UAAU,IAAI,YAAY,EAAE,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QAE3C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC;gBACX,cAAc,EAAE,UAAU;gBAC1B,WAAW;gBACX,YAAY,EAAE,IAAI;gBAClB,cAAc,EAAE,KAAK;aACtB,CAAC,CAAC;YACH,sBAAsB,GAAG,KAAK,CAAC;YAC/B,WAAW,EAAE,CAAC;YACd,SAAS;QACX,CAAC;QAED,MAAM,YAAY,GAAG,yBAAyB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAElE,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,sBAAsB,GAAG,KAAK,CAAC;QACjC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,cAAc,EAAE,UAAU;YAC1B,WAAW;YACX,YAAY;YACZ,cAAc,EAAE,KAAK;SACtB,CAAC,CAAC;QACH,WAAW,EAAE,CAAC;IAChB,CAAC;IAED,KAAK,MAAM,kBAAkB,IAAI,mBAAmB,EAAE,CAAC;QACrD,MAAM,YAAY,GAAG,yCAAyC,CAC5D,kBAAkB,CAAC,UAAU,CAC9B,CAAC;QAEF,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,sBAAsB,GAAG,KAAK,CAAC;QACjC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,cAAc,EAAE,IAAI;YACpB,WAAW;YACX,YAAY;YACZ,cAAc,EAAE,IAAI;SACrB,CAAC,CAAC;QACH,WAAW,EAAE,CAAC;IAChB,CAAC;IAED,OAAO;QACL,gBAAgB,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;QAC5C,gBAAgB,EAAE,OAAO;QACzB,OAAO;QACP,sBAAsB;QACtB,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED,SAAS,oCAAoC,CAC3C,MAA8B,EAC9B,YAA8C;IAE9C,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;IAChC,MAAM,OAAO,GAAyB,EAAE,CAAC;IACzC,IAAI,sBAAsB,GAAG,IAAI,CAAC;IAClC,MAAM,gBAAgB,GAAG,KAAK,CAAC;IAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAC7C,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAE,CAAC;QACrC,MAAM,YAAY,GAAG,yBAAyB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QAEnE,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,sBAAsB,GAAG,KAAK,CAAC;QACjC,CAAC;QAED,OAAO,CAAC,IAAI,CAAC;YACX,cAAc,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;YACzC,WAAW,EAAE,CAAC;YACd,YAAY;YACZ,cAAc,EAAE,KAAK;SACtB,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,gBAAgB,EAAE,YAAY,CAAC,QAAQ,CAAC,IAAI;QAC5C,gBAAgB,EAAE,WAAW;QAC7B,OAAO;QACP,sBAAsB;QACtB,gBAAgB;KACjB,CAAC;AACJ,CAAC;AAED,SAAS,gBAAgB,CACvB,MAA8B;IAE9B,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAEzC,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC3C,OAAO,2BAA2B,CAAC,MAAM,CAAC,CAAC;IAC7C,CAAC;IAED,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;QACtD,MAAM,YAAY,GAAwB,EAAE,CAAC;QAC7C,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACxC,IACE,QAAQ,CAAC,qBAAqB,EAAE,QAAQ,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,EACpE,CAAC;gBACD,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9B,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO,oCAAoC,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACpE,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AASD,MAAM,UAAU,0BAA0B,CACxC,MAAwC;IAExC,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,4BAA4B,EAAE,GAAG,MAAM,CAAC;IACzE,MAAM,OAAO,GAA+B,EAAE,CAAC;IAE/C,KAAK,MAAM,QAAQ,IAAI,cAAc,EAAE,CAAC;QACtC,IACE,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,OAAO;YAClC,QAAQ,CAAC,QAAQ,CAAC,IAAI,KAAK,kBAAkB,EAC7C,CAAC;YACD,oGAAoG;YACpG,IAAI,4BAA4B,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7D,SAAS;YACX,CAAC;YACD,MAAM,MAAM,GAAG,gBAAgB,CAAC,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YACrE,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -24,6 +24,8 @@ export interface CollectTypenameResolveTypesParams {
|
|
|
24
24
|
readonly extractedTypes: ReadonlyArray<ExtractedTypeInfo>;
|
|
25
25
|
readonly typeMap: ReadonlyMap<string, ExtractedTypeInfo>;
|
|
26
26
|
readonly manualResolveTypeNames: ReadonlySet<string>;
|
|
27
|
+
/** Union names that have discriminatorFields configured; these are excluded from typename processing. */
|
|
28
|
+
readonly discriminatorFieldUnionNames: ReadonlySet<string>;
|
|
27
29
|
}
|
|
28
30
|
export interface CollectTypenameResolveTypesResult {
|
|
29
31
|
readonly autoResolveTypes: ReadonlyArray<TypenameAutoResolveTypeInfo>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-resolve-type-generator.d.ts","sourceRoot":"","sources":["../../src/auto-type-generator/typename-resolve-type-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"typename-resolve-type-generator.d.ts","sourceRoot":"","sources":["../../src/auto-type-generator/typename-resolve-type-generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AAK3E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;;;GAIG;AACH,MAAM,WAAW,kBAAmB,SAAQ,uBAAuB;IACjE,QAAQ,CAAC,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,gBAAgB,EAAE,OAAO,GAAG,WAAW,CAAC;IACjD,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;CACjD;AAED,MAAM,WAAW,yBAAyB;IACxC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,cAAc,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAC1D,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IACzD,QAAQ,CAAC,sBAAsB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrD,yGAAyG;IACzG,QAAQ,CAAC,4BAA4B,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iCAAiC;IAChD,QAAQ,CAAC,gBAAgB,EAAE,aAAa,CAAC,2BAA2B,CAAC,CAAC;IACtE,QAAQ,CAAC,oBAAoB,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACnD,QAAQ,CAAC,oBAAoB,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IAChE,QAAQ,CAAC,0BAA0B,EAAE,aAAa,CAAC,yBAAyB,CAAC,CAAC;CAC/E;AA0FD,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,iCAAiC,GACxC,iCAAiC,CAuDnC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { generateObjectTypeFromInlineObject } from "./inline-object-converter.js";
|
|
1
2
|
import { collectTypenameExtractions, } from "./typename-extractor.js";
|
|
2
3
|
function determineResolveTypePattern(extraction) {
|
|
3
4
|
if (!extraction.allMembersHaveTypename) {
|
|
@@ -25,88 +26,8 @@ function determineResolveTypePattern(extraction) {
|
|
|
25
26
|
}
|
|
26
27
|
return { usedFieldNames, memberFieldMap };
|
|
27
28
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
case "string":
|
|
31
|
-
return "String";
|
|
32
|
-
case "number":
|
|
33
|
-
return "Float";
|
|
34
|
-
case "boolean":
|
|
35
|
-
return "Boolean";
|
|
36
|
-
default:
|
|
37
|
-
return "String";
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
function convertInlineObjectPropertyToField(property) {
|
|
41
|
-
if (property.propertyName === "__typename" ||
|
|
42
|
-
property.propertyName === "$typeName") {
|
|
43
|
-
return null;
|
|
44
|
-
}
|
|
45
|
-
const tsType = property.propertyType;
|
|
46
|
-
let typeName;
|
|
47
|
-
const nullable = tsType.nullable;
|
|
48
|
-
let list = false;
|
|
49
|
-
let listItemNullable = null;
|
|
50
|
-
if (tsType.kind === "array" && tsType.elementType) {
|
|
51
|
-
list = true;
|
|
52
|
-
listItemNullable = tsType.elementType.nullable;
|
|
53
|
-
const elementName = tsType.elementType.name ?? "String";
|
|
54
|
-
typeName =
|
|
55
|
-
tsType.elementType.kind === "primitive"
|
|
56
|
-
? primitiveToGraphQLScalar(elementName)
|
|
57
|
-
: elementName;
|
|
58
|
-
}
|
|
59
|
-
else if (tsType.kind === "reference" && tsType.name) {
|
|
60
|
-
typeName = tsType.name;
|
|
61
|
-
}
|
|
62
|
-
else if (tsType.kind === "primitive" && tsType.name) {
|
|
63
|
-
typeName = primitiveToGraphQLScalar(tsType.name);
|
|
64
|
-
}
|
|
65
|
-
else if (tsType.kind === "scalar" && tsType.scalarInfo) {
|
|
66
|
-
typeName = tsType.scalarInfo.scalarName;
|
|
67
|
-
}
|
|
68
|
-
else {
|
|
69
|
-
typeName = "String";
|
|
70
|
-
}
|
|
71
|
-
return {
|
|
72
|
-
name: property.propertyName,
|
|
73
|
-
type: {
|
|
74
|
-
typeName,
|
|
75
|
-
nullable,
|
|
76
|
-
list,
|
|
77
|
-
listItemNullable,
|
|
78
|
-
},
|
|
79
|
-
description: property.description,
|
|
80
|
-
deprecated: property.deprecated,
|
|
81
|
-
directives: null,
|
|
82
|
-
defaultValue: null,
|
|
83
|
-
};
|
|
84
|
-
}
|
|
85
|
-
function generateObjectTypeFromInlineObject(inlineObjectMember, typeName, abstractTypeName, sourceFile) {
|
|
86
|
-
const fields = [];
|
|
87
|
-
for (const property of inlineObjectMember.properties) {
|
|
88
|
-
const field = convertInlineObjectPropertyToField(property);
|
|
89
|
-
if (field !== null) {
|
|
90
|
-
fields.push(field);
|
|
91
|
-
}
|
|
92
|
-
}
|
|
93
|
-
return {
|
|
94
|
-
name: typeName,
|
|
95
|
-
kind: "Object",
|
|
96
|
-
fields,
|
|
97
|
-
enumValues: null,
|
|
98
|
-
unionMembers: null,
|
|
99
|
-
needsStringEnumMapping: false,
|
|
100
|
-
sourceLocation: { file: sourceFile, line: 1, column: 1 },
|
|
101
|
-
generatedFrom: {
|
|
102
|
-
parentTypeName: abstractTypeName,
|
|
103
|
-
fieldPath: [],
|
|
104
|
-
context: "typeField",
|
|
105
|
-
},
|
|
106
|
-
description: null,
|
|
107
|
-
resolveTypeFieldPattern: null,
|
|
108
|
-
};
|
|
109
|
-
}
|
|
29
|
+
/** Typename-related properties that should be excluded from generated object types. */
|
|
30
|
+
const TYPENAME_PROPERTY_NAMES = new Set(["__typename", "$typeName"]);
|
|
110
31
|
function collectGeneratedObjectTypes(extraction, extractedType) {
|
|
111
32
|
const generatedObjectTypes = [];
|
|
112
33
|
const generatedInlineObjectTypes = [];
|
|
@@ -125,7 +46,13 @@ function collectGeneratedObjectTypes(extraction, extractedType) {
|
|
|
125
46
|
continue;
|
|
126
47
|
}
|
|
127
48
|
const typeName = member.typenameInfo.typeName;
|
|
128
|
-
const objectType = generateObjectTypeFromInlineObject(
|
|
49
|
+
const objectType = generateObjectTypeFromInlineObject({
|
|
50
|
+
inlineObjectMember,
|
|
51
|
+
typeName,
|
|
52
|
+
abstractTypeName: extraction.abstractTypeName,
|
|
53
|
+
sourceFile: extractedType.metadata.sourceFile,
|
|
54
|
+
skipPropertyNames: TYPENAME_PROPERTY_NAMES,
|
|
55
|
+
});
|
|
129
56
|
generatedObjectTypes.push(objectType);
|
|
130
57
|
generatedInlineObjectTypes.push({
|
|
131
58
|
typeName,
|
|
@@ -136,10 +63,11 @@ function collectGeneratedObjectTypes(extraction, extractedType) {
|
|
|
136
63
|
return { generatedObjectTypes, generatedInlineObjectTypes };
|
|
137
64
|
}
|
|
138
65
|
export function collectTypenameResolveTypes(params) {
|
|
139
|
-
const { extractedTypes, typeMap, manualResolveTypeNames } = params;
|
|
66
|
+
const { extractedTypes, typeMap, manualResolveTypeNames, discriminatorFieldUnionNames, } = params;
|
|
140
67
|
const extractions = collectTypenameExtractions({
|
|
141
68
|
extractedTypes,
|
|
142
69
|
typeMap,
|
|
70
|
+
discriminatorFieldUnionNames,
|
|
143
71
|
});
|
|
144
72
|
const autoResolveTypes = [];
|
|
145
73
|
const autoResolveTypeNames = new Set();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-resolve-type-generator.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-resolve-type-generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"typename-resolve-type-generator.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-resolve-type-generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,10 @@
|
|
|
13
13
|
* 2. Update findTypenameProperty priority if needed
|
|
14
14
|
*/
|
|
15
15
|
export declare const TYPENAME_FIELD_NAMES: readonly ["__typename", "$typeName"];
|
|
16
|
+
/**
|
|
17
|
+
* Check if a field name is a typename discrimination field.
|
|
18
|
+
*/
|
|
19
|
+
export declare function isTypenameFieldName(name: string): boolean;
|
|
16
20
|
/**
|
|
17
21
|
* The field name used for type discrimination.
|
|
18
22
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-types.d.ts","sourceRoot":"","sources":["../../src/auto-type-generator/typename-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,sCAAuC,CAAC;AAEzE;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;AAElE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAC3C,oBAAoB,CAEtB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;CACvC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,GACxB;IAAE,QAAQ,EAAE,CAAC,CAAC;IAAC,SAAS,EAAE,iBAAiB,CAAA;CAAE,GAAG,IAAI,CActD"}
|
|
1
|
+
{"version":3,"file":"typename-types.d.ts","sourceRoot":"","sources":["../../src/auto-type-generator/typename-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,sCAAuC,CAAC;AAEzE;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEzD;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,GAAG,CAAC,OAAO,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEtE;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC,iBAAiB,CAAC,CAAC;AAElE;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,UAAU,EAAE,aAAa,CAAC,iBAAiB,CAAC,GAC3C,oBAAoB,CAEtB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;CACvC;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC,EAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,MAAM,GACxB;IAAE,QAAQ,EAAE,CAAC,CAAC;IAAC,SAAS,EAAE,iBAAiB,CAAA;CAAE,GAAG,IAAI,CActD"}
|
|
@@ -13,6 +13,12 @@
|
|
|
13
13
|
* 2. Update findTypenameProperty priority if needed
|
|
14
14
|
*/
|
|
15
15
|
export const TYPENAME_FIELD_NAMES = ["__typename", "$typeName"];
|
|
16
|
+
/**
|
|
17
|
+
* Check if a field name is a typename discrimination field.
|
|
18
|
+
*/
|
|
19
|
+
export function isTypenameFieldName(name) {
|
|
20
|
+
return TYPENAME_FIELD_NAMES.includes(name);
|
|
21
|
+
}
|
|
16
22
|
/**
|
|
17
23
|
* Create a TypenameFieldNameSet from field names.
|
|
18
24
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-types.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"typename-types.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,YAAY,EAAE,WAAW,CAAU,CAAC;AAEzE;;GAEG;AACH,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC9C,OAAQ,oBAA0C,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AACpE,CAAC;AAYD;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAChC,UAA4C;IAE5C,OAAO,IAAI,GAAG,CAAC,UAAU,CAAC,CAAC;AAC7B,CAAC;AAUD;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAClC,UAA4B,EAC5B,OAAyB;IAEzB,MAAM,gBAAgB,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,CAAC;IAC7E,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,YAAY,EAAE,CAAC;IACjE,CAAC;IAED,MAAM,sBAAsB,GAAG,UAAU,CAAC,IAAI,CAC5C,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,WAAW,CAClC,CAAC;IACF,IAAI,sBAAsB,EAAE,CAAC;QAC3B,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;IACtE,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-validator.d.ts","sourceRoot":"","sources":["../../src/auto-type-generator/typename-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAMxE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IACpD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjD;AA8GD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,uBAAuB,GAC9B,uBAAuB,
|
|
1
|
+
{"version":3,"file":"typename-validator.d.ts","sourceRoot":"","sources":["../../src/auto-type-generator/typename-validator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,iBAAiB,EACjB,kBAAkB,EAClB,cAAc,EACf,MAAM,kCAAkC,CAAC;AAC1C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AAMxE,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,gBAAgB,EAAE,wBAAwB,CAAC;IACpD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,mBAAmB,EAAE,aAAa,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;CACxE;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjD;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACvD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC1D;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjD;AA8GD;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,uBAAuB,GAC9B,uBAAuB,CAmEzB;AAqCD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,6BAA6B,GACpC,6BAA6B,CA8D/B"}
|
|
@@ -20,7 +20,7 @@ function analyzeInlineObjectTypename(inlineObjectMember) {
|
|
|
20
20
|
return {
|
|
21
21
|
exists: true,
|
|
22
22
|
fieldName,
|
|
23
|
-
isStringLiteral: tsType.kind === "
|
|
23
|
+
isStringLiteral: tsType.kind === "stringLiteral" && tsType.name !== null,
|
|
24
24
|
isNullable: tsType.nullable,
|
|
25
25
|
};
|
|
26
26
|
}
|
|
@@ -91,7 +91,8 @@ export function validateTypenames(params) {
|
|
|
91
91
|
continue;
|
|
92
92
|
}
|
|
93
93
|
const { typeName, fieldName } = member.typenameInfo;
|
|
94
|
-
const memberTypeName = member.memberTypeName ??
|
|
94
|
+
const memberTypeName = member.memberTypeName ??
|
|
95
|
+
`(anonymous member at index ${member.memberIndex})`;
|
|
95
96
|
const existing = typenameValueToMembers.get(typeName) ?? [];
|
|
96
97
|
existing.push({ memberTypeName, fieldName });
|
|
97
98
|
typenameValueToMembers.set(typeName, existing);
|
|
@@ -136,7 +137,7 @@ function extractTypenameFromObjectType(typeInfo) {
|
|
|
136
137
|
const { tsType } = field;
|
|
137
138
|
if (field.optional ||
|
|
138
139
|
tsType.nullable ||
|
|
139
|
-
tsType.kind !== "
|
|
140
|
+
tsType.kind !== "stringLiteral" ||
|
|
140
141
|
tsType.name === null) {
|
|
141
142
|
return null;
|
|
142
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typename-validator.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-validator.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,oBAAoB,GAErB,MAAM,qBAAqB,CAAC;AA4B7B,SAAS,oBAAoB,CAAC,IAA2B;IACvD,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC;AAClD,CAAC;AAED,SAAS,cAAc,CAAC,IAA2B;IACjD,OAAO,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC;AACvD,CAAC;AASD,SAAS,2BAA2B,CAClC,kBAAsC;IAEtC,MAAM,KAAK,GAAG,oBAAoB,CAChC,kBAAkB,CAAC,UAAU,EAC7B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CACtB,CAAC;IAEF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO;YACL,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,IAAI;YACf,eAAe,EAAE,KAAK;YACtB,UAAU,EAAE,KAAK;SAClB,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IACtC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAE1C,OAAO;QACL,MAAM,EAAE,IAAI;QACZ,SAAS;QACT,eAAe,EAAE,MAAM,CAAC,IAAI,KAAK,
|
|
1
|
+
{"version":3,"file":"typename-validator.js","sourceRoot":"","sources":["../../src/auto-type-generator/typename-validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gen.d.ts","sourceRoot":"","sources":["../../src/commands/gen.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,
|
|
1
|
+
{"version":3,"file":"gen.d.ts","sourceRoot":"","sources":["../../src/commands/gen.ts"],"names":[],"mappings":"AAYA,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAED,wBAAsB,aAAa,CACjC,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,mBAAmB,CAAC,CA+G9B;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqBrB,CAAC"}
|
package/dist/commands/gen.js
CHANGED
|
@@ -24,7 +24,7 @@ export async function runGenCommand(options) {
|
|
|
24
24
|
const configDir = configResult.configPath
|
|
25
25
|
? dirname(configResult.configPath)
|
|
26
26
|
: options.cwd;
|
|
27
|
-
const { sourceDir, sourceIgnoreGlobs, output, scalars, tsconfigPath } = configResult.config;
|
|
27
|
+
const { sourceDir, sourceIgnoreGlobs, output, scalars, tsconfigPath, discriminatorFields, } = configResult.config;
|
|
28
28
|
const config = {
|
|
29
29
|
cwd: options.cwd,
|
|
30
30
|
sourceDir,
|
|
@@ -33,6 +33,7 @@ export async function runGenCommand(options) {
|
|
|
33
33
|
configDir,
|
|
34
34
|
customScalars: scalars,
|
|
35
35
|
tsconfigPath,
|
|
36
|
+
discriminatorFields,
|
|
36
37
|
};
|
|
37
38
|
progressReporter.startPhase("Extracting types");
|
|
38
39
|
progressReporter.startPhase("Extracting resolvers");
|
package/dist/commands/gen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gen.js","sourceRoot":"","sources":["../../src/commands/gen.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,MAAM,oDAAoD,CAAC;AAClF,OAAO,EACL,iBAAiB,EAEjB,mBAAmB,GACpB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,wBAAwB,EAAE,MAAM,qDAAqD,CAAC;AAC/F,OAAO,EAAE,sBAAsB,EAAE,MAAM,mDAAmD,CAAC;AAW3F,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA6B;IAE7B,MAAM,MAAM,GAAG;QACb,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC;QACzC,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC;KAC5C,CAAC;IAEF,MAAM,gBAAgB,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACxD,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAE5D,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC;QACpC,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC,CAAC;IAEH,IAAI,YAAY,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxC,kBAAkB,CAAC,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC;QAC/D,kBAAkB,CAAC,WAAW,CAAC,oBAAoB,CAAC,CAAC;QACrD,OAAO,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;IACzB,CAAC;IAED,MAAM,SAAS,GAAG,YAAY,CAAC,UAAU;QACvC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC;QAClC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC;IAEhB,MAAM,
|
|
1
|
+
{"version":3,"file":"gen.js","sourceRoot":"","sources":["../../src/commands/gen.ts"],"names":[],"mappings":"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"}
|
package/dist/config/types.d.ts
CHANGED
|
@@ -89,6 +89,13 @@ export interface GqlkitConfig {
|
|
|
89
89
|
* Hook configuration for lifecycle events.
|
|
90
90
|
*/
|
|
91
91
|
readonly hooks?: HooksConfig;
|
|
92
|
+
/**
|
|
93
|
+
* Custom discriminator field mappings for union types.
|
|
94
|
+
* Maps GraphQL union type names to TypeScript discriminator field names.
|
|
95
|
+
* When specified, gqlkit generates __resolveType functions based on these fields
|
|
96
|
+
* instead of requiring $typeName or __typename.
|
|
97
|
+
*/
|
|
98
|
+
readonly discriminatorFields?: Readonly<Record<string, string | ReadonlyArray<string>>>;
|
|
92
99
|
}
|
|
93
100
|
/**
|
|
94
101
|
* Custom scalar mapping configuration.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAEnD;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtC;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;CAC7D;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAEnD;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAE/B;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/config/types.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,MAAM,eAAe,GAAG,IAAI,GAAG,MAAM,GAAG,IAAI,CAAC;AAEnD;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;OAMG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC;;;;;;OAMG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtC;;;;;;OAMG;IACH,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEpC;;;;OAIG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,eAAe,CAAC;CAC5C;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;CAC7D;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;OAIG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAE5B;;;;OAIG;IACH,QAAQ,CAAC,iBAAiB,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAEnD;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAE/B;;;OAGG;IACH,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,mBAAmB,CAAC,CAAC;IAEtD;;;;;OAKG;IACH,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,CAAC;IAE7B;;;;;OAKG;IACH,QAAQ,CAAC,mBAAmB,CAAC,EAAE,QAAQ,CACrC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAC/C,CAAC;CACH;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,MAAM,EAAE;QACf;;;WAGG;QACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QAEtB;;;WAGG;QACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;KACxB,CAAC;IAEF;;;;;OAKG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAEnC;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export { type LoadConfigOptions, type LoadConfigResult, loadConfig, type ResolvedConfig, type ResolvedHooksConfig, type ResolvedOutputConfig, type ResolvedScalarMapping, } from "./loader.js";
|
|
1
|
+
export { type LoadConfigOptions, type LoadConfigResult, loadConfig, type ResolvedConfig, type ResolvedDiscriminatorFieldsMap, type ResolvedHooksConfig, type ResolvedOutputConfig, type ResolvedScalarMapping, } from "./loader.js";
|
|
2
2
|
export type { ValidateConfigOptions, ValidateConfigResult, } from "./validator.js";
|
|
3
3
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config-loader/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,UAAU,EACV,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,aAAa,CAAC;AAErB,YAAY,EACV,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config-loader/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,UAAU,EACV,KAAK,cAAc,EACnB,KAAK,8BAA8B,EACnC,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,aAAa,CAAC;AAErB,YAAY,EACV,qBAAqB,EACrB,oBAAoB,GACrB,MAAM,gBAAgB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-loader/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config-loader/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,GAMX,MAAM,aAAa,CAAC"}
|
|
@@ -33,6 +33,11 @@ export interface ResolvedHooksConfig {
|
|
|
33
33
|
/** Normalized to array (empty if not configured) */
|
|
34
34
|
readonly afterAllFileWrite: ReadonlyArray<string>;
|
|
35
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* Normalized discriminator fields mapping.
|
|
38
|
+
* All values are normalized to arrays (single strings are wrapped in arrays).
|
|
39
|
+
*/
|
|
40
|
+
export type ResolvedDiscriminatorFieldsMap = ReadonlyMap<string, ReadonlyArray<string>>;
|
|
36
41
|
export interface ResolvedConfig {
|
|
37
42
|
readonly sourceDir: string;
|
|
38
43
|
readonly sourceIgnoreGlobs: ReadonlyArray<string>;
|
|
@@ -40,6 +45,7 @@ export interface ResolvedConfig {
|
|
|
40
45
|
readonly scalars: ReadonlyArray<ResolvedScalarMapping>;
|
|
41
46
|
readonly tsconfigPath: string | null;
|
|
42
47
|
readonly hooks: ResolvedHooksConfig;
|
|
48
|
+
readonly discriminatorFields: ResolvedDiscriminatorFieldsMap;
|
|
43
49
|
}
|
|
44
50
|
export interface LoadConfigResult {
|
|
45
51
|
readonly config: ResolvedConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config-loader/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAGnE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,uDAAuD;IACvD,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,gEAAgE;IAChE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qDAAqD;IACrD,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gDAAgD;IAChD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,oDAAoD;IACpD,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACnD;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config-loader/loader.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAGnE,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC;IACzC,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC;AAED;;;GAGG;AACH,MAAM,WAAW,oBAAoB;IACnC,uDAAuD;IACvD,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,gEAAgE;IAChE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,qDAAqD;IACrD,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gDAAgD;IAChD,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC;CAC3C;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,oDAAoD;IACpD,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;CACnD;AAED;;;GAGG;AACH,MAAM,MAAM,8BAA8B,GAAG,WAAW,CACtD,MAAM,EACN,aAAa,CAAC,MAAM,CAAC,CACtB,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,iBAAiB,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,qBAAqB,CAAC,CAAC;IACvD,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,CAAC;IACpC,QAAQ,CAAC,mBAAmB,EAAE,8BAA8B,CAAC;CAC9D;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IACxC,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjD;AAID,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AACtD,eAAO,MAAM,sBAAsB,0CAA0C,CAAC;AAC9E,eAAO,MAAM,qBAAqB,yCAAyC,CAAC;AAC5E,eAAO,MAAM,mBAAmB,4CAA4C,CAAC;AAuB7E,wBAAsB,UAAU,CAC9B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,gBAAgB,CAAC,CAqF3B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config-loader/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config-loader/loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/config-loader/validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAKL,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"validator.d.ts","sourceRoot":"","sources":["../../src/config-loader/validator.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAKL,KAAK,cAAc,EAKpB,MAAM,aAAa,CAAC;AAErB,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,cAAc,GAAG,SAAS,CAAC;IACpD,QAAQ,CAAC,WAAW,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC;CACjD;AA8oBD,wBAAgB,cAAc,CAC5B,OAAO,EAAE,qBAAqB,GAC7B,oBAAoB,CA4HtB"}
|
|
@@ -424,6 +424,85 @@ function validateHooksConfig(hooks, configPath) {
|
|
|
424
424
|
});
|
|
425
425
|
return { resolved: undefined, diagnostics };
|
|
426
426
|
}
|
|
427
|
+
function validateDiscriminatorFieldsConfig(value, configPath) {
|
|
428
|
+
const diagnostics = [];
|
|
429
|
+
if (value === undefined) {
|
|
430
|
+
return { resolved: new Map(), diagnostics: [] };
|
|
431
|
+
}
|
|
432
|
+
if (!isRecord(value)) {
|
|
433
|
+
diagnostics.push({
|
|
434
|
+
code: "CONFIG_INVALID_DISCRIMINATOR_FIELDS",
|
|
435
|
+
message: "discriminatorFields must be an object",
|
|
436
|
+
severity: "error",
|
|
437
|
+
location: { file: configPath, line: 1, column: 1 },
|
|
438
|
+
});
|
|
439
|
+
return { resolved: undefined, diagnostics };
|
|
440
|
+
}
|
|
441
|
+
const result = new Map();
|
|
442
|
+
for (const [key, entry] of Object.entries(value)) {
|
|
443
|
+
if (typeof entry === "string") {
|
|
444
|
+
if (entry === "") {
|
|
445
|
+
diagnostics.push({
|
|
446
|
+
code: "CONFIG_EMPTY_DISCRIMINATOR_FIELDS",
|
|
447
|
+
message: `discriminatorFields["${key}"] cannot be an empty string`,
|
|
448
|
+
severity: "error",
|
|
449
|
+
location: { file: configPath, line: 1, column: 1 },
|
|
450
|
+
});
|
|
451
|
+
continue;
|
|
452
|
+
}
|
|
453
|
+
result.set(key, [entry]);
|
|
454
|
+
}
|
|
455
|
+
else if (Array.isArray(entry)) {
|
|
456
|
+
if (entry.length === 0) {
|
|
457
|
+
diagnostics.push({
|
|
458
|
+
code: "CONFIG_EMPTY_DISCRIMINATOR_FIELDS",
|
|
459
|
+
message: `discriminatorFields["${key}"] cannot be an empty array`,
|
|
460
|
+
severity: "error",
|
|
461
|
+
location: { file: configPath, line: 1, column: 1 },
|
|
462
|
+
});
|
|
463
|
+
continue;
|
|
464
|
+
}
|
|
465
|
+
let hasError = false;
|
|
466
|
+
for (const item of entry) {
|
|
467
|
+
if (typeof item !== "string") {
|
|
468
|
+
diagnostics.push({
|
|
469
|
+
code: "CONFIG_INVALID_DISCRIMINATOR_ENTRY",
|
|
470
|
+
message: `discriminatorFields["${key}"] array must contain only strings`,
|
|
471
|
+
severity: "error",
|
|
472
|
+
location: { file: configPath, line: 1, column: 1 },
|
|
473
|
+
});
|
|
474
|
+
hasError = true;
|
|
475
|
+
break;
|
|
476
|
+
}
|
|
477
|
+
if (item === "") {
|
|
478
|
+
diagnostics.push({
|
|
479
|
+
code: "CONFIG_EMPTY_DISCRIMINATOR_FIELDS",
|
|
480
|
+
message: `discriminatorFields["${key}"] array contains an empty string`,
|
|
481
|
+
severity: "error",
|
|
482
|
+
location: { file: configPath, line: 1, column: 1 },
|
|
483
|
+
});
|
|
484
|
+
hasError = true;
|
|
485
|
+
break;
|
|
486
|
+
}
|
|
487
|
+
}
|
|
488
|
+
if (!hasError) {
|
|
489
|
+
result.set(key, entry);
|
|
490
|
+
}
|
|
491
|
+
}
|
|
492
|
+
else {
|
|
493
|
+
diagnostics.push({
|
|
494
|
+
code: "CONFIG_INVALID_DISCRIMINATOR_ENTRY",
|
|
495
|
+
message: `discriminatorFields["${key}"] must be a string or array of strings`,
|
|
496
|
+
severity: "error",
|
|
497
|
+
location: { file: configPath, line: 1, column: 1 },
|
|
498
|
+
});
|
|
499
|
+
}
|
|
500
|
+
}
|
|
501
|
+
if (diagnostics.length > 0) {
|
|
502
|
+
return { resolved: undefined, diagnostics };
|
|
503
|
+
}
|
|
504
|
+
return { resolved: result, diagnostics: [] };
|
|
505
|
+
}
|
|
427
506
|
export function validateConfig(options) {
|
|
428
507
|
const { config, configPath } = options;
|
|
429
508
|
const diagnostics = [];
|
|
@@ -446,6 +525,8 @@ export function validateConfig(options) {
|
|
|
446
525
|
diagnostics.push(...tsconfigPathResult.diagnostics);
|
|
447
526
|
const hooksResult = validateHooksConfig(config["hooks"], configPath);
|
|
448
527
|
diagnostics.push(...hooksResult.diagnostics);
|
|
528
|
+
const discriminatorFieldsResult = validateDiscriminatorFieldsConfig(config["discriminatorFields"], configPath);
|
|
529
|
+
diagnostics.push(...discriminatorFieldsResult.diagnostics);
|
|
449
530
|
if (config["scalars"] !== undefined && !Array.isArray(config["scalars"])) {
|
|
450
531
|
diagnostics.push({
|
|
451
532
|
code: "CONFIG_INVALID_TYPE",
|
|
@@ -501,7 +582,8 @@ export function validateConfig(options) {
|
|
|
501
582
|
!sourceDirResult.resolved ||
|
|
502
583
|
!sourceIgnoreGlobsResult.resolved ||
|
|
503
584
|
!outputResult.resolved ||
|
|
504
|
-
!hooksResult.resolved
|
|
585
|
+
!hooksResult.resolved ||
|
|
586
|
+
!discriminatorFieldsResult.resolved) {
|
|
505
587
|
return { valid: false, resolvedConfig: undefined, diagnostics };
|
|
506
588
|
}
|
|
507
589
|
return {
|
|
@@ -513,6 +595,7 @@ export function validateConfig(options) {
|
|
|
513
595
|
scalars: resolvedScalars,
|
|
514
596
|
tsconfigPath: tsconfigPathResult.resolved,
|
|
515
597
|
hooks: hooksResult.resolved,
|
|
598
|
+
discriminatorFields: discriminatorFieldsResult.resolved,
|
|
516
599
|
},
|
|
517
600
|
diagnostics: [],
|
|
518
601
|
};
|