@smartive/graphql-magic 3.0.1 → 3.1.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/CHANGELOG.md +3 -3
- package/dist/cjs/index.cjs +9 -2
- package/dist/esm/client/queries.js +9 -2
- package/dist/esm/client/queries.js.map +1 -1
- package/package.json +8 -8
- package/src/client/queries.ts +10 -2
- package/tests/unit/__snapshots__/generate.spec.ts.snap +3 -0
- package/tests/unit/__snapshots__/queries.spec.ts.snap +11 -0
- package/tests/unit/queries.spec.ts +10 -0
- package/tests/utils/database/schema.ts +2 -0
- package/tests/utils/models.ts +7 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
# [3.1.0](https://github.com/smartive/graphql-magic/compare/v3.0.1...v3.1.0) (2023-08-15)
|
|
2
2
|
|
|
3
3
|
|
|
4
|
-
###
|
|
4
|
+
### Features
|
|
5
5
|
|
|
6
|
-
*
|
|
6
|
+
* Sort relations by display field ([d979333](https://github.com/smartive/graphql-magic/commit/d979333354c2592dc192108f326030e9a02f57b5))
|
package/dist/cjs/index.cjs
CHANGED
|
@@ -358,9 +358,16 @@ var getEditEntityRelationsQuery = (models, model, action, fields2, ignoreFields,
|
|
|
358
358
|
return !!relations.length && `query ${(0, import_upperFirst.default)(action)}${model.name}Relations {
|
|
359
359
|
${relations.map(({ name: name2, type }) => {
|
|
360
360
|
const model2 = summonByName(models, type);
|
|
361
|
-
|
|
361
|
+
let filters = "";
|
|
362
|
+
if (model2.displayField) {
|
|
363
|
+
const displayField2 = model2.fieldsByName[model2.displayField];
|
|
364
|
+
if (displayField2.orderable) {
|
|
365
|
+
filters = `(orderBy: [{ ${model2.displayField}: ASC }])`;
|
|
366
|
+
}
|
|
367
|
+
}
|
|
368
|
+
return `${name2}: ${getModelPluralField(model2)}${filters} {
|
|
362
369
|
id
|
|
363
|
-
display: ${model2.displayField || ""}
|
|
370
|
+
display: ${model2.displayField || "id"}
|
|
364
371
|
${additionalFields[name2] || ""}
|
|
365
372
|
}`;
|
|
366
373
|
}).join(" ")}
|
|
@@ -23,9 +23,16 @@ export const getEditEntityRelationsQuery = (models, model, action, fields, ignor
|
|
|
23
23
|
${relations
|
|
24
24
|
.map(({ name, type }) => {
|
|
25
25
|
const model = summonByName(models, type);
|
|
26
|
-
|
|
26
|
+
let filters = '';
|
|
27
|
+
if (model.displayField) {
|
|
28
|
+
const displayField = model.fieldsByName[model.displayField];
|
|
29
|
+
if (displayField.orderable) {
|
|
30
|
+
filters = `(orderBy: [{ ${model.displayField}: ASC }])`;
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
return `${name}: ${getModelPluralField(model)}${filters} {
|
|
27
34
|
id
|
|
28
|
-
display: ${model.displayField || ''}
|
|
35
|
+
display: ${model.displayField || 'id'}
|
|
29
36
|
${additionalFields[name] || ''}
|
|
30
37
|
}`;
|
|
31
38
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/client/queries.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EACL,mBAAmB,EACnB,GAAG,EACH,aAAa,EACb,UAAU,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,iBAAiB,EAGjB,GAAG,GAIJ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE1F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAY,EACZ,IAAS,EACT,MAA6B,EAC7B,gBAAgB,GAAG,EAAE,EACrB,EAAE,CAAC,eAAe,KAAK,CAAC,IAAI;UACpB,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;;MAE3B,KAAK,CAAC,MAAM;KACX,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACtD,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACvB,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;KAC3B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KACvB,IAAI,CAAC,GAAG,CAAC;MACV,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC;KACnC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACtD,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC;MACpC,gBAAgB;;EAEpB,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,MAAc,EACd,KAAY,EACZ,MAAsC,EACtC,MAAiB,EACjB,YAAuB,EACvB,mBAA2C,EAAE,EAC7C,EAAE;IACF,MAAM,SAAS,GAAG,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CACzD,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACpG,CAAC;IAEF,OAAO,CACL,CAAC,CAAC,SAAS,CAAC,MAAM;QAClB,SAAS,UAAU,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI;QACpC,SAAS;aACR,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACtB,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEzC,OAAO,GAAG,IAAI,KAAK,mBAAmB,CAAC,KAAK,CAAC;;
|
|
1
|
+
{"version":3,"file":"queries.js","sourceRoot":"","sources":["../../../src/client/queries.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EACL,mBAAmB,EACnB,GAAG,EACH,aAAa,EACb,UAAU,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,iBAAiB,EAGjB,GAAG,GAIJ,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAE1F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAY,EACZ,IAAS,EACT,MAA6B,EAC7B,gBAAgB,GAAG,EAAE,EACrB,EAAE,CAAC,eAAe,KAAK,CAAC,IAAI;UACpB,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;;MAE3B,KAAK,CAAC,MAAM;KACX,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACtD,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACvB,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;KAC3B,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;KACvB,IAAI,CAAC,GAAG,CAAC;MACV,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC;KACnC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;KACtD,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,GAAG,IAAI,SAAS,CAAC;MACpC,gBAAgB;;EAEpB,CAAC;AAEH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,MAAc,EACd,KAAY,EACZ,MAAsC,EACtC,MAAiB,EACjB,YAAuB,EACvB,mBAA2C,EAAE,EAC7C,EAAE;IACF,MAAM,SAAS,GAAG,mBAAmB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,MAAM,CACzD,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACpG,CAAC;IAEF,OAAO,CACL,CAAC,CAAC,SAAS,CAAC,MAAM;QAClB,SAAS,UAAU,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI;QACpC,SAAS;aACR,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE;YACtB,MAAM,KAAK,GAAG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAEzC,IAAI,OAAO,GAAG,EAAE,CAAC;YACjB,IAAI,KAAK,CAAC,YAAY,EAAE;gBACtB,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;gBAC5D,IAAI,YAAY,CAAC,SAAS,EAAE;oBAC1B,OAAO,GAAG,gBAAgB,KAAK,CAAC,YAAY,WAAW,CAAC;iBACzD;aACF;YAED,OAAO,GAAG,IAAI,KAAK,mBAAmB,CAAC,KAAK,CAAC,GAAG,OAAO;;uBAE1C,KAAK,CAAC,YAAY,IAAI,IAAI;cACnC,gBAAgB,CAAC,IAAI,CAAC,IAAI,EAAE;YAC9B,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC;MACZ,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,KAAY,EAAE,MAAiB,EAAE,YAAuB,EAAE,EAAE;IACjG,MAAM,mBAAmB,GAAkC,EAAE,CAAC;IAC9D,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,gBAAgB,EAAE;QAC1C,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE;YACnG,SAAS;SACV;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CACzC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,CACpF,CAAC;QACF,IAAI,CAAC,QAAQ,EAAE;YACb,SAAS;SACV;QAED,MAAM,kBAAkB,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAClD,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,CAC5G,CAAC;QACF,IAAI,kBAAkB,CAAC,MAAM,EAAE;YAC7B,SAAS;SACV;QAED,mBAAmB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;KAC7C;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,KAAY,EAAE,IAAY,EAAE,EAAE,CAAC,sBAAsB,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9G,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,KAAY,EACZ,MAA2B,EAC3B,mBAAkD,EAClD,EAAE,CACF,CAAC,CAAC,mBAAmB,CAAC,MAAM;IAC5B,CAAC,MAAM,KAAK,QAAQ;QAClB,CAAC,CAAC,eAAe,KAAK,CAAC,IAAI;cACjB,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;gBACrB,mBAAmB;aAClB,GAAG,CAAC,CAAC,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACpC,OAAO,GAAG,eAAe,CAAC,IAAI;;sBAE1B,KAAK,CAAC,IAAI;;;oBAGZ,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC;;cAEZ,mBAAmB;aAClB,GAAG,CAAC,CAAC,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACpC,OAAO,GAAG,eAAe,CAAC,IAAI,KAAK,mBAAmB,CAAC,KAAK,CAAC;;oBAEzD,KAAK,CAAC,YAAY,IAAI,EAAE;kBAC1B,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC;YACZ;QACR,CAAC,CAAC,eAAe,KAAK,CAAC,IAAI;cACjB,mBAAmB;aAClB,GAAG,CAAC,CAAC,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;YACpC,OAAO,GAAG,eAAe,CAAC,IAAI,KAAK,mBAAmB,CAAC,KAAK,CAAC;;oBAEzD,KAAK,CAAC,YAAY,IAAI,EAAE;kBAC1B,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,GAAG,CAAC;YACZ,CAAC,CAAC;AAQd,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,KAAY,EAAE,MAAsC,EAAE,EAAE,CACvF,MAAM,KAAK,QAAQ;IACjB,CAAC,CAAC;yBACmB,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,IAAI;2BACpC,KAAK,CAAC,IAAI;;;;SAI5B;IACL,CAAC,CAAC,MAAM,KAAK,QAAQ;QACrB,CAAC,CAAC;yBACmB,KAAK,CAAC,IAAI,4BAA4B,KAAK,CAAC,IAAI;2BAC9C,KAAK,CAAC,IAAI;;;;SAI5B;QACL,CAAC,CAAC;yBACmB,KAAK,CAAC,IAAI;2BACR,KAAK,CAAC,IAAI;;;;SAI5B,CAAC;AAEV,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAY,EAAE,EAAE,CAAC;EAC5C,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE;CAC3D,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAAY,EACZ,IAAY,EACZ,gBAAgB,GAAG,EAAE,EACrB,IAKC,EACD,EAAE,CAAC,SAAS,cAAc,CAAC,KAAK,CAAC;IAC/B,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;;YAEf,KAAK,CAAC,IAAI;IAClB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,EAAE;;IAE3E,IAAI,CAAC,CAAC,CAAC,SAAS,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE;YACjE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,kCACtE,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAC5E;QACQ,YAAY,CAAC,KAAK,CAAC;QACnB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;QACpF,gBAAgB;;IAEpB,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;EACjB,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAAc,EACd,KAAY,EACZ,IAAY,EACZ,sBAA8C,EAC9C,qBAA+B,EAC/B,EAAE,CAAC,cAAc,KAAK,CAAC,IAAI;UACnB,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC;MAC3B,YAAY,CAAC,KAAK,CAAC;MACnB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;MACpF,cAAc,CACd,MAAM,EACN,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,iBAAiB,CAAC,sBAAsB,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EACjG,IAAI,EACJ,qBAAqB,CACtB;MACC,cAAc,CACd,MAAM,EACN,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,EAAE,iBAAiB,CAAC,sBAAsB,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,EAChH,IAAI,EACJ,qBAAqB,CACtB;;EAEH,CAAC;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAY,EAAE,IAAY,EAAE,EAAE,CAAC,aAAa,KAAK,CAAC,IAAI,YACvF,KAAK,CAAC,IACR,sBAAsB,KAAK,CAAC,IAAI;UACtB,mBAAmB,CAAC,KAAK,CAAC;MAC9B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,aAAa,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;;EAExF,CAAC;AAEH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAAc,EACd,SAA2C,EAC3C,IAAY,EACZ,qBAA+B,EAC/B,EAAE,CACF,SAAS;KACN,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAU,EAAE;IAC9B,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAExG,OAAO,GAAG,IAAI;;YAER,YAAY,CAAC,YAAY,CAAC;YAC1B,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,EAAE;UAClG,CAAC;AACP,CAAC,CAAC;KACD,IAAI,CAAC,IAAI,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@smartive/graphql-magic",
|
|
3
|
-
"version": "3.0
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -31,7 +31,7 @@
|
|
|
31
31
|
},
|
|
32
32
|
"overrides": {
|
|
33
33
|
"graphql": "$graphql",
|
|
34
|
-
"rollup": "3.
|
|
34
|
+
"rollup": "3.28.0"
|
|
35
35
|
},
|
|
36
36
|
"browserslist": "> 0.25%, not dead",
|
|
37
37
|
"publishConfig": {
|
|
@@ -52,19 +52,19 @@
|
|
|
52
52
|
"@smartive/eslint-config": "3.2.0",
|
|
53
53
|
"@smartive/prettier-config": "3.1.2",
|
|
54
54
|
"@types/jest": "29.5.3",
|
|
55
|
-
"@types/lodash": "4.14.
|
|
55
|
+
"@types/lodash": "4.14.197",
|
|
56
56
|
"@types/luxon": "3.3.1",
|
|
57
57
|
"@types/uuid": "9.0.2",
|
|
58
58
|
"create-ts-index": "1.14.0",
|
|
59
59
|
"del-cli": "5.0.0",
|
|
60
|
-
"esbuild": "0.19.
|
|
61
|
-
"eslint": "8.
|
|
62
|
-
"graphql-request": "
|
|
60
|
+
"esbuild": "0.19.2",
|
|
61
|
+
"eslint": "8.47.0",
|
|
62
|
+
"graphql-request": "6.1.0",
|
|
63
63
|
"jest": "29.6.2",
|
|
64
64
|
"mock-knex": "0.4.12",
|
|
65
|
-
"pg": "
|
|
65
|
+
"pg": "8.11.2",
|
|
66
66
|
"prettier": "2.8.8",
|
|
67
|
-
"simple-git": "
|
|
67
|
+
"simple-git": "3.19.1",
|
|
68
68
|
"ts-jest": "29.1.1",
|
|
69
69
|
"ts-node": "10.9.1",
|
|
70
70
|
"typescript": "5.1.6"
|
package/src/client/queries.ts
CHANGED
|
@@ -57,9 +57,17 @@ export const getEditEntityRelationsQuery = (
|
|
|
57
57
|
.map(({ name, type }) => {
|
|
58
58
|
const model = summonByName(models, type);
|
|
59
59
|
|
|
60
|
-
|
|
60
|
+
let filters = '';
|
|
61
|
+
if (model.displayField) {
|
|
62
|
+
const displayField = model.fieldsByName[model.displayField];
|
|
63
|
+
if (displayField.orderable) {
|
|
64
|
+
filters = `(orderBy: [{ ${model.displayField}: ASC }])`;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
return `${name}: ${getModelPluralField(model)}${filters} {
|
|
61
69
|
id
|
|
62
|
-
display: ${model.displayField || ''}
|
|
70
|
+
display: ${model.displayField || 'id'}
|
|
63
71
|
${additionalFields[name] || ''}
|
|
64
72
|
}`;
|
|
65
73
|
})
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
exports[`generate generates a schema 1`] = `
|
|
4
4
|
"type AnotherObject {
|
|
5
5
|
id: ID!
|
|
6
|
+
name: String
|
|
6
7
|
myself: AnotherObject
|
|
7
8
|
deleted: Boolean!
|
|
8
9
|
deletedAt: DateTime
|
|
@@ -12,6 +13,7 @@ exports[`generate generates a schema 1`] = `
|
|
|
12
13
|
}
|
|
13
14
|
|
|
14
15
|
input AnotherObjectOrderBy {
|
|
16
|
+
name: Order
|
|
15
17
|
deletedAt: Order
|
|
16
18
|
}
|
|
17
19
|
|
|
@@ -99,6 +101,7 @@ type SomeRawObject {
|
|
|
99
101
|
}
|
|
100
102
|
|
|
101
103
|
input UpdateSomeObject {
|
|
104
|
+
anotherId: ID
|
|
102
105
|
xyz: Int
|
|
103
106
|
}
|
|
104
107
|
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { getEditEntityRelationsQuery, summonByName } from "../../src";
|
|
2
|
+
import { models } from "../utils/models";
|
|
3
|
+
|
|
4
|
+
describe('queries', () => {
|
|
5
|
+
describe('getEntityRelationsQuery', () => {
|
|
6
|
+
it('applies filters', () => {
|
|
7
|
+
expect(getEditEntityRelationsQuery(models, summonByName(models, 'SomeObject'), 'update')).toMatchSnapshot()
|
|
8
|
+
});
|
|
9
|
+
})
|
|
10
|
+
})
|
|
@@ -54,6 +54,8 @@ export const setupSchema = async (knex: Knex) => {
|
|
|
54
54
|
await knex.schema.createTable('SomeObjectRevision', (table) => {
|
|
55
55
|
table.uuid('id').notNullable().primary();
|
|
56
56
|
table.uuid('someObjectId').notNullable();
|
|
57
|
+
table.uuid('anotherId').notNullable();
|
|
58
|
+
table.foreign('anotherId').references('id').inTable('AnotherObject');
|
|
57
59
|
table.uuid('createdById').notNullable();
|
|
58
60
|
table.timestamp('createdAt').notNullable().defaultTo(knex.fn.now(0));
|
|
59
61
|
table.boolean('deleted').notNullable();
|
package/tests/utils/models.ts
CHANGED
|
@@ -39,7 +39,13 @@ export const rawModels: RawModels = [
|
|
|
39
39
|
name: 'AnotherObject',
|
|
40
40
|
listQueriable: true,
|
|
41
41
|
deletable: true,
|
|
42
|
+
displayField: 'name',
|
|
42
43
|
fields: [
|
|
44
|
+
{
|
|
45
|
+
type: 'String',
|
|
46
|
+
name: 'name',
|
|
47
|
+
orderable: true,
|
|
48
|
+
},
|
|
43
49
|
{
|
|
44
50
|
type: 'AnotherObject',
|
|
45
51
|
name: 'myself',
|
|
@@ -70,6 +76,7 @@ export const rawModels: RawModels = [
|
|
|
70
76
|
type: 'AnotherObject',
|
|
71
77
|
relation: true,
|
|
72
78
|
filterable: true,
|
|
79
|
+
updatable: true,
|
|
73
80
|
nonNull: true,
|
|
74
81
|
},
|
|
75
82
|
{
|