diff --git a/app/src/adapter/index.ts b/app/src/adapter/index.ts index 3082d43f..56438b10 100644 --- a/app/src/adapter/index.ts +++ b/app/src/adapter/index.ts @@ -169,6 +169,7 @@ export function serveStaticViaImport(opts?: { manifest?: Manifest }) { if (files.includes(path)) { try { const content = await import(`bknd/static/${path}?raw`, { + /* @vite-ignore */ assert: { type: "text" }, }).then((m) => m.default); diff --git a/app/src/data/api/DataController.ts b/app/src/data/api/DataController.ts index b468a080..5bf03e76 100644 --- a/app/src/data/api/DataController.ts +++ b/app/src/data/api/DataController.ts @@ -256,10 +256,12 @@ export class DataController extends Controller { // read many const saveRepoQuery = s .object({ - ...omitKeys(repoQuery.properties, ["with"]), + ...omitKeys(repoQuery.properties, ["with", "where"]), sort: s.string({ default: "id" }), select: s.array(s.string()), join: s.array(s.string()), + with: s.anyOf([s.array(s.string()), s.record(s.object({}))]), + where: s.object({}), }) .partial(); const saveRepoQueryParams = (pick: string[] = Object.keys(repoQuery.properties)) => [ @@ -273,7 +275,15 @@ export class DataController extends Controller { "/:entity", describeRoute({ summary: "Read many", - parameters: saveRepoQueryParams(["limit", "offset", "sort", "select", "join"]), + parameters: saveRepoQueryParams([ + "limit", + "offset", + "sort", + "select", + "join", + "with", + "where", + ]), tags: ["data"], }), permission(DataPermissions.entityRead),