@contember/engine-content-api 1.3.0-beta.4 → 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.
Files changed (10) hide show
  1. package/dist/src/mapper/select/OrderByBuilder.d.ts.map +1 -1
  2. package/dist/src/mapper/select/OrderByBuilder.js +7 -1
  3. package/dist/src/mapper/select/OrderByBuilder.js.map +1 -1
  4. package/dist/src/schema/OrderByTypeProvider.js +2 -2
  5. package/dist/src/schema/OrderByTypeProvider.js.map +1 -1
  6. package/dist/src/tsconfig.tsbuildinfo +1 -1
  7. package/dist/tests/tsconfig.tsbuildinfo +1 -1
  8. package/package.json +11 -11
  9. package/src/mapper/select/OrderByBuilder.ts +8 -1
  10. package/src/schema/OrderByTypeProvider.ts +2 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contember/engine-content-api",
3
- "version": "1.3.0-beta.4",
3
+ "version": "1.3.0-rc.2",
4
4
  "license": "Apache-2.0",
5
5
  "main": "dist/src/index.js",
6
6
  "typings": "dist/src/index.d.ts",
@@ -13,21 +13,21 @@
13
13
  "test": "vitest --dir ./tests/cases --no-threads"
14
14
  },
15
15
  "dependencies": {
16
- "@contember/database": "1.3.0-beta.4",
17
- "@contember/dic": "1.3.0-beta.4",
18
- "@contember/graphql-utils": "1.3.0-beta.4",
19
- "@contember/logger": "1.3.0-beta.4",
20
- "@contember/schema": "1.3.0-beta.4",
21
- "@contember/schema-definition": "1.3.0-beta.4",
22
- "@contember/schema-utils": "1.3.0-beta.4",
16
+ "@contember/database": "1.3.0-rc.2",
17
+ "@contember/dic": "1.3.0-rc.2",
18
+ "@contember/graphql-utils": "1.3.0-rc.2",
19
+ "@contember/logger": "1.3.0-rc.2",
20
+ "@contember/schema": "1.3.0-rc.2",
21
+ "@contember/schema-definition": "1.3.0-rc.2",
22
+ "@contember/schema-utils": "1.3.0-rc.2",
23
23
  "@graphql-tools/schema": "^8.3.5",
24
24
  "fast-deep-equal": "^3.1.3",
25
25
  "graphql-tag": "^2.12.5"
26
26
  },
27
27
  "devDependencies": {
28
- "@contember/database-tester": "1.3.0-beta.4",
29
- "@contember/engine-api-tester": "1.3.0-beta.4",
30
- "@contember/schema-definition": "1.3.0-beta.4",
28
+ "@contember/database-tester": "1.3.0-rc.2",
29
+ "@contember/engine-api-tester": "1.3.0-rc.2",
30
+ "@contember/schema-definition": "1.3.0-rc.2",
31
31
  "@graphql-codegen/cli": "^2.6.2",
32
32
  "@graphql-codegen/typescript": "^2.5.1",
33
33
  "@graphql-codegen/typescript-operations": "^2.4.2",
package/src/mapper/select/OrderByBuilder.ts CHANGED
@@ -5,6 +5,13 @@ import { Literal, QueryBuilder, SelectBuilder } from '@contember/database'
5
5
  import { getColumnName, getTargetEntity } from '@contember/schema-utils'
6
6
  import { UserError } from '../../exception'
7
7
 
8
+ const orderByMapping = {
9
+ asc: 'asc',
10
+ desc: 'desc',
11
+ ascNullsFirst: 'asc nulls first',
12
+ descNullsLast: 'desc nulls last',
13
+ } as const
14
+
8
15
  export class OrderByBuilder {
9
16
  constructor(private readonly schema: Model.Schema, private readonly joinBuilder: JoinBuilder) {}
10
17
 
@@ -56,7 +63,7 @@ export class OrderByBuilder {
56
63
  if (typeof value === 'string') {
57
64
  const columnName = getColumnName(this.schema, entity, fieldName)
58
65
  const applyOrder = <Orderable extends QueryBuilder.Orderable<any>>(orderable: Orderable) =>
59
- orderable.orderBy([path.alias, columnName], value)
66
+ orderable.orderBy([path.alias, columnName], orderByMapping[value])
60
67
 
61
68
  qb = applyOrder(qb)
62
69
  if (orderable !== null) {
package/src/schema/OrderByTypeProvider.ts CHANGED
@@ -22,8 +22,8 @@ export class OrderByTypeProvider {
22
22
  values: {
23
23
  asc: { value: 'asc' },
24
24
  desc: { value: 'desc' },
25
- ascNullsFirst: { value: 'asc nulls first' },
26
- descNullsLast: { value: 'desc nulls last' },
25
+ ascNullsFirst: { value: 'ascNullsFirst' },
26
+ descNullsLast: { value: 'descNullsLast' },
27
27
  },
28
28
  })
29
29