CHANGELOG.md

+## [0.85.1](https://gitlab.com/getanthill/datastore/compare/v0.85.0...v0.85.1) (2024-05-30)
+
+
+### Bug Fixes
+
+* **walk:** order equals in time events ad entities by version ([cce0718](https://gitlab.com/getanthill/datastore/commit/cce0718a08f2b9b84d8fea1841c8360457eb7175))
+
 # [0.85.0](https://gitlab.com/getanthill/datastore/compare/v0.84.0...v0.85.0) (2024-05-29)
 
 

package-lock.json

 {
   "name": "@getanthill/datastore",
-  "version": "0.85.0",
+  "version": "0.85.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@getanthill/datastore",
-      "version": "0.85.0",
+      "version": "0.85.1",
       "license": "MIT",
       "dependencies": {
         "@getanthill/api-validators": "1.3.0",

package.json

 {
   "name": "@getanthill/datastore",
   "description": "Event-Sourced Datastore",
-  "version": "0.85.0",
+  "version": "0.85.1",
   "main": "dist/sdk/index.js",
   "bin": {
     "datastore": "scripts/cli.js",

src/sdk/utils.test.ts

@@ -366,6 +366,77 @@ describe('utils', () => {
         ),
       ).toEqual(-1);
     });
+
+    it('returns 0 if b created is the same than a created and versions are the sames', () => {
+      expect(
+        utils.defaultWalkMultiSortHandler(
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 1,
+          },
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 1,
+          },
+        ),
+      ).toEqual(0);
+    });
+
+    it('returns 0 if b created is the same than a created and versions are both undefined', () => {
+      expect(
+        utils.defaultWalkMultiSortHandler(
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+          },
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+          },
+        ),
+      ).toEqual(0);
+    });
+
+    it('returns -1 if b created is the same than a created and a version is undefined', () => {
+      expect(
+        utils.defaultWalkMultiSortHandler(
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+          },
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 1,
+          },
+        ),
+      ).toEqual(-1);
+    });
+
+    it('returns 1 if b created is the same than a created and b version is undefined', () => {
+      expect(
+        utils.defaultWalkMultiSortHandler(
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 1,
+          },
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+          },
+        ),
+      ).toEqual(1);
+    });
+
+    it('returns -1 if b created is the same than a created and b version is greater than a version', () => {
+      expect(
+        utils.defaultWalkMultiSortHandler(
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 1,
+          },
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 2,
+          },
+        ),
+      ).toEqual(-1);
+    });
   });
 
   describe('#sortResults', () => {
@@ -389,7 +460,31 @@ describe('utils', () => {
       ]);
     });
 
-    it('sorts entities with a defined sort handleer', () => {
+    it('sorts entities on the same instant by version', () => {
+      expect(
+        utils.sortResults([
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 2,
+          },
+          {
+            created_at: '2020-01-01T00:00:00.000Z',
+            version: 1,
+          },
+        ]),
+      ).toEqual([
+        {
+          created_at: '2020-01-01T00:00:00.000Z',
+          version: 1,
+        },
+        {
+          created_at: '2020-01-01T00:00:00.000Z',
+          version: 2,
+        },
+      ]);
+    });
+
+    it('sorts entities with a defined sort handler', () => {
       expect(
         utils.sortResults(
           [

src/sdk/utils.ts

@@ -89,9 +89,14 @@ export function objToJsonSchema(obj: Any): JSONSchemaType<Any> {
 }
 
 export function defaultWalkMultiSortHandler(a: any, b: any) {
-  return (a.updated_at ?? a.created_at).localeCompare(
-    b.updated_at ?? b.created_at,
-  );
+  const aComparisonDate = a.updated_at ?? a.created_at;
+  const bComparisonDate = b.updated_at ?? b.created_at;
+
+  const dateComparisonValue = aComparisonDate.localeCompare(bComparisonDate);
+
+  return dateComparisonValue === 0
+    ? (a.version ?? 0).toFixed(0).localeCompare((b.version ?? 0).toFixed(0))
+    : dateComparisonValue;
 }
 
 export function sortResults(