@pothos/plugin-prisma 3.40.1 → 3.40.3
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/CHANGELOG.md +13 -0
- package/dts/util/map-query.d.ts.map +1 -1
- package/esm/util/map-query.d.ts.map +1 -1
- package/esm/util/map-query.js +6 -2
- package/esm/util/map-query.js.map +1 -1
- package/generated.ts +1 -1
- package/lib/util/map-query.js +5 -2
- package/lib/util/map-query.js.map +1 -1
- package/package.json +4 -4
- package/src/util/map-query.ts +19 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,18 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 3.40.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 372260ec: Fix bug that prevented prisma from correctly including selections when using the
|
|
8
|
+
directResult option from the errors plugin
|
|
9
|
+
|
|
10
|
+
## 3.40.2
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- 98c6e801: Fix issue when using path and typeName together in resolveQueryFromInfo
|
|
15
|
+
|
|
3
16
|
## 3.40.1
|
|
4
17
|
|
|
5
18
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-query.d.ts","sourceRoot":"","sources":["../../src/util/map-query.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,gBAAgB,EAEhB,kBAAkB,EAKnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAKL,YAAY,EACb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAIL,cAAc,EAEf,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"map-query.d.ts","sourceRoot":"","sources":["../../src/util/map-query.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,gBAAgB,EAEhB,kBAAkB,EAKnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAKL,YAAY,EACb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAIL,cAAc,EAEf,MAAM,cAAc,CAAC;AA+StB,wBAAgB,aAAa,CAAC,CAAC,SAAS,YAAY,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,SAAS,EAAE,EACtF,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,IAAS,GACV,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,CAAC,EAAE,EAAE,CAAA;CAAE,CA+CnC;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EACxB,QAAQ,CAAC,EAAE,MAAM,kBAalB;AAkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,kBAAkB,oBAU/E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"map-query.d.ts","sourceRoot":"","sources":["../../src/util/map-query.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,gBAAgB,EAEhB,kBAAkB,EAKnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAKL,YAAY,EACb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAIL,cAAc,EAEf,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"map-query.d.ts","sourceRoot":"","sources":["../../src/util/map-query.ts"],"names":[],"mappings":"AAEA,OAAO,EAML,gBAAgB,EAEhB,kBAAkB,EAKnB,MAAM,SAAS,CAAC;AACjB,OAAO,EAKL,YAAY,EACb,MAAM,UAAU,CAAC;AAGlB,OAAO,EAIL,cAAc,EAEf,MAAM,cAAc,CAAC;AA+StB,wBAAgB,aAAa,CAAC,CAAC,SAAS,YAAY,CAAC,QAAQ,CAAC,GAAG,SAAS,GAAG,SAAS,EAAE,EACtF,OAAO,EACP,IAAI,EACJ,QAAQ,EACR,MAAM,EACN,IAAS,GACV,EAAE;IACD,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,kBAAkB,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,CAAC,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,GAAG;IAAE,MAAM,EAAE,CAAC,CAAA;CAAE,GAAG;IAAE,OAAO,CAAC,EAAE,EAAE,CAAA;CAAE,CA+CnC;AAED,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,kBAAkB,EACxB,QAAQ,CAAC,EAAE,MAAM,kBAalB;AAkBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,kBAAkB,oBAU/E"}
|
package/esm/util/map-query.js
CHANGED
|
@@ -7,11 +7,15 @@ function addTypeSelectionsForField(type, context, info, state, selection, indire
|
|
|
7
7
|
}
|
|
8
8
|
var _type_extensions;
|
|
9
9
|
const { pothosPrismaInclude, pothosPrismaSelect, pothosPrismaIndirectInclude, pothosPrismaModel } = (_type_extensions = type.extensions) !== null && _type_extensions !== void 0 ? _type_extensions : {};
|
|
10
|
-
if (pothosPrismaIndirectInclude) {
|
|
10
|
+
if (pothosPrismaIndirectInclude && pothosPrismaIndirectInclude.path.length > 0) {
|
|
11
11
|
resolveIndirectInclude(type, info, selection, pothosPrismaIndirectInclude.path, indirectPath, (resolvedType, field, path) => {
|
|
12
12
|
addTypeSelectionsForField(resolvedType, context, info, state, field, path);
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
|
+
else if (pothosPrismaIndirectInclude) {
|
|
16
|
+
addTypeSelectionsForField(info.schema.getType(pothosPrismaIndirectInclude.getType()), context, info, state, selection, indirectPath);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
15
19
|
if (!isObjectType(type)) {
|
|
16
20
|
return;
|
|
17
21
|
}
|
|
@@ -176,7 +180,7 @@ export function queryFromInfo({ context, info, typeName, select, path = [] }) {
|
|
|
176
180
|
resolveIndirectInclude(indirectType, info, indirectField, path.map((n) => typeof n === "string" ? {
|
|
177
181
|
name: n
|
|
178
182
|
} : n), subPath, (resolvedType, resolvedField, nested) => {
|
|
179
|
-
addTypeSelectionsForField(resolvedType, context, info, state, resolvedField, nested);
|
|
183
|
+
addTypeSelectionsForField(typeName ? type : resolvedType, context, info, state, resolvedField, nested);
|
|
180
184
|
});
|
|
181
185
|
});
|
|
182
186
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/map-query.ts"],"names":["getArgumentValues","getNamedType","isObjectType","Kind","setLoaderMappings","createState","mergeSelection","selectionCompatible","selectionToQuery","addTypeSelectionsForField","type","context","info","state","selection","indirectPath","name","value","startsWith","pothosPrismaInclude","pothosPrismaSelect","pothosPrismaIndirectInclude","pothosPrismaModel","extensions","
|
|
1
|
+
{"version":3,"sources":["../../src/util/map-query.ts"],"names":["getArgumentValues","getNamedType","isObjectType","Kind","setLoaderMappings","createState","mergeSelection","selectionCompatible","selectionToQuery","addTypeSelectionsForField","type","context","info","state","selection","indirectPath","name","value","startsWith","pothosPrismaInclude","pothosPrismaSelect","pothosPrismaIndirectInclude","pothosPrismaModel","extensions","path","length","resolveIndirectInclude","resolvedType","field","schema","getType","mode","select","undefined","include","selectionSet","addNestedSelections","includePath","resolve","rest","sel","selections","kind","FIELD","returnType","getFields","alias","FRAGMENT_SPREAD","fragments","typeCondition","INLINE_FRAGMENT","Error","addFieldSelection","fieldSelect","fieldSelectionMap","mappings","args","variableValues","rawQuery","indirectInclude","query","normalizedIndirectInclude","Array","isArray","normalizeInclude","getIndirectType","fieldState","createStateForType","Object","keys","resolvedField","node","map","_","queryFromInfo","typeName","getTypeMap","fieldNodes","indirectType","indirectField","subPath","n","nested","selectionStateFromInfo","parentType","parent","targetType","fieldMap","pothosPrismaFieldMap","currentType","normalized","fieldName","push"],"mappings":"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"}
|
package/generated.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/*
|
|
2
2
|
This File should be overwritten by adding the pothos generator to you prisma schema
|
|
3
|
-
and running `prisma generate`. See https://pothos-graphql.dev/plugins/prisma for more details
|
|
3
|
+
and running `prisma generate`. See https://pothos-graphql.dev/docs/plugins/prisma for more details
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
export {};
|
package/lib/util/map-query.js
CHANGED
|
@@ -22,10 +22,13 @@ function addTypeSelectionsForField(type, context, info, state, selection, indire
|
|
|
22
22
|
}
|
|
23
23
|
var _type_extensions;
|
|
24
24
|
const { pothosPrismaInclude , pothosPrismaSelect , pothosPrismaIndirectInclude , pothosPrismaModel } = (_type_extensions = type.extensions) !== null && _type_extensions !== void 0 ? _type_extensions : {};
|
|
25
|
-
if (pothosPrismaIndirectInclude) {
|
|
25
|
+
if (pothosPrismaIndirectInclude && pothosPrismaIndirectInclude.path.length > 0) {
|
|
26
26
|
resolveIndirectInclude(type, info, selection, pothosPrismaIndirectInclude.path, indirectPath, (resolvedType, field, path)=>{
|
|
27
27
|
addTypeSelectionsForField(resolvedType, context, info, state, field, path);
|
|
28
28
|
});
|
|
29
|
+
} else if (pothosPrismaIndirectInclude) {
|
|
30
|
+
addTypeSelectionsForField(info.schema.getType(pothosPrismaIndirectInclude.getType()), context, info, state, selection, indirectPath);
|
|
31
|
+
return;
|
|
29
32
|
}
|
|
30
33
|
if (!(0, _graphql.isObjectType)(type)) {
|
|
31
34
|
return;
|
|
@@ -190,7 +193,7 @@ function queryFromInfo({ context , info , typeName , select , path =[] }) {
|
|
|
190
193
|
resolveIndirectInclude(indirectType, info, indirectField, path.map((n)=>typeof n === 'string' ? {
|
|
191
194
|
name: n
|
|
192
195
|
} : n), subPath, (resolvedType, resolvedField, nested)=>{
|
|
193
|
-
addTypeSelectionsForField(resolvedType, context, info, state, resolvedField, nested);
|
|
196
|
+
addTypeSelectionsForField(typeName ? type : resolvedType, context, info, state, resolvedField, nested);
|
|
194
197
|
});
|
|
195
198
|
});
|
|
196
199
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/map-query.ts"],"names":["queryFromInfo","selectionStateFromInfo","getIndirectType","addTypeSelectionsForField","type","context","info","state","selection","indirectPath","name","value","startsWith","pothosPrismaInclude","pothosPrismaSelect","pothosPrismaIndirectInclude","pothosPrismaModel","extensions","
|
|
1
|
+
{"version":3,"sources":["../../src/util/map-query.ts"],"names":["queryFromInfo","selectionStateFromInfo","getIndirectType","addTypeSelectionsForField","type","context","info","state","selection","indirectPath","name","value","startsWith","pothosPrismaInclude","pothosPrismaSelect","pothosPrismaIndirectInclude","pothosPrismaModel","extensions","path","length","resolveIndirectInclude","resolvedType","field","schema","getType","isObjectType","mode","mergeSelection","select","undefined","include","selectionSet","addNestedSelections","includePath","resolve","rest","sel","selections","kind","Kind","FIELD","returnType","getNamedType","getFields","alias","FRAGMENT_SPREAD","fragments","typeCondition","INLINE_FRAGMENT","Error","addFieldSelection","fieldSelect","fieldSelectionMap","mappings","args","getArgumentValues","variableValues","rawQuery","indirectInclude","query","normalizedIndirectInclude","Array","isArray","normalizeInclude","fieldState","createStateForType","Object","keys","resolvedField","selectionToQuery","node","map","_","selectionCompatible","typeName","getTypeMap","fieldNodes","indirectType","indirectField","subPath","n","nested","setLoaderMappings","parentType","parent","targetType","fieldMap","pothosPrismaFieldMap","createState","currentType","normalized","fieldName","push"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pothos/plugin-prisma",
|
|
3
|
-
"version": "3.40.
|
|
3
|
+
"version": "3.40.3",
|
|
4
4
|
"description": "A Pothos plugin for more efficient integration with prisma",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"types": "./dts/index.d.ts",
|
|
@@ -67,10 +67,10 @@
|
|
|
67
67
|
"graphql-scalars": "^1.20.1",
|
|
68
68
|
"graphql-tag": "^2.12.6",
|
|
69
69
|
"prisma": "^4.7.1",
|
|
70
|
-
"@pothos/core": "3.24.
|
|
70
|
+
"@pothos/core": "3.24.1",
|
|
71
71
|
"@pothos/plugin-complexity": "3.11.7",
|
|
72
|
-
"@pothos/plugin-errors": "3.10.
|
|
73
|
-
"@pothos/plugin-relay": "3.
|
|
72
|
+
"@pothos/plugin-errors": "3.10.1",
|
|
73
|
+
"@pothos/plugin-relay": "3.34.0",
|
|
74
74
|
"@pothos/plugin-simple-objects": "3.6.7",
|
|
75
75
|
"@pothos/test-utils": "1.4.7"
|
|
76
76
|
},
|
package/src/util/map-query.ts
CHANGED
|
@@ -55,7 +55,7 @@ function addTypeSelectionsForField(
|
|
|
55
55
|
pothosPrismaIndirectInclude?: IndirectInclude;
|
|
56
56
|
};
|
|
57
57
|
|
|
58
|
-
if (pothosPrismaIndirectInclude) {
|
|
58
|
+
if (pothosPrismaIndirectInclude && pothosPrismaIndirectInclude.path.length > 0) {
|
|
59
59
|
resolveIndirectInclude(
|
|
60
60
|
type,
|
|
61
61
|
info,
|
|
@@ -66,6 +66,16 @@ function addTypeSelectionsForField(
|
|
|
66
66
|
addTypeSelectionsForField(resolvedType, context, info, state, field, path);
|
|
67
67
|
},
|
|
68
68
|
);
|
|
69
|
+
} else if (pothosPrismaIndirectInclude) {
|
|
70
|
+
addTypeSelectionsForField(
|
|
71
|
+
info.schema.getType(pothosPrismaIndirectInclude.getType())!,
|
|
72
|
+
context,
|
|
73
|
+
info,
|
|
74
|
+
state,
|
|
75
|
+
selection,
|
|
76
|
+
indirectPath,
|
|
77
|
+
);
|
|
78
|
+
return;
|
|
69
79
|
}
|
|
70
80
|
|
|
71
81
|
if (!isObjectType(type)) {
|
|
@@ -362,7 +372,14 @@ export function queryFromInfo<T extends SelectionMap['select'] | undefined = und
|
|
|
362
372
|
path.map((n) => (typeof n === 'string' ? { name: n } : n)),
|
|
363
373
|
subPath,
|
|
364
374
|
(resolvedType, resolvedField, nested) => {
|
|
365
|
-
addTypeSelectionsForField(
|
|
375
|
+
addTypeSelectionsForField(
|
|
376
|
+
typeName ? type : resolvedType,
|
|
377
|
+
context,
|
|
378
|
+
info,
|
|
379
|
+
state,
|
|
380
|
+
resolvedField,
|
|
381
|
+
nested,
|
|
382
|
+
);
|
|
366
383
|
},
|
|
367
384
|
);
|
|
368
385
|
},
|