diff --git a/.gitignore b/.gitignore index 35f9eb9..30432be 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ Thumbs.db # CUSTOM result +/public/meta +/public/index.ixx diff --git a/flake.lock b/flake.lock index ee9838e..87583d2 100644 --- a/flake.lock +++ b/flake.lock @@ -18,13 +18,37 @@ "type": "github" } }, + "ixx": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729544999, + "narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "65c207c92befec93e22086da9456d3906a4e999c", + "type": "github" + }, + "original": { + "owner": "NuschtOS", + "ref": "v0.0.5", + "repo": "ixx", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", + "lastModified": 1729256560, + "narHash": "sha256-/uilDXvCIEs3C9l73JTACm4quuHUsIHcns1c+cHUJwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", + "rev": "4c2fcb090b1f3e5b47eaa7bd33913b574a11e0a0", "type": "github" }, "original": { @@ -37,6 +61,7 @@ "root": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": "nixpkgs" } }, diff --git a/flake.nix b/flake.nix index 69bcd36..5e67ffc 100644 --- a/flake.nix +++ b/flake.nix @@ -4,28 +4,37 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; flake-utils.url = "github:numtide/flake-utils"; + ixx = { + # match version with npm package + url = "github:NuschtOS/ixx/v0.0.5"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; }; - outputs = { nixpkgs, flake-utils, ... }: + outputs = { nixpkgs, flake-utils, ixx, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = (import nixpkgs) { inherit system; }; + ixxPkgs = ixx.packages.${system}; in { devShells.default = pkgs.mkShell { - buildInputs = with pkgs; [ + nativeBuildInputs = with pkgs; [ nodejs pnpm - (python3.withPackages (ps: with ps; [ markdown pygments ])) + ixxPkgs.ixx ]; }; packages = rec { nuscht-search = pkgs.callPackage ./nix/frontend.nix { }; - inherit (pkgs.callPackages ./nix/wrapper.nix { inherit nuscht-search; }) mkOptionsJSON mkSearchJSON mkSearch mkMultiSearch; + inherit (pkgs.callPackages ./nix/wrapper.nix { inherit nuscht-search ixxPkgs; }) mkOptionsJSON mkSearchJSON mkSearch mkMultiSearch; default = nuscht-search; }; } diff --git a/nix/fixup-options.py b/nix/fixup-options.py deleted file mode 100644 index e173a68..0000000 --- a/nix/fixup-options.py +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env python -import sys -import json -import markdown -from pygments import highlight -from pygments.lexers import NixLexer -from pygments.formatters import HtmlFormatter -from html_sanitizer import Sanitizer - -sanitizer = Sanitizer() - -if (len(sys.argv) - 1) % 2 != 0: - print("Usage: path/to/options.json https://example.com/option/ path/to/other/options.json https://example.com/other_option/") - sys.exit(1) - -def code(code): - if code["_type"] == 'literalExpression': - return highlight(code["text"], NixLexer(), HtmlFormatter()) - elif code["_type"] == 'literalMD': - return sanitizer.sanitize(markdown.markdown(code["text"])) - else: - print("ERROR: cannot handle a " + code["_type"], file=sys.stderr) - sys.exit(1) - - -def update_declaration(url, declaration): - if "url" in declaration: - return declaration["url"] - if declaration.startswith("/nix/store/"): - # strip prefix: /nix/store/0a0mxyfmad6kaknkkr0ysraifws856i7-source - return f"{url}{declaration[51:]}" - return declaration - -out = [] - -for i in range(1,len(sys.argv),2): - with open(sys.argv[i], "r", encoding="utf-8") as file: - url = sys.argv[i+1] - data = json.load(file) - - for key in data: - entry = data[key] - entry["name"] = key - del entry["loc"] - entry["declarations"] = list(map(lambda x: update_declaration(url, x), entry["declarations"])) - - entry["description"] = sanitizer.sanitize(markdown.markdown(entry["description"])) - if 'default' in entry: - entry['default'] = code(entry["default"]) - if 'example' in entry: - entry['example'] = code(entry["example"]) - out.append(entry) - -out.sort(key=lambda option: option["name"]) - -print(json.dumps(out)) diff --git a/nix/frontend.nix b/nix/frontend.nix index 4718408..cbca953 100644 --- a/nix/frontend.nix +++ b/nix/frontend.nix @@ -15,11 +15,13 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/app/core/config.domain.ts \ --replace-fail '##TITLE##' '${title}' + substituteInPlace src/index.html \ + --replace-fail '##TITLE##' '${title}' ''; pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src; - hash = "sha256-1SwWGZtPQ3/5sumiuOSVhKmwAkYGzSDsGNFXetmqLQk="; + hash = "sha256-DLB/BTHReaTdUUTqnLkO9UsWmWp12CJ5UOVlK0sIT1Y="; }; nativeBuildInputs = [ nodejs pnpm.configHook ]; diff --git a/nix/wrapper.nix b/nix/wrapper.nix index 5de2796..182cb2a 100644 --- a/nix/wrapper.nix +++ b/nix/wrapper.nix @@ -1,4 +1,4 @@ -{ lib, nixosOptionsDoc, jq, nuscht-search, python3, runCommand, xorg }: +{ lib, nixosOptionsDoc, nuscht-search, ixxPkgs, runCommand, xorg }: rec { mkOptionsJSON = modules: (nixosOptionsDoc { @@ -15,39 +15,36 @@ rec { warningsAreErrors = false; }).optionsJSON + /share/doc/nixos/options.json; - mkSearchJSON = scopes: + mkSearchData = scopes: let optionsJSON = opt: opt.optionsJSON or (mkOptionsJSON opt.modules); - optionsJSONPrefixed = opt: - if opt?optionsJSON then (runCommand "options.json-prefixed" - { - nativeBuildInputs = [ jq ]; - } /* bash */ '' - mkdir $out - jq -r '[to_entries[] | select(.key | test("^(_module|_freeformOptions|warnings|assertions|content)\\..*") | not)] | from_entries ${lib.optionalString (opt?optionsPrefix) ''| with_entries(.key as $key | .key |= "${opt.optionsPrefix}.\($key)")''}' ${optionsJSON opt} > $out/options.json - '') + /options.json else optionsJSON opt; + config = { + scopes = map + (scope: (lib.filterAttrs (name: _value: name != "modules") scope) // { optionsJson = optionsJSON scope; }) + scopes; + }; in - runCommand "options.json" - { nativeBuildInputs = [ (python3.withPackages (ps: with ps; [ markdown pygments html-sanitizer ])) ]; } - ('' + runCommand "search-meta" + { + config = builtins.toJSON config; + passAsFile = [ "config" ]; + nativeBuildInputs = [ ixxPkgs.ixx ]; + } + '' mkdir $out - python \ - ${./fixup-options.py} \ - '' + lib.concatStringsSep " " (lib.flatten (map - (opt: [ - (optionsJSONPrefixed opt) - "'${opt.urlPrefix}'" - ]) - scopes)) + '' - > $out/options.json - ''); + ixx index \ + --index-output $out/index.ixx \ + --meta-output $out/meta \ + --chunk-size 100 \ + $configPath + ''; # mkMultiSearch { # baseHref = "/search/"; # title = "Custom Search"; # scopes = [ - # { modules = [ self.inputs.nixos-modules.nixosModule ]; urlPrefix = "https://github.com/NuschtOS/nixos-modules/blob/main/"; } - # { optionsJSON = ./path/to/options.json; optionsPrefix = "programs.example"; urlPrefix = "https://git.example.com/blob/main/"; } + # { modules = [ self.inputs.nixos-modules.nixosModule ]; urlPrefix = "https://github.com/NuschtOS/nixos-modules/blob/main/"; name = "NixOS Modules"; } + # { optionsJSON = ./path/to/options.json; optionsPrefix = "programs.example"; urlPrefix = "https://git.example.com/blob/main/"; name = "Example Module"; } # ]; # }; mkMultiSearch = { scopes, baseHref ? "/", title ? "NüschtOS Search" }: @@ -56,7 +53,7 @@ rec { '' mkdir $out lndir ${nuscht-search.override { inherit baseHref title; }} $out - ln -s ${mkSearchJSON scopes}/options.json $out/options.json + ln -s ${mkSearchData scopes}/{meta,index.ixx} $out ''; # mkSearch { modules = [ self.inputs.nixos-modules.nixosModule ]; urlPrefix = "https://github.com/NuschtOS/nixos-modules/blob/main/"; } diff --git a/package.json b/package.json index 78e2a4d..b8696ea 100644 --- a/package.json +++ b/package.json @@ -20,10 +20,11 @@ "@angular/platform-browser": "^18.2.7", "@angular/platform-browser-dynamic": "^18.2.7", "@angular/router": "^18.2.7", - "@feel/form": "^0.0.25", - "@feel/style": "^0.0.25", + "@feel/form": "^0.0.27", + "@feel/style": "^0.0.27", "@fontsource/dm-mono": "^5.1.0", "@fontsource/dm-sans": "^5.1.0", + "@nuschtos/fixx": "^0.0.5", "rxjs": "~7.8.1", "tslib": "^2.7.0", "zone.js": "~0.15.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2c3bbcd..043d925 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -33,33 +33,36 @@ importers: specifier: ^18.2.7 version: 18.2.8(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(@angular/platform-browser@18.2.8(@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(rxjs@7.8.1) '@feel/form': - specifier: ^0.0.25 - version: 0.0.25(@angular/cdk@17.3.10(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(@feel/style@0.0.25(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))) + specifier: ^0.0.27 + version: 0.0.27(@angular/cdk@17.3.10(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(@feel/style@0.0.27(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))) '@feel/style': - specifier: ^0.0.25 - version: 0.0.25(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) + specifier: ^0.0.27 + version: 0.0.27(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) '@fontsource/dm-mono': specifier: ^5.1.0 version: 5.1.0 '@fontsource/dm-sans': specifier: ^5.1.0 version: 5.1.0 + '@nuschtos/fixx': + specifier: ^0.0.5 + version: 0.0.5 rxjs: specifier: ~7.8.1 version: 7.8.1 tslib: specifier: ^2.7.0 - version: 2.8.0 + version: 2.7.0 zone.js: specifier: ~0.15.0 version: 0.15.0 devDependencies: '@angular-devkit/build-angular': specifier: ^18.2.8 - version: 18.2.9(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.6)(chokidar@3.6.0)(karma@6.4.4)(typescript@5.5.4) + version: 18.2.8(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.5)(chokidar@3.6.0)(karma@6.4.4)(typescript@5.5.4) '@angular/cli': specifier: ^18.2.8 - version: 18.2.9(chokidar@3.6.0) + version: 18.2.8(chokidar@3.6.0) '@angular/compiler-cli': specifier: ^18.2.7 version: 18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4) @@ -97,12 +100,12 @@ packages: resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} - '@angular-devkit/architect@0.1802.9': - resolution: {integrity: sha512-fubJf4WC/t3ITy+tyjI4/CKKwUP4XJTmV+Y0nyPcrkcthVyUcIpZB74NlUOvg6WECiPQuIc+CtoAaA9X5+RQ5Q==} + '@angular-devkit/architect@0.1802.8': + resolution: {integrity: sha512-/rtFQEKgS7LlB9oHr4NCBSdKnvP5kr8L5Hbd3Vl8hZOYK9QWjxKPEXnryA2d5+PCE98bBzZswCNXqELZCPTgIQ==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} - '@angular-devkit/build-angular@18.2.9': - resolution: {integrity: sha512-d4W6t9vBozFUmOP2VvihMcSg/zgr3AvJY6/b7OPuATlK+W3P6tmsqxGIQ6eKc1TxXeu3lWhi14mV2pPykfrwfA==} + '@angular-devkit/build-angular@18.2.8': + resolution: {integrity: sha512-qK/iLk7A8vQp1CyiJV4DpwfLjPKoiOlTtFqoO5vD8Tyxmc+R06FQp6GJTsZ7JtrTLYSiH+QAWiY6NgF/Rj/hHg==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^18.0.0 @@ -142,15 +145,15 @@ packages: tailwindcss: optional: true - '@angular-devkit/build-webpack@0.1802.9': - resolution: {integrity: sha512-p7xNGo5ZTV/Z0Rk+q2/E68QQLw9VT33kauDh6s010jIeBLrOwMo74JpzXMSFttQo5O4bLKP8IORzIM+0q7Uzjg==} + '@angular-devkit/build-webpack@0.1802.8': + resolution: {integrity: sha512-uPpopkXkO66SSdjtVr7xCyQCPs/x6KUC76xkDc4j0b8EEHifTbi/fNpbkcZ6wBmoAfjKLWXfKvtkh0TqKK5Hkw==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: webpack: ^5.30.0 webpack-dev-server: ^5.0.2 - '@angular-devkit/core@18.2.9': - resolution: {integrity: sha512-bsVt//5E0ua7FZfO0dCF/qGGY6KQD34/bNGyRu5B6HedimpdU2/0PGDptksU5v3yKEc9gNw0xC6mT0UsY/R9pA==} + '@angular-devkit/core@18.2.8': + resolution: {integrity: sha512-4o2T6wsmXGE/v53+F8L7kGoN2+qzt03C9rtjLVQpOljzpJVttQ8bhvfWxyYLWwcl04RWqRa+82fpIZtBkOlZJw==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: chokidar: ^3.5.2 @@ -158,8 +161,8 @@ packages: chokidar: optional: true - '@angular-devkit/schematics@18.2.9': - resolution: {integrity: sha512-aIY5/IomDOINGCtFYi77uo0acDpdQNNCighfBBUGEBNMQ1eE3oGNGpLAH/qWeuxJndgmxrdKsvws9DdT46kLig==} + '@angular-devkit/schematics@18.2.8': + resolution: {integrity: sha512-i/h2Oji5FhJMC7wDSnIl5XUe/qym+C1ZwScaATJwDyRLCUIynZkj5rLgdG/uK6l+H0PgvxigkF+akWpokkwW6w==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} '@angular/animations@18.2.8': @@ -168,8 +171,8 @@ packages: peerDependencies: '@angular/core': 18.2.8 - '@angular/build@18.2.9': - resolution: {integrity: sha512-o1hOEM2e6ARy+ck2Pohl0d/RFgbbXTw6/hTLAj3CBKjtqAGStRaVF2UlJjhi+xOxlfsOPuJJc9IpzLBteku+Ag==} + '@angular/build@18.2.8': + resolution: {integrity: sha512-ufuA4vHJSrL9SQW7bKV61DOoN1mm0t0ILTHaxSoCG3YF70cZJOX7+HNp3cK2uoldRMwbTOKSvCWBw54KKDRd5Q==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^18.0.0 @@ -201,8 +204,8 @@ packages: '@angular/core': ^17.0.0 || ^18.0.0 rxjs: ^6.5.3 || ^7.4.0 - '@angular/cli@18.2.9': - resolution: {integrity: sha512-ejTIqwvPABwK7MtVmI2qWbEaMhhbHNsq0NPzl1hwLtkrLbjdDrEVv0Wy+gN0xqrT9NyCPl4AmNLz/xuYTzgU5g==} + '@angular/cli@18.2.8': + resolution: {integrity: sha512-GKXG7F7z5rxwZ8/bnW/Bp8/zsfE/BpHmIP/icLfUIOwv2kaY5OD2tfQssWXPEuqZzYq2AYz+wjVSbWjxGoja8A==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} hasBin: true @@ -283,8 +286,8 @@ packages: resolution: {integrity: sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==} engines: {node: '>=6.9.0'} - '@babel/compat-data@7.25.8': - resolution: {integrity: sha512-ZsysZyXY4Tlx+Q53XdnOFmqwfB9QDTHYxaZYajWRoBLuLEAwI2UIbtxOjWh/cFaa9IKUlcB+DDuoskLuKu56JA==} + '@babel/compat-data@7.25.7': + resolution: {integrity: sha512-9ickoLz+hcXCeh7jrcin+/SLWm+GkxE2kTvoYyp38p4WkdFXfQJxDFGWp/YHjiKLPx06z2A7W8XKuqbReXDzsw==} engines: {node: '>=6.9.0'} '@babel/core@7.25.2': @@ -411,11 +414,6 @@ packages: engines: {node: '>=6.0.0'} hasBin: true - '@babel/parser@7.25.8': - resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==} - engines: {node: '>=6.0.0'} - hasBin: true - '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.7': resolution: {integrity: sha512-UV9Lg53zyebzD1DwQoT9mzkEKa922LNUp5YkTJ6Uta0RbyXaQNUgcvSt7qIu1PpPzVb6rd10OVNTzkyBGeVmxQ==} engines: {node: '>=6.9.0'} @@ -590,8 +588,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-class-static-block@7.25.8': - resolution: {integrity: sha512-e82gl3TCorath6YLf9xUwFehVvjvfqFhdOo4+0iVIVju+6XOi5XHkqB3P2AXnSwoeTX0HBoXq5gJFtvotJzFnQ==} + '@babel/plugin-transform-class-static-block@7.25.7': + resolution: {integrity: sha512-rvUUtoVlkDWtDWxGAiiQj0aNktTPn3eFynBcMC2IhsXweehwgdI9ODe+XjWw515kEmv22sSOTp/rxIRuTiB7zg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.12.0 @@ -632,8 +630,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0 - '@babel/plugin-transform-dynamic-import@7.25.8': - resolution: {integrity: sha512-gznWY+mr4ZQL/EWPcbBQUP3BXS5FwZp8RUOw06BaRn8tQLzN4XLIxXejpHN9Qo8x8jjBmAAKp6FoS51AgkSA/A==} + '@babel/plugin-transform-dynamic-import@7.25.7': + resolution: {integrity: sha512-UvcLuual4h7/GfylKm2IAA3aph9rwvAM2XBA0uPKU3lca+Maai4jBjjEVUS568ld6kJcgbouuumCBhMd/Yz17w==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -644,8 +642,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-export-namespace-from@7.25.8': - resolution: {integrity: sha512-sPtYrduWINTQTW7FtOy99VCTWp4H23UX7vYcut7S4CIMEXU+54zKX9uCoGkLsWXteyaMXzVHgzWbLfQ1w4GZgw==} + '@babel/plugin-transform-export-namespace-from@7.25.7': + resolution: {integrity: sha512-h3MDAP5l34NQkkNulsTNyjdaR+OiB0Im67VU//sFupouP8Q6m9Spy7l66DcaAQxtmCqGdanPByLsnwFttxKISQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -662,8 +660,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-json-strings@7.25.8': - resolution: {integrity: sha512-4OMNv7eHTmJ2YXs3tvxAfa/I43di+VcF+M4Wt66c88EAED1RoGaf1D64cL5FkRpNL+Vx9Hds84lksWvd/wMIdA==} + '@babel/plugin-transform-json-strings@7.25.7': + resolution: {integrity: sha512-Ot43PrL9TEAiCe8C/2erAjXMeVSnE/BLEx6eyrKLNFCCw5jvhTHKyHxdI1pA0kz5njZRYAnMO2KObGqOCRDYSA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -674,8 +672,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-logical-assignment-operators@7.25.8': - resolution: {integrity: sha512-f5W0AhSbbI+yY6VakT04jmxdxz+WsID0neG7+kQZbCOjuyJNdL5Nn4WIBm4hRpKnUcO9lP0eipUhFN12JpoH8g==} + '@babel/plugin-transform-logical-assignment-operators@7.25.7': + resolution: {integrity: sha512-iImzbA55BjiovLyG2bggWS+V+OLkaBorNvc/yJoeeDQGztknRnDdYfp2d/UPmunZYEnZi6Lg8QcTmNMHOB0lGA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -722,20 +720,20 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-nullish-coalescing-operator@7.25.8': - resolution: {integrity: sha512-Z7WJJWdQc8yCWgAmjI3hyC+5PXIubH9yRKzkl9ZEG647O9szl9zvmKLzpbItlijBnVhTUf1cpyWBsZ3+2wjWPQ==} + '@babel/plugin-transform-nullish-coalescing-operator@7.25.7': + resolution: {integrity: sha512-FbuJ63/4LEL32mIxrxwYaqjJxpbzxPVQj5a+Ebrc8JICV6YX8nE53jY+K0RZT3um56GoNWgkS2BQ/uLGTjtwfw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-numeric-separator@7.25.8': - resolution: {integrity: sha512-rm9a5iEFPS4iMIy+/A/PiS0QN0UyjPIeVvbU5EMZFKJZHt8vQnasbpo3T3EFcxzCeYO0BHfc4RqooCZc51J86Q==} + '@babel/plugin-transform-numeric-separator@7.25.7': + resolution: {integrity: sha512-8CbutzSSh4hmD+jJHIA8vdTNk15kAzOnFLVVgBSMGr28rt85ouT01/rezMecks9pkU939wDInImwCKv4ahU4IA==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-object-rest-spread@7.25.8': - resolution: {integrity: sha512-LkUu0O2hnUKHKE7/zYOIjByMa4VRaV2CD/cdGz0AxU9we+VA3kDDggKEzI0Oz1IroG+6gUP6UmWEHBMWZU316g==} + '@babel/plugin-transform-object-rest-spread@7.25.7': + resolution: {integrity: sha512-1JdVKPhD7Y5PvgfFy0Mv2brdrolzpzSoUq2pr6xsR+m+3viGGeHEokFKsCgOkbeFOQxfB1Vt2F0cPJLRpFI4Zg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -746,14 +744,14 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-optional-catch-binding@7.25.8': - resolution: {integrity: sha512-EbQYweoMAHOn7iJ9GgZo14ghhb9tTjgOc88xFgYngifx7Z9u580cENCV159M4xDh3q/irbhSjZVpuhpC2gKBbg==} + '@babel/plugin-transform-optional-catch-binding@7.25.7': + resolution: {integrity: sha512-m9obYBA39mDPN7lJzD5WkGGb0GO54PPLXsbcnj1Hyeu8mSRz7Gb4b1A6zxNX32ZuUySDK4G6it8SDFWD1nCnqg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-optional-chaining@7.25.8': - resolution: {integrity: sha512-q05Bk7gXOxpTHoQ8RSzGSh/LHVB9JEIkKnk3myAWwZHnYiTGYtbdrYkIsS8Xyh4ltKf7GNUSgzs/6P2bJtBAQg==} + '@babel/plugin-transform-optional-chaining@7.25.7': + resolution: {integrity: sha512-h39agClImgPWg4H8mYVAbD1qP9vClFbEjqoJmt87Zen8pjqK8FTPUwrOXAvqu5soytwxrLMd2fx2KSCp2CHcNg==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -770,8 +768,8 @@ packages: peerDependencies: '@babel/core': ^7.0.0-0 - '@babel/plugin-transform-private-property-in-object@7.25.8': - resolution: {integrity: sha512-8Uh966svuB4V8RHHg0QJOB32QK287NBksJOByoKmHMp1TAobNniNalIkI2i5IPj5+S9NYCG4VIjbEuiSN8r+ow==} + '@babel/plugin-transform-private-property-in-object@7.25.7': + resolution: {integrity: sha512-LzA5ESzBy7tqj00Yjey9yWfs3FKy4EmJyKOSWld144OxkTji81WWnUT8nkLUn+imN/zHL8ZQlOu/MTUAhHaX3g==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 @@ -881,10 +879,6 @@ packages: resolution: {integrity: sha512-vwIVdXG+j+FOpkwqHRcBgHLYNL7XMkufrlaFvL9o6Ai9sJn9+PdyIL5qa0XzTZw084c+u9LOls53eoZWP/W5WQ==} engines: {node: '>=6.9.0'} - '@babel/types@7.25.8': - resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==} - engines: {node: '>=6.9.0'} - '@colors/colors@1.5.0': resolution: {integrity: sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==} engines: {node: '>=0.1.90'} @@ -1175,16 +1169,16 @@ packages: cpu: [x64] os: [win32] - '@feel/form@0.0.25': - resolution: {integrity: sha512-S86TcCN3Va5GbgcSymsXCbe0EAm9YjueM3VWnY9WoCY4CHxNJ1YXboz/tuXtFGwzpuJ+yp73B0c+GpCZhIKAPQ==, tarball: https://codeberg.org/api/packages/m4rc3l/npm/%40feel%2Fform/-/0.0.25/form-0.0.25.tgz} + '@feel/form@0.0.27': + resolution: {integrity: sha512-/pCMGr+B9bk8MWIdhI7STpzA0rH7mc+pgmhLaohW8E7DysrpEyW+6fKNpcYF8OVUQFVeinxHzRdIMYsniWdM1Q==, tarball: https://codeberg.org/api/packages/m4rc3l/npm/%40feel%2Fform/-/0.0.27/form-0.0.27.tgz} peerDependencies: '@angular/cdk': ^17.0.0 '@angular/common': ^17.0.0 '@angular/core': ^17.0.0 - '@feel/style': 0.0.25 + '@feel/style': 0.0.27 - '@feel/style@0.0.25': - resolution: {integrity: sha512-uW1cVRlhdEKujRrBxeiTp9/dS97IHsuJzZQgvbqjmPf0gOoC9sUE5fBiGauJ+NwNq2SLv/Shlhuobzry/zQWvQ==, tarball: https://codeberg.org/api/packages/m4rc3l/npm/%40feel%2Fstyle/-/0.0.25/style-0.0.25.tgz} + '@feel/style@0.0.27': + resolution: {integrity: sha512-CNdncgpUiZ8QHOlzU9WTgklPsf8I51xWs+UjwQSNJRxCtaxEAWCd3EUtv53xvSN7idUe5ZmayyVGaYTbU17h5w==, tarball: https://codeberg.org/api/packages/m4rc3l/npm/%40feel%2Fstyle/-/0.0.27/style-0.0.27.tgz} peerDependencies: '@angular/common': ^17.0.0 '@angular/core': ^17.0.0 @@ -1375,8 +1369,8 @@ packages: cpu: [x64] os: [win32] - '@ngtools/webpack@18.2.9': - resolution: {integrity: sha512-/apDvs4qevjSWoYw3h3/c/mILFrf2EgCJfBy9f3E7PEgi2tjifOIszBRrLQkVpeHAaFgEH8zKS2ol0hAmOl8sw==} + '@ngtools/webpack@18.2.8': + resolution: {integrity: sha512-sq0kI8gEen4QlM6X8XqOYy7j4B8iLCYNo+iKxatV36ts4AXH0MuVkP56+oMaoH5oZNoSqd0RlfnotEHfvJAr8A==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} peerDependencies: '@angular/compiler-cli': ^18.0.0 @@ -1432,6 +1426,9 @@ packages: resolution: {integrity: sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==} engines: {node: ^16.14.0 || >=18.0.0} + '@nuschtos/fixx@0.0.5': + resolution: {integrity: sha512-MJkoxTALqXlga1OQJzw1C04xOSXAc7EBWy/vGYXnBFqg1VPd4c6iOjV+ejpoBy3ESVIPJkszNxN/LnjqBuSByA==} + '@pkgjs/parseargs@0.11.0': resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} engines: {node: '>=14'} @@ -1596,8 +1593,8 @@ packages: cpu: [x64] os: [win32] - '@schematics/angular@18.2.9': - resolution: {integrity: sha512-LlMHZQ6f8zrqSK24OBXi4u2MTNHNu9ZN6JXpbElq0bz/9QkUR2zy+Kk2wLpPxCwXYTZby7/xgHiTzXvG+zTdhw==} + '@schematics/angular@18.2.8': + resolution: {integrity: sha512-62Sr7/j/dlhZorxH4GzQgpJy0s162BVts0Q7knZuEacP4VL+IWOUE1NS9OFkh/cbomoyXBdoewkZ5Zd1dVX78w==} engines: {node: ^18.19.1 || ^20.11.1 || >=22.0.0, npm: ^6.11.0 || ^7.5.6 || >=8.0.0, yarn: '>= 1.13.0'} '@sigstore/bundle@2.3.2': @@ -1696,9 +1693,6 @@ packages: '@types/node@22.7.5': resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==} - '@types/node@22.7.6': - resolution: {integrity: sha512-/d7Rnj0/ExXDMcioS78/kf1lMzYk4BZV8MZGTBKzTGZ6/406ukkbYlIsZmMPhcR5KlkunDHQLrtAVmSq7r+mSw==} - '@types/qs@6.9.16': resolution: {integrity: sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==} @@ -1799,8 +1793,8 @@ packages: peerDependencies: acorn: ^8 - acorn@8.13.0: - resolution: {integrity: sha512-8zSiw54Oxrdym50NlZ9sUusyO1Z1ZchgRLWRaK6c86XJFClyCgFKetdowBg5bKxyp/u+CDBJG4Mpp0m3HLZl9w==} + acorn@8.12.1: + resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==} engines: {node: '>=0.4.0'} hasBin: true @@ -2002,8 +1996,8 @@ packages: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} engines: {node: '>=6'} - caniuse-lite@1.0.30001669: - resolution: {integrity: sha512-DlWzFDJqstqtIVx1zeSpIMLjunf5SmwOw0N2Ck/QSQdS8PLS4+9HrLaYei4w8BIAL7IB/UEDu889d8vhCTPA0w==} + caniuse-lite@1.0.30001667: + resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==} chalk@2.4.2: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} @@ -2291,8 +2285,8 @@ packages: ee-first@1.1.1: resolution: {integrity: sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==} - electron-to-chromium@1.5.41: - resolution: {integrity: sha512-dfdv/2xNjX0P8Vzme4cfzHqnPm5xsZXwsolTYr0eyW18IUmNyG08vL+fttvinTfhKfIKdRoqkDIC9e9iWQCNYQ==} + electron-to-chromium@1.5.35: + resolution: {integrity: sha512-hOSRInrIDm0Brzp4IHW2F/VM+638qOL2CzE0DgpnGzKW27C95IqqeqgKz/hxHGnvPxvQGpHUGD5qRVC9EZY2+A==} emoji-regex@10.4.0: resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==} @@ -2455,8 +2449,8 @@ packages: fast-json-stable-stringify@2.1.0: resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==} - fast-uri@3.0.3: - resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==} + fast-uri@3.0.2: + resolution: {integrity: sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==} fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} @@ -2547,8 +2541,8 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-east-asian-width@1.3.0: - resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==} + get-east-asian-width@1.2.0: + resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==} engines: {node: '>=18'} get-intrinsic@1.2.4: @@ -3072,8 +3066,8 @@ packages: resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==} engines: {node: '>= 0.6'} - memfs@4.14.0: - resolution: {integrity: sha512-JUeY0F/fQZgIod31Ja1eJgiSxLn7BfQlCnqhwXFBzFHEw63OdLK7VJUJ7bnzNsWgCyoUP5tEp1VRY8rDaYzqOA==} + memfs@4.13.0: + resolution: {integrity: sha512-dIs5KGy24fbdDhIAg0RxXpFqQp3RwL6wgSMRF9OSuphL/Uc9a4u2/SDJKPLj/zUgtOGKuHrRMrj563+IErj4Cg==} engines: {node: '>= 4.0.0'} merge-descriptors@1.0.3: @@ -3403,8 +3397,8 @@ packages: parse5-sax-parser@7.0.0: resolution: {integrity: sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==} - parse5@7.2.0: - resolution: {integrity: sha512-ZkDsAOcxsUMZ4Lz5fVciOehNcJ+Gb8gTzcA4yl3wnc273BAybYWrQ+Ks/OjCjSEpjvQkDSeZbybK9qj2VHHdGA==} + parse5@7.1.2: + resolution: {integrity: sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==} parseurl@1.3.3: resolution: {integrity: sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==} @@ -3436,8 +3430,8 @@ packages: resolution: {integrity: sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==} engines: {node: '>=12'} - picocolors@1.1.1: - resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==} + picocolors@1.1.0: + resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==} picomatch@2.3.1: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} @@ -4027,8 +4021,8 @@ packages: tslib@2.6.3: resolution: {integrity: sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==} - tslib@2.8.0: - resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==} + tslib@2.7.0: + resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} tuf-js@2.2.1: resolution: {integrity: sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==} @@ -4334,20 +4328,20 @@ snapshots: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 - '@angular-devkit/architect@0.1802.9(chokidar@3.6.0)': + '@angular-devkit/architect@0.1802.8(chokidar@3.6.0)': dependencies: - '@angular-devkit/core': 18.2.9(chokidar@3.6.0) + '@angular-devkit/core': 18.2.8(chokidar@3.6.0) rxjs: 7.8.1 transitivePeerDependencies: - chokidar - '@angular-devkit/build-angular@18.2.9(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.6)(chokidar@3.6.0)(karma@6.4.4)(typescript@5.5.4)': + '@angular-devkit/build-angular@18.2.8(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.5)(chokidar@3.6.0)(karma@6.4.4)(typescript@5.5.4)': dependencies: '@ampproject/remapping': 2.3.0 - '@angular-devkit/architect': 0.1802.9(chokidar@3.6.0) - '@angular-devkit/build-webpack': 0.1802.9(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0))(webpack@5.94.0(esbuild@0.23.0)) - '@angular-devkit/core': 18.2.9(chokidar@3.6.0) - '@angular/build': 18.2.9(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.6)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(terser@5.31.6)(typescript@5.5.4) + '@angular-devkit/architect': 0.1802.8(chokidar@3.6.0) + '@angular-devkit/build-webpack': 0.1802.8(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0))(webpack@5.94.0(esbuild@0.23.0)) + '@angular-devkit/core': 18.2.8(chokidar@3.6.0) + '@angular/build': 18.2.8(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.5)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(terser@5.31.6)(typescript@5.5.4) '@angular/compiler-cli': 18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4) '@babel/core': 7.25.2 '@babel/generator': 7.25.0 @@ -4359,8 +4353,8 @@ snapshots: '@babel/preset-env': 7.25.3(@babel/core@7.25.2) '@babel/runtime': 7.25.0 '@discoveryjs/json-ext': 0.6.1 - '@ngtools/webpack': 18.2.9(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(typescript@5.5.4)(webpack@5.94.0(esbuild@0.23.0)) - '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6)) + '@ngtools/webpack': 18.2.8(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(typescript@5.5.4)(webpack@5.94.0(esbuild@0.23.0)) + '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6)) ansi-colors: 4.1.3 autoprefixer: 10.4.20(postcss@8.4.41) babel-loader: 9.1.3(@babel/core@7.25.2)(webpack@5.94.0(esbuild@0.23.0)) @@ -4400,7 +4394,7 @@ snapshots: tree-kill: 1.2.2 tslib: 2.6.3 typescript: 5.5.4 - vite: 5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6) + vite: 5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6) watchpack: 2.4.1 webpack: 5.94.0(esbuild@0.23.0) webpack-dev-middleware: 7.4.2(webpack@5.94.0) @@ -4428,16 +4422,16 @@ snapshots: - utf-8-validate - webpack-cli - '@angular-devkit/build-webpack@0.1802.9(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0))(webpack@5.94.0(esbuild@0.23.0))': + '@angular-devkit/build-webpack@0.1802.8(chokidar@3.6.0)(webpack-dev-server@5.0.4(webpack@5.94.0))(webpack@5.94.0(esbuild@0.23.0))': dependencies: - '@angular-devkit/architect': 0.1802.9(chokidar@3.6.0) + '@angular-devkit/architect': 0.1802.8(chokidar@3.6.0) rxjs: 7.8.1 webpack: 5.94.0(esbuild@0.23.0) webpack-dev-server: 5.0.4(webpack@5.94.0) transitivePeerDependencies: - chokidar - '@angular-devkit/core@18.2.9(chokidar@3.6.0)': + '@angular-devkit/core@18.2.8(chokidar@3.6.0)': dependencies: ajv: 8.17.1 ajv-formats: 3.0.1(ajv@8.17.1) @@ -4448,9 +4442,9 @@ snapshots: optionalDependencies: chokidar: 3.6.0 - '@angular-devkit/schematics@18.2.9(chokidar@3.6.0)': + '@angular-devkit/schematics@18.2.8(chokidar@3.6.0)': dependencies: - '@angular-devkit/core': 18.2.9(chokidar@3.6.0) + '@angular-devkit/core': 18.2.8(chokidar@3.6.0) jsonc-parser: 3.3.1 magic-string: 0.30.11 ora: 5.4.1 @@ -4461,19 +4455,19 @@ snapshots: '@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))': dependencies: '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) - tslib: 2.8.0 + tslib: 2.7.0 - '@angular/build@18.2.9(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.6)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(terser@5.31.6)(typescript@5.5.4)': + '@angular/build@18.2.8(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(@types/node@22.7.5)(chokidar@3.6.0)(less@4.2.0)(postcss@8.4.41)(terser@5.31.6)(typescript@5.5.4)': dependencies: '@ampproject/remapping': 2.3.0 - '@angular-devkit/architect': 0.1802.9(chokidar@3.6.0) + '@angular-devkit/architect': 0.1802.8(chokidar@3.6.0) '@angular/compiler-cli': 18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4) '@babel/core': 7.25.2 '@babel/helper-annotate-as-pure': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 '@babel/plugin-syntax-import-attributes': 7.24.7(@babel/core@7.25.2) '@inquirer/confirm': 3.1.22 - '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6)) + '@vitejs/plugin-basic-ssl': 1.1.0(vite@5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6)) browserslist: 4.24.0 critters: 0.0.24 esbuild: 0.23.0 @@ -4490,7 +4484,7 @@ snapshots: sass: 1.77.6 semver: 7.6.3 typescript: 5.5.4 - vite: 5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6) + vite: 5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6) watchpack: 2.4.1 optionalDependencies: less: 4.2.0 @@ -4510,18 +4504,18 @@ snapshots: '@angular/common': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1) '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) rxjs: 7.8.1 - tslib: 2.8.0 + tslib: 2.7.0 optionalDependencies: - parse5: 7.2.0 + parse5: 7.1.2 - '@angular/cli@18.2.9(chokidar@3.6.0)': + '@angular/cli@18.2.8(chokidar@3.6.0)': dependencies: - '@angular-devkit/architect': 0.1802.9(chokidar@3.6.0) - '@angular-devkit/core': 18.2.9(chokidar@3.6.0) - '@angular-devkit/schematics': 18.2.9(chokidar@3.6.0) + '@angular-devkit/architect': 0.1802.8(chokidar@3.6.0) + '@angular-devkit/core': 18.2.8(chokidar@3.6.0) + '@angular-devkit/schematics': 18.2.8(chokidar@3.6.0) '@inquirer/prompts': 5.3.8 '@listr2/prompt-adapter-inquirer': 2.0.15(@inquirer/prompts@5.3.8) - '@schematics/angular': 18.2.9(chokidar@3.6.0) + '@schematics/angular': 18.2.8(chokidar@3.6.0) '@yarnpkg/lockfile': 1.1.0 ini: 4.1.3 jsonc-parser: 3.3.1 @@ -4542,7 +4536,7 @@ snapshots: dependencies: '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) rxjs: 7.8.1 - tslib: 2.8.0 + tslib: 2.7.0 '@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4)': dependencies: @@ -4553,7 +4547,7 @@ snapshots: convert-source-map: 1.9.0 reflect-metadata: 0.2.2 semver: 7.6.3 - tslib: 2.8.0 + tslib: 2.7.0 typescript: 5.5.4 yargs: 17.7.2 transitivePeerDependencies: @@ -4561,14 +4555,14 @@ snapshots: '@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))': dependencies: - tslib: 2.8.0 + tslib: 2.7.0 optionalDependencies: '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) '@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)': dependencies: rxjs: 7.8.1 - tslib: 2.8.0 + tslib: 2.7.0 zone.js: 0.15.0 '@angular/forms@18.2.8(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(@angular/platform-browser@18.2.8(@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(rxjs@7.8.1)': @@ -4577,7 +4571,7 @@ snapshots: '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) '@angular/platform-browser': 18.2.8(@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) rxjs: 7.8.1 - tslib: 2.8.0 + tslib: 2.7.0 '@angular/language-service@18.2.8': {} @@ -4587,13 +4581,13 @@ snapshots: '@angular/compiler': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) '@angular/platform-browser': 18.2.8(@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) - tslib: 2.8.0 + tslib: 2.7.0 '@angular/platform-browser@18.2.8(@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))': dependencies: '@angular/common': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1) '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) - tslib: 2.8.0 + tslib: 2.7.0 optionalDependencies: '@angular/animations': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) @@ -4603,14 +4597,14 @@ snapshots: '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) '@angular/platform-browser': 18.2.8(@angular/animations@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) rxjs: 7.8.1 - tslib: 2.8.0 + tslib: 2.7.0 '@babel/code-frame@7.25.7': dependencies: '@babel/highlight': 7.25.7 - picocolors: 1.1.1 + picocolors: 1.1.0 - '@babel/compat-data@7.25.8': {} + '@babel/compat-data@7.25.7': {} '@babel/core@7.25.2': dependencies: @@ -4620,10 +4614,10 @@ snapshots: '@babel/helper-compilation-targets': 7.25.7 '@babel/helper-module-transforms': 7.25.7(@babel/core@7.25.2) '@babel/helpers': 7.25.7 - '@babel/parser': 7.25.8 + '@babel/parser': 7.25.7 '@babel/template': 7.25.7 '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 convert-source-map: 2.0.0 debug: 4.3.7 gensync: 1.0.0-beta.2 @@ -4654,7 +4648,7 @@ snapshots: '@babel/generator@7.25.0': dependencies: - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 jsesc: 2.5.2 @@ -4668,22 +4662,22 @@ snapshots: '@babel/helper-annotate-as-pure@7.24.7': dependencies: - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 '@babel/helper-annotate-as-pure@7.25.7': dependencies: - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 '@babel/helper-builder-binary-assignment-operator-visitor@7.25.7': dependencies: '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color '@babel/helper-compilation-targets@7.25.7': dependencies: - '@babel/compat-data': 7.25.8 + '@babel/compat-data': 7.25.7 '@babel/helper-validator-option': 7.25.7 browserslist: 4.24.0 lru-cache: 5.1.1 @@ -4723,14 +4717,14 @@ snapshots: '@babel/helper-member-expression-to-functions@7.25.7': dependencies: '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color '@babel/helper-module-imports@7.25.7': dependencies: '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color @@ -4756,7 +4750,7 @@ snapshots: '@babel/helper-optimise-call-expression@7.25.7': dependencies: - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 '@babel/helper-plugin-utils@7.25.7': {} @@ -4781,20 +4775,20 @@ snapshots: '@babel/helper-simple-access@7.25.7': dependencies: '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color '@babel/helper-skip-transparent-expression-wrappers@7.25.7': dependencies: '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color '@babel/helper-split-export-declaration@7.24.7': dependencies: - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 '@babel/helper-string-parser@7.25.7': {} @@ -4806,30 +4800,26 @@ snapshots: dependencies: '@babel/template': 7.25.7 '@babel/traverse': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 transitivePeerDependencies: - supports-color '@babel/helpers@7.25.7': dependencies: '@babel/template': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 '@babel/highlight@7.25.7': dependencies: '@babel/helper-validator-identifier': 7.25.7 chalk: 2.4.2 js-tokens: 4.0.0 - picocolors: 1.1.1 + picocolors: 1.1.0 '@babel/parser@7.25.7': dependencies: '@babel/types': 7.25.7 - '@babel/parser@7.25.8': - dependencies: - '@babel/types': 7.25.8 - '@babel/plugin-bugfix-firefox-class-in-computed-class-key@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 @@ -4853,7 +4843,7 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 - '@babel/plugin-transform-optional-chaining': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-optional-chaining': 7.25.7(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -5007,11 +4997,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-class-static-block@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-class-static-block@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-class-static-block': 7.14.5(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -5055,10 +5046,11 @@ snapshots: '@babel/helper-create-regexp-features-plugin': 7.25.7(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-transform-dynamic-import@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-dynamic-import@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.25.2) '@babel/plugin-transform-exponentiation-operator@7.25.7(@babel/core@7.25.2)': dependencies: @@ -5068,10 +5060,11 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-export-namespace-from@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-export-namespace-from@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.25.2) '@babel/plugin-transform-for-of@7.25.7(@babel/core@7.25.2)': dependencies: @@ -5090,20 +5083,22 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-json-strings@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-json-strings@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.25.2) '@babel/plugin-transform-literals@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-transform-logical-assignment-operators@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-logical-assignment-operators@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.25.2) '@babel/plugin-transform-member-expression-literals@7.25.7(@babel/core@7.25.2)': dependencies: @@ -5156,21 +5151,24 @@ snapshots: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 - '@babel/plugin-transform-nullish-coalescing-operator@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-nullish-coalescing-operator@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-transform-numeric-separator@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-numeric-separator@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.25.2) - '@babel/plugin-transform-object-rest-spread@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-object-rest-spread@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-compilation-targets': 7.25.7 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.25.2) '@babel/plugin-transform-parameters': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-object-super@7.25.7(@babel/core@7.25.2)': @@ -5181,16 +5179,18 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-optional-catch-binding@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-optional-catch-binding@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.25.2) - '@babel/plugin-transform-optional-chaining@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-optional-chaining@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 '@babel/helper-skip-transparent-expression-wrappers': 7.25.7 + '@babel/plugin-syntax-optional-chaining': 7.8.3(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -5207,12 +5207,13 @@ snapshots: transitivePeerDependencies: - supports-color - '@babel/plugin-transform-private-property-in-object@7.25.8(@babel/core@7.25.2)': + '@babel/plugin-transform-private-property-in-object@7.25.7(@babel/core@7.25.2)': dependencies: '@babel/core': 7.25.2 '@babel/helper-annotate-as-pure': 7.25.7 '@babel/helper-create-class-features-plugin': 7.25.7(@babel/core@7.25.2) '@babel/helper-plugin-utils': 7.25.7 + '@babel/plugin-syntax-private-property-in-object': 7.14.5(@babel/core@7.25.2) transitivePeerDependencies: - supports-color @@ -5297,7 +5298,7 @@ snapshots: '@babel/preset-env@7.25.3(@babel/core@7.25.2)': dependencies: - '@babel/compat-data': 7.25.8 + '@babel/compat-data': 7.25.7 '@babel/core': 7.25.2 '@babel/helper-compilation-targets': 7.25.7 '@babel/helper-plugin-utils': 7.25.7 @@ -5332,21 +5333,21 @@ snapshots: '@babel/plugin-transform-block-scoped-functions': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-block-scoping': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-class-properties': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-class-static-block': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-class-static-block': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-classes': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-computed-properties': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-destructuring': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-dotall-regex': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-duplicate-keys': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-duplicate-named-capturing-groups-regex': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-dynamic-import': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-dynamic-import': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-exponentiation-operator': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-export-namespace-from': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-export-namespace-from': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-for-of': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-function-name': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-json-strings': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-json-strings': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-literals': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-logical-assignment-operators': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-logical-assignment-operators': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-member-expression-literals': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-modules-amd': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-modules-commonjs': 7.25.7(@babel/core@7.25.2) @@ -5354,15 +5355,15 @@ snapshots: '@babel/plugin-transform-modules-umd': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-named-capturing-groups-regex': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-new-target': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-nullish-coalescing-operator': 7.25.8(@babel/core@7.25.2) - '@babel/plugin-transform-numeric-separator': 7.25.8(@babel/core@7.25.2) - '@babel/plugin-transform-object-rest-spread': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-nullish-coalescing-operator': 7.25.7(@babel/core@7.25.2) + '@babel/plugin-transform-numeric-separator': 7.25.7(@babel/core@7.25.2) + '@babel/plugin-transform-object-rest-spread': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-object-super': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-optional-catch-binding': 7.25.8(@babel/core@7.25.2) - '@babel/plugin-transform-optional-chaining': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-optional-catch-binding': 7.25.7(@babel/core@7.25.2) + '@babel/plugin-transform-optional-chaining': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-parameters': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-private-methods': 7.25.7(@babel/core@7.25.2) - '@babel/plugin-transform-private-property-in-object': 7.25.8(@babel/core@7.25.2) + '@babel/plugin-transform-private-property-in-object': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-property-literals': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-regenerator': 7.25.7(@babel/core@7.25.2) '@babel/plugin-transform-reserved-words': 7.25.7(@babel/core@7.25.2) @@ -5388,7 +5389,7 @@ snapshots: dependencies: '@babel/core': 7.25.2 '@babel/helper-plugin-utils': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 esutils: 2.0.3 '@babel/runtime@7.25.0': @@ -5398,16 +5399,16 @@ snapshots: '@babel/template@7.25.7': dependencies: '@babel/code-frame': 7.25.7 - '@babel/parser': 7.25.8 - '@babel/types': 7.25.8 + '@babel/parser': 7.25.7 + '@babel/types': 7.25.7 '@babel/traverse@7.25.7': dependencies: '@babel/code-frame': 7.25.7 '@babel/generator': 7.25.7 - '@babel/parser': 7.25.8 + '@babel/parser': 7.25.7 '@babel/template': 7.25.7 - '@babel/types': 7.25.8 + '@babel/types': 7.25.7 debug: 4.3.7 globals: 11.12.0 transitivePeerDependencies: @@ -5419,12 +5420,6 @@ snapshots: '@babel/helper-validator-identifier': 7.25.7 to-fast-properties: 2.0.0 - '@babel/types@7.25.8': - dependencies: - '@babel/helper-string-parser': 7.25.7 - '@babel/helper-validator-identifier': 7.25.7 - to-fast-properties: 2.0.0 - '@colors/colors@1.5.0': {} '@discoveryjs/json-ext@0.6.1': {} @@ -5570,19 +5565,19 @@ snapshots: '@esbuild/win32-x64@0.23.0': optional: true - '@feel/form@0.0.25(@angular/cdk@17.3.10(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(@feel/style@0.0.25(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))': + '@feel/form@0.0.27(@angular/cdk@17.3.10(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(@feel/style@0.0.27(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))': dependencies: '@angular/cdk': 17.3.10(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1) '@angular/common': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1) '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) - '@feel/style': 0.0.25(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) - tslib: 2.8.0 + '@feel/style': 0.0.27(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)) + tslib: 2.7.0 - '@feel/style@0.0.25(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))': + '@feel/style@0.0.27(@angular/common@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1))(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))': dependencies: '@angular/common': 18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0))(rxjs@7.8.1) '@angular/core': 18.2.8(rxjs@7.8.1)(zone.js@0.15.0) - tslib: 2.8.0 + tslib: 2.7.0 '@fontsource/dm-mono@5.1.0': {} @@ -5611,7 +5606,7 @@ snapshots: '@inquirer/figures': 1.0.7 '@inquirer/type': 2.0.0 '@types/mute-stream': 0.0.4 - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/wrap-ansi': 3.0.0 ansi-escapes: 4.3.2 cli-width: 4.1.0 @@ -5726,21 +5721,21 @@ snapshots: '@jridgewell/resolve-uri': 3.1.2 '@jridgewell/sourcemap-codec': 1.5.0 - '@jsonjoy.com/base64@1.1.2(tslib@2.8.0)': + '@jsonjoy.com/base64@1.1.2(tslib@2.7.0)': dependencies: - tslib: 2.8.0 + tslib: 2.7.0 - '@jsonjoy.com/json-pack@1.1.0(tslib@2.8.0)': + '@jsonjoy.com/json-pack@1.1.0(tslib@2.7.0)': dependencies: - '@jsonjoy.com/base64': 1.1.2(tslib@2.8.0) - '@jsonjoy.com/util': 1.5.0(tslib@2.8.0) + '@jsonjoy.com/base64': 1.1.2(tslib@2.7.0) + '@jsonjoy.com/util': 1.5.0(tslib@2.7.0) hyperdyperid: 1.2.0 - thingies: 1.21.0(tslib@2.8.0) - tslib: 2.8.0 + thingies: 1.21.0(tslib@2.7.0) + tslib: 2.7.0 - '@jsonjoy.com/util@1.5.0(tslib@2.8.0)': + '@jsonjoy.com/util@1.5.0(tslib@2.7.0)': dependencies: - tslib: 2.8.0 + tslib: 2.7.0 '@leichtgewicht/ip-codec@2.0.5': {} @@ -5785,7 +5780,7 @@ snapshots: '@msgpackr-extract/msgpackr-extract-win32-x64@3.0.3': optional: true - '@ngtools/webpack@18.2.9(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(typescript@5.5.4)(webpack@5.94.0(esbuild@0.23.0))': + '@ngtools/webpack@18.2.8(@angular/compiler-cli@18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4))(typescript@5.5.4)(webpack@5.94.0(esbuild@0.23.0))': dependencies: '@angular/compiler-cli': 18.2.8(@angular/compiler@18.2.8(@angular/core@18.2.8(rxjs@7.8.1)(zone.js@0.15.0)))(typescript@5.5.4) typescript: 5.5.4 @@ -5868,6 +5863,8 @@ snapshots: - bluebird - supports-color + '@nuschtos/fixx@0.0.5': {} + '@pkgjs/parseargs@0.11.0': optional: true @@ -5967,10 +5964,10 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.24.0': optional: true - '@schematics/angular@18.2.9(chokidar@3.6.0)': + '@schematics/angular@18.2.8(chokidar@3.6.0)': dependencies: - '@angular-devkit/core': 18.2.9(chokidar@3.6.0) - '@angular-devkit/schematics': 18.2.9(chokidar@3.6.0) + '@angular-devkit/core': 18.2.8(chokidar@3.6.0) + '@angular-devkit/schematics': 18.2.8(chokidar@3.6.0) jsonc-parser: 3.3.1 transitivePeerDependencies: - chokidar @@ -6021,20 +6018,20 @@ snapshots: '@types/body-parser@1.19.5': dependencies: '@types/connect': 3.4.38 - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/bonjour@3.5.13': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/connect-history-api-fallback@1.5.4': dependencies: '@types/express-serve-static-core': 5.0.0 - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/connect@3.4.38': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/cookie@0.4.1': {} @@ -6048,14 +6045,14 @@ snapshots: '@types/express-serve-static-core@4.19.6': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/qs': 6.9.16 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 '@types/express-serve-static-core@5.0.0': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/qs': 6.9.16 '@types/range-parser': 1.2.7 '@types/send': 0.17.4 @@ -6071,7 +6068,7 @@ snapshots: '@types/http-proxy@1.17.15': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/jasmine@5.1.4': {} @@ -6081,20 +6078,16 @@ snapshots: '@types/mute-stream@0.0.4': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/node-forge@1.3.11': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/node@22.7.5': dependencies: undici-types: 6.19.8 - '@types/node@22.7.6': - dependencies: - undici-types: 6.19.8 - '@types/qs@6.9.16': {} '@types/range-parser@1.2.7': {} @@ -6104,7 +6097,7 @@ snapshots: '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/serve-index@1.9.4': dependencies: @@ -6113,22 +6106,22 @@ snapshots: '@types/serve-static@1.15.7': dependencies: '@types/http-errors': 2.0.4 - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/send': 0.17.4 '@types/sockjs@0.3.36': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 '@types/wrap-ansi@3.0.0': {} '@types/ws@8.5.12': dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 - '@vitejs/plugin-basic-ssl@1.1.0(vite@5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6))': + '@vitejs/plugin-basic-ssl@1.1.0(vite@5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6))': dependencies: - vite: 5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6) + vite: 5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6) '@webassemblyjs/ast@1.12.1': dependencies: @@ -6219,11 +6212,11 @@ snapshots: mime-types: 2.1.35 negotiator: 0.6.3 - acorn-import-attributes@1.9.5(acorn@8.13.0): + acorn-import-attributes@1.9.5(acorn@8.12.1): dependencies: - acorn: 8.13.0 + acorn: 8.12.1 - acorn@8.13.0: {} + acorn@8.12.1: {} adjust-sourcemap-loader@4.0.0: dependencies: @@ -6268,7 +6261,7 @@ snapshots: ajv@8.17.1: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.0.3 + fast-uri: 3.0.2 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -6310,10 +6303,10 @@ snapshots: autoprefixer@10.4.20(postcss@8.4.41): dependencies: browserslist: 4.24.0 - caniuse-lite: 1.0.30001669 + caniuse-lite: 1.0.30001667 fraction.js: 4.3.7 normalize-range: 0.1.2 - picocolors: 1.1.1 + picocolors: 1.1.0 postcss: 8.4.41 postcss-value-parser: 4.2.0 @@ -6326,7 +6319,7 @@ snapshots: babel-plugin-polyfill-corejs2@0.4.11(@babel/core@7.25.2): dependencies: - '@babel/compat-data': 7.25.8 + '@babel/compat-data': 7.25.7 '@babel/core': 7.25.2 '@babel/helper-define-polyfill-provider': 0.6.2(@babel/core@7.25.2) semver: 6.3.1 @@ -6405,8 +6398,8 @@ snapshots: browserslist@4.24.0: dependencies: - caniuse-lite: 1.0.30001669 - electron-to-chromium: 1.5.41 + caniuse-lite: 1.0.30001667 + electron-to-chromium: 1.5.35 node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.0) @@ -6450,7 +6443,7 @@ snapshots: callsites@3.1.0: {} - caniuse-lite@1.0.30001669: {} + caniuse-lite@1.0.30001667: {} chalk@2.4.2: dependencies: @@ -6742,7 +6735,7 @@ snapshots: ee-first@1.1.1: {} - electron-to-chromium@1.5.41: {} + electron-to-chromium@1.5.35: {} emoji-regex@10.4.0: {} @@ -6968,7 +6961,7 @@ snapshots: fast-json-stable-stringify@2.1.0: {} - fast-uri@3.0.3: {} + fast-uri@3.0.2: {} fastq@1.17.1: dependencies: @@ -7060,7 +7053,7 @@ snapshots: get-caller-file@2.0.5: {} - get-east-asian-width@1.3.0: {} + get-east-asian-width@1.2.0: {} get-intrinsic@1.2.4: dependencies: @@ -7301,7 +7294,7 @@ snapshots: is-fullwidth-code-point@5.0.0: dependencies: - get-east-asian-width: 1.3.0 + get-east-asian-width: 1.2.0 is-glob@4.0.3: dependencies: @@ -7360,7 +7353,7 @@ snapshots: istanbul-lib-instrument@6.0.3: dependencies: '@babel/core': 7.25.2 - '@babel/parser': 7.25.8 + '@babel/parser': 7.25.7 '@istanbuljs/schema': 0.1.3 istanbul-lib-coverage: 3.2.2 semver: 7.6.3 @@ -7398,7 +7391,7 @@ snapshots: jest-worker@27.5.1: dependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 merge-stream: 2.0.0 supports-color: 8.1.1 @@ -7500,7 +7493,7 @@ snapshots: launch-editor@2.9.1: dependencies: - picocolors: 1.1.1 + picocolors: 1.1.0 shell-quote: 1.8.1 less-loader@12.2.0(less@4.2.0)(webpack@5.94.0(esbuild@0.23.0)): @@ -7513,7 +7506,7 @@ snapshots: dependencies: copy-anything: 2.0.6 parse-node-version: 1.0.1 - tslib: 2.8.0 + tslib: 2.7.0 optionalDependencies: errno: 0.1.8 graceful-fs: 4.2.11 @@ -7635,12 +7628,12 @@ snapshots: media-typer@0.3.0: {} - memfs@4.14.0: + memfs@4.13.0: dependencies: - '@jsonjoy.com/json-pack': 1.1.0(tslib@2.8.0) - '@jsonjoy.com/util': 1.5.0(tslib@2.8.0) - tree-dump: 1.0.2(tslib@2.8.0) - tslib: 2.8.0 + '@jsonjoy.com/json-pack': 1.1.0(tslib@2.7.0) + '@jsonjoy.com/util': 1.5.0(tslib@2.7.0) + tree-dump: 1.0.2(tslib@2.7.0) + tslib: 2.7.0 merge-descriptors@1.0.3: {} @@ -7983,14 +7976,14 @@ snapshots: parse5-html-rewriting-stream@7.0.0: dependencies: entities: 4.5.0 - parse5: 7.2.0 + parse5: 7.1.2 parse5-sax-parser: 7.0.0 parse5-sax-parser@7.0.0: dependencies: - parse5: 7.2.0 + parse5: 7.1.2 - parse5@7.2.0: + parse5@7.1.2: dependencies: entities: 4.5.0 @@ -8013,7 +8006,7 @@ snapshots: path-type@5.0.0: {} - picocolors@1.1.1: {} + picocolors@1.1.0: {} picomatch@2.3.1: {} @@ -8074,13 +8067,13 @@ snapshots: postcss@8.4.41: dependencies: nanoid: 3.3.7 - picocolors: 1.1.1 + picocolors: 1.1.0 source-map-js: 1.2.1 postcss@8.4.47: dependencies: nanoid: 3.3.7 - picocolors: 1.1.1 + picocolors: 1.1.0 source-map-js: 1.2.1 proc-log@4.2.0: {} @@ -8280,7 +8273,7 @@ snapshots: rxjs@7.8.1: dependencies: - tslib: 2.8.0 + tslib: 2.7.0 safe-buffer@5.1.2: {} @@ -8569,7 +8562,7 @@ snapshots: string-width@7.2.0: dependencies: emoji-regex: 10.4.0 - get-east-asian-width: 1.3.0 + get-east-asian-width: 1.2.0 strip-ansi: 7.1.0 string_decoder@1.1.1: @@ -8631,13 +8624,13 @@ snapshots: terser@5.31.6: dependencies: '@jridgewell/source-map': 0.3.6 - acorn: 8.13.0 + acorn: 8.12.1 commander: 2.20.3 source-map-support: 0.5.21 - thingies@1.21.0(tslib@2.8.0): + thingies@1.21.0(tslib@2.7.0): dependencies: - tslib: 2.8.0 + tslib: 2.7.0 thunky@1.1.0: {} @@ -8655,15 +8648,15 @@ snapshots: toidentifier@1.0.1: {} - tree-dump@1.0.2(tslib@2.8.0): + tree-dump@1.0.2(tslib@2.7.0): dependencies: - tslib: 2.8.0 + tslib: 2.7.0 tree-kill@1.2.2: {} tslib@2.6.3: {} - tslib@2.8.0: {} + tslib@2.7.0: {} tuf-js@2.2.1: dependencies: @@ -8717,7 +8710,7 @@ snapshots: dependencies: browserslist: 4.24.0 escalade: 3.2.0 - picocolors: 1.1.1 + picocolors: 1.1.0 uri-js@4.4.1: dependencies: @@ -8738,13 +8731,13 @@ snapshots: vary@1.1.2: {} - vite@5.4.6(@types/node@22.7.6)(less@4.2.0)(sass@1.77.6)(terser@5.31.6): + vite@5.4.6(@types/node@22.7.5)(less@4.2.0)(sass@1.77.6)(terser@5.31.6): dependencies: esbuild: 0.21.5 postcss: 8.4.47 rollup: 4.24.0 optionalDependencies: - '@types/node': 22.7.6 + '@types/node': 22.7.5 fsevents: 2.3.3 less: 4.2.0 sass: 1.77.6 @@ -8770,7 +8763,7 @@ snapshots: webpack-dev-middleware@7.4.2(webpack@5.94.0): dependencies: colorette: 2.0.20 - memfs: 4.14.0 + memfs: 4.13.0 mime-types: 2.1.35 on-finished: 2.4.1 range-parser: 1.2.1 @@ -8837,8 +8830,8 @@ snapshots: '@webassemblyjs/ast': 1.12.1 '@webassemblyjs/wasm-edit': 1.12.1 '@webassemblyjs/wasm-parser': 1.12.1 - acorn: 8.13.0 - acorn-import-attributes: 1.9.5(acorn@8.13.0) + acorn: 8.12.1 + acorn-import-attributes: 1.9.5(acorn@8.12.1) browserslist: 4.24.0 chrome-trace-event: 1.0.4 enhanced-resolve: 5.17.1 diff --git a/public/fixx_bg.wasm b/public/fixx_bg.wasm new file mode 120000 index 0000000..99d66b3 --- /dev/null +++ b/public/fixx_bg.wasm @@ -0,0 +1 @@ +../node_modules/@nuschtos/fixx/fixx_bg.wasm \ No newline at end of file diff --git a/src/app/core/components/option/option.component.html b/src/app/core/components/option/option.component.html index ce084a4..bec264e 100644 --- a/src/app/core/components/option/option.component.html +++ b/src/app/core/components/option/option.component.html @@ -21,15 +21,15 @@

{{option.name}}

Type - {{option.type}} + {{option.type}} Default - +
Example - +
diff --git a/src/app/core/components/option/option.component.scss b/src/app/core/components/option/option.component.scss index 358525a..0bf84ff 100644 --- a/src/app/core/components/option/option.component.scss +++ b/src/app/core/components/option/option.component.scss @@ -8,5 +8,6 @@ td { &:first-of-type { text-align: right; + font-weight: bold; } } diff --git a/src/app/core/components/option/option.component.ts b/src/app/core/components/option/option.component.ts index 8c04a05..1331fe4 100644 --- a/src/app/core/components/option/option.component.ts +++ b/src/app/core/components/option/option.component.ts @@ -15,7 +15,7 @@ import { SearchService } from '../../data/search.service'; export class OptionComponent { protected readonly option = this.activatedRoute.queryParams.pipe( - switchMap(({option}) => this.searchService.getByName(option)), + switchMap(({ option }) => this.searchService.getByName(option)), ); constructor( diff --git a/src/app/core/components/search/search.component.html b/src/app/core/components/search/search.component.html index fe8a8a9..cdcb452 100644 --- a/src/app/core/components/search/search.component.html +++ b/src/app/core/components/search/search.component.html @@ -1,4 +1,14 @@ - +
+ + + + + + + +
    @@ -9,5 +19,6 @@
-

Only showing the first 500 results. Make your search term more concise.

+

Only showing the first {{maxSearchResults}} results. Make your search + term more concise.

diff --git a/src/app/core/components/search/search.component.scss b/src/app/core/components/search/search.component.scss index 574ee22..03ec014 100644 --- a/src/app/core/components/search/search.component.scss +++ b/src/app/core/components/search/search.component.scss @@ -6,6 +6,12 @@ gap: 1rem; width: 100%; + form { + display: flex; + flex-direction: column; + gap: 0.5rem; + } + .scroll { overflow-y: scroll; diff --git a/src/app/core/components/search/search.component.ts b/src/app/core/components/search/search.component.ts index 69929ce..c75a94b 100644 --- a/src/app/core/components/search/search.component.ts +++ b/src/app/core/components/search/search.component.ts @@ -1,38 +1,47 @@ -import { AfterViewInit, ChangeDetectionStrategy, Component } from '@angular/core'; -import { FormControl, ReactiveFormsModule } from '@angular/forms'; -import { Observable, map, switchMap } from 'rxjs'; -import { SearchService, Option } from '../../data/search.service'; +import { AfterViewInit, ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core'; +import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms'; +import { Observable, Subject, combineLatest, debounceTime, filter, map, switchMap, takeUntil } from 'rxjs'; +import { MAX_SEARCH_RESULTS, SearchService, SearchedOption } from '../../data/search.service'; import { ActivatedRoute, Router, RouterLink } from '@angular/router'; -import { TextFieldComponent } from "@feel/form"; +import { DropdownComponent, TextFieldComponent } from "@feel/form"; import { AsyncPipe, NgFor, NgIf } from '@angular/common'; -function getQuery(): string | null { - return new URL(location.href).searchParams.get("query"); +function getQuery(): { query: string | null, scope: string | null } { + const params = new URL(location.href).searchParams; + const query = (params.get("query") ?? '').trim(); + const scope = (params.get("scope") ?? '').trim(); + return { query: query.length > 0 ? query : null, scope: scope.length > 0 ? scope : null }; } @Component({ selector: 'app-search', standalone: true, - imports: [ReactiveFormsModule, TextFieldComponent, NgIf, AsyncPipe, NgFor, RouterLink], + imports: [ReactiveFormsModule, TextFieldComponent, NgIf, AsyncPipe, NgFor, RouterLink, DropdownComponent], templateUrl: './search.component.html', styleUrl: './search.component.scss', changeDetection: ChangeDetectionStrategy.OnPush, }) -export class SearchComponent implements AfterViewInit { - - protected readonly search = new FormControl(); - protected readonly results = this.search.valueChanges.pipe( - switchMap(query => { - const q = query?.trim(); - if (q !== getQuery()) this.router.navigate([], { queryParams: { query: q }, queryParamsHandling: 'merge' }); - if (q && q.length > 0) { - return this.searchService.search(q); - } else { - return this.searchService.all(); - } - }), +export class SearchComponent implements OnInit, AfterViewInit, OnDestroy { + + protected readonly search = new FormGroup({ + query: new FormControl(""), + scope: new FormControl("-1"), + }); + + private readonly formValue = new Subject<{ query: string | null, scope: number | null }>(); + + protected readonly scopes = this.searchService.getScopes(); + protected readonly results = this.formValue.pipe( + switchMap(formValue => this.searchService.search( + formValue.scope === null ? undefined : formValue.scope, + formValue.query ?? '' + )), ); + protected readonly selectedOption = this.activatedRoute.queryParams.pipe(map(({ option }) => option)); + protected readonly maxSearchResults = MAX_SEARCH_RESULTS; + + private readonly destroy = new Subject(); constructor( private readonly searchService: SearchService, @@ -41,16 +50,58 @@ export class SearchComponent implements AfterViewInit { ) { } + public ngOnInit(): void { + this.search.valueChanges + .pipe(takeUntil(this.destroy)) + .subscribe(({ query: formQuery, scope: formScope }) => { + const query = (formQuery ?? '').trim(); + const scope = Number(formScope); + + this.formValue.next({ + query: query.length > 0 ? query : null, + scope: scope >= 0 ? scope : null + }); + }); + + combineLatest({ form: this.formValue, scopes: this.scopes }) + .pipe(takeUntil(this.destroy), debounceTime(500)) + .subscribe(({ form, scopes }) => { + const formValue = { + query: form.query, + scope: form.scope === null ? null : scopes[form.scope] + }; + + const urlValue = getQuery(); + if (form !== urlValue) { + this.router.navigate([], { + queryParams: formValue, + queryParamsHandling: 'merge' + }); + } + }); + } + public ngAfterViewInit(): void { - this.search.setValue(getQuery()); + const { query, scope } = getQuery(); + this.scopes.pipe(takeUntil(this.destroy), filter(scopes => scopes.length > 0)) + .subscribe(scopes => { + const idx = scopes.findIndex(s => s === scope); + console.log(scopes, scope, idx); + this.search.setValue({ query, scope: idx.toString() }) + }) + } + + public ngOnDestroy(): void { + this.destroy.next(void 0); + this.destroy.complete(); } - protected trackBy(_idx: number, { name }: Option): string { - return name; + protected trackBy(_idx: number, option: SearchedOption): number { + return option.idx; } - protected isActive({ name }: Option): Observable { - return this.selectedOption.pipe(map(option => option === name)); + protected isActive(opt: SearchedOption): Observable { + return this.selectedOption.pipe(map(option => option === opt.name)); } } diff --git a/src/app/core/data/search.service.ts b/src/app/core/data/search.service.ts index 608b431..c200637 100644 --- a/src/app/core/data/search.service.ts +++ b/src/app/core/data/search.service.ts @@ -1,6 +1,14 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import { BehaviorSubject, Observable, map, of } from 'rxjs'; +import __wbg_init, { Index } from '@nuschtos/fixx'; +import { BehaviorSubject, Observable, from, map, of, switchMap, tap } from 'rxjs'; + +export interface SearchedOption { + idx: number; + name: string; +} + +export const MAX_SEARCH_RESULTS = 500; // https://transform.tools/json-to-typescript export interface Option { @@ -18,79 +26,65 @@ export interface Option { }) export class SearchService { - private nextUpdate = 0; - private readonly data = new BehaviorSubject([]); + private readonly index = new BehaviorSubject(null); + private readonly data = new BehaviorSubject>({}); constructor( private readonly http: HttpClient, - ) { } - - private update() { - const now = Date.now(); - if (this.nextUpdate < now) { - this.nextUpdate = now + 1000 * 60 * 10; - this.http.get>>(`${document.getElementsByTagName('base')[0].href}options.json`) - .subscribe(data => this.data.next(Object.entries(data).map(([name, data]) => ({ name, ...data })))); - } + ) { + from(__wbg_init(`${document.getElementsByTagName('base')[0].href}fixx_bg.wasm`)) + .pipe(switchMap(() => this.http.get(`${document.getElementsByTagName('base')[0].href}index.ixx`, { responseType: 'arraybuffer' }))) + .subscribe(data => this.index.next(Index.read(new Uint8Array(data)))); } - public search(query: string): Observable { - this.update(); + public search(scope_id: number | undefined, query: string): Observable { + return this.index.pipe( + map(index => { + return index ? index.search(scope_id, query, MAX_SEARCH_RESULTS).map(option => { + const opt = ({ idx: option.idx(), name: option.name() }); + // option.free(); + return opt; + }) : []; + }) + ); + } - const search = query.toLowerCase().split('*'); - if (search.length === 0) { - return of([]); + public getByName(name: string | undefined): Observable