diff --git a/dist/index.js b/dist/index.js index 25f5757..0e5456e 100644 --- a/dist/index.js +++ b/dist/index.js @@ -90087,7 +90087,7 @@ function firstString() { var external_path_ = __nccwpck_require__(1017); ;// CONCATENATED MODULE: external "node:crypto" const external_node_crypto_namespaceObject = __WEBPACK_EXTERNAL_createRequire(import.meta.url)("node:crypto"); -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/correlation.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@57c3688958a8ea902fa24780111e5c37dc5386a5_5zdsm7qsjhwwxqyje77k44k4nm/node_modules/detsys-ts/dist/correlation.js function identify(projectName) { @@ -90169,10 +90169,17 @@ function hashEnvironmentVariables(prefix, variables) { return `${prefix}-${hash.digest("hex")}`; } -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/package.json +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@57c3688958a8ea902fa24780111e5c37dc5386a5_5zdsm7qsjhwwxqyje77k44k4nm/node_modules/detsys-ts/dist/package.json const package_namespaceObject = {"i8":"1.0.0"}; -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/platform.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@57c3688958a8ea902fa24780111e5c37dc5386a5_5zdsm7qsjhwwxqyje77k44k4nm/node_modules/detsys-ts/dist/platform.js +/** + * @packageDocumentation + * Helpers for determining system attributes of the current runner. + */ +/** + * Get the current architecture plus OS. Examples include `X64-Linux` and `ARM64-macOS`. + */ function getArchOs() { const envArch = process.env.RUNNER_ARCH; const envOs = process.env.RUNNER_OS; @@ -90184,6 +90191,9 @@ function getArchOs() { throw new Error("RUNNER_ARCH and/or RUNNER_OS is not defined"); } } +/** + * Get the current Nix system. Examples include `x86_64-linux` and `aarch64-darwin`. + */ function getNixPlatform(archOs) { const archOsMap = new Map([ ["X64-macOS", "x86_64-darwin"], @@ -90201,17 +90211,86 @@ function getNixPlatform(archOs) { } } -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/sourcedef.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@57c3688958a8ea902fa24780111e5c37dc5386a5_5zdsm7qsjhwwxqyje77k44k4nm/node_modules/detsys-ts/dist/inputs.js +/** + * @packageDocumentation + * Helpers for getting values from an Action's configuration. + */ + +/** + * Get a Boolean input from the Action's configuration by name. + */ +const getBool = (name) => { + return core.getBooleanInput(name); +}; +/** + * Get a multi-line string input from the Action's configuration by name or return `null` if not set. + */ +const getMultilineStringOrNull = (name) => { + const value = core.getMultilineInput(name); + if (value.length === 0) { + return null; + } + else { + return value; + } +}; +/** + * Get a number input from the Action's configuration by name or return `null` if not set. + */ +const getNumberOrNull = (name) => { + const value = core.getInput(name); + if (value === "") { + return null; + } + else { + return Number(value); + } +}; +/** + * Get a string input from the Action's configuration. + */ +const getString = (name) => { + return core.getInput(name); +}; +/** + * Get a string input from the Action's configuration by name or return `null` if not set. + */ +const getStringOrNull = (name) => { + const value = core.getInput(name); + if (value === "") { + return null; + } + else { + return value; + } +}; +/** + * Get a string input from the Action's configuration by name or return `undefined` if not set. + */ +const getStringOrUndefined = (name) => { + const value = core.getInput(name); + if (value === "") { + return undefined; + } + else { + return value; + } +}; + + +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@57c3688958a8ea902fa24780111e5c37dc5386a5_5zdsm7qsjhwwxqyje77k44k4nm/node_modules/detsys-ts/dist/sourcedef.js + function constructSourceParameters(legacyPrefix) { const noisilyGetInput = (suffix) => { - const preferredInput = inputStringOrUndef(`source-${suffix}`); + const preferredInput = getStringOrUndefined(`source-${suffix}`); if (!legacyPrefix) { return preferredInput; } // Remaining is for handling cases where the legacy prefix // should be examined. - const legacyInput = inputStringOrUndef(`${legacyPrefix}-${suffix}`); + const legacyInput = getStringOrUndefined(`${legacyPrefix}-${suffix}`); if (preferredInput && legacyInput) { core.warning(`The supported option source-${suffix} and the legacy option ${legacyPrefix}-${suffix} are both set. Preferring source-${suffix}. Please stop setting ${legacyPrefix}-${suffix}.`); return preferredInput; @@ -90233,15 +90312,6 @@ function constructSourceParameters(legacyPrefix) { revision: noisilyGetInput("revision"), }; } -function inputStringOrUndef(name) { - const value = core.getInput(name); - if (value === "") { - return undefined; - } - else { - return value; - } -} // EXTERNAL MODULE: ./node_modules/.pnpm/@actions+cache@3.2.4/node_modules/@actions/cache/lib/cache.js var cache = __nccwpck_require__(6878); @@ -97212,7 +97282,11 @@ const validate = uuid_dist/* validate */.Gu; const stringify = uuid_dist/* stringify */.Pz; const parse = uuid_dist/* parse */.Qc; -;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@3a315cdffd83d4b229d4fb16548d22a3756baf28_lprtsns3vmnabnzqpk64lag6gi/node_modules/detsys-ts/dist/main.js +;// CONCATENATED MODULE: ./node_modules/.pnpm/github.com+DeterminateSystems+detsys-ts@57c3688958a8ea902fa24780111e5c37dc5386a5_5zdsm7qsjhwwxqyje77k44k4nm/node_modules/detsys-ts/dist/main.js +/** + * @packageDocumentation + * Determinate Systems' TypeScript library for creating GitHub Actions logic. + */ // eslint-disable-next-line import/extensions @@ -97583,6 +97657,9 @@ function mungeDiagnosticEndpoint(inputUrl) { } return inputUrl; } +// Public exports from other files + + ;// CONCATENATED MODULE: ./dist/main.js @@ -97604,35 +97681,35 @@ class NixInstallerAction { legacySourcePrefix: "nix-installer", }); this.platform = get_nix_platform(); - this.nix_package_url = action_input_string_or_null("nix-package-url"); - this.backtrace = action_input_string_or_null("backtrace"); - this.extra_args = action_input_string_or_null("extra-args"); - this.extra_conf = action_input_multiline_string_or_null("extra-conf"); - this.flakehub = action_input_bool("flakehub"); - this.kvm = action_input_bool("kvm"); - this.force_docker_shim = action_input_bool("force-docker-shim"); - this.github_token = action_input_string_or_null("github-token"); - this.github_server_url = action_input_string_or_null("github-server-url"); - this.init = action_input_string_or_null("init"); - this.local_root = action_input_string_or_null("local-root"); - this.log_directives = action_input_string_or_null("log-directives"); - this.logger = action_input_string_or_null("logger"); - this.ssl_cert_file = action_input_string_or_null("ssl-cert-file"); - this.proxy = action_input_string_or_null("proxy"); - this.mac_case_sensitive = action_input_string_or_null("mac-case-sensitive"); - this.mac_encrypt = action_input_string_or_null("mac-encrypt"); - this.mac_root_disk = action_input_string_or_null("mac-root-disk"); - this.mac_volume_label = action_input_string_or_null("mac-volume-label"); - this.modify_profile = action_input_bool("modify-profile"); - this.nix_build_group_id = action_input_number_or_null("nix-build-group-id"); - this.nix_build_group_name = action_input_string_or_null("nix-build-group-name"); - this.nix_build_user_base = action_input_number_or_null("nix_build-user-base"); - this.nix_build_user_count = action_input_number_or_null("nix-build-user-count"); - this.nix_build_user_prefix = action_input_string_or_null("nix-build-user-prefix"); - this.planner = action_input_string_or_null("planner"); - this.reinstall = action_input_bool("reinstall"); - this.start_daemon = action_input_bool("start-daemon"); - this.trust_runner_user = action_input_bool("trust-runner-user"); + this.nix_package_url = getStringOrNull("nix-package-url"); + this.backtrace = getStringOrNull("backtrace"); + this.extra_args = getStringOrNull("extra-args"); + this.extra_conf = getMultilineStringOrNull("extra-conf"); + this.flakehub = getBool("flakehub"); + this.kvm = getBool("kvm"); + this.force_docker_shim = getBool("force-docker-shim"); + this.github_token = getStringOrNull("github-token"); + this.github_server_url = getStringOrNull("github-server-url"); + this.init = getStringOrNull("init"); + this.local_root = getStringOrNull("local-root"); + this.log_directives = getStringOrNull("log-directives"); + this.logger = getStringOrNull("logger"); + this.ssl_cert_file = getStringOrNull("ssl-cert-file"); + this.proxy = getStringOrNull("proxy"); + this.mac_case_sensitive = getStringOrNull("mac-case-sensitive"); + this.mac_encrypt = getStringOrNull("mac-encrypt"); + this.mac_root_disk = getStringOrNull("mac-root-disk"); + this.mac_volume_label = getStringOrNull("mac-volume-label"); + this.modify_profile = getBool("modify-profile"); + this.nix_build_group_id = getNumberOrNull("nix-build-group-id"); + this.nix_build_group_name = getStringOrNull("nix-build-group-name"); + this.nix_build_user_base = getNumberOrNull("nix_build-user-base"); + this.nix_build_user_count = getNumberOrNull("nix-build-user-count"); + this.nix_build_user_prefix = getStringOrNull("nix-build-user-prefix"); + this.planner = getStringOrNull("planner"); + this.reinstall = getBool("reinstall"); + this.start_daemon = getBool("start-daemon"); + this.trust_runner_user = getBool("trust-runner-user"); } async detectAndForceDockerShim() { // Detect if we're in a GHA runner which is Linux, doesn't have Systemd, and does have Docker. @@ -98335,36 +98412,6 @@ function get_default_planner() { throw new Error(`Unsupported \`RUNNER_OS\` (currently \`${env_os}\`)`); } } -function action_input_string_or_null(name) { - const value = core.getInput(name); - if (value === "") { - return null; - } - else { - return value; - } -} -function action_input_multiline_string_or_null(name) { - const value = core.getMultilineInput(name); - if (value.length === 0) { - return null; - } - else { - return value; - } -} -function action_input_number_or_null(name) { - const value = core.getInput(name); - if (value === "") { - return null; - } - else { - return Number(value); - } -} -function action_input_bool(name) { - return core.getBooleanInput(name); -} function main() { const installer = new NixInstallerAction(); installer.idslib.onMain(async () => { diff --git a/dist/main.js b/dist/main.js index 9fb2a20..691f58a 100644 --- a/dist/main.js +++ b/dist/main.js @@ -7,7 +7,7 @@ import fs from "node:fs"; import { userInfo } from "node:os"; import stringArgv from "string-argv"; import * as path from "path"; -import { IdsToolbox } from "detsys-ts"; +import { IdsToolbox, inputs } from "detsys-ts"; import { randomUUID } from "node:crypto"; class NixInstallerAction { constructor() { @@ -17,35 +17,35 @@ class NixInstallerAction { legacySourcePrefix: "nix-installer", }); this.platform = get_nix_platform(); - this.nix_package_url = action_input_string_or_null("nix-package-url"); - this.backtrace = action_input_string_or_null("backtrace"); - this.extra_args = action_input_string_or_null("extra-args"); - this.extra_conf = action_input_multiline_string_or_null("extra-conf"); - this.flakehub = action_input_bool("flakehub"); - this.kvm = action_input_bool("kvm"); - this.force_docker_shim = action_input_bool("force-docker-shim"); - this.github_token = action_input_string_or_null("github-token"); - this.github_server_url = action_input_string_or_null("github-server-url"); - this.init = action_input_string_or_null("init"); - this.local_root = action_input_string_or_null("local-root"); - this.log_directives = action_input_string_or_null("log-directives"); - this.logger = action_input_string_or_null("logger"); - this.ssl_cert_file = action_input_string_or_null("ssl-cert-file"); - this.proxy = action_input_string_or_null("proxy"); - this.mac_case_sensitive = action_input_string_or_null("mac-case-sensitive"); - this.mac_encrypt = action_input_string_or_null("mac-encrypt"); - this.mac_root_disk = action_input_string_or_null("mac-root-disk"); - this.mac_volume_label = action_input_string_or_null("mac-volume-label"); - this.modify_profile = action_input_bool("modify-profile"); - this.nix_build_group_id = action_input_number_or_null("nix-build-group-id"); - this.nix_build_group_name = action_input_string_or_null("nix-build-group-name"); - this.nix_build_user_base = action_input_number_or_null("nix_build-user-base"); - this.nix_build_user_count = action_input_number_or_null("nix-build-user-count"); - this.nix_build_user_prefix = action_input_string_or_null("nix-build-user-prefix"); - this.planner = action_input_string_or_null("planner"); - this.reinstall = action_input_bool("reinstall"); - this.start_daemon = action_input_bool("start-daemon"); - this.trust_runner_user = action_input_bool("trust-runner-user"); + this.nix_package_url = inputs.getStringOrNull("nix-package-url"); + this.backtrace = inputs.getStringOrNull("backtrace"); + this.extra_args = inputs.getStringOrNull("extra-args"); + this.extra_conf = inputs.getMultilineStringOrNull("extra-conf"); + this.flakehub = inputs.getBool("flakehub"); + this.kvm = inputs.getBool("kvm"); + this.force_docker_shim = inputs.getBool("force-docker-shim"); + this.github_token = inputs.getStringOrNull("github-token"); + this.github_server_url = inputs.getStringOrNull("github-server-url"); + this.init = inputs.getStringOrNull("init"); + this.local_root = inputs.getStringOrNull("local-root"); + this.log_directives = inputs.getStringOrNull("log-directives"); + this.logger = inputs.getStringOrNull("logger"); + this.ssl_cert_file = inputs.getStringOrNull("ssl-cert-file"); + this.proxy = inputs.getStringOrNull("proxy"); + this.mac_case_sensitive = inputs.getStringOrNull("mac-case-sensitive"); + this.mac_encrypt = inputs.getStringOrNull("mac-encrypt"); + this.mac_root_disk = inputs.getStringOrNull("mac-root-disk"); + this.mac_volume_label = inputs.getStringOrNull("mac-volume-label"); + this.modify_profile = inputs.getBool("modify-profile"); + this.nix_build_group_id = inputs.getNumberOrNull("nix-build-group-id"); + this.nix_build_group_name = inputs.getStringOrNull("nix-build-group-name"); + this.nix_build_user_base = inputs.getNumberOrNull("nix_build-user-base"); + this.nix_build_user_count = inputs.getNumberOrNull("nix-build-user-count"); + this.nix_build_user_prefix = inputs.getStringOrNull("nix-build-user-prefix"); + this.planner = inputs.getStringOrNull("planner"); + this.reinstall = inputs.getBool("reinstall"); + this.start_daemon = inputs.getBool("start-daemon"); + this.trust_runner_user = inputs.getBool("trust-runner-user"); } async detectAndForceDockerShim() { // Detect if we're in a GHA runner which is Linux, doesn't have Systemd, and does have Docker. @@ -748,36 +748,6 @@ function get_default_planner() { throw new Error(`Unsupported \`RUNNER_OS\` (currently \`${env_os}\`)`); } } -function action_input_string_or_null(name) { - const value = actions_core.getInput(name); - if (value === "") { - return null; - } - else { - return value; - } -} -function action_input_multiline_string_or_null(name) { - const value = actions_core.getMultilineInput(name); - if (value.length === 0) { - return null; - } - else { - return value; - } -} -function action_input_number_or_null(name) { - const value = actions_core.getInput(name); - if (value === "") { - return null; - } - else { - return Number(value); - } -} -function action_input_bool(name) { - return actions_core.getBooleanInput(name); -} function main() { const installer = new NixInstallerAction(); installer.idslib.onMain(async () => { diff --git a/package.json b/package.json index 2578412..d426fbd 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@trivago/prettier-plugin-sort-imports": "^4.3.0", "@types/node": "^20.12.7", "@types/uuid": "^9.0.8", - "@typescript-eslint/eslint-plugin": "^7.6.0", + "@typescript-eslint/eslint-plugin": "^7.7.0", "@vercel/ncc": "^0.38.1", "eslint": "^8.57.0", "eslint-import-resolver-typescript": "^3.6.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 11ed2d4..1ec4cd4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -19,7 +19,7 @@ dependencies: version: 2.0.1 detsys-ts: specifier: github:DeterminateSystems/detsys-ts - version: github.com/DeterminateSystems/detsys-ts/3a315cdffd83d4b229d4fb16548d22a3756baf28 + version: github.com/DeterminateSystems/detsys-ts/57c3688958a8ea902fa24780111e5c37dc5386a5 fetch-retry: specifier: ^5.0.6 version: 5.0.6 @@ -38,8 +38,8 @@ devDependencies: specifier: ^9.0.8 version: 9.0.8 "@typescript-eslint/eslint-plugin": - specifier: ^7.6.0 - version: 7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) + specifier: ^7.7.0 + version: 7.7.0(@typescript-eslint/parser@7.7.0)(eslint@8.57.0)(typescript@5.4.5) "@vercel/ncc": specifier: ^0.38.1 version: 0.38.1 @@ -48,13 +48,13 @@ devDependencies: version: 8.57.0 eslint-import-resolver-typescript: specifier: ^3.6.1 - version: 3.6.1(@typescript-eslint/parser@7.6.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0) + version: 3.6.1(@typescript-eslint/parser@7.7.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0) eslint-plugin-github: specifier: ^4.10.2 version: 4.10.2(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)(typescript@5.4.5) eslint-plugin-import: specifier: ^2.29.1 - version: 2.29.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + version: 2.29.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) eslint-plugin-prettier: specifier: ^5.1.3 version: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) @@ -1104,10 +1104,10 @@ packages: engines: { node: ^12.20.0 || ^14.18.0 || >=16.0.0 } dev: true - /@rollup/rollup-android-arm-eabi@4.14.1: + /@rollup/rollup-android-arm-eabi@4.14.3: resolution: { - integrity: sha512-fH8/o8nSUek8ceQnT7K4EQbSiV7jgkHq81m9lWZFIXjJ7lJzpWXbQFpT/Zh6OZYnpFykvzC3fbEvEAFZu03dPA==, + integrity: sha512-X9alQ3XM6I9IlSlmC8ddAvMSyG1WuHk5oUnXGw+yUBs3BFoTizmG1La/Gr8fVJvDWAq+zlYTZ9DBgrlKRVY06g==, } cpu: [arm] os: [android] @@ -1115,10 +1115,10 @@ packages: dev: true optional: true - /@rollup/rollup-android-arm64@4.14.1: + /@rollup/rollup-android-arm64@4.14.3: resolution: { - integrity: sha512-Y/9OHLjzkunF+KGEoJr3heiD5X9OLa8sbT1lm0NYeKyaM3oMhhQFvPB0bNZYJwlq93j8Z6wSxh9+cyKQaxS7PQ==, + integrity: sha512-eQK5JIi+POhFpzk+LnjKIy4Ks+pwJ+NXmPxOCSvOKSNRPONzKuUvWE+P9JxGZVxrtzm6BAYMaL50FFuPe0oWMQ==, } cpu: [arm64] os: [android] @@ -1126,10 +1126,10 @@ packages: dev: true optional: true - /@rollup/rollup-darwin-arm64@4.14.1: + /@rollup/rollup-darwin-arm64@4.14.3: resolution: { - integrity: sha512-+kecg3FY84WadgcuSVm6llrABOdQAEbNdnpi5X3UwWiFVhZIZvKgGrF7kmLguvxHNQy+UuRV66cLVl3S+Rkt+Q==, + integrity: sha512-Od4vE6f6CTT53yM1jgcLqNfItTsLt5zE46fdPaEmeFHvPs5SjZYlLpHrSiHEKR1+HdRfxuzXHjDOIxQyC3ptBA==, } cpu: [arm64] os: [darwin] @@ -1137,10 +1137,10 @@ packages: dev: true optional: true - /@rollup/rollup-darwin-x64@4.14.1: + /@rollup/rollup-darwin-x64@4.14.3: resolution: { - integrity: sha512-2pYRzEjVqq2TB/UNv47BV/8vQiXkFGVmPFwJb+1E0IFFZbIX8/jo1olxqqMbo6xCXf8kabANhp5bzCij2tFLUA==, + integrity: sha512-0IMAO21axJeNIrvS9lSe/PGthc8ZUS+zC53O0VhF5gMxfmcKAP4ESkKOCwEi6u2asUrt4mQv2rjY8QseIEb1aw==, } cpu: [x64] os: [darwin] @@ -1148,10 +1148,10 @@ packages: dev: true optional: true - /@rollup/rollup-linux-arm-gnueabihf@4.14.1: + /@rollup/rollup-linux-arm-gnueabihf@4.14.3: resolution: { - integrity: sha512-mS6wQ6Do6/wmrF9aTFVpIJ3/IDXhg1EZcQFYHZLHqw6AzMBjTHWnCG35HxSqUNphh0EHqSM6wRTT8HsL1C0x5g==, + integrity: sha512-ge2DC7tHRHa3caVEoSbPRJpq7azhG+xYsd6u2MEnJ6XzPSzQsTKyXvh6iWjXRf7Rt9ykIUWHtl0Uz3T6yXPpKw==, } cpu: [arm] os: [linux] @@ -1159,10 +1159,21 @@ packages: dev: true optional: true - /@rollup/rollup-linux-arm64-gnu@4.14.1: + /@rollup/rollup-linux-arm-musleabihf@4.14.3: resolution: { - integrity: sha512-p9rGKYkHdFMzhckOTFubfxgyIO1vw//7IIjBBRVzyZebWlzRLeNhqxuSaZ7kCEKVkm/kuC9fVRW9HkC/zNRG2w==, + integrity: sha512-ljcuiDI4V3ySuc7eSk4lQ9wU8J8r8KrOUvB2U+TtK0TiW6OFDmJ+DdIjjwZHIw9CNxzbmXY39wwpzYuFDwNXuw==, + } + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /@rollup/rollup-linux-arm64-gnu@4.14.3: + resolution: + { + integrity: sha512-Eci2us9VTHm1eSyn5/eEpaC7eP/mp5n46gTRB3Aar3BgSvDQGJZuicyq6TsH4HngNBgVqC5sDYxOzTExSU+NjA==, } cpu: [arm64] os: [linux] @@ -1170,10 +1181,10 @@ packages: dev: true optional: true - /@rollup/rollup-linux-arm64-musl@4.14.1: + /@rollup/rollup-linux-arm64-musl@4.14.3: resolution: { - integrity: sha512-nDY6Yz5xS/Y4M2i9JLQd3Rofh5OR8Bn8qe3Mv/qCVpHFlwtZSBYSPaU4mrGazWkXrdQ98GB//H0BirGR/SKFSw==, + integrity: sha512-UrBoMLCq4E92/LCqlh+blpqMz5h1tJttPIniwUgOFJyjWI1qrtrDhhpHPuFxULlUmjFHfloWdixtDhSxJt5iKw==, } cpu: [arm64] os: [linux] @@ -1181,21 +1192,21 @@ packages: dev: true optional: true - /@rollup/rollup-linux-powerpc64le-gnu@4.14.1: + /@rollup/rollup-linux-powerpc64le-gnu@4.14.3: resolution: { - integrity: sha512-im7HE4VBL+aDswvcmfx88Mp1soqL9OBsdDBU8NqDEYtkri0qV0THhQsvZtZeNNlLeCUQ16PZyv7cqutjDF35qw==, + integrity: sha512-5aRjvsS8q1nWN8AoRfrq5+9IflC3P1leMoy4r2WjXyFqf3qcqsxRCfxtZIV58tCxd+Yv7WELPcO9mY9aeQyAmw==, } - cpu: [ppc64le] + cpu: [ppc64] os: [linux] requiresBuild: true dev: true optional: true - /@rollup/rollup-linux-riscv64-gnu@4.14.1: + /@rollup/rollup-linux-riscv64-gnu@4.14.3: resolution: { - integrity: sha512-RWdiHuAxWmzPJgaHJdpvUUlDz8sdQz4P2uv367T2JocdDa98iRw2UjIJ4QxSyt077mXZT2X6pKfT2iYtVEvOFw==, + integrity: sha512-sk/Qh1j2/RJSX7FhEpJn8n0ndxy/uf0kI/9Zc4b1ELhqULVdTfN6HL31CDaTChiBAOgLcsJ1sgVZjWv8XNEsAQ==, } cpu: [riscv64] os: [linux] @@ -1203,10 +1214,10 @@ packages: dev: true optional: true - /@rollup/rollup-linux-s390x-gnu@4.14.1: + /@rollup/rollup-linux-s390x-gnu@4.14.3: resolution: { - integrity: sha512-VMgaGQ5zRX6ZqV/fas65/sUGc9cPmsntq2FiGmayW9KMNfWVG/j0BAqImvU4KTeOOgYSf1F+k6at1UfNONuNjA==, + integrity: sha512-jOO/PEaDitOmY9TgkxF/TQIjXySQe5KVYB57H/8LRP/ux0ZoO8cSHCX17asMSv3ruwslXW/TLBcxyaUzGRHcqg==, } cpu: [s390x] os: [linux] @@ -1214,10 +1225,10 @@ packages: dev: true optional: true - /@rollup/rollup-linux-x64-gnu@4.14.1: + /@rollup/rollup-linux-x64-gnu@4.14.3: resolution: { - integrity: sha512-9Q7DGjZN+hTdJomaQ3Iub4m6VPu1r94bmK2z3UeWP3dGUecRC54tmVu9vKHTm1bOt3ASoYtEz6JSRLFzrysKlA==, + integrity: sha512-8ybV4Xjy59xLMyWo3GCfEGqtKV5M5gCSrZlxkPGvEPCGDLNla7v48S662HSGwRd6/2cSneMQWiv+QzcttLrrOA==, } cpu: [x64] os: [linux] @@ -1225,10 +1236,10 @@ packages: dev: true optional: true - /@rollup/rollup-linux-x64-musl@4.14.1: + /@rollup/rollup-linux-x64-musl@4.14.3: resolution: { - integrity: sha512-JNEG/Ti55413SsreTguSx0LOVKX902OfXIKVg+TCXO6Gjans/k9O6ww9q3oLGjNDaTLxM+IHFMeXy/0RXL5R/g==, + integrity: sha512-s+xf1I46trOY10OqAtZ5Rm6lzHre/UiLA1J2uOhCFXWkbZrJRkYBPO6FhvGfHmdtQ3Bx793MNa7LvoWFAm93bg==, } cpu: [x64] os: [linux] @@ -1236,10 +1247,10 @@ packages: dev: true optional: true - /@rollup/rollup-win32-arm64-msvc@4.14.1: + /@rollup/rollup-win32-arm64-msvc@4.14.3: resolution: { - integrity: sha512-ryS22I9y0mumlLNwDFYZRDFLwWh3aKaC72CWjFcFvxK0U6v/mOkM5Up1bTbCRAhv3kEIwW2ajROegCIQViUCeA==, + integrity: sha512-+4h2WrGOYsOumDQ5S2sYNyhVfrue+9tc9XcLWLh+Kw3UOxAvrfOrSMFon60KspcDdytkNDh7K2Vs6eMaYImAZg==, } cpu: [arm64] os: [win32] @@ -1247,10 +1258,10 @@ packages: dev: true optional: true - /@rollup/rollup-win32-ia32-msvc@4.14.1: + /@rollup/rollup-win32-ia32-msvc@4.14.3: resolution: { - integrity: sha512-TdloItiGk+T0mTxKx7Hp279xy30LspMso+GzQvV2maYePMAWdmrzqSNZhUpPj3CGw12aGj57I026PgLCTu8CGg==, + integrity: sha512-T1l7y/bCeL/kUwh9OD4PQT4aM7Bq43vX05htPJJ46RTI4r5KNt6qJRzAfNfM+OYMNEVBWQzR2Gyk+FXLZfogGw==, } cpu: [ia32] os: [win32] @@ -1258,10 +1269,10 @@ packages: dev: true optional: true - /@rollup/rollup-win32-x64-msvc@4.14.1: + /@rollup/rollup-win32-x64-msvc@4.14.3: resolution: { - integrity: sha512-wQGI+LY/Py20zdUPq+XCem7JcPOyzIJBm3dli+56DJsQOHbnXZFEwgmnC6el1TPAfC8lBT3m+z69RmLykNUbew==, + integrity: sha512-/BypzV0H1y1HzgYpxqRaXGBRqfodgoBBCcsrujT6QRcakDQdfU+Lq9PENPh5jB4I44YWq+0C2eHsHya+nZY1sA==, } cpu: [x64] os: [win32] @@ -1379,10 +1390,10 @@ packages: } dev: true - /@typescript-eslint/eslint-plugin@7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5): + /@typescript-eslint/eslint-plugin@7.7.0(@typescript-eslint/parser@7.7.0)(eslint@8.57.0)(typescript@5.4.5): resolution: { - integrity: sha512-gKmTNwZnblUdnTIJu3e9kmeRRzV2j1a/LUO27KNNAnIC5zjy1aSvXSRp4rVNlmAoHlQ7HzX42NbKpcSr4jF80A==, + integrity: sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==, } engines: { node: ^18.18.0 || >=20.0.0 } peerDependencies: @@ -1394,11 +1405,11 @@ packages: optional: true dependencies: "@eslint-community/regexpp": 4.10.0 - "@typescript-eslint/parser": 7.6.0(eslint@8.57.0)(typescript@5.4.5) - "@typescript-eslint/scope-manager": 7.6.0 - "@typescript-eslint/type-utils": 7.6.0(eslint@8.57.0)(typescript@5.4.5) - "@typescript-eslint/utils": 7.6.0(eslint@8.57.0)(typescript@5.4.5) - "@typescript-eslint/visitor-keys": 7.6.0 + "@typescript-eslint/parser": 7.7.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/scope-manager": 7.7.0 + "@typescript-eslint/type-utils": 7.7.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/utils": 7.7.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/visitor-keys": 7.7.0 debug: 4.3.4 eslint: 8.57.0 graphemer: 1.4.0 @@ -1411,10 +1422,10 @@ packages: - supports-color dev: true - /@typescript-eslint/parser@7.6.0(eslint@8.57.0)(typescript@5.4.5): + /@typescript-eslint/parser@7.7.0(eslint@8.57.0)(typescript@5.4.5): resolution: { - integrity: sha512-usPMPHcwX3ZoPWnBnhhorc14NJw9J4HpSXQX4urF2TPKG0au0XhJoZyX62fmvdHONUkmyUe74Hzm1//XA+BoYg==, + integrity: sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==, } engines: { node: ^18.18.0 || >=20.0.0 } peerDependencies: @@ -1424,10 +1435,10 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/scope-manager": 7.6.0 - "@typescript-eslint/types": 7.6.0 - "@typescript-eslint/typescript-estree": 7.6.0(typescript@5.4.5) - "@typescript-eslint/visitor-keys": 7.6.0 + "@typescript-eslint/scope-manager": 7.7.0 + "@typescript-eslint/types": 7.7.0 + "@typescript-eslint/typescript-estree": 7.7.0(typescript@5.4.5) + "@typescript-eslint/visitor-keys": 7.7.0 debug: 4.3.4 eslint: 8.57.0 typescript: 5.4.5 @@ -1435,21 +1446,21 @@ packages: - supports-color dev: true - /@typescript-eslint/scope-manager@7.6.0: + /@typescript-eslint/scope-manager@7.7.0: resolution: { - integrity: sha512-ngttyfExA5PsHSx0rdFgnADMYQi+Zkeiv4/ZxGYUWd0nLs63Ha0ksmp8VMxAIC0wtCFxMos7Lt3PszJssG/E6w==, + integrity: sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==, } engines: { node: ^18.18.0 || >=20.0.0 } dependencies: - "@typescript-eslint/types": 7.6.0 - "@typescript-eslint/visitor-keys": 7.6.0 + "@typescript-eslint/types": 7.7.0 + "@typescript-eslint/visitor-keys": 7.7.0 dev: true - /@typescript-eslint/type-utils@7.6.0(eslint@8.57.0)(typescript@5.4.5): + /@typescript-eslint/type-utils@7.7.0(eslint@8.57.0)(typescript@5.4.5): resolution: { - integrity: sha512-NxAfqAPNLG6LTmy7uZgpK8KcuiS2NZD/HlThPXQRGwz6u7MDBWRVliEEl1Gj6U7++kVJTpehkhZzCJLMK66Scw==, + integrity: sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==, } engines: { node: ^18.18.0 || >=20.0.0 } peerDependencies: @@ -1459,8 +1470,8 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/typescript-estree": 7.6.0(typescript@5.4.5) - "@typescript-eslint/utils": 7.6.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/typescript-estree": 7.7.0(typescript@5.4.5) + "@typescript-eslint/utils": 7.7.0(eslint@8.57.0)(typescript@5.4.5) debug: 4.3.4 eslint: 8.57.0 ts-api-utils: 1.3.0(typescript@5.4.5) @@ -1469,18 +1480,18 @@ packages: - supports-color dev: true - /@typescript-eslint/types@7.6.0: + /@typescript-eslint/types@7.7.0: resolution: { - integrity: sha512-h02rYQn8J+MureCvHVVzhl69/GAfQGPQZmOMjG1KfCl7o3HtMSlPaPUAPu6lLctXI5ySRGIYk94clD/AUMCUgQ==, + integrity: sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==, } engines: { node: ^18.18.0 || >=20.0.0 } dev: true - /@typescript-eslint/typescript-estree@7.6.0(typescript@5.4.5): + /@typescript-eslint/typescript-estree@7.7.0(typescript@5.4.5): resolution: { - integrity: sha512-+7Y/GP9VuYibecrCQWSKgl3GvUM5cILRttpWtnAu8GNL9j11e4tbuGZmZjJ8ejnKYyBRb2ddGQ3rEFCq3QjMJw==, + integrity: sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==, } engines: { node: ^18.18.0 || >=20.0.0 } peerDependencies: @@ -1489,8 +1500,8 @@ packages: typescript: optional: true dependencies: - "@typescript-eslint/types": 7.6.0 - "@typescript-eslint/visitor-keys": 7.6.0 + "@typescript-eslint/types": 7.7.0 + "@typescript-eslint/visitor-keys": 7.7.0 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 @@ -1502,10 +1513,10 @@ packages: - supports-color dev: true - /@typescript-eslint/utils@7.6.0(eslint@8.57.0)(typescript@5.4.5): + /@typescript-eslint/utils@7.7.0(eslint@8.57.0)(typescript@5.4.5): resolution: { - integrity: sha512-x54gaSsRRI+Nwz59TXpCsr6harB98qjXYzsRxGqvA5Ue3kQH+FxS7FYU81g/omn22ML2pZJkisy6Q+ElK8pBCA==, + integrity: sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==, } engines: { node: ^18.18.0 || >=20.0.0 } peerDependencies: @@ -1514,9 +1525,9 @@ packages: "@eslint-community/eslint-utils": 4.4.0(eslint@8.57.0) "@types/json-schema": 7.0.15 "@types/semver": 7.5.8 - "@typescript-eslint/scope-manager": 7.6.0 - "@typescript-eslint/types": 7.6.0 - "@typescript-eslint/typescript-estree": 7.6.0(typescript@5.4.5) + "@typescript-eslint/scope-manager": 7.7.0 + "@typescript-eslint/types": 7.7.0 + "@typescript-eslint/typescript-estree": 7.7.0(typescript@5.4.5) eslint: 8.57.0 semver: 7.6.0 transitivePeerDependencies: @@ -1524,14 +1535,14 @@ packages: - typescript dev: true - /@typescript-eslint/visitor-keys@7.6.0: + /@typescript-eslint/visitor-keys@7.7.0: resolution: { - integrity: sha512-4eLB7t+LlNUmXzfOu1VAIAdkjbu5xNSerURS9X/S5TUKWFRpXRQZbmtPqgKmYx8bj3J0irtQXSiWAOY82v+cgw==, + integrity: sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==, } engines: { node: ^18.18.0 || >=20.0.0 } dependencies: - "@typescript-eslint/types": 7.6.0 + "@typescript-eslint/types": 7.7.0 eslint-visitor-keys: 3.4.3 dev: true @@ -1860,8 +1871,8 @@ packages: engines: { node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7 } hasBin: true dependencies: - caniuse-lite: 1.0.30001608 - electron-to-chromium: 1.4.733 + caniuse-lite: 1.0.30001610 + electron-to-chromium: 1.4.736 node-releases: 2.0.14 update-browserslist-db: 1.0.13(browserslist@4.23.0) dev: true @@ -1933,10 +1944,10 @@ packages: engines: { node: ">=6" } dev: true - /caniuse-lite@1.0.30001608: + /caniuse-lite@1.0.30001610: resolution: { - integrity: sha512-cjUJTQkk9fQlJR2s4HMuPMvTiRggl0rAVMtthQuyOlDWuqHXqN8azLq+pi8B2TjwKJ32diHjUqRIKeFX4z1FoA==, + integrity: sha512-QFutAY4NgaelojVMjY63o6XlZyORPaLfyMnsl3HgnWdJUcX6K0oaJymHjH8PT5Gk7sTm8rvC/c5COUQKXqmOMA==, } dev: true @@ -2231,10 +2242,10 @@ packages: } dev: true - /electron-to-chromium@1.4.733: + /electron-to-chromium@1.4.736: resolution: { - integrity: sha512-gUI9nhI2iBGF0OaYYLKOaOtliFMl+Bt1rY7VmEjwxOxqoYLub/D9xmduPEhbw2imE6gYkJKhIE5it+KE2ulVxQ==, + integrity: sha512-Rer6wc3ynLelKNM4lOCg7/zPQj8tPOCB2hzD32PX9wd3hgRRi9MxEbmkFCokzcEhRVMiOVLjnL9ig9cefJ+6+Q==, } dev: true @@ -2485,7 +2496,7 @@ packages: - supports-color dev: true - /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.6.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0): + /eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.7.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0): resolution: { integrity: sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==, @@ -2498,8 +2509,8 @@ packages: debug: 4.3.4 enhanced-resolve: 5.16.0 eslint: 8.57.0 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) fast-glob: 3.3.2 get-tsconfig: 4.7.3 is-core-module: 2.13.1 @@ -2511,7 +2522,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): + /eslint-module-utils@2.8.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): resolution: { integrity: sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==, @@ -2535,11 +2546,11 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - "@typescript-eslint/parser": 7.6.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/parser": 7.7.0(eslint@8.57.0)(typescript@5.4.5) debug: 3.2.7 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.6.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0) + eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.7.0)(eslint-plugin-import@2.29.1)(eslint@8.57.0) transitivePeerDependencies: - supports-color dev: true @@ -2595,8 +2606,8 @@ packages: eslint: ^8.0.1 dependencies: "@github/browserslist-config": 1.0.0 - "@typescript-eslint/eslint-plugin": 7.6.0(@typescript-eslint/parser@7.6.0)(eslint@8.57.0)(typescript@5.4.5) - "@typescript-eslint/parser": 7.6.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/eslint-plugin": 7.7.0(@typescript-eslint/parser@7.7.0)(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/parser": 7.7.0(eslint@8.57.0)(typescript@5.4.5) aria-query: 5.3.0 eslint: 8.57.0 eslint-config-prettier: 9.1.0(eslint@8.57.0) @@ -2604,7 +2615,7 @@ packages: eslint-plugin-eslint-comments: 3.2.0(eslint@8.57.0) eslint-plugin-filenames: 1.3.2(eslint@8.57.0) eslint-plugin-i18n-text: 1.0.1(eslint@8.57.0) - eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0) eslint-plugin-no-only-tests: 3.1.0 eslint-plugin-prettier: 5.1.3(eslint-config-prettier@9.1.0)(eslint@8.57.0)(prettier@3.2.5) @@ -2631,7 +2642,7 @@ packages: eslint: 8.57.0 dev: true - /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): + /eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0): resolution: { integrity: sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==, @@ -2644,7 +2655,7 @@ packages: "@typescript-eslint/parser": optional: true dependencies: - "@typescript-eslint/parser": 7.6.0(eslint@8.57.0)(typescript@5.4.5) + "@typescript-eslint/parser": 7.7.0(eslint@8.57.0)(typescript@5.4.5) array-includes: 3.1.8 array.prototype.findlastindex: 1.2.5 array.prototype.flat: 1.3.2 @@ -2653,7 +2664,7 @@ packages: doctrine: 2.1.0 eslint: 8.57.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.6.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) + eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.7.0)(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0) hasown: 2.0.2 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -4584,31 +4595,32 @@ packages: glob: 7.2.3 dev: true - /rollup@4.14.1: + /rollup@4.14.3: resolution: { - integrity: sha512-4LnHSdd3QK2pa1J6dFbfm1HN0D7vSK/ZuZTsdyUAlA6Rr1yTouUTL13HaDOGJVgby461AhrNGBS7sCGXXtT+SA==, + integrity: sha512-ag5tTQKYsj1bhrFC9+OEWqb5O6VYgtQDO9hPDBMmIbePwhfSr+ExlcU741t8Dhw5DkPCQf6noz0jb36D6W9/hw==, } engines: { node: ">=18.0.0", npm: ">=8.0.0" } hasBin: true dependencies: "@types/estree": 1.0.5 optionalDependencies: - "@rollup/rollup-android-arm-eabi": 4.14.1 - "@rollup/rollup-android-arm64": 4.14.1 - "@rollup/rollup-darwin-arm64": 4.14.1 - "@rollup/rollup-darwin-x64": 4.14.1 - "@rollup/rollup-linux-arm-gnueabihf": 4.14.1 - "@rollup/rollup-linux-arm64-gnu": 4.14.1 - "@rollup/rollup-linux-arm64-musl": 4.14.1 - "@rollup/rollup-linux-powerpc64le-gnu": 4.14.1 - "@rollup/rollup-linux-riscv64-gnu": 4.14.1 - "@rollup/rollup-linux-s390x-gnu": 4.14.1 - "@rollup/rollup-linux-x64-gnu": 4.14.1 - "@rollup/rollup-linux-x64-musl": 4.14.1 - "@rollup/rollup-win32-arm64-msvc": 4.14.1 - "@rollup/rollup-win32-ia32-msvc": 4.14.1 - "@rollup/rollup-win32-x64-msvc": 4.14.1 + "@rollup/rollup-android-arm-eabi": 4.14.3 + "@rollup/rollup-android-arm64": 4.14.3 + "@rollup/rollup-darwin-arm64": 4.14.3 + "@rollup/rollup-darwin-x64": 4.14.3 + "@rollup/rollup-linux-arm-gnueabihf": 4.14.3 + "@rollup/rollup-linux-arm-musleabihf": 4.14.3 + "@rollup/rollup-linux-arm64-gnu": 4.14.3 + "@rollup/rollup-linux-arm64-musl": 4.14.3 + "@rollup/rollup-linux-powerpc64le-gnu": 4.14.3 + "@rollup/rollup-linux-riscv64-gnu": 4.14.3 + "@rollup/rollup-linux-s390x-gnu": 4.14.3 + "@rollup/rollup-linux-x64-gnu": 4.14.3 + "@rollup/rollup-linux-x64-musl": 4.14.3 + "@rollup/rollup-win32-arm64-msvc": 4.14.3 + "@rollup/rollup-win32-ia32-msvc": 4.14.3 + "@rollup/rollup-win32-x64-msvc": 4.14.3 fsevents: 2.3.3 dev: true @@ -5098,7 +5110,7 @@ packages: joycon: 3.1.1 postcss-load-config: 4.0.2 resolve-from: 5.0.0 - rollup: 4.14.1 + rollup: 4.14.3 source-map: 0.8.0-beta.0 sucrase: 3.35.0 tree-kill: 1.2.2 @@ -5462,10 +5474,10 @@ packages: engines: { node: ">=10" } dev: true - github.com/DeterminateSystems/detsys-ts/3a315cdffd83d4b229d4fb16548d22a3756baf28: + github.com/DeterminateSystems/detsys-ts/57c3688958a8ea902fa24780111e5c37dc5386a5: resolution: { - tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/3a315cdffd83d4b229d4fb16548d22a3756baf28, + tarball: https://codeload.github.com/DeterminateSystems/detsys-ts/tar.gz/57c3688958a8ea902fa24780111e5c37dc5386a5, } name: detsys-ts version: 1.0.0 diff --git a/src/main.ts b/src/main.ts index 062a6db..56bda16 100644 --- a/src/main.ts +++ b/src/main.ts @@ -7,7 +7,7 @@ import fs from "node:fs"; import { userInfo } from "node:os"; import stringArgv from "string-argv"; import * as path from "path"; -import { IdsToolbox } from "detsys-ts"; +import { IdsToolbox, inputs } from "detsys-ts"; import { randomUUID } from "node:crypto"; class NixInstallerAction { @@ -51,43 +51,37 @@ class NixInstallerAction { }); this.platform = get_nix_platform(); - this.nix_package_url = action_input_string_or_null("nix-package-url"); - this.backtrace = action_input_string_or_null("backtrace"); - this.extra_args = action_input_string_or_null("extra-args"); - this.extra_conf = action_input_multiline_string_or_null("extra-conf"); - this.flakehub = action_input_bool("flakehub"); - this.kvm = action_input_bool("kvm"); - this.force_docker_shim = action_input_bool("force-docker-shim"); - this.github_token = action_input_string_or_null("github-token"); - this.github_server_url = action_input_string_or_null("github-server-url"); - this.init = action_input_string_or_null("init"); - this.local_root = action_input_string_or_null("local-root"); - this.log_directives = action_input_string_or_null("log-directives"); - this.logger = action_input_string_or_null("logger"); - this.ssl_cert_file = action_input_string_or_null("ssl-cert-file"); - this.proxy = action_input_string_or_null("proxy"); - this.mac_case_sensitive = action_input_string_or_null("mac-case-sensitive"); - this.mac_encrypt = action_input_string_or_null("mac-encrypt"); - this.mac_root_disk = action_input_string_or_null("mac-root-disk"); - this.mac_volume_label = action_input_string_or_null("mac-volume-label"); - this.modify_profile = action_input_bool("modify-profile"); - this.nix_build_group_id = action_input_number_or_null("nix-build-group-id"); - this.nix_build_group_name = action_input_string_or_null( - "nix-build-group-name", - ); - this.nix_build_user_base = action_input_number_or_null( - "nix_build-user-base", - ); - this.nix_build_user_count = action_input_number_or_null( - "nix-build-user-count", - ); - this.nix_build_user_prefix = action_input_string_or_null( + this.nix_package_url = inputs.getStringOrNull("nix-package-url"); + this.backtrace = inputs.getStringOrNull("backtrace"); + this.extra_args = inputs.getStringOrNull("extra-args"); + this.extra_conf = inputs.getMultilineStringOrNull("extra-conf"); + this.flakehub = inputs.getBool("flakehub"); + this.kvm = inputs.getBool("kvm"); + this.force_docker_shim = inputs.getBool("force-docker-shim"); + this.github_token = inputs.getStringOrNull("github-token"); + this.github_server_url = inputs.getStringOrNull("github-server-url"); + this.init = inputs.getStringOrNull("init"); + this.local_root = inputs.getStringOrNull("local-root"); + this.log_directives = inputs.getStringOrNull("log-directives"); + this.logger = inputs.getStringOrNull("logger"); + this.ssl_cert_file = inputs.getStringOrNull("ssl-cert-file"); + this.proxy = inputs.getStringOrNull("proxy"); + this.mac_case_sensitive = inputs.getStringOrNull("mac-case-sensitive"); + this.mac_encrypt = inputs.getStringOrNull("mac-encrypt"); + this.mac_root_disk = inputs.getStringOrNull("mac-root-disk"); + this.mac_volume_label = inputs.getStringOrNull("mac-volume-label"); + this.modify_profile = inputs.getBool("modify-profile"); + this.nix_build_group_id = inputs.getNumberOrNull("nix-build-group-id"); + this.nix_build_group_name = inputs.getStringOrNull("nix-build-group-name"); + this.nix_build_user_base = inputs.getNumberOrNull("nix_build-user-base"); + this.nix_build_user_count = inputs.getNumberOrNull("nix-build-user-count"); + this.nix_build_user_prefix = inputs.getStringOrNull( "nix-build-user-prefix", ); - this.planner = action_input_string_or_null("planner"); - this.reinstall = action_input_bool("reinstall"); - this.start_daemon = action_input_bool("start-daemon"); - this.trust_runner_user = action_input_bool("trust-runner-user"); + this.planner = inputs.getStringOrNull("planner"); + this.reinstall = inputs.getBool("reinstall"); + this.start_daemon = inputs.getBool("start-daemon"); + this.trust_runner_user = inputs.getBool("trust-runner-user"); } async detectAndForceDockerShim(): Promise { @@ -990,37 +984,6 @@ function get_default_planner(): string { } } -function action_input_string_or_null(name: string): string | null { - const value = actions_core.getInput(name); - if (value === "") { - return null; - } else { - return value; - } -} - -function action_input_multiline_string_or_null(name: string): string[] | null { - const value = actions_core.getMultilineInput(name); - if (value.length === 0) { - return null; - } else { - return value; - } -} - -function action_input_number_or_null(name: string): number | null { - const value = actions_core.getInput(name); - if (value === "") { - return null; - } else { - return Number(value); - } -} - -function action_input_bool(name: string): boolean { - return actions_core.getBooleanInput(name); -} - function main(): void { const installer = new NixInstallerAction();