cruddl 4.2.2 → 4.2.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.
@@ -3,5 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CRUDDL_VERSION = void 0;
4
4
  // do not modify - this is parsed and changed by the build script
5
5
  // explicitly annotating with "string" so typescript won't infer a string literal type
6
- exports.CRUDDL_VERSION = '4.2.2';
6
+ exports.CRUDDL_VERSION = '4.2.3';
7
7
  //# sourceMappingURL=cruddl-version.js.map
@@ -19,6 +19,7 @@ const string_map_1 = require("../../../schema/scalars/string-map");
19
19
  const arango_basics_1 = require("../arango-basics");
20
20
  const migrations_1 = require("./migrations");
21
21
  const offset_date_time_1 = require("../../../schema/scalars/offset-date-time");
22
+ const core_1 = require("@js-joda/core");
22
23
  exports.FLEX_SEARCH_VIEW_PREFIX = 'flex_view_';
23
24
  function getRequiredViewsFromModel(model) {
24
25
  return model.rootEntityTypes
@@ -34,11 +35,21 @@ function getViewForRootEntity(rootEntityType) {
34
35
  viewName: getFlexSearchViewNameForRootEntity(rootEntityType),
35
36
  collectionName: (0, arango_basics_1.getCollectionNameForRootEntity)(rootEntityType),
36
37
  primarySort: rootEntityType.flexSearchPrimarySort.map((clause) => ({
37
- field: clause.field.path === constants_1.ID_FIELD ? '_key' : clause.field.path,
38
+ field: getPrimarySortFieldPath(clause.field),
38
39
  asc: clause.direction === order_1.OrderDirection.ASCENDING,
39
40
  })),
40
41
  };
41
42
  }
43
+ function getPrimarySortFieldPath(path) {
44
+ if (path.path === constants_1.ID_FIELD) {
45
+ return '_key';
46
+ }
47
+ if (path.type?.name === core_1.OffsetDateTime.name) {
48
+ // OffsetDateTime is stored as { timestamp, offset } - we need to sort by the timestamp
49
+ return `${path.path}.${offset_date_time_1.TIMESTAMP_PROPERTY}`;
50
+ }
51
+ return path.path;
52
+ }
42
53
  async function calculateRequiredArangoSearchViewCreateOperations(existingViews, requiredViews, db, configuration) {
43
54
  let viewsToCreate = requiredViews.filter((value) => !existingViews.some((value1) => value1.name === value.viewName));
44
55
  async function mapToMigration(value) {
@@ -1 +1 @@
1
- {"version":3,"file":"arango-search-helpers.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/arango-search-helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"arango-search-helpers.js","sourceRoot":"","sources":["../../../../../src/database/arangodb/schema-migration/arango-search-helpers.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "cruddl",
3
- "version": "4.2.2",
3
+ "version": "4.2.3",
4
4
  "description": "",
5
5
  "license": "MIT",
6
6
  "main": "dist/index.js",