fix: tests

2026-01-07 22:12:53 +00:00 · 2023-05-31 15:05:41 +02:00
parent 0d60b8bfad
commit 68400f2480
29 changed files with 647 additions and 272 deletions
--- a/backend/backend/package.json
+++ b/backend/backend/package.json
@@ -56,7 +56,6 @@
  "devDependencies": {
    "@openstapps/es-mapping-generator": "workspace:*",
    "@openstapps/eslint-config": "workspace:*",
-    "@openstapps/nyc-config": "workspace:*",
    "@openstapps/prettier-config": "workspace:*",
    "@openstapps/tsconfig": "workspace:*",
    "@testdeck/mocha": "0.3.3",
@@ -91,7 +90,7 @@
    "sinon-express-mock": "2.2.1",
    "supertest": "6.3.3",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/backend/backend/src/storage/elasticsearch/elasticsearch.ts
+++ b/backend/backend/src/storage/elasticsearch/elasticsearch.ts
@@ -20,19 +20,18 @@ import {
  IndicesGetAliasResponse,
  SearchHit,
  SearchResponse,
-} from '@elastic/elasticsearch/lib/api/types';
+} from '@elastic/elasticsearch/lib/api/types.js';
 import {SCConfigFile, SCSearchQuery, SCSearchResponse, SCThings, SCUuid} from '@openstapps/core';
 import {Logger} from '@openstapps/logger';
-import {IndicesUpdateAliasesParamsAction, SearchResponse} from 'elasticsearch';
 import moment from 'moment';
-import {MailQueue} from '../../notification/mail-queue';
-import {Bulk} from '../bulk-storage';
-import {Database} from '../database';
-import {parseAggregations} from './aggregations';
-import * as Monitoring from './monitoring';
-import {buildQuery} from './query/query';
-import {buildSort} from './query/sort';
-import {aggregations, putTemplate} from './templating';
+import {MailQueue} from '../../notification/mail-queue.js';
+import {Bulk} from '../bulk-storage.js';
+import {Database} from '../database.js';
+import {parseAggregations} from './aggregations.js';
+import * as Monitoring from './monitoring.js';
+import {buildQuery} from './query/query.js';
+import {buildSort} from './query/sort.js';
+import {aggregations, putTemplate} from './templating.js';
 import {
  ElasticsearchConfig,
  ElasticsearchQueryDisMaxConfig,
@@ -44,7 +43,7 @@ import {
  INACTIVE_INDICES_ALIAS,
  matchIndexByType,
  VALID_INDEX_REGEX,
-} from './util';
+} from './util/index.js';
 import {noUndefined} from './util/no-undefined.js';
 import {retryCatch, RetryOptions} from './util/retry.js';

@@ -170,7 +169,7 @@ export class Elasticsearch implements Database {
    return searchResponse.hits.hits[0];
  }

-  private async prepareBulkWrite(bulk: Bulk): Promise<string> {
+  async prepareBulkWrite(bulk: Bulk): Promise<string> {
    if (!this.ready) {
      throw new Error('No connection to elasticsearch established yet.');
    }
@@ -389,7 +388,7 @@ export class Elasticsearch implements Database {
      index: ACTIVE_INDICES_ALIAS,
      allow_no_indices: true,
      size: parameters.size,
-      sort: typeof parameters.sort !== 'undefined' ? buildSort(parameters.sort) : undefined,
+      sort: typeof parameters.sort === 'undefined' ? undefined : buildSort(parameters.sort),
    });

    return {
@@ -401,9 +400,9 @@ export class Elasticsearch implements Database {
        })
        .filter(noUndefined),
      facets:
-        typeof response.aggregations !== 'undefined'
-          ? parseAggregations(response.aggregations as Record<AggregateName, AggregationsMultiTermsBucket>)
-          : [],
+        typeof response.aggregations === 'undefined'
+          ? []
+          : parseAggregations(response.aggregations as Record<AggregateName, AggregationsMultiTermsBucket>),
      pagination: {
        count: response.hits.hits.length,
        offset: typeof parameters.from === 'number' ? parameters.from : 0,
--- a/backend/backend/src/storage/elasticsearch/monitoring.ts
+++ b/backend/backend/src/storage/elasticsearch/monitoring.ts
@@ -14,7 +14,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import {Client} from '@elastic/elasticsearch';
-import {SearchRequest} from '@elastic/elasticsearch/lib/api/types';
+import {SearchRequest} from '@elastic/elasticsearch/lib/api/types.js';
 import {
  SCMonitoringConfiguration,
  SCMonitoringLogAction,
@@ -150,6 +150,3 @@ export async function setUp(

  Logger.log(`Scheduled ${monitoringConfig.watchers.length} watches`);
 }
-
-// do this for esm mocking
-export default {setUp};
--- a/backend/backend/src/storage/elasticsearch/query/query.ts
+++ b/backend/backend/src/storage/elasticsearch/query/query.ts
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types';
+import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types.js';
 import {SCConfigFile, SCSearchQuery} from '@openstapps/core';
 import {ElasticsearchConfig} from '../types/elasticsearch-config.js';
 import {buildFilter} from './filter.js';
@@ -31,7 +31,7 @@ export const buildQuery = function buildQuery(
  defaultConfig: SCConfigFile,
  elasticsearchConfig: ElasticsearchConfig,
 ): QueryDslQueryContainer {
-  // if config provides an minMatch parameter we use query_string instead of match query
+  // if config provides a minMatch parameter, we use query_string instead of a match query
  let query;
  if (typeof elasticsearchConfig.query === 'undefined') {
    query = {
@@ -39,7 +39,7 @@ export const buildQuery = function buildQuery(
        analyzer: 'search_german',
        default_field: 'name',
        minimum_should_match: '90%',
-        query: typeof parameters.query !== 'string' ? '*' : parameters.query,
+        query: typeof parameters.query === 'string' ? parameters.query : '*',
      },
    };
  } else if (elasticsearchConfig.query.queryType === 'query_string') {
@@ -48,7 +48,7 @@ export const buildQuery = function buildQuery(
        analyzer: 'search_german',
        default_field: 'name',
        minimum_should_match: elasticsearchConfig.query.minMatch,
-        query: typeof parameters.query !== 'string' ? '*' : parameters.query,
+        query: typeof parameters.query === 'string' ? parameters.query : '*',
      },
    };
  } else if (elasticsearchConfig.query.queryType === 'dis_max') {
--- a/backend/backend/src/storage/elasticsearch/query/sort.ts
+++ b/backend/backend/src/storage/elasticsearch/query/sort.ts
@@ -12,7 +12,7 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
-import {Sort} from '@elastic/elasticsearch/lib/api/types';
+import {Sort} from '@elastic/elasticsearch/lib/api/types.js';
 import {SCSearchSort} from '@openstapps/core';
 import {buildDistanceSort} from './sort/distance.js';
 import {buildDucetSort} from './sort/ducet.js';
--- a/backend/backend/src/storage/elasticsearch/query/sort/generic.ts
+++ b/backend/backend/src/storage/elasticsearch/query/sort/generic.ts
@@ -12,14 +12,16 @@
 * You should have received a copy of the GNU General Public License along with
 * this program. If not, see <https://www.gnu.org/licenses/>.
 */
+import {SortOptions} from '@elastic/elasticsearch/lib/api/types.js';
+import {SCGenericSort} from '@openstapps/core';

 /**
+ * Converts a generic sort to elasticsearch syntax
 *
+ * @param sort A sorting definition
 */
-export function hashStringToInt(string_: string): number {
-  return [...string_].reduce(
-    (accumulator, current) =>
-      (current.codePointAt(0) ?? 0) + (accumulator << 6) + (accumulator << 16) - accumulator,
-    0,
-  );
+export function buildGenericSort(sort: SCGenericSort): SortOptions {
+  return {
+    [sort.arguments.field]: sort.order,
+  };
 }
--- a/backend/backend/test/routes/bulk-route.spec.ts
+++ b/backend/backend/test/routes/bulk-route.spec.ts
@@ -24,10 +24,11 @@ import {expect} from 'chai';
 import {bulk, DEFAULT_TEST_TIMEOUT} from '../common.js';
 import {testApp} from '../tests-setup.js';
 import {readFile} from 'fs/promises';
+import {v4} from 'uuid';

 const book = JSON.parse(
-  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.1.json', 'utf8'),
-);
+  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.2.json', 'utf8'),
+).instance;

 describe('Bulk routes', async function () {
  // increase timeout for the suite
@@ -60,7 +61,7 @@ describe('Bulk routes', async function () {

  it('should return (throw) error if a bulk with the provided UID cannot be found when adding to a bulk', async function () {
    await testApp.post(bulkRoute.urlPath).set('Content-Type', 'application/json').send(request);
-    const bulkAddRouteUrlPath = bulkAddRoute.urlPath.toLocaleLowerCase().replace(':uid', 'a-wrong-uid');
+    const bulkAddRouteUrlPath = bulkAddRoute.urlPath.toLocaleLowerCase().replace(':uid', v4());

    const {status} = await testApp
      .post(bulkAddRouteUrlPath)
@@ -75,10 +76,10 @@ describe('Bulk routes', async function () {
      .post(bulkRoute.urlPath)
      .set('Content-Type', 'application/json')
      .send(request);
-    const bulkAddRouteurlPath = bulkAddRoute.urlPath.toLocaleLowerCase().replace(':uid', response.body.uid);
+    const bulkAddRouteUrlPath = bulkAddRoute.urlPath.toLocaleLowerCase().replace(':uid', response.body.uid);

    const {status, body} = await testApp
-      .post(bulkAddRouteurlPath)
+      .post(bulkAddRouteUrlPath)
      .set('Content-Type', 'application/json')
      .send(book);

@@ -88,10 +89,10 @@ describe('Bulk routes', async function () {

  it('should return (throw) error if a bulk with the provided UID cannot be found when closing a bulk (done)', async function () {
    await testApp.post(bulkRoute.urlPath).set('Content-Type', 'application/json').send(request);
-    const bulkDoneRouteurlPath = bulkDoneRoute.urlPath.toLocaleLowerCase().replace(':uid', 'a-wrong-uid');
+    const bulkDoneRouteUrlPath = bulkDoneRoute.urlPath.toLocaleLowerCase().replace(':uid', 'a-wrong-uid');

    const {status} = await testApp
-      .post(bulkDoneRouteurlPath)
+      .post(bulkDoneRouteUrlPath)
      .set('Content-Type', 'application/json')
      .send({});

--- a/backend/backend/test/routes/thing-update-route.spec.ts
+++ b/backend/backend/test/routes/thing-update-route.spec.ts
@@ -24,7 +24,7 @@ use(chaiAsPromised);

 const book = JSON.parse(
  await readFile('node_modules/@openstapps/core/test/resources/indexable/Book.1.json', 'utf8'),
-);
+).instance;

 describe('Thing update route', async function () {
  // increase timeout for the suite
--- a/backend/backend/test/storage/elasticsearch/aggregations.spec.ts
+++ b/backend/backend/test/storage/elasticsearch/aggregations.spec.ts
@@ -13,7 +13,7 @@
 * You should have received a copy of the GNU Affero General Public License
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
-import {AggregateName, AggregationsMultiTermsBucket} from '@elastic/elasticsearch/lib/api/types';
+import {AggregateName, AggregationsMultiTermsBucket} from '@elastic/elasticsearch/lib/api/types.js';
 import {SCFacet, SCThingType} from '@openstapps/core';
 import {expect} from 'chai';
 import {parseAggregations} from '../../../src/storage/elasticsearch/aggregations.js';
--- a/backend/backend/test/storage/elasticsearch/common.spec.ts
+++ b/backend/backend/test/storage/elasticsearch/common.spec.ts
--- a/backend/backend/test/storage/elasticsearch/elasticsearch.spec.ts
+++ b/backend/backend/test/storage/elasticsearch/elasticsearch.spec.ts
@@ -15,13 +15,8 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import {Client, Diagnostic} from '@elastic/elasticsearch';
-import Indices from '@elastic/elasticsearch/lib/api/api/indices';
-import {
-  CreateResponse,
-  SearchHit,
-  SearchResponse,
-  SortCombinations,
-} from '@elastic/elasticsearch/lib/api/types';
+import Indices from '@elastic/elasticsearch/lib/api/api/indices.js';
+import {CreateResponse, SearchHit, SearchResponse} from '@elastic/elasticsearch/lib/api/types.js';
 import {
  SCBook,
  SCBulkResponse,
@@ -36,27 +31,25 @@ import {expect, use} from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import {beforeEach} from 'mocha';
 import mockedEnv from 'mocked-env';
-import {
-  ACTIVE_INDICES_ALIAS,
-  INACTIVE_INDICES_ALIAS,
-  parseIndexName,
-} from '../../../src/storage/elasticsearch/util.js';
-import * as queryModule from '../../../src/storage/elasticsearch/query/query.js';
-import * as sortModule from '../../../src/storage/elasticsearch/query/sort.js';
 import sinon, {SinonStub} from 'sinon';
-import {getIndexUID, getThingIndexName, INDEX_UID_LENGTH} from '../../../src/storage/elasticsearch/util.js';
-import * as utilModule from '../../../src/storage/elasticsearch/util.js';
 import {removeInvalidAliasChars} from '../../../src/storage/elasticsearch/util/alias.js';
-import {configFile} from '../../../src/common.js';
 import {MailQueue} from '../../../src/notification/mail-queue.js';
 import {aggregations} from '../../../src/storage/elasticsearch/templating.js';
 import {Elasticsearch} from '../../../src/storage/elasticsearch/elasticsearch.js';
-import * as Monitoring from '../../../src/storage/elasticsearch/monitoring.js';
-import * as templating from '../../../src/storage/elasticsearch/templating.js';
 import {bulk, DEFAULT_TEST_TIMEOUT, getTransport, getIndex} from '../../common.js';
 import fs from 'fs';
 import {backendConfig} from '../../../src/config.js';
 import {readFile} from 'fs/promises';
+import {
+  ACTIVE_INDICES_ALIAS,
+  getIndexUID,
+  getThingIndexName,
+  INACTIVE_INDICES_ALIAS,
+  INDEX_UID_LENGTH,
+  parseIndexName,
+} from '../../../src/storage/elasticsearch/util/index.js';
+import cron from 'node-cron';
+import {query} from './query.js';

 use(chaiAsPromised);

@@ -115,7 +108,7 @@ describe('Elasticsearch', function () {

  describe('getAliasMap', function () {
    it('should fail after retries', async function () {
-      const es = new Elasticsearch(configFile);
+      const es = new Elasticsearch(backendConfig);
      sandbox.stub(es.client.indices, 'getAlias').throws();
      await expect(es.init({maxRetries: 1, retryInterval: 10})).to.be.rejected;
    });
@@ -283,17 +276,24 @@ describe('Elasticsearch', function () {
            ...backendConfig.internal,
            monitoring: {
              actions: [],
-              watchers: [],
+              watchers: [
+                {
+                  triggers: [{executionTime: 'daily', name: 'trigger'}],
+                  name: 'watcher',
+                  actions: [],
+                  query: {},
+                  conditions: [],
+                },
+              ],
            },
          },
        };
-        const monitoringSetUpStub = sandbox.stub(Monitoring, 'setUp');
+        const cronSetupStub = sandbox.stub(cron, 'schedule');

        const es = new Elasticsearch(config, new MailQueue(getTransport(false) as unknown as SMTP));
-
        es.init();

-        expect(monitoringSetUpStub.called).to.be.true;
+        expect(cronSetupStub.called).to.be.true;
      });
    });

@@ -308,14 +308,14 @@ describe('Elasticsearch', function () {

      beforeEach(function () {
        sandbox
-          .stub(Indices.prototype, 'getAlias')
+          .stub(Indices.default.prototype, 'getAlias')
          .resolves({[oldIndex]: {aliases: {[SCThingType.Book]: {}}}} as any);
-        sandbox.stub(Indices.prototype, 'putTemplate').resolves({} as any);
-        createStub = sandbox.stub(Indices.prototype, 'create').resolves({} as any);
-        deleteStub = sandbox.stub(Indices.prototype, 'delete').resolves({} as any);
-        refreshStub = sandbox.stub(Indices.prototype, 'refresh').resolves({} as any);
-        updateAliasesStub = sandbox.stub(Indices.prototype, 'updateAliases').resolves({} as any);
-        es = new Elasticsearch(configFile);
+        sandbox.stub(Indices.default.prototype, 'putTemplate').resolves({} as any);
+        createStub = sandbox.stub(Indices.default.prototype, 'create').resolves({} as any);
+        deleteStub = sandbox.stub(Indices.default.prototype, 'delete').resolves({} as any);
+        refreshStub = sandbox.stub(Indices.default.prototype, 'refresh').resolves({} as any);
+        updateAliasesStub = sandbox.stub(Indices.default.prototype, 'updateAliases').resolves({} as any);
+        es = new Elasticsearch(backendConfig);
      });

      afterEach(function () {
@@ -329,21 +329,18 @@ describe('Elasticsearch', function () {

        it('should reject (throw an error) if the index name is not valid', async function () {
          sandbox.createStubInstance(Client, {});
-          sandbox.stub(utilModule, 'getThingIndexName').returns(`invalid_${getIndex}`);
+          const invalidBulk = {...bulk, source: '%#$^'};
          await es.init();

-          return expect(es.bulkCreated(bulk)).to.be.rejectedWith('Index');
+          return expect(es.bulkCreated(invalidBulk)).to.be.rejectedWith('Index');
        });

        it('should create a new index', async function () {
          const index = getIndex();
-          sandbox.stub(utilModule, 'getThingIndexName').returns(index);
-          const putTemplateStub = sandbox.stub(templating, 'putTemplate');
+          sandbox.stub(es, 'prepareBulkWrite').resolves(index);
          await es.init();
-
          await es.bulkCreated(bulk);

-          expect(putTemplateStub.called).to.be.true;
          expect(createStub.calledWith({index, aliases: {[INACTIVE_INDICES_ALIAS]: {}}})).to.be.true;
        });
      });
@@ -354,7 +351,7 @@ describe('Elasticsearch', function () {
          sandbox.restore();
        });
        it('should cleanup index in case of the expired bulk for bulk whose index is not in use', async function () {
-          sandbox.stub(utilModule, 'getThingIndexName').returns(getIndex());
+          sandbox.stub(es, 'prepareBulkWrite').resolves(getIndex());

          await es.init();
          await es.bulkExpired({...bulk, state: 'in progress'});
@@ -363,7 +360,7 @@ describe('Elasticsearch', function () {
        });

        it('should not cleanup index in case of the expired bulk for bulk whose index is in use', async function () {
-          sandbox.stub(utilModule, 'getThingIndexName').returns(getIndex());
+          sandbox.stub(es, 'prepareBulkWrite').resolves(getIndex());

          await es.init();
          await es.bulkExpired({...bulk, state: 'done'});
@@ -378,11 +375,11 @@ describe('Elasticsearch', function () {
        });

        it('should reject if the index name is not valid', async function () {
-          sandbox.stub(utilModule, 'getThingIndexName').returns(`invalid_${getIndex()}`);
+          const invalidBulk = {...bulk, source: '%#$^'};
          sandbox.createStubInstance(Client, {});
          await es.init();

-          return expect(es.bulkUpdated(bulk)).to.be.rejectedWith('Index');
+          return expect(es.bulkUpdated(invalidBulk)).to.be.rejectedWith('Index');
        });

        it("should refuse to finalize bulk if index doesn't exist", async function () {
@@ -411,10 +408,8 @@ describe('Elasticsearch', function () {
              remove_index: {index: oldIndex},
            },
          ];
-          sandbox.stub(utilModule, 'getThingIndexName').returns(index);
-          sandbox.stub(templating, 'putTemplate');
+          sandbox.stub(es, 'prepareBulkWrite').resolves(index);
          await es.init();
-
          await es.bulkUpdated(bulk);

          expect(refreshStub.calledWith({index, allow_no_indices: false})).to.be.true;
@@ -467,7 +462,7 @@ describe('Elasticsearch', function () {
      });

      beforeEach(function () {
-        sandbox.stub(Indices.prototype, 'getAlias').resolves({} as any);
+        sandbox.stub(Indices.default.prototype, 'getAlias').resolves({} as any);
      });

      afterEach(function () {
@@ -483,7 +478,7 @@ describe('Elasticsearch', function () {
          _source: message as SCMessage,
        };
        sandbox.stub(es.client, 'search').resolves(searchResponse<SCMessage>(object));
-        sandbox.stub(utilModule, 'getThingIndexName').returns(index);
+        sandbox.stub(es, 'prepareBulkWrite').resolves(index);

        await es.init();
        return expect(es.post(object._source!, bulk)).to.be.rejectedWith('UID conflict');
@@ -609,7 +604,7 @@ describe('Elasticsearch', function () {
      };
      let searchStub: sinon.SinonStub;
      before(function () {
-        es = new Elasticsearch(configFile);
+        es = new Elasticsearch(backendConfig);
      });
      beforeEach(function () {
        searchStub = sandbox.stub(es.client, 'search').resolves(fakeSearchResponse);
@@ -680,18 +675,14 @@ describe('Elasticsearch', function () {
            },
          },
        };
-        const fakeResponse = {foo: 'bar'} as SortCombinations;
-        const fakeBuildSortResponse = [fakeResponse];
-        // @ts-expect-error not assignable
-        sandbox.stub(queryModule, 'buildQuery').returns(fakeResponse);
-        sandbox.stub(sortModule, 'buildSort').returns(fakeBuildSortResponse);

        await es.search(parameters);

-        sandbox.assert.calledWithMatch(searchStub, {
+        expect(searchStub.firstCall.firstArg).to.be.deep.equal({
          aggs: aggregations,
-          query: fakeResponse,
-          sort: fakeBuildSortResponse,
+          query,
+          allow_no_indices: true,
+          sort: [{'name.sort': 'desc'}],
          from: parameters.from,
          index: ACTIVE_INDICES_ALIAS,
          size: parameters.size,
--- a/backend/backend/test/storage/elasticsearch/monitoring.spec.ts
+++ b/backend/backend/test/storage/elasticsearch/monitoring.spec.ts
@@ -15,7 +15,7 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 import {Client} from '@elastic/elasticsearch';
-import {SearchResponse} from '@elastic/elasticsearch/lib/api/types';
+import {SearchResponse} from '@elastic/elasticsearch/lib/api/types.js';
 import {
  SCMonitoringConfiguration,
  SCMonitoringLogAction,
--- a/backend/backend/test/storage/elasticsearch/query.spec.ts
+++ b/backend/backend/test/storage/elasticsearch/query.spec.ts
@@ -31,7 +31,7 @@ import {buildQuery} from '../../../src/storage/elasticsearch/query/query.js';
 import {buildSort} from '../../../src/storage/elasticsearch/query/sort.js';
 import {ElasticsearchConfig} from '../../../src/storage/elasticsearch/types/elasticsearch-config.js';
 import {QueryDslSpecificQueryContainer} from '../../../src/storage/elasticsearch/types/util.js';
-import {SortCombinations} from '@elastic/elasticsearch/lib/api/types';
+import {SortCombinations} from '@elastic/elasticsearch/lib/api/types.js';
 import {backendConfig} from '../../../src/config.js';

 describe('Query', function () {
--- a/backend/backend/test/storage/elasticsearch/query.ts
+++ b/backend/backend/test/storage/elasticsearch/query.ts
@@ -0,0 +1,386 @@
+import {QueryDslQueryContainer} from '@elastic/elasticsearch/lib/api/types.js';
+
+export const query: QueryDslQueryContainer = {
+  function_score: {
+    functions: [
+      {
+        filter: {
+          term: {
+            type: 'academic event',
+          },
+        },
+        weight: 1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'academicTerms.acronym.raw': 'SS 2023',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'academicTerms.acronym.raw': 'WS 2022/23',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.05,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'academicTerms.acronym.raw': 'SoSe 2023',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'academicTerms.acronym.raw': 'WiSe 2022/23',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.05,
+      },
+      {
+        filter: {
+          term: {
+            type: 'academic event',
+          },
+        },
+        weight: 1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'course',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.08,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'integrated course',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.08,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'introductory class',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.05,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'lecture',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'seminar',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.01,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'academic event',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'tutorial',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.05,
+      },
+      {
+        filter: {
+          term: {
+            type: 'building',
+          },
+        },
+        weight: 1.6,
+      },
+      {
+        filter: {
+          term: {
+            type: 'point of interest',
+          },
+        },
+        weight: 1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'point of interest',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'cafe',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'point of interest',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'learn',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'point of interest',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'library',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.2,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'point of interest',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'restaurant',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 1.1,
+      },
+      {
+        filter: {
+          term: {
+            type: 'dish',
+          },
+        },
+        weight: 1,
+      },
+      {
+        filter: {
+          bool: {
+            must: [
+              {
+                term: {
+                  type: 'dish',
+                },
+              },
+              {
+                term: {
+                  'categories.raw': 'main dish',
+                },
+              },
+            ],
+            should: [],
+          },
+        },
+        weight: 2,
+      },
+    ],
+    query: {
+      bool: {
+        minimum_should_match: 0,
+        must: [
+          {
+            dis_max: {
+              boost: 1.2,
+              queries: [
+                {
+                  match: {
+                    name: {
+                      boost: 1.3,
+                      fuzziness: 'AUTO',
+                      query: 'mathematics',
+                    },
+                  },
+                },
+                {
+                  query_string: {
+                    default_field: 'name',
+                    minimum_should_match: '75%',
+                    query: 'mathematics',
+                  },
+                },
+              ],
+              tie_breaker: 0,
+            },
+          },
+          {
+            term: {
+              'type.raw': 'academic event',
+            },
+          },
+        ],
+        should: [],
+      },
+    },
+    score_mode: 'multiply',
+  },
+};
--- a/backend/proxy/package.json
+++ b/backend/proxy/package.json
@@ -34,7 +34,7 @@
    "is-cidr": "4.0.2",
    "mustache": "4.2.0",
    "semver": "7.3.8",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "devDependencies": {
    "@openstapps/eslint-config": "workspace:*",
--- a/configuration/eslint-config/package.json
+++ b/configuration/eslint-config/package.json
@@ -14,7 +14,7 @@
    "@openstapps/tsconfig": "workspace:*",
    "@types/node": "18.15.3",
    "eslint": "8.33.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "peerDependencies": {
    "@typescript-eslint/eslint-plugin": "5.49.0",
--- a/configuration/projectmanagement/package.json
+++ b/configuration/projectmanagement/package.json
@@ -52,7 +52,7 @@
    "mocha": "10.2.0",
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/examples/minimal-connector/package.json
+++ b/examples/minimal-connector/package.json
@@ -47,7 +47,7 @@
    "nyc": "15.1.0",
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/examples/minimal-plugin/package.json
+++ b/examples/minimal-plugin/package.json
@@ -34,7 +34,7 @@
    "@types/express": "4.17.17",
    "@types/node": "18.15.3",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/frontend/app/package.json
+++ b/frontend/app/package.json
@@ -163,7 +163,7 @@
    "protractor": "7.0.0",
    "surge": "0.23.1",
    "ts-node": "10.9.1",
-    "typescript": "4.6.4",
+    "typescript": "4.8.4",
    "webpack-bundle-analyzer": "4.7.0"
  },
  "prettier": "@openstapps/prettier-config",
--- a/package.json
+++ b/package.json
@@ -24,6 +24,6 @@
    "syncpack": "10.1.0",
    "turbo": "1.10.0",
    "typedoc": "0.24.7",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  }
 }
--- a/packages/api/package.json
+++ b/packages/api/package.json
@@ -77,7 +77,7 @@
    "nock": "13.3.1",
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "peerDependencies": {
    "@openstapps/core": "workspace:*"
--- a/packages/collection-utils/package.json
+++ b/packages/collection-utils/package.json
@@ -24,7 +24,7 @@
    "mocha": "10.2.0",
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/packages/core-tools/package.json
+++ b/packages/core-tools/package.json
@@ -76,7 +76,7 @@
    "nock": "13.3.1",
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -67,7 +67,7 @@
    "surge": "0.23.1",
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/packages/easy-ast/package.json
+++ b/packages/easy-ast/package.json
@@ -20,7 +20,7 @@
    "@openstapps/collection-utils": "workspace:*",
    "@openstapps/logger": "workspace:*",
    "glob": "10.2.6",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "devDependencies": {
    "@openstapps/eslint-config": "workspace:*",
--- a/packages/gitlab-api/package.json
+++ b/packages/gitlab-api/package.json
@@ -36,7 +36,7 @@
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
    "typedoc": "0.24.7",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -44,7 +44,7 @@
    "ts-node": "10.9.1",
    "tsup": "6.7.0",
    "typedoc": "0.24.7",
-    "typescript": "4.6.4"
+    "typescript": "4.8.4"
  },
  "tsup": {
    "entry": [
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -30,10 +30,10 @@ importers:
        version: 1.10.0
      typedoc:
        specifier: 0.24.7
-        version: 0.24.7(typescript@4.6.4)
+        version: 0.24.7(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  backend/backend:
    dependencies:
@@ -96,7 +96,7 @@ importers:
        version: 2.2.5
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      uuid:
        specifier: 8.3.2
        version: 8.3.2
@@ -172,10 +172,10 @@ importers:
        version: 8.3.4
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -235,10 +235,10 @@ importers:
        version: 6.3.3
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  backend/proxy:
    dependencies:
@@ -273,8 +273,8 @@ importers:
        specifier: 7.3.8
        version: 7.3.8
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4
    devDependencies:
      '@openstapps/eslint-config':
        specifier: workspace:*
@@ -311,10 +311,10 @@ importers:
        version: 3.2.9
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -350,10 +350,10 @@ importers:
        version: 3.7.0(chai@4.3.7)(sinon@15.0.4)
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)

  configuration/backend-config:
    devDependencies:
@@ -368,10 +368,10 @@ importers:
        version: link:../tsconfig
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      eslint:
        specifier: 8.33.0
        version: 8.33.0
@@ -395,10 +395,10 @@ importers:
    dependencies:
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      eslint-config-prettier:
        specifier: 8.6.0
        version: 8.6.0(eslint@8.33.0)
@@ -422,8 +422,8 @@ importers:
        specifier: 8.33.0
        version: 8.33.0
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  configuration/nyc-config: {}

@@ -489,10 +489,10 @@ importers:
        version: 0.2.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -525,13 +525,13 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  configuration/tsconfig: {}

@@ -582,10 +582,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      chai:
        specifier: 4.3.7
        version: 4.3.7
@@ -624,13 +624,13 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  examples/minimal-plugin:
    dependencies:
@@ -654,7 +654,7 @@ importers:
        version: 4.18.2
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
    devDependencies:
      '@openstapps/eslint-config':
        specifier: workspace:*
@@ -673,10 +673,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      eslint:
        specifier: 8.33.0
        version: 8.33.0
@@ -697,10 +697,10 @@ importers:
        version: 2.8.6
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  frontend/app:
    dependencies:
@@ -881,7 +881,7 @@ importers:
        version: 0.1303.9
      '@angular-devkit/build-angular':
        specifier: 13.3.9
-        version: 13.3.9(@angular/compiler-cli@13.3.11)(karma@6.4.1)(protractor@7.0.0)(typescript@4.6.4)
+        version: 13.3.9(@angular/compiler-cli@13.3.11)(karma@6.4.1)(protractor@7.0.0)(typescript@4.8.4)
      '@angular-devkit/core':
        specifier: 13.3.9
        version: 13.3.9(chokidar@3.5.3)
@@ -890,19 +890,19 @@ importers:
        version: 13.3.9(chokidar@3.5.3)
      '@angular-eslint/builder':
        specifier: 13.5.0
-        version: 13.5.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 13.5.0(eslint@8.33.0)(typescript@4.8.4)
      '@angular-eslint/eslint-plugin':
        specifier: 13.5.0
-        version: 13.5.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 13.5.0(eslint@8.33.0)(typescript@4.8.4)
      '@angular-eslint/eslint-plugin-template':
        specifier: 13.5.0
-        version: 13.5.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 13.5.0(eslint@8.33.0)(typescript@4.8.4)
      '@angular-eslint/schematics':
        specifier: 13.5.0
-        version: 13.5.0(@angular/cli@13.3.9)(eslint@8.33.0)(typescript@4.6.4)
+        version: 13.5.0(@angular/cli@13.3.9)(eslint@8.33.0)(typescript@4.8.4)
      '@angular-eslint/template-parser':
        specifier: 13.5.0
-        version: 13.5.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 13.5.0(eslint@8.33.0)(typescript@4.8.4)
      '@angular/cli':
        specifier: 13.3.9
        version: 13.3.9
@@ -911,7 +911,7 @@ importers:
        version: 13.3.11
      '@angular/compiler-cli':
        specifier: 13.3.11
-        version: 13.3.11(@angular/compiler@13.3.11)(typescript@4.6.4)
+        version: 13.3.11(@angular/compiler@13.3.11)(typescript@4.8.4)
      '@angular/language-service':
        specifier: 13.3.11
        version: 13.3.11
@@ -971,10 +971,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      cordova-res:
        specifier: 0.15.4
        version: 0.15.4
@@ -1043,10 +1043,10 @@ importers:
        version: 0.23.1
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4
      webpack-bundle-analyzer:
        specifier: 4.7.0
        version: 4.7.0
@@ -1158,10 +1158,10 @@ importers:
        version: 10.0.1
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -1206,13 +1206,13 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  packages/collection-utils:
    devDependencies:
@@ -1236,10 +1236,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -1269,13 +1269,13 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  packages/core:
    dependencies:
@@ -1336,10 +1336,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -1378,13 +1378,13 @@ importers:
        version: 0.23.1
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  packages/core-tools:
    dependencies:
@@ -1484,10 +1484,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -1520,13 +1520,13 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  packages/easy-ast:
    dependencies:
@@ -1540,8 +1540,8 @@ importers:
        specifier: 10.2.6
        version: 10.2.6
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4
    devDependencies:
      '@openstapps/eslint-config':
        specifier: workspace:*
@@ -1563,10 +1563,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -1596,10 +1596,10 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)

  packages/es-mapping-generator:
    dependencies:
@@ -1715,10 +1715,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      eslint:
        specifier: 8.33.0
        version: 8.33.0
@@ -1739,16 +1739,16 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typedoc:
        specifier: 0.24.7
-        version: 0.24.7(typescript@4.6.4)
+        version: 0.24.7(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

  packages/logger:
    dependencies:
@@ -1791,10 +1791,10 @@ importers:
        version: 18.15.3
      '@typescript-eslint/eslint-plugin':
        specifier: 5.49.0
-        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/parser':
        specifier: 5.49.0
-        version: 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+        version: 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      c8:
        specifier: 7.13.0
        version: 7.13.0
@@ -1830,16 +1830,16 @@ importers:
        version: 2.8.6
      ts-node:
        specifier: 10.9.1
-        version: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+        version: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      tsup:
        specifier: 6.7.0
-        version: 6.7.0(ts-node@10.9.1)(typescript@4.6.4)
+        version: 6.7.0(ts-node@10.9.1)(typescript@4.8.4)
      typedoc:
        specifier: 0.24.7
-        version: 0.24.7(typescript@4.6.4)
+        version: 0.24.7(typescript@4.8.4)
      typescript:
-        specifier: 4.6.4
-        version: 4.6.4
+        specifier: 4.8.4
+        version: 4.8.4

 packages:

@@ -1873,7 +1873,7 @@ packages:
      - chokidar
    dev: true

-  /@angular-devkit/build-angular@13.3.9(@angular/compiler-cli@13.3.11)(karma@6.4.1)(protractor@7.0.0)(typescript@4.6.4):
+  /@angular-devkit/build-angular@13.3.9(@angular/compiler-cli@13.3.11)(karma@6.4.1)(protractor@7.0.0)(typescript@4.8.4):
    resolution: {integrity: sha512-1LqcMizeabx3yOkx3tptCSAoEhG6nO6hPgI/B3EJ07G/ZcoxunMWSeN3P3zT10dZMEHhcxl+8cSStSXaXj9hfA==}
    engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
    peerDependencies:
@@ -1903,7 +1903,7 @@ packages:
      '@angular-devkit/architect': 0.1303.9
      '@angular-devkit/build-webpack': 0.1303.9(webpack-dev-server@4.7.3)(webpack@5.70.0)
      '@angular-devkit/core': 13.3.9(chokidar@3.5.3)
-      '@angular/compiler-cli': 13.3.11(@angular/compiler@13.3.11)(typescript@4.6.4)
+      '@angular/compiler-cli': 13.3.11(@angular/compiler@13.3.11)(typescript@4.8.4)
      '@babel/core': 7.16.12
      '@babel/generator': 7.16.8
      '@babel/helper-annotate-as-pure': 7.16.7
@@ -1914,7 +1914,7 @@ packages:
      '@babel/runtime': 7.16.7
      '@babel/template': 7.16.7
      '@discoveryjs/json-ext': 0.5.6
-      '@ngtools/webpack': 13.3.9(@angular/compiler-cli@13.3.11)(typescript@4.6.4)(webpack@5.70.0)
+      '@ngtools/webpack': 13.3.9(@angular/compiler-cli@13.3.11)(typescript@4.8.4)(webpack@5.70.0)
      ansi-colors: 4.1.1
      babel-loader: 8.2.5(@babel/core@7.16.12)(webpack@5.70.0)
      babel-plugin-istanbul: 6.1.1
@@ -1961,7 +1961,7 @@ packages:
      text-table: 0.2.0
      tree-kill: 1.2.2
      tslib: 2.3.1
-      typescript: 4.6.4
+      typescript: 4.8.4
      webpack: 5.70.0(esbuild@0.14.22)
      webpack-dev-middleware: 5.3.0(webpack@5.70.0)
      webpack-dev-server: 4.7.3(webpack@5.70.0)
@@ -2082,7 +2082,7 @@ packages:
      - chokidar
    dev: true

-  /@angular-eslint/builder@13.5.0(eslint@8.33.0)(typescript@4.6.4):
+  /@angular-eslint/builder@13.5.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-IYY/HYS4fSddJLs2pAkMkKhHL07driUILPxGnGLblfWuoJBhRspyrVL3uZc3Q4iJXc1RJfaOno9oRw11FGyL6Q==}
    peerDependencies:
      eslint: ^7.0.0 || ^8.0.0
@@ -2090,7 +2090,7 @@ packages:
    dependencies:
      '@nrwl/devkit': 13.1.3
      eslint: 8.33.0
-      typescript: 4.6.4
+      typescript: 4.8.4
    transitivePeerDependencies:
      - '@swc-node/register'
      - '@swc/core'
@@ -2101,43 +2101,43 @@ packages:
    resolution: {integrity: sha512-7M/5ilxqPD3ydgqqdLsYs3kBwZgNg2Y6C01B5SEHZNLqLT9kAJa7I4y6GlxCZqejCIh554kdXGeV3abIxFccSg==}
    dev: true

-  /@angular-eslint/eslint-plugin-template@13.5.0(eslint@8.33.0)(typescript@4.6.4):
+  /@angular-eslint/eslint-plugin-template@13.5.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-ZVSXayn8MqYOhYomH2Cjc0azhuUQbY9fp9dKjJZOD64KhP8BYHw8+Ogc9E/FU5oZQ9fKw6A+23NAYKmLNqSAgA==}
    peerDependencies:
      eslint: ^7.0.0 || ^8.0.0
      typescript: '*'
    dependencies:
      '@angular-eslint/bundled-angular-compiler': 13.5.0
-      '@typescript-eslint/experimental-utils': 5.27.1(eslint@8.33.0)(typescript@4.6.4)
+      '@typescript-eslint/experimental-utils': 5.27.1(eslint@8.33.0)(typescript@4.8.4)
      aria-query: 4.2.2
      axobject-query: 2.2.0
      eslint: 8.33.0
-      typescript: 4.6.4
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color
    dev: true

-  /@angular-eslint/eslint-plugin@13.5.0(eslint@8.33.0)(typescript@4.6.4):
+  /@angular-eslint/eslint-plugin@13.5.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-k9o9WIqUkdO8tdYFCJ54PUWsNd9HHflih/GmA13EWciBYx8QxciwBh0u4NSAnbtOwp4Y7juGZ/Dta5ZrT/2VBA==}
    peerDependencies:
      eslint: ^7.0.0 || ^8.0.0
      typescript: '*'
    dependencies:
-      '@angular-eslint/utils': 13.5.0(eslint@8.33.0)(typescript@4.6.4)
-      '@typescript-eslint/experimental-utils': 5.27.1(eslint@8.33.0)(typescript@4.6.4)
+      '@angular-eslint/utils': 13.5.0(eslint@8.33.0)(typescript@4.8.4)
+      '@typescript-eslint/experimental-utils': 5.27.1(eslint@8.33.0)(typescript@4.8.4)
      eslint: 8.33.0
-      typescript: 4.6.4
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color
    dev: true

-  /@angular-eslint/schematics@13.5.0(@angular/cli@13.3.9)(eslint@8.33.0)(typescript@4.6.4):
+  /@angular-eslint/schematics@13.5.0(@angular/cli@13.3.9)(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-0LvdalNpYb0oWwptwkeK2PVokfQ9itMIp8/aMjbOLH1RQ3eHFZgBtVvVm3G5EpPKzbL0llaeTifZvH2z70qVYQ==}
    peerDependencies:
      '@angular/cli': '>= 13.0.0 < 14.0.0'
    dependencies:
-      '@angular-eslint/eslint-plugin': 13.5.0(eslint@8.33.0)(typescript@4.6.4)
-      '@angular-eslint/eslint-plugin-template': 13.5.0(eslint@8.33.0)(typescript@4.6.4)
+      '@angular-eslint/eslint-plugin': 13.5.0(eslint@8.33.0)(typescript@4.8.4)
+      '@angular-eslint/eslint-plugin-template': 13.5.0(eslint@8.33.0)(typescript@4.8.4)
      '@angular/cli': 13.3.9
      ignore: 5.2.0
      strip-json-comments: 3.1.1
@@ -2148,7 +2148,7 @@ packages:
      - typescript
    dev: true

-  /@angular-eslint/template-parser@13.5.0(eslint@8.33.0)(typescript@4.6.4):
+  /@angular-eslint/template-parser@13.5.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-k+24+kBjaOuthfp9RBQB0zH6UqeizZuFQFEuZEQbvirPbdQ2SqNBw7IcmW2Qw1v7fjFe6/6gqK7wm2g7o9ZZvA==}
    peerDependencies:
      eslint: ^7.0.0 || ^8.0.0
@@ -2157,19 +2157,19 @@ packages:
      '@angular-eslint/bundled-angular-compiler': 13.5.0
      eslint: 8.33.0
      eslint-scope: 5.1.1
-      typescript: 4.6.4
+      typescript: 4.8.4
    dev: true

-  /@angular-eslint/utils@13.5.0(eslint@8.33.0)(typescript@4.6.4):
+  /@angular-eslint/utils@13.5.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-wX3W6STSDJDJ7ZyEsUdBp4HUPwmillMmKcdnFsy+qxbpJFzFOxOFpK1zet4ELsq1XpB89i9vRvC3vYbpHn3CSw==}
    peerDependencies:
      eslint: ^7.0.0 || ^8.0.0
      typescript: '*'
    dependencies:
      '@angular-eslint/bundled-angular-compiler': 13.5.0
-      '@typescript-eslint/experimental-utils': 5.27.1(eslint@8.33.0)(typescript@4.6.4)
+      '@typescript-eslint/experimental-utils': 5.27.1(eslint@8.33.0)(typescript@4.8.4)
      eslint: 8.33.0
-      typescript: 4.6.4
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -2242,7 +2242,7 @@ packages:
      tslib: 2.4.1
    dev: false

-  /@angular/compiler-cli@13.3.11(@angular/compiler@13.3.11)(typescript@4.6.4):
+  /@angular/compiler-cli@13.3.11(@angular/compiler@13.3.11)(typescript@4.8.4):
    resolution: {integrity: sha512-cl+3Wzxt8NRi2WY+RdsxuQ3yQRUp8pSlfSlJJnfaKE1BEqap6uem2DovuhnIbmrLhxZ5xt7o+I1szyO6sn6+ag==}
    engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0}
    hasBin: true
@@ -2260,7 +2260,7 @@ packages:
      semver: 7.3.8
      sourcemap-codec: 1.4.8
      tslib: 2.4.1
-      typescript: 4.6.4
+      typescript: 4.8.4
      yargs: 17.7.1
    transitivePeerDependencies:
      - supports-color
@@ -4928,7 +4928,7 @@ packages:
    dependencies:
      ansi-colors: 4.1.3
      fancy-log: 1.3.3
-      typescript: 4.6.4
+      typescript: 4.8.4
    dev: true

  /@compodoc/ngd-transformer@2.1.0:
@@ -5777,7 +5777,7 @@ packages:
      read-yaml-file: 1.1.0
    dev: true

-  /@ngtools/webpack@13.3.9(@angular/compiler-cli@13.3.11)(typescript@4.6.4)(webpack@5.70.0):
+  /@ngtools/webpack@13.3.9(@angular/compiler-cli@13.3.11)(typescript@4.8.4)(webpack@5.70.0):
    resolution: {integrity: sha512-wmgOI5sogAuilwBZJqCHVMjm2uhDxjdSmNLFx7eznwGDa6LjvjuATqCv2dVlftq0Y/5oZFVrg5NpyHt5kfZ8Cg==}
    engines: {node: ^12.20.0 || ^14.15.0 || >=16.10.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'}
    peerDependencies:
@@ -5785,8 +5785,8 @@ packages:
      typescript: '>=4.4.3 <4.7'
      webpack: ^5.30.0
    dependencies:
-      '@angular/compiler-cli': 13.3.11(@angular/compiler@13.3.11)(typescript@4.6.4)
-      typescript: 4.6.4
+      '@angular/compiler-cli': 13.3.11(@angular/compiler@13.3.11)(typescript@4.8.4)
+      typescript: 4.8.4
      webpack: 5.70.0(esbuild@0.14.22)
    dev: true

@@ -6773,7 +6773,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/eslint-plugin@5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.6.4):
+  /@typescript-eslint/eslint-plugin@5.49.0(@typescript-eslint/parser@5.49.0)(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-IhxabIpcf++TBaBa1h7jtOWyon80SXPRLDq0dVz5SLFC/eW6tofkw/O7Ar3lkx5z5U6wzbKDrl2larprp5kk5Q==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -6784,28 +6784,28 @@ packages:
      typescript:
        optional: true
    dependencies:
-      '@typescript-eslint/parser': 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+      '@typescript-eslint/parser': 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      '@typescript-eslint/scope-manager': 5.49.0
-      '@typescript-eslint/type-utils': 5.49.0(eslint@8.33.0)(typescript@4.6.4)
-      '@typescript-eslint/utils': 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+      '@typescript-eslint/type-utils': 5.49.0(eslint@8.33.0)(typescript@4.8.4)
+      '@typescript-eslint/utils': 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      debug: 4.3.4(supports-color@5.5.0)
      eslint: 8.33.0
      ignore: 5.2.4
      natural-compare-lite: 1.4.0
      regexpp: 3.2.0
      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.6.4)
-      typescript: 4.6.4
+      tsutils: 3.21.0(typescript@4.8.4)
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color

-  /@typescript-eslint/experimental-utils@5.27.1(eslint@8.33.0)(typescript@4.6.4):
+  /@typescript-eslint/experimental-utils@5.27.1(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-Vd8uewIixGP93sEnmTRIH6jHZYRQRkGPDPpapACMvitJKX8335VHNyqKTE+mZ+m3E2c5VznTZfSsSsS5IF7vUA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
      eslint: ^6.0.0 || ^7.0.0 || ^8.0.0
    dependencies:
-      '@typescript-eslint/utils': 5.27.1(eslint@8.33.0)(typescript@4.6.4)
+      '@typescript-eslint/utils': 5.27.1(eslint@8.33.0)(typescript@4.8.4)
      eslint: 8.33.0
    transitivePeerDependencies:
      - supports-color
@@ -6832,7 +6832,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/parser@5.49.0(eslint@8.33.0)(typescript@4.6.4):
+  /@typescript-eslint/parser@5.49.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-veDlZN9mUhGqU31Qiv2qEp+XrJj5fgZpJ8PW30sHU+j/8/e5ruAhLaVDAeznS7A7i4ucb/s8IozpDtt9NqCkZg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -6844,10 +6844,10 @@ packages:
    dependencies:
      '@typescript-eslint/scope-manager': 5.49.0
      '@typescript-eslint/types': 5.49.0
-      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.6.4)
+      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.8.4)
      debug: 4.3.4(supports-color@5.5.0)
      eslint: 8.33.0
-      typescript: 4.6.4
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color

@@ -6886,7 +6886,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/type-utils@5.49.0(eslint@8.33.0)(typescript@4.6.4):
+  /@typescript-eslint/type-utils@5.49.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-eUgLTYq0tR0FGU5g1YHm4rt5H/+V2IPVkP0cBmbhRyEmyGe4XvJ2YJ6sYTmONfjmdMqyMLad7SB8GvblbeESZA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -6896,12 +6896,12 @@ packages:
      typescript:
        optional: true
    dependencies:
-      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.6.4)
-      '@typescript-eslint/utils': 5.49.0(eslint@8.33.0)(typescript@4.6.4)
+      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.8.4)
+      '@typescript-eslint/utils': 5.49.0(eslint@8.33.0)(typescript@4.8.4)
      debug: 4.3.4(supports-color@5.5.0)
      eslint: 8.33.0
-      tsutils: 3.21.0(typescript@4.6.4)
-      typescript: 4.6.4
+      tsutils: 3.21.0(typescript@4.8.4)
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color

@@ -6914,7 +6914,7 @@ packages:
    resolution: {integrity: sha512-7If46kusG+sSnEpu0yOz2xFv5nRz158nzEXnJFCGVEHWnuzolXKwrH5Bsf9zsNlOQkyZuk0BZKKoJQI+1JPBBg==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}

-  /@typescript-eslint/typescript-estree@5.27.1(typescript@4.6.4):
+  /@typescript-eslint/typescript-estree@5.27.1(typescript@4.8.4):
    resolution: {integrity: sha512-DnZvvq3TAJ5ke+hk0LklvxwYsnXpRdqUY5gaVS0D4raKtbznPz71UJGnPTHEFo0GDxqLOLdMkkmVZjSpET1hFw==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -6929,8 +6929,8 @@ packages:
      globby: 11.1.0
      is-glob: 4.0.3
      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.6.4)
-      typescript: 4.6.4
+      tsutils: 3.21.0(typescript@4.8.4)
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color
    dev: true
@@ -6956,7 +6956,7 @@ packages:
      - supports-color
    dev: true

-  /@typescript-eslint/typescript-estree@5.49.0(typescript@4.6.4):
+  /@typescript-eslint/typescript-estree@5.49.0(typescript@4.8.4):
    resolution: {integrity: sha512-PBdx+V7deZT/3GjNYPVQv1Nc0U46dAHbIuOG8AZ3on3vuEKiPDwFE/lG1snN2eUB9IhF7EyF7K1hmTcLztNIsA==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -6971,12 +6971,12 @@ packages:
      globby: 11.1.0
      is-glob: 4.0.3
      semver: 7.3.8
-      tsutils: 3.21.0(typescript@4.6.4)
-      typescript: 4.6.4
+      tsutils: 3.21.0(typescript@4.8.4)
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color

-  /@typescript-eslint/utils@5.27.1(eslint@8.33.0)(typescript@4.6.4):
+  /@typescript-eslint/utils@5.27.1(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-mZ9WEn1ZLDaVrhRaYgzbkXBkTPghPFsup8zDbbsYTxC5OmqrFE7skkKS/sraVsLP3TcT3Ki5CSyEFBRkLH/H/w==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -6985,7 +6985,7 @@ packages:
      '@types/json-schema': 7.0.11
      '@typescript-eslint/scope-manager': 5.27.1
      '@typescript-eslint/types': 5.27.1
-      '@typescript-eslint/typescript-estree': 5.27.1(typescript@4.6.4)
+      '@typescript-eslint/typescript-estree': 5.27.1(typescript@4.8.4)
      eslint: 8.33.0
      eslint-scope: 5.1.1
      eslint-utils: 3.0.0(eslint@8.33.0)
@@ -7014,7 +7014,7 @@ packages:
      - typescript
    dev: true

-  /@typescript-eslint/utils@5.49.0(eslint@8.33.0)(typescript@4.6.4):
+  /@typescript-eslint/utils@5.49.0(eslint@8.33.0)(typescript@4.8.4):
    resolution: {integrity: sha512-cPJue/4Si25FViIb74sHCLtM4nTSBXtLx1d3/QT6mirQ/c65bV8arBEebBJJizfq8W2YyMoPI/WWPFWitmNqnQ==}
    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
    peerDependencies:
@@ -7024,7 +7024,7 @@ packages:
      '@types/semver': 7.3.13
      '@typescript-eslint/scope-manager': 5.49.0
      '@typescript-eslint/types': 5.49.0
-      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.6.4)
+      '@typescript-eslint/typescript-estree': 5.49.0(typescript@4.8.4)
      eslint: 8.33.0
      eslint-scope: 5.1.1
      eslint-utils: 3.0.0(eslint@8.33.0)
@@ -15869,7 +15869,7 @@ packages:
        optional: true
    dependencies:
      lilconfig: 2.1.0
-      ts-node: 10.9.1(@types/node@18.15.3)(typescript@4.6.4)
+      ts-node: 10.9.1(@types/node@18.15.3)(typescript@4.8.4)
      yaml: 1.10.2
    dev: true

@@ -18708,7 +18708,7 @@ packages:
      yn: 3.1.1
    dev: true

-  /ts-node@10.9.1(@types/node@18.15.3)(typescript@4.6.4):
+  /ts-node@10.9.1(@types/node@18.15.3)(typescript@4.8.4):
    resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
    hasBin: true
    peerDependencies:
@@ -18734,7 +18734,7 @@ packages:
      create-require: 1.1.1
      diff: 4.0.2
      make-error: 1.3.6
-      typescript: 4.6.4
+      typescript: 4.8.4
      v8-compile-cache-lib: 3.0.1
      yn: 3.1.1

@@ -18761,7 +18761,7 @@ packages:
  /tslib@2.4.1:
    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}

-  /tsup@6.7.0(ts-node@10.9.1)(typescript@4.6.4):
+  /tsup@6.7.0(ts-node@10.9.1)(typescript@4.8.4):
    resolution: {integrity: sha512-L3o8hGkaHnu5TdJns+mCqFsDBo83bJ44rlK7e6VdanIvpea4ArPcU3swWGsLVbXak1PqQx/V+SSmFPujBK+zEQ==}
    engines: {node: '>=14.18'}
    hasBin: true
@@ -18791,7 +18791,7 @@ packages:
      source-map: 0.8.0-beta.0
      sucrase: 3.30.0
      tree-kill: 1.2.2
-      typescript: 4.6.4
+      typescript: 4.8.4
    transitivePeerDependencies:
      - supports-color
      - ts-node
@@ -18807,14 +18807,14 @@ packages:
      typescript: 3.8.3
    dev: true

-  /tsutils@3.21.0(typescript@4.6.4):
+  /tsutils@3.21.0(typescript@4.8.4):
    resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
    engines: {node: '>= 6'}
    peerDependencies:
      typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
    dependencies:
      tslib: 1.14.1
-      typescript: 4.6.4
+      typescript: 4.8.4

  /tty-browserify@0.0.0:
    resolution: {integrity: sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==}
@@ -19013,7 +19013,7 @@ packages:
      typescript: 3.8.3
    dev: false

-  /typedoc@0.24.7(typescript@4.6.4):
+  /typedoc@0.24.7(typescript@4.8.4):
    resolution: {integrity: sha512-zzfKDFIZADA+XRIp2rMzLe9xZ6pt12yQOhCr7cD7/PBTjhPmMyMvGrkZ2lPNJitg3Hj1SeiYFNzCsSDrlpxpKw==}
    engines: {node: '>= 14.14'}
    hasBin: true
@@ -19024,7 +19024,7 @@ packages:
      marked: 4.3.0
      minimatch: 9.0.1
      shiki: 0.14.1
-      typescript: 4.6.4
+      typescript: 4.8.4
    dev: true

  /typescript@3.8.3:
@@ -19032,8 +19032,8 @@ packages:
    engines: {node: '>=4.2.0'}
    hasBin: true

-  /typescript@4.6.4:
-    resolution: {integrity: sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==}
+  /typescript@4.8.4:
+    resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
    engines: {node: '>=4.2.0'}
    hasBin: true