@webda/core 3.15.1 → 3.16.1

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 (32) hide show
  1. package/CHANGELOG.md +384 -0
  2. package/lib/core.d.ts +0 -2
  3. package/lib/index.d.ts +1 -0
  4. package/lib/index.js +1 -0
  5. package/lib/index.js.map +1 -1
  6. package/lib/models/coremodel.d.ts +1 -2
  7. package/lib/models/coremodel.js +1 -3
  8. package/lib/models/coremodel.js.map +1 -1
  9. package/lib/queues/filequeue.js +2 -2
  10. package/lib/queues/filequeue.js.map +1 -1
  11. package/lib/queues/filequeue.spec.js +6 -0
  12. package/lib/queues/filequeue.spec.js.map +1 -1
  13. package/lib/queues/queueservice.d.ts +0 -1
  14. package/lib/services/binary.d.ts +0 -2
  15. package/lib/services/cloudbinary.d.ts +1 -1
  16. package/lib/services/cryptoservice.d.ts +0 -2
  17. package/lib/services/filebinary.d.ts +0 -1
  18. package/lib/services/prometheus.d.ts +0 -1
  19. package/lib/services/prometheus.js +3 -2
  20. package/lib/services/prometheus.js.map +1 -1
  21. package/lib/services/service.d.ts +0 -1
  22. package/lib/stores/webdaql/query.d.ts +3 -0
  23. package/lib/stores/webdaql/query.js +55 -20
  24. package/lib/stores/webdaql/query.js.map +1 -1
  25. package/lib/stores/webdaql/query.spec.js +25 -18
  26. package/lib/stores/webdaql/query.spec.js.map +1 -1
  27. package/lib/utils/context.d.ts +0 -4
  28. package/lib/utils/httpcontext.d.ts +0 -3
  29. package/lib/utils/httpcontext.spec.d.ts +0 -1
  30. package/lib/utils/serializers.d.ts +0 -3
  31. package/package.json +7 -8
  32. package/LICENSE +0 -166
package/lib/queues/filequeue.spec.js CHANGED
@@ -20,21 +20,27 @@ let FileQueueTest = class FileQueueTest extends QueueTest {
20
20
  async lock() {
21
21
  let queue = this.getService("FileQueue");
22
22
  await queue.__clean();
23
+ // Try to receive one message only
23
24
  await queue.sendMessage({ test: "plop" });
24
25
  let msg = await queue.receiveMessage();
25
26
  let msg2 = await queue.receiveMessage();
26
27
  assert.strictEqual(msg.length, 1);
28
+ // Check if there is no more message left
27
29
  assert.strictEqual(msg2.length, 0);
30
+ // Wait for the lock to expire, as it is set at 1 second in config file
28
31
  await this.sleep(1000);
29
32
  await queue.sendMessage({ test: "plop2" });
30
33
  msg2 = await queue.receiveMessage();
31
34
  assert.strictEqual(msg2.length, 1);
32
35
  assert.deepStrictEqual(msg2[0], msg[0]);
36
+ // Check if the deletion is not crashing even if the lock file is removed
33
37
  unlinkSync(`${queue.getParameters().folder}/${msg[0].ReceiptHandle}.json.lock`);
34
38
  await queue.deleteMessage(msg[0].ReceiptHandle);
35
39
  msg2 = await queue.receiveMessage();
40
+ // Check if the deletion is not crashing even if the content file is removed
36
41
  unlinkSync(`${queue.getParameters().folder}/${msg2[0].ReceiptHandle}.json`);
37
42
  await queue.deleteMessage(msg2[0].ReceiptHandle);
43
+ // Check if default parameter is correctly set
38
44
  queue = new FileQueue(this.webda, "q", {});
39
45
  assert.strictEqual(queue.getParameters().expire, 30000);
40
46
  }
package/lib/queues/filequeue.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filequeue.spec.js","sourceRoot":"","sources":["../../src/queues/filequeue.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAGzC,IAAM,aAAa,GAAnB,MAAM,aAAc,SAAQ,SAAS;IAE7B,AAAN,KAAK,CAAC,KAAK;QACT,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAGK,AAAN,KAAK,CAAC,IAAI;QACR,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC/D,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QACtB,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,IAAI,GAAG,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QACvC,IAAI,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QACxC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACnC,MAAM,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;QAC3C,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QACpC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACxC,UAAU,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,YAAY,CAAC,CAAC;QAChF,MAAM,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QAChD,IAAI,GAAG,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QACpC,UAAU,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,OAAO,CAAC,CAAC;QAC5E,MAAM,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;QACjD,KAAK,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1D,CAAC;IAGK,AAAN,KAAK,CAAC,WAAW;QACf,IAAI,KAAK,GAAyB,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;QAC/D,IAAI,SAAS,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,OAAO,GAAG,CAAC,GAAW,EAAE,EAAE;YAC9B,IAAI,SAAS,EAAE,CAAC;gBACd,EAAE,CAAC,aAAa,CAAC,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,EAAE,IAAI,CAAC,CAAC;gBACtE,SAAS,GAAG,KAAK,CAAC;YACpB,CAAC;YACD,OAAO,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,IAAI,GAAG,OAAO,CAAC;QACvD,CAAC,CAAC;QACF,MAAM,KAAK,CAAC,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QAC1C,YAAY,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;QAC3C,EAAE,CAAC,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACxD,KAAK,CAAC,iBAAiB,EAAE,CAAC;QAC1B,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,aAAa,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;QACvD,KAAK,CAAC,iBAAiB,EAAE,CAAC;IAC5B,CAAC;CACF,CAAA;AAhDO;IADL,IAAI;0CAKJ;AAGK;IADL,IAAI;yCAqBJ;AAGK;IADL,IAAI;gDAkBJ;AAjDG,aAAa;IADlB,KAAK;GACA,aAAa,CAkDlB"}
1
+ {"version":3,"file":"filequeue.spec.js","sourceRoot":"","sources":["../../src/queues/filequeue.spec.ts"],"names":[],"mappings":"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"}
package/lib/queues/queueservice.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { ServiceParameters } from "../services/service.js";
3
2
  import { CancelablePromise, WaitDelayer, WaitDelayerDefinition } from "../utils/waiter.js";
4
3
  import { PubSubService } from "./pubsubservice.js";
package/lib/services/binary.d.ts CHANGED
@@ -1,5 +1,3 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
1
  import { Readable } from "stream";
4
2
  import { Counter, WebdaError } from "../index.js";
5
3
  import { CoreModel } from "../models/coremodel.js";
package/lib/services/cloudbinary.d.ts CHANGED
@@ -14,7 +14,7 @@ export declare abstract class CloudBinary<T extends CloudBinaryParameters = Clou
14
14
  /**
15
15
  * @override
16
16
  */
17
- loadParameters(params: any): any;
17
+ loadParameters(params: any): CloudBinaryParameters;
18
18
  /**
19
19
  * Get a UrlFromObject
20
20
  *
package/lib/services/cryptoservice.d.ts CHANGED
@@ -1,5 +1,3 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
1
  import * as util from "util";
4
2
  import { OperationContext, RegistryEntry, Store } from "../index.js";
5
3
  import { DeepPartial, Service, ServiceParameters } from "./service.js";
package/lib/services/filebinary.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { Readable } from "stream";
3
2
  import { CloudBinary, CloudBinaryParameters, CoreModel } from "../index.js";
4
3
  import { WebContext } from "../utils/context.js";
package/lib/services/prometheus.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import * as http from "http";
3
2
  import { Counter, Gauge, Histogram } from "prom-client";
4
3
  import { WebContext } from "../utils/context.js";
package/lib/services/prometheus.js CHANGED
@@ -98,9 +98,10 @@ export class PrometheusService extends Service {
98
98
  if (req.method === "GET" && req.url === this.parameters.url) {
99
99
  res.writeHead(200, { "Content-Type": register.contentType });
100
100
  res.write(await register.metrics());
101
- res.end();
102
101
  }
103
- res.writeHead(404);
102
+ else {
103
+ res.writeHead(404);
104
+ }
104
105
  res.end();
105
106
  })
106
107
  .listen(this.parameters.portNumber, this.parameters.bind));
package/lib/services/prometheus.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"prometheus.js","sourceRoot":"","sources":["../../src/services/prometheus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEzF,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAMvD,MAAM,OAAO,oBAAqB,SAAQ,iBAAiB;IAyCzD,YAAY,MAAW;QACrB,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,GAAG,KAAR,IAAI,CAAC,GAAG,GAAK,UAAU,EAAC;QACxB,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,EAAE,EAAC;QACnB,IAAI,CAAC,kBAAkB,KAAvB,IAAI,CAAC,kBAAkB,GAAK,IAAI,EAAC;QACjC,IAAI,CAAC,qBAAqB,KAA1B,IAAI,CAAC,qBAAqB,GAAK,IAAI,EAAC;QACpC,IAAI,CAAC,MAAM,KAAX,IAAI,CAAC,MAAM,GAAK,EAAE,EAAC;IACrB,CAAC;CACF;AAED;;;;;;;GAOG;AACH,MAAM,OAAO,iBAAyE,SAAQ,OAAU;IAuBtG;;;;OAIG;IACH,cAAc,CAAC,MAAW;QACxB,OAAO,IAAI,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,WAAW;QACT,IAAI,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;YAC1C,IAAI,CAAC,OAAO,GAAG;gBACb,kBAAkB,EACP,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,oBAAoB,CAAC;oBAChF,IAAI,OAAO,CAAC;wBACV,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,oBAAoB;wBACnD,IAAI,EAAE,aAAa;wBACnB,UAAU,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC;qBAChD,CAAC;gBACJ,sBAAsB,EACb,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,wBAAwB,CAAC;oBAClF,IAAI,KAAK,CAAC;wBACR,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,wBAAwB;wBACvD,IAAI,EAAE,WAAW;qBAClB,CAAC;gBACJ,kCAAkC,EACrB,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,oCAAoC,CAAC;oBAClG,IAAI,SAAS,CAAC;wBACZ,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,oCAAoC;wBACnE,UAAU,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC;wBAC/C,IAAI,EAAE,IAAI;qBACX,CAAC;gBACJ,kBAAkB,EACL,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,oBAAoB,CAAC;oBAClF,IAAI,SAAS,CAAC;wBACZ,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,oBAAoB;wBACnD,UAAU,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC;wBAC/C,IAAI,EAAE,GAAG;qBACV,CAAC;gBACJ,mBAAmB,EACN,QAAQ,CAAC,eAAe,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,qBAAqB,CAAC;oBACnF,IAAI,SAAS,CAAC;wBACZ,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,qBAAqB;wBACpD,UAAU,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,SAAS,CAAC;wBAC/C,IAAI,EAAE,GAAG;qBACV,CAAC;aACL,CAAC;QACJ,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,CAAC,kBAAkB,IAAI,CAAC,iBAAiB,CAAC,qBAAqB,EAAE,CAAC;YACnF,iBAAiB,CAAC,qBAAqB,GAAG,IAAI,CAAC;YAC/C,qBAAqB,CAAC;gBACpB,QAAQ;gBACR,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;gBAC9B,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,MAAM;aAC/B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;IACxB,CAAC;IAED;;;OAGG;IACH,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;YAChC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,UAAU,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,GAAG,CACN,MAAM,EACN,uCAAuC,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAClG,CAAC;YACF,IAAI,CAAC,IAAI,KAAT,IAAI,CAAC,IAAI,GAAK,IAAI;iBACf,YAAY,CAAC,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;gBAC/B,IAAI,GAAG,CAAC,MAAM,KAAK,KAAK,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;oBAC5D,GAAG,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,cAAc,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;oBAC7D,GAAG,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;oBACpC,GAAG,CAAC,GAAG,EAAE,CAAC;gBACZ,CAAC;gBACD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;gBACnB,GAAG,CAAC,GAAG,EAAE,CAAC;YACZ,CAAC,CAAC;iBACD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAC;QAC9D,CAAC;QACD,oDAAoD;QACpD,IAAI,IAAI,CAAC,UAAU,CAAC,qBAAqB,EAAE,CAAC;YAC1C,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBAClD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;oBACtE,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,EAAE,CAAC;gBAC1C,OAAO,CAAC,YAAY,CAAC,YAAY,EAAuB;oBACtD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,kCAAkC,CAAC,UAAU,EAAE;iBACpE,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;gBACjD,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE,KAAK,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;oBACtE,OAAO;gBACT,CAAC;gBACD,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC;gBAClD,MAAM,MAAM,GAAG;oBACb,OAAO,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,cAAc,EAAE;oBAClD,MAAM,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE;oBAC5C,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,GAAG,YAAY;iBAChB,CAAC;gBACF,OAAO;qBACJ,YAAY,CAAsB,YAAY,CAAC;qBAC/C,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC;gBACrE,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC/C,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,SAAS,EAAE,CAAC,EAAE,CAAC;oBAC5E,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,CACrC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,EAC1D,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,UAAU,EAAE,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,CAChF,CAAC;oBACF,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,CACtC,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,YAAY,EAC1D,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,IAAI,GAAG,CAAC,CACrE,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC;YAC3D,CAAC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY,CAAC,GAAe;QAChC,GAAG,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC;IACtC,CAAC;;AArKD;;GAEG;AACY,0CAAwB,GAAG,KAAK,CAAC;AAChD;;GAEG;AACY,uCAAqB,GAAG,KAAK,CAAC"}
1
+ {"version":3,"file":"prometheus.js","sourceRoot":"","sources":["../../src/services/prometheus.ts"],"names":[],"mappings":"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"}
package/lib/services/service.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { WorkerLogLevel } from "@webda/workout";
3
2
  import * as events from "events";
4
3
  import { Constructor, Core, Counter, Gauge, Histogram, Logger, MetricConfiguration, OperationContext } from "../index.js";
package/lib/stores/webdaql/query.d.ts CHANGED
@@ -278,6 +278,9 @@ export declare namespace WebdaQL {
278
278
  protected query: Query;
279
279
  protected builder: ExpressionBuilder;
280
280
  constructor(sql: string, builder?: ExpressionBuilder);
281
+ hasCondition(): boolean;
282
+ toString(): string;
283
+ merge(query: string, type?: "OR" | "AND"): this;
281
284
  /**
282
285
  * Get offset
283
286
  * @returns
package/lib/stores/webdaql/query.js CHANGED
@@ -10,26 +10,7 @@ import { OrderFieldExpressionContext, SubExpressionContext, WebdaQLParserParser
10
10
  export var WebdaQL;
11
11
  (function (WebdaQL) {
12
12
  function PrependCondition(query = "", condition) {
13
- if (!condition) {
14
- return query;
15
- }
16
- query = query.trim();
17
- // Find the right part of the query this regex will always be true as all part are optional
18
- const rightPart = query.match(/(?<order>ORDER BY ([a-zA-Z0-9\._]+( DESC| ASC)?,?)+ *)?(?<limit>LIMIT \d+ *)?(?<offset>OFFSET ["']\w+["'] *)?$/);
19
- // Remove it if found
20
- query = query.substring(0, query.length - rightPart[0].length).trim();
21
- // Add the condition to the query now
22
- if (!query) {
23
- query = condition;
24
- }
25
- else {
26
- query = `(${condition}) AND (${query})`;
27
- }
28
- // Re-add the right part
29
- if (rightPart[0].length) {
30
- query += " " + rightPart[0];
31
- }
32
- return query;
13
+ return new QueryValidator(query).merge(condition).toString();
33
14
  }
34
15
  WebdaQL.PrependCondition = PrependCondition;
35
16
  /**
@@ -472,6 +453,60 @@ export var WebdaQL;
472
453
  this.builder = builder;
473
454
  this.query = this.builder.visit(this.tree);
474
455
  }
456
+ hasCondition() {
457
+ const filter = this.query.filter;
458
+ const isAnd = filter instanceof AndExpression;
459
+ if (isAnd) {
460
+ return filter.children.length > 0;
461
+ }
462
+ return true;
463
+ }
464
+ toString() {
465
+ let res = this.query.filter.toString();
466
+ if (this.query.orderBy) {
467
+ res += ` ORDER BY ${this.query.orderBy.map(o => `${o.field} ${o.direction}`).join(", ")}`;
468
+ }
469
+ if (this.query.limit) {
470
+ res += ` LIMIT ${this.query.limit}`;
471
+ }
472
+ if (this.query.continuationToken) {
473
+ res += ` OFFSET "${this.query.continuationToken}"`;
474
+ }
475
+ return res.trim();
476
+ }
477
+ merge(query, type = "AND") {
478
+ var _a;
479
+ const adds = new QueryValidator(query);
480
+ // Add additional conditions
481
+ if (adds.hasCondition()) {
482
+ if ((this.query.filter instanceof AndExpression && type === "AND") ||
483
+ (this.query.filter instanceof OrExpression && type === "OR")) {
484
+ this.query.filter.children.push(adds.query.filter);
485
+ }
486
+ else {
487
+ this.query.filter = new (type === "AND" ? AndExpression : OrExpression)([
488
+ this.query.filter,
489
+ adds.query.filter
490
+ ]);
491
+ }
492
+ }
493
+ // Set the limit if overriden
494
+ if (adds.query.limit) {
495
+ this.query.limit = adds.query.limit;
496
+ }
497
+ // Set the offset if overriden
498
+ if (adds.query.continuationToken) {
499
+ this.query.continuationToken = adds.query.continuationToken;
500
+ }
501
+ // Add the order by if overriden
502
+ if (adds.query.orderBy) {
503
+ const fields = adds.query.orderBy.map(o => o.field);
504
+ (_a = this.query).orderBy ?? (_a.orderBy = []);
505
+ // Remove the fields that are already in the query
506
+ this.query.orderBy = [...adds.query.orderBy, ...this.query.orderBy.filter(o => !fields.includes(o.field))];
507
+ }
508
+ return this;
509
+ }
475
510
  /**
476
511
  * Get offset
477
512
  * @returns
package/lib/stores/webdaql/query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAA2C,MAAM,UAAU,CAAC;AACnG,OAAO,EAAE,wBAAwB,EAAa,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAYL,2BAA2B,EAG3B,oBAAoB,EACpB,mBAAmB,EAEpB,MAAM,uBAAuB,CAAC;AAK/B;;;;GAIG;AACH,MAAM,KAAW,OAAO,CAoxBvB;AApxBD,WAAiB,OAAO;IAMtB,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,EAAE,SAAkB;QACrE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;QACD,KAAK,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;QACrB,2FAA2F;QAC3F,MAAM,SAAS,GAAG,KAAK,CAAC,KAAK,CAC3B,gHAAgH,CACjH,CAAC;QACF,qBAAqB;QACrB,KAAK,GAAG,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;QACtE,qCAAqC;QACrC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,SAAS,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,IAAI,SAAS,UAAU,KAAK,GAAG,CAAC;QAC1C,CAAC;QACD,wBAAwB;QACxB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;YACxB,KAAK,IAAI,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAtBe,wBAAgB,mBAsB/B,CAAA;IACD;;;;OAIG;IACH,MAAa,iBAAkB,SAAQ,wBAA+B;QAWpE;;;WAGG;QACO,aAAa;YACrB,2BAA2B;YAC3B,OAAO;gBACL,MAAM,EAAE,IAAI,aAAa,CAAC,EAAE,CAAC;aAC9B,CAAC;QACJ,CAAC;QAED;;;WAGG;QACH,SAAS;YACP,OAAO,IAAI,CAAC,MAAM,CAAC;QACrB,CAAC;QAED;;;WAGG;QACH,QAAQ;YACN,OAAO,IAAI,CAAC,KAAK,CAAC;QACpB,CAAC;QAED;;;WAGG;QACH,oBAAoB,CAAC,GAA2B;YAC9C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,mBAAmB,CAAwB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC;QAED;;;WAGG;QACH,qBAAqB,CAAC,GAA4B;YAChD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAuB,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/E,CAAC;QAED;;WAEG;QACH,yBAAyB,CAAC,GAAgC;YACxD,OAAO;gBACL,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI;gBAC3B,SAAS,EAAE,GAAG,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,CAAM,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;aAClE,CAAC;QACJ,CAAC;QAED;;WAEG;QACH,oBAAoB,CAAC,GAA2B;YAC9C,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC,QAAQ;gBACzB,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,YAAY,2BAA2B,CAAC;iBACtD,GAAG,CAAC,CAAC,CAA8B,EAAE,EAAE,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC,CAAC;QAChF,CAAC;QAED;;;;WAIG;QACH,YAAY,CAAC,GAAmB;YAC9B,IAAI,GAAG,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;gBACzB,2BAA2B;gBAC3B,OAAO;oBACL,MAAM,EAAE,IAAI,aAAa,CAAC,EAAE,CAAC;iBAC9B,CAAC;YACJ,CAAC;YAED,yCAAyC;YACzC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5C,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9B,CAAC;YACD,sEAAsE;YACtE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,oBAAoB,EAAE,CAAC;gBACpD,OAAO;oBACL,MAAM,EAAwB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,IAAI,IAAI,aAAa,CAAC,EAAE,CAAC;oBAC/F,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,iBAAiB,EAAE,IAAI,CAAC,MAAM;oBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;iBACtB,CAAC;YACJ,CAAC;YACD,+EAA+E;YAC/E,OAAO;gBACL,MAAM,EAAwB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAE,IAAI,IAAI,aAAa,CAAC,EAAE,CAAC;gBACnF,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,iBAAiB,EAAE,IAAI,CAAC,MAAM;gBAC9B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC;QACJ,CAAC;QAED;;;;WAIG;QACH,aAAa,CAAC,GAAyD;YACrE,MAAM,GAAG,GAAG,EAAE,CAAC;YACf,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACpC,IAAI,KAAK,YAAY,oBAAoB,EAAE,CAAC;gBAC1C,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC5B,CAAC;YACD,IAAI,IAAI,YAAY,oBAAoB,EAAE,CAAC;gBACzC,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;YACD,IAAI,IAAI,YAAY,GAAG,CAAC,WAAW,EAAE,CAAC;gBACpC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAiE,IAAK,CAAC,CAAC,CAAC;YACzG,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjB,CAAC;YACD,IAAI,KAAK,YAAY,GAAG,CAAC,WAAW,EAAE,CAAC;gBACrC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAiE,KAAM,CAAC,CAAC,CAAC;YAC1G,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAClB,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED;;;;;WAKG;QACH,uBAAuB,CAAC,GAA8B;YACpD,OAAO,IAAI,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAuB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;QACnG,CAAC;QAED;;WAEG;QACH,+BAA+B,CAAC,GAAsC;YACpE,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACvC,aAAa;YACb,OAAO,IAAI,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACzE,CAAC;QAED;;WAEG;QACH,kBAAkB,CAAC,GAAyB;YAC1C,OAA0B,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAE,CAAC;QAC7F,CAAC;QAED;;;;WAIG;QACH,mBAAmB,CAAC,GAA0B;YAC5C,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,KAAK,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;YAChD,OAAO,IAAI,oBAAoB,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC5D,CAAC;QAED;;WAEG;QACH,iBAAiB,CAAC,GAAwB;YACxC,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,KAAK,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;YAChD,OAAO,IAAI,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC1D,CAAC;QAED;;WAEG;QACH,uBAAuB,CAAC,GAA8B;YACpD,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,KAAK,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;YAChD,OAAO,IAAI,oBAAoB,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAChE,CAAC;QAED;;;;;WAKG;QACH,sBAAsB,CAAC,GAA6B;YAClD,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAuB,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAC;QAClG,CAAC;QAED;;WAEG;QACH,kBAAkB,CAAC,GAAyB;YAC1C,OAAO,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QACpD,CAAC;QAED;;WAEG;QACH,mBAAmB,CAAC,GAA0B;YAC5C,OAAO,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC;QAC7B,CAAC;QAED;;WAEG;QACH,mBAAmB,CAAC,GAA0B;YAC5C,OAAO,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;KACF;IA5NY,yBAAiB,oBA4N7B,CAAA;IA4BD;;OAEG;IACH,MAAsB,UAAU;QAG9B,YAAY,QAAW;YACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC;KAYF;IAjBqB,kBAAU,aAiB/B,CAAA;IAGD;;OAEG;IACH,MAAa,oBAAwE,SAAQ,UAAa;QASxG;;;;;WAKG;QACH,YAAY,QAAW,EAAE,SAAiB,EAAE,KAAoB;YAC9D,KAAK,CAAC,QAAQ,CAAC,CAAC;YAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACxC,CAAC;QAED,MAAM,CAAC,WAAW,CAAC,IAAY;YAC7B,OAAO,IAAI,MAAM,CACf,IAAI;gBACF,8BAA8B;iBAC7B,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;iBACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;iBACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;iBACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;gBACtB,wCAAwC;iBACvC,OAAO,CAAC,WAAW,EAAE,QAAQ,CAAC;iBAC9B,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC;iBACtB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;iBACpB,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;iBAC5B,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC;iBACpB,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;gBACrB,2BAA2B;iBAC1B,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,CACnC,CAAC;QACJ,CAAC;QAED;;;;;WAKG;QACH,MAAM,CAAC,iBAAiB,CAAC,MAAW,EAAE,SAAmB;YACvD,IAAI,GAAG,GAAG,MAAM,CAAC;YACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;YAC1B,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;QAED;;;;;WAKG;QACH,iBAAiB,CAAC,MAAW;;YAC3B,oDAAoD;YACpD,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBACzC,OAAO;YACT,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;gBAC1B,IAAI,GAAG,GAAG,MAAM,CAAC;gBACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC1D,GAAG,MAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAArB,GAAG,OAAwB,EAAE,EAAC;oBAC9B,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;YAC9D,CAAC;QACH,CAAC;QACD;;WAEG;QACH,IAAI,CAAC,MAAW;YACd,MAAM,IAAI,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;YAC5E,QAAQ,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACtB,KAAK,GAAG;oBACN,gCAAgC;oBAChC,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC;gBAC5B,KAAK,IAAI;oBACP,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC;gBAC5B,KAAK,IAAI;oBACP,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC;gBAC5B,KAAK,GAAG;oBACN,OAAO,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC3B,KAAK,GAAG;oBACN,OAAO,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;gBAC3B,KAAK,IAAI;oBACP,OAAO,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC;gBAC5B,KAAK,MAAM;oBACT,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC7B,yCAAyC;wBACzC,OAAO,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,WAAW,CAAS,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC;oBACnF,CAAC;oBACD,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,WAAW,CAAS,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,IAAI,CAAC;gBAC9F,KAAK,IAAI;oBACP,OAAiB,IAAI,CAAC,KAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC9C,KAAK,UAAU;oBACb,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;wBACxB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnC,CAAC;oBACD,OAAO,KAAK,CAAC;YACjB,CAAC;QACH,CAAC;QAED;;WAEG;QACH,aAAa,CAAC,KAAsB;YAClC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;YACjE,CAAC;YACD,QAAQ,OAAO,KAAK,EAAE,CAAC;gBACrB,KAAK,QAAQ;oBACX,OAAO,IAAI,KAAK,GAAG,CAAC;gBACtB,KAAK,SAAS;oBACZ,OAAO,KAAK,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,CAAC;YAC1C,CAAC;YACD,OAAO,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC3B,CAAC;QAED;;WAEG;QACH,iBAAiB;YACf,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClC,CAAC;QAED;;WAEG;QACH,gBAAgB;YACd,OAAO,IAAI,CAAC,QAAQ,CAAC;QACvB,CAAC;QAED;;WAEG;QACH,QAAQ;YACN,OAAO,GAAG,IAAI,CAAC,iBAAiB,EAAE,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACpG,CAAC;KACF;IAlJY,4BAAoB,uBAkJhC,CAAA;IAED;;;;OAIG;IACH,MAAsB,iBAAqB,SAAQ,UAAa;QAK9D;;;;WAIG;QACH,YAAY,QAAW,EAAE,QAAsB;YAC7C,KAAK,CAAC,QAAQ,CAAC,CAAC;YAVlB;;eAEG;YACH,aAAQ,GAAiB,EAAE,CAAC;YAQ1B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC;QAED;;WAEG;QACH,QAAQ,CAAC,QAAgB,CAAC;YACxB,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC;YAChG,CAAC;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAClF,CAAC;KACF;IAxBqB,yBAAiB,oBAwBtC,CAAA;IAED;;OAEG;IACH,MAAa,aAAc,SAAQ,iBAAwB;QACzD;;WAEG;QACH,YAAY,QAAsB;YAChC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACzB,CAAC;QAED;;WAEG;QACH,IAAI,CAAC,MAAW;YACd,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBACxB,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;KACF;IAnBY,qBAAa,gBAmBzB,CAAA;IAED;;OAEG;IACH,MAAa,YAAa,SAAQ,iBAAuB;QACvD;;WAEG;QACH,YAAY,QAAsB;YAChC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QACxB,CAAC;QAED;;WAEG;QACH,IAAI,CAAC,MAAW;YACd,KAAK,IAAI,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;oBACvB,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,CAAC;QACpC,CAAC;KACF;IAnBY,oBAAY,eAmBxB,CAAA;IAED;;OAEG;IACH,MAAa,cAAc;QAMzB,YACY,GAAW,EACrB,UAA6B,IAAI,iBAAiB,EAAE;YAD1C,QAAG,GAAH,GAAG,CAAQ;YAGrB,IAAI,CAAC,KAAK,GAAG,IAAI,YAAY,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC;YACjE,IAAI,WAAW,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,MAAM,GAAG,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC;YAClD,MAAM,CAAC,oBAAoB,EAAE,CAAC;YAC9B,MAAM,CAAC,gBAAgB,CAAC;gBACtB,WAAW,EAAE,CACX,WAAmC,EACnC,gBAAuB,EACvB,KAAa,EACb,mBAA2B,EAC3B,GAAW,EACX,EAAwB,EACxB,EAAE;oBACF,MAAM,IAAI,WAAW,CAAC,GAAG,GAAG,YAAY,GAAG,GAAG,CAAC,CAAC;gBAClD,CAAC;aACF,CAAC,CAAC;YACH,+EAA+E;YAC/E,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;YACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC;QAED;;;WAGG;QACH,SAAS;YACP,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC;QACxC,CAAC;QAED;;;WAGG;QACH,QAAQ;YACN,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC;QACzC,CAAC;QAED;;;WAGG;QACH,aAAa;YACX,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;QAC3B,CAAC;QAED;;;WAGG;QACH,QAAQ;YACN,OAAO;gBACL,GAAG,IAAI,CAAC,KAAK;gBACb,mDAAmD;gBACnD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;aACnC,CAAC;QACJ,CAAC;QAED;;;;WAIG;QACH,IAAI,CAAC,MAAW;YACd,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAED;;;;WAIG;QACH,WAAW,CAAC,OAAkB,IAAI,CAAC,IAAI;YACrC,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,KAAK,YAAY,YAAY,EAAE,CAAC;oBAClC,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;wBAC3B,SAAS;oBACX,CAAC;oBACD,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC;gBAC9C,CAAC;YACH,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC;KACF;IAjGY,sBAAc,iBAiG1B,CAAA;IAED;;OAEG;IACH,MAAa,eAAgB,SAAQ,cAAc;QACjD,YAAY,GAAW;YACrB,KAAK,CAAC,GAAG,CAAC,CAAC;YACX,iEAAiE;YACjE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,MAAW;YACd,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACzC,CAAC;YACD,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,MAAW,EAAE,UAAsB;YACxC,IAAI,UAAU,YAAY,aAAa,EAAE,CAAC;gBACxC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;YAC3D,CAAC;iBAAM,IAAI,UAAU,YAAY,oBAAoB,IAA2B,UAAW,CAAC,QAAQ,KAAK,GAAG,EAAE,CAAC;gBAC7G,UAAU,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACvC,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,WAAW,CAAC,mEAAmE,CAAC,CAAC;YAC7F,CAAC;QACH,CAAC;KACF;IAvBY,uBAAe,kBAuB3B,CAAA;IAED,MAAa,gBAAiB,SAAQ,cAAc;QAGlD,YAAY,KAAa,EAAE,UAAoC,IAAI,wBAAwB,EAAE;YAC3F,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QACxB,CAAC;QAED;;;;;WAKG;QACH,IAAI,CAAC,MAAW,EAAE,UAAmB,IAAI;YACvC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACjC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,CAAC;QAED;;;WAGG;QACH,eAAe;YACb,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC;QACnC,CAAC;KACF;IA1BY,wBAAgB,mBA0B5B,CAAA;IAED,MAAa,2BAEX,SAAQ,oBAAuB;QAC/B,YACY,OAAiC,EAC3C,EAAK,EACL,SAAiB,EACjB,KAAU;YAEV,KAAK,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;YALlB,YAAO,GAAP,OAAO,CAA0B;QAM7C,CAAC;QAED;;;;;;WAMG;QACH,IAAI,CAAC,MAAW;YACd,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;gBACzB,MAAM,IAAI,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC5E,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;oBACnC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YACD,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC5B,CAAC;KACF;IA7BY,mCAA2B,8BA6BvC,CAAA;IAED,MAAa,wBAAyB,SAAQ,iBAAiB;QAU7D,UAAU,CAAC,OAAgB;YACzB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,CAAC;QAED,eAAe,CAAC,OAAgB;YAC9B,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC9B,CAAC;QACD;;;;WAIG;QACH,mBAAmB,CAAC,GAAQ;YAC1B,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,KAAK,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;YAChD,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACzE,CAAC;QAED;;WAEG;QACH,+BAA+B,CAAC,GAAQ;YACtC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACvC,aAAa;YACb,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACtF,CAAC;QAED;;WAEG;QACH,iBAAiB,CAAC,GAAQ;YACxB,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,KAAK,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;YAChD,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACvE,CAAC;QAED;;WAEG;QACH,uBAAuB,CAAC,GAAQ;YAC9B,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,QAAQ,CAAC;YACtC,IAAI,KAAK,GAAoB,IAAI,CAAC,KAAK,CAAC,KAAK,CAAE,CAAC;YAChD,OAAO,IAAI,2BAA2B,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7E,CAAC;KACF;IAtDY,gCAAwB,2BAsDpC,CAAA;IAED;;;;OAIG;IACH,SAAgB,UAAU,CAAC,KAAa;QACtC,OAAO,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC3D,CAAC;IAFe,kBAAU,aAEzB,CAAA;AACH,CAAC,EApxBgB,OAAO,KAAP,OAAO,QAoxBvB"}
1
+ {"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.ts"],"names":[],"mappings":"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"}
package/lib/stores/webdaql/query.spec.js CHANGED
@@ -73,25 +73,32 @@ let QueryTest = class QueryTest {
73
73
  }
74
74
  }
75
75
  prependQuery() {
76
- const check = (query, condition, expected) => {
77
- assert.strictEqual(WebdaQL.PrependCondition(query, condition), expected);
78
- // Ensure it is a valid query
79
- new WebdaQL.QueryValidator(query);
80
- new WebdaQL.QueryValidator(expected);
81
- console.log("QUERY", query, "CONDITION", condition, "EXPECTED", expected);
76
+ // merge method is tested through the prependQuery helper
77
+ const strictEqual = (arg1, arg2) => {
78
+ // Ensure it is parsable
79
+ new WebdaQL.QueryValidator(arg1);
80
+ assert.deepStrictEqual(arg1, arg2);
82
81
  };
83
- check("", "test='plop'", "test='plop'");
84
- check("test='plop'", "", "test='plop'");
85
- check("test='plip'", "test='plop'", "(test='plop') AND (test='plip')");
86
- check("ORDER BY test", "test='plop'", "test='plop' ORDER BY test");
87
- check("ORDER BY test LIMIT 100", "test='plop'", "test='plop' ORDER BY test LIMIT 100");
88
- check("ORDER BY test DESC LIMIT 100", "test='plop'", "test='plop' ORDER BY test DESC LIMIT 100");
89
- check("test='plip' ORDER BY test ASC LIMIT 100", "test='plop'", "(test='plop') AND (test='plip') ORDER BY test ASC LIMIT 100");
90
- check("test='plip' LIMIT 100", "test='plop'", "(test='plop') AND (test='plip') LIMIT 100");
91
- check("test='plip' LIMIT 100 OFFSET 'test'", "test='plop'", "(test='plop') AND (test='plip') LIMIT 100 OFFSET 'test'");
92
- check("test='plip' OFFSET 'test'", "test='plop'", "(test='plop') AND (test='plip') OFFSET 'test'");
93
- check("test='ORDER BY plop' OFFSET 'test'", "test='plop'", "(test='plop') AND (test='ORDER BY plop') OFFSET 'test'");
94
- check('test="ORDER BY plop" LIMIT 100', "test='plop'", "(test='plop') AND (test=\"ORDER BY plop\") LIMIT 100");
82
+ strictEqual(WebdaQL.PrependCondition("", "test='plop'"), 'test = "plop"');
83
+ strictEqual(WebdaQL.PrependCondition("test='plop'", ""), 'test = "plop"');
84
+ strictEqual(WebdaQL.PrependCondition("test='plip'", "test='plop'"), 'test = "plip" AND test = "plop"');
85
+ strictEqual(WebdaQL.PrependCondition("ORDER BY test", "test='plop'"), 'test = "plop" ORDER BY test ASC');
86
+ strictEqual(WebdaQL.PrependCondition("ORDER BY test LIMIT 100", "test='plop'"), 'test = "plop" ORDER BY test ASC LIMIT 100');
87
+ strictEqual(WebdaQL.PrependCondition("ORDER BY test DESC LIMIT 100", "test='plop'"), 'test = "plop" ORDER BY test DESC LIMIT 100');
88
+ strictEqual(WebdaQL.PrependCondition("test='plip' ORDER BY test ASC LIMIT 100", "test='plop'"), 'test = "plip" AND test = "plop" ORDER BY test ASC LIMIT 100');
89
+ strictEqual(WebdaQL.PrependCondition("test='plip' LIMIT 100", "test='plop'"), 'test = "plip" AND test = "plop" LIMIT 100');
90
+ strictEqual(WebdaQL.PrependCondition("test='plip' OFFSET 'test'", "test='plop'"), 'test = "plip" AND test = "plop" OFFSET "test"');
91
+ strictEqual(WebdaQL.PrependCondition("test='ORDER BY plop' OFFSET 'test'", "test='plop'"), 'test = "ORDER BY plop" AND test = "plop" OFFSET "test"');
92
+ strictEqual(WebdaQL.PrependCondition('test="ORDER BY plop" LIMIT 100', "test='plop'"), 'test = "ORDER BY plop" AND test = "plop" LIMIT 100');
93
+ // Composed ORDER BY
94
+ strictEqual(WebdaQL.PrependCondition('test="plop" ORDER BY ab ASC LIMIT 100', "ORDER BY forced DESC"), 'test = "plop" ORDER BY forced DESC, ab ASC LIMIT 100');
95
+ // Opposite ORDER BY
96
+ strictEqual(WebdaQL.PrependCondition('test="plop" ORDER BY forced ASC LIMIT 100', "ORDER BY forced DESC"), 'test = "plop" ORDER BY forced DESC LIMIT 100');
97
+ // Overwrite LIMIT
98
+ strictEqual(WebdaQL.PrependCondition('test="plop" ORDER BY forced ASC LIMIT 100', "LIMIT 5"), 'test = "plop" ORDER BY forced ASC LIMIT 5');
99
+ // Overwrite OFFSET
100
+ strictEqual(WebdaQL.PrependCondition('OFFSET "test"', "OFFSET 'plop'"), 'OFFSET "plop"');
101
+ strictEqual(WebdaQL.PrependCondition('plop = "ok"', "OFFSET 'plop'"), 'plop = "ok" OFFSET "plop"');
95
102
  }
96
103
  likeRegexp() {
97
104
  assert.deepStrictEqual(WebdaQL.ComparisonExpression.likeToRegex("test"), /test/);
package/lib/stores/webdaql/query.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"query.spec.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"query.spec.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.spec.ts"],"names":[],"mappings":"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"}
package/lib/utils/context.d.ts CHANGED
@@ -1,7 +1,3 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
- /// <reference types="node" />
4
- /// <reference types="node" />
5
1
  import { WorkerLogLevel } from "@webda/workout";
6
2
  import { EventEmitter } from "events";
7
3
  import * as http from "http";
package/lib/utils/httpcontext.d.ts CHANGED
@@ -1,6 +1,3 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
- /// <reference types="node" />
4
1
  import { IncomingHttpHeaders } from "http";
5
2
  import { Readable } from "stream";
6
3
  export type HttpMethodType = "GET" | "OPTIONS" | "POST" | "PUT" | "PATCH" | "DELETE";
package/lib/utils/httpcontext.spec.d.ts CHANGED
@@ -1,4 +1,3 @@
1
- /// <reference types="node" />
2
1
  import { Readable } from "stream";
3
2
  export declare class FakeReadable extends Readable {
4
3
  _read(): void;
package/lib/utils/serializers.d.ts CHANGED
@@ -1,6 +1,3 @@
1
- /// <reference types="node" />
2
- /// <reference types="node" />
3
- /// <reference types="node" />
4
1
  import { Readable, Transform, TransformCallback, Writable } from "stream";
5
2
  type WalkerOptionsType = {
6
3
  followSymlinks?: boolean;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webda/core",
3
- "version": "3.15.1",
3
+ "version": "3.16.1",
4
4
  "description": "Expose API with Lambda",
5
5
  "keywords": [
6
6
  "aws",
@@ -19,8 +19,8 @@
19
19
  "pretest": "npm run build",
20
20
  "lint": "prettier --check src/**/*",
21
21
  "lint:fix": "prettier --write src/**/*",
22
- "test": "NODE_OPTIONS='--experimental-loader ./hooks.mjs' c8 mocha --recursive --exit --timeout=30000 'src/**/*.spec.ts'",
23
- "test:debug": "mocha --recursive --exit --no-timeouts 'src/**/*.spec.ts'"
22
+ "test": "NODE_OPTIONS='--experimental-loader ./hooks.mjs' c8 mocha",
23
+ "test:debug": "mocha --no-timeouts"
24
24
  },
25
25
  "dependencies": {
26
26
  "@types/json-schema": "^7.0.8",
@@ -54,7 +54,7 @@
54
54
  "stream-buffers": "^3.0.2",
55
55
  "ts-method-cache": "^3.3.1",
56
56
  "uri-templates": "^0.2.0",
57
- "uuid": "^9.0.0",
57
+ "uuid": "^10.0.0",
58
58
  "yaml": "^2.0.0"
59
59
  },
60
60
  "devDependencies": {
@@ -65,14 +65,14 @@
65
65
  "@webda/tsc-esm": "^1.3.0",
66
66
  "antlr4ts-cli": "^0.5.0-alpha.4",
67
67
  "axios": "^1.1.3",
68
- "c8": "^9.0.0",
68
+ "c8": "^10.1.2",
69
69
  "fs-extra": "^11.0.0",
70
70
  "mocha": "^10.0.0",
71
71
  "prettier": "^3.0.0",
72
72
  "sinon": "^18.0.0",
73
73
  "source-map-support": "^0.5.19",
74
74
  "ts-node": "^10.1.0",
75
- "typescript": "~5.4.5",
75
+ "typescript": "~5.5.3",
76
76
  "ws": "^8.13.0"
77
77
  },
78
78
  "files": [
@@ -112,6 +112,5 @@
112
112
  "type": "module",
113
113
  "engines": {
114
114
  "node": ">=18.0.0"
115
- },
116
- "gitHead": "1ebcfa79aae5a5200323a2e60efb6b1f79c34e17"
115
+ }
117
116
  }