@wener/common 1.0.2 → 1.0.3

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.
Files changed (56) hide show
  1. package/lib/cn/DivisionCode.js +311 -0
  2. package/lib/cn/DivisionCode.js.map +1 -0
  3. package/lib/cn/Mod11Checksum.js +42 -0
  4. package/lib/cn/Mod11Checksum.js.map +1 -0
  5. package/lib/cn/Mod31Checksum.js +48 -0
  6. package/lib/cn/Mod31Checksum.js.map +1 -0
  7. package/lib/cn/ResidentIdentityCardNumber.js +50 -0
  8. package/lib/cn/ResidentIdentityCardNumber.js.map +1 -0
  9. package/lib/cn/UnifiedSocialCreditCode.js +118 -0
  10. package/lib/cn/UnifiedSocialCreditCode.js.map +1 -0
  11. package/lib/cn/formatDate.js +15 -0
  12. package/lib/cn/formatDate.js.map +1 -0
  13. package/lib/cn/index.js +4 -0
  14. package/lib/cn/index.js.map +1 -0
  15. package/lib/cn/parseSex.js +22 -0
  16. package/lib/cn/parseSex.js.map +1 -0
  17. package/lib/cn/types.d.js +8 -0
  18. package/lib/cn/types.d.js.map +1 -0
  19. package/lib/meta/defineFileType.js +44 -0
  20. package/lib/meta/defineFileType.js.map +1 -0
  21. package/lib/meta/defineMetadata.js +14 -3
  22. package/lib/meta/defineMetadata.js.map +1 -1
  23. package/lib/meta/index.js +1 -0
  24. package/lib/meta/index.js.map +1 -1
  25. package/lib/parseSort.js +15 -0
  26. package/lib/parseSort.js.map +1 -1
  27. package/lib/search/formatAdvanceSearch.js +1 -1
  28. package/lib/search/formatAdvanceSearch.js.map +1 -1
  29. package/lib/search/parser.js +380 -76
  30. package/lib/search/parser.js.map +1 -1
  31. package/lib/search/types.d.js.map +1 -1
  32. package/package.json +8 -4
  33. package/src/cn/DivisionCode.test.ts +50 -0
  34. package/src/cn/DivisionCode.ts +253 -0
  35. package/src/cn/Mod11Checksum.ts +24 -0
  36. package/src/cn/Mod31Checksum.ts +36 -0
  37. package/src/cn/ResidentIdentityCardNumber.test.ts +21 -0
  38. package/src/cn/ResidentIdentityCardNumber.ts +96 -0
  39. package/src/cn/UnifiedSocialCreditCode.test.ts +16 -0
  40. package/src/cn/UnifiedSocialCreditCode.ts +148 -0
  41. package/src/cn/__snapshots__/ResidentIdentityCardNumber.test.ts.snap +15 -0
  42. package/src/cn/__snapshots__/UnifiedSocialCreditCode.test.ts.snap +41 -0
  43. package/src/cn/formatDate.ts +12 -0
  44. package/src/cn/index.ts +3 -0
  45. package/src/cn/parseSex.ts +27 -0
  46. package/src/cn/types.d.ts +51 -0
  47. package/src/meta/defineFileType.tsx +68 -0
  48. package/src/meta/defineMetadata.ts +16 -3
  49. package/src/meta/index.ts +2 -0
  50. package/src/parseSort.ts +18 -0
  51. package/src/search/AdvanceSearch.test.ts +2 -2
  52. package/src/search/__snapshots__/AdvanceSearch.test.ts.snap +3 -3
  53. package/src/search/formatAdvanceSearch.ts +1 -1
  54. package/src/search/parser.js +325 -73
  55. package/src/search/parser.peggy +42 -9
  56. package/src/search/types.d.ts +1 -1
@@ -154,12 +154,23 @@ function peg$parse(input, options) {
154
154
  var peg$c18 = "T";
155
155
  var peg$c19 = "Z";
156
156
  var peg$c20 = "\"";
157
- var peg$c21 = "true";
158
- var peg$c22 = "false";
159
- var peg$c23 = "null";
160
- var peg$c24 = "OR";
161
- var peg$c25 = "AND";
162
- var peg$c26 = "NOT";
157
+ var peg$c21 = "\\'";
158
+ var peg$c22 = "\\\"";
159
+ var peg$c23 = "\\\\";
160
+ var peg$c24 = "\\/";
161
+ var peg$c25 = "\\b";
162
+ var peg$c26 = "\\f";
163
+ var peg$c27 = "\\n";
164
+ var peg$c28 = "\\r";
165
+ var peg$c29 = "\\t";
166
+ var peg$c30 = "''";
167
+ var peg$c31 = "\\u";
168
+ var peg$c32 = "true";
169
+ var peg$c33 = "false";
170
+ var peg$c34 = "null";
171
+ var peg$c35 = "OR";
172
+ var peg$c36 = "AND";
173
+ var peg$c37 = "NOT";
163
174
  var peg$r0 = /^[^*]/;
164
175
  var peg$r1 = /^[^\-+,'" \r\n\t()]/;
165
176
  var peg$r2 = /^[^ \r\n\t)]/;
@@ -169,9 +180,10 @@ function peg$parse(input, options) {
169
180
  var peg$r6 = /^[0-9]/;
170
181
  var peg$r7 = /^[a-zA-Z]/;
171
182
  var peg$r8 = /^[_a-zA-Z0-9]/;
172
- var peg$r9 = /^[^"]/;
173
- var peg$r10 = /^[A-Za-z_]/;
174
- var peg$r11 = /^[ \t\n\r]/;
183
+ var peg$r9 = /^[^"\\\0-\x1F\x7F]/;
184
+ var peg$r10 = /^[0-9a-fA-F]/;
185
+ var peg$r11 = /^[A-Za-z_]/;
186
+ var peg$r12 = /^[ \t\n\r]/;
175
187
  var peg$e0 = peg$literalExpectation("/*", false);
176
188
  var peg$e1 = peg$classExpectation([
177
189
  "*"
@@ -262,12 +274,43 @@ function peg$parse(input, options) {
262
274
  ], false, false);
263
275
  var peg$e29 = peg$literalExpectation("\"", false);
264
276
  var peg$e30 = peg$classExpectation([
265
- "\""
277
+ "\"",
278
+ "\\",
279
+ [
280
+ "\0",
281
+ "\x1F"
282
+ ],
283
+ "\x7F"
266
284
  ], true, false);
267
- var peg$e31 = peg$literalExpectation("true", false);
268
- var peg$e32 = peg$literalExpectation("false", false);
269
- var peg$e33 = peg$literalExpectation("null", false);
270
- var peg$e34 = peg$classExpectation([
285
+ var peg$e31 = peg$literalExpectation("\\'", false);
286
+ var peg$e32 = peg$literalExpectation("\\\"", false);
287
+ var peg$e33 = peg$literalExpectation("\\\\", false);
288
+ var peg$e34 = peg$literalExpectation("\\/", false);
289
+ var peg$e35 = peg$literalExpectation("\\b", false);
290
+ var peg$e36 = peg$literalExpectation("\\f", false);
291
+ var peg$e37 = peg$literalExpectation("\\n", false);
292
+ var peg$e38 = peg$literalExpectation("\\r", false);
293
+ var peg$e39 = peg$literalExpectation("\\t", false);
294
+ var peg$e40 = peg$literalExpectation("''", false);
295
+ var peg$e41 = peg$literalExpectation("\\u", false);
296
+ var peg$e42 = peg$classExpectation([
297
+ [
298
+ "0",
299
+ "9"
300
+ ],
301
+ [
302
+ "a",
303
+ "f"
304
+ ],
305
+ [
306
+ "A",
307
+ "F"
308
+ ]
309
+ ], false, false);
310
+ var peg$e43 = peg$literalExpectation("true", false);
311
+ var peg$e44 = peg$literalExpectation("false", false);
312
+ var peg$e45 = peg$literalExpectation("null", false);
313
+ var peg$e46 = peg$classExpectation([
271
314
  [
272
315
  "A",
273
316
  "Z"
@@ -278,17 +321,17 @@ function peg$parse(input, options) {
278
321
  ],
279
322
  "_"
280
323
  ], false, false);
281
- var peg$e35 = peg$literalExpectation("OR", false);
282
- var peg$e36 = peg$literalExpectation("AND", false);
283
- var peg$e37 = peg$literalExpectation("NOT", false);
284
- var peg$e38 = peg$otherExpectation("whitespace");
285
- var peg$e39 = peg$classExpectation([
324
+ var peg$e47 = peg$literalExpectation("OR", false);
325
+ var peg$e48 = peg$literalExpectation("AND", false);
326
+ var peg$e49 = peg$literalExpectation("NOT", false);
327
+ var peg$e50 = peg$otherExpectation("whitespace");
328
+ var peg$e51 = peg$classExpectation([
286
329
  " ",
287
330
  "\t",
288
331
  "\n",
289
332
  "\r"
290
333
  ], false, false);
291
- var peg$e40 = peg$anyExpectation();
334
+ var peg$e52 = peg$anyExpectation();
292
335
  var peg$f0 = function(value) {
293
336
  return {
294
337
  type: "comment",
@@ -367,7 +410,7 @@ function peg$parse(input, options) {
367
410
  return {
368
411
  type: "compare",
369
412
  field,
370
- operator: "has",
413
+ operator: "match",
371
414
  value: {
372
415
  value
373
416
  },
@@ -436,21 +479,54 @@ function peg$parse(input, options) {
436
479
  return v.join("");
437
480
  };
438
481
  var peg$f23 = function() {
439
- return text().toLowerCase() === "true";
482
+ return "'";
440
483
  };
441
484
  var peg$f24 = function() {
442
- return parseInt(text());
485
+ return '"';
443
486
  };
444
487
  var peg$f25 = function() {
445
- return parseFloat(text());
488
+ return "\\";
446
489
  };
447
490
  var peg$f26 = function() {
448
- return null;
491
+ return "/";
449
492
  };
450
493
  var peg$f27 = function() {
451
- return "";
494
+ return "\b";
452
495
  };
453
496
  var peg$f28 = function() {
497
+ return "\f";
498
+ };
499
+ var peg$f29 = function() {
500
+ return "\n";
501
+ };
502
+ var peg$f30 = function() {
503
+ return "\r";
504
+ };
505
+ var peg$f31 = function() {
506
+ return "\t";
507
+ };
508
+ var peg$f32 = function() {
509
+ return "'";
510
+ };
511
+ var peg$f33 = function(h1, h2, h3, h4) {
512
+ return String.fromCharCode(parseInt("0x" + h1 + h2 + h3 + h4));
513
+ };
514
+ var peg$f34 = function() {
515
+ return text().toLowerCase() === "true";
516
+ };
517
+ var peg$f35 = function() {
518
+ return parseInt(text());
519
+ };
520
+ var peg$f36 = function() {
521
+ return parseFloat(text());
522
+ };
523
+ var peg$f37 = function() {
524
+ return null;
525
+ };
526
+ var peg$f38 = function() {
527
+ return "";
528
+ };
529
+ var peg$f39 = function() {
454
530
  return " ";
455
531
  };
456
532
  var peg$currPos = options.peg$currPos | 0;
@@ -2301,26 +2377,10 @@ function peg$parse(input, options) {
2301
2377
  }
2302
2378
  if (s1 !== peg$FAILED) {
2303
2379
  s2 = [];
2304
- s3 = input.charAt(peg$currPos);
2305
- if (peg$r9.test(s3)) {
2306
- peg$currPos++;
2307
- } else {
2308
- s3 = peg$FAILED;
2309
- if (peg$silentFails === 0) {
2310
- peg$fail(peg$e30);
2311
- }
2312
- }
2380
+ s3 = peg$parsesingle_char();
2313
2381
  while(s3 !== peg$FAILED){
2314
2382
  s2.push(s3);
2315
- s3 = input.charAt(peg$currPos);
2316
- if (peg$r9.test(s3)) {
2317
- peg$currPos++;
2318
- } else {
2319
- s3 = peg$FAILED;
2320
- if (peg$silentFails === 0) {
2321
- peg$fail(peg$e30);
2322
- }
2323
- }
2383
+ s3 = peg$parsesingle_char();
2324
2384
  }
2325
2385
  if (input.charCodeAt(peg$currPos) === 34) {
2326
2386
  s3 = peg$c20;
@@ -2344,32 +2404,276 @@ function peg$parse(input, options) {
2344
2404
  }
2345
2405
  return s0;
2346
2406
  }
2407
+ function peg$parsesingle_char() {
2408
+ var s0;
2409
+ s0 = input.charAt(peg$currPos);
2410
+ if (peg$r9.test(s0)) {
2411
+ peg$currPos++;
2412
+ } else {
2413
+ s0 = peg$FAILED;
2414
+ if (peg$silentFails === 0) {
2415
+ peg$fail(peg$e30);
2416
+ }
2417
+ }
2418
+ if (s0 === peg$FAILED) {
2419
+ s0 = peg$parseescape_char();
2420
+ }
2421
+ return s0;
2422
+ }
2423
+ function peg$parseescape_char() {
2424
+ var s0, s1, s2, s3, s4, s5;
2425
+ s0 = peg$currPos;
2426
+ if (input.substr(peg$currPos, 2) === peg$c21) {
2427
+ s1 = peg$c21;
2428
+ peg$currPos += 2;
2429
+ } else {
2430
+ s1 = peg$FAILED;
2431
+ if (peg$silentFails === 0) {
2432
+ peg$fail(peg$e31);
2433
+ }
2434
+ }
2435
+ if (s1 !== peg$FAILED) {
2436
+ peg$savedPos = s0;
2437
+ s1 = peg$f23();
2438
+ }
2439
+ s0 = s1;
2440
+ if (s0 === peg$FAILED) {
2441
+ s0 = peg$currPos;
2442
+ if (input.substr(peg$currPos, 2) === peg$c22) {
2443
+ s1 = peg$c22;
2444
+ peg$currPos += 2;
2445
+ } else {
2446
+ s1 = peg$FAILED;
2447
+ if (peg$silentFails === 0) {
2448
+ peg$fail(peg$e32);
2449
+ }
2450
+ }
2451
+ if (s1 !== peg$FAILED) {
2452
+ peg$savedPos = s0;
2453
+ s1 = peg$f24();
2454
+ }
2455
+ s0 = s1;
2456
+ if (s0 === peg$FAILED) {
2457
+ s0 = peg$currPos;
2458
+ if (input.substr(peg$currPos, 2) === peg$c23) {
2459
+ s1 = peg$c23;
2460
+ peg$currPos += 2;
2461
+ } else {
2462
+ s1 = peg$FAILED;
2463
+ if (peg$silentFails === 0) {
2464
+ peg$fail(peg$e33);
2465
+ }
2466
+ }
2467
+ if (s1 !== peg$FAILED) {
2468
+ peg$savedPos = s0;
2469
+ s1 = peg$f25();
2470
+ }
2471
+ s0 = s1;
2472
+ if (s0 === peg$FAILED) {
2473
+ s0 = peg$currPos;
2474
+ if (input.substr(peg$currPos, 2) === peg$c24) {
2475
+ s1 = peg$c24;
2476
+ peg$currPos += 2;
2477
+ } else {
2478
+ s1 = peg$FAILED;
2479
+ if (peg$silentFails === 0) {
2480
+ peg$fail(peg$e34);
2481
+ }
2482
+ }
2483
+ if (s1 !== peg$FAILED) {
2484
+ peg$savedPos = s0;
2485
+ s1 = peg$f26();
2486
+ }
2487
+ s0 = s1;
2488
+ if (s0 === peg$FAILED) {
2489
+ s0 = peg$currPos;
2490
+ if (input.substr(peg$currPos, 2) === peg$c25) {
2491
+ s1 = peg$c25;
2492
+ peg$currPos += 2;
2493
+ } else {
2494
+ s1 = peg$FAILED;
2495
+ if (peg$silentFails === 0) {
2496
+ peg$fail(peg$e35);
2497
+ }
2498
+ }
2499
+ if (s1 !== peg$FAILED) {
2500
+ peg$savedPos = s0;
2501
+ s1 = peg$f27();
2502
+ }
2503
+ s0 = s1;
2504
+ if (s0 === peg$FAILED) {
2505
+ s0 = peg$currPos;
2506
+ if (input.substr(peg$currPos, 2) === peg$c26) {
2507
+ s1 = peg$c26;
2508
+ peg$currPos += 2;
2509
+ } else {
2510
+ s1 = peg$FAILED;
2511
+ if (peg$silentFails === 0) {
2512
+ peg$fail(peg$e36);
2513
+ }
2514
+ }
2515
+ if (s1 !== peg$FAILED) {
2516
+ peg$savedPos = s0;
2517
+ s1 = peg$f28();
2518
+ }
2519
+ s0 = s1;
2520
+ if (s0 === peg$FAILED) {
2521
+ s0 = peg$currPos;
2522
+ if (input.substr(peg$currPos, 2) === peg$c27) {
2523
+ s1 = peg$c27;
2524
+ peg$currPos += 2;
2525
+ } else {
2526
+ s1 = peg$FAILED;
2527
+ if (peg$silentFails === 0) {
2528
+ peg$fail(peg$e37);
2529
+ }
2530
+ }
2531
+ if (s1 !== peg$FAILED) {
2532
+ peg$savedPos = s0;
2533
+ s1 = peg$f29();
2534
+ }
2535
+ s0 = s1;
2536
+ if (s0 === peg$FAILED) {
2537
+ s0 = peg$currPos;
2538
+ if (input.substr(peg$currPos, 2) === peg$c28) {
2539
+ s1 = peg$c28;
2540
+ peg$currPos += 2;
2541
+ } else {
2542
+ s1 = peg$FAILED;
2543
+ if (peg$silentFails === 0) {
2544
+ peg$fail(peg$e38);
2545
+ }
2546
+ }
2547
+ if (s1 !== peg$FAILED) {
2548
+ peg$savedPos = s0;
2549
+ s1 = peg$f30();
2550
+ }
2551
+ s0 = s1;
2552
+ if (s0 === peg$FAILED) {
2553
+ s0 = peg$currPos;
2554
+ if (input.substr(peg$currPos, 2) === peg$c29) {
2555
+ s1 = peg$c29;
2556
+ peg$currPos += 2;
2557
+ } else {
2558
+ s1 = peg$FAILED;
2559
+ if (peg$silentFails === 0) {
2560
+ peg$fail(peg$e39);
2561
+ }
2562
+ }
2563
+ if (s1 !== peg$FAILED) {
2564
+ peg$savedPos = s0;
2565
+ s1 = peg$f31();
2566
+ }
2567
+ s0 = s1;
2568
+ if (s0 === peg$FAILED) {
2569
+ s0 = peg$currPos;
2570
+ if (input.substr(peg$currPos, 2) === peg$c30) {
2571
+ s1 = peg$c30;
2572
+ peg$currPos += 2;
2573
+ } else {
2574
+ s1 = peg$FAILED;
2575
+ if (peg$silentFails === 0) {
2576
+ peg$fail(peg$e40);
2577
+ }
2578
+ }
2579
+ if (s1 !== peg$FAILED) {
2580
+ peg$savedPos = s0;
2581
+ s1 = peg$f32();
2582
+ }
2583
+ s0 = s1;
2584
+ if (s0 === peg$FAILED) {
2585
+ s0 = peg$currPos;
2586
+ if (input.substr(peg$currPos, 2) === peg$c31) {
2587
+ s1 = peg$c31;
2588
+ peg$currPos += 2;
2589
+ } else {
2590
+ s1 = peg$FAILED;
2591
+ if (peg$silentFails === 0) {
2592
+ peg$fail(peg$e41);
2593
+ }
2594
+ }
2595
+ if (s1 !== peg$FAILED) {
2596
+ s2 = peg$parsehex_digit();
2597
+ if (s2 !== peg$FAILED) {
2598
+ s3 = peg$parsehex_digit();
2599
+ if (s3 !== peg$FAILED) {
2600
+ s4 = peg$parsehex_digit();
2601
+ if (s4 !== peg$FAILED) {
2602
+ s5 = peg$parsehex_digit();
2603
+ if (s5 !== peg$FAILED) {
2604
+ peg$savedPos = s0;
2605
+ s0 = peg$f33(s2, s3, s4, s5);
2606
+ } else {
2607
+ peg$currPos = s0;
2608
+ s0 = peg$FAILED;
2609
+ }
2610
+ } else {
2611
+ peg$currPos = s0;
2612
+ s0 = peg$FAILED;
2613
+ }
2614
+ } else {
2615
+ peg$currPos = s0;
2616
+ s0 = peg$FAILED;
2617
+ }
2618
+ } else {
2619
+ peg$currPos = s0;
2620
+ s0 = peg$FAILED;
2621
+ }
2622
+ } else {
2623
+ peg$currPos = s0;
2624
+ s0 = peg$FAILED;
2625
+ }
2626
+ }
2627
+ }
2628
+ }
2629
+ }
2630
+ }
2631
+ }
2632
+ }
2633
+ }
2634
+ }
2635
+ }
2636
+ return s0;
2637
+ }
2638
+ function peg$parsehex_digit() {
2639
+ var s0;
2640
+ s0 = input.charAt(peg$currPos);
2641
+ if (peg$r10.test(s0)) {
2642
+ peg$currPos++;
2643
+ } else {
2644
+ s0 = peg$FAILED;
2645
+ if (peg$silentFails === 0) {
2646
+ peg$fail(peg$e42);
2647
+ }
2648
+ }
2649
+ return s0;
2650
+ }
2347
2651
  function peg$parsebool() {
2348
2652
  var s0, s1;
2349
2653
  s0 = peg$currPos;
2350
- if (input.substr(peg$currPos, 4) === peg$c21) {
2351
- s1 = peg$c21;
2654
+ if (input.substr(peg$currPos, 4) === peg$c32) {
2655
+ s1 = peg$c32;
2352
2656
  peg$currPos += 4;
2353
2657
  } else {
2354
2658
  s1 = peg$FAILED;
2355
2659
  if (peg$silentFails === 0) {
2356
- peg$fail(peg$e31);
2660
+ peg$fail(peg$e43);
2357
2661
  }
2358
2662
  }
2359
2663
  if (s1 === peg$FAILED) {
2360
- if (input.substr(peg$currPos, 5) === peg$c22) {
2361
- s1 = peg$c22;
2664
+ if (input.substr(peg$currPos, 5) === peg$c33) {
2665
+ s1 = peg$c33;
2362
2666
  peg$currPos += 5;
2363
2667
  } else {
2364
2668
  s1 = peg$FAILED;
2365
2669
  if (peg$silentFails === 0) {
2366
- peg$fail(peg$e32);
2670
+ peg$fail(peg$e44);
2367
2671
  }
2368
2672
  }
2369
2673
  }
2370
2674
  if (s1 !== peg$FAILED) {
2371
2675
  peg$savedPos = s0;
2372
- s1 = peg$f23();
2676
+ s1 = peg$f34();
2373
2677
  }
2374
2678
  s0 = s1;
2375
2679
  return s0;
@@ -2405,7 +2709,7 @@ function peg$parse(input, options) {
2405
2709
  }
2406
2710
  if (s1 !== peg$FAILED) {
2407
2711
  peg$savedPos = s0;
2408
- s1 = peg$f24();
2712
+ s1 = peg$f35();
2409
2713
  }
2410
2714
  s0 = s1;
2411
2715
  return s0;
@@ -2478,7 +2782,7 @@ function peg$parse(input, options) {
2478
2782
  }
2479
2783
  if (s3 !== peg$FAILED) {
2480
2784
  peg$savedPos = s0;
2481
- s0 = peg$f25();
2785
+ s0 = peg$f36();
2482
2786
  } else {
2483
2787
  peg$currPos = s0;
2484
2788
  s0 = peg$FAILED;
@@ -2496,18 +2800,18 @@ function peg$parse(input, options) {
2496
2800
  function peg$parsenull() {
2497
2801
  var s0, s1;
2498
2802
  s0 = peg$currPos;
2499
- if (input.substr(peg$currPos, 4) === peg$c23) {
2500
- s1 = peg$c23;
2803
+ if (input.substr(peg$currPos, 4) === peg$c34) {
2804
+ s1 = peg$c34;
2501
2805
  peg$currPos += 4;
2502
2806
  } else {
2503
2807
  s1 = peg$FAILED;
2504
2808
  if (peg$silentFails === 0) {
2505
- peg$fail(peg$e33);
2809
+ peg$fail(peg$e45);
2506
2810
  }
2507
2811
  }
2508
2812
  if (s1 !== peg$FAILED) {
2509
2813
  peg$savedPos = s0;
2510
- s1 = peg$f26();
2814
+ s1 = peg$f37();
2511
2815
  }
2512
2816
  s0 = s1;
2513
2817
  return s0;
@@ -2515,12 +2819,12 @@ function peg$parse(input, options) {
2515
2819
  function peg$parseident_start() {
2516
2820
  var s0;
2517
2821
  s0 = input.charAt(peg$currPos);
2518
- if (peg$r10.test(s0)) {
2822
+ if (peg$r11.test(s0)) {
2519
2823
  peg$currPos++;
2520
2824
  } else {
2521
2825
  s0 = peg$FAILED;
2522
2826
  if (peg$silentFails === 0) {
2523
- peg$fail(peg$e34);
2827
+ peg$fail(peg$e46);
2524
2828
  }
2525
2829
  }
2526
2830
  return s0;
@@ -2528,13 +2832,13 @@ function peg$parse(input, options) {
2528
2832
  function peg$parseKW_OR() {
2529
2833
  var s0, s1, s2, s3;
2530
2834
  s0 = peg$currPos;
2531
- if (input.substr(peg$currPos, 2) === peg$c24) {
2532
- s1 = peg$c24;
2835
+ if (input.substr(peg$currPos, 2) === peg$c35) {
2836
+ s1 = peg$c35;
2533
2837
  peg$currPos += 2;
2534
2838
  } else {
2535
2839
  s1 = peg$FAILED;
2536
2840
  if (peg$silentFails === 0) {
2537
- peg$fail(peg$e35);
2841
+ peg$fail(peg$e47);
2538
2842
  }
2539
2843
  }
2540
2844
  if (s1 !== peg$FAILED) {
@@ -2567,13 +2871,13 @@ function peg$parse(input, options) {
2567
2871
  function peg$parseKW_AND() {
2568
2872
  var s0, s1, s2, s3;
2569
2873
  s0 = peg$currPos;
2570
- if (input.substr(peg$currPos, 3) === peg$c25) {
2571
- s1 = peg$c25;
2874
+ if (input.substr(peg$currPos, 3) === peg$c36) {
2875
+ s1 = peg$c36;
2572
2876
  peg$currPos += 3;
2573
2877
  } else {
2574
2878
  s1 = peg$FAILED;
2575
2879
  if (peg$silentFails === 0) {
2576
- peg$fail(peg$e36);
2880
+ peg$fail(peg$e48);
2577
2881
  }
2578
2882
  }
2579
2883
  if (s1 !== peg$FAILED) {
@@ -2606,13 +2910,13 @@ function peg$parse(input, options) {
2606
2910
  function peg$parseKW_NOT() {
2607
2911
  var s0, s1, s2, s3;
2608
2912
  s0 = peg$currPos;
2609
- if (input.substr(peg$currPos, 3) === peg$c26) {
2610
- s1 = peg$c26;
2913
+ if (input.substr(peg$currPos, 3) === peg$c37) {
2914
+ s1 = peg$c37;
2611
2915
  peg$currPos += 3;
2612
2916
  } else {
2613
2917
  s1 = peg$FAILED;
2614
2918
  if (peg$silentFails === 0) {
2615
- peg$fail(peg$e37);
2919
+ peg$fail(peg$e49);
2616
2920
  }
2617
2921
  }
2618
2922
  if (s1 !== peg$FAILED) {
@@ -2653,12 +2957,12 @@ function peg$parse(input, options) {
2653
2957
  s2 = peg$parsewhite();
2654
2958
  }
2655
2959
  peg$savedPos = s0;
2656
- s1 = peg$f27();
2960
+ s1 = peg$f38();
2657
2961
  s0 = s1;
2658
2962
  peg$silentFails--;
2659
2963
  s1 = peg$FAILED;
2660
2964
  if (peg$silentFails === 0) {
2661
- peg$fail(peg$e38);
2965
+ peg$fail(peg$e50);
2662
2966
  }
2663
2967
  return s0;
2664
2968
  }
@@ -2678,14 +2982,14 @@ function peg$parse(input, options) {
2678
2982
  }
2679
2983
  if (s1 !== peg$FAILED) {
2680
2984
  peg$savedPos = s0;
2681
- s1 = peg$f28();
2985
+ s1 = peg$f39();
2682
2986
  }
2683
2987
  s0 = s1;
2684
2988
  peg$silentFails--;
2685
2989
  if (s0 === peg$FAILED) {
2686
2990
  s1 = peg$FAILED;
2687
2991
  if (peg$silentFails === 0) {
2688
- peg$fail(peg$e38);
2992
+ peg$fail(peg$e50);
2689
2993
  }
2690
2994
  }
2691
2995
  return s0;
@@ -2693,12 +2997,12 @@ function peg$parse(input, options) {
2693
2997
  function peg$parsewhite() {
2694
2998
  var s0;
2695
2999
  s0 = input.charAt(peg$currPos);
2696
- if (peg$r11.test(s0)) {
3000
+ if (peg$r12.test(s0)) {
2697
3001
  peg$currPos++;
2698
3002
  } else {
2699
3003
  s0 = peg$FAILED;
2700
3004
  if (peg$silentFails === 0) {
2701
- peg$fail(peg$e39);
3005
+ peg$fail(peg$e51);
2702
3006
  }
2703
3007
  }
2704
3008
  return s0;
@@ -2713,7 +3017,7 @@ function peg$parse(input, options) {
2713
3017
  } else {
2714
3018
  s1 = peg$FAILED;
2715
3019
  if (peg$silentFails === 0) {
2716
- peg$fail(peg$e40);
3020
+ peg$fail(peg$e52);
2717
3021
  }
2718
3022
  }
2719
3023
  peg$silentFails--;
@@ -2726,7 +3030,7 @@ function peg$parse(input, options) {
2726
3030
  return s0;
2727
3031
  }
2728
3032
  const OPERATORS = {
2729
- ":": "has",
3033
+ ":": "match",
2730
3034
  ":=": "eq",
2731
3035
  ":!=": "ne",
2732
3036
  ":>": "gt",