@nymphjs/query-parser 1.0.0-beta.11 → 1.0.0-beta.111
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +419 -0
- package/README.md +16 -6
- package/dist/index.d.ts +4 -0
- package/dist/index.js +4 -1
- package/dist/index.js.map +1 -1
- package/{lib → dist}/queryParser.js +166 -50
- package/dist/queryParser.js.map +1 -0
- package/{lib → dist}/queryParser.test.js +402 -54
- package/dist/queryParser.test.js.map +1 -0
- package/jest.config.js +11 -2
- package/package.json +22 -29
- package/src/index.ts +2 -2
- package/src/queryParser.test.ts +395 -2
- package/src/queryParser.ts +153 -48
- package/tsconfig.json +6 -4
- package/typedoc.json +4 -0
- package/lib/index.d.ts +0 -4
- package/lib/index.js +0 -25
- package/lib/index.js.map +0 -1
- package/lib/queryParser.js.map +0 -1
- package/lib/queryParser.test.js.map +0 -1
- package/webpack.config.js +0 -28
- /package/{lib → dist}/queryParser.d.ts +0 -0
- /package/{lib → dist}/queryParser.test.d.ts +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"queryParser.test.js","sourceRoot":"","sources":["../src/queryParser.test.ts"],"names":[],"mappings":"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"}
|
package/jest.config.js
CHANGED
|
@@ -1,6 +1,15 @@
|
|
|
1
|
+
import { createDefaultEsmPreset } from 'ts-jest';
|
|
2
|
+
|
|
3
|
+
const presetConfig = createDefaultEsmPreset();
|
|
4
|
+
|
|
1
5
|
/** @type {import('ts-jest').JestConfigWithTsJest} */
|
|
2
|
-
|
|
3
|
-
|
|
6
|
+
const jestConfig = {
|
|
7
|
+
...presetConfig,
|
|
4
8
|
testEnvironment: 'node',
|
|
5
9
|
rootDir: 'src/',
|
|
10
|
+
moduleNameMapper: {
|
|
11
|
+
'^(\\.|\\.\\.)\\/(.+)\\.js': '$1/$2',
|
|
12
|
+
},
|
|
6
13
|
};
|
|
14
|
+
|
|
15
|
+
export default jestConfig;
|
package/package.json
CHANGED
|
@@ -1,27 +1,22 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nymphjs/query-parser",
|
|
3
|
-
"version": "1.0.0-beta.
|
|
4
|
-
"description": "
|
|
5
|
-
"
|
|
6
|
-
"main": "
|
|
7
|
-
"types": "
|
|
3
|
+
"version": "1.0.0-beta.111",
|
|
4
|
+
"description": "Nymph.js - Query Parser",
|
|
5
|
+
"type": "module",
|
|
6
|
+
"main": "dist/index.js",
|
|
7
|
+
"types": "dist/index.d.ts",
|
|
8
8
|
"keywords": [
|
|
9
9
|
"nymph",
|
|
10
10
|
"ORM",
|
|
11
11
|
"object relational mapper"
|
|
12
12
|
],
|
|
13
13
|
"scripts": {
|
|
14
|
-
"clean": "
|
|
15
|
-
"
|
|
16
|
-
"
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
"watch:ts": "tsc --watch",
|
|
21
|
-
"watch:js": "webpack --watch",
|
|
22
|
-
"prepare": "npm run clean && npm run build",
|
|
23
|
-
"test": "jest",
|
|
24
|
-
"test:watch": "jest --watch"
|
|
14
|
+
"clean": "test -d dist && rm -r dist || true",
|
|
15
|
+
"build": "tsc",
|
|
16
|
+
"watch": "tsc --watch",
|
|
17
|
+
"prepublish": "npm run clean && npm run build",
|
|
18
|
+
"test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest",
|
|
19
|
+
"test:watch": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" npx jest --watch"
|
|
25
20
|
},
|
|
26
21
|
"publishConfig": {
|
|
27
22
|
"access": "public"
|
|
@@ -35,19 +30,17 @@
|
|
|
35
30
|
"url": "https://github.com/sciactive/nymphjs/issues"
|
|
36
31
|
},
|
|
37
32
|
"license": "Apache-2.0",
|
|
38
|
-
"devDependencies": {
|
|
39
|
-
"@nymphjs/client": "^1.0.0-beta.11",
|
|
40
|
-
"@tsconfig/recommended": "^1.0.2",
|
|
41
|
-
"@types/jest": "^29.4.0",
|
|
42
|
-
"jest": "^29.4.3",
|
|
43
|
-
"ts-jest": "^29.0.5",
|
|
44
|
-
"ts-loader": "^9.4.2",
|
|
45
|
-
"typescript": "^4.9.5",
|
|
46
|
-
"webpack": "^5.75.0",
|
|
47
|
-
"webpack-cli": "^5.0.1"
|
|
48
|
-
},
|
|
49
33
|
"dependencies": {
|
|
50
|
-
"@sciactive/splitn": "^3.
|
|
34
|
+
"@sciactive/splitn": "^3.1.0"
|
|
35
|
+
},
|
|
36
|
+
"devDependencies": {
|
|
37
|
+
"@nymphjs/client": "^1.0.0-beta.111",
|
|
38
|
+
"@tsconfig/recommended": "^1.0.13",
|
|
39
|
+
"@types/jest": "^30.0.0",
|
|
40
|
+
"jest": "^30.2.0",
|
|
41
|
+
"ts-jest": "^29.4.6",
|
|
42
|
+
"ts-node": "^10.9.2",
|
|
43
|
+
"typescript": "^5.9.3"
|
|
51
44
|
},
|
|
52
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "8028358367d8fd89bb434f122b243bec4c71f2e1"
|
|
53
46
|
}
|
package/src/index.ts
CHANGED
package/src/queryParser.test.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Entity } from '@nymphjs/client';
|
|
2
|
-
import queryParser from './queryParser';
|
|
2
|
+
import queryParser from './queryParser.js';
|
|
3
3
|
|
|
4
4
|
const BlogPost = function () {} as unknown as typeof Entity;
|
|
5
5
|
const Category = function () {} as unknown as typeof Entity;
|
|
@@ -150,8 +150,327 @@ describe('queryParser', () => {
|
|
|
150
150
|
]);
|
|
151
151
|
});
|
|
152
152
|
|
|
153
|
+
it('parses a query with json value with spaces', () => {
|
|
154
|
+
const query =
|
|
155
|
+
'obj={"prop": "my value"} foobar arr=["a value", "another value"]';
|
|
156
|
+
const [options, ...selectors] = queryParser({
|
|
157
|
+
query,
|
|
158
|
+
entityClass: BlogPost,
|
|
159
|
+
defaultFields: ['title', 'body'],
|
|
160
|
+
});
|
|
161
|
+
|
|
162
|
+
expect(options).toEqual({
|
|
163
|
+
class: BlogPost,
|
|
164
|
+
});
|
|
165
|
+
|
|
166
|
+
expect(selectors).toEqual([
|
|
167
|
+
{
|
|
168
|
+
type: '&',
|
|
169
|
+
equal: [
|
|
170
|
+
['obj', { prop: 'my value' }],
|
|
171
|
+
['arr', ['a value', 'another value']],
|
|
172
|
+
],
|
|
173
|
+
},
|
|
174
|
+
{
|
|
175
|
+
type: '|',
|
|
176
|
+
ilike: [
|
|
177
|
+
['title', '%foobar%'],
|
|
178
|
+
['body', '%foobar%'],
|
|
179
|
+
],
|
|
180
|
+
},
|
|
181
|
+
]);
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
it('parses a query with nested json value with spaces', () => {
|
|
185
|
+
const query =
|
|
186
|
+
'obj={"obj": {"sub": "my value"}, "prop": "my value"} foobar arr=["a value", "another value", {"prop": [1, 2, 3]}]';
|
|
187
|
+
const [options, ...selectors] = queryParser({
|
|
188
|
+
query,
|
|
189
|
+
entityClass: BlogPost,
|
|
190
|
+
defaultFields: ['title', 'body'],
|
|
191
|
+
});
|
|
192
|
+
|
|
193
|
+
expect(options).toEqual({
|
|
194
|
+
class: BlogPost,
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
expect(selectors).toEqual([
|
|
198
|
+
{
|
|
199
|
+
type: '&',
|
|
200
|
+
equal: [
|
|
201
|
+
['obj', { obj: { sub: 'my value' }, prop: 'my value' }],
|
|
202
|
+
['arr', ['a value', 'another value', { prop: [1, 2, 3] }]],
|
|
203
|
+
],
|
|
204
|
+
},
|
|
205
|
+
{
|
|
206
|
+
type: '|',
|
|
207
|
+
ilike: [
|
|
208
|
+
['title', '%foobar%'],
|
|
209
|
+
['body', '%foobar%'],
|
|
210
|
+
],
|
|
211
|
+
},
|
|
212
|
+
]);
|
|
213
|
+
});
|
|
214
|
+
|
|
215
|
+
it('parses a query with broken json', () => {
|
|
216
|
+
const query = 'obj={"obj":"val"';
|
|
217
|
+
const [options, ...selectors] = queryParser({
|
|
218
|
+
query,
|
|
219
|
+
entityClass: BlogPost,
|
|
220
|
+
defaultFields: ['title', 'body'],
|
|
221
|
+
});
|
|
222
|
+
|
|
223
|
+
expect(options).toEqual({
|
|
224
|
+
class: BlogPost,
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
expect(selectors).toEqual([
|
|
228
|
+
{
|
|
229
|
+
type: '&',
|
|
230
|
+
equal: [['obj', '{"obj":"val"']],
|
|
231
|
+
},
|
|
232
|
+
]);
|
|
233
|
+
});
|
|
234
|
+
|
|
235
|
+
it('parses a query with broken json and correct json', () => {
|
|
236
|
+
const query = 'obj={"obj":"val" another={"prop":"value"}';
|
|
237
|
+
const [options, ...selectors] = queryParser({
|
|
238
|
+
query,
|
|
239
|
+
entityClass: BlogPost,
|
|
240
|
+
defaultFields: ['title', 'body'],
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
expect(options).toEqual({
|
|
244
|
+
class: BlogPost,
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
expect(selectors).toEqual([
|
|
248
|
+
{
|
|
249
|
+
type: '&',
|
|
250
|
+
equal: [
|
|
251
|
+
['another', { prop: 'value' }],
|
|
252
|
+
['obj', '{"obj":"val"'],
|
|
253
|
+
],
|
|
254
|
+
},
|
|
255
|
+
]);
|
|
256
|
+
});
|
|
257
|
+
|
|
258
|
+
it('parses a query with search', () => {
|
|
259
|
+
const query = 'limit:4 foobar prop(a search string)';
|
|
260
|
+
const [options, ...selectors] = queryParser({
|
|
261
|
+
query,
|
|
262
|
+
entityClass: BlogPost,
|
|
263
|
+
defaultFields: ['title', 'body'],
|
|
264
|
+
qrefMap: {
|
|
265
|
+
cat: {
|
|
266
|
+
class: Category,
|
|
267
|
+
defaultFields: ['name'],
|
|
268
|
+
},
|
|
269
|
+
},
|
|
270
|
+
});
|
|
271
|
+
|
|
272
|
+
expect(options).toEqual({
|
|
273
|
+
class: BlogPost,
|
|
274
|
+
limit: 4,
|
|
275
|
+
});
|
|
276
|
+
|
|
277
|
+
expect(selectors).toEqual([
|
|
278
|
+
{
|
|
279
|
+
type: '&',
|
|
280
|
+
search: [['prop', 'a search string']],
|
|
281
|
+
},
|
|
282
|
+
{
|
|
283
|
+
type: '|',
|
|
284
|
+
ilike: [
|
|
285
|
+
['title', '%foobar%'],
|
|
286
|
+
['body', '%foobar%'],
|
|
287
|
+
],
|
|
288
|
+
},
|
|
289
|
+
]);
|
|
290
|
+
});
|
|
291
|
+
|
|
292
|
+
it('parses a query with search in a selector', () => {
|
|
293
|
+
const query =
|
|
294
|
+
'limit:4 foobar (| prop(a search string) prop2("another search string"))';
|
|
295
|
+
const [options, ...selectors] = queryParser({
|
|
296
|
+
query,
|
|
297
|
+
entityClass: BlogPost,
|
|
298
|
+
defaultFields: ['title', 'body'],
|
|
299
|
+
qrefMap: {
|
|
300
|
+
cat: {
|
|
301
|
+
class: Category,
|
|
302
|
+
defaultFields: ['name'],
|
|
303
|
+
},
|
|
304
|
+
},
|
|
305
|
+
});
|
|
306
|
+
|
|
307
|
+
expect(options).toEqual({
|
|
308
|
+
class: BlogPost,
|
|
309
|
+
limit: 4,
|
|
310
|
+
});
|
|
311
|
+
|
|
312
|
+
expect(selectors).toEqual([
|
|
313
|
+
{
|
|
314
|
+
type: '&',
|
|
315
|
+
selector: [
|
|
316
|
+
{
|
|
317
|
+
type: '|',
|
|
318
|
+
search: [
|
|
319
|
+
['prop', 'a search string'],
|
|
320
|
+
['prop2', '"another search string"'],
|
|
321
|
+
],
|
|
322
|
+
},
|
|
323
|
+
],
|
|
324
|
+
},
|
|
325
|
+
{
|
|
326
|
+
type: '|',
|
|
327
|
+
ilike: [
|
|
328
|
+
['title', '%foobar%'],
|
|
329
|
+
['body', '%foobar%'],
|
|
330
|
+
],
|
|
331
|
+
},
|
|
332
|
+
]);
|
|
333
|
+
});
|
|
334
|
+
|
|
335
|
+
it('parses a query with lt and tag', () => {
|
|
336
|
+
const query = 'limit:4 foobar mdate<"2 weeks ago" <tag>';
|
|
337
|
+
const [options, ...selectors] = queryParser({
|
|
338
|
+
query,
|
|
339
|
+
entityClass: BlogPost,
|
|
340
|
+
defaultFields: ['title', 'body'],
|
|
341
|
+
qrefMap: {
|
|
342
|
+
cat: {
|
|
343
|
+
class: Category,
|
|
344
|
+
defaultFields: ['name'],
|
|
345
|
+
},
|
|
346
|
+
},
|
|
347
|
+
});
|
|
348
|
+
|
|
349
|
+
expect(options).toEqual({
|
|
350
|
+
class: BlogPost,
|
|
351
|
+
limit: 4,
|
|
352
|
+
});
|
|
353
|
+
|
|
354
|
+
expect(selectors).toEqual([
|
|
355
|
+
{
|
|
356
|
+
type: '&',
|
|
357
|
+
lt: [['mdate', null, '2 weeks ago']],
|
|
358
|
+
tag: ['tag'],
|
|
359
|
+
},
|
|
360
|
+
{
|
|
361
|
+
type: '|',
|
|
362
|
+
ilike: [
|
|
363
|
+
['title', '%foobar%'],
|
|
364
|
+
['body', '%foobar%'],
|
|
365
|
+
],
|
|
366
|
+
},
|
|
367
|
+
]);
|
|
368
|
+
});
|
|
369
|
+
|
|
370
|
+
it('parses a query with contain that has brackets', () => {
|
|
371
|
+
const query = 'limit:4 foobar string<"a string with < and > characters">';
|
|
372
|
+
const [options, ...selectors] = queryParser({
|
|
373
|
+
query,
|
|
374
|
+
entityClass: BlogPost,
|
|
375
|
+
defaultFields: ['title', 'body'],
|
|
376
|
+
qrefMap: {
|
|
377
|
+
cat: {
|
|
378
|
+
class: Category,
|
|
379
|
+
defaultFields: ['name'],
|
|
380
|
+
},
|
|
381
|
+
},
|
|
382
|
+
});
|
|
383
|
+
|
|
384
|
+
expect(options).toEqual({
|
|
385
|
+
class: BlogPost,
|
|
386
|
+
limit: 4,
|
|
387
|
+
});
|
|
388
|
+
|
|
389
|
+
expect(selectors).toEqual([
|
|
390
|
+
{
|
|
391
|
+
type: '&',
|
|
392
|
+
contain: [['string', 'a string with < and > characters']],
|
|
393
|
+
},
|
|
394
|
+
{
|
|
395
|
+
type: '|',
|
|
396
|
+
ilike: [
|
|
397
|
+
['title', '%foobar%'],
|
|
398
|
+
['body', '%foobar%'],
|
|
399
|
+
],
|
|
400
|
+
},
|
|
401
|
+
]);
|
|
402
|
+
});
|
|
403
|
+
|
|
404
|
+
it('parses a query with contain that has quotes', () => {
|
|
405
|
+
const query = 'limit:4 foobar string<"a string with a \\" characters">';
|
|
406
|
+
const [options, ...selectors] = queryParser({
|
|
407
|
+
query,
|
|
408
|
+
entityClass: BlogPost,
|
|
409
|
+
defaultFields: ['title', 'body'],
|
|
410
|
+
qrefMap: {
|
|
411
|
+
cat: {
|
|
412
|
+
class: Category,
|
|
413
|
+
defaultFields: ['name'],
|
|
414
|
+
},
|
|
415
|
+
},
|
|
416
|
+
});
|
|
417
|
+
|
|
418
|
+
expect(options).toEqual({
|
|
419
|
+
class: BlogPost,
|
|
420
|
+
limit: 4,
|
|
421
|
+
});
|
|
422
|
+
|
|
423
|
+
expect(selectors).toEqual([
|
|
424
|
+
{
|
|
425
|
+
type: '&',
|
|
426
|
+
contain: [['string', 'a string with a " characters']],
|
|
427
|
+
},
|
|
428
|
+
{
|
|
429
|
+
type: '|',
|
|
430
|
+
ilike: [
|
|
431
|
+
['title', '%foobar%'],
|
|
432
|
+
['body', '%foobar%'],
|
|
433
|
+
],
|
|
434
|
+
},
|
|
435
|
+
]);
|
|
436
|
+
});
|
|
437
|
+
|
|
438
|
+
it('parses a query with a dash in the property name', () => {
|
|
439
|
+
const query = 'limit:4 foobar Test-Prop<"a string">';
|
|
440
|
+
const [options, ...selectors] = queryParser({
|
|
441
|
+
query,
|
|
442
|
+
entityClass: BlogPost,
|
|
443
|
+
defaultFields: ['title', 'body'],
|
|
444
|
+
qrefMap: {
|
|
445
|
+
cat: {
|
|
446
|
+
class: Category,
|
|
447
|
+
defaultFields: ['name'],
|
|
448
|
+
},
|
|
449
|
+
},
|
|
450
|
+
});
|
|
451
|
+
|
|
452
|
+
expect(options).toEqual({
|
|
453
|
+
class: BlogPost,
|
|
454
|
+
limit: 4,
|
|
455
|
+
});
|
|
456
|
+
|
|
457
|
+
expect(selectors).toEqual([
|
|
458
|
+
{
|
|
459
|
+
type: '&',
|
|
460
|
+
contain: [['Test-Prop', 'a string']],
|
|
461
|
+
},
|
|
462
|
+
{
|
|
463
|
+
type: '|',
|
|
464
|
+
ilike: [
|
|
465
|
+
['title', '%foobar%'],
|
|
466
|
+
['body', '%foobar%'],
|
|
467
|
+
],
|
|
468
|
+
},
|
|
469
|
+
]);
|
|
470
|
+
});
|
|
471
|
+
|
|
153
472
|
it('parses all options', () => {
|
|
154
|
-
const query = 'limit:10 offset:15 reverse:true search';
|
|
473
|
+
const query = 'limit:10 offset:15 sort:someProp reverse:true search';
|
|
155
474
|
const [options, ...selectors] = queryParser({
|
|
156
475
|
query,
|
|
157
476
|
entityClass: BlogPost,
|
|
@@ -162,6 +481,31 @@ describe('queryParser', () => {
|
|
|
162
481
|
class: BlogPost,
|
|
163
482
|
limit: 10,
|
|
164
483
|
offset: 15,
|
|
484
|
+
sort: 'someProp',
|
|
485
|
+
reverse: true,
|
|
486
|
+
});
|
|
487
|
+
|
|
488
|
+
expect(selectors).toEqual([
|
|
489
|
+
{
|
|
490
|
+
type: '|',
|
|
491
|
+
ilike: [['text', '%search%']],
|
|
492
|
+
},
|
|
493
|
+
]);
|
|
494
|
+
});
|
|
495
|
+
|
|
496
|
+
it('parses null sort option', () => {
|
|
497
|
+
const query = 'limit:10 offset:15 sort:- reverse:true search';
|
|
498
|
+
const [options, ...selectors] = queryParser({
|
|
499
|
+
query,
|
|
500
|
+
entityClass: BlogPost,
|
|
501
|
+
defaultFields: ['text'],
|
|
502
|
+
});
|
|
503
|
+
|
|
504
|
+
expect(options).toEqual({
|
|
505
|
+
class: BlogPost,
|
|
506
|
+
limit: 10,
|
|
507
|
+
offset: 15,
|
|
508
|
+
sort: null,
|
|
165
509
|
reverse: true,
|
|
166
510
|
});
|
|
167
511
|
|
|
@@ -995,4 +1339,53 @@ describe('queryParser', () => {
|
|
|
995
1339
|
},
|
|
996
1340
|
]);
|
|
997
1341
|
});
|
|
1342
|
+
|
|
1343
|
+
it('parses nested qref clauses', () => {
|
|
1344
|
+
const query =
|
|
1345
|
+
'categories<{Category parent<{Category id="sort+newsletters"}>}> ';
|
|
1346
|
+
const [options, ...selectors] = queryParser({
|
|
1347
|
+
query,
|
|
1348
|
+
entityClass: BlogPost,
|
|
1349
|
+
defaultFields: ['title', 'body'],
|
|
1350
|
+
qrefMap: {
|
|
1351
|
+
Category: {
|
|
1352
|
+
class: Category,
|
|
1353
|
+
defaultFields: ['name'],
|
|
1354
|
+
},
|
|
1355
|
+
},
|
|
1356
|
+
});
|
|
1357
|
+
|
|
1358
|
+
expect(options).toEqual({
|
|
1359
|
+
class: BlogPost,
|
|
1360
|
+
});
|
|
1361
|
+
|
|
1362
|
+
expect(selectors).toEqual([
|
|
1363
|
+
{
|
|
1364
|
+
type: '&',
|
|
1365
|
+
qref: [
|
|
1366
|
+
[
|
|
1367
|
+
'categories',
|
|
1368
|
+
[
|
|
1369
|
+
{ class: Category },
|
|
1370
|
+
{
|
|
1371
|
+
type: '&',
|
|
1372
|
+
qref: [
|
|
1373
|
+
[
|
|
1374
|
+
'parent',
|
|
1375
|
+
[
|
|
1376
|
+
{ class: Category },
|
|
1377
|
+
{
|
|
1378
|
+
type: '&',
|
|
1379
|
+
equal: [['id', 'sort+newsletters']],
|
|
1380
|
+
},
|
|
1381
|
+
],
|
|
1382
|
+
],
|
|
1383
|
+
],
|
|
1384
|
+
},
|
|
1385
|
+
],
|
|
1386
|
+
],
|
|
1387
|
+
],
|
|
1388
|
+
},
|
|
1389
|
+
]);
|
|
1390
|
+
});
|
|
998
1391
|
});
|