@webda/core 3.16.0 → 3.16.1

package/CHANGELOG.md

@@ -0,0 +1,384 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+## [3.16.0](https://github.com/loopingz/webda.io/compare/core-v3.15.1...core-v3.16.0) (2024-07-16)
+
+
+### Features
+
+* **cloudevents:** add module ([562f4a9](https://github.com/loopingz/webda.io/commit/562f4a929e6cb3931a07d9db23d3e1b596272d16))
+
+
+### Bug Fixes
+
+* **core:** filequeue node 22 lock ([266eb8a](https://github.com/loopingz/webda.io/commit/266eb8a197f660f16026f69591e19e2a5b2a0856))
+
+## [3.15.1](https://github.com/loopingz/webda.io/compare/core-v3.15.0...core-v3.15.1) (2024-05-19)
+
+
+### Bug Fixes
+
+* update in otel and json-schema-generator ([c1d9866](https://github.com/loopingz/webda.io/commit/c1d9866ffc6717b622c4e4d72682ef91dc187a12))
+
+## [3.15.0](https://github.com/loopingz/webda.io/compare/core-v3.14.0...core-v3.15.0) (2024-04-12)
+
+
+### Features
+
+* update store to model ([#577](https://github.com/loopingz/webda.io/issues/577)) ([018d096](https://github.com/loopingz/webda.io/commit/018d0969ce83b9a1e8346a9ef5df9857573adb3e))
+* update to latest otel ([db00927](https://github.com/loopingz/webda.io/commit/db00927fa3bc442b21aac2a970b0da33b6c845b6))
+
+
+### Bug Fixes
+
+* WebdaQL prepend with limit and offset ([55cb37a](https://github.com/loopingz/webda.io/commit/55cb37a233fa582c24a53171ce9a035480defe8e))
+
+
+### Dependencies
+
+* The following workspace dependencies were updated
+  * dependencies
+    * @webda/workout bumped from ^3.1.3 to ^3.2.0
+
+## [3.14.0](https://github.com/loopingz/webda.io/compare/core-v3.13.2...core-v3.14.0) (2024-02-04)
+
+
+### Features
+
+* **postgres:** add option to create views for each models ([1830dc4](https://github.com/loopingz/webda.io/commit/1830dc43e76626ca8832b83548034acbff79e73b))
+
+
+### Bug Fixes
+
+* **core:** plurals with s ending name ([b643003](https://github.com/loopingz/webda.io/commit/b64300360bbe07adf65203997ce86d6bc38279cf))
+
+## [3.13.2](https://github.com/loopingz/webda.io/compare/core-v3.13.1...core-v3.13.2) (2024-01-22)
+
+### Bug Fixes
+
+- numeric equals on postgres ([75f5e36](https://github.com/loopingz/webda.io/commit/75f5e36e1517a29f99c99e7e4af0e4d5da9ba8bd))
+
+## [3.13.1](https://github.com/loopingz/webda.io/compare/core-v3.13.0...core-v3.13.1) (2024-01-16)
+
+### Bug Fixes
+
+- registerInteruptableProcess before Core.get() exists ([0b9cbcb](https://github.com/loopingz/webda.io/commit/0b9cbcb87ab03316ad78c3ef3be89baaae4d92f7))
+
+## [3.13.0](https://github.com/loopingz/webda.io/compare/core-v3.12.0...core-v3.13.0) (2024-01-16)
+
+### Features
+
+- add service client event option ([cf68e7f](https://github.com/loopingz/webda.io/commit/cf68e7fa59ec26fc4e49ff593a6de4f53ea029c4))
+
+### Bug Fixes
+
+- clean cancel on SIGINT ([90c8627](https://github.com/loopingz/webda.io/commit/90c862701bc2e17ff2f513c0a0e98af5aa8fc883))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.1.2 to ^3.1.3
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.2.0 to ^1.3.0
+
+## [3.12.0](https://github.com/loopingz/webda.io/compare/core-v3.11.2...core-v3.12.0) (2024-01-09)
+
+### Features
+
+- add a PartialValidator for query ([1ef8dea](https://github.com/loopingz/webda.io/commit/1ef8dea2b6e96ee007ed278267e21d3e9e0ff41a))
+- add Aggregation for subscriptions and event listener subscriptions ([8bca3ce](https://github.com/loopingz/webda.io/commit/8bca3cebd45e3d91355bf3d862abab93d3be14b4))
+- add encrypter and configuration encryption ([b53611c](https://github.com/loopingz/webda.io/commit/b53611cf9c18838b250e732a14a77224abca484d))
+- add metrics to pubsub and update store for cache update ([5c6e196](https://github.com/loopingz/webda.io/commit/5c6e19619e00478baa332d8db1496ad0b8eb0cf9))
+- add mutations on graphql ([fa3d647](https://github.com/loopingz/webda.io/commit/fa3d647eea8883ecf20bfd4d947f3f99ad05a0f3))
+- add subscription system ([b4f625c](https://github.com/loopingz/webda.io/commit/b4f625c44a306f57c7cc44b3aae805b1e6537c52))
+- make CoreModel class fully compatible with EventEmitter ([76c3b9b](https://github.com/loopingz/webda.io/commit/76c3b9b16a855a15008e9afe1ff0b8c7ea47ebb3))
+- move ProxyService to runtime ([#342](https://github.com/loopingz/webda.io/issues/342)) ([a95a797](https://github.com/loopingz/webda.io/commit/a95a7977ed4e35b0f475fd3cb0648ae5a0c5cc75))
+- move some services from @webda/core to @webda/runtime ([#342](https://github.com/loopingz/webda.io/issues/342)) ([bf78ca9](https://github.com/loopingz/webda.io/commit/bf78ca90aadce5b92bc90986beeae3d6543631da))
+- use MemoryStore cache by default on all store ([85c9288](https://github.com/loopingz/webda.io/commit/85c92884736e5955ed749ca61361eb8e3f1b6bfc))
+
+### Bug Fixes
+
+- > < characters in query were sanitized ([ea19364](https://github.com/loopingz/webda.io/commit/ea193646b7603ec786413ccd74316127f2badc84))
+- append condition to query ([4c0e3fc](https://github.com/loopingz/webda.io/commit/4c0e3fc08a779c1b4c72ffa8472595cc35f85b6b))
+- ASC/DESC in ORDER BY query with prepended condition ([1903a12](https://github.com/loopingz/webda.io/commit/1903a126688615efb7f7ea3c66342827116e2267))
+- cache sync ([0475815](https://github.com/loopingz/webda.io/commit/047581528891dbb35f9904bad367e5e4d6e3a116))
+- dynamodb scan query splice bad result ([5c3d657](https://github.com/loopingz/webda.io/commit/5c3d6575191d481dedd2365407eb6fc47f223bd5))
+- getMetrics ensure service name is included ([00881b7](https://github.com/loopingz/webda.io/commit/00881b7f08da6cabce4f617cf9a692db6a230af8))
+- NotEnumerable properties should not be in schema ([cb9e4ac](https://github.com/loopingz/webda.io/commit/cb9e4ace3053750e9ab3bfe5443d2cde577d6676))
+- **test:** store metric now have the service name ([12baed4](https://github.com/loopingz/webda.io/commit/12baed4a8525278f401299989111fec552f2363a))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.1.1 to ^3.1.2
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.1.1 to ^1.2.0
+
+## [3.11.2](https://github.com/loopingz/webda.io/compare/core-v3.11.1...core-v3.11.2) (2023-12-05)
+
+### Bug Fixes
+
+- Action override in subclass ([113f5a6](https://github.com/loopingz/webda.io/commit/113f5a60907f3e6dcea31bf82e0f476fe3b2d085))
+- named action execution ([931f4b2](https://github.com/loopingz/webda.io/commit/931f4b2e3362d947fa0ec379a4331b13be2a6db2))
+
+## [3.11.1](https://github.com/loopingz/webda.io/compare/core-v3.11.0...core-v3.11.1) (2023-12-04)
+
+### Bug Fixes
+
+- allow Binaries to define metadata and metadata schema ([2001b1e](https://github.com/loopingz/webda.io/commit/2001b1e9a43b415a25e9e7726e94d351d1749e51))
+- FileUtils.walk wrong depth limit ([9e6ce51](https://github.com/loopingz/webda.io/commit/9e6ce5181b0cd2533077253966ed80d6363d91ba))
+
+## [3.11.0](https://github.com/loopingz/webda.io/compare/core-v3.10.0...core-v3.11.0) (2023-11-30)
+
+### Features
+
+- add ndjson streams and stream persistence for big MemoryStore ([d283948](https://github.com/loopingz/webda.io/commit/d2839481c4b8b28bf7c0f758a1ca2515517d960a))
+
+### Bug Fixes
+
+- **tsc-esm:** node module import rewrite .js ([e4a15ae](https://github.com/loopingz/webda.io/commit/e4a15ae90a761620520cb890fa5a9121415c453b))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.1.0 to ^3.1.1
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.1.0 to ^1.1.1
+
+## [3.10.0](https://github.com/loopingz/webda.io/compare/core-v3.9.1...core-v3.10.0) (2023-11-29)
+
+### Features
+
+- add a setModelStore to force model store ([5354f46](https://github.com/loopingz/webda.io/commit/5354f4686fd93f3e573d7b6209f3b38ffce06073))
+- add action input validation and openapi definition ([fc0e28c](https://github.com/loopingz/webda.io/commit/fc0e28c30f3ca5866f4accad2ad8be0e2374d2b5))
+- add util registerModel in test ([059eee8](https://github.com/loopingz/webda.io/commit/059eee88f69821c9278a85ea9623883f57bfabf0))
+- allow to get routes from router ([dcdbd74](https://github.com/loopingz/webda.io/commit/dcdbd74d67abd1f52189ae647c1cdc63c0753661))
+- allow to specify action name in @Action ([ed1429f](https://github.com/loopingz/webda.io/commit/ed1429fe39a9e2c8340984a0b231c44464b4204a))
+- async module use AsyncAction model directly ([862d051](https://github.com/loopingz/webda.io/commit/862d0510f0104386459e51f80ef2650f64bdaa67))
+- compress MemoryStore persistence and handle .gz in FileUtils.save/load ([997e11b](https://github.com/loopingz/webda.io/commit/997e11b04661f3dd14ab68c568ff6d103df7572f))
+- manage all models by default for a BinaryService ([c3524da](https://github.com/loopingz/webda.io/commit/c3524daf10e237070d613d8e6dd1a2b222752def))
+- speed up test by cache unpackedapplication.load ([242ee04](https://github.com/loopingz/webda.io/commit/242ee0460088b2d4b7ddd87e1906aa2f682e9ab4))
+
+### Bug Fixes
+
+- graphql any[] type replaced by string[] ([c3ffe20](https://github.com/loopingz/webda.io/commit/c3ffe20a63c193b886345f7a4a73773f112fa747))
+
+## [3.9.1](https://github.com/loopingz/webda.io/compare/core-v3.9.0...core-v3.9.1) (2023-11-22)
+
+### Bug Fixes
+
+- add more explicit message for ValidationError ([9cf3d64](https://github.com/loopingz/webda.io/commit/9cf3d64d9fc9ed14dcbc194a3e0a28d9230d1311))
+- organize imports ([0326b4b](https://github.com/loopingz/webda.io/commit/0326b4b973a307b91cb619a3ec79382bf7f8d101))
+
+## [3.9.0](https://github.com/loopingz/webda.io/compare/core-v3.8.1...core-v3.9.0) (2023-11-18)
+
+### Features
+
+- add a BinaryModel for big json ([7849fac](https://github.com/loopingz/webda.io/commit/7849facb86118ee1d2eb19fc0479ba1ea769901f))
+- allow return of async function for StoreMigration ([baebc5f](https://github.com/loopingz/webda.io/commit/baebc5fe781a5030b73059a53a4e39ad2b4dcc6e))
+
+### Bug Fixes
+
+- avoid exposing OpenAPI root if not defined ([e525412](https://github.com/loopingz/webda.io/commit/e52541277f7e6e2d3a9f0974ea0c2ab46492435c))
+- links with ** prefix misplaced with \_** by escapeName ([6a5a8b9](https://github.com/loopingz/webda.io/commit/6a5a8b91ae9e02d65b0a8db6c3647d5108de104f))
+
+## [3.8.1](https://github.com/loopingz/webda.io/compare/core-v3.8.0...core-v3.8.1) (2023-11-15)
+
+### Bug Fixes
+
+- getGraph case insensitive ([a35ea49](https://github.com/loopingz/webda.io/commit/a35ea49ad5f0e676f0c483ae2a23ab90fe0c4315))
+
+## [3.8.0](https://github.com/loopingz/webda.io/compare/core-v3.7.0...core-v3.8.0) (2023-11-14)
+
+### Features
+
+- add otel module ([1841c28](https://github.com/loopingz/webda.io/commit/1841c28ab6225f6e2df3068f6869f1487b470d52))
+
+## [3.7.0](https://github.com/loopingz/webda.io/compare/core-v3.6.0...core-v3.7.0) (2023-11-12)
+
+### Features
+
+- add an isEmpty method for Binary ([daf5832](https://github.com/loopingz/webda.io/commit/daf5832f4ca8b867eff1669e455f9761f1a15834))
+- add CoreModel listeners system ([977dd9d](https://github.com/loopingz/webda.io/commit/977dd9d8a04f5b3e6d19f09f8755277b26242a18))
+- add execute/wait method to Throttler ([b6cd66b](https://github.com/loopingz/webda.io/commit/b6cd66b49cc051f1eec085542fa4cf76f822f19f))
+- add iterate generator methods ([ff45183](https://github.com/loopingz/webda.io/commit/ff45183625bdce480f396f88f594fe196415d3da))
+- drop node16 as it is EOL ([a6b795a](https://github.com/loopingz/webda.io/commit/a6b795a76e5089a0cf81269c49e00131bc17c1a9))
+- modelmapper service ([e5eee5f](https://github.com/loopingz/webda.io/commit/e5eee5f9c79f513a6bd9efe2e464c4491ac6924b))
+- RESTDomainService: add the url info retriever on Binaries ([13fe77c](https://github.com/loopingz/webda.io/commit/13fe77ccd0082432ea79ec9b7c32ac261cebeb01))
+- Store: add additionalModels to compose models in store ([e0f1d69](https://github.com/loopingz/webda.io/commit/e0f1d69c7a1302c9df1ea2fa365e422b141c0d89))
+- Throttler add a static method ([dd5178e](https://github.com/loopingz/webda.io/commit/dd5178e385bd970ab0e36a6f4ecb6dd63b438bc2))
+
+### Bug Fixes
+
+- BinaryFile: fallback on originalname if name is not present ([245a24b](https://github.com/loopingz/webda.io/commit/245a24b97963d51c2b5085fa29c5b54e40bf46d4))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.0.4 to ^3.1.0
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.0.6 to ^1.1.0
+
+## [3.6.0](https://github.com/loopingz/webda.io/compare/core-v3.5.0...core-v3.6.0) (2023-10-07)
+
+### Features
+
+- add isGlobal to Context ([6423ba7](https://github.com/loopingz/webda.io/commit/6423ba7a23e96c6132ca468074e5e6fdd66d71ce))
+- add stop function for service ([c4fb0ec](https://github.com/loopingz/webda.io/commit/c4fb0ec6cc1b1ee49105193cedad32538742113a))
+- allow context propagation in linked model ([e84df9a](https://github.com/loopingz/webda.io/commit/e84df9a7435db40d56d498b624d5f71e9f2d0ebe))
+
+### Bug Fixes
+
+- display help command ([3d0b790](https://github.com/loopingz/webda.io/commit/3d0b79090f1fc23e3d02a7e7b0c3ce023f85f586))
+- domainservice model actions ([48a899a](https://github.com/loopingz/webda.io/commit/48a899adac3c81a611702defccee4871a7941df7))
+- remove completely the \_ prefix of action method ([3530b60](https://github.com/loopingz/webda.io/commit/3530b60fe51ee3f913b71801009dbace2b68188d))
+- setContext on undefined reference ([030db1b](https://github.com/loopingz/webda.io/commit/030db1bc6166a8d18248d304b6bf3bf988e8a9f7))
+- write on flushed header ([2d1ef2e](https://github.com/loopingz/webda.io/commit/2d1ef2e59d3809e5c1dbe82b5312e31fb2015eca))
+
+## [3.5.0](https://github.com/loopingz/webda.io/compare/core-v3.4.0...core-v3.5.0) (2023-10-04)
+
+### Features
+
+- add absolute url when prefix is in use for Router ([8ea07f7](https://github.com/loopingz/webda.io/commit/8ea07f7f66a09ebf95a79a9edea2cef2dc399128))
+- add more cases to transformName for RESTDomainService ([b1071f2](https://github.com/loopingz/webda.io/commit/b1071f20157932ccbd4e0150791300f624a6e25c))
+- ensure YAMLUtils.parse can handle multiple documents ([11061f9](https://github.com/loopingz/webda.io/commit/11061f92c0e91e8c80f92027392942eb0ed2b810))
+
+### Bug Fixes
+
+- . route on / url service ([426ec2a](https://github.com/loopingz/webda.io/commit/426ec2a386ca409c581827a294e11af09536cf65))
+- default toLowerCase for k8s resources name ([aaa0d58](https://github.com/loopingz/webda.io/commit/aaa0d5844f12532d2eb3a5813968a730deb4d4d0))
+- display of double import warning ([c55f2d8](https://github.com/loopingz/webda.io/commit/c55f2d83f75143a24a6af2035d82b6c593e0014f))
+- ensure a / exists before root collection for RESTDomainService ([555782e](https://github.com/loopingz/webda.io/commit/555782e4c8bd5f2a43cff4e7ee447a64e2982cd1))
+- machineIdSync catch error ([7a29f5c](https://github.com/loopingz/webda.io/commit/7a29f5c548e4db50f3bebc5b8e248ddfaf485dad))
+- set devMode prior to initialization ([cb62746](https://github.com/loopingz/webda.io/commit/cb627464a23c9f0741a2353654f30b700676823c))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.0.3 to ^3.0.4
+
+## [3.4.0](https://github.com/loopingz/webda.io/compare/core-v3.3.0...core-v3.4.0) (2023-09-07)
+
+### Features
+
+- add swagger-ui for dev ([a6adb77](https://github.com/loopingz/webda.io/commit/a6adb77fcfb38c6e6398d2404a9351d8871a0dc9))
+
+### Bug Fixes
+
+- DomainService collection query ([6f81d7c](https://github.com/loopingz/webda.io/commit/6f81d7c10ab2d554c3c309fdca4063b3db83c2f1))
+- query parameters on collection for DomainService ([ef6d18d](https://github.com/loopingz/webda.io/commit/ef6d18d8283d789fceb278d1a969eb49db061d0b))
+- query SubExpression only ([36bccd7](https://github.com/loopingz/webda.io/commit/36bccd7992f4260a6f27ad15388f5f0c320d4dec))
+
+## [3.3.0](https://github.com/loopingz/webda.io/compare/core-v3.2.2...core-v3.3.0) (2023-08-30)
+
+### Features
+
+- allow no domain on cookie to default on domain only ([308fa49](https://github.com/loopingz/webda.io/commit/308fa493e3f2e813d919f1375839302512eb7969))
+
+### Bug Fixes
+
+- beans local configuration without config declaration ([5186555](https://github.com/loopingz/webda.io/commit/5186555a5d5318e750ea585ca90ea693a41db47e))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.0.2 to ^3.0.3
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.0.5 to ^1.0.6
+
+## [3.2.2](https://github.com/loopingz/webda.io/compare/core-v3.2.1...core-v3.2.2) (2023-07-19)
+
+### Bug Fixes
+
+- allow no resolution for symlink to fix aspect_build_js all symlink ([a6a97ad](https://github.com/loopingz/webda.io/commit/a6a97ad4ada88b83b8c32ab2ef40e6482944b333))
+- make values optional to allow downward compatibility ([c0fec4f](https://github.com/loopingz/webda.io/commit/c0fec4fb21dba5e6c97f3ff87e15bf0abf2334bc))
+
+## [3.2.1](https://github.com/loopingz/webda.io/compare/core-v3.2.0...core-v3.2.1) (2023-07-08)
+
+### Bug Fixes
+
+- keep symlink path with folder symlinked ([bd3d7b5](https://github.com/loopingz/webda.io/commit/bd3d7b59d4a22d3e5e26b24532214ee62505098a))
+- relax version condition between @webda/shell and @webda/core ([b634574](https://github.com/loopingz/webda.io/commit/b6345743ea5ea0ef66615d7e1ae3bca4c8610122))
+
+## [3.2.0](https://github.com/loopingz/webda.io/compare/core-v3.1.2...core-v3.2.0) (2023-07-07)
+
+### Features
+
+- add a Webda.UpdateContextRoute to be able to alter router decision ([22463f9](https://github.com/loopingz/webda.io/commit/22463f9b12a25cbee124184df0243d8ab7bf706d))
+- add regexp validator utility classes ([b71f1ca](https://github.com/loopingz/webda.io/commit/b71f1ca37ac3602675de21341ac843833d6eaf63))
+
+### Bug Fixes
+
+- ignore any .folder in node_modules for pnpm and nx ([ebe7f81](https://github.com/loopingz/webda.io/commit/ebe7f81e19d27f5a8bed27e040a18c2925fe5e27))
+
+## [3.1.2](https://github.com/loopingz/webda.io/compare/core-v3.1.1...core-v3.1.2) (2023-07-01)
+
+### Bug Fixes
+
+- allow to specify a machine id ([#413](https://github.com/loopingz/webda.io/issues/413)) ([fa24d8e](https://github.com/loopingz/webda.io/commit/fa24d8ec00340903e180ba16dc7dbf5765430d21))
+
+## [3.1.1](https://github.com/loopingz/webda.io/compare/core-v3.1.0...core-v3.1.1) (2023-06-30)
+
+### Bug Fixes
+
+- add explicit dependencies declaration ([#411](https://github.com/loopingz/webda.io/issues/411)) ([4d8cbae](https://github.com/loopingz/webda.io/commit/4d8cbae4d6d31b62df98832591bc97ca77ae6a69))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.0.1 to ^3.0.2
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.0.4 to ^1.0.5
+
+## [3.1.0](https://github.com/loopingz/webda.io/compare/core-v3.0.2...core-v3.1.0) (2023-06-30)
+
+### Features
+
+- add WS proxy system ([fdc394d](https://github.com/loopingz/webda.io/commit/fdc394de666d74e9130d29fb6d4ddd67b650430f))
+- allow usage of lowercase log level ([6e8efdb](https://github.com/loopingz/webda.io/commit/6e8efdbbdfee1cbe1bcb04e9daf17a4aab89ae1f))
+
+### Bug Fixes
+
+- @types/ws version ([f63b002](https://github.com/loopingz/webda.io/commit/f63b0025b72f96f4282fbd30232f02164134ed5e))
+- force file format with JSON/YAMLUtils.saveFile ([d629ad6](https://github.com/loopingz/webda.io/commit/d629ad6ac62ae059cdec9700a48813d489316325))
+- improve error message for unsupported diagrams ([03238b0](https://github.com/loopingz/webda.io/commit/03238b072ad3525ed463212fc77463f958259f90))
+
+### Dependencies
+
+- The following workspace dependencies were updated
+  - dependencies
+    - @webda/workout bumped from ^3.0.0 to ^3.0.1
+  - devDependencies
+    - @webda/tsc-esm bumped from ^1.0.3 to ^1.0.4
+
+## [1.0.1](https://github.com/loopingz/webda.io/compare/@webda/core@1.0.0...@webda/core@1.0.1) (2021-03-18)
+
+**Note:** Version bump only for package @webda/core
+
+# 1.0.0-beta.0 (2019-08-21)
+
+### Bug Fixes
+
+- code smell ([af4f211](https://github.com/loopingz/webda/commit/af4f211))
+- move away from checkCSRF to checkRequest ([84a9265](https://github.com/loopingz/webda/commit/84a9265))
+- resolved routes issue within test ([62b41f2](https://github.com/loopingz/webda/commit/62b41f2))
+- update all packages to use the new scope [@webda](https://github.com/webda) ([6acc1d5](https://github.com/loopingz/webda/commit/6acc1d5))
+- update imports ([7896f0c](https://github.com/loopingz/webda/commit/7896f0c))
+
+### Features
+
+- new versioning system ([27ab549](https://github.com/loopingz/webda/commit/27ab549))
+
+### BREAKING CHANGES
+
+- need to update as CorsFilter is not exported anymore
+- new v1.0.0

package/lib/index.d.ts

@@ -31,6 +31,7 @@ export * from "./services/filebinary.js";
 export * from "./services/fileconfiguration.js";
 export * from "./services/invitationservice.js";
 export * from "./services/kubernetesconfiguration.js";
+export * from "./services/prometheus.js";
 export * from "./services/mailer.js";
 export * from "./services/notificationservice.js";
 export * from "./services/oauth.js";

package/lib/index.js

@@ -36,6 +36,7 @@ export * from "./services/filebinary.js"; // move to runtime
 export * from "./services/fileconfiguration.js";
 export * from "./services/invitationservice.js"; // move to runtime
 export * from "./services/kubernetesconfiguration.js"; // move to runtime
+export * from "./services/prometheus.js";
 export * from "./services/mailer.js";
 export * from "./services/notificationservice.js";
 export * from "./services/oauth.js";

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,sFAAsF;AACtF,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,MAAM,YAAY,GAAG,IAAI,kBAAkB,EAAE,CAAC;AAE9C,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,uBAAuB,CAAC;AAEtC,SAAS;AACT,cAAc,mBAAmB,CAAC,CAAC,kBAAkB;AACrD,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC,CAAC,kBAAkB;AACtD,cAAc,eAAe,CAAC;AAE9B,SAAS;AACT,cAAc,oBAAoB,CAAC,CAAC,kBAAkB;AACtD,cAAc,sBAAsB,CAAC,CAAC,oBAAoB;AAC1D,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AAEtC,WAAW;AACX,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC,CAAC,kBAAkB;AAC1D,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC,CAAC,uBAAuB;AACjE,cAAc,uBAAuB,CAAC,CAAC,kBAAkB;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC,CAAC,kBAAkB;AAChE,cAAc,oCAAoC,CAAC,CAAC,kBAAkB;AACtE,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,oBAAoB,CAAC;AAEnC,SAAS;AACT,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,eAAe,CAAC,CAAC,kBAAkB;AACjD,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAE/B,QAAQ;AACR,cAAc,0BAA0B,CAAC;AACzC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAE/B,cAAc,wBAAwB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,0BAA0B;AAC1B,sFAAsF;AACtF,OAAO,EAAE,WAAW,IAAI,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AACrD,MAAM,YAAY,GAAG,IAAI,kBAAkB,EAAE,CAAC;AAE9C,cAAc,eAAe,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,uBAAuB,CAAC;AAEtC,SAAS;AACT,cAAc,mBAAmB,CAAC,CAAC,kBAAkB;AACrD,cAAc,oBAAoB,CAAC;AACnC,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,oBAAoB,CAAC;AACnC,cAAc,oBAAoB,CAAC,CAAC,kBAAkB;AACtD,cAAc,eAAe,CAAC;AAE9B,SAAS;AACT,cAAc,oBAAoB,CAAC,CAAC,kBAAkB;AACtD,cAAc,sBAAsB,CAAC,CAAC,oBAAoB;AAC1D,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC;AAEtC,WAAW;AACX,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC,CAAC,kBAAkB;AAC1D,cAAc,0BAA0B,CAAC;AACzC,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC,CAAC,uBAAuB;AACjE,cAAc,uBAAuB,CAAC,CAAC,kBAAkB;AACzD,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC,CAAC,kBAAkB;AAChE,cAAc,oCAAoC,CAAC,CAAC,kBAAkB;AACtE,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,kBAAkB,CAAC;AACjC,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,oBAAoB,CAAC;AAEnC,SAAS;AACT,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,qBAAqB,CAAC,CAAC,kBAAkB;AACvD,cAAc,eAAe,CAAC,CAAC,kBAAkB;AACjD,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAE/B,QAAQ;AACR,cAAc,0BAA0B,CAAC;AACzC,cAAc,cAAc,CAAC;AAC7B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,qBAAqB,CAAC;AACpC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAE/B,cAAc,wBAAwB,CAAC"}

package/lib/models/coremodel.d.ts

@@ -56,7 +56,7 @@ export declare class CoreModelQuery {
      * @param context
      * @returns
      */
-    iterate(query?: string, context?: OperationContext): AsyncGenerator<CoreModel, any, unknown>;
+    iterate(query?: string, context?: OperationContext): AsyncGenerator<CoreModel, any, any>;
     /**
      * Get all the objects
      * @returns

package/lib/services/prometheus.js

@@ -98,9 +98,10 @@ export class PrometheusService extends Service {
                 if (req.method === "GET" && req.url === this.parameters.url) {
                     res.writeHead(200, { "Content-Type": register.contentType });
                     res.write(await register.metrics());
-                    res.end();
                 }
-                res.writeHead(404);
+                else {
+                    res.writeHead(404);
+                }
                 res.end();
             })
                 .listen(this.parameters.portNumber, this.parameters.bind));

package/lib/services/prometheus.js.map

@@ -1 +1 @@
-{"version":3,"file":"prometheus.js","sourceRoot":"","sources":["../../src/services/prometheus.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"prometheus.js","sourceRoot":"","sources":["../../src/services/prometheus.ts"],"names":[],"mappings":"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"}

package/lib/stores/webdaql/query.d.ts

@@ -278,6 +278,9 @@ export declare namespace WebdaQL {
         protected query: Query;
         protected builder: ExpressionBuilder;
         constructor(sql: string, builder?: ExpressionBuilder);
+        hasCondition(): boolean;
+        toString(): string;
+        merge(query: string, type?: "OR" | "AND"): this;
         /**
          * Get offset
          * @returns

package/lib/stores/webdaql/query.js

@@ -10,26 +10,7 @@ import { OrderFieldExpressionContext, SubExpressionContext, WebdaQLParserParser
 export var WebdaQL;
 (function (WebdaQL) {
     function PrependCondition(query = "", condition) {
-        if (!condition) {
-            return query;
-        }
-        query = query.trim();
-        // Find the right part of the query this regex will always be true as all part are optional
-        const rightPart = query.match(/(?<order>ORDER BY ([a-zA-Z0-9\._]+( DESC| ASC)?,?)+ *)?(?<limit>LIMIT \d+ *)?(?<offset>OFFSET ["']\w+["'] *)?$/);
-        // Remove it if found
-        query = query.substring(0, query.length - rightPart[0].length).trim();
-        // Add the condition to the query now
-        if (!query) {
-            query = condition;
-        }
-        else {
-            query = `(${condition}) AND (${query})`;
-        }
-        // Re-add the right part
-        if (rightPart[0].length) {
-            query += " " + rightPart[0];
-        }
-        return query;
+        return new QueryValidator(query).merge(condition).toString();
     }
     WebdaQL.PrependCondition = PrependCondition;
     /**
@@ -472,6 +453,60 @@ export var WebdaQL;
             this.builder = builder;
             this.query = this.builder.visit(this.tree);
         }
+        hasCondition() {
+            const filter = this.query.filter;
+            const isAnd = filter instanceof AndExpression;
+            if (isAnd) {
+                return filter.children.length > 0;
+            }
+            return true;
+        }
+        toString() {
+            let res = this.query.filter.toString();
+            if (this.query.orderBy) {
+                res += ` ORDER BY ${this.query.orderBy.map(o => `${o.field} ${o.direction}`).join(", ")}`;
+            }
+            if (this.query.limit) {
+                res += ` LIMIT ${this.query.limit}`;
+            }
+            if (this.query.continuationToken) {
+                res += ` OFFSET "${this.query.continuationToken}"`;
+            }
+            return res.trim();
+        }
+        merge(query, type = "AND") {
+            var _a;
+            const adds = new QueryValidator(query);
+            // Add additional conditions
+            if (adds.hasCondition()) {
+                if ((this.query.filter instanceof AndExpression && type === "AND") ||
+                    (this.query.filter instanceof OrExpression && type === "OR")) {
+                    this.query.filter.children.push(adds.query.filter);
+                }
+                else {
+                    this.query.filter = new (type === "AND" ? AndExpression : OrExpression)([
+                        this.query.filter,
+                        adds.query.filter
+                    ]);
+                }
+            }
+            // Set the limit if overriden
+            if (adds.query.limit) {
+                this.query.limit = adds.query.limit;
+            }
+            // Set the offset if overriden
+            if (adds.query.continuationToken) {
+                this.query.continuationToken = adds.query.continuationToken;
+            }
+            // Add the order by if overriden
+            if (adds.query.orderBy) {
+                const fields = adds.query.orderBy.map(o => o.field);
+                (_a = this.query).orderBy ?? (_a.orderBy = []);
+                // Remove the fields that are already in the query
+                this.query.orderBy = [...adds.query.orderBy, ...this.query.orderBy.filter(o => !fields.includes(o.field))];
+            }
+            return this;
+        }
         /**
          * Get offset
          * @returns

package/lib/stores/webdaql/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.ts"],"names":[],"mappings":"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"}
+{"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

@@ -73,25 +73,32 @@ let QueryTest = class QueryTest {
         }
     }
     prependQuery() {
-        const check = (query, condition, expected) => {
-            assert.strictEqual(WebdaQL.PrependCondition(query, condition), expected);
-            // Ensure it is a valid query
-            new WebdaQL.QueryValidator(query);
-            new WebdaQL.QueryValidator(expected);
-            console.log("QUERY", query, "CONDITION", condition, "EXPECTED", expected);
+        // merge method is tested through the prependQuery helper
+        const strictEqual = (arg1, arg2) => {
+            // Ensure it is parsable
+            new WebdaQL.QueryValidator(arg1);
+            assert.deepStrictEqual(arg1, arg2);
         };
-        check("", "test='plop'", "test='plop'");
-        check("test='plop'", "", "test='plop'");
-        check("test='plip'", "test='plop'", "(test='plop') AND (test='plip')");
-        check("ORDER BY test", "test='plop'", "test='plop' ORDER BY test");
-        check("ORDER BY test LIMIT 100", "test='plop'", "test='plop' ORDER BY test LIMIT 100");
-        check("ORDER BY test DESC LIMIT 100", "test='plop'", "test='plop' ORDER BY test DESC LIMIT 100");
-        check("test='plip' ORDER BY test ASC LIMIT 100", "test='plop'", "(test='plop') AND (test='plip') ORDER BY test ASC LIMIT 100");
-        check("test='plip' LIMIT 100", "test='plop'", "(test='plop') AND (test='plip') LIMIT 100");
-        check("test='plip' LIMIT 100 OFFSET 'test'", "test='plop'", "(test='plop') AND (test='plip') LIMIT 100 OFFSET 'test'");
-        check("test='plip'   OFFSET 'test'", "test='plop'", "(test='plop') AND (test='plip') OFFSET 'test'");
-        check("test='ORDER BY plop' OFFSET 'test'", "test='plop'", "(test='plop') AND (test='ORDER BY plop') OFFSET 'test'");
-        check('test="ORDER BY plop" LIMIT 100', "test='plop'", "(test='plop') AND (test=\"ORDER BY plop\") LIMIT 100");
+        strictEqual(WebdaQL.PrependCondition("", "test='plop'"), 'test = "plop"');
+        strictEqual(WebdaQL.PrependCondition("test='plop'", ""), 'test = "plop"');
+        strictEqual(WebdaQL.PrependCondition("test='plip'", "test='plop'"), 'test = "plip" AND test = "plop"');
+        strictEqual(WebdaQL.PrependCondition("ORDER BY test", "test='plop'"), 'test = "plop" ORDER BY test ASC');
+        strictEqual(WebdaQL.PrependCondition("ORDER BY test LIMIT 100", "test='plop'"), 'test = "plop" ORDER BY test ASC LIMIT 100');
+        strictEqual(WebdaQL.PrependCondition("ORDER BY test DESC LIMIT 100", "test='plop'"), 'test = "plop" ORDER BY test DESC LIMIT 100');
+        strictEqual(WebdaQL.PrependCondition("test='plip' ORDER BY test ASC LIMIT 100", "test='plop'"), 'test = "plip" AND test = "plop" ORDER BY test ASC LIMIT 100');
+        strictEqual(WebdaQL.PrependCondition("test='plip' LIMIT 100", "test='plop'"), 'test = "plip" AND test = "plop" LIMIT 100');
+        strictEqual(WebdaQL.PrependCondition("test='plip' OFFSET 'test'", "test='plop'"), 'test = "plip" AND test = "plop" OFFSET "test"');
+        strictEqual(WebdaQL.PrependCondition("test='ORDER BY plop' OFFSET 'test'", "test='plop'"), 'test = "ORDER BY plop" AND test = "plop" OFFSET "test"');
+        strictEqual(WebdaQL.PrependCondition('test="ORDER BY plop" LIMIT 100', "test='plop'"), 'test = "ORDER BY plop" AND test = "plop" LIMIT 100');
+        // Composed ORDER BY
+        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');
+        // Opposite ORDER BY
+        strictEqual(WebdaQL.PrependCondition('test="plop" ORDER BY forced ASC LIMIT 100', "ORDER BY forced DESC"), 'test = "plop" ORDER BY forced DESC LIMIT 100');
+        // Overwrite LIMIT
+        strictEqual(WebdaQL.PrependCondition('test="plop" ORDER BY forced ASC LIMIT 100', "LIMIT 5"), 'test = "plop" ORDER BY forced ASC LIMIT 5');
+        // Overwrite OFFSET
+        strictEqual(WebdaQL.PrependCondition('OFFSET "test"', "OFFSET 'plop'"), 'OFFSET "plop"');
+        strictEqual(WebdaQL.PrependCondition('plop = "ok"', "OFFSET 'plop'"), 'plop = "ok" OFFSET "plop"');
     }
     likeRegexp() {
         assert.deepStrictEqual(WebdaQL.ComparisonExpression.likeToRegex("test"), /test/);

package/lib/stores/webdaql/query.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.spec.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAElC,MAAM,OAAO,GAAG;IACd;QACE,IAAI,EAAE;YACJ,KAAK,EAAE,MAAM;SACd;QACD,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,EAAE;QACT,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;KACxB;CACF,CAAC;AAGF,IAAM,SAAS,GAAf,MAAM,SAAS;IAEb,GAAG;QACD,IAAI,QAAQ,GAAG;YACb,qCAAqC,EAAE,qCAAqC;YAC5E,uCAAuC,EAAE,qCAAqC;YAC9E,yCAAyC,EAAE,qCAAqC;YAChF,wCAAwC,EAAE,wCAAwC;YAClF,uCAAuC,EAAE,qCAAqC;YAC9E,kCAAkC,EAAE,kCAAkC;YACtE,2CAA2C,EAAE,6CAA6C;YAC1F,+CAA+C,EAAE,mDAAmD;YACpG,qBAAqB,EAAE,IAAI;YAC3B,sBAAsB,EAAE,KAAK;YAC7B,oDAAoD,EAAE,oDAAoD;YAC1G,kEAAkE,EAAE,IAAI;YACxE,iFAAiF,EAAE,IAAI;YACvF,mFAAmF,EAAE,IAAI;YACzF,kFAAkF,EAAE,IAAI;YACxF,gBAAgB,EAAE,IAAI;YACtB,oCAAoC,EAAE,IAAI;YAC1C,uDAAuD,EAAE,IAAI;YAC7D,6DAA6D,EAAE,IAAI;YACnE,EAAE,EAAE,IAAI;YACR,wBAAwB,EAAE,IAAI;YAC9B,yBAAyB,EAAE,KAAK;YAChC,iBAAiB,EAAE,IAAI;YACvB,aAAa,EAAE,IAAI;YACnB,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE,IAAI;YACnB,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE,KAAK;YACnB,uBAAuB,EAAE,IAAI;YAC7B,wBAAwB,EAAE,KAAK;YAC/B,uBAAuB,EAAE,IAAI;YAC7B,8BAA8B,EAAE,4CAA4C,EAAE,2DAA2D;YACzI,kBAAkB,EAAE,IAAI;YACxB,8BAA8B,EAAE,IAAI;YACpC,eAAe,EAAE,IAAI;SACtB,CAAC;QACF,KAAK,IAAI,KAAK,IAAI,QAAQ,EAAE,CAAC;YAC3B,MAAM,SAAS,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YACpD,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC;YACzF,IAAI,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACxC,MAAM,CAAC,WAAW,CAChB,SAAS,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EACpC,QAAQ,CAAC,KAAK,CAAC,EACf,iCAAiC,KAAK,OAAO,SAAS,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,CACpF,CAAC;YACJ,CAAC;iBAAM,IAAI,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,SAAS,EAAE,CAAC;gBAChD,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,KAAK,EAAE,CAAC,CAAC;YAC5F,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC5B,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,SAAS,CAAC,aAAa,EAAE,CAAC,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzG,CAAC;QACH,CAAC;IACH,CAAC;IAGD,YAAY;QACV,MAAM,KAAK,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;YAC3C,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;YACzE,6BAA6B;YAC7B,IAAI,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEF,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QACxC,KAAK,CAAC,aAAa,EAAE,EAAE,EAAE,aAAa,CAAC,CAAC;QACxC,KAAK,CAAC,aAAa,EAAE,aAAa,EAAE,iCAAiC,CAAC,CAAC;QACvE,KAAK,CAAC,eAAe,EAAE,aAAa,EAAE,2BAA2B,CAAC,CAAC;QACnE,KAAK,CAAC,yBAAyB,EAAE,aAAa,EAAE,qCAAqC,CAAC,CAAC;QACvF,KAAK,CAAC,8BAA8B,EAAE,aAAa,EAAE,0CAA0C,CAAC,CAAC;QACjG,KAAK,CACH,yCAAyC,EACzC,aAAa,EACb,6DAA6D,CAC9D,CAAC;QACF,KAAK,CAAC,uBAAuB,EAAE,aAAa,EAAE,2CAA2C,CAAC,CAAC;QAC3F,KAAK,CACH,qCAAqC,EACrC,aAAa,EACb,yDAAyD,CAC1D,CAAC;QACF,KAAK,CAAC,6BAA6B,EAAE,aAAa,EAAE,+CAA+C,CAAC,CAAC;QACrG,KAAK,CACH,oCAAoC,EACpC,aAAa,EACb,wDAAwD,CACzD,CAAC;QACF,KAAK,CAAC,gCAAgC,EAAE,aAAa,EAAE,sDAAsD,CAAC,CAAC;IACjH,CAAC;IAGD,UAAU;QACR,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;QACjF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC;QACtF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC;QACtF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;QAErF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;QACpF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CAAC;QACvF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC,CAAC;QACrF,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;IACxF,CAAC;IAGD,MAAM;QACJ,MAAM,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAC7F,MAAM,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACjG,CAAC;IAGD,QAAQ;QACN,MAAM,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,6BAA6B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxG,CAAC;IAGD,QAAQ;QACN,MAAM,CAAC,WAAW,CAChB,IAAI,OAAO,CAAC,cAAc,CAAC,iDAAiD,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAC9F,IAAI,CACL,CAAC;IACJ,CAAC;IAGD,OAAO;QACL,IAAI,OAAO,CAAC,cAAc,CAAC,kEAAkE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAClH,CAAC;IAGD,aAAa;QACX,IAAI,OAAO,CAAC,cAAc,CAAC,iFAAiF,CAAC,CAAC,IAAI,CAChH,OAAO,CAAC,CAAC,CAAC,CACX,CAAC;QACF,IAAI,OAAO,CAAC,cAAc,CAAC,kFAAkF,CAAC,CAAC,IAAI,CACjH,OAAO,CAAC,CAAC,CAAC,CACX,CAAC;IACJ,CAAC;IAGD,WAAW;QACT,IAAI,GAAG,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC,sBAAsB,CAAC,CAAC;QAC7D,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC;QAC1C,GAAG,GAAG,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,CAAC;QACzC,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IAGD,QAAQ;QACN,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACrF,CAAC;IAGD,OAAO;QACL,IAAI,MAAM,GAAQ,EAAE,CAAC;QACrB,IAAI,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACnC,MAAM,GAAG,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QAClD,IAAI,OAAO,CAAC,eAAe,CAAC,8BAA8B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACzE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,GAAG,EAAE,CAAC;QACZ,IAAI,OAAO,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACrE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACrD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;QACjG,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,qBAAqB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,CAAC;IACpG,CAAC;IAGD,gBAAgB;QACd,IAAI,SAAS,GAAG,IAAI,OAAO,CAAC,gBAAgB,CAAC,iCAAiC,CAAC,CAAC;QAChF,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;QACrD,MAAM,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,EAAE,CACP,IAAI,OAAO,CAAC,gBAAgB,CAC1B,qFAAqF,CACtF,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAC1B,CAAC;IACJ,CAAC;CACF,CAAA;AA1LC;IADC,IAAI;oCAuDJ;AAGD;IADC,IAAI;6CAkCJ;AAGD;IADC,IAAI;2CAWJ;AAGD;IADC,IAAI;uCAIJ;AAGD;IADC,IAAI;yCAGJ;AAGD;IADC,IAAI;yCAMJ;AAGD;IADC,IAAI;wCAGJ;AAGD;IADC,IAAI;8CAQJ;AAGD;IADC,IAAI;4CAQJ;AAGD;IADC,IAAI;yCAGJ;AAGD;IADC,IAAI;wCAiBJ;AAGD;IADC,IAAI;iDAYJ;AA3LG,SAAS;IADd,KAAK;GACA,SAAS,CA4Ld"}
+{"version":3,"file":"query.spec.js","sourceRoot":"","sources":["../../../src/stores/webdaql/query.spec.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webda/core",
-  "version": "3.16.0",
+  "version": "3.16.1",
   "description": "Expose API with Lambda",
   "keywords": [
     "aws",
@@ -19,8 +19,8 @@
     "pretest": "npm run build",
     "lint": "prettier --check src/**/*",
     "lint:fix": "prettier --write src/**/*",
-    "test": "NODE_OPTIONS='--experimental-loader ./hooks.mjs' c8 mocha 'src/**/*.spec.ts'",
-    "test:debug": "mocha --no-timeouts 'src/**/*.spec.ts'"
+    "test": "NODE_OPTIONS='--experimental-loader ./hooks.mjs' c8 mocha",
+    "test:debug": "mocha --no-timeouts"
   },
   "dependencies": {
     "@types/json-schema": "^7.0.8",
@@ -112,6 +112,5 @@
   "type": "module",
   "engines": {
     "node": ">=18.0.0"
-  },
-  "gitHead": "af93fd620b1d0de91cabb1900f01b94e50774d41"
+  }
 }

package/LICENSE

@@ -1,166 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-