@k0lyan/typegraphql-prisma-nestjs 1.1.0 → 1.1.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.
|
@@ -3,6 +3,7 @@ import { EmitBlockKind } from "./emit-block";
|
|
|
3
3
|
import { GenerateMappingData } from "./types";
|
|
4
4
|
import { GeneratorOptions } from "./options";
|
|
5
5
|
export declare function generateTypeGraphQLImport(sourceFile: SourceFile): void;
|
|
6
|
+
export declare function generateForwardRefImport(sourceFile: SourceFile): void;
|
|
6
7
|
export declare function generateGraphQLFieldsImport(sourceFile: SourceFile): void;
|
|
7
8
|
export declare function generateGraphQLInfoImport(sourceFile: SourceFile): void;
|
|
8
9
|
export declare function generateGraphQLScalarsImport(sourceFile: SourceFile): void;
|
package/lib/generator/imports.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.generateArgsImports = exports.generateResolversOutputsImports = exports.generateOutputsImports = exports.generateInputsImports = exports.generateEnumsImports = exports.generateModelsImports = void 0;
|
|
4
4
|
exports.generateTypeGraphQLImport = generateTypeGraphQLImport;
|
|
5
|
+
exports.generateForwardRefImport = generateForwardRefImport;
|
|
5
6
|
exports.generateGraphQLFieldsImport = generateGraphQLFieldsImport;
|
|
6
7
|
exports.generateGraphQLInfoImport = generateGraphQLInfoImport;
|
|
7
8
|
exports.generateGraphQLScalarsImport = generateGraphQLScalarsImport;
|
|
@@ -46,6 +47,12 @@ function generateTypeGraphQLImport(sourceFile) {
|
|
|
46
47
|
].sort(),
|
|
47
48
|
});
|
|
48
49
|
}
|
|
50
|
+
function generateForwardRefImport(sourceFile) {
|
|
51
|
+
sourceFile.addImportDeclaration({
|
|
52
|
+
moduleSpecifier: "@nestjs/common",
|
|
53
|
+
namedImports: ["forwardRef"],
|
|
54
|
+
});
|
|
55
|
+
}
|
|
49
56
|
function generateGraphQLFieldsImport(sourceFile) {
|
|
50
57
|
sourceFile.addImportDeclaration({
|
|
51
58
|
moduleSpecifier: "graphql-fields",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/generator/imports.ts"],"names":[],"mappings":";;;AAsBA,8DAsBC;AAED,kEAKC;AAED,8DAMC;AAED,oEAKC;AAED,0EAKC;AAED,kEAOC;AAED,8DAeC;AAED,sEAkBC;AAED,wDAYC;AAED,sDAWC;AAED,4DAYC;AAED,0DAYC;AAED,4DAaC;AAED,8DAgBC;AAED,8CA0FC;AAED,kEAcC;AACD,gFAkBC;AAED,gEAkBC;;
|
|
1
|
+
{"version":3,"file":"imports.js","sourceRoot":"","sources":["../../src/generator/imports.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,11 @@ function generateObjectTypeClassFromModel(project, baseDirPath, model, modelOutp
|
|
|
17
17
|
(0, imports_1.generateGraphQLScalarsImport)(sourceFile);
|
|
18
18
|
(0, imports_1.generatePrismaNamespaceImport)(sourceFile, dmmfDocument.options, 1);
|
|
19
19
|
(0, imports_1.generateCustomScalarsImport)(sourceFile, 1);
|
|
20
|
+
// Check if model has relation fields to determine if forwardRef import is needed
|
|
21
|
+
const relationFields = model.fields.filter(field => !!field.relationName);
|
|
22
|
+
if (relationFields.length > 0) {
|
|
23
|
+
(0, imports_1.generateForwardRefImport)(sourceFile);
|
|
24
|
+
}
|
|
20
25
|
(0, imports_1.generateModelsImports)(sourceFile, model.fields
|
|
21
26
|
.filter(field => field.location === "outputObjectTypes")
|
|
22
27
|
.filter(field => field.type !== model.name)
|
|
@@ -67,6 +72,16 @@ function generateObjectTypeClassFromModel(project, baseDirPath, model, modelOutp
|
|
|
67
72
|
const isRelationNullable = isRelation
|
|
68
73
|
? !field.isList && !field.isRequired
|
|
69
74
|
: false;
|
|
75
|
+
// For relation fields, extract the base type (without array brackets) for forwardRef
|
|
76
|
+
const getRelationTypeExpression = () => {
|
|
77
|
+
// Get the base type name (e.g., "City" from "[City]" or "City")
|
|
78
|
+
const baseType = field.typeGraphQLType.replace(/^\[|\]$/g, "");
|
|
79
|
+
// Wrap in array if it's a list
|
|
80
|
+
if (field.isList) {
|
|
81
|
+
return `[forwardRef(() => ${baseType})]`;
|
|
82
|
+
}
|
|
83
|
+
return `forwardRef(() => ${baseType})`;
|
|
84
|
+
};
|
|
70
85
|
return {
|
|
71
86
|
name: field.name,
|
|
72
87
|
type: field.fieldTSType,
|
|
@@ -81,7 +96,7 @@ function generateObjectTypeClassFromModel(project, baseDirPath, model, modelOutp
|
|
|
81
96
|
{
|
|
82
97
|
name: "Field",
|
|
83
98
|
arguments: [
|
|
84
|
-
`(_type: any) => ${
|
|
99
|
+
`(_type: any) => ${getRelationTypeExpression()}`,
|
|
85
100
|
ts_morph_1.Writers.object({
|
|
86
101
|
nullable: `${isRelationNullable}`,
|
|
87
102
|
...(field.docs && { description: `"${field.docs}"` }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-type-class.js","sourceRoot":"","sources":["../../src/generator/model-type-class.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"model-type-class.js","sourceRoot":"","sources":["../../src/generator/model-type-class.ts"],"names":[],"mappings":"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"}
|