Skip to content

Commit 380ee64

Browse files
committed
feat: allow raw queries for where filter
Adapted types and functions Added tests Updated dependencies safely
1 parent adc14c7 commit 380ee64

6 files changed

Lines changed: 209 additions & 73 deletions

File tree

package-lock.json

Lines changed: 67 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
"cli:browser:v2": "./bin/cli.js test/openapi_v2.json --target browser",
4545
"cli:browser.rx:v2": "./bin/cli.js test/openapi_v2.json --target browser.rx",
4646
"cli:browser:v3": "./bin/cli.js test/openapi_v3.json --target browser",
47+
"cli:browser:v3:ql": "./bin/cli.js test/openapi_v3.json --target browser --use-query-language",
4748
"cli:browser:v3:cache": "./bin/cli.js test/openapi_v3.json --target browser --cache",
4849
"cli:browser.rx:v3": "./bin/cli.js test/openapi_v3.json --target browser.rx",
4950
"cli:browser.rx:v3:cache": "./bin/cli.js test/openapi_v3.json --target browser.rx --cache",
@@ -55,9 +56,10 @@
5556
"prettier:fix": "prettier . --write",
5657
"test": "vitest run",
5758
"test:coverage": "vitest run --coverage",
59+
"type-check": "tsc -p tsconfig.sdk.json --noEmit --skipLibCheck",
5860
"lint": "eslint ./src --cache",
5961
"lint:fix": "npm run lint -- --fix",
60-
"ci": "npm run prettier && npm run lint && npm run test && npm run build && npm run cli:browser:v1 && npm run cli:browser:v2 && npm run cli:browser:v3",
62+
"ci": "npm run prettier && npm run lint && npm run build && npm run cli:browser:v1 && npm run cli:browser:v2 && npm run cli:browser:v3 && npm run cli:browser:v3:ql && npm run type-check && npm run test",
6163
"release": "standard-version"
6264
},
6365
"devDependencies": {

src/generator/01-base/static/queriesWithQueryLanguage.ts.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ export type QueryFilter<T> = SingleFilterExpr<T> & {
6969
};
7070

7171
export type CountQuery<F> = {
72-
where?: QueryFilter<F>;
72+
where?: QueryFilter<F> | string;
7373
};
7474

7575
export type SomeQuery<E, F, I, P> = {
7676
serializeNulls?: boolean;
7777
include?: QuerySelect<I>;
7878
properties?: P;
79-
where?: QueryFilter<F>;
79+
where?: QueryFilter<F> | string;
8080
select?: QuerySelect<E>;
8181
sort?: Sort<E>[];
8282
pagination?: Pagination;
@@ -210,9 +210,17 @@ const flattenWhere = (
210210
};
211211

212212
const assembleFilterParam = (
213-
obj: QueryFilter<any> = {}
213+
filter?: QueryFilter<any> | string
214214
): Record<string, string> => {
215-
const flattedFilter = flattenWhere(obj, []);
215+
if(!filter) {
216+
return {};
217+
}
218+
219+
if (typeof filter === 'string') {
220+
return { filter };
221+
}
222+
223+
const flattedFilter = flattenWhere(filter, []);
216224
return flattedFilter.length ? { filter: flattedFilter.join(' and ') } : {};
217225
};
218226

0 commit comments

Comments
 (0)