@paroicms/server 4.4.0 → 4.5.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-ordering-query.d.ts","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"child-ordering-query.d.ts","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,cAAc,EAEd,SAAS,EACT,UAAU,EACX,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEzE,wBAAgB,kCAAkC,CAChD,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,GAAG,YAAY,CAAC,EACnD,OAAO,EAAE;IACP,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC;IACzB,kBAAkB,EAAE,cAAc,CAAC;IACnC,sBAAsB,CAAC,EAAE,SAAS,CAAC;IACnC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,OAAO,CAAC,EAAE,UAAU,EAAE,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,GACA;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,CAmExC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getRegularDocumentTypeByName } from "@paroicms/internal-anywhere-lib";
|
|
1
|
+
import { getRegularDocumentTypeByName, sortableVarcharDataTypes, } from "@paroicms/internal-anywhere-lib";
|
|
2
2
|
import { dbAnyLanguage } from "../context.js";
|
|
3
3
|
export function applyRegularChildrenSortingOnQuery(siteContext, options) {
|
|
4
4
|
const { query, parentDocumentType, leftJoinDocument, orderByAsString, useAggregates } = options;
|
|
@@ -39,18 +39,11 @@ export function applyRegularChildrenSortingOnQuery(siteContext, options) {
|
|
|
39
39
|
if (!orderProperties)
|
|
40
40
|
throw new Error(`unknown field '${fieldName}'`);
|
|
41
41
|
const { dataType, localized } = orderProperties;
|
|
42
|
-
|
|
43
|
-
if (dataType === "string" || dataType === "boolean") {
|
|
44
|
-
orderByField = useAggregates ? `max(f${index}.val)` : `f${index}.val`;
|
|
45
|
-
}
|
|
46
|
-
else if (dataType === "number" || dataType === "currency") {
|
|
47
|
-
orderByField = useAggregates
|
|
48
|
-
? `max(cast(f${index}.val as float))`
|
|
49
|
-
: `cast(f${index}.val as float)`;
|
|
50
|
-
}
|
|
51
|
-
else {
|
|
42
|
+
if (!sortableVarcharDataTypes.has(dataType)) {
|
|
52
43
|
throw new Error(`invalid data type '${dataType}'`);
|
|
53
44
|
}
|
|
45
|
+
const value = dataType === "number" ? `cast(f${index}.val as float)` : `f${index}.val`;
|
|
46
|
+
const orderByField = useAggregates ? `max(${value})` : value;
|
|
54
47
|
query.leftJoin(`PaFieldVarchar as f${index}`, {
|
|
55
48
|
[`f${index}.field`]: siteContext.cn.raw("?", [fieldName]),
|
|
56
49
|
[`f${index}.nodeId`]: "l.nodeId",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"child-ordering-query.js","sourceRoot":"","sources":["../../src/common/child-ordering-query.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@paroicms/server",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.5.0",
|
|
4
4
|
"description": "The ParoiCMS server",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -40,16 +40,16 @@
|
|
|
40
40
|
"dependencies": {
|
|
41
41
|
"@apollo/server": "~5.5.1",
|
|
42
42
|
"@as-integrations/express5": "~1.1.2",
|
|
43
|
-
"@paroicms/admin-ui": "1.
|
|
44
|
-
"@paroicms/internal-anywhere-lib": "1.
|
|
45
|
-
"@paroicms/internal-server-lib": "1.24.
|
|
46
|
-
"@paroicms/playground_demo1": "0.68.
|
|
43
|
+
"@paroicms/admin-ui": "1.101.0",
|
|
44
|
+
"@paroicms/internal-anywhere-lib": "1.41.0",
|
|
45
|
+
"@paroicms/internal-server-lib": "1.24.25",
|
|
46
|
+
"@paroicms/playground_demo1": "0.68.19",
|
|
47
47
|
"@paroicms/public-anywhere-lib": "1.2.0",
|
|
48
|
-
"@paroicms/public-server-lib": "1.7.
|
|
49
|
-
"@paroicms/script-lib": "1.0.
|
|
50
|
-
"@paroicms/server-database-media-storage": "1.26.
|
|
51
|
-
"@paroicms/server-image-cache-engine": "1.29.
|
|
52
|
-
"@paroicms/server-text-cache-system": "1.21.
|
|
48
|
+
"@paroicms/public-server-lib": "1.7.1",
|
|
49
|
+
"@paroicms/script-lib": "1.0.6",
|
|
50
|
+
"@paroicms/server-database-media-storage": "1.26.32",
|
|
51
|
+
"@paroicms/server-image-cache-engine": "1.29.47",
|
|
52
|
+
"@paroicms/server-text-cache-system": "1.21.47",
|
|
53
53
|
"archiver": "~8.0.0",
|
|
54
54
|
"arktype": "~2.2.3",
|
|
55
55
|
"bcrypt": "~6.0.0",
|