fixed sorting to use value instead of key

aoijs · Apr 15, 2024 · f7f5a6a · f7f5a6a
1 parent 283e02a
commit f7f5a6a
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 19 deletions.
diff --git a/dist/cjs/KeyValue/src/FileManager.d.ts b/dist/cjs/KeyValue/src/FileManager.d.ts
@@ -12,7 +12,7 @@ export default class FileManager {
     clear(): Promise<unknown> | undefined;
     has(key: KeyValueData["key"]): Promise<unknown>;
     all(query: (d: KeyValueData) => boolean, limit: number, order: "firstN" | "asc" | "desc"): Promise<unknown>;
-    findOne(query: (d: KeyValueData) => boolean): Promise<unknown>;
+    findOne(query: (d: KeyValueData) => boolean): Promise<KeyValueData | undefined>;
     findMany(query: (d: KeyValueData) => boolean): Promise<unknown>;
     getFirstN(query: (d: KeyValueData) => boolean, limit: number): Promise<unknown>;
     removeMany(query: (d: KeyValueData) => boolean): Promise<unknown>;

diff --git a/dist/cjs/KeyValue/src/FileManager.js b/dist/cjs/KeyValue/src/FileManager.js
diff --git a/dist/cjs/KeyValue/src/FileManager.js.map b/dist/cjs/KeyValue/src/FileManager.js.map
diff --git a/dist/cjs/KeyValue/src/Table.d.ts b/dist/cjs/KeyValue/src/Table.d.ts
@@ -34,7 +34,7 @@ export default class Table extends EventEmitter {
     clear(): Promise<void>;
     has(key: string): Promise<unknown>;
     all(query: (d: Data) => boolean, limit: number, order: "firstN" | "asc" | "desc"): Promise<unknown>;
-    findOne(query: (d: Data) => boolean): Promise<unknown>;
+    findOne(query: (d: Data) => boolean): Promise<Data | undefined>;
     findMany(query: (d: Data) => boolean): Promise<unknown>;
     removeMany(query: (d: Data) => boolean): Promise<unknown>;
     ping(): Promise<unknown>;

diff --git a/dist/cjs/KeyValue/src/database.d.ts b/dist/cjs/KeyValue/src/database.d.ts
@@ -131,7 +131,7 @@ export default class KeyValue extends EventEmitter {
      * })
      * ```
      */
-    findOne(table: string, query: (value: Data) => boolean): Promise<unknown>;
+    findOne(table: string, query: (value: Data) => boolean): Promise<Data | undefined>;
     /**
      * @description find all data that matches the query
      * @param table table to find

diff --git a/dist/cjs/KeyValue/src/database.js b/dist/cjs/KeyValue/src/database.js
diff --git a/dist/cjs/KeyValue/src/database.js.map b/dist/cjs/KeyValue/src/database.js.map
diff --git a/dist/esm/KeyValue/src/FileManager.d.ts b/dist/esm/KeyValue/src/FileManager.d.ts
@@ -12,7 +12,7 @@ export default class FileManager {
     clear(): Promise<unknown> | undefined;
     has(key: KeyValueData["key"]): Promise<unknown>;
     all(query: (d: KeyValueData) => boolean, limit: number, order: "firstN" | "asc" | "desc"): Promise<unknown>;
-    findOne(query: (d: KeyValueData) => boolean): Promise<unknown>;
+    findOne(query: (d: KeyValueData) => boolean): Promise<KeyValueData | undefined>;
     findMany(query: (d: KeyValueData) => boolean): Promise<unknown>;
     getFirstN(query: (d: KeyValueData) => boolean, limit: number): Promise<unknown>;
     removeMany(query: (d: KeyValueData) => boolean): Promise<unknown>;

diff --git a/dist/esm/KeyValue/src/FileManager.js b/dist/esm/KeyValue/src/FileManager.js
diff --git a/dist/esm/KeyValue/src/FileManager.js.map b/dist/esm/KeyValue/src/FileManager.js.map
diff --git a/dist/esm/KeyValue/src/Table.d.ts b/dist/esm/KeyValue/src/Table.d.ts
@@ -34,7 +34,7 @@ export default class Table extends EventEmitter {
     clear(): Promise<void>;
     has(key: string): Promise<unknown>;
     all(query: (d: Data) => boolean, limit: number, order: "firstN" | "asc" | "desc"): Promise<unknown>;
-    findOne(query: (d: Data) => boolean): Promise<unknown>;
+    findOne(query: (d: Data) => boolean): Promise<Data | undefined>;
     findMany(query: (d: Data) => boolean): Promise<unknown>;
     removeMany(query: (d: Data) => boolean): Promise<unknown>;
     ping(): Promise<unknown>;

diff --git a/dist/esm/KeyValue/src/database.d.ts b/dist/esm/KeyValue/src/database.d.ts
@@ -131,7 +131,7 @@ export default class KeyValue extends EventEmitter {
      * })
      * ```
      */
-    findOne(table: string, query: (value: Data) => boolean): Promise<unknown>;
+    findOne(table: string, query: (value: Data) => boolean): Promise<Data | undefined>;
     /**
      * @description find all data that matches the query
      * @param table table to find

diff --git a/dist/esm/KeyValue/src/database.js b/dist/esm/KeyValue/src/database.js
diff --git a/dist/esm/KeyValue/src/database.js.map b/dist/esm/KeyValue/src/database.js.map
diff --git a/lib/KeyValue/src/FileManager.ts b/lib/KeyValue/src/FileManager.ts
@@ -264,9 +264,9 @@ export default class FileManager {
 				}
 			}
 			if (order === "asc") {
-				data.sort((a, b) => a.key.localeCompare(b.key));
+				data.sort((a,b) => this.#table.db.options.cacheConfig.sortFunction(a,b));
 			} else {
-				data.sort((a, b) => b.key.localeCompare(a.key));
+				data.sort((a,b) => this.#table.db.options.cacheConfig.sortFunction(a,b)).reverse();
 			}
 			return data.slice(0, limit);
 		}

diff --git a/lib/KeyValue/src/database.ts b/lib/KeyValue/src/database.ts
@@ -80,7 +80,7 @@ export default class KeyValue extends EventEmitter {
                 limit: 1000,
                 sorted: false,
                 sortFunction: (a, b) => {
-                    return 0;
+                    return a.value - b.value;
                 },
             },
             debug: false,