From a675ccd07e82e6ac2799a86573a5e1a47800ddc2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:46:06 +0000 Subject: [PATCH 1/2] Bump the major group with 13 updates Bumps the major group with 13 updates: | Package | From | To | | --- | --- | --- | | [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) | `18.18.14` | `20.10.3` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `5.62.0` | `6.13.1` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `5.62.0` | `6.13.1` | | [cross-fetch](https://github.com/lquixada/cross-fetch) | `3.1.8` | `4.0.0` | | [dotenv-cli](https://github.com/entropitor/dotenv-cli) | `5.1.0` | `7.3.0` | | [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) | `8.10.0` | `9.1.0` | | [fs-extra](https://github.com/jprichardson/node-fs-extra) | `10.1.0` | `11.2.0` | | [@types/fs-extra](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/fs-extra) | `9.0.13` | `11.0.4` | | [npm-run-all2](https://github.com/bcomnes/npm-run-all2) | `5.0.2` | `6.1.1` | | [prettier](https://github.com/prettier/prettier) | `2.8.8` | `3.1.0` | | [prettier-plugin-organize-imports](https://github.com/simonhaenisch/prettier-plugin-organize-imports) | `2.3.4` | `3.2.4` | | [stringify-object](https://github.com/yeoman/stringify-object) | `4.0.1` | `5.0.0` | | [typescript](https://github.com/Microsoft/TypeScript) | `4.9.5` | `5.3.2` | Updates `@types/node` from 18.18.14 to 20.10.3 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) Updates `@typescript-eslint/eslint-plugin` from 5.62.0 to 6.13.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.1/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 5.62.0 to 6.13.1 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v6.13.1/packages/parser) Updates `cross-fetch` from 3.1.8 to 4.0.0 - [Release notes](https://github.com/lquixada/cross-fetch/releases) - [Changelog](https://github.com/lquixada/cross-fetch/blob/v4.x/CHANGELOG.md) - [Commits](https://github.com/lquixada/cross-fetch/compare/v3.1.8...v4.0.0) Updates `dotenv-cli` from 5.1.0 to 7.3.0 - [Release notes](https://github.com/entropitor/dotenv-cli/releases) - [Commits](https://github.com/entropitor/dotenv-cli/compare/v5.1.0...v7.3.0) Updates `eslint-config-prettier` from 8.10.0 to 9.1.0 - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.10.0...v9.1.0) Updates `fs-extra` from 10.1.0 to 11.2.0 - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](https://github.com/jprichardson/node-fs-extra/compare/10.1.0...11.2.0) Updates `@types/fs-extra` from 9.0.13 to 11.0.4 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/fs-extra) Updates `npm-run-all2` from 5.0.2 to 6.1.1 - [Release notes](https://github.com/bcomnes/npm-run-all2/releases) - [Changelog](https://github.com/bcomnes/npm-run-all2/blob/master/CHANGELOG.md) - [Commits](https://github.com/bcomnes/npm-run-all2/compare/v5.0.2...v6.1.1) Updates `prettier` from 2.8.8 to 3.1.0 - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.8...3.1.0) Updates `prettier-plugin-organize-imports` from 2.3.4 to 3.2.4 - [Release notes](https://github.com/simonhaenisch/prettier-plugin-organize-imports/releases) - [Commits](https://github.com/simonhaenisch/prettier-plugin-organize-imports/compare/v2.3.4...v3.2.4) Updates `stringify-object` from 4.0.1 to 5.0.0 - [Release notes](https://github.com/yeoman/stringify-object/releases) - [Commits](https://github.com/yeoman/stringify-object/compare/v4.0.1...v5.0.0) Updates `typescript` from 4.9.5 to 5.3.2 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.9.5...v5.3.2) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: cross-fetch dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: dotenv-cli dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: fs-extra dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: "@types/fs-extra" dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: npm-run-all2 dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: prettier-plugin-organize-imports dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: stringify-object dependency-type: direct:development update-type: version-update:semver-major dependency-group: major - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-major dependency-group: major ... Signed-off-by: dependabot[bot] --- package.json | 26 +-- pnpm-lock.yaml | 420 ++++++++++++++++++++++++------------------------- 2 files changed, 220 insertions(+), 226 deletions(-) diff --git a/package.json b/package.json index 66148654..2236744b 100644 --- a/package.json +++ b/package.json @@ -26,29 +26,29 @@ "@atao60/fse-cli": "^0.1.9", "@d2api/manifest-node": "^2.0.9", "@hayes0724/web-font-converter": "^1.0.5", - "@types/fs-extra": "^9.0.13", - "@types/node": "^18.18.14", + "@types/fs-extra": "^11.0.4", + "@types/node": "^20.10.3", "@types/opentype.js": "^1.3.8", "@types/stringify-object": "^4.0.5", - "@typescript-eslint/eslint-plugin": "^5.62.0", - "@typescript-eslint/parser": "^5.62.0", + "@typescript-eslint/eslint-plugin": "^6.13.1", + "@typescript-eslint/parser": "^6.13.1", "bungie-api-ts": "^5.0.0", - "cross-fetch": "^3.1.8", - "dotenv-cli": "^5.1.0", + "cross-fetch": "^4.0.0", + "dotenv-cli": "^7.3.0", "eslint": "^8.55.0", - "eslint-config-prettier": "^8.10.0", + "eslint-config-prettier": "^9.1.0", "eslint-plugin-import": "^2.29.0", - "fs-extra": "^10.1.0", + "fs-extra": "^11.2.0", "husky": "^8.0.3", "lint-staged": "^15.2.0", - "npm-run-all2": "^5.0.2", + "npm-run-all2": "^6.1.1", "opentype.js": "^1.3.4", - "prettier": "^2.8.8", - "prettier-plugin-organize-imports": "^2.3.4", + "prettier": "^3.1.0", + "prettier-plugin-organize-imports": "^3.2.4", "pretty-quick": "^3.1.3", "resolve-tspaths": "^0.8.15", - "stringify-object": "^4.0.1", - "typescript": "^4.9.5" + "stringify-object": "^5.0.0", + "typescript": "^5.3.2" }, "packageManager": "pnpm@8.8.0+sha256.d713a5750e41c3660d1e090608c7f607ad00d1dd5ba9b6552b5f390bf37924e9" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ebf14180..a884cbf9 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -15,11 +15,11 @@ devDependencies: specifier: ^1.0.5 version: 1.0.5 '@types/fs-extra': - specifier: ^9.0.13 - version: 9.0.13 + specifier: ^11.0.4 + version: 11.0.4 '@types/node': - specifier: ^18.18.14 - version: 18.18.14 + specifier: ^20.10.3 + version: 20.10.3 '@types/opentype.js': specifier: ^1.3.8 version: 1.3.8 @@ -27,32 +27,32 @@ devDependencies: specifier: ^4.0.5 version: 4.0.5 '@typescript-eslint/eslint-plugin': - specifier: ^5.62.0 - version: 5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.55.0)(typescript@4.9.5) + specifier: ^6.13.1 + version: 6.13.1(@typescript-eslint/parser@6.13.1)(eslint@8.55.0)(typescript@5.3.2) '@typescript-eslint/parser': - specifier: ^5.62.0 - version: 5.62.0(eslint@8.55.0)(typescript@4.9.5) + specifier: ^6.13.1 + version: 6.13.1(eslint@8.55.0)(typescript@5.3.2) bungie-api-ts: specifier: ^5.0.0 version: 5.0.0 cross-fetch: - specifier: ^3.1.8 - version: 3.1.8 + specifier: ^4.0.0 + version: 4.0.0 dotenv-cli: - specifier: ^5.1.0 - version: 5.1.0 + specifier: ^7.3.0 + version: 7.3.0 eslint: specifier: ^8.55.0 version: 8.55.0 eslint-config-prettier: - specifier: ^8.10.0 - version: 8.10.0(eslint@8.55.0) + specifier: ^9.1.0 + version: 9.1.0(eslint@8.55.0) eslint-plugin-import: specifier: ^2.29.0 - version: 2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.55.0) + version: 2.29.0(@typescript-eslint/parser@6.13.1)(eslint@8.55.0) fs-extra: - specifier: ^10.1.0 - version: 10.1.0 + specifier: ^11.2.0 + version: 11.2.0 husky: specifier: ^8.0.3 version: 8.0.3 @@ -60,29 +60,29 @@ devDependencies: specifier: ^15.2.0 version: 15.2.0 npm-run-all2: - specifier: ^5.0.2 - version: 5.0.2 + specifier: ^6.1.1 + version: 6.1.1 opentype.js: specifier: ^1.3.4 version: 1.3.4 prettier: - specifier: ^2.8.8 - version: 2.8.8 + specifier: ^3.1.0 + version: 3.1.0 prettier-plugin-organize-imports: - specifier: ^2.3.4 - version: 2.3.4(prettier@2.8.8)(typescript@4.9.5) + specifier: ^3.2.4 + version: 3.2.4(prettier@3.1.0)(typescript@5.3.2) pretty-quick: specifier: ^3.1.3 - version: 3.1.3(prettier@2.8.8) + version: 3.1.3(prettier@3.1.0) resolve-tspaths: specifier: ^0.8.15 - version: 0.8.17(typescript@4.9.5) + version: 0.8.17(typescript@5.3.2) stringify-object: - specifier: ^4.0.1 - version: 4.0.1 + specifier: ^5.0.0 + version: 5.0.0 typescript: - specifier: ^4.9.5 - version: 4.9.5 + specifier: ^5.3.2 + version: 5.3.2 packages: @@ -252,10 +252,11 @@ packages: tslib: 2.6.2 dev: true - /@types/fs-extra@9.0.13: - resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} + /@types/fs-extra@11.0.4: + resolution: {integrity: sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==} dependencies: - '@types/node': 18.18.14 + '@types/jsonfile': 6.1.4 + '@types/node': 20.10.3 dev: true /@types/json-schema@7.0.15: @@ -266,12 +267,18 @@ packages: resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} dev: true + /@types/jsonfile@6.1.4: + resolution: {integrity: sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==} + dependencies: + '@types/node': 20.10.3 + dev: true + /@types/minimatch@3.0.5: resolution: {integrity: sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==} dev: true - /@types/node@18.18.14: - resolution: {integrity: sha512-iSOeNeXYNYNLLOMDSVPvIFojclvMZ/HDY2dU17kUlcsOsSQETbWIslJbYLZgA+ox8g2XQwSHKTkght1a5X26lQ==} + /@types/node@20.10.3: + resolution: {integrity: sha512-XJavIpZqiXID5Yxnxv3RUDKTN5b81ddNC3ecsA0SoFXz/QU8OGBwZGMomiq0zw+uuqbL/krztv/DINAQ/EV4gg==} dependencies: undici-types: 5.26.5 dev: true @@ -292,133 +299,134 @@ packages: resolution: {integrity: sha512-TzX5V+njkbJ8iJ0mrj+Vqveep/1JBH4SSA3J2wYrE1eUrOhdsjTBCb0kao4EquSQ8KgPpqY4zSVP2vCPWKBElg==} dev: true - /@typescript-eslint/eslint-plugin@5.62.0(@typescript-eslint/parser@5.62.0)(eslint@8.55.0)(typescript@4.9.5): - resolution: {integrity: sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/eslint-plugin@6.13.1(@typescript-eslint/parser@6.13.1)(eslint@8.55.0)(typescript@5.3.2): + resolution: {integrity: sha512-5bQDGkXaxD46bPvQt08BUz9YSaO4S0fB1LB5JHQuXTfkGPI3+UUeS387C/e9jRie5GqT8u5kFTrMvAjtX4O5kA==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - '@typescript-eslint/parser': ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + '@typescript-eslint/parser': ^6.0.0 || ^6.0.0-alpha + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: '@eslint-community/regexpp': 4.10.0 - '@typescript-eslint/parser': 5.62.0(eslint@8.55.0)(typescript@4.9.5) - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/type-utils': 5.62.0(eslint@8.55.0)(typescript@4.9.5) - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@4.9.5) + '@typescript-eslint/parser': 6.13.1(eslint@8.55.0)(typescript@5.3.2) + '@typescript-eslint/scope-manager': 6.13.1 + '@typescript-eslint/type-utils': 6.13.1(eslint@8.55.0)(typescript@5.3.2) + '@typescript-eslint/utils': 6.13.1(eslint@8.55.0)(typescript@5.3.2) + '@typescript-eslint/visitor-keys': 6.13.1 debug: 4.3.4 eslint: 8.55.0 graphemer: 1.4.0 ignore: 5.3.0 - natural-compare-lite: 1.4.0 + natural-compare: 1.4.0 semver: 7.5.4 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + ts-api-utils: 1.0.3(typescript@5.3.2) + typescript: 5.3.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/parser@5.62.0(eslint@8.55.0)(typescript@4.9.5): - resolution: {integrity: sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/parser@6.13.1(eslint@8.55.0)(typescript@5.3.2): + resolution: {integrity: sha512-fs2XOhWCzRhqMmQf0eicLa/CWSaYss2feXsy7xBD/pLyWke/jCIVc2s1ikEAtSW7ina1HNhv7kONoEfVNEcdDQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) + '@typescript-eslint/scope-manager': 6.13.1 + '@typescript-eslint/types': 6.13.1 + '@typescript-eslint/typescript-estree': 6.13.1(typescript@5.3.2) + '@typescript-eslint/visitor-keys': 6.13.1 debug: 4.3.4 eslint: 8.55.0 - typescript: 4.9.5 + typescript: 5.3.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/scope-manager@5.62.0: - resolution: {integrity: sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/scope-manager@6.13.1: + resolution: {integrity: sha512-BW0kJ7ceiKi56GbT2KKzZzN+nDxzQK2DS6x0PiSMPjciPgd/JRQGMibyaN2cPt2cAvuoH0oNvn2fwonHI+4QUQ==} + engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 + '@typescript-eslint/types': 6.13.1 + '@typescript-eslint/visitor-keys': 6.13.1 dev: true - /@typescript-eslint/type-utils@5.62.0(eslint@8.55.0)(typescript@4.9.5): - resolution: {integrity: sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/type-utils@6.13.1(eslint@8.55.0)(typescript@5.3.2): + resolution: {integrity: sha512-A2qPlgpxx2v//3meMqQyB1qqTg1h1dJvzca7TugM3Yc2USDY+fsRBiojAEo92HO7f5hW5mjAUF6qobOPzlBCBQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: '*' + eslint: ^7.0.0 || ^8.0.0 typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) - '@typescript-eslint/utils': 5.62.0(eslint@8.55.0)(typescript@4.9.5) + '@typescript-eslint/typescript-estree': 6.13.1(typescript@5.3.2) + '@typescript-eslint/utils': 6.13.1(eslint@8.55.0)(typescript@5.3.2) debug: 4.3.4 eslint: 8.55.0 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + ts-api-utils: 1.0.3(typescript@5.3.2) + typescript: 5.3.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/types@5.62.0: - resolution: {integrity: sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/types@6.13.1: + resolution: {integrity: sha512-gjeEskSmiEKKFIbnhDXUyiqVma1gRCQNbVZ1C8q7Zjcxh3WZMbzWVfGE9rHfWd1msQtPS0BVD9Jz9jded44eKg==} + engines: {node: ^16.0.0 || >=18.0.0} dev: true - /@typescript-eslint/typescript-estree@5.62.0(typescript@4.9.5): - resolution: {integrity: sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/typescript-estree@6.13.1(typescript@5.3.2): + resolution: {integrity: sha512-sBLQsvOC0Q7LGcUHO5qpG1HxRgePbT6wwqOiGLpR8uOJvPJbfs0mW3jPA3ujsDvfiVwVlWUDESNXv44KtINkUQ==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: typescript: '*' peerDependenciesMeta: typescript: optional: true dependencies: - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/visitor-keys': 5.62.0 + '@typescript-eslint/types': 6.13.1 + '@typescript-eslint/visitor-keys': 6.13.1 debug: 4.3.4 globby: 11.1.0 is-glob: 4.0.3 semver: 7.5.4 - tsutils: 3.21.0(typescript@4.9.5) - typescript: 4.9.5 + ts-api-utils: 1.0.3(typescript@5.3.2) + typescript: 5.3.2 transitivePeerDependencies: - supports-color dev: true - /@typescript-eslint/utils@5.62.0(eslint@8.55.0)(typescript@4.9.5): - resolution: {integrity: sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/utils@6.13.1(eslint@8.55.0)(typescript@5.3.2): + resolution: {integrity: sha512-ouPn/zVoan92JgAegesTXDB/oUp6BP1v8WpfYcqh649ejNc9Qv+B4FF2Ff626kO1xg0wWwwG48lAJ4JuesgdOw==} + engines: {node: ^16.0.0 || >=18.0.0} peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^7.0.0 || ^8.0.0 dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@8.55.0) '@types/json-schema': 7.0.15 '@types/semver': 7.5.6 - '@typescript-eslint/scope-manager': 5.62.0 - '@typescript-eslint/types': 5.62.0 - '@typescript-eslint/typescript-estree': 5.62.0(typescript@4.9.5) + '@typescript-eslint/scope-manager': 6.13.1 + '@typescript-eslint/types': 6.13.1 + '@typescript-eslint/typescript-estree': 6.13.1(typescript@5.3.2) eslint: 8.55.0 - eslint-scope: 5.1.1 semver: 7.5.4 transitivePeerDependencies: - supports-color - typescript dev: true - /@typescript-eslint/visitor-keys@5.62.0: - resolution: {integrity: sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==} - engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} + /@typescript-eslint/visitor-keys@6.13.1: + resolution: {integrity: sha512-NDhQUy2tg6XGNBGDRm1XybOHSia8mcXmlbKWoQP+nm1BIIMxa55shyJfZkHpEBN62KNPLrocSM2PdPcaLgDKMQ==} + engines: {node: ^16.0.0 || >=18.0.0} dependencies: - '@typescript-eslint/types': 5.62.0 + '@typescript-eslint/types': 6.13.1 eslint-visitor-keys: 3.4.3 dev: true @@ -508,11 +516,6 @@ packages: color-convert: 2.0.1 dev: true - /ansi-styles@5.2.0: - resolution: {integrity: sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==} - engines: {node: '>=10'} - dev: true - /ansi-styles@6.2.1: resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==} engines: {node: '>=12'} @@ -683,6 +686,12 @@ packages: concat-map: 0.0.1 dev: true + /brace-expansion@2.0.1: + resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==} + dependencies: + balanced-match: 1.0.2 + dev: true + /braces@3.0.2: resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==} engines: {node: '>=8'} @@ -879,8 +888,8 @@ packages: resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} dev: true - /cross-fetch@3.1.8: - resolution: {integrity: sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==} + /cross-fetch@4.0.0: + resolution: {integrity: sha512-e4a5N8lVvuLgAWgnCrLr2PP0YyDOTHa9H/Rj54dirp61qXnNq46m82bRhNqIA5VccJtWBvPTFRV3TtvHUKPB1g==} dependencies: node-fetch: 2.7.0 transitivePeerDependencies: @@ -1016,18 +1025,18 @@ packages: esutils: 2.0.3 dev: true - /dotenv-cli@5.1.0: - resolution: {integrity: sha512-NoEZAlKo9WVrG0b3i9mBxdD6INdDuGqdgR74t68t8084QcI077/1MnPerRW1odl+9uULhcdnQp2U0pYVppKHOA==} + /dotenv-cli@7.3.0: + resolution: {integrity: sha512-314CA4TyK34YEJ6ntBf80eUY+t1XaFLyem1k9P0sX1gn30qThZ5qZr/ZwE318gEnzyYP9yj9HJk6SqwE0upkfw==} hasBin: true dependencies: cross-spawn: 7.0.3 dotenv: 16.3.1 - dotenv-expand: 8.0.3 + dotenv-expand: 10.0.0 minimist: 1.2.8 dev: true - /dotenv-expand@8.0.3: - resolution: {integrity: sha512-SErOMvge0ZUyWd5B0NXMQlDkN+8r+HhVUsxgOO7IoPDOdDRD2JjExpN6y3KnFR66jsJMwSn1pqIivhU5rcJiNg==} + /dotenv-expand@10.0.0: + resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==} engines: {node: '>=12'} dev: true @@ -1156,8 +1165,8 @@ packages: engines: {node: '>=10'} dev: true - /eslint-config-prettier@8.10.0(eslint@8.55.0): - resolution: {integrity: sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==} + /eslint-config-prettier@9.1.0(eslint@8.55.0): + resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==} hasBin: true peerDependencies: eslint: '>=7.0.0' @@ -1175,7 +1184,7 @@ packages: - supports-color dev: true - /eslint-module-utils@2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.55.0): + /eslint-module-utils@2.8.0(@typescript-eslint/parser@6.13.1)(eslint-import-resolver-node@0.3.9)(eslint@8.55.0): resolution: {integrity: sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==} engines: {node: '>=4'} peerDependencies: @@ -1196,7 +1205,7 @@ packages: eslint-import-resolver-webpack: optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.55.0)(typescript@4.9.5) + '@typescript-eslint/parser': 6.13.1(eslint@8.55.0)(typescript@5.3.2) debug: 3.2.7 eslint: 8.55.0 eslint-import-resolver-node: 0.3.9 @@ -1204,7 +1213,7 @@ packages: - supports-color dev: true - /eslint-plugin-import@2.29.0(@typescript-eslint/parser@5.62.0)(eslint@8.55.0): + /eslint-plugin-import@2.29.0(@typescript-eslint/parser@6.13.1)(eslint@8.55.0): resolution: {integrity: sha512-QPOO5NO6Odv5lpoTkddtutccQjysJuFxoPS7fAHO+9m9udNHvTCPSAMW9zGAYj8lAIdr40I8yPCdUYrncXtrwg==} engines: {node: '>=4'} peerDependencies: @@ -1214,7 +1223,7 @@ packages: '@typescript-eslint/parser': optional: true dependencies: - '@typescript-eslint/parser': 5.62.0(eslint@8.55.0)(typescript@4.9.5) + '@typescript-eslint/parser': 6.13.1(eslint@8.55.0)(typescript@5.3.2) array-includes: 3.1.7 array.prototype.findlastindex: 1.2.3 array.prototype.flat: 1.3.2 @@ -1223,7 +1232,7 @@ packages: doctrine: 2.1.0 eslint: 8.55.0 eslint-import-resolver-node: 0.3.9 - eslint-module-utils: 2.8.0(@typescript-eslint/parser@5.62.0)(eslint-import-resolver-node@0.3.9)(eslint@8.55.0) + eslint-module-utils: 2.8.0(@typescript-eslint/parser@6.13.1)(eslint-import-resolver-node@0.3.9)(eslint@8.55.0) hasown: 2.0.0 is-core-module: 2.13.1 is-glob: 4.0.3 @@ -1239,14 +1248,6 @@ packages: - supports-color dev: true - /eslint-scope@5.1.1: - resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==} - engines: {node: '>=8.0.0'} - dependencies: - esrecurse: 4.3.0 - estraverse: 4.3.0 - dev: true - /eslint-scope@7.2.2: resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1330,11 +1331,6 @@ packages: estraverse: 5.3.0 dev: true - /estraverse@4.3.0: - resolution: {integrity: sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==} - engines: {node: '>=4.0'} - dev: true - /estraverse@5.3.0: resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==} engines: {node: '>=4.0'} @@ -1524,15 +1520,6 @@ packages: mime-types: 2.1.35 dev: true - /fs-extra@10.1.0: - resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==} - engines: {node: '>=12'} - dependencies: - graceful-fs: 4.2.11 - jsonfile: 6.1.0 - universalify: 2.0.1 - dev: true - /fs-extra@11.2.0: resolution: {integrity: sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==} engines: {node: '>=14.14'} @@ -1597,8 +1584,9 @@ packages: hasown: 2.0.0 dev: true - /get-own-enumerable-property-symbols@3.0.2: - resolution: {integrity: sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==} + /get-own-enumerable-keys@1.0.0: + resolution: {integrity: sha512-PKsK2FSrQCyxcGHsGrLDcK0lx+0Ke+6e8KFFozA9/fIQLhQzPaRvJFdcz7+Axg3jUH/Mq+NI4xa5u/UT2tQskA==} + engines: {node: '>=14.16'} dev: true /get-stream@5.2.0: @@ -1754,8 +1742,11 @@ packages: function-bind: 1.1.2 dev: true - /hosted-git-info@2.8.9: - resolution: {integrity: sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==} + /hosted-git-info@7.0.1: + resolution: {integrity: sha512-+K84LB1DYwMHoHSgaOY/Jfhw3ucPmSET5v98Ke/HdNSw4a0UktWzyW1mjhjpuxxTqOOsfWT/7iVshHmVZ4IpOA==} + engines: {node: ^16.14.0 || >=18.0.0} + dependencies: + lru-cache: 10.1.0 dev: true /http-signature@1.2.0: @@ -2096,8 +2087,9 @@ packages: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} dev: true - /json-parse-even-better-errors@2.3.1: - resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==} + /json-parse-even-better-errors@3.0.1: + resolution: {integrity: sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==} + engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} dev: true /json-schema-traverse@0.4.1: @@ -2160,8 +2152,9 @@ packages: engines: {node: '>=14'} dev: true - /lines-and-columns@1.2.4: - resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==} + /lines-and-columns@2.0.4: + resolution: {integrity: sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==} + engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true /lint-staged@15.2.0: @@ -2236,6 +2229,11 @@ packages: wrap-ansi: 9.0.0 dev: true + /lru-cache@10.1.0: + resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==} + engines: {node: 14 || >=16.14} + dev: true + /lru-cache@6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} @@ -2297,6 +2295,13 @@ packages: brace-expansion: 1.1.11 dev: true + /minimatch@9.0.3: + resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==} + engines: {node: '>=16 || 14 >=14.17'} + dependencies: + brace-expansion: 2.0.1 + dev: true + /minimist@1.2.8: resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==} dev: true @@ -2353,10 +2358,6 @@ packages: resolution: {integrity: sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==} dev: true - /natural-compare-lite@1.4.0: - resolution: {integrity: sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==} - dev: true - /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true @@ -2398,26 +2399,27 @@ packages: abbrev: 1.1.1 dev: true - /normalize-package-data@2.5.0: - resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} + /normalize-package-data@6.0.0: + resolution: {integrity: sha512-UL7ELRVxYBHBgYEtZCXjxuD5vPxnmvMGq0jp/dGPKKrN7tfsBh2IY7TlJ15WWwdjRWD3RJbnsygUurTK3xkPkg==} + engines: {node: ^16.14.0 || >=18.0.0} dependencies: - hosted-git-info: 2.8.9 - resolve: 1.22.8 - semver: 5.7.2 + hosted-git-info: 7.0.1 + is-core-module: 2.13.1 + semver: 7.5.4 validate-npm-package-license: 3.0.4 dev: true - /npm-run-all2@5.0.2: - resolution: {integrity: sha512-S2G6FWZ3pNWAAKm2PFSOtEAG/N+XO/kz3+9l6V91IY+Y3XFSt7Lp7DV92KCgEboEW0hRTu0vFaMe4zXDZYaOyA==} - engines: {node: '>= 10'} + /npm-run-all2@6.1.1: + resolution: {integrity: sha512-lWLbkPZ5BSdXtN8lR+0rc8caKoPdymycpZksyDEC9MOBvfdwTXZ0uVhb7bMcGeXv2/BKtfQuo6Zn3zfc8rxNXA==} + engines: {node: ^14.18.0 || >=16.0.0, npm: '>= 8'} hasBin: true dependencies: - ansi-styles: 5.2.0 + ansi-styles: 6.2.1 cross-spawn: 7.0.3 memorystream: 0.3.1 - minimatch: 3.1.2 - pidtree: 0.5.0 - read-pkg: 5.2.0 + minimatch: 9.0.3 + pidtree: 0.6.0 + read-pkg: 8.1.0 shell-quote: 1.8.1 dev: true @@ -2640,14 +2642,15 @@ packages: callsites: 3.1.0 dev: true - /parse-json@5.2.0: - resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} - engines: {node: '>=8'} + /parse-json@7.1.1: + resolution: {integrity: sha512-SgOTCX/EZXtZxBE5eJ97P4yGM5n37BwRU+YMsH4vNzFqJV/oWFXXCmwFlgWUM4PrakybVOueJJ6pwHqSVhTFDw==} + engines: {node: '>=16'} dependencies: '@babel/code-frame': 7.23.5 error-ex: 1.3.2 - json-parse-even-better-errors: 2.3.1 - lines-and-columns: 1.2.4 + json-parse-even-better-errors: 3.0.1 + lines-and-columns: 2.0.4 + type-fest: 3.13.1 dev: true /path-exists@4.0.0: @@ -2695,12 +2698,6 @@ packages: engines: {node: '>=8.6'} dev: true - /pidtree@0.5.0: - resolution: {integrity: sha512-9nxspIM7OpZuhBxPg73Zvyq7j1QMPMPsGKTqRc2XOaFQauDvoNz9fM1Wdkjmeo7l9GXOZiRs97sPkuayl39wjA==} - engines: {node: '>=0.10'} - hasBin: true - dev: true - /pidtree@0.6.0: resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==} engines: {node: '>=0.10'} @@ -2712,23 +2709,30 @@ packages: engines: {node: '>= 0.8.0'} dev: true - /prettier-plugin-organize-imports@2.3.4(prettier@2.8.8)(typescript@4.9.5): - resolution: {integrity: sha512-R8o23sf5iVL/U71h9SFUdhdOEPsi3nm42FD/oDYIZ2PQa4TNWWuWecxln6jlIQzpZTDMUeO1NicJP6lLn2TtRw==} + /prettier-plugin-organize-imports@3.2.4(prettier@3.1.0)(typescript@5.3.2): + resolution: {integrity: sha512-6m8WBhIp0dfwu0SkgfOxJqh+HpdyfqSSLfKKRZSFbDuEQXDDndb8fTpRWkUrX/uBenkex3MgnVk0J3b3Y5byog==} peerDependencies: + '@volar/vue-language-plugin-pug': ^1.0.4 + '@volar/vue-typescript': ^1.0.4 prettier: '>=2.0' typescript: '>=2.9' + peerDependenciesMeta: + '@volar/vue-language-plugin-pug': + optional: true + '@volar/vue-typescript': + optional: true dependencies: - prettier: 2.8.8 - typescript: 4.9.5 + prettier: 3.1.0 + typescript: 5.3.2 dev: true - /prettier@2.8.8: - resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==} - engines: {node: '>=10.13.0'} + /prettier@3.1.0: + resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} + engines: {node: '>=14'} hasBin: true dev: true - /pretty-quick@3.1.3(prettier@2.8.8): + /pretty-quick@3.1.3(prettier@3.1.0): resolution: {integrity: sha512-kOCi2FJabvuh1as9enxYmrnBC6tVMoVOenMaBqRfsvBHB0cbpYHjdQEpSglpASDFEXVwplpcGR4CLEaisYAFcA==} engines: {node: '>=10.13'} hasBin: true @@ -2741,7 +2745,7 @@ packages: ignore: 5.3.0 mri: 1.2.0 multimatch: 4.0.0 - prettier: 2.8.8 + prettier: 3.1.0 dev: true /process-nextick-args@2.0.1: @@ -2778,14 +2782,14 @@ packages: resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==} dev: true - /read-pkg@5.2.0: - resolution: {integrity: sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==} - engines: {node: '>=8'} + /read-pkg@8.1.0: + resolution: {integrity: sha512-PORM8AgzXeskHO/WEv312k9U03B8K9JSiWF/8N9sUuFjBa+9SF2u6K7VClzXwDXab51jCd8Nd36CNM+zR97ScQ==} + engines: {node: '>=16'} dependencies: '@types/normalize-package-data': 2.4.4 - normalize-package-data: 2.5.0 - parse-json: 5.2.0 - type-fest: 0.6.0 + normalize-package-data: 6.0.0 + parse-json: 7.1.1 + type-fest: 4.8.3 dev: true /readable-stream@2.3.8: @@ -2858,7 +2862,7 @@ packages: engines: {node: '>=4'} dev: true - /resolve-tspaths@0.8.17(typescript@4.9.5): + /resolve-tspaths@0.8.17(typescript@5.3.2): resolution: {integrity: sha512-oM+e7uUEd23NL39EpBrxQfyzRy8UP11e3jqtj7WUxi6B/SWlIvfgXqUjgzLBz2+QjZ7aWkX47ZsJnCgH7wVpFQ==} hasBin: true peerDependencies: @@ -2867,7 +2871,7 @@ packages: ansi-colors: 4.1.3 commander: 11.1.0 fast-glob: 3.3.1 - typescript: 4.9.5 + typescript: 5.3.2 dev: true /resolve@1.22.8: @@ -2974,11 +2978,6 @@ packages: hasBin: true dev: true - /semver@5.7.2: - resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} - hasBin: true - dev: true - /semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true @@ -3203,11 +3202,11 @@ packages: safe-buffer: 5.2.1 dev: true - /stringify-object@4.0.1: - resolution: {integrity: sha512-qpV1FBpN0R1gDAhCHIU71SYGZb35Te+gOQbQ6lYRmVJT7pF1NB8mkHeEJvyYNiHXw+fB4KIbeIjQl1rgiIijiA==} - engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + /stringify-object@5.0.0: + resolution: {integrity: sha512-zaJYxz2FtcMb4f+g60KsRNFOpVMUyuJgA51Zi5Z1DOTC3S59+OQiVOzE9GZt0x72uBGWKsQIuBKeF9iusmKFsg==} + engines: {node: '>=14.16'} dependencies: - get-own-enumerable-property-symbols: 3.0.2 + get-own-enumerable-keys: 1.0.0 is-obj: 3.0.0 is-regexp: 3.1.0 dev: true @@ -3355,6 +3354,15 @@ packages: resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==} dev: true + /ts-api-utils@1.0.3(typescript@5.3.2): + resolution: {integrity: sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==} + engines: {node: '>=16.13.0'} + peerDependencies: + typescript: '>=4.2.0' + dependencies: + typescript: 5.3.2 + dev: true + /tsconfig-paths@3.14.2: resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==} dependencies: @@ -3364,24 +3372,10 @@ packages: strip-bom: 3.0.0 dev: true - /tslib@1.14.1: - resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==} - dev: true - /tslib@2.6.2: resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==} dev: true - /tsutils@3.21.0(typescript@4.9.5): - resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} - engines: {node: '>= 6'} - peerDependencies: - typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' - dependencies: - tslib: 1.14.1 - typescript: 4.9.5 - dev: true - /ttf2woff2@3.0.0: resolution: {integrity: sha512-5/Web6B0lF/STNAQ0d5vAlRRquuWsNj8wOmKQ9ql9Bsgbx8MsLnNzaBG9vBcSE4s4Ry1QOr/MyUrDUIVgVPEfw==} engines: {node: '>= 4.0.0'} @@ -3430,11 +3424,6 @@ packages: engines: {node: '>=10'} dev: true - /type-fest@0.6.0: - resolution: {integrity: sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==} - engines: {node: '>=8'} - dev: true - /type-fest@1.4.0: resolution: {integrity: sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==} engines: {node: '>=10'} @@ -3445,6 +3434,11 @@ packages: engines: {node: '>=14.16'} dev: true + /type-fest@4.8.3: + resolution: {integrity: sha512-//BaTm14Q/gHBn09xlnKNqfI8t6bmdzx2DXYfPBNofN0WUybCEUDcbCWcTa0oF09lzLjZgPphXAsvRiMK0V6Bw==} + engines: {node: '>=16'} + dev: true + /typed-array-buffer@1.0.0: resolution: {integrity: sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==} engines: {node: '>= 0.4'} @@ -3483,9 +3477,9 @@ packages: is-typed-array: 1.1.12 dev: true - /typescript@4.9.5: - resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==} - engines: {node: '>=4.2.0'} + /typescript@5.3.2: + resolution: {integrity: sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==} + engines: {node: '>=14.17'} hasBin: true dev: true From befe8a0873c4fa74a5f4bf3c4820b33ef0d49f20 Mon Sep 17 00:00:00 2001 From: Rob Jones Date: Mon, 4 Dec 2023 06:50:00 -0700 Subject: [PATCH 2/2] pretty --- output/reduced-cost-mod-mappings.ts | 2 +- src/generate-adept-weapon-hashes.ts | 2 +- src/generate-bounty-data.ts | 6 +- src/generate-catalyst-data.ts | 118 +++++++++--------- src/generate-crafting-enhanced-intrinsics.ts | 18 +-- src/generate-crafting-mementos.ts | 2 +- src/generate-empty-plugs.ts | 2 +- src/generate-enums.ts | 23 ++-- src/generate-event-info.ts | 2 +- src/generate-extended-breaker.ts | 4 +- src/generate-extended-foundry.ts | 18 +-- src/generate-extended-ich.ts | 8 +- src/generate-focusing-item-outputs.ts | 4 +- src/generate-font-glyph-enums.ts | 2 +- src/generate-masterworks-with-cond-stats.ts | 2 +- src/generate-missing-collectible-info.ts | 6 +- src/generate-mod-cost-reductions.ts | 4 +- src/generate-mods-with-bad-descriptions.ts | 2 +- src/generate-perk-names-for-voiceDIM.ts | 4 +- src/generate-season-info.ts | 12 +- src/generate-season-to-source.ts | 8 +- src/generate-source-info.ts | 4 +- src/generate-spider-mats.ts | 10 +- src/generate-trait-enhanced-trait-lookup.ts | 6 +- src/generate-universal-ornament-aux-sets.ts | 4 +- ...nerate-universal-ornament-plugsethashes.ts | 2 +- ...generate-unreferenced-collections-items.ts | 2 +- src/generate-watermark-info.ts | 28 ++--- src/generate-weapons-from-quest.ts | 8 +- src/generate-workaround-items.ts | 2 +- src/helpers.ts | 18 ++- 31 files changed, 171 insertions(+), 162 deletions(-) diff --git a/output/reduced-cost-mod-mappings.ts b/output/reduced-cost-mod-mappings.ts index 6bfe805b..e3725472 100644 --- a/output/reduced-cost-mod-mappings.ts +++ b/output/reduced-cost-mod-mappings.ts @@ -112,5 +112,5 @@ export const normalToReducedMod: { [normalModHash: number]: number } = { }; export const reducedToNormalMod: { [reducedModHash: number]: number } = Object.fromEntries( - Object.entries(normalToReducedMod).map(([normal, reduced]) => [reduced, parseInt(normal, 10)]) + Object.entries(normalToReducedMod).map(([normal, reduced]) => [reduced, parseInt(normal, 10)]), ); diff --git a/src/generate-adept-weapon-hashes.ts b/src/generate-adept-weapon-hashes.ts index 61f23a68..1eb5516d 100644 --- a/src/generate-adept-weapon-hashes.ts +++ b/src/generate-adept-weapon-hashes.ts @@ -18,7 +18,7 @@ const adeptWeaponHashes = inventoryItems .filter( (i) => i.itemType === DestinyItemType.Weapon && - adeptStrings.some((adepts) => i.displayProperties.name.trim().endsWith(adepts)) + adeptStrings.some((adepts) => i.displayProperties.name.trim().endsWith(adepts)), ) .map((i) => i.hash); diff --git a/src/generate-bounty-data.ts b/src/generate-bounty-data.ts index 2e5dfef6..051b96bb 100644 --- a/src/generate-bounty-data.ts +++ b/src/generate-bounty-data.ts @@ -4,7 +4,7 @@ import { KillType, matchTable } from '../data/bounties/bounty-config.js'; import { ItemCategoryHashes } from '../data/generated-enums.js'; import { writeFile } from './helpers.js'; -type Ruleset = typeof matchTable[number]; +type Ruleset = (typeof matchTable)[number]; type BountyMetadata = Ruleset['assign']; type AssignmentCategory = keyof BountyMetadata; @@ -118,7 +118,7 @@ inventoryItems.forEach((inventoryItem) => { label: inventoryItem.inventory?.stackUniqueLabel, places: thisBounty.Destination?.map((p) => getDef('Destination', p)?.displayProperties.name), activities: thisBounty.ActivityMode?.map( - (a) => getDef('ActivityMode', a)?.displayProperties.name + (a) => getDef('ActivityMode', a)?.displayProperties.name, ), dmg: thisBounty.DamageType?.map((a) => getDef('DamageType', a)?.displayProperties.name), item: thisBounty.ItemCategory?.map((a) => getDef('ItemCategory', a)?.displayProperties.name), @@ -195,7 +195,7 @@ for (const recordHash of recordHashes) { }), places: thisBounty.Destination?.map((p) => getDef('Destination', p)?.displayProperties.name), activities: thisBounty.ActivityMode?.map( - (a) => getDef('ActivityMode', a)?.displayProperties.name + (a) => getDef('ActivityMode', a)?.displayProperties.name, ), dmg: thisBounty.DamageType?.map((a) => getDef('DamageType', a)?.displayProperties.name), item: thisBounty.ItemCategory?.map((a) => getDef('ItemCategory', a)?.displayProperties.name), diff --git a/src/generate-catalyst-data.ts b/src/generate-catalyst-data.ts index c6dd58c9..dcd55194 100644 --- a/src/generate-catalyst-data.ts +++ b/src/generate-catalyst-data.ts @@ -18,7 +18,7 @@ const IGNORED_CATALYSTS = [ const IGNORED_CATALYSTS_NAMES: string[] = []; // Filled in below with names via hashes from above IGNORED_CATALYSTS.forEach((hash) => - IGNORED_CATALYSTS_NAMES.push(getDef('InventoryItem', hash)?.displayProperties.name ?? '') + IGNORED_CATALYSTS_NAMES.push(getDef('InventoryItem', hash)?.displayProperties.name ?? ''), ); const allsockets = getAllDefs('SocketType'); @@ -26,7 +26,7 @@ const inventoryItems = getAllDefs('InventoryItem').filter( (i) => !i.itemCategoryHashes?.includes(ItemCategoryHashes.Dummies) && !i.crafting && - !IGNORED_CATALYSTS.includes(i.hash) + !IGNORED_CATALYSTS.includes(i.hash), ); const craftableExotics = getAllDefs('InventoryItem') @@ -38,64 +38,66 @@ const craftableExotics = getAllDefs('InventoryItem') // (more interesting than the all-identical icons on catalyst triumphs) const triumphData: any = { icon: String, source: String }; -getDef('PresentationNode', catalystPresentationNodeHash)?.children.presentationNodes.forEach((p) => - getDef('PresentationNode', p.presentationNodeHash)?.children.records.forEach((r) => { - const recordName = getDef('Record', r.recordHash)?.displayProperties.name; - catalystRecordNames.push(recordName ?? ''); - }) +getDef('PresentationNode', catalystPresentationNodeHash)?.children.presentationNodes.forEach( + (p) => + getDef('PresentationNode', p.presentationNodeHash)?.children.records.forEach((r) => { + const recordName = getDef('Record', r.recordHash)?.displayProperties.name; + catalystRecordNames.push(recordName ?? ''); + }), ); // loop the catalyst section of triumphs -getDef('PresentationNode', catalystPresentationNodeHash)?.children.presentationNodes.forEach((p) => - getDef('PresentationNode', p.presentationNodeHash)?.children.records.forEach((r) => { - const record = getDef('Record', r.recordHash); - const recordName = record?.displayProperties.name; - if (!record || !recordName) { - return; - } - - // look for an inventoryItem with the same name, and plugStyle 1 (should find the catalyst for that gun) - let itemWithSameName = inventoryItems.find( - (i) => i.displayProperties.name === recordName && i.plug?.plugStyle === 1 - ); - - // Work around for weirdly named catalysts - if (recordName === 'Two-Tailed Fox Catalyst') { - itemWithSameName = inventoryItems.find( - (i) => i.displayProperties.name === 'Third Tail' && i.plug?.plugStyle === 1 - ); - } - - const matchingExotic = - (itemWithSameName && - (findWeaponViaCatalystPlug(itemWithSameName.hash) ?? - findWeaponViaCatalystPCH(itemWithSameName.plug!.plugCategoryHash))) ?? - craftableExotics.find((i) => - record.displayProperties.description.includes(i!.displayProperties.name) +getDef('PresentationNode', catalystPresentationNodeHash)?.children.presentationNodes.forEach( + (p) => + getDef('PresentationNode', p.presentationNodeHash)?.children.records.forEach((r) => { + const record = getDef('Record', r.recordHash); + const recordName = record?.displayProperties.name; + if (!record || !recordName) { + return; + } + + // look for an inventoryItem with the same name, and plugStyle 1 (should find the catalyst for that gun) + let itemWithSameName = inventoryItems.find( + (i) => i.displayProperties.name === recordName && i.plug?.plugStyle === 1, ); - if (matchingExotic) { - exoticWeaponHashToCatalystRecord[matchingExotic.hash] = r.recordHash; - exoticWeaponHashesWithCatalyst.push(matchingExotic.hash); - } + // Work around for weirdly named catalysts + if (recordName === 'Two-Tailed Fox Catalyst') { + itemWithSameName = inventoryItems.find( + (i) => i.displayProperties.name === 'Third Tail' && i.plug?.plugStyle === 1, + ); + } + + const matchingExotic = + (itemWithSameName && + (findWeaponViaCatalystPlug(itemWithSameName.hash) ?? + findWeaponViaCatalystPCH(itemWithSameName.plug!.plugCategoryHash))) ?? + craftableExotics.find((i) => + record.displayProperties.description.includes(i!.displayProperties.name), + ); + + if (matchingExotic) { + exoticWeaponHashToCatalystRecord[matchingExotic.hash] = r.recordHash; + exoticWeaponHashesWithCatalyst.push(matchingExotic.hash); + } - // and get its icon image - const icon = itemWithSameName?.displayProperties?.icon; + // and get its icon image + const icon = itemWithSameName?.displayProperties?.icon; - // this "if" check is because of classified data situations - if (icon) { - triumphData[r.recordHash] = icon; - } else { - if (!IGNORED_CATALYSTS_NAMES.some((term) => recordName?.includes(term))) { - console.log(`no catalyst image found for ${r.recordHash} ${recordName}`); + // this "if" check is because of classified data situations + if (icon) { + triumphData[r.recordHash] = icon; + } else { + if (!IGNORED_CATALYSTS_NAMES.some((term) => recordName?.includes(term))) { + console.log(`no catalyst image found for ${r.recordHash} ${recordName}`); + } } - } - }) + }), ); // Generate List of Sorted Exotic Weapons Hashes with Catalysts const pretty = `const exoticWeaponHashesWithCatalyst = new Set([\n${uniqAndSortArray( - exoticWeaponHashesWithCatalyst + exoticWeaponHashesWithCatalyst, ) .map((h) => `${h},\n`) .join('')}]);\n\nexport default exoticWeaponHashesWithCatalyst;`; @@ -109,25 +111,27 @@ function getCatalystPresentationNodeHash(): number | undefined { const presentationNodes = getAllDefs('PresentationNode'); const catNodeHash = presentationNodes.find( (p) => - p.displayProperties.name === 'Exotic Catalysts' && p.children.presentationNodes.length > 1 + p.displayProperties.name === 'Exotic Catalysts' && p.children.presentationNodes.length > 1, )?.hash; return catNodeHash; } function findWeaponViaCatalystPlug(catalystPlugHash: number) { - return inventoryItems.find((item) => - item.sockets?.socketEntries.find( - (socket) => socket.reusablePlugItems[0]?.plugItemHash === catalystPlugHash - ) + return inventoryItems.find( + (item) => + item.sockets?.socketEntries.find( + (socket) => socket.reusablePlugItems[0]?.plugItemHash === catalystPlugHash, + ), ); } function findWeaponViaCatalystPCH(catalystPCH: number | undefined) { - const socketTypeHash = allsockets.find((sockets) => - sockets.plugWhitelist?.find((plug) => plug.categoryHash === catalystPCH) + const socketTypeHash = allsockets.find( + (sockets) => sockets.plugWhitelist?.find((plug) => plug.categoryHash === catalystPCH), )?.hash; - return inventoryItems.find((item) => - item.sockets?.socketEntries.find((socket) => socket.socketTypeHash === socketTypeHash) + return inventoryItems.find( + (item) => + item.sockets?.socketEntries.find((socket) => socket.socketTypeHash === socketTypeHash), ); } diff --git a/src/generate-crafting-enhanced-intrinsics.ts b/src/generate-crafting-enhanced-intrinsics.ts index 76d9cd96..ef1c1741 100644 --- a/src/generate-crafting-enhanced-intrinsics.ts +++ b/src/generate-crafting-enhanced-intrinsics.ts @@ -11,18 +11,20 @@ const allEnhancedIntrinsics = new Set(); const inventoryItems = getAllDefs('InventoryItem'); for (const pattern of inventoryItems.filter((i) => i.crafting)) { - const frameSocket = pattern.sockets?.socketEntries.find((s) => - getDef('SocketType', s.socketTypeHash)?.plugWhitelist.some( - (w) => w.categoryHash === PlugCategoryHashes.Intrinsics - ) + const frameSocket = pattern.sockets?.socketEntries.find( + (s) => + getDef('SocketType', s.socketTypeHash)?.plugWhitelist.some( + (w) => w.categoryHash === PlugCategoryHashes.Intrinsics, + ), ); if (frameSocket?.reusablePlugSetHash) { const plugSet = getDef('PlugSet', frameSocket.reusablePlugSetHash); const enhancedIntrinsics = plugSet?.reusablePlugItems - .filter((p) => - getDef('InventoryItem', p.plugItemHash)?.investmentStats.some( - (s) => s.isConditionallyActive - ) + .filter( + (p) => + getDef('InventoryItem', p.plugItemHash)?.investmentStats.some( + (s) => s.isConditionallyActive, + ), ) .map((p) => p.plugItemHash); if (enhancedIntrinsics?.length) { diff --git a/src/generate-crafting-mementos.ts b/src/generate-crafting-mementos.ts index 34179fac..45a24b8e 100644 --- a/src/generate-crafting-mementos.ts +++ b/src/generate-crafting-mementos.ts @@ -11,7 +11,7 @@ const mementoRegex = /^([\w\s]+) Memento$/; const inventoryItems = getAllDefs('InventoryItem'); for (const memento of inventoryItems.filter( - (i) => i.plug?.plugCategoryHash === PlugCategoryHashes.Mementos + (i) => i.plug?.plugCategoryHash === PlugCategoryHashes.Mementos, )) { const match = memento.displayProperties.name.match(mementoRegex); const sourceName = match ? match[1].toLowerCase() : 'other'; diff --git a/src/generate-empty-plugs.ts b/src/generate-empty-plugs.ts index 17a8f726..81b90cb9 100644 --- a/src/generate-empty-plugs.ts +++ b/src/generate-empty-plugs.ts @@ -17,7 +17,7 @@ const emptyPlugs = inventoryItems emptyPlugs.sort( (a, b) => a.displayProperties.name.localeCompare(b.displayProperties.name) || - a.plug!.plugCategoryIdentifier.localeCompare(b.plug!.plugCategoryIdentifier) + a.plug!.plugCategoryIdentifier.localeCompare(b.plug!.plugCategoryIdentifier), ); const commentedEntries = emptyPlugs.map((i) => { diff --git a/src/generate-enums.ts b/src/generate-enums.ts index ee08d4af..48254d8d 100644 --- a/src/generate-enums.ts +++ b/src/generate-enums.ts @@ -43,7 +43,7 @@ const enumSources = [ { name: 'ProgressionHashes', data: someProgressions }, { name: 'TraitHashes', data: allTraits }, ]; -type Data = typeof enumSources[number]['data'][number]; +type Data = (typeof enumSources)[number]['data'][number]; enumSources.forEach(({ name, data }) => { // our output data goes here @@ -144,7 +144,7 @@ const outString = Object.entries(generatedEnums) `export const enum ${enumName} {${Object.entries(enumValues) .map(([label, value]) => `${label} = ${value},`) .sort() - .join('\n')}}` + .join('\n')}}`, ) .join('\n\n'); writeFile('./data/generated-enums.ts', outString); @@ -167,7 +167,7 @@ function tryToGetAdditionalStringContent(thing: Data) { const labels: string[] = []; // for item categories, try using its granted types as labels - const thingAsItemCategory = thing as typeof allItemCategories[number]; + const thingAsItemCategory = thing as (typeof allItemCategories)[number]; if (thingAsItemCategory.grantDestinyItemType !== undefined) { if (thingAsItemCategory.grantDestinyItemType) { labels.push(DestinyItemTypeLookup[thingAsItemCategory.grantDestinyItemType]); @@ -178,7 +178,7 @@ function tryToGetAdditionalStringContent(thing: Data) { } // for socket categories, try using its granted types as labels - const thingAsSocketCategory = thing as typeof allSocketCategories[number]; + const thingAsSocketCategory = thing as (typeof allSocketCategories)[number]; if (thingAsSocketCategory.categoryStyle !== undefined) { if (thingAsSocketCategory.categoryStyle) { labels.push(DestinySocketCategoryStyleLookup[thingAsSocketCategory.categoryStyle]); @@ -186,8 +186,11 @@ function tryToGetAdditionalStringContent(thing: Data) { // or try to go find an example item with this socket type, to show more info about where this socket ends up // currently this basically helps distinguish Ship sockets and Sparrow sockets - const exampleItems = inventoryItems.filter((i) => - i.sockets?.socketCategories.find((s) => s.socketCategoryHash === thingAsSocketCategory.hash) + const exampleItems = inventoryItems.filter( + (i) => + i.sockets?.socketCategories.find( + (s) => s.socketCategoryHash === thingAsSocketCategory.hash, + ), ); if (!exampleItems.length) { // no item actually has a socket with this socket category @@ -202,7 +205,7 @@ function tryToGetAdditionalStringContent(thing: Data) { } const descriptionDiscriminator = socketCategoryDescriptionDiscriminator.find((str) => - thing.displayProperties.description.includes(str) + thing.displayProperties.description.includes(str), ); // only use this label if all found items have the same item type if (descriptionDiscriminator) { @@ -211,15 +214,15 @@ function tryToGetAdditionalStringContent(thing: Data) { } } // for buckets, try using its category as labels - const thingAsBucket = thing as typeof allBuckets[number]; + const thingAsBucket = thing as (typeof allBuckets)[number]; if (thingAsBucket.category !== undefined) { labels.push(BucketCategoryLookup[thingAsBucket.category]); } - const thingAsTrait = thing as typeof allTraits[number]; + const thingAsTrait = thing as (typeof allTraits)[number]; if (thingAsTrait.displayHint !== undefined) { const discriminator = traitDiscriminators.find((str) => - thing.displayProperties.description.includes(str) + thing.displayProperties.description.includes(str), ); if (discriminator) { labels.push(convertMixedStringToLeadingCapCamelCase(discriminator)); diff --git a/src/generate-event-info.ts b/src/generate-event-info.ts index 9e77cf01..74b71c28 100644 --- a/src/generate-event-info.ts +++ b/src/generate-event-info.ts @@ -149,7 +149,7 @@ vendors if ( // it already has an event source sourcedItems.includes( - getDef('Collectible', item.collectibleHash)?.sourceHash ?? -99999999 + getDef('Collectible', item.collectibleHash)?.sourceHash ?? -99999999, ) || // it's a category we don't include (item.itemCategoryHashes && diff --git a/src/generate-extended-breaker.ts b/src/generate-extended-breaker.ts index 9c10f7e2..4fb9f30f 100644 --- a/src/generate-extended-breaker.ts +++ b/src/generate-extended-breaker.ts @@ -16,7 +16,7 @@ inventoryItems.filter( const intrinsicTraitDescription = getDef( 'InventoryItem', - socket.singleInitialItemHash + socket.singleInitialItemHash, )?.displayProperties.description.toLowerCase() ?? ''; if (/shield-piercing|disrupt|overload|stagger/.test(intrinsicTraitDescription)) { switch (true) { @@ -32,7 +32,7 @@ inventoryItems.filter( extendedBreakers[item.hash] = extendedBreaker; } } - }) + }), ); writeFile('./output/extended-breaker.json', extendedBreakers); diff --git a/src/generate-extended-foundry.ts b/src/generate-extended-foundry.ts index 54debef6..9f495aa8 100644 --- a/src/generate-extended-foundry.ts +++ b/src/generate-extended-foundry.ts @@ -41,11 +41,11 @@ const foundryInfo: Record< const foundries = Object.keys(foundryInfo); const foundryOriginTraitHashes = Object.values(foundryInfo).map( - (foundry) => foundry.originTraitHash + (foundry) => foundry.originTraitHash, ); const foundryItems = inventoryItems.filter( - (item) => item.traitIds?.some((trait) => trait.startsWith('foundry')) && item.secondaryIcon + (item) => item.traitIds?.some((trait) => trait.startsWith('foundry')) && item.secondaryIcon, ); foundries.forEach(function (foundry) { @@ -68,7 +68,7 @@ function fixMismatchIconFoundry(foundry: string) { .filter( (item) => item.traitHashes?.includes(foundryInfo[foundry].traitHash) && - item.secondaryIcon !== foundryInfo[foundry].icon + item.secondaryIcon !== foundryInfo[foundry].icon, ) .map((i) => i.hash); @@ -85,7 +85,7 @@ function fixMismatchIconFoundry(foundry: string) { item.sockets?.socketEntries.find((socket) => { if ( [SocketCategoryHashes.IntrinsicTraits, originTraitSocketCategoryHash].includes( - socket.socketTypeHash + socket.socketTypeHash, ) && !excludedOriginTraitInitialHashes.includes(socket.singleInitialItemHash) ) { @@ -98,7 +98,7 @@ function fixMismatchIconFoundry(foundry: string) { if (foundryOriginTraitHashes.includes(foundryOriginTrait[0])) { const foundry = Object.keys(foundryInfo).find( - (foundry) => foundryInfo[foundry].originTraitHash === foundryOriginTrait[0] + (foundry) => foundryInfo[foundry].originTraitHash === foundryOriginTrait[0], ) ?? ''; if ( @@ -109,14 +109,14 @@ function fixMismatchIconFoundry(foundry: string) { } } } - }) + }), ); } function getFoundryIcon(foundry: string) { const foundryIcon = foundryItems .filter( - (item) => item.traitHashes?.includes(foundryInfo[foundry].traitHash) && item.secondaryIcon + (item) => item.traitHashes?.includes(foundryInfo[foundry].traitHash) && item.secondaryIcon, ) .map((i) => i.secondaryIcon); @@ -136,7 +136,7 @@ function getFoundryIcon(foundry: string) { function getMissingFoundryIcons(foundry: string) { const hashes = inventoryItems .filter( - (item) => item.traitHashes?.includes(foundryInfo[foundry].traitHash) && !item.secondaryIcon + (item) => item.traitHashes?.includes(foundryInfo[foundry].traitHash) && !item.secondaryIcon, ) .map((i) => i.hash); hashes.forEach(function (hash) { @@ -155,7 +155,7 @@ function getFoundryInfoViaRegex(foundry: string) { i.itemCategoryHashes?.includes(ItemCategoryHashes.Weapon) && !i.itemCategoryHashes.includes(ItemCategoryHashes.Dummies) && i.displayProperties.name.replace(' (Adept)', '').match(foundryInfo[foundry].regex) && - !i.traitHashes?.includes(foundryInfo[foundry].traitHash) + !i.traitHashes?.includes(foundryInfo[foundry].traitHash), ) .map((i) => i.hash); hashes.forEach(function (hash) { diff --git a/src/generate-extended-ich.ts b/src/generate-extended-ich.ts index acc7a951..1304b4d6 100644 --- a/src/generate-extended-ich.ts +++ b/src/generate-extended-ich.ts @@ -8,18 +8,18 @@ const ffGrenadeLaunchers = inventoryItems.filter( (item) => item.itemCategoryHashes?.includes(ItemCategoryHashes.GrenadeLaunchers) && !item.itemCategoryHashes.includes(ItemCategoryHashes.PowerWeapon) && - !item.itemCategoryHashes.includes(ItemCategoryHashes.Dummies) + !item.itemCategoryHashes.includes(ItemCategoryHashes.Dummies), ); const slugShotguns = inventoryItems.filter( (item) => item.itemCategoryHashes?.includes(ItemCategoryHashes.Shotgun) && !item.itemCategoryHashes.includes(ItemCategoryHashes.Dummies) && - item.sockets?.socketEntries[0].singleInitialItemHash === 918679156 // Slug Precision Frame + item.sockets?.socketEntries[0].singleInitialItemHash === 918679156, // Slug Precision Frame ); -const festivalMasks = inventoryItems.filter((item) => - item.itemTypeDisplayName?.includes('Festival Mask') +const festivalMasks = inventoryItems.filter( + (item) => item.itemTypeDisplayName?.includes('Festival Mask'), ); const extendedICH: Record = {}; diff --git a/src/generate-focusing-item-outputs.ts b/src/generate-focusing-item-outputs.ts index 28121658..f270c2a6 100644 --- a/src/generate-focusing-item-outputs.ts +++ b/src/generate-focusing-item-outputs.ts @@ -51,7 +51,7 @@ for (const vendor of getAllDefs('Vendor')) { const candidates = possibleOutputItemsByName[def.displayProperties.name].filter( (c) => c.itemTypeDisplayName === def.itemTypeDisplayName && - (def.classType === DestinyClass.Unknown || c.classType === def.classType) + (def.classType === DestinyClass.Unknown || c.classType === def.classType), ); if (candidates?.length) { let best = @@ -72,7 +72,7 @@ for (const vendor of getAllDefs('Vendor')) { if (watermarkItemsMatched > 0 || fallbackitemsMatched > 0 || itemsNotMatched > 0) { console.log( - `focusing item outputs: vendor ${vendor.displayProperties.name} (${vendor.hash}) - ${watermarkItemsMatched} exact matches, ${fallbackitemsMatched} fallbacks, ${itemsNotMatched} failures - example item ${exampleDef?.displayProperties?.name}` + `focusing item outputs: vendor ${vendor.displayProperties.name} (${vendor.hash}) - ${watermarkItemsMatched} exact matches, ${fallbackitemsMatched} fallbacks, ${itemsNotMatched} failures - example item ${exampleDef?.displayProperties?.name}`, ); } } diff --git a/src/generate-font-glyph-enums.ts b/src/generate-font-glyph-enums.ts index 6f580b4f..eb517529 100644 --- a/src/generate-font-glyph-enums.ts +++ b/src/generate-font-glyph-enums.ts @@ -22,5 +22,5 @@ writeFile('./data/d2-font-glyphs.ts', outputEnum); fonts.ttf.convert.woff2( './Destiny-2-Font-Symbols/fonts/Destiny_Keys.otf', - './output/DestinySymbols.woff2' + './output/DestinySymbols.woff2', ); diff --git a/src/generate-masterworks-with-cond-stats.ts b/src/generate-masterworks-with-cond-stats.ts index 7d363dce..90701cb0 100644 --- a/src/generate-masterworks-with-cond-stats.ts +++ b/src/generate-masterworks-with-cond-stats.ts @@ -11,7 +11,7 @@ const masterworkPlugsWithCondStats = inventoryItems .filter( (i) => i.displayProperties.name.startsWith('Masterworked: ') && - i.investmentStats.some((s) => s.isConditionallyActive) + i.investmentStats.some((s) => s.isConditionallyActive), ) .map((i) => i.hash); diff --git a/src/generate-missing-collectible-info.ts b/src/generate-missing-collectible-info.ts index 97ac1c14..da0ef0e2 100644 --- a/src/generate-missing-collectible-info.ts +++ b/src/generate-missing-collectible-info.ts @@ -38,8 +38,8 @@ collectibleItems.forEach((collectibleItem) => { (nonCollectibleItem) => stringifySortCompare( collectibleItem.itemCategoryHashes ?? [], - nonCollectibleItem.itemCategoryHashes ?? [] - ) + nonCollectibleItem.itemCategoryHashes ?? [], + ), ) ?? []; itemsWithSameName.forEach((nonCollectibleItem) => { @@ -109,7 +109,7 @@ const pretty = `const missingSources: { [key: string]: number[] } = ${stringifyO D2SourcesSorted, { indent: ' ', - } + }, )};\n\nexport default missingSources;`; // annotate the file with sources or item names next to matching hashes diff --git a/src/generate-mod-cost-reductions.ts b/src/generate-mod-cost-reductions.ts index 81117909..cee521a1 100644 --- a/src/generate-mod-cost-reductions.ts +++ b/src/generate-mod-cost-reductions.ts @@ -33,7 +33,7 @@ for (const slot of Object.values(modsMap)) { if (mods.length > 2 && displayName !== 'Deprecated Armor Mod') { console.warn( 'mod-cost-reductions', - `this is getting out of hand, ${mods.length} copies of ${displayName}?` + `this is getting out of hand, ${mods.length} copies of ${displayName}?`, ); } else if (mods.length === 2) { // In these mods, one is the "canonical" copy and one is the other copy. @@ -48,7 +48,7 @@ for (const slot of Object.values(modsMap)) { const outString = `export const normalToReducedMod: { [normalModHash: number]: number } = ${JSON.stringify( normalToReducedMod, null, - 2 + 2, )};\n\n export const reducedToNormalMod: { [reducedModHash: number]: number } = Object.fromEntries(Object.entries(normalToReducedMod).map(([normal, reduced]) => [reduced, parseInt(normal, 10)])); `; diff --git a/src/generate-mods-with-bad-descriptions.ts b/src/generate-mods-with-bad-descriptions.ts index 560fa2eb..fdcc7681 100644 --- a/src/generate-mods-with-bad-descriptions.ts +++ b/src/generate-mods-with-bad-descriptions.ts @@ -27,7 +27,7 @@ noteableModStrings.forEach((identifier) => { item.plug?.plugCategoryHash == PlugCategoryHashes.EnhancementsV2Chest || item.plug?.plugCategoryHash == PlugCategoryHashes.EnhancementsV2Legs || item.plug?.plugCategoryHash == PlugCategoryHashes.EnhancementsV2ClassItem) && - item.displayProperties.name.trim().includes(identifier) + item.displayProperties.name.trim().includes(identifier), ) .map((item) => item.hash); specialMods[identifier] = mods; diff --git a/src/generate-perk-names-for-voiceDIM.ts b/src/generate-perk-names-for-voiceDIM.ts index 33b275e5..6c19faff 100644 --- a/src/generate-perk-names-for-voiceDIM.ts +++ b/src/generate-perk-names-for-voiceDIM.ts @@ -22,7 +22,9 @@ const plugs = [ const allWeaponsPerkNames = inventoryItems .filter( (i) => - i.itemType === 19 && plugs.includes(i.plug?.plugCategoryHash ?? 0) && i.displayProperties.name + i.itemType === 19 && + plugs.includes(i.plug?.plugCategoryHash ?? 0) && + i.displayProperties.name, ) .map((i) => i.displayProperties.name); diff --git a/src/generate-season-info.ts b/src/generate-season-info.ts index 6499b1cc..22763c5b 100644 --- a/src/generate-season-info.ts +++ b/src/generate-season-info.ts @@ -10,7 +10,7 @@ const powerCaps = new Set( getAllDefs('PowerCap') .map((p) => p.powerCap) .filter((p) => p > 1000 && p < 50000) - .sort((a, b) => a - b) + .sort((a, b) => a - b), ); const seasonOverrides: Record< @@ -141,7 +141,7 @@ const lightCapToSeason = Object.values(D2SeasonInfo) .reduce( (acc: Record, seasonInfo) => Object.assign(acc, { [seasonInfo.pinnacleCap]: seasonInfo.season }), - {} + {}, ); // what's left in powerCaps is max light levels that don't apply to any season yet // we left off at D2CalculatedSeason so we'll start adding dummy seasons at D2CalculatedSeason+1 @@ -178,8 +178,8 @@ function getNumWeeks(season: number) { const numWeeks = Math.round( Math.abs( new Date(seasonDefs[season].endDate ?? '').getTime() - - new Date(seasonDefs[season].startDate ?? '').getTime() - ) / 604800000 + new Date(seasonDefs[season].startDate ?? '').getTime(), + ) / 604800000, ); // ms in a week return numWeeks ? numWeeks : -1; } @@ -188,7 +188,7 @@ function updateSeasonsMD(seasonNumber: number) { const paddedSeasonNumber = ` ${D2SeasonInfo[seasonNumber].season.toString().padEnd(4)}`; const paddedDLCName = D2SeasonInfo[seasonNumber].DLCName.padEnd(15); const paddedReleaseDate = formatDateDDMMMYYYY( - `${D2SeasonInfo[seasonNumber].releaseDate}T${D2SeasonInfo[seasonNumber].resetTime}` + `${D2SeasonInfo[seasonNumber].releaseDate}T${D2SeasonInfo[seasonNumber].resetTime}`, ).padEnd(10); const paddedEndDate = ( seasonDefs[seasonNumber - 1].endDate @@ -222,7 +222,7 @@ function formatDateDDMMMYYYY(dateString: string, dayBefore = false) { function generateBestGuessEndDate(seasonNumber: number) { const numWeeks = 12; const bestGuess = new Date( - `${D2SeasonInfo[seasonNumber].releaseDate}T${D2SeasonInfo[seasonNumber - 1].resetTime}` + `${D2SeasonInfo[seasonNumber].releaseDate}T${D2SeasonInfo[seasonNumber - 1].resetTime}`, ); bestGuess.setDate(bestGuess.getDate() + numWeeks * 7); const validDate = bestGuess instanceof Date && !isNaN(bestGuess.getDate()); diff --git a/src/generate-season-to-source.ts b/src/generate-season-to-source.ts index a1ca206f..5442b5dd 100644 --- a/src/generate-season-to-source.ts +++ b/src/generate-season-to-source.ts @@ -37,7 +37,7 @@ seasonNumbers.forEach((seasonA) => { seasonNumbers.forEach((seasonB) => { if (seasonA < seasonB) { notSeasonallyUnique = notSeasonallyUnique.concat( - seasonToSource[seasonA].filter((hash) => seasonToSource[seasonB].includes(hash)) + seasonToSource[seasonA].filter((hash) => seasonToSource[seasonB].includes(hash)), ); } }); @@ -50,7 +50,7 @@ seasonNumbers.forEach((season) => { return a - b; }); seasonToSource[season] = seasonToSource[season].filter( - (hash) => !notSeasonallyUnique.includes(hash) + (hash) => !notSeasonallyUnique.includes(hash), ); }); @@ -130,7 +130,7 @@ const seasons: Record = {}; inventoryItems = inventoryItems.filter( (o) => o.quality?.displayVersionWatermarkIcons === undefined || - o.quality?.displayVersionWatermarkIcons.includes('') + o.quality?.displayVersionWatermarkIcons.includes(''), ); inventoryItems.forEach((item) => { @@ -141,7 +141,7 @@ inventoryItems.forEach((item) => { plugCategoryDenyList.some((pc) => typeof pc === 'string' ? item.plug!.plugCategoryIdentifier.includes(pc) - : item.plug!.plugCategoryHash === pc + : item.plug!.plugCategoryHash === pc, ); const traitDenied = traitDenyList.some((trait) => item.traitIds?.includes(trait)); const itemTypeDenied = itemTypeDenyList.some((itemType) => item.itemTypeDisplayName === itemType); diff --git a/src/generate-source-info.ts b/src/generate-source-info.ts index b237bcfe..d5206e81 100644 --- a/src/generate-source-info.ts +++ b/src/generate-source-info.ts @@ -101,7 +101,7 @@ for (const [sourceTag, matchRule] of Object.entries(categories.sources)) { i.itemCategoryHashes?.includes(ItemCategoryHashes.Emblems) || i.itemCategoryHashes?.includes(ItemCategoryHashes.Ships) || i.itemCategoryHashes?.includes(ItemCategoryHashes.Mods_Ornament) || - i.itemCategoryHashes?.includes(ItemCategoryHashes.Sparrows))) + i.itemCategoryHashes?.includes(ItemCategoryHashes.Sparrows))), ) .map((i) => i.hash); itemHashes.push(...includedItemHashes); @@ -114,7 +114,7 @@ for (const [sourceTag, matchRule] of Object.entries(categories.sources)) { const foundPresentationNodes = allPresentationNodes.filter( (p) => matchRule.presentationNodes?.includes(p.hash) || - matchRule.presentationNodes?.includes(p.displayProperties?.name) + matchRule.presentationNodes?.includes(p.displayProperties?.name), ); for (const foundPresentationNode of foundPresentationNodes) { for (const collectible of foundPresentationNode.children.collectibles) { diff --git a/src/generate-spider-mats.ts b/src/generate-spider-mats.ts index 5c49fcf8..ba9d7e82 100644 --- a/src/generate-spider-mats.ts +++ b/src/generate-spider-mats.ts @@ -65,9 +65,9 @@ const validRahoolCurrencies = [ ...new Set( rahool?.itemList.flatMap((i) => i.currencies.map( - (c) => [c.itemHash, getDef('InventoryItem', c.itemHash)?.displayProperties.name] as const - ) - ) ?? [] + (c) => [c.itemHash, getDef('InventoryItem', c.itemHash)?.displayProperties.name] as const, + ), + ) ?? [], ), ]; const purchaseableCurrencyItems = rahool?.itemList.filter((i) => { @@ -76,7 +76,7 @@ const purchaseableCurrencyItems = rahool?.itemList.filter((i) => { def?.startsWith('Purchase ') && validRahoolCurrencies.find( ([, matName]) => - matName?.includes(def.replace('Purchase ', '')) || (matName && def.includes(matName)) + matName?.includes(def.replace('Purchase ', '')) || (matName && def.includes(matName)), ) ) { return true; @@ -87,7 +87,7 @@ purchaseableCurrencyItems?.forEach((i) => { const def = getDef('InventoryItem', i.itemHash)!.displayProperties.name; purchaseableMatTable[i.itemHash] = validRahoolCurrencies.find( ([, matName]) => - matName?.includes(def.replace('Purchase ', '')) || (matName && def.includes(matName)) + matName?.includes(def.replace('Purchase ', '')) || (matName && def.includes(matName)), )![0]; }); diff --git a/src/generate-trait-enhanced-trait-lookup.ts b/src/generate-trait-enhanced-trait-lookup.ts index 0c1431b0..6be64c32 100644 --- a/src/generate-trait-enhanced-trait-lookup.ts +++ b/src/generate-trait-enhanced-trait-lookup.ts @@ -21,7 +21,7 @@ const matchTraits = (plugs: DestinyInventoryItemDefinition[]) => { const enhancedTrait = enhancedTraits.find( (et) => et.displayProperties.name == bt.displayProperties.name || - et.displayProperties.name.startsWith(bt.displayProperties.name) + et.displayProperties.name.startsWith(bt.displayProperties.name), ); if (enhancedTrait) { @@ -29,7 +29,7 @@ const matchTraits = (plugs: DestinyInventoryItemDefinition[]) => { if (existingBase) { if (existingBase !== bt.hash) { console.log( - `ignoring base ${bt.displayProperties.name} (${bt.hash}) -> enhanced ${enhancedTrait.displayProperties.name} (${enhancedTrait.hash}) because other mapping (${existingBase}) was previously found` + `ignoring base ${bt.displayProperties.name} (${bt.hash}) -> enhanced ${enhancedTrait.displayProperties.name} (${enhancedTrait.hash}) because other mapping (${existingBase}) was previously found`, ); } } else { @@ -63,7 +63,7 @@ for (const recipe of craftingRecipes) { // enhanced versions for most random traits, even if they don't appear // on patterns yet const allTraits = inventoryItems.filter( - (i) => i.plug?.plugCategoryHash === PlugCategoryHashes.Frames + (i) => i.plug?.plugCategoryHash === PlugCategoryHashes.Frames, ); matchTraits(allTraits); diff --git a/src/generate-universal-ornament-aux-sets.ts b/src/generate-universal-ornament-aux-sets.ts index 1f3ae803..9f595393 100644 --- a/src/generate-universal-ornament-aux-sets.ts +++ b/src/generate-universal-ornament-aux-sets.ts @@ -24,8 +24,8 @@ const output: { [classType: number]: { [setKey: string]: number[] } } = { const allItems = universalOrnamentPlugSetHashes.flatMap((hash) => getDef('PlugSet', hash)!.reusablePlugItems.map((item) => - getDef('InventoryItem', item.plugItemHash) - ) + getDef('InventoryItem', item.plugItemHash), + ), ); for (const classType of [DestinyClass.Titan, DestinyClass.Hunter, DestinyClass.Warlock]) { diff --git a/src/generate-universal-ornament-plugsethashes.ts b/src/generate-universal-ornament-plugsethashes.ts index eeba95b6..8c272884 100644 --- a/src/generate-universal-ornament-plugsethashes.ts +++ b/src/generate-universal-ornament-plugsethashes.ts @@ -16,7 +16,7 @@ for (const plugSet of plugSets.filter((s) => s.reusablePlugItems?.length > 100)) if (ornamentPlugSetHashes.length != expectedNumber) { console.log( - `We have ${ornamentPlugSetHashes.length} universalOrnament plugSetHashes when we only expected ${expectedNumber}` + `We have ${ornamentPlugSetHashes.length} universalOrnament plugSetHashes when we only expected ${expectedNumber}`, ); } diff --git a/src/generate-unreferenced-collections-items.ts b/src/generate-unreferenced-collections-items.ts index e574395a..a49677ca 100644 --- a/src/generate-unreferenced-collections-items.ts +++ b/src/generate-unreferenced-collections-items.ts @@ -16,7 +16,7 @@ const allCollectibles = getAllDefs('Collectible'); for (const item of craftableInventoryItemHashes) { if (allCollectibles.find((c) => c.itemHash === item.hash)) continue; const targetCollectible = allCollectibles.find( - (c) => c.displayProperties.name === item.displayProperties.name + (c) => c.displayProperties.name === item.displayProperties.name, ); if (targetCollectible) output[targetCollectible.hash] = item.hash; } diff --git a/src/generate-watermark-info.ts b/src/generate-watermark-info.ts index 374da6a2..55fac772 100644 --- a/src/generate-watermark-info.ts +++ b/src/generate-watermark-info.ts @@ -39,13 +39,13 @@ writeFile('./output/watermark-to-event.json', sortObjectByValue(watermarkToEvent //============================================================================= function findWatermarksViaICH(watermark: string, ICH: number) { const item = inventoryItems.filter((item) => - ICH === ItemCategoryHashes.Shaders ? isShader(item) : item.itemCategoryHashes?.includes(ICH) + ICH === ItemCategoryHashes.Shaders ? isShader(item) : item.itemCategoryHashes?.includes(ICH), ); const itemWithUnassignedWatermark = item.find( (i) => i.collectibleHash && (i.iconWatermark?.includes(watermark) || - i.quality?.displayVersionWatermarkIcons[0].includes(watermark)) + i.quality?.displayVersionWatermarkIcons[0].includes(watermark)), ); const hash = itemWithUnassignedWatermark?.hash; const season = seasons[hash as unknown as keyof typeof seasons]; @@ -57,7 +57,7 @@ function findWatermarksViaICH(watermark: string, ICH: number) { ]; seasonalWatermarks?.forEach((watermark) => - watermark ? (watermarkToSeason[watermark] = season) : undefined + watermark ? (watermarkToSeason[watermark] = season) : undefined, ); // Remove watermarks that have been assigned from unassigned watermarks unassignedWatermarks = diffArrays(unassignedWatermarks, Object.keys(watermarkToSeason)); @@ -77,7 +77,7 @@ function findWatermarksForEvent(watermark: string) { ]; eventWatermarks?.forEach((watermark) => - event && watermark ? (watermarkToEvent[watermark] = event) : undefined + event && watermark ? (watermarkToEvent[watermark] = event) : undefined, ); // Remove watermarks that have been assigned from unassigned watermarks unassignedWatermarks = diffArrays(unassignedWatermarks, Object.keys(watermarkToEvent)); @@ -113,7 +113,7 @@ function sortObjectByValue(obj: Record) { ..._sortedObj, [k]: v, }), - {} + {}, ); } @@ -122,7 +122,7 @@ function sortObjectByValue(obj: Record) { //============================================================================= function getAllWatermarks() { const itemsNoMods = inventoryItems.filter( - (item) => !item.itemCategoryHashes?.includes(ItemCategoryHashes.Mods_Mod) + (item) => !item.itemCategoryHashes?.includes(ItemCategoryHashes.Mods_Mod), ); return uniqAndSortArray([ @@ -135,8 +135,8 @@ function getAllWatermarks() { itemsNoMods .map((item) => item.iconWatermarkShelved) .flat() - .filter(Boolean) - ) + .filter(Boolean), + ), ), ]); } @@ -146,7 +146,7 @@ function getAllWatermarks() { //============================================================================= function findWatermarksViaSeasonPass() { const seasonDefs = getAllDefs('Season').sort((a, b) => - a.seasonNumber > b.seasonNumber ? 1 : -1 + a.seasonNumber > b.seasonNumber ? 1 : -1, ); for (let season = 6; season < seasonDefs.length; ++season) { @@ -155,7 +155,7 @@ function findWatermarksViaSeasonPass() { } const rewardDef = getDef( 'Progression', - getDef('SeasonPass', seasonDefs[season].seasonPassHash)?.rewardProgressionHash + getDef('SeasonPass', seasonDefs[season].seasonPassHash)?.rewardProgressionHash, )?.rewardItems.map((item) => getDef('InventoryItem', item.itemHash))[0]; const seasonalWatermarks = [ @@ -166,7 +166,7 @@ function findWatermarksViaSeasonPass() { ]; seasonalWatermarks?.forEach((watermark) => - watermark ? (watermarkToSeason[watermark] = season) : undefined + watermark ? (watermarkToSeason[watermark] = season) : undefined, ); } // Remove watermarks that have been assigned from unassigned watermarks @@ -178,15 +178,15 @@ function generateEventWatermarks() { (item) => isShader(item) && item.inventory?.stackUniqueLabel?.match( - /(events.(dawning|crimson|fotl|ggames))|(silver.(spring|summer|solstice|revelry))/g - ) + /(events.(dawning|crimson|fotl|ggames))|(silver.(spring|summer|solstice|revelry))/g, + ), ); return [ ...new Set( eventShaders .map((item) => item.iconWatermark) .flat() - .filter(Boolean) + .filter(Boolean), ), ]; } diff --git a/src/generate-weapons-from-quest.ts b/src/generate-weapons-from-quest.ts index 5e91e564..b18d0ae3 100644 --- a/src/generate-weapons-from-quest.ts +++ b/src/generate-weapons-from-quest.ts @@ -10,7 +10,7 @@ const allWeaponsHashes = inventoryItems .filter( (i) => i.itemCategoryHashes?.includes(ItemCategoryHashes.Weapon) && - !i.itemCategoryHashes.includes(ItemCategoryHashes.Dummies) + !i.itemCategoryHashes.includes(ItemCategoryHashes.Dummies), ) .map((i) => i.hash); @@ -19,15 +19,15 @@ const allWeaponQuests = uniqAndSortArray( .filter( (q) => q.itemCategoryHashes?.includes(ItemCategoryHashes.QuestStep) && - q.value?.itemValue.filter((rewards) => allWeaponsHashes.includes(rewards.itemHash)) + q.value?.itemValue.filter((rewards) => allWeaponsHashes.includes(rewards.itemHash)), ) - .map((q) => q.setData?.itemList[0].itemHash) + .map((q) => q.setData?.itemList[0].itemHash), ); allWeaponQuests.forEach((qHash) => { const questInfo = getDef('InventoryItem', qHash); const weaponRewardHash = questInfo?.value?.itemValue.filter((rewards) => - allWeaponsHashes.includes(rewards.itemHash) + allWeaponsHashes.includes(rewards.itemHash), )[0]?.itemHash; if (weaponRewardHash) { diff --git a/src/generate-workaround-items.ts b/src/generate-workaround-items.ts index 168f3470..08c54e92 100644 --- a/src/generate-workaround-items.ts +++ b/src/generate-workaround-items.ts @@ -18,7 +18,7 @@ Object.values(inventoryItems).forEach((item) => { (correspondingItem) => correspondingItem.hash !== item.hash && correspondingItem.displayProperties.name === item.displayProperties.name && - correspondingItem.inventory!.bucketTypeHash === 2422292810 + correspondingItem.inventory!.bucketTypeHash === 2422292810, ); if (badItem) { itemReplacementTable[badItem.hash] = item.hash; diff --git a/src/helpers.ts b/src/helpers.ts index 5ce8d621..613e8a7d 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -65,7 +65,7 @@ export function diffArrays(all: any[], exclude: any[]) { } else { return false; } - }) + }), ), ]; } @@ -152,7 +152,7 @@ export interface Categories { export function applySourceStringRules( haystack: typeof sourcesInfo, - sourceStringRules: Categories['sources'][string] + sourceStringRules: Categories['sources'][string], ): number[] { const { includes, excludes } = sourceStringRules; @@ -163,15 +163,13 @@ export function applySourceStringRules( ([, sourceString]) => // do inclusion strings match this sourceString? includes?.filter((searchTerm) => - sourceString.toLowerCase().includes(searchTerm.toLowerCase()) + sourceString.toLowerCase().includes(searchTerm.toLowerCase()), ).length && // not any excludes or not any exclude matches - !( - // do exclusion strings match this sourceString? - excludes?.filter((searchTerm) => - sourceString.toLowerCase().includes(searchTerm.toLowerCase()) - ).length - ) + !// do exclusion strings match this sourceString? + excludes?.filter((searchTerm) => + sourceString.toLowerCase().includes(searchTerm.toLowerCase()), + ).length, ) // keep the sourceHash and discard the sourceString. // convert them back from object keys (strings) to numbers. @@ -182,7 +180,7 @@ export function applySourceStringRules( export function getCurrentSeason() { // Sort Seasons backwards and return the first season without "Redacted" in its name const seasonDefs = getAllDefs('Season').sort((a, b) => - a.seasonNumber > b.seasonNumber ? 1 : -1 + a.seasonNumber > b.seasonNumber ? 1 : -1, ); for (let season = seasonDefs.length - 1; season > 0; season--) { const validSeason = !seasonDefs[season].displayProperties.name