shishantbiswas/bknd
1
0
Fork 0
mirror of https://github.com/shishantbiswas/bknd.git synced 2026-03-16 12:37:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/repo-query-sort' into release/0.5

Browse Source 
# Conflicts:
#	app/src/data/api/DataController.ts
This commit is contained in:
dswbx
2025-01-10 08:23:51 +01:00
parent 138a3579cb aa86d54553
commit c8745b3464
2 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/data/server/data-query-impl.ts
View File

@@ -6,7 +6,6 @@ import {
Type,
Value
} from "core/utils";
import type { Simplify } from "type-fest";
import { WhereBuilder } from "../entities";
const NumberOrString = (options: SchemaOptions = {}) =>
@@ -19,17 +18,25 @@ const limit = NumberOrString({ default: 10 });
const offset = NumberOrString({ default: 0 });
// @todo: allow "id" and "-id"
const sort_default = { by: "id", dir: "asc" };
const sort = Type.Transform(
Type.Union(
[Type.String(), Type.Object({ by: Type.String(), dir: StringEnum(["asc", "desc"]) })],
{
default: { by: "id", dir: "asc" }
default: sort_default
}
)
)
.Decode((value) => {
if (typeof value === "string") {
return JSON.parse(value);
if (/^-?[a-zA-Z_][a-zA-Z0-9_.]*$/.test(value)) {
const dir = value[0] === "-" ? "desc" : "asc";
return { by: dir === "desc" ? value.slice(1) : value, dir };
} else if (/^{.*}$/.test(value)) {
return JSON.parse(value);
}
return sort_default;
}
return value;
})