@contember/engine-content-api 1.3.0-rc.1 → 1.3.0-rc.2
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/src/mapper/select/OrderByBuilder.d.ts.map +1 -1
- package/dist/src/mapper/select/OrderByBuilder.js +7 -1
- package/dist/src/mapper/select/OrderByBuilder.js.map +1 -1
- package/dist/src/schema/OrderByTypeProvider.js +2 -2
- package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
- package/dist/src/tsconfig.tsbuildinfo +1 -1
- package/dist/tests/tsconfig.tsbuildinfo +1 -1
- package/package.json +11 -11
- package/src/mapper/select/OrderByBuilder.ts +8 -1
- package/src/schema/OrderByTypeProvider.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderByBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAW,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"OrderByBuilder.d.ts","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAA;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAW,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAW1E,qBAAa,cAAc;IACd,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAgB,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAlD,MAAM,EAAE,KAAK,CAAC,MAAM,EAAmB,WAAW,EAAE,WAAW;IAErF,KAAK,CAAC,SAAS,SAAS,YAAY,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,EAChE,EAAE,EAAE,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EACvC,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,GACtB,CAAC,aAAa,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC;IAOnD,OAAO,CAAC,QAAQ;CAqDhB"}
|
|
@@ -4,6 +4,12 @@ exports.OrderByBuilder = void 0;
|
|
|
4
4
|
const database_1 = require("@contember/database");
|
|
5
5
|
const schema_utils_1 = require("@contember/schema-utils");
|
|
6
6
|
const exception_1 = require("../../exception");
|
|
7
|
+
const orderByMapping = {
|
|
8
|
+
asc: 'asc',
|
|
9
|
+
desc: 'desc',
|
|
10
|
+
ascNullsFirst: 'asc nulls first',
|
|
11
|
+
descNullsLast: 'desc nulls last',
|
|
12
|
+
};
|
|
7
13
|
class OrderByBuilder {
|
|
8
14
|
constructor(schema, joinBuilder) {
|
|
9
15
|
this.schema = schema;
|
|
@@ -37,7 +43,7 @@ class OrderByBuilder {
|
|
|
37
43
|
const [fieldName, value] = entries[0];
|
|
38
44
|
if (typeof value === 'string') {
|
|
39
45
|
const columnName = (0, schema_utils_1.getColumnName)(this.schema, entity, fieldName);
|
|
40
|
-
const applyOrder = (orderable) => orderable.orderBy([path.alias, columnName], value);
|
|
46
|
+
const applyOrder = (orderable) => orderable.orderBy([path.alias, columnName], orderByMapping[value]);
|
|
41
47
|
qb = applyOrder(qb);
|
|
42
48
|
if (orderable !== null) {
|
|
43
49
|
orderable = applyOrder(orderable);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderByBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":";;;AAGA,kDAA0E;AAC1E,0DAAwE;AACxE,+CAA2C;AAE3C,MAAa,cAAc;IAC1B,YAA6B,MAAoB,EAAmB,WAAwB;QAA/D,WAAM,GAAN,MAAM,CAAc;QAAmB,gBAAW,GAAX,WAAW,CAAa;IAAG,CAAC;IAEzF,KAAK,CACX,EAAuC,EACvC,SAAoB,EACpB,MAAoB,EACpB,IAAU,EACV,OAAwB;QAExB,OAAO,OAAO,CAAC,MAAM,CACpB,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,EAAE,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,CAAC,EAC3F,CAAC,EAAE,EAAE,SAAS,CAAC,CACf,CAAA;IACF,CAAC;IAEO,QAAQ,CACf,EAAuC,EACvC,SAAoB,EACpB,MAAoB,EACpB,IAAU,EACV,OAAsB;QAEtB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACvC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YACzB,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YAClD,MAAM,IAAI,qBAAS,CAAC,6EAA6E,GAAG,MAAM,CAAC,CAAA;SAC3G;QACD,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,aAAa,EAAE;YAC7C,IAAI,OAAO,CAAC,aAAa,EAAE;gBAC1B,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBACpD,IAAI,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE;oBAC1B,MAAM,IAAI,qBAAS,CAAC,gEAAgE,CAAC,CAAA;iBACrF;gBACD,EAAE,GAAG,EAAE;qBACL,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;qBACxE,IAAI,CAAC,WAAW,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;aACxD;YAED,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,kBAAO,CAAC,UAAU,CAAC,CAAC,CAAA;YACxC,IAAI,SAAS,KAAK,IAAI,EAAE;gBACvB,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,kBAAO,CAAC,UAAU,CAAC,CAAC,CAAA;aACtD;YACD,OAAO,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;SACtB;QAED,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,GAAiC,OAAO,CAAC,CAAC,CAAC,CAAA;QAEnE,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC9B,MAAM,UAAU,GAAG,IAAA,4BAAa,EAAC,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,CAAC,CAAA;YAChE,MAAM,UAAU,GAAG,CAAgD,SAAoB,EAAE,EAAE,CAC1F,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,KAAK,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"OrderByBuilder.js","sourceRoot":"","sources":["../../../../src/mapper/select/OrderByBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,8 +17,8 @@ class OrderByTypeProvider {
|
|
|
17
17
|
values: {
|
|
18
18
|
asc: { value: 'asc' },
|
|
19
19
|
desc: { value: 'desc' },
|
|
20
|
-
ascNullsFirst: { value: '
|
|
21
|
-
descNullsLast: { value: '
|
|
20
|
+
ascNullsFirst: { value: 'ascNullsFirst' },
|
|
21
|
+
descNullsLast: { value: 'descNullsLast' },
|
|
22
22
|
},
|
|
23
23
|
});
|
|
24
24
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OrderByTypeProvider.js","sourceRoot":"","sources":["../../../src/schema/OrderByTypeProvider.ts"],"names":[],"mappings":";;;AAAA,qCAQgB;AAChB,8CAA8C;AAC9C,0DAA4D;AAC5D,oCAA2C;AAC3C,mCAAqC;AAErC,6DAAyD;AAEzD,MAAa,mBAAmB;IAa/B,YAA6B,MAAoB,EAAmB,YAA0B;QAAjE,WAAM,GAAN,MAAM,CAAc;QAAmB,iBAAY,GAAZ,YAAY,CAAc;QAZtF,qBAAgB,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAA;QAE/E,uBAAkB,GAAG,IAAI,yBAAe,CAAC;YAChD,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE;gBACP,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;gBACrB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;gBACvB,aAAa,EAAE,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"OrderByTypeProvider.js","sourceRoot":"","sources":["../../../src/schema/OrderByTypeProvider.ts"],"names":[],"mappings":";;;AAAA,qCAQgB;AAChB,8CAA8C;AAC9C,0DAA4D;AAC5D,oCAA2C;AAC3C,mCAAqC;AAErC,6DAAyD;AAEzD,MAAa,mBAAmB;IAa/B,YAA6B,MAAoB,EAAmB,YAA0B;QAAjE,WAAM,GAAN,MAAM,CAAc;QAAmB,iBAAY,GAAZ,YAAY,CAAc;QAZtF,qBAAgB,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,CAAA;QAE/E,uBAAkB,GAAG,IAAI,yBAAe,CAAC;YAChD,IAAI,EAAE,gBAAgB;YACtB,MAAM,EAAE;gBACP,GAAG,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE;gBACrB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;gBACvB,aAAa,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE;gBACzC,aAAa,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE;aACzC;SACD,CAAC,CAAA;IAE+F,CAAC;IAE3F,oBAAoB,CAAC,UAAkB;QAC7C,OAAO,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAA;IACzC,CAAC;IAEO,uBAAuB,CAAC,UAAkB;QACjD,OAAO,IAAI,gCAAsB,CAAC;YACjC,IAAI,EAAE,IAAA,mBAAW,EAAA,GAAG,UAAU,SAAS;YACvC,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;SACrD,CAAC,CAAA;IACH,CAAC;IAEO,sBAAsB,CAAC,IAAY;QAC1C,MAAM,MAAM,GAA+B;YAC1C,OAAO,EAAE,EAAE,IAAI,EAAE,wBAAc,EAAE;YACjC,aAAa,EAAE,EAAE,IAAI,EAAE,oBAAU,EAAE;SACnC,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;QAEzC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE;YACtC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;gBAC7C,SAAQ;aACR;YACD,MAAM,aAAa,GAAG,IAAI,uCAAkB,CAAC,YAAG,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;YACnF,IAAI,CAAC,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,aAAa,CAAC,EAAE;gBACrE,SAAQ;aACR;YAED,MAAM,KAAK,GAAG,IAAA,iCAAkB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE;gBAC9D,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBACtD,WAAW,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrF,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS;aAC8B,CAAC,CAAA;YAE7D,IAAI,KAAK,KAAK,SAAS,EAAE;gBACxB,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,CAAA;aACzB;SACD;QAED,OAAO,MAAM,CAAA;IACd,CAAC;CACD;AAvDD,kDAuDC"}
|